Changeset 7902 for trunk

Timestamp:

02/21/13 10:46:17 (11 years ago)

Author:

angelo

Message:

Ticket #3353 - Problema na funcionalidade de aplicar resultado do filtro na caixa de entrada

Location:

trunk

Files:

• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (1 diff)
• prototype/modules/filters/interceptors/FilterMapping.php (modified) (1 diff)

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

@@ -5368 +5368 @@
                                                 $ret[$msg][] = imap_mail_copy($imap,$msg,$proc['value'], CP_UID);
                                         else
+                                        {
                                                 /* Está sempre copiando a mensagem para a pasta destino */
                                             //$ret[$msg][] = imap_mail_move($imap,$msg,$proc['parameter'], CP_UID);
                                                 $ret[$msg][] = imap_mail_move($imap,$msg,$proc['parameter'], CP_UID);                                           
+                                                imap_expunge($imap);
+                                        }
                                         break;
                                 case 'redirect':                                                                                        

trunk/prototype/modules/filters/interceptors/FilterMapping.php

@@ -550 +550 @@
                 $actions['type'] = $rule_apply['actions'][0]['type'];
                 $actions['parameter'] = $rule_apply['actions'][0]['parameter'];
-                /* Hardcoded */
-                $actions['keep'] = false;
+
+                $actions['keep'] = is_array($rule_apply['actions'][1]);
+                if ($actions['keep'])
+                        $actions['value'] = $rule_apply['actions'][0]['parameter'];
 
                 //$messages = $rule_apply['applyMessages'];