Changeset 5245

Timestamp:

12/13/11 10:47:28 (12 years ago)

Author:

cristiano

Message:

Ticket #2331 - Troca da informação UidNumber? para Uid

File:

• trunk/expressoMail1_2/inc/class.ldap_functions.inc.php (modified) (7 diffs)

trunk/expressoMail1_2/inc/class.ldap_functions.inc.php

@@ -113 +113 @@
                     $ldapService->connection = $this->ds;
                                 if($extendedinfo)
-                        $justthese = array("cn", "mail", "telephonenumber", "uidNumber", "mobile", "phpgwaccountvisible", "employeenumber", "ou");
+                                        $justthese = array("cn", "mail", "telephonenumber", "uid","uidNumber", "mobile", "phpgwaccountvisible", "employeenumber", "ou");
                                 else 
-                                        $justthese = array("cn", "mail", "telephoneNumber", "phpgwAccountVisible", "uid");
+                                        $justthese = array("cn", "mail", "telephoneNumber", "phpgwAccountVisible", "uidNumber","uid");
                 $types = false;
 
@@ -144 +144 @@
                                 $catalogsNum=count($this->external_srcs);
                 for ($i=0; $i<=$catalogsNum; $i++)      {
-                                        if ($this->external_srcs[$i]["quicksearch"]) {
+                                        if ($this->external_srcs[$i]["quicksearch"]) { 
                                                 $this->ldapConnect(true,$i);
                                                 $filter="(|(cn=*$search_for*)(mail=*$search_for*))";
                                                 if($extendedinfo)
-                                        $justthese = array("cn", "mail", "telephonenumber", "uidNumber", "mobile", "phpgwaccountvisible", "employeenumber", "ou");
+                                        $justthese = array("cn", "mail", "telephonenumber", "uid","uidNumber", "mobile", "phpgwaccountvisible", "employeenumber", "ou");
                                                 else 
-                                                        $justthese = array("cn", "mail", "telephoneNumber", "phpgwAccountVisible", "uid");
+                                                        $justthese = array("cn", "mail", "telephoneNumber", "phpgwAccountVisible","uidNumber", "uid");
                                                 $sr=@ldap_search($this->ds, $this->ldap_context, $filter, $justthese, 0, $this->max_result+1);
                                                 if(!$sr)
@@ -169 +169 @@
                         for ($i=0; $i<$info["count"]; $i++)
                         {
-                $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];
+                $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];
 
                 if (/*(!$quickSearch_only_in_userSector) &&*/ preg_match("/$user_sector_dn/i", $info[$i]['dn']))
@@ -194 +194 @@
                                         $contacts_result[$i] = array();
                                         $contacts_result[$i]["cn"] = $cn;
-                                        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);
+                                        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);
                                         $i++;
                                 }
@@ -493 +493 @@
                     $extendedinfo=false;
 
-                list ($contacts_result["mail"], $contacts_result["phone"], $contacts_result["mobile"], $contacts_result["uidNumber"], $contacts_result["jpegphoto"], $contacts_result["employeenumber"], $contacts_result["ou"]) = split ('%', $info);
+                list ($contacts_result["mail"], $contacts_result["phone"], $contacts_result["mobile"], $contacts_result["uid"], $contacts_result["jpegphoto"], $contacts_result["employeenumber"], $contacts_result["ou"]) = split ('%', $info);
 
                 if ($contacts_result['jpegphoto'])
@@ -515 +515 @@
                     }
                     $empNumber = $contacts_result["employeenumber"];
-                        $uidNumber = $contacts_result["uidNumber"];
+                        $uid = $contacts_result["uid"];
                     if($empNumber) {
                             $empNumber = "$empNumber - ";
                     } 
-                        else if($uidNumber){
-                                $uidNumber = "$uidNumber - ";
+                        else if($uid){
+                                $uid = "$uid - ";
                         }                       
                     $ou = $contacts_result["ou"];
@@ -544 +544 @@
                                 '</td>' .
                                 '<td class="cc">' .
-                                        '<span name="cn">' . ($empNumber != "" ? $empNumber : $uidNumber) . $contacts_result['cn'] . '</span>' . '<br>' .
+                                        '<span name="cn">' . ($empNumber != "" ? $empNumber : $uid) . $contacts_result['cn'] . '</span>' . '<br>' .
                                         '<a title="'.$functions->getLang("Write message").'" onClick="javascript:QuickSearchUser.create_new_message(\''.$contacts_result["cn"].'\', \''.$contacts_result["mail"].'\')">' .
                                                 '<font color=blue>' .