Changeset 5132 for trunk/calendar/inc/class.bogroup_access.inc.php

Timestamp:

11/03/11 13:21:19 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus, do modulo calendar.

File:

• trunk/calendar/inc/class.bogroup_access.inc.php (modified) (1 diff)

trunk/calendar/inc/class.bogroup_access.inc.php

@@ -22 +22 @@
         }
 
-        public final function search_user($params){                     
-                $objLdap = new ldap_functions();
-                $objLdap -> ldapRootConnect();
-                $ldap = $objLdap -> ds;         
-                $search = $params['search'];
-                $accounttype = $params['type'];
-                $justthese = array("cn","uid", "uidNumber","gidNumber");
-        $users_list=ldap_search($ldap, $_SESSION['phpgw_info']['expressomail']['server']['ldap_context'], "(&(phpgwAccountType=$accounttype) (|(cn=*$search*)(mail=$search*)) )", $justthese);          
-        if (ldap_count_entries($ldap, $users_list) == 0)
+        public final function search_user($params)
         {
-                $return['status'] = 'false';
-                $return['msg'] = 'Nenhum resultado encontrado.';
-                return $return;
-        }       
-        ldap_sort($ldap, $users_list, "cn");            
-        $entries = ldap_get_entries($ldap, $users_list);                
+            $server = $_SESSION['phpgw_info']['expressomail']['server'];
+
+            $t = $params['type'];
+
+            $ldapService = ServiceLocator::getService('ldap');
+
+            $ldapService->connect( $server['ldap_host'], $server['ldap_root_dn'], $server['ldap_root_pw'] );
+
+            $entries = $ldapService->accountSearch($params['search'], array('cn', $t.'idNumber', $t.'id' ), $server['ldap_context'], $t, 'cn');
+
                 $options = '';
-                for ($i=0; $i<$entries['count']; $i++)
+
+            foreach( $entries as $value )
                 {
-                        $value = $entries[$i][$accounttype == "u" ? 'uidnumber' : 'gidnumber'][0];              
-                        if($entries[$i]['mail'][0])
-                                $mail = "(".$entries[$i]['mail'][0].")";
-                        $options .= "<option value=" . $value. ">" . $entries[$i]['cn'][0] . " $mail" . "</option>";
+                $id = $value[$t.'id'] ? $value[$t.'id'] : $value[$t.'idnumber'];
+
+                $options .= '<option value='.$value[ $t.'idnumber' ].'>'.$value['cn'].'('.$id.')</option>';
                 }       
+
         return $options;                
         }