Changeset 314 for trunk/contactcenter/inc/class.bo_global_ldap_catalog.inc.php

Timestamp:

06/17/08 14:41:55 (16 years ago)

Author:

niltonneto

Message:

Verificar Ocorrência #222.

File:

• trunk/contactcenter/inc/class.bo_global_ldap_catalog.inc.php (modified) (3 diffs)

trunk/contactcenter/inc/class.bo_global_ldap_catalog.inc.php

@@ -133 +133 @@
                         $filter = $this->process_restrictions($rules, $trans_f);
 
-                        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")     
+                        if("ou" === strtolower(substr($this->src_info['context'], 0, 2)) ||
+                                (trim($rules[4]['value']) != "inetOrgPerson"))  
                         {                       
-                                $followReferral = true;
+                                $ldap = $GLOBALS['phpgw']->common->ldapConnect($this->src_info['host'], $this->src_info['acc'], $this->src_info['pw'], true);
+                                $result_r = ldap_search($ldap , $this->src_info['context'], $filter, $fields, 0);
                         }
                         else
@@ -152 +144 @@
                         }
                         
-                        $ldap = $GLOBALS['phpgw']->common->ldapConnect($this->src_info['host'], $this->src_info['acc'], $this->src_info['pw'], $followReferral);
-                        $result_r = ldap_search($ldap ,($refer_context  ? $refer_context  : $this->src_info['context']), $filter, $fields, 0);
 
                         if (!$result_r)
@@ -570 +560 @@
                         }
                         
-                        $resource = ldap_read($ldap, $id_contact, 'objectClass='.$this->src_info['obj']);
-                        $n_entries = ldap_count_entries($ldap, $resource);
+                        $resource = @ldap_read($ldap, $id_contact, 'objectClass='.$this->src_info['obj']);
+                        $n_entries = @ldap_count_entries($ldap, $resource);
                         if ( $n_entries > 1 or $n_entries < 1)
                         {