Changeset 5862 for trunk/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

04/02/12 17:58:17 (12 years ago)

Author:

airton

Message:

Ticket #1794 - Codificar DFD0060 - Aplicacao das regras nas mensagens da caixa de entrada

File:

• trunk/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (1 diff)

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

@@ -5161 +5161 @@
         }
         
-        function apliSieveFilter($msgs , $proc )
+        function apliSieveFilter($msgs , $proc)
         {
                 $ret = array();
-                
-                switch($proc['action']){
-                        case 'fileintro':
-                                $imap = $this->open_mbox( 'INBOX' );
-                                foreach( $msgs as $msg )
+                foreach ($msgs as $i => $msg)
+                {
+                        switch($proc['type']){
+                                case 'fileinto':
+                                        $imap = $this->open_mbox( 'INBOX' );
                                         if($proc['keep'] === true)
-                                                $ret[$msg][] =  imap_mail_copy($imap,$msg,$proc['value']);
+                                                $ret[$msg][] = imap_mail_copy($imap,$msg,$proc['value'], CP_UID);
                                         else
-                                                $ret[$msg][] = imap_mail_move($imap,$msg,$proc['value']);
-                                break;
-                        case 'redirect':
-                                        foreach($msgs as $msg)
-                                        {                               
+                                                /* 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);
+                                        break;
+                                case 'redirect':        
+                                        /* TO-DO: Fix the problems of include serviceLocator file */
+                                        //foreach($msgs as $msg)
+                                        //{                             
+                                                /*
                                                 $info = $this->get_info_msg(array('msg_folder' => 'INBOX','msg_number' => $msg));
-                                
-                                                require_once $_SESSION['rootPath'] . '/API/class.servicelocator.php';
+                                                //require_once $_SESSION['rootPath'] . '/API/class.servicelocator.php';
                                                 $mailService = ServiceLocator::getService('mail');
                                                 
-                                                $ret[$msg][] = $mailService->sendMail( $proc['value'] , $info['from']['full'] , $info['subject'] ,$info['body'] );
-                                                
-                                                if($proc['keep'] !== true)
-                                                    $this->delete_msgs(array('msgs_number' => $msg , 'folder' => 'INBOX'));
-                                        }       
-                                break;
-                        
-                        case 'setflag':
-                                foreach($msgs as $msg)
-                                        $ret[$msg][] = $this->set_messages_flag( array( 'folder' => 'INBOX' , 'msgs_to_set' => $msg , 'flag' => $proc['value']) );
-                
-                                break;
-                }
-                
+                                                $ret[$msg][] = $mailService->sendMail( $proc['parameter'] , $info['from']['full'] , $info['subject'] ,$info['body'] );
+                                                                                
+                                                if($proc['keep'] !== true)
+                                                        $this->delete_msgs(array('msgs_number' => $msg , 'folder' => 'INBOX'));
+                                                        
+                                                */       
+                                        //}     
+                                        break;
+                                
+                                case 'setflag':
+                                        foreach($msgs as $msg)
+                                                $ret[$msg][] = $this->set_messages_flag( array( 'folder' => 'INBOX' , 'msgs_to_set' => $msg , 'flag' => $proc['parameter']) );
+                                        break;
+                        }
+                }
                 return $ret;
         }