Changeset 1970 for branches/2.1/expressoMail1_2/js/local_messages.js

Timestamp:

02/03/10 18:48:58 (15 years ago)

Author:

eduardoalex

Message:

Ticket #785 - Replicando no branch a correcao feita no trunk

File:

• branches/2.1/expressoMail1_2/js/local_messages.js (modified) (5 diffs)

branches/2.1/expressoMail1_2/js/local_messages.js

@@ -310 +310 @@
 
         }
+        /**
+         * check if ID is no from main tab, if it's from main returns false, else 
+         * returns an array with all string in position 0, the mail id in position 1 
+         * and the part of string relative to tab in position 2
+         * @param {Object} id_mail
+         */
+        local_messages.prototype.parse_id_mail = function(id_mail) { 
+                if (this.isInt(id_mail))
+                        return false;
+                
+                var matches = id_mail.match(/(.+)(_[a-zA-Z0-9]+)/);
+                return matches;
+        }
+        
+        local_messages.prototype.isInt = function(x) {
+                var y=parseInt(x);
+                if (isNaN(y)) return false;
+                return x==y && x.toString()==y.toString();
+        }
         
         local_messages.prototype.get_local_mail = function(id_mail) {
                 this.init_local_messages();
+
+                var plus_id = '';
+                var matches = '';
+                if(matches = this.parse_id_mail(id_mail)) { //Mails coming from other tab.
+                        id_mail = matches[1];
+                        plus_id = matches[2];
+                }
+                
                 var rs = this.dbGears.execute("select mail.rowid,mail.mail,mail.ffrom,mail.subject,mail.body,mail.fto,mail.cc,folder.folder,mail.original_id from mail inner join folder on mail.id_folder=folder.rowid  where mail.rowid="+id_mail);
                 var retorno = null;
@@ -324 +351 @@
         if (typeof(retorno.source) == 'string')
         {
-            retorno.msg_number=rs.field(0);
+            retorno.msg_number=rs.field(0)+plus_id;
             retorno.original_ID=rs.field(8);
             retorno.msg_folder=rs.field(7);
@@ -367 +394 @@
             retorno['local_message'] = true;
             retorno['msg_folder'] = "local_"+rs.field(7); //Now it's a local folder
-            retorno['msg_number'] = rs.field(0); //the message number is the rowid
+            retorno['msg_number'] = rs.field(0)+plus_id; //the message number is the rowid
 
         }
@@ -490 +517 @@
         local_messages.prototype.get_url_anexo = function(msg_number,pid) {
                 this.init_local_messages();
-
+                var matches = '';
+                if(matches = this.parse_id_mail(msg_number)) {
+                        msg_number = matches[1];
+                }
+                
                 var retorno;
                 var rs = this.dbGears.execute("select url from anexo where id_mail="+msg_number+" and pid = '"+pid+"'");
@@ -574 +605 @@
                 for (var i in msgs_to_set) {
                 
+                        var matches = '';//Messages comming from other tabs.
+                        if(matches = this.parse_id_mail(msgs_to_set[i])) { 
+                                msgs_to_set[i] = matches[1];
+                        }
+                                        
                         var rs = this.dbGears.execute("select header,unseen from mail where rowid=" + msgs_to_set[i]);
                         header = connector.unserialize(rs.field(0));