- Timestamp:
- 12/12/11 08:12:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
r5209 r5237 104 104 else 105 105 $extendedinfo=false; 106 106 107 107 // follow the referral 108 108 $this->ldapConnect(true); … … 112 112 $ldapService->connection = $this->ds; 113 113 if($extendedinfo) 114 $justthese = array("cn", "mail", "telephonenumber", " mobile", "phpgwaccountvisible", "uid", "employeenumber", "ou");114 $justthese = array("cn", "mail", "telephonenumber", "uidNumber", "mobile", "phpgwaccountvisible", "employeenumber", "ou"); 115 115 else 116 116 $justthese = array("cn", "mail", "telephoneNumber", "phpgwAccountVisible", "uid"); … … 135 135 136 136 // New search only on user sector 137 if ( $count_entries == $this->max_result)137 if (true) 138 138 { 139 139 $overload = $count_entries; … … 147 147 $filter="(|(cn=*$search_for*)(mail=*$search_for*))"; 148 148 if($extendedinfo) 149 $justthese = array("cn", "mail", "telephonenumber", " mobile", "phpgwaccountvisible", "uid", "employeenumber", "ou");149 $justthese = array("cn", "mail", "telephonenumber", "uidNumber", "mobile", "phpgwaccountvisible", "employeenumber", "ou"); 150 150 else 151 151 $justthese = array("cn", "mail", "telephoneNumber", "phpgwAccountVisible", "uid"); … … 168 168 for ($i=0; $i<$info["count"]; $i++) 169 169 { 170 $key = $info[$i]["mail"][0] . '%' . $info[$i]["telephonenumber"][0] . '%'. $info[$i]["mobile"][0] . '%' . $info[$i]["uid"][0] . '%' . $info[$i]["jpegphoto"]['count'] . '%' . $info[$i]["employeenumber"][0] . '%' . $info[$i]["ou"][0];170 $key = $info[$i]["mail"][0] . '%' . $info[$i]["telephonenumber"][0] . '%'. $info[$i]["mobile"][0] . '%' . $info[$i]["uidnumber"][0] . '%' . $info[$i]["jpegphoto"]['count'] . '%' . $info[$i]["employeenumber"][0] . '%' . $info[$i]["ou"][0]; 171 171 172 172 if (/*(!$quickSearch_only_in_userSector) &&*/ preg_match("/$user_sector_dn/i", $info[$i]['dn'])) … … 193 193 $contacts_result[$i] = array(); 194 194 $contacts_result[$i]["cn"] = $cn; 195 list ($contacts_result[$i]["mail"], $contacts_result[$i]["phone"], $contacts_result[$i]["mobile"], $contacts_result[$i]["uid "], $contacts_result[$i]["jpegphoto"], $contacts_result[$i]["employeenumber"], $contacts_result[$i]["ou"]) = split ('%', $info);195 list ($contacts_result[$i]["mail"], $contacts_result[$i]["phone"], $contacts_result[$i]["mobile"], $contacts_result[$i]["uidnumber"], $contacts_result[$i]["jpegphoto"], $contacts_result[$i]["employeenumber"], $contacts_result[$i]["ou"]) = split ('%', $info); 196 196 $i++; 197 197 } … … 492 492 $extendedinfo=false; 493 493 494 list ($contacts_result["mail"], $contacts_result["phone"], $contacts_result["mobile"], $contacts_result["uid "], $contacts_result["jpegphoto"], $contacts_result["employeenumber"], $contacts_result["ou"]) = split ('%', $info);494 list ($contacts_result["mail"], $contacts_result["phone"], $contacts_result["mobile"], $contacts_result["uidNumber"], $contacts_result["jpegphoto"], $contacts_result["employeenumber"], $contacts_result["ou"]) = split ('%', $info); 495 495 496 496 if ($contacts_result['jpegphoto']) … … 514 514 } 515 515 $empNumber = $contacts_result["employeenumber"]; 516 $uidNumber = $contacts_result["uidNumber"]; 516 517 if($empNumber) { 517 518 $empNumber = "$empNumber - "; 518 } 519 } 520 else if($uidNumber){ 521 $uidNumber = "$uidNumber - "; 522 } 519 523 $ou = $contacts_result["ou"]; 520 524 if($ou) { … … 539 543 '</td>' . 540 544 '<td class="cc">' . 541 '<span name="cn">' . $empNumber. $contacts_result['cn'] . '</span>' . '<br>' .545 '<span name="cn">' . ($empNumber != "" ? $empNumber : $uidNumber) . $contacts_result['cn'] . '</span>' . '<br>' . 542 546 '<a title="'.$functions->getLang("Write message").'" onClick="javascript:QuickSearchUser.create_new_message(\''.$contacts_result["cn"].'\', \''.$contacts_result["mail"].'\')">' . 543 547 '<font color=blue>' .
Note: See TracChangeset
for help on using the changeset viewer.