Changeset 1970

Timestamp:

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

Author:

eduardoalex

Message:

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

Location:

branches/2.1/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (2 diffs)
• js/draw_api.js (modified) (2 diffs)
• js/globals.js (modified) (1 diff)
• js/local_messages.js (modified) (5 diffs)
• js/main.js (modified) (2 diffs)
• js/search.js (modified) (2 diffs)

branches/2.1/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -450 +450 @@
                 $return = array();
                 $msg_number = $params['msg_number'];
+                if(preg_match('(.+)(_[a-zA-Z0-9]+)',$msg_number,$matches)) { //Verifies if it comes from a tab diferent of the main one. 
+                        $msg_number = $matches[1]; 
+                        $plus_id = $matches[2]; 
+                } 
+                else { 
+                        $plus_id = ''; 
+                }
                 $msg_folder = urldecode($params['msg_folder']);
 
@@ -506 +513 @@
                 }
 
-                $return['msg_number'] = $msg_number;
+                $return['msg_number'] = $msg_number.$plus_id;
                 $return['msg_folder'] = $msg_folder;
 

branches/2.1/expressoMail1_2/js/draw_api.js

@@ -1124 +1124 @@
                 currentTab = ID;
                 openTab.type[ID] = 2;
-                            proxy_mensagens.get_msg(parseInt(folder.nextSibling.id),nextMsgBox,true,show_msg);
+                            proxy_mensagens.get_msg(folder.nextSibling.id,nextMsgBox,true,show_msg);
                 //cExecute("$this.imap_functions.get_info_msg&msg_number="+folder.nextSibling.id+"&msg_folder="+nextMsgBox, show_msg);
             };
@@ -1180 +1180 @@
                 openTab.type[ID] = 2;
                 //cExecute("$this.imap_functions.get_info_msg&msg_number="+folder.previousSibling.id+"&msg_folder=" + previousMsgBox, show_msg);
-                            proxy_mensagens.get_msg(parseInt(folder.previousSibling.id),previousMsgBox,true,show_msg);
+                            proxy_mensagens.get_msg(folder.previousSibling.id,previousMsgBox,true,show_msg);
             };
         }

branches/2.1/expressoMail1_2/js/globals.js

@@ -20 +20 @@
 var tree_folders = '';
 var folders = new Array();
+var global_search = 1;
 var title_app_menu = '<table height="16px" align=center border=0 width=100% cellspacing=0 cellpadding=2>'+
         '<tr><td align=left height=16px width="1%" nowrap class="table_top">&nbsp;'+

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));

branches/2.1/expressoMail1_2/js/main.js

@@ -595 +595 @@
                                 }
                                 trfolder = (tr.getAttribute('name') == null?get_current_folder():tr.getAttribute('name'));
-                                selected_param += ','+trfolder+';'+tr.id;
+                                selected_param += ','+trfolder+';'+tr.id.replace(/_[a-zA-Z0-9]+/,"");
                         }
                 }
@@ -607 +607 @@
                         }
                         trfolder = (tr.getAttribute('name') == null?get_current_folder():tr.getAttribute('name'));
-                        selected_param=trfolder+';'+tr.id;
+                        selected_param=trfolder+';'+tr.id.replace(/_[a-zA-Z0-9]+/,"");
                 }
                 var params = "";

branches/2.1/expressoMail1_2/js/search.js

@@ -410 +410 @@
                         var uid_msg = aux[6];
                         var subject = aux[2];
-                        tr.id = uid_msg;
+                        tr.id = uid_msg+"_s"+global_search;
 
                         // Keep the two lines together please
@@ -545 +545 @@
                 tbody.appendChild(tr);
                 }
+                global_search++; //Tabs from search must not have the same id on its tr's 
                 table.appendChild(tbody);