Changeset 3512

Timestamp:

11/17/10 13:17:16 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1322 - Data incorreta nas mensagens na caixa de entrada (local antigas).

Location:

branches/2.2/expressoMail1_2/js

Files:

• draw_api.js (modified) (2 diffs)
• local_messages.js (modified) (4 diffs)

branches/2.2/expressoMail1_2/js/draw_api.js

@@ -840 +840 @@
                 if (typeof offsetToGMT == 'undefined')
                 {
-                    offsetToGMT = headers_msgs.offsetToGMT;
+                    // In older local messages headers_msgs.offsetToGMT is undefined.
+                    offsetToGMT = typeof headers_msgs.offsetToGMT != 'undefined'?headers_msgs.offsetToGMT:0;
                 }
                 var tr_element = document.createElement('tr');
@@ -1060 +1061 @@
                 today.setMinutes(0);
 
-                 // Using offset between user defined timezone and GMT
-                 // Date object converts time to local timezone, so we have to adjust it
-                var udate_local = headers_msgs.udate*1000 + offsetToGMT*1000 + today.getTimezoneOffset()*60*1000;
-                var date_msg = new Date(udate_local);
+                var udate_local = null;
+                var date_msg = null;
+
+                // old local messages can capture headers_msgs.udate as "hh:mm" or "dd/mm/yyyy"
+                if (headers_msgs.udate.toString().match(/\d{2}:\d{2}/) || headers_msgs.udate.toString().match(/\d{2}\/\d{2}\/\d{4}/))
+                {
+                    temp_msg_day = headers_msgs.msg_day.split('/');
+                    temp_msg_hour = headers_msgs.msg_hour.split(':');
+                    date_msg = new Date(temp_msg_day[2], temp_msg_day[1]-1, temp_msg_day[0], temp_msg_hour[0], temp_msg_hour[1]);
+                }
+                else
+                    {
+                        // The new date implementation
+                        // Using offset between user defined timezone and GMT
+                        // Date object converts time to local timezone, so we have to adjust it
+                        udate_local = headers_msgs.udate*1000 + offsetToGMT*1000 + today.getTimezoneOffset()*60*1000;
+                        date_msg = new Date(udate_local);
+                    }
 
                 if (today.getTime() - date_msg.getTime() < 86400000)

branches/2.2/expressoMail1_2/js/local_messages.js

@@ -459 +459 @@
                 
         sql = 'select mail.rowid as rowid,mail.header as header,mail.size as size,' +
-    'mail.timestamp as timestamp,mail.unseen as unseen,mail.body as body,' +
+    'mail.timestamp as timestamp,mail.unseen as unseen,mail.body as body, mail.mail as mail, ' +
     'case when lower(mail.ffrom) like ? then ' +
     'case when ltrim(ltrim(substr(UPPER(fto),7,length(fto)),\':\'),\'"\') like \'5:%\' then ' +
@@ -501 +501 @@
         var head = rs.field(1);
         var codigoMail = rs.field(0);
+        var mail = rs.field(6);
 
         var msg_body = rs.field(5);//recebe o conteudo da coluna "body" do banco de dados;
@@ -506 +507 @@
         var rs2 = this.dbGears.execute('select count(*) from anexo where id_mail = '+codigoMail);
         var head_unserialized = connector.unserialize(head);
-        head_unserialized.Size = rs.field(2);
+        var mail_unserialized = connector.unserialize(mail);
+
+      head_unserialized.Size = rs.field(2);
         if(rs.field(4)==1)
             head_unserialized.Unseen = 'U';
@@ -516 +519 @@
         retorno[cont] = head_unserialized;
         retorno[cont]['msg_number'] = codigoMail;
-                        
+        retorno[cont]['msg_day'] = mail_unserialized.msg_day;
+        retorno[cont]['msg_hour'] = mail_unserialized.msg_hour;
         //declaracao do array() para receber o body de cada mensagem encontrada na busca sql realizada;