Changeset 278

Timestamp:

04/30/08 18:46:18 (16 years ago)

Author:

wmerlotto

Message:

Correcao na forma como a assinatura (X-DSPAM-Signature) do DSPAM e identificada. Grato ao Eder Ruiz Maria.

File:

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

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

@@ -2284 +2284 @@
                         $msg = $header . $body;
                         $email = $_SESSION['phpgw_info']['expressomail']['user']['email'];
-                        //$tmp_file = $tmp_dir . "msg." . $email . '.'. $msg_number . time();
-                        // maybe we can get it faster with regex, don't know how :'(
-                        $signature = trim(substr($header, strpos($header, 'X-DSPAM-Signature:') + 18));
+                        $username = $this->username;
                         strtok($email, '@');
                         $domain = strtok('@');
 
+                        //Encontrar a assinatura do dspam no cabecalho
+                        $v = explode("\r\n", $header);
+                        foreach ($v as $linha){
+                                if (eregi("^X-DSPAM-Signature", $linha)) {
+                                        
+                                        $args = explode(" ",$linha);
+                                        $signature = $args[1];
+                                }
+                        }
+
                         // feed dspam
-                        if ($is_spam)
-                                $cmd = str_replace(
-                                                        array('##EMAIL##', '##USERNAME##', '##DOMAIN##', '##SIGNATURE##'), 
-                                                        array($email, $this->username, $domain, $signature), $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_command_for_spam']
-                                                );
-                        else
-                                $cmd = str_replace(
-                                                        array('##EMAIL##', '##USERNAME##', '##DOMAIN##', '##SIGNATURE##'),
-                                                array($email, $this->username, $domain, $signature), $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_command_for_ham']
-                                        );
-                        
+                        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);
                         system($cmd);
-                        
                 }
                 imap_close($mbox_stream);