Ticket #511: antispam.diff

class.imap_functions.inc.php

@@ -2795 +2795 @@
                 $msgs_number = explode(',',$params['msgs_number']);
 
                 foreach($msgs_number as $msg_number) {
-                        $header = imap_fetchheader($mbox_stream, imap_msgno($mbox_stream, $msg_number));
-                        $body = imap_body($mbox_stream, imap_msgno($mbox_stream, $msg_number));
+                        $imap_msg_number = imap_msgno($mbox_stream, $msg_number);
+                        $header = imap_fetchheader($mbox_stream, $imap_msg_number);
+                        $body = imap_body($mbox_stream, $imap_msg_number);
                         $msg = $header . $body;
                         $email = $_SESSION['phpgw_info']['expressomail']['user']['email'];
                         $username = $this->username;
@@ -2807 +2808 @@
                         $v = explode("\r\n", $header);
                         foreach ($v as $linha){
                                 if (eregi("^X-DSPAM-Signature", $linha)) {
-                                        
                                         $args = explode(" ",$linha);
                                         $signature = $args[1];
+                                } elseif (eregi("^Message-ID", $linha)) {
+                                        $args = explode(" ", $linha);
+                                        $msg_id = "$args[1]";
                                 }
                         }
 
-                        // feed dspam
+                        // Seleciona qual comando a ser executado
                         switch($is_spam){
                                 case 'true':  $cmd = $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_command_for_spam']; break;
                                 case 'false': $cmd = $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_command_for_ham']; break;
                         }
-                        $tags = array('##EMAIL##', '##USERNAME##', '##DOMAIN##', '##SIGNATURE##');
-                        $cmd = str_replace($tags,array($email,$username,$domain,$signature),$cmd);
+
+                        $tags = array('##EMAIL##', '##USERNAME##', '##DOMAIN##', '##SIGNATURE##', '##MSGID##', '##MSG##');
+                        $cmd = str_replace($tags, array($email, $username, $domain, $signature, $msg_id, $msg), $cmd);
                         system($cmd);
                 }
                 imap_close($mbox_stream);