Changeset 6139
- Timestamp:
- 05/08/12 16:43:09 (12 years ago)
- Location:
- trunk/expressoMail1_2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
r6057 r6139 519 519 520 520 $phoneUser = $contacts_result['phone']; 521 522 if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['voip_enabled'] && $phoneUser) { 523 $phoneUser = '<a title="'.$this->functions->getLang("Call to Comercial Number").'" href="#" onclick="InfoContact.connectVoip(\''.$phoneUser.'\',\'com\')">'.$phoneUser.'</a>'; 524 if($contacts_result['mobile']){ 525 $phoneUser .= ' / <a title="'.$this->functions->getLang("Call to Mobile Number").'" href="#" onclick="InfoContact.connectVoip(\''.$contacts_result['mobile'].'\',\'mob\')">'.$contacts_result['mobile'].'</a>'; 526 } 527 } 528 //verifica de existe o celular do funcionario ($contacts_result["mobile"]), se nao, $phoneUser fica vazia; 529 530 $mobileUser = $contacts_result["mobile"]; 531 if($mobileUser && !$voipMobile) { 532 $phoneUser .= " / $mobileUser"; 533 } 534 $empNumber = $contacts_result["employeenumber"]; 535 $uid = $contacts_result["uid"]; 536 if($empNumber) { 537 $empNumber = "$empNumber - "; 538 } 539 else if($uid){ 540 $uid = "$uid - "; 541 } 542 $ou = $contacts_result["ou"]; 543 if($ou) { 544 $ou = "<br/>$ou" ; 545 } 521 $mobileUser = $contacts_result["mobile"]; 522 if($mobileUser){ 523 $phoneUser .= " / $mobileUser"; 524 } 525 526 if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['voip_enabled']) { 527 $phoneUser = $contacts_result['phone']; 528 if($phoneUser) 529 $phoneUser = '<a title="'.$this->functions->getLang("Call to Comercial Number").'" href="#" onclick="InfoContact.connectVoip(\''.$phoneUser.'\',\'com\')">'.$phoneUser.'</a>'; 530 if($mobileUser) 531 $phoneUser .= ' / <a title="'.$this->functions->getLang("Call to Mobile Number").'" href="#" onclick="InfoContact.connectVoip(\''.$mobileUser.'\',\'mob\')">'.$mobileUser.'</a>'; 532 } 533 534 $empNumber = $contacts_result["employeenumber"]; 535 if($empNumber) { 536 $empNumber = "$empNumber - "; 537 } 538 $ou = $contacts_result["ou"]; 539 if($ou) { 540 $ou = "<br/>$ou" ; 541 } 546 542 547 543 // Begin: nickname, firstname and lastname for QuickAdd. … … 969 965 $justthese = array("cn","uid","telephoneNumber","jpegPhoto","mobile","ou","employeeNumber"); 970 966 else 971 $justthese = array("cn","uid","telephoneNumber","jpegPhoto" ,"mobile");967 $justthese = array("cn","uid","telephoneNumber","jpegPhoto"); 972 968 973 969 // Follow the referral -
trunk/expressoMail1_2/js/InfoContact.js
r5790 r6139 95 95 96 96 97 if(preferences.voip_enabled && phoneUser) { 98 phoneUser = "<a title=\""+get_lang("Call to Comercial Number")+"\" href=\"#\" onclick=\"InfoContact.connectVoip('"+phoneUser+"', 'com')\">"+phoneUser+"</a>"; 97 if(preferences.voip_enabled) { 98 phoneUser = ''; 99 if(data.telefone) 100 phoneUser = "<a title=\""+get_lang("Call to Comercial Number")+"\" href=\"#\" onclick=\"InfoContact.connectVoip('"+ data.telefone+"', 'com')\">"+ data.telefone+"</a>"; 99 101 if(data.mobile){ 100 phoneUser += " /<a title=\""+get_lang("Call to Mobile Number")+"\" href=\"#\" onclick=\"InfoContact.connectVoip('"+data.mobile+"', 'mob')\">"+data.mobile+"</a>";102 phoneUser += "<br> <a title=\""+get_lang("Call to Mobile Number")+"\" href=\"#\" onclick=\"InfoContact.connectVoip('"+data.mobile+"', 'mob')\">"+data.mobile+"</a>"; 101 103 } 102 104 } … … 106 108 "<td style='padding-top:4px' align='center' valign='center' colspan ='2'><img src='templates/"+template+"/images/"+(data.type)+"_catalog.png' /><font size=1 color=BLACK> <b>"+get_lang("Sender's Information")+"</b></font>"+_this.verifyIM(data.uid,data.email)+"</td></tr>"+ 107 109 108 "<tr><td align='center' width='70' height='93' style='padding-left:6px' align='center' valign='center'>"+110 "<tr><td align='center' style='width:70px;height:93px;padding-left:6px' align='center' valign='center'>"+ 109 111 "<img style='float:left' src='./inc/show_img.php?email="+data.email+"'></td>"+ 110 "<td style='padding-left:2px' align='left' valign='top'>"+112 "<td style='padding-left:2px' width='70%' align='left' valign='top'>"+ 111 113 "<br><img style='float:left'align='center' src='templates/"+template+"/images/phone.gif' /> <font size=1 color=BLACK>"+(phoneUser ? phoneUser : get_lang("None") )+"</font><br />"+ 112 "< font size=1 color=BLACK>"+employeeNumber+"<br/>"+cn+"</font>"+114 "<br><font size=1 color=BLACK>"+cn+"</font><br><b>"+employeeNumber+"</b>"+ 113 115 "<br/>"+ou+"</td></tr>"+ 114 115 "<tr><td style='padding-bottom:4px' align='center' valign='center' colspan ='2'><span title='"+get_lang("Write message")+"' style='cursor:pointer' onclick='InfoContact.sendMail(\""+cn+"\",\""+data.email+"\")'><font size=1 color=DARKBLUE><u>"+data.email+"</u></font></span>"+ 116 "<tr><td style='padding-bottom:4px' align='center' valign='center' colspan ='2' nowrap><span title='"+get_lang("Write message")+"' style='cursor:pointer' onclick='InfoContact.sendMail(\""+cn+"\",\""+data.email+"\")'><font size=1 color=DARKBLUE><u>"+data.email+"</u></font></span>"+ 116 117 "</td></tr></table>"; 117 118
Note: See TracChangeset
for help on using the changeset viewer.