- Timestamp:
- 06/04/09 15:21:28 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/jabberit_messenger/inc/class.ldap_im.inc.php
r946 r951 24 24 private $ldap_dn; 25 25 private $ldap_host; 26 private $ldap_org; 26 27 private $ldap_pass; 27 28 private $max_result; … … 182 183 $this->ldap_context = $confHosts[$i]['contextLdap']; 183 184 $this->ldap_dn = $confHosts[$i]['user']; 185 $this->ldap_org = $confHosts[$i]['org']; 184 186 $this->ldap_pass = $confHosts[$i]['password']; 185 187 186 188 $conn = $this->ldapCatalog(); 187 189 … … 190 192 $filter = "(&(phpgwaccounttype=u)(".$search ."))"; 191 193 $justthese = array("uid","uidNumber","cn","mail","phpgwAccountVisible","dn","jpegPhoto"); 192 $search1 = @ldap_search($conn, $this->ldap_context, $filter, $justthese, 0, $this->max_result + 1); 194 $searchRoot = ( $this->ldap_org != "*" ) ? "ou=".$this->ldap_org.",".$this->ldap_context : $this->ldap_context; 195 $search1 = @ldap_search($conn, $searchRoot, $filter, $justthese, 0, $this->max_result + 1); 193 196 $entry1 = @ldap_get_entries( $conn, $search1 ); 194 195 197 $result = $this->resultArray($entry1, $conn ); 196 198
Note: See TracChangeset
for help on using the changeset viewer.