Changeset 381 for trunk/expressoMail1_2/inc/class.ldap_functions.inc.php

Timestamp:

07/30/08 16:54:18 (16 years ago)

Author:

niltonneto

Message:

Ver Ocorrência #275 do Trac;

File:

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

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

@@ -150 +150 @@
                                         $return = array();
                                         $return['status'] = false;
-                                        $return['error'] = "many results";
+                                        $return['error'] = "many results";                                      
                                         return $return;
                                 }
@@ -393 +393 @@
                 $error = False;
                 
-                $this->ldapConnect(false,$catalog);
+                $this->ldapConnect(true,$catalog);
                 
                 $params['organization'] == 'all' ? $user_context = $this->ldap_context :$user_context = $this->branch."=".$params['organization'].",".$this->ldap_context;              
@@ -410 +410 @@
                         }
                         
-                        $sr=@ldap_search($this->ds, $user_context, $filter, $justthese, 0, $this->max_result+1);
+                        $sr=@ldap_search($this->ds, $user_context, $filter, $justthese, 0, $max_result+1);
                         if(!$sr)
                                 return null;
                         $count_entries = ldap_count_entries($this->ds,$sr);
-                        if ($count_entries > $this->max_result){
+                        if ($count_entries > $max_result){
                                 $info = null;
-                                $error = True;                                          
+                                $error = True;                                  
                         }
                         else
@@ -430 +430 @@
                                         //aqui eh feita a concatenacao do departamento ao cn;
                                         $u_tmp[$info[$i]["mail"][0]] = utf8_decode($info[$i]["cn"][0]). '%' . $info[$i]["ou"][0];
-                                else
+                                if((!$catalog==0)||(strtoupper($info[$i]["phpgwaccounttype"][0]) == 'L') && ($info[$i]["phpgwaccountvisible"][0] != '-1'))                                                      
                                         $g_tmp[$info[$i]["mail"][0]] = utf8_decode($info[$i]["cn"][0]);
                         }                                                                               
@@ -655 +655 @@
                         
                         if($entry) {                                            
-                                $obj =  array("cn" => utf8_decode(ldap_get_values($ds, $entry, "cn")),
+                                $obj =  array("cn" => utf8_decode(current(ldap_get_values($ds, $entry, "cn"))),
                                                   "email" => $params['email'],
                                                   "uid" => ldap_get_values($ds, $entry, "uid"),