Changeset 7948 for trunk/expressoMail1_2

Timestamp:

03/04/13 12:06:01 (11 years ago)

Author:

marcosw

Message:

Ticket #3349 - Adicionado melhoria de pesquisa de mensagens ao anexar no diretório trunk

Location:

trunk/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (2 diffs)
• js/mail_archiver.js (modified) (4 diffs)
• setup/phpgw_pt-br.lang (modified) (1 diff)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -5217 +5217 @@
         function searchSieveRule( $params )
         {
-
-                $imap = $this->open_mbox( 'INBOX' );
+                $imap = $this->open_mbox( $params['folder']['criteria'] ? $params['folder']['criteria'] : 'INBOX' );
                 $msgs = imap_sort( $imap , SORTDATE , 0 , SE_UID);
-                
+        
                 $rr = array();
 
@@ -5292 +5291 @@
                         if(isset($params['body']))
                         {                       
-                                $this->mbox = $this->open_mbox( 'INBOX' );
-                                $b = $this->get_body_msg( $v , 'INBOX' );
+                                $this->mbox = $this->open_mbox( $params['folder']['criteria'] ? $params['folder']['criteria'] : 'INBOX' );
+                                $b = $this->get_body_msg( $v , $params['folder']['criteria'] ? $params['folder']['criteria'] : 'INBOX' );
                                 
                                 if( $this->filterCheck( $b['body'] , $params['body']['criteria'] , $params['body']['filter'] ))

trunk/expressoMail1_2/js/mail_archiver.js

@@ -2141 +2141 @@
             var filters = eval('(' + expresso_mail_archive.queryconfig.pharseSearchFields(fields) + ')');
 
+
+
             if(folderlist.indexOf("#") != -1)
                 filters.folder = folderlist.substr(0, folderlist.indexOf("#"));
@@ -2151 +2153 @@
 
             expresso_mail_archive.querydata = expresso_mail_archive.search_queryconfig.query(filters);
-            
+
+
+
             //var query_data = '<?xml version="1.0" encoding="UTF-8"?><query subject="teste"><folder id="inbox"/><order asc="date"/></query>';
             ArchiveServices.listMessages(expresso_mail_archive.searchOperationOK, expresso_mail_archive.searchOperationFailure, expresso_mail_archive.session.id, expresso_mail_archive.querydata);        
@@ -2185 +2189 @@
             
         //expresso_mail_archive.queryresult = msglist;        
-        expresso_mail_archive.search_queryresult = msglist;    
+        expresso_mail_archive.search_queryresult = msglist; 
         //expresso_mail_archive.messageslisted = msglist2;
         expresso_mail_archive.search_message_list = msglist2;
@@ -2319 +2323 @@
         var ExpSerialized2 = expresso_mail_archive.pattern.toExpressoHeader(serviceReturn.getReturn());
         var msgitem2 = connector.unserialize(ExpSerialized2);
+        if(!expresso_mail_archive.messageslisted){
+            expresso_mail_archive.messageslisted = [];
+        }
         expresso_mail_archive.messageslisted.push(msgitem2);    
         expresso_mail_archive.getMessageHeaders(serviceReturn.getReturn().getId());

trunk/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -975 +975 @@
 Sending the message...  expressoMail1_2 pt-br   Enviando a mensagem...
 Please, Wait the messages from archieve be ready.       expressoMail1_2 pt-br   Por favor, Aguarde as mensagens arquivadas ficarem prontas.
+take on this option to regard the message body in the search.   expressoMail1_2 pt-br   Considerar o corpo da mensagem como filtro na busca
+take off this option to disregard the message body in the search.       expressoMail1_2 pt-br   Desconsiderar o corpo da mensagem como filtro na busca