gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/include ldap.class.php.in, 1.1.2.4, 1.1.2.5

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv9045/kolab-webadmin/kolab-webadmin/php/admin/include

Modified Files:
      Tag: kolab_2_2_branch
	ldap.class.php.in 
Log Message:
MFH: kolab/issue3499 (Kolab web admin does not use LDAP escaping) 

Index: ldap.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php.in,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- ldap.class.php.in	3 Dec 2009 21:08:28 -0000	1.1.2.4
+++ ldap.class.php.in	21 Feb 2010 11:58:45 -0000	1.1.2.5
@@ -418,13 +418,13 @@
                      )
                      (uid='.$this->escape($mail).')
                    )';
-	$res = $this->search( $this->dn_escape($base), $filter, array( 'dn' ) );
+	$res = $this->search( $base, $filter, array( 'dn' ) );
 	$count = 0;
 
 	$entries = ldap_get_entries( $this->connection, $res );
 	if( $excludedn ) {
 	  for ( $i = 0; $i < count( $entries ); $i++ ) {
-		if( is_null( $entries[$i] ) ) continue;
+		if( !isset($entries[$i]) || is_null( $entries[$i] ) ) continue;
 		if( KolabLDAP::unescape_dn_value($entries[$i]['dn']) == KolabLDAP::unescape_dn_value($excludedn) ) continue;	   
 		debug("found ".$entries[$i]['dn'] );
 		$count++;