Changeset 5199 for trunk/expressoMail1_2

Timestamp:

11/23/11 14:36:17 (12 years ago)

Author:

gustavo

Message:

Ticket #2331 - Preferência do ExpressoMail? aparentemente sem efeito

File:

• trunk/expressoMail1_2/inc/class.ldap_functions.inc.php (modified) (5 diffs)

trunk/expressoMail1_2/inc/class.ldap_functions.inc.php

@@ -98 +98 @@
                 $contacts_result['field'] = $field;
                 $contacts_result['ID'] = $ID;
-                $search_for = utf8_encode($params['search_for']);
-
+                $search_for = utf8_encode($params['search_for']);
+                
+                if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['extended_info'])
+                        $extendedinfo=true;
+                else
+                        $extendedinfo=false;
+                
                 // follow the referral
                 $this->ldapConnect(true);
@@ -106 +111 @@
                 {
                     $ldapService->connection = $this->ds;
-
-                $justthese = array("cn", "mail", "telephonenumber", "mobile", "phpgwaccountvisible", "uid", "employeenumber", "ou");
+                                if($extendedinfo)
+                        $justthese = array("cn", "mail", "telephonenumber", "mobile", "phpgwaccountvisible", "uid", "employeenumber", "ou");
+                                else 
+                                        $justthese = array("cn", "mail", "telephoneNumber", "phpgwAccountVisible", "uid");
                 $types = false;
 
@@ -139 +146 @@
                                                 $this->ldapConnect(true,$i);
                                                 $filter="(|(cn=*$search_for*)(mail=*$search_for*))";
-                                                $justthese = array("cn", "mail", "telephoneNumber", "mobile", "phpgwAccountVisible", "uid","employeeNumber", "ou");
+                                                if($extendedinfo)
+                                        $justthese = array("cn", "mail", "telephonenumber", "mobile", "phpgwaccountvisible", "uid", "employeenumber", "ou");
+                                                else 
+                                                        $justthese = array("cn", "mail", "telephoneNumber", "phpgwAccountVisible", "uid");
                                                 $sr=@ldap_search($this->ds, $this->ldap_context, $filter, $justthese, 0, $this->max_result+1);
                                                 if(!$sr)
@@ -426 +436 @@
                         }
                         ldap_close($this->ds);      
-                
+
                         //Busca em Catalagos externos
                         $catalogsNum=count($this->external_srcs);
@@ -459 +469 @@
             return $info_return;
         } 
-        
-        
-        
-        
-        
-        
         
         function make_quicksearch_card($info, $cn)