gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/include ldap.class.php, 1.29, 1.30

cvs at kolab.org cvs at kolab.org
Fri Jul 13 08:51:31 CEST 2007


Author: gunnar

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

Modified Files:
	ldap.class.php 
Log Message:
Fixed possible notices.

Index: ldap.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ldap.class.php	10 Jul 2007 15:39:48 -0000	1.29
+++ ldap.class.php	13 Jul 2007 06:51:29 -0000	1.30
@@ -117,7 +117,7 @@
       $dn = $_SESSION['php_dn'];
       $pw = $_SESSION['php_pw'];
     }
-    $this->is_bound = ldap_bind( $this->connection, $dn, $pw );
+    $this->is_bound = @ldap_bind( $this->connection, $dn, $pw );
     if( $this->is_bound ) {
       $this->bind_dn = $dn;
     } else {
@@ -415,6 +415,9 @@
   }
 
   function addToDomainGroups( $member, $domains ) {
+	if (empty($domains)) {
+	  return true;
+	}
 	foreach( $domains as $domain ) {
 	  $domgrpdn = 'cn='.$this->dn_escape($domain).',cn=domains,cn=internal,'.$_SESSION['base_dn'];
 	  $dom_obj = $this->read( $domgrpdn );	  
@@ -441,6 +444,9 @@
   }
 
   function removeFromDomainGroups( $member, $domains ) {
+	if (empty($domains)) {
+	  return true;
+	}
 	foreach( $domains as $domain ) {
 	  $domgrpdn = 'cn='.$this->dn_escape($domain).',cn=domains,cn=internal,'.$_SESSION['base_dn'];
 	  $dom_obj = $this->read( $domgrpdn );





More information about the commits mailing list