Changeset 5158 for trunk/expressoMail1_2/js/draw_api.js

Timestamp:

11/08/11 15:30:53 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus. Ultimas sincronizacoes

File:

• trunk/expressoMail1_2/js/draw_api.js (modified) (3 diffs)

trunk/expressoMail1_2/js/draw_api.js

@@ -1366 +1366 @@
                     test = false;
 
-                if( (headers_msgs.from != undefined) && headers_msgs.from.email.toLowerCase() == Element("user_email").value.toLowerCase() && !(preferences.from_to_sent == "1" && test) && !(msg_folder.substr(0,5) == "user/"))
+                if( (headers_msgs.from != undefined) && headers_msgs.from.email.toLowerCase() == Element("user_email").value.toLowerCase() && (preferences.from_to_sent == "1") && !(msg_folder.substr(0,5) == "user/"))
                 {
                         td_element3.onmouseover = function () {this.title=headers_msgs.to.email;};
@@ -1395 +1395 @@
                                 spanSender.onmouseover = function (event) {this.style.textDecoration = "underline";try {InfoContact.begin(this,headers_msgs.from.email)} catch(e){};};
                                 spanSender.onmouseout = function (){try {this.style.textDecoration = "none";clearTimeout(InfoContact.timeout);} catch(e){}};
-                                if ( headers_msgs.from !== undefined )
+                                folder = special_folders['Sent'];
+                                current = get_current_folder();
+                                if ((preferences.from_to_sent == "1") && (current.substr(current.length - folder.length, folder.length) == folder)){
+                                        if (headers_msgs.to) {
+                                                if (headers_msgs.to.name != null){
+                                                        spanSender.innerHTML += headers_msgs.to.name;
+                                                }else if(headers_msgs.to.email != null) {
+                                                        spanSender.innerHTML += headers_msgs.to.email;
+                                                }
+                                        }
+                                }else if(headers_msgs.from !== undefined){
                                 spanSender.innerHTML =  headers_msgs.from.name != null ? headers_msgs.from.name : headers_msgs.from.email;
+                                }
                                 if (spanSender.innerHTML.indexOf(" ") == '-1' && spanSender.innerHTML.length > 25){
                                         spanSender.innerHTML = spanSender.innerHTML.substring(0,25) + "...";
@@ -1550 +1561 @@
                         break;
         }
+        folder = special_folders['Sent'];
+        current = get_current_folder();
+        if ((preferences.from_to_sent == "1") && (current.substr(current.length - folder.length, folder.length) == folder)) {
+        document.getElementById("message_header_SORTFROM_"+numBox).innerHTML    = get_lang("To");
+    }else{
         document.getElementById("message_header_SORTFROM_"+numBox).innerHTML    = get_lang("From");
+    }
         document.getElementById("message_header_SORTSUBJECT_"+numBox).innerHTML = get_lang("Subject");
         document.getElementById("message_header_SORTARRIVAL_"+numBox).innerHTML = get_lang("Date");