From: Reini U. <ru...@us...> - 2004-09-17 14:21:37
|
Update of /cvsroot/phpwiki/phpwiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5719 Modified Files: WikiGroup.php Log Message: fix LDAP ou= issue, wrong strstr arg order Index: WikiGroup.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiGroup.php,v retrieving revision 1.40 retrieving revision 1.41 diff -u -2 -b -p -d -r1.40 -r1.41 --- WikiGroup.php 29 Jun 2004 06:48:02 -0000 1.40 +++ WikiGroup.php 17 Sep 2004 14:21:28 -0000 1.41 @@ -949,8 +949,8 @@ class GroupLdap extends WikiGroup { // from users and group if (!LDAP_OU_USERS) - if (strstr("ou=",LDAP_BASE_DN)) + if (strstr(LDAP_BASE_DN, "ou=")) $this->base_dn = preg_replace("/(ou=\w+,)?()/","\$2", LDAP_BASE_DN); - if (!isset($this->user) or !isa($this->user,'_LDAPPassUser')) + if (!isset($this->user) or !isa($this->user, '_LDAPPassUser')) $this->_user = new _LDAPPassUser('LdapGroupTest'); // to have a valid username else @@ -1082,4 +1082,7 @@ class GroupLdap extends WikiGroup { // $Log$ +// Revision 1.41 2004/09/17 14:21:28 rurban +// fix LDAP ou= issue, wrong strstr arg order +// // Revision 1.40 2004/06/29 06:48:02 rurban // Improve LDAP auth and GROUP_LDAP membership: |