Changeset 3111

Timestamp:

08/02/10 09:56:24 (14 years ago)

Author:

amuller

Message:

Ticket #974 - Arrumando problema da data ao visualizar email

Location:

trunk/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (1 diff)
• js/base/common_functions.js (modified) (1 diff)
• js/base/draw_api_folders.js (modified) (1 diff)
• js/jscode/draw_messages.js (modified) (1 diff)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -1573 +1573 @@
                         $return[$i]['Flagged']          = $header->Flagged;
 
-                        $date_msg = gmdate("d/m/Y",$header->udate);
-                        if (gmdate("d/m/Y") == $date_msg)
-                                $return[$i]['udate'] = gmdate("H:i",$header->udate);
-                        else
-                                $return[$i]['udate'] = $date_msg;
+                        $return[$i]['udate'] = $header->udate;
 
                         $from = $header->from;

trunk/expressoMail1_2/js/base/common_functions.js

@@ -369 +369 @@
         forward_body += body;
         return forward_body;
+}
+
+function norm(arg) {return (arg < 10 ? '0'+arg : arg);}
+
+function strDateShow(timestamp){
+        var retStr = '';
+        var weekDays = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'];
+        var date_msg = new Date(timestamp*1000);
+        var today = new Date();
+        today.setHours = 0;
+        today.setMinutes = 0;
+
+        if (today.getTime() - date_msg.getTime() < 86400000)
+                retStr = norm(date_msg.getHours()) + ':' + norm(date_msg.getMinutes());
+        else
+                if (today.getTime() - date_msg.getTime() < 172800000)
+                        retStr = get_lang('Yesterday');
+                else
+                        if (today.getTime() - date_msg.getTime() < 259200000)
+                                retStr = get_lang(weekDays[date_msg.getDay()]);
+                        else
+                                retStr = norm(date_msg.getDate()) + '/' + norm(date_msg.getMonth()+1) + '/' +date_msg.getFullYear();
+        return retStr;
 }
 

trunk/expressoMail1_2/js/base/draw_api_folders.js

@@ -1109 +1109 @@
         td_element5.onclick = _onclick;
         td_element5.setAttribute("align", "center");
-        var norm = function (arg) {return (arg < 10 ? '0'+arg : arg);};
-        var weekDays = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'];
         var date_msg = new Date(headers_msgs.udate*1000);
-        var today = new Date();
-        if (today.getTime() - date_msg.getTime() < 86400000)
-                td_element5.innerHTML = norm(date_msg.getHours()) + ':' + norm(date_msg.getMinutes());
-        else
-                if (today.getTime() - date_msg.getTime() < 172800000)
-                        td_element5.innerHTML = get_lang('Yesterday');
-                else
-                        if (today.getTime() - date_msg.getTime() < 259200000)
-                                td_element5.innerHTML = get_lang(weekDays[date_msg.getDay()]);
-                        else
-                                td_element5.innerHTML = norm(date_msg.getDate()) + '/' + norm(date_msg.getMonth()+1) + '/' +date_msg.getFullYear();
+        td_element5.innerHTML = strDateShow(headers_msgs.udate);
         td_element5.title = norm(date_msg.getDate()) + '/' + norm(date_msg.getMonth()+1) + '/' +date_msg.getFullYear();
         td_element5.alt = td_element5.title;

trunk/expressoMail1_2/js/jscode/draw_messages.js

@@ -337 +337 @@
                 _name = info_msg.from.email.length > _maxChar ? info_msg.from.email.substring(0,_maxChar) + "..." : info_msg.from.email;
         var id = this.id;
-        td.innerHTML = _name.bold() + ', ' + info_msg.udate;
+        td.innerHTML = _name.bold() + ', ' +strDateShow(info_msg.udate)+' ';
         if (info_msg.attachment.names.length > 0)
                 td.innerHTML += "&nbsp<img style='cursor:pointer' onclick='javascript:Element(\"option_hide_more_"+id+"\").onclick()' src ='" + URL_SERVER + "expressoMail1_2/templates/"+template+"/images/clip.png' title='"+info_msg.attachment.names+"'>";