Changeset 3722 for branches/2.2/expressoMail1_2/js/search.js

Timestamp:

01/26/11 11:10:08 (13 years ago)

Author:

eduardoalex

Message:

Ticket #1392 - Corrigindo a busca por mensagens com ## e -- no assunto

File:

• branches/2.2/expressoMail1_2/js/search.js (modified) (2 diffs)

branches/2.2/expressoMail1_2/js/search.js

@@ -427 +427 @@
                         var tr = document.createElement("TR");
                                 tr.style.height = preferences.line_height;
-
-                        if (false && nw_array[i].match(/.*--.*--\w*--\d{2}\/\d{2}\/\d{4}--\d+? \w*b--.*--\d*$/g) != null) //subject with "--"
-                        {
-                                var aux1 = nw_array[i].match(/\d{2}\/\d{2}\/\d{4}--\d+? \w*b--.*--\d*$/g);
-                                        aux1 = aux1[0].split("--");
-                                nw_array[i] = nw_array[i].substr(0, nw_array[i].indexOf(aux1[0])-2);
-                                
-                                var aux         = [];
-                                
-                                aux[0]  = nw_array[i].substr(0, nw_array[i].indexOf('--'));
-                                nw_array[i] = nw_array[i].substr(nw_array[i].indexOf('--')+2);
-                                aux[3] = nw_array[i].substr(0, nw_array[i].indexOf('--'));
-                                nw_array[i] = nw_array[i].substr(nw_array[i].indexOf('--')+2);
-                                aux[1] = nw_array[i].substr(0, nw_array[i].indexOf('--'));
-                                aux[2] = nw_array[i].substr(nw_array[i].indexOf('--')+2);
-                                aux = aux.concat(aux1);
-                        }
-                        else
-                        {
-                                var aux = nw_array[i].split("--");
-                                aux.splice(4,0,aux[1]);
-                                var mailbox = aux.shift();
-                                aux.splice(0,1,mailbox);
-                        }
-
+                        nw_array[i] = url_decode(unescape(nw_array[i]));
+                        
+                        var aux1;
+                        aux1 = nw_array[i].match(/\d{2}\/\d{2}\/\d{4}--\d+? \w*b--.*--\d*$/g);
+                        /*
+                         * E-mails do dia estão vindo com o horário em mensagens locais. 
+                         * Caso isso seja "corrigido" essa condicional não será mais necessária
+                         */
+                        if(aux1==null) 
+                                aux1 = nw_array[i].match(/\d{2}:\d{2}--\d+? \w*b--.*--\d*$/g);
+                        aux1 = aux1[0].split("--");
+                        nw_array[i] = nw_array[i].substr(0, nw_array[i].indexOf(aux1[0])-2);
+                        
+                        var aux         = [];
+                        var mailbox = "";
+                        aux[0] = mailbox = nw_array[i].substr(0, nw_array[i].indexOf('--'));
+                        nw_array[i] = nw_array[i].substr(nw_array[i].indexOf('--')+2);
+                        aux[3] = nw_array[i].substr(0, nw_array[i].indexOf('--'));
+                        nw_array[i] = nw_array[i].substr(nw_array[i].indexOf('--')+2);
+                        aux[1] = nw_array[i].substr(0, nw_array[i].indexOf('--'));
+                        aux[2] = nw_array[i].substr(nw_array[i].indexOf('--')+2);
+                        aux = aux.concat(aux1);
+
+                        
                         var mailbox_name = aux[0];
                         var mailbox_id = aux[3];
@@ -529 +528 @@
                                         {
                                                 var td1 = this.aux_local_folder_display(td1);
-                                                aux[2] = tr.name = aux[0]; // precisa trocar pelo nome real no banco do gears.
+                                                tr.name = aux[0]; // precisa trocar pelo nome real no banco do gears.
                                         }
                                         else