Index: /branches/2.2/expressoMail1_2/inc/class.ldap_functions.inc.php
===================================================================
--- /branches/2.2/expressoMail1_2/inc/class.ldap_functions.inc.php (revision 4950)
+++ /branches/2.2/expressoMail1_2/inc/class.ldap_functions.inc.php (revision 4973)
@@ -331,25 +331,25 @@
$phoneUser = $contacts_result['phone'];
-
- if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['voip_enabled'] && $phoneUser) {
- $phoneUser = ''.$phoneUser.'';
- if($contacts_result['mobile']){
- $phoneUser .= ' / '.$contacts_result['mobile'].'';
- }
- }
- //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"];
- if($empNumber) {
- $empNumber = "$empNumber - ";
- }
- $ou = $contacts_result["ou"];
- if($ou) {
- $ou = "
$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 = ''.$phoneUser.'';
+ if($mobileUser)
+ $phoneUser .= ' / '.$mobileUser.'';
+ }
+
+ $empNumber = $contacts_result["employeenumber"];
+ if($empNumber) {
+ $empNumber = "$empNumber - ";
+ }
+ $ou = $contacts_result["ou"];
+ if($ou) {
+ $ou = "
$ou" ;
+ }
// Begin: nickname, firstname and lastname for QuickAdd.
Index: /branches/2.2/expressoMail1_2/js/InfoContact.js
===================================================================
--- /branches/2.2/expressoMail1_2/js/InfoContact.js (revision 3388)
+++ /branches/2.2/expressoMail1_2/js/InfoContact.js (revision 4973)
@@ -93,8 +93,10 @@
- if(preferences.voip_enabled && phoneUser) {
- phoneUser = ""+phoneUser+"";
+ if(preferences.voip_enabled) {
+ phoneUser = '';
+ if(data.telefone)
+ phoneUser = ""+ data.telefone+"";
if(data.mobile){
- phoneUser += " / "+data.mobile+"";
+ phoneUser += "
"+data.mobile+"";
}
}
@@ -104,12 +106,11 @@
"