steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusy.php, 1.36, 1.37 freebusyldap.class.php, 1.7, 1.8

cvs at intevation.de cvs at intevation.de
Mon Jun 6 22:35:26 CEST 2005


Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy
In directory doto:/tmp/cvs-serv23846/kolab-resource-handlers/freebusy

Modified Files:
	freebusy.php freebusyldap.class.php 
Log Message:
Issue778 (alias fb)

Index: freebusy.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- freebusy.php	16 Dec 2004 20:54:46 -0000	1.36
+++ freebusy.php	6 Jun 2005 20:35:24 -0000	1.37
@@ -43,6 +43,7 @@
 }
 
 $imapuser = $ldap->mailForUid( $imapuser );
+$user = $ldap->mailForUidOrAlias( $user );
 $homeserver = $ldap->homeServer( $user );
 
 if( $homeserver === false ) {

Index: freebusyldap.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusyldap.class.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- freebusyldap.class.php	13 Jan 2005 02:41:31 -0000	1.7
+++ freebusyldap.class.php	6 Jun 2005 20:35:24 -0000	1.8
@@ -79,14 +79,11 @@
   }
 
   function mailForUid( $uid ) {
-    if( !isset( $uid ) ) return false;
-    $result = ldap_search( $this->connection, $this->base, '(&(objectClass=kolabInetOrgPerson)(uid='.$uid.'))',
-			   array( 'mail' ) );
-    if( $result ) {
-      $entries = ldap_get_entries( $this->connection, $result );
-      if( $entries['count'] > 0 && !empty($entries[0]['mail'][0]) ) return $entries[0]['mail'][0];
-    }
-    return $uid;
+    return $this->_internalLookupMail('(&(objectClass=kolabInetOrgPerson)(uid='.$uid.'))',$uid);
+  }
+
+  function mailForUidOrAlias( $uid ) {
+    return $this->_internalLookupMail('(&(objectClass=kolabInetOrgPerson)(|(uid='.$uid.')(alias='.$uid.')))',$uid);
   }
 
   function homeServer( $uid ) {
@@ -170,6 +167,17 @@
     }
     if( $val == '' ) $val = $default;
     return $val;
+  }
+
+  function _internalLookupMail( $filter, $default ) {
+    if( !isset( $default ) ) return false;
+    $result = ldap_search( $this->connection, $this->base, $filter,
+			   array( 'mail' ) );
+    if( $result ) {
+      $entries = ldap_get_entries( $this->connection, $result );
+      if( $entries['count'] > 0 && !empty($entries[0]['mail'][0]) ) return $entries[0]['mail'][0];
+    }
+    return $default;
   }
 
   var $connection;





More information about the commits mailing list