Changeset 4326 for branches/2.2.0.1/contactcenter/inc/class.bo_ldap_manager.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_ldap_manager.inc.php (modified) (6 diffs)

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

@@ -269 +269 @@
                         }
                         
-                        $ldap = $GLOBALS['phpgw']->common->ldapConnect($this->srcs[$id_source]['host'], $this->srcs[$id_source]['acc'],$this->srcs[$id_source]['pw'], false);
+                        $ldap = $GLOBALS['phpgw']->common->ldapConnect($this->srcs[$id_source]['host'], $this->srcs[$id_source]['acc'],$this->srcs[$id_source]['pw'], true);
                         if (!$ldap)
                         {
@@ -466 +466 @@
 
                 function get_ldap_tree_level($id_source, $resource, $context, $objectClass, $branch_dn, $external = 0)
-                {
-                        if(strstr($context, "ldap://")){
-                                $refer_context = str_replace("??base","",preg_replace('!^(ldap://[^/]+)/(.*$)!', '\\2', $context));
-                                $host   = preg_replace('!^(ldap://[^/]+)/.*$!', '\\1', $context);
-                                $resource = ldap_connect($host);
-                                ldap_bind($resource);
-                        }
-
+                {                       
                         /*
                          * TODO: Search timeouts
@@ -491 +484 @@
                                 // and whose attribute phpgwAccountVisible value is different from -1
                                 $filter = '(&(!(objectClass='.$objectClass.')) (!(phpgwAccountVisible=-1)))';
-                        }
-                        $result_res = @ldap_list($resource,  ($refer_context ? $refer_context : $context), $filter, array(), 0, 0);
+                                $context = preg_replace("/dc=(.*)/i",$this->srcs[$id_source]['dn'],$context);
+                        }
+                        $result_res = @ldap_list($resource,  $context, $filter, array(), 0, 0);
                         @ldap_sort($resource, $result_res, 'ou');
 
@@ -509 +503 @@
                                 $filter = '(objectClass='.$objectClass.')';
                                 // Get only one attribute of the source's objectClass
-                                $result_res2 = @ldap_list($resource, ($refer_context ? $refer_context : $context), $filter, Array('cn'), 0, 1);
+                                $result_res2 = @ldap_list($resource, $context, $filter, Array('cn'), 0, 1);
                                 $entries_count = ldap_count_entries($resource, $result_res2);
 
@@ -551 +545 @@
                                                 'name'  => $this->translate_accentuation($dn_parts_1[0]),
                                                 'type'  => 'unknown',
-                                                'value' =>  ($refer_context ? $host."/" : "").$dn,
+                                                'value' =>  $dn,
                                                 'sub_branch' => false
                                         );
@@ -558 +552 @@
                                 $i++;
                         }
-
-                        if(! $refer_context) {
-                                $array_referral = $this -> get_ldap_sub_branches_referrals($resource, $context,'(objectClass=organizationalUnit)');
-                                for($z = 0; $z < count($array_referral); $z++) {
-                                        $tree['sub_branch'][$i++] = $array_referral[$z];
-                                }
-                        }
-
+                        
                         $filter = 'objectClass='.$objectClass;
-                        $result_res2 = @ldap_list($resource, ($refer_context ? $refer_context : $context), $filter, Array('cn'), 0, 1);
+                        $result_res2 = @ldap_list($resource, $context, $filter, Array('cn'), 0, 1);
                         $entries_count = ldap_count_entries($resource, $result_res2);