Changeset 4352
- Timestamp:
- 05/12/11 09:24:37 (13 years ago)
- Location:
- sandbox/2.2.0.2/contactcenter/inc
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.2.0.2/contactcenter/inc/class.bo_global_ldap_catalog.inc.php
r4274 r4352 152 152 $filter = "(&".$filter."(mail=*))"; 153 153 154 if(strstr($this->src_info['context'], "ldap://")) {155 $refer_context = str_replace("??base","",preg_replace('!^(ldap://[^/]+)/(.*$)!', '\\2', $this->src_info['context']));156 $host = preg_replace('!^(ldap://[^/]+)/.*$!', '\\1', $this->src_info['context']);157 $this->src_info['host'] = $host;158 }159 if($refer_context || "ou" === strtolower(substr($this->src_info['context'], 0, 2)))160 {161 $followReferral = false;162 }163 elseif(trim($rules[4]['value']) != "inetOrgPerson")164 {165 $followReferral = true;166 }167 else168 {169 return false;170 }171 172 $ldap = $GLOBALS['phpgw']->common->ldapConnect($this->src_info['host'], $this->src_info['acc'], $this->src_info['pw'], $followReferral);173 $result_r = $recursive ? ldap_search($ldap ,($refer_context ? $refer_context : $this->src_info['context']), $filter, $fields, 0, $this->src_info['max_results']) :174 ldap_list($ldap , ($refer_context ? $refer_context : $this->src_info['context']), $filter, $fields, 0, $this->src_info['max_results']);175 154 176 155 if (!$result_r) -
sandbox/2.2.0.2/contactcenter/inc/class.bo_ldap_manager.inc.php
r4305 r4352 269 269 } 270 270 271 $ldap = $GLOBALS['phpgw']->common->ldapConnect($this->srcs[$id_source]['host'], $this->srcs[$id_source]['acc'],$this->srcs[$id_source]['pw'], false);271 $ldap = $GLOBALS['phpgw']->common->ldapConnect($this->srcs[$id_source]['host'], $this->srcs[$id_source]['acc'],$this->srcs[$id_source]['pw'], true); 272 272 if (!$ldap) 273 273 { … … 467 467 function get_ldap_tree_level($id_source, $resource, $context, $objectClass, $branch_dn, $external = 0) 468 468 { 469 if(strstr($context, "ldap://")){470 $refer_context = str_replace("??base","",preg_replace('!^(ldap://[^/]+)/(.*$)!', '\\2', $context));471 $host = preg_replace('!^(ldap://[^/]+)/.*$!', '\\1', $context);472 $resource = ldap_connect($host);473 ldap_bind($resource);474 }475 469 476 470 /* … … 492 486 $filter = '(&(!(objectClass='.$objectClass.')) (!(phpgwAccountVisible=-1)))'; 493 487 } 494 $result_res = @ldap_list($resource, ($refer_context ? $refer_context : $context), $filter, array(), 0, 0);488 $result_res = @ldap_list($resource, $context, $filter, array(), 0, 0); 495 489 @ldap_sort($resource, $result_res, 'ou'); 496 490 … … 509 503 $filter = '(objectClass='.$objectClass.')'; 510 504 // Get only one attribute of the source's objectClass 511 $result_res2 = @ldap_list($resource, ($refer_context ? $refer_context : $context), $filter, Array('cn'), 0, 1);505 $result_res2 = @ldap_list($resource, $context, $filter, Array('cn'), 0, 1); 512 506 $entries_count = ldap_count_entries($resource, $result_res2); 513 507 … … 551 545 'name' => $this->translate_accentuation($dn_parts_1[0]), 552 546 'type' => 'unknown', 553 'value' => ($refer_context ? $host."/" : "").$dn,547 'value' => $dn, 554 548 'sub_branch' => false 555 549 ); … … 559 553 } 560 554 561 if(! $refer_context) {562 $array_referral = $this -> get_ldap_sub_branches_referrals($resource, $context,'(objectClass=organizationalUnit)');563 for($z = 0; $z < count($array_referral); $z++) {564 $tree['sub_branch'][$i++] = $array_referral[$z];565 }566 }567 555 568 556 $filter = 'objectClass='.$objectClass; 569 $result_res2 = @ldap_list($resource, ($refer_context ? $refer_context : $context), $filter, Array('cn'), 0, 1);557 $result_res2 = @ldap_list($resource, $context, $filter, Array('cn'), 0, 1); 570 558 $entries_count = ldap_count_entries($resource, $result_res2); 571 559
Note: See TracChangeset
for help on using the changeset viewer.