steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include ldap.class.php, 1.20, 1.21

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	ldap.class.php 
Log Message:
Fix for issue630 (aliases in admin dist lists)

Index: ldap.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ldap.class.php	8 Jan 2005 03:25:28 -0000	1.20
+++ ldap.class.php	21 Jan 2005 11:29:47 -0000	1.21
@@ -240,7 +240,20 @@
         return ldap_get_dn( $this->connection, $entry );
       }
     } else {
-      echo _("Error searching for DN for Mail=$mail");
+      $errors[] = _("Error searching for DN for alias=$mail: ").ldap_error($this->connection);
+    }
+    return false;
+  }
+
+  function dnForMailOrAlias( $mail ) {
+    if( $this->search( $_SESSION['base_dn'],
+                       '(&(objectclass=kolabInetOrgPerson)(|(mail='.$this->escape($mail).')(alias='.$this->escape($mail).')))' ) ) {
+      $entry = $this->firstEntry();
+      if( $entry ) {
+        return ldap_get_dn( $this->connection, $entry );
+      }
+    } else {
+      $errors[] = _("Error searching for DN for mail_or_alias=$mail: ").ldap_error($this->connection);
     }
     return false;
   }