Changeset 33 for trunk/instant_messenger/inc/class.ldap_im.inc.php

Timestamp:

06/21/07 08:32:34 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

File:

• trunk/instant_messenger/inc/class.ldap_im.inc.php (modified) (7 diffs)

trunk/instant_messenger/inc/class.ldap_im.inc.php

@@ -14 +14 @@
                 $this->user             = $_SESSION['phpgw_info']['instant_messenger']['user_ldap_jabber'];
                 $this->password         = $_SESSION['phpgw_info']['instant_messenger']['password_ldap_jabber'];
-                $this->connect_ldap(true);
+                $this->connect_ldap(false);
         }
         
@@ -35 +35 @@
         function get_photo_ldap($user,$getPhoto)
         {
-                $result = "";
                 if ($this->conn) {
-                        $filter="uid=".$user;           
+                        $filter="(&(uid=".$user.")(phpgwAccountType=u))";               
                         $justthese = array("jpegphoto");
                         $search = ldap_search($this->conn,$this->ldap_context, $filter, $justthese);
                         $entry = ldap_first_entry($this->conn, $search);
-                        if($entry != 'undefined'){
-                                $jpeg_data = @ldap_get_values_len($this->conn, $entry, "jpegphoto");
+                        $jpeg_data = @ldap_get_values_len($this->conn, $entry, "jpegphoto");
+                        
+                        if( count($jpeg_data) > 1){
+
                                 $photo = imagecreatefromstring($jpeg_data[0]);
                                 if($photo){
@@ -72 +73 @@
         }
         
-        function list_users_ldap($filter)
+        function list_users_ldap($search)
         {
-
-                if( $this->conn ){
-                        $filter = "(&(|".$filter.")(phpgwAccountType=u))";
-                        $justthese = array("uid","uidNumber","cn","mail","phpgwAccountVisible","dn");                   
-                        $search = ldap_search($this->conn,$this->ldap_context, $filter, $justthese);
+                
+                if($this->conn){
+                        $filter = "(&(".$search.")(phpgwAccountType=u))";
+                        $justthese = array("uid","uidNumber","cn","mail","phpgwAccountVisible","dn");
+                        $search = ldap_search($this->conn,$this->ldap_context,$filter,$justthese);
                         $entry = ldap_get_entries($this->conn,$search);
                 }
-
+                
                 if( $entry['count'] > 0){
                         $i = 0;
+                        $result_user = array();
                         foreach($entry as $tmp)
                         {
-                                if($tmp['uidnumber'][0] != ""){
+                                if($tmp['uidnumber'][0] != "" && $tmp['phpgwaccountvisible'][0] != "-1"){
                                         $result_user[$i]['uidnumber'] = $tmp['uidnumber'][0];                   
                                         $result_user[$i]['mail'] = $tmp['mail'][0];
                                         $result_user[$i]['uid'] = $tmp['uid'][0];
                                         $result_user[$i]['cn'] = $tmp['cn'][0];
-                                        $dn = explode(",dc=",$tmp['dn']);
-                                        $ou = explode(",",$dn[0]);
-                                        $result_user[$i]['ou'] = strtoupper(array_pop($ou));
+                                        $ou = explode("dc=",$tmp['dn']);
+                                        $ou = explode("ou=",$ou[0]);
+                                        $ou = array_pop($ou);
+                                        $result_user[$i]['dn'] = strtoupper(substr($ou,0,strlen($ou)-1));                                       
                                         $i++;
                                 }                               
@@ -102 +105 @@
         }
         
-        function list_groups_ldap($filter)
+        function list_groups_ldap($search)
         {
 
                 if( $this->conn ){
-                        $filter = "(&(|".$filter.")(phpgwAccountType=g))";
+                        $filter = "(&(".$search.")(phpgwAccountType=g))";
                         $justthese = array("gidnumber","cn","memberuid");                       
                         $search = ldap_search($this->conn,$this->ldap_context, $filter, $justthese);
@@ -112 +115 @@
                 }
                 
-                if( $entry['count'] > 0 ){
+                if($entry['count'] > 0){
                         $i = 0;
-                        foreach($entry as $tmp)
-                        {
-                                if($tmp['gidnumber'][0] != ""){
-                                        $result_groups[$i]['gidnumber'] = $tmp['gidnumber'][0];
-                                        $org = explode(",",$tmp['dn']);
-                                        $result_groups[$i]['ou'] = strtoupper($org[1]);
-                                        array_shift($tmp['memberuid']);
-                                        foreach($tmp['memberuid'] as $mb)
-                                                $result_groups[$i]['members'][] = $mb;
+                        $result_groups = array();
+                        foreach($entry as $tmpg){
+                                if($tmpg['gidnumber'] != ""){
+                                        $result_groups[$i]['gidnumber'] = $tmpg['gidnumber'][0];
+                                        array_shift($tmpg['memberuid']);
+                                        foreach($tmpg['memberuid'] as $tmp)
+                                                $result_groups[$i]['members'][] = $tmp;                                 
                                         $i++;
                                 }
-                        }
+                        }       
                         return $result_groups;
                 }
                 return 0;
-
         }
         
@@ -149 +149 @@
                         }
                 }
-                
                 sort($result_org);
-
                 return $result_org;
         }
@@ -157 +155 @@
         function info_user($user)
         {
-                $uid = $user['uid'];
-                $filter = "(uid=".$uid.")";
+                $uid = "uid=".$user['uid'];
                 $i= 0;
                 
-                $entry = $this->list_users_ldap($filter);
+                $entry = $this->list_users_ldap($uid);
                 
-                if( count($entry) > 0 ){
+                if( count($entry) > 0 )
                         return $entry;
-                }else{
+                else
                         return false;   
-                }
         }
 }