Changeset 4045 for extensions/Mail_supervisor/include

Timestamp:

Oct 15, 2009, 4:36:45 PM (15 years ago)

Author:

cljosse

Message:

[mail_supervisor] Modification gestion reprise spam

Location:

extensions/Mail_supervisor

Files:

• . (modified) (1 prop)
• include (modified) (1 prop)
• include/fonctions.php (modified) (1 diff)
• include/function_test_send.php (modified) (2 diffs)

extensions/Mail_supervisor/include/fonctions.php

@@ -181 +181 @@
 function corrige_header($Carbonne,$headers)
         {
-        global $mails_options,$conf_mail,$mailto;
-
-                $splitter="|".$Carbonne.":(.*)\n|U";
-                preg_match_all($splitter,$headers, $out,PREG_PATTERN_ORDER);
-                $val=array();
-                $match=array("<",">");
-                $string=array("","") ;
-                foreach($out as $messages)
-                {
-                $val[]=  $messages[0] ;
-                }
- 
-
-        $val[1]=  str_replace( $match,$string,$val[0] ) ;
-        $src=$val[0];
-        
-        $splitter="|\"(.*)\"|U";
-        preg_match_all($splitter,$val[1], $out,PREG_PATTERN_ORDER);
-        $string=array();
-        $string = array_fill( 0, count($out), '');
-        $dest = str_replace($out[0], $string, $val[1]) ;
- if ($mailto <>"" ) {   
-         $dest=str_replace($mailto.',', '', $dest) ;
-         $dest=str_replace($mailto, '', $dest) ;
-        
-} 
-
-
-        $headers = str_replace( $src,$dest, $headers) ;
+        global $mails_options,$conf_mail,$mailto,$args;
+        $headers = preg_replace('/.*'.$Carbonne.'(.*).\n/i', $Carbonne.' : '.get_strict_email_list(implode(' , ', $args[$Carbonne]))."\n", $headers);
+
         return $headers;
 

extensions/Mail_supervisor/include/function_test_send.php

@@ -72 +72 @@
         $args['Bcc']=$groups;
         $args['from'] = $conf_mail['formated_email_webmaster'];
-
-  
-  
         //==================================================================
          $message_texte=sprintf(
@@ -83 +80 @@
                 $args['from']
         );      
-        $message_texte .=$message;      
         //==================================================================
-        $message_html=$message_texte;
-//      $message_html .=        '<img src="'.PHPWG_ROOT_PATH.'admin/template/goto/theme/roma/images/piwigo_logo_sombre_214x100.png" />';
-         
+        $message_html = $message_texte;
+
         
  //==========================================================================