Changeset 526 for trunk/jabberit_messenger/inc/class.ldap_im.inc.php

Timestamp:

10/13/08 11:53:05 (16 years ago)

Author:

niltonneto

Message:

Correções referentes à versão 0.7.9

File:

• trunk/jabberit_messenger/inc/class.ldap_im.inc.php (modified) (3 diffs)

trunk/jabberit_messenger/inc/class.ldap_im.inc.php

@@ -61 +61 @@
                         $filter = "(&(phpgwaccounttype=u)(|".$uidnumber.")(".$search ."))";
                         $justthese = array("uid","uidNumber","cn","mail","phpgwAccountVisible","dn","jpegPhoto");
+                        // SERPRO
+                        //$justthese = array("uid","uidNumber","cn","mail","description","phpgwAccountVisible","dn","jpegPhoto");                       
                         $search = ldap_search($this->ldap,$this->ldap_context,$filter,$justthese, 0, $this->max_result + 1);
                         $entry1 = ldap_get_entries($this->ldap,$search);
@@ -83 +85 @@
                                                 $result['uid'] = @ldap_get_values($this->ldap, $entry, 'uid');
                                                 $result['cn'] = @ldap_get_values($this->ldap, $entry, 'cn');
+                                                // SERPRO
+                                                //$result['description'] = @ldap_get_values($this->ldap, $entry, 'description');
 
                                                 foreach ( $result as $key => $value )
@@ -99 +103 @@
                                                         $_SESSION['phpgw_info']['jabberit_messenger']['photo'][trim($result_user[$i]['uid'])] = $photo[0];
                                                 }
+                                                
+                                                $organization = explode(",", $_SESSION['phpgw_info']['jabberit_messenger']['attributes_org_ldap_jabberit']);
+
+                                                if(is_array($organization))
+                                                {
+                                                        foreach($organization as $attr)
+                                                        {
+                                                                $tmp = explode(";",$attr);
+                                                                if( strtolower(trim($tmp[0])) == strtolower(trim($result_user[$i]['dn'])) )
+                                                                {
+                                                                        switch(strtolower(trim($tmp[1])))
+                                                                        {
+                                                                                case "mail" :
+                                                                                                $uid = $result_user[$i]['mail'];
+                                                                                                $uid = substr($uid,0,strpos($uid,"@")); 
+                                                                                                $result_user[$i]['uid'] = $uid;
+                                                                                                break;
+        
+                                                                                case "description" :
+                                                                                                // SERPRO
+                                                                                                // parte antes do arroba; 
+                                                                                                $result_user[$i]['uid'] = $result_user[$i]['description'];                                                                              
+                                                                                                break;
+                                                                        }
+                                                                }
+                                                        }
+                                                }
+                                                
                                                 $i++;
                                         }                               
                                         $entry = ldap_next_entry($this->ldap,$entry);   
                                 }
+                                
                                 return $result_user;
                         }