Index: /sandbox/2.4.1-3/expressoMail1_2/inc/class.ldap_functions.inc.php
===================================================================
--- /sandbox/2.4.1-3/expressoMail1_2/inc/class.ldap_functions.inc.php (revision 6139)
+++ /sandbox/2.4.1-3/expressoMail1_2/inc/class.ldap_functions.inc.php (revision 6409)
@@ -553,5 +553,5 @@
'
' .
'' .
- '' .
+ '' .
$photo_link .
'' .
@@ -559,5 +559,5 @@
' | ' .
'' . ($empNumber != "" ? $empNumber : $uid) . $contacts_result['cn'] . '' . ' ' .
- '' .
+ '' .
'' .
'' . $contacts_result['mail'] . ''.
Index: /sandbox/2.4.1-3/expressoMail1_2/js/QuickSearchUser.js
===================================================================
--- /sandbox/2.4.1-3/expressoMail1_2/js/QuickSearchUser.js (revision 6405)
+++ /sandbox/2.4.1-3/expressoMail1_2/js/QuickSearchUser.js (revision 6409)
@@ -53,16 +53,17 @@
}
- emQuickSearchUser.prototype.create_new_message = function (cn, mail)
+ emQuickSearchUser.prototype.create_new_message = function (cn, mail, uid)
{
QuickSearchUser.closeWindow();
+ var ldap_id = preferences.expressoMail_ldap_identifier_recipient;
- if (openTab.type[currentTab] != 4)
- {
+ if (openTab.type[currentTab] != 4){
new_message("new","null");
- draw_email_box("\""+cn+"\" <"+mail+">", $("#content_id_"+currentTab).find(".to").filter("input"));
}
- else
- {
- draw_email_box("\""+cn+"\" <"+mail+">", $("#content_id_"+currentTab).find(".to").filter("input"));
+
+ if(ldap_id){
+ draw_email_box(uid, $("#content_id_"+currentTab).find(".to").filter("input"));
+ }else{
+ draw_email_box("\""+cn+"\" <"+mail+">", $("#content_id_"+currentTab).find(".to").filter("input"));
}
}
|