[Jifty-commit] r5246 - in jifty/trunk/plugins/AuthzLDAP/lib/Jifty/Plugin: .

[Jifty commits]

Author: yves
Date: Mon Mar 31 04:09:23 2008
New Revision: 5246

Modified:
   jifty/trunk/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP.pm
   jifty/trunk/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP/Model/LDAPFilter.pm

Log:
* bugfix for 'new' classloader
* chg name column filter by ldapfilter


Modified: jifty/trunk/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP.pm
==============================================================================
--- jifty/trunk/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP.pm	(original)
+++ jifty/trunk/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP.pm	Mon Mar 31 04:09:23 2008
@@ -63,6 +63,9 @@
 
 package Jifty::Plugin::AuthzLDAP;
 use base qw/Jifty::Plugin/;
+
+our $VERSION = '0.02';
+
 use Net::LDAP;
 use Cache::MemoryCache;
 
@@ -74,7 +77,7 @@
         my %args = @_;
 
         my $appname = Jifty->config->framework('ApplicationName');
-        $LDAPFilterClass = "${appname}::Model::LDAPFilter";
+        $LDAPFilterClass = "Jifty::Plugin::AuthzLDAP::Model::LDAPFilter";
 
         $params{'Hostname'} = $args{LDAPhost};
         $params{'base'} = $args{LDAPbase};
@@ -158,7 +161,7 @@
     # (?) allow use of writing filter in filtername
     # TODO: filtername must be cleanned
     # my $filter = ($record->filter)?$record->filter:$filtername;
-    my $filter = $record->filter;
+    my $filter = $record->ldapfilter;
 
     $user = $self->UID().'='.$user.','.$self->BASE();
     

Modified: jifty/trunk/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP/Model/LDAPFilter.pm
==============================================================================
--- jifty/trunk/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP/Model/LDAPFilter.pm	(original)
+++ jifty/trunk/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP/Model/LDAPFilter.pm	Mon Mar 31 04:09:23 2008
@@ -10,7 +10,7 @@
   is distinct;
 
 column
-  filter => type is 'text',
+  ldapfilter => type is 'text',
   label is 'Filter',
   is mandatory;