- Timestamp:
- 12/13/11 10:47:28 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
r5243 r5245 113 113 $ldapService->connection = $this->ds; 114 114 if($extendedinfo) 115 $justthese = array("cn", "mail", "telephonenumber","uidNumber", "mobile", "phpgwaccountvisible", "employeenumber", "ou");115 $justthese = array("cn", "mail", "telephonenumber", "uid","uidNumber", "mobile", "phpgwaccountvisible", "employeenumber", "ou"); 116 116 else 117 $justthese = array("cn", "mail", "telephoneNumber", "phpgwAccountVisible", "uid ");117 $justthese = array("cn", "mail", "telephoneNumber", "phpgwAccountVisible", "uidNumber","uid"); 118 118 $types = false; 119 119 … … 144 144 $catalogsNum=count($this->external_srcs); 145 145 for ($i=0; $i<=$catalogsNum; $i++) { 146 if ($this->external_srcs[$i]["quicksearch"]) { 146 if ($this->external_srcs[$i]["quicksearch"]) { 147 147 $this->ldapConnect(true,$i); 148 148 $filter="(|(cn=*$search_for*)(mail=*$search_for*))"; 149 149 if($extendedinfo) 150 $justthese = array("cn", "mail", "telephonenumber", "uid Number", "mobile", "phpgwaccountvisible", "employeenumber", "ou");150 $justthese = array("cn", "mail", "telephonenumber", "uid","uidNumber", "mobile", "phpgwaccountvisible", "employeenumber", "ou"); 151 151 else 152 $justthese = array("cn", "mail", "telephoneNumber", "phpgwAccountVisible", "uid");152 $justthese = array("cn", "mail", "telephoneNumber", "phpgwAccountVisible","uidNumber", "uid"); 153 153 $sr=@ldap_search($this->ds, $this->ldap_context, $filter, $justthese, 0, $this->max_result+1); 154 154 if(!$sr) … … 169 169 for ($i=0; $i<$info["count"]; $i++) 170 170 { 171 $key = $info[$i]["mail"][0] . '%' . $info[$i]["telephonenumber"][0] . '%'. $info[$i]["mobile"][0] . '%' . $info[$i]["uid number"][0] . '%' . $info[$i]["jpegphoto"]['count'] . '%' . $info[$i]["employeenumber"][0] . '%' . $info[$i]["ou"][0];171 $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]; 172 172 173 173 if (/*(!$quickSearch_only_in_userSector) &&*/ preg_match("/$user_sector_dn/i", $info[$i]['dn'])) … … 194 194 $contacts_result[$i] = array(); 195 195 $contacts_result[$i]["cn"] = $cn; 196 list ($contacts_result[$i]["mail"], $contacts_result[$i]["phone"], $contacts_result[$i]["mobile"], $contacts_result[$i]["uid number"], $contacts_result[$i]["jpegphoto"], $contacts_result[$i]["employeenumber"], $contacts_result[$i]["ou"]) = split ('%', $info);196 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); 197 197 $i++; 198 198 } … … 493 493 $extendedinfo=false; 494 494 495 list ($contacts_result["mail"], $contacts_result["phone"], $contacts_result["mobile"], $contacts_result["uid Number"], $contacts_result["jpegphoto"], $contacts_result["employeenumber"], $contacts_result["ou"]) = split ('%', $info);495 list ($contacts_result["mail"], $contacts_result["phone"], $contacts_result["mobile"], $contacts_result["uid"], $contacts_result["jpegphoto"], $contacts_result["employeenumber"], $contacts_result["ou"]) = split ('%', $info); 496 496 497 497 if ($contacts_result['jpegphoto']) … … 515 515 } 516 516 $empNumber = $contacts_result["employeenumber"]; 517 $uid Number = $contacts_result["uidNumber"];517 $uid = $contacts_result["uid"]; 518 518 if($empNumber) { 519 519 $empNumber = "$empNumber - "; 520 520 } 521 else if($uid Number){522 $uid Number = "$uidNumber- ";521 else if($uid){ 522 $uid = "$uid - "; 523 523 } 524 524 $ou = $contacts_result["ou"]; … … 544 544 '</td>' . 545 545 '<td class="cc">' . 546 '<span name="cn">' . ($empNumber != "" ? $empNumber : $uid Number) . $contacts_result['cn'] . '</span>' . '<br>' .546 '<span name="cn">' . ($empNumber != "" ? $empNumber : $uid) . $contacts_result['cn'] . '</span>' . '<br>' . 547 547 '<a title="'.$functions->getLang("Write message").'" onClick="javascript:QuickSearchUser.create_new_message(\''.$contacts_result["cn"].'\', \''.$contacts_result["mail"].'\')">' . 548 548 '<font color=blue>' .
Note: See TracChangeset
for help on using the changeset viewer.