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

Timestamp:

03/10/08 09:18:37 (16 years ago)

Author:

niltonneto

Message:

ver Ticket #154 e #155;
Otimizar verificação do Fora de Escritório;
Otimizar código que salva as preferências;

File:

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

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

@@ -27 +27 @@
                 @ldap_bind($this->ds, $_SESSION['phpgw_info']['expressomail']['ldap_server']['acc'],$_SESSION['phpgw_info']['expressomail']['ldap_server']['pw']);                              
         }
+
+        //Teste jakjr retornando o DS
+        function ldapConnect2($refer = false){
+                $ds = ldap_connect($_SESSION['phpgw_info']['expressomail']['ldap_server']['host']);
+                
+                if (!$ds)
+                        return false;
+                
+                ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
+                ldap_set_option($ds, LDAP_OPT_REFERRALS, $refer);
+                if ($refer)
+                        ldap_set_rebind_proc($ds, ldapRebind);
+                @ldap_bind($ds, $_SESSION['phpgw_info']['expressomail']['ldap_server']['acc'],$_SESSION['phpgw_info']['expressomail']['ldap_server']['pw']);
+                
+                return $ds;                             
+        }
+
 
         // usa o host e context do setup.
@@ -439 +456 @@
         }
 
-        function getUserByEmail($params){       
+        function getUserByEmail($params)
+        {
+                $filter="(&(phpgwAccountType=u)(mail=" . $params['email'] . "))";
+                $ldap_context = $_SESSION['phpgw_info']['expressomail']['ldap_server']['dn'];
+                $justthese = array("cn","uid","telephoneNumber","jpegPhoto","mobile");
+
                 // Follow the referral
-                $email = $params['email'];
-                $this->ldapConnect(true);
-                if ($this->ds)
-                {
-                        $filter="(&(phpgwAccountType=u)(mail=$email))";         
-                        $justthese = array("cn","uid","telephoneNumber","jpegPhoto","mobile");
-                        $sr=ldap_search($this->ds, $this->ldap_context, $filter, $justthese);
-                        $entry = ldap_first_entry($this->ds, $sr);                      
+                $ds = $this->ldapConnect2(true);
+                if ($ds)
+                {                       
+                        $sr=ldap_search($ds, $ldap_context, $filter, $justthese);
+                        
+                        if (!$sr)
+                                return null;
+                        
+                        $entry = ldap_first_entry($ds, $sr);
+                        
                         if($entry) {                                            
-                                $obj =  array("cn" => @ldap_get_values($this->ds, $entry, "cn"),
-                                                  "email" => $email,
-                                                  "uid" => @ldap_get_values($this->ds, $entry, "uid"),
+                                $obj =  array("cn" => ldap_get_values($ds, $entry, "cn"),
+                                                  "email" => $params['email'],
+                                                  "uid" => ldap_get_values($ds, $entry, "uid"),
                                                   "type" => "global",
-                                                  "mobile" =>  @ldap_get_values($this->ds, $entry, "mobile"),
-                                                  "telefone" =>  @ldap_get_values($this->ds, $entry, "telephonenumber"));
-
-                                $_SESSION['phpgw_info']['expressomail']['contact_photo'] = @ldap_get_values_len($this->ds, $entry, "jpegphoto");
-                                ldap_close($this->ds);                          
+                                                  "mobile" =>  @ldap_get_values($ds, $entry, "mobile"),
+                                                  "telefone" =>  @ldap_get_values($ds, $entry, "telephonenumber")
+                                        );
+
+                                $_SESSION['phpgw_info']['expressomail']['contact_photo'] = ldap_get_values_len($ds, $entry, "jpegphoto");
+                                ldap_close($ds);
                                 return $obj;
-                        }               
+                        }
                 }
                 return null;