Changeset 1806

Timestamp:

12/10/09 15:59:39 (14 years ago)

Author:

rafaelraymundo

Message:

Ticket #811 - Correcao de get_local_range_msgs() em local_messages.js (parametros e sql).

File:

• trunk/expressoMail1_2/js/local_messages.js (modified) (3 diffs)

trunk/expressoMail1_2/js/local_messages.js

@@ -392 +392 @@
         }
 
-        local_messages.prototype.get_local_range_msgs = function(folder,msg_range_begin,emails_per_page,sort,sort_reverse,search) { 
+        local_messages.prototype.strip_tags = function (str) {
+                return str.replace(/<\/?[^>]+>/gi, '');
+        }
+
+        local_messages.prototype.get_local_range_msgs = function(folder,msg_range_begin,emails_per_page,sort,sort_reverse,search,preview_msg_subject,preview_msg_tip) {
+
                 this.init_local_messages();
                 var retorno = new Array();
@@ -410 +415 @@
                         filter = "and header like '%\"Answered\";s:1:\"A%' ";
                 }
-                sql = 'select rowid,header,size,timestamp,unseen from (';
-                sql += 'select mail.rowid as rowid,mail.header as header,mail.size as size,mail.timestamp as timestamp,mail.unseen as unseen,ltrim(ltrim(substr(UPPER(ffrom),21,length(ffrom)),\':\'),\'"\') as order_from,mail.subject from mail inner join folder on mail.id_folder=folder.rowid where mail.uid_usuario=? and folder.folder=? and lower(mail.ffrom) not like lower(?) ';
+                sql = 'select rowid,header,size,timestamp,unseen,body from (';
+                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,ltrim(ltrim(substr(UPPER(ffrom),21,length(ffrom)),\':\'),\'"\') as order_from,mail.subject from mail inner join folder on mail.id_folder=folder.rowid where mail.uid_usuario=? and folder.folder=? and lower(mail.ffrom) not like lower(?) ';
                 sql += filter;
                 sql += 'union ';
-                sql += 'select mail.rowid as rowid,mail.header as header,mail.size as size,mail.timestamp as timestamp,mail.unseen as unseen,ltrim(ltrim(substr(UPPER(fto),7,length(fto)),\':\'),\'"\') as order_from,mail.subject from mail inner join folder on mail.id_folder=folder.rowid where mail.uid_usuario=? and folder.folder=? and lower(mail.ffrom) like lower(?) ';
+                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,ltrim(ltrim(substr(UPPER(fto),7,length(fto)),\':\'),\'"\') as order_from,mail.subject from mail inner join folder on mail.id_folder=folder.rowid where mail.uid_usuario=? and folder.folder=? and lower(mail.ffrom) like lower(?) ';
                 sql += filter;
                 sql += ') order by '
@@ -472 +477 @@
                         else
                         {
-                                retorno[cont]['msg_sample']['body'] = " - " + msg_body.substr(3,300);
+                                retorno[cont]['msg_sample']['body'] = " - " + msg_body.substr(2,300);
                         }