Changeset 4326 for branches/2.2.0.1/contactcenter/inc/class.bo_global_ldap_catalog.inc.php

Timestamp:

05/11/11 09:50:40 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1726 - Modificado implementação que lista Referrals, sem ldap_next_reference(). r4313

File:

• branches/2.2.0.1/contactcenter/inc/class.bo_global_ldap_catalog.inc.php (modified) (1 diff)

branches/2.2.0.1/contactcenter/inc/class.bo_global_ldap_catalog.inc.php

@@ -152 +152 @@
                         $filter = "(&".$filter."(mail=*))";
 
-                        if(strstr($this->src_info['context'], "ldap://")) {
-                                $refer_context  = str_replace("??base","",preg_replace('!^(ldap://[^/]+)/(.*$)!', '\\2', $this->src_info['context']));
-                                $host   = preg_replace('!^(ldap://[^/]+)/.*$!', '\\1', $this->src_info['context']);
-                                $this->src_info['host'] = $host;
-                        }
-                        if($refer_context || "ou" === strtolower(substr($this->src_info['context'], 0, 2)))
-                        {
-                                $followReferral = false;
-                        }
-                        elseif(trim($rules[4]['value']) != "inetOrgPerson")
-                        {
-                                $followReferral = true;
-                        }
-                        else
-                        {                               
-                                return false;
-                        }
-                        
-                        $ldap = $GLOBALS['phpgw']->common->ldapConnect($this->src_info['host'], $this->src_info['acc'], $this->src_info['pw'], $followReferral);
-                        $result_r = $recursive ? ldap_search($ldap ,($refer_context  ? $refer_context  : $this->src_info['context']), $filter, $fields, 0, $this->src_info['max_results']) :
-                                                ldap_list($ldap , ($refer_context  ? $refer_context  : $this->src_info['context']), $filter, $fields, 0, $this->src_info['max_results']);
-
+                        $ldap = $GLOBALS['phpgw']->common->ldapConnect($this->src_info['host'], $this->src_info['acc'], $this->src_info['pw'], true);
+                        $result_r = $recursive ? ldap_search($ldap , $this->src_info['context'], $filter, $fields, 0, $this->src_info['max_results']) :
+                                                ldap_list($ldap , $this->src_info['context'], $filter, $fields, 0, $this->src_info['max_results']);
+                                                
                         if (!$result_r)
                         {