Changeset 6139 for trunk/expressoMail1_2/inc/class.ldap_functions.inc.php

Timestamp:

05/08/12 16:43:09 (12 years ago)

Author:

niltonneto

Message:

Ticket #2230 - Correção da versão 2.2 replicada para o Trunk. Vide Ticket.

File:

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

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

@@ -519 +519 @@
 
                 $phoneUser = $contacts_result['phone'];
-
-                if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['voip_enabled'] && $phoneUser) {
-                        $phoneUser = '<a title="'.$this->functions->getLang("Call to Comercial Number").'" href="#" onclick="InfoContact.connectVoip(\''.$phoneUser.'\',\'com\')">'.$phoneUser.'</a>';
-                        if($contacts_result['mobile']){
-                                $phoneUser .= ' / <a title="'.$this->functions->getLang("Call to Mobile Number").'" href="#" onclick="InfoContact.connectVoip(\''.$contacts_result['mobile'].'\',\'mob\')">'.$contacts_result['mobile'].'</a>';
-                        }
-                }
-                //verifica de existe o celular do funcionario ($contacts_result["mobile"]), se nao, $phoneUser fica vazia;
-
-                    $mobileUser = $contacts_result["mobile"];
-                    if($mobileUser && !$voipMobile) {
-                            $phoneUser .= " / $mobileUser";
-                    }
-                    $empNumber = $contacts_result["employeenumber"];
-                        $uid = $contacts_result["uid"];
-                    if($empNumber) {
-                            $empNumber = "$empNumber - ";
-                    } 
-                        else if($uid){
-                                $uid = "$uid - ";
-                        }                       
-                    $ou = $contacts_result["ou"];
-                    if($ou) {
-                            $ou = "<br/>$ou" ;
-                    }
+                $mobileUser = $contacts_result["mobile"];
+                if($mobileUser){
+                        $phoneUser .= " / $mobileUser";
+                }
+                
+                if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['voip_enabled']) {
+                        $phoneUser = $contacts_result['phone'];
+                        if($phoneUser)
+                                $phoneUser = '<a title="'.$this->functions->getLang("Call to Comercial Number").'" href="#" onclick="InfoContact.connectVoip(\''.$phoneUser.'\',\'com\')">'.$phoneUser.'</a>';
+                        if($mobileUser)
+                                $phoneUser .= ' / <a title="'.$this->functions->getLang("Call to Mobile Number").'" href="#" onclick="InfoContact.connectVoip(\''.$mobileUser.'\',\'mob\')">'.$mobileUser.'</a>';
+                }
+
+                $empNumber = $contacts_result["employeenumber"];
+                if($empNumber) {
+                        $empNumber = "$empNumber - ";
+                }
+                $ou = $contacts_result["ou"];
+                if($ou) {
+                        $ou = "<br/>$ou" ;
+                }
 
                 // Begin: nickname, firstname and lastname for QuickAdd.
@@ -969 +965 @@
                     $justthese = array("cn","uid","telephoneNumber","jpegPhoto","mobile","ou","employeeNumber");
                 else
-                    $justthese = array("cn","uid","telephoneNumber","jpegPhoto","mobile");
+                    $justthese = array("cn","uid","telephoneNumber","jpegPhoto");
 
                 // Follow the referral