Changeset 10822 for extensions/Mail_supervisor/main.inc.php

Timestamp:

May 9, 2011, 11:23:06 AM (13 years ago)

Author:

cljosse

Message:

[extensions] mail_supervisor add option debug_mail,

File:

• extensions/Mail_supervisor/main.inc.php (modified) (5 diffs)

extensions/Mail_supervisor/main.inc.php

@@ -173 +173 @@
     }
    
-  $content= cl_pwg_mail($args);
-  
-
-    if (  !preg_match('/'. $conf_mail['boundary_key'] .'/', $headers)){
-        $erreur_message .=   "ERREUR manque : boundary_key dans le headers <br />";
+     $pattern = '/(http:\/\/)([0-9].*)([0-9]\/)/'; 
+     //---- si adresse avec ip , certaine boite aux lettres traite ces messages en spam (orange+windowsmail)
+  if(preg_match($pattern, $content)){
+      // remplace 192.168.1.25 par rien ??
+      $replacement = '${1}'; 
+      $content = preg_replace( $pattern, $replacement,  $content );      
+}
+
+      $content= preg_replace('#(?<!\r)\n#si', "\r\n", $content); //drop LF barre 
+
+    if (!preg_match('/'. $conf_mail['boundary_key'] .'/', $headers)){
+        $erreur_message .=   "<br />ERREUR manque : boundary_key dans le headers <br />";
         $infos_message = l10n('Sv_mail_not_send'); 
-         $envoie_ok= false ;
-    }
- 
-
-
-    if( isset($conf['debug_mail']) && $conf['debug_mail']=="true") {
-
-    //    $erreur_message .="DEBUG:"."<br />Theme: ".    $file. "<br />";
-
-        $content1 =   htmlspecialchars( var_export($headers, true ) );   
-        $erreur_message .="<br />DEBUG -> "." Header: <br />".   $content1 ."<br />";
-
-        $content1 =   htmlspecialchars( var_export($mailto, true ) );   
-        $erreur_message .="<br />DEBUG -> "." Mail to: <br />".   $content1 ."<br />";
-
-        $content1 =   htmlspecialchars( var_export($subject ,true ) );   
-        $erreur_message .="<br />DEBUG -> "." Sujet: <br />".   $content1 ."<br />";
-
-        $content1 =   htmlspecialchars( var_export($content, true ) );    
-        $erreur_message .="<br />DEBUG -> "." Contenu:<br />" . $content1 ."<br />";
-    }
-
-
-            $ret=false;
+        $envoie_ok= false ;
+    }
+            $ret=false;  
+             ob_start();
             //======== Non mise en quarantaine =============
-
-
-            ob_start();
+            //echo "warning spam" ;
+           // echo " Warning: mail() has been disabled for security reasons";
+         
               if ($nb_destinataires > 0) {
                 if( $envoie_ok)  $ret = mail($mailto, $subject,$content, $headers);
@@ -217 +204 @@
               trigger_event('mail_supervisor_mail', $arg_trigg );
               $mails_donnees['message']=$message;
-              Gestion_erreurs($message,$ret,$nb_destinataires,$headers,$mailto);
+              Gestion_erreurs($message,$ret,$nb_destinataires,$headers,$mailto, $subject,$content);
             } else {
                 //================== Est en quarantaine =======================
@@ -260 +247 @@
 }
 //===========================================================================================
-function Gestion_erreurs($message,$ret,$nb_destinataires,$headers,$mailto){
+function Gestion_erreurs($message,$ret,$nb_destinataires,$headers,$mailto, $subject,$content){
      global $conf, $user,  $conf_mail,$mails_options,$mails_donnees , $template,$page ,$infos_message,$erreur_message,$args,$lang, $lang_info;
      $match=array("<",">");
-    $string=array("&lt;","&gt;") ;
-//Warning: mail() has been disabled for security reasons
-
-    $est_un_spam =!(strpos(strtolower($message), 'spam') === false);
-    $headers=str_replace( $match,$string, $headers);
-
+     $string=array("&lt;","&gt;") ;
+     //  $headers=str_replace( $match,$string, $headers);
+    // Warning: mail() has been disabled for security reasons
+    $est_un_spam =!(strpos(strtolower($message), 'spam') === false);  
     if ( ($ret==false) || ($est_un_spam==true) || ($nb_destinataires == 0) ) {
-         ;              // Bad recipient address syntax
+        // Bad recipient address syntax
         $pos1 = strpos(strtolower($message), 'bad recipient address syntax');
         if (  !($pos1 === false) ){
             $erreur_message .= l10n('Sv_detection_de').' Bad recipient address syntax .';
             $erreur_message .= l10n('Sv_verifiez_les_destinataires').' (Bcc,Cc,To)<br />';
-            }
-
-    $erreur_message .= sprintf(l10n('Sv_debug_message'),
-    ($ret==true)? "true" : "false",
-    $message ,
-    $mailto ,
-    $headers ,
-    $nb_destinataires );
-       //=============== La fonction mail retourne une erreur =========================
-                }
-
-        if ($est_un_spam == false)
-            {
+            }               
+
+    $erreur_message .=sprintf(l10n('Sv_debug_message'),
+                              ($ret==true)? "true" : "false",
+                              htmlspecialchars($message) ,
+                              htmlspecialchars( $mailto) ,
+                              htmlspecialchars($subject) ,
+                              htmlspecialchars($headers) ,
+                              htmlspecialchars($content) ,
+                              $nb_destinataires );
+
+     Mail_supervisor_log($mailto,$erreur_message) ;   
+     //=============== La fonction mail retourne une erreur =========================
+      }else{ 
+           
+    if( isset($mails_options['debug_mail']) && $mails_options['debug_mail']=="on") {
+        $erreur_message .="DEBUG : <br />" .sprintf(l10n('Sv_debug_message'),
+                                  "DEBUG",
+                                  htmlspecialchars( $message) ,
+                                  htmlspecialchars( $mailto) ,
+                                  htmlspecialchars($subject) ,
+                                  htmlspecialchars($headers) ,
+                                  htmlspecialchars($content) ,
+                                  $nb_destinataires );
+
+         Mail_supervisor_log($mailto,$erreur_message) ; 
+        }
+      }
+
+
+
+        if ($est_un_spam == false){
                 if ($mails_donnees['nb_mails']==0) {    $mails_donnees['date_mail'] =  time();  }
                 $mails_donnees['nb_mails'] += $nb_destinataires;
-            }
-            else
-            {
+            } else {
                 $mails_donnees['nb_spams'] += $nb_destinataires;
                 //--- Detection de spam ------------------
@@ -308 +310 @@
  $ret=true;
  return $ret ;
+}
+//============================================================
+global $ms_file_log;
+$dir=$conf['local_data_dir'].'/Mail_supervisor_log';
+ if (!is_dir($dir)){  
+    $umask = umask(0);
+    $mkd = @mkdir($dir, 0755, true );
+    umask($umask);
+
+      if ($mkd==false){
+      fatal_error( "$dir ".l10n('no write access'));
+      return false;
+    }
+        $file = $dir.'/.htaccess';
+       @file_put_contents( $file, 'allow from all' );
+
+    }
+   if($ms_file_log=="") $ms_file_log=$dir."/"."pw1.html";
+
+
+//============================================================
+function Mail_supervisor_log($label_,$lines){
+  global $ms_file_log,$conf;  
+  $nb_lignes=300 ;
+$t= var_export( $lines, true );
+$s  = htmlspecialchars(  $lines);
+ $s  =  (  $lines);
+    if (!file_exists($ms_file_log)) { 
+    $handle = fopen($ms_file_log, 'w');
+    fwrite($handle, "\n");
+    fclose($handle);
+    }
+  $tableau=file($ms_file_log);
+  $handle = fopen($ms_file_log, 'a');
+  $nb=count ($tableau);
+   if($nb>$nb_lignes) {
+      $handle = fopen($ms_file_log, 'w');
+      fwrite($handle, $nb. " > " . $nb_lignes . "  RAZ " ."\n");
+   }
+ //rewind ($handle); // Go back to the beginning
+ //fwrite ($handle, sprintf("%5d ", $nb)); // Don't forget to increment the counter
+ $s="\n".date('Y m d H:m:s ')."\n".$s;
+
+
+$s= nl2br($s);
+
+ if( $s !="") fwrite($handle,$s );
+      fclose($handle);
 }
 
@@ -432 +482 @@
   unset_make_full_url(); 
 
-  $pattern = '/(http:\/\/)([0-9].*)([0-9]\/)/'; 
-  if(preg_match($pattern, $content)){
-  //remplace 192.168.1.25 par rien ??
-      $replacement = '${1}'; 
-      $content = preg_replace( $pattern, $replacement,  $content ); 
-      //$content1 =   htmlspecialchars( var_export($content, true ) );     
-}
-
-      $content= preg_replace('#(?<!\r)\n#si', "\r\n", $content); //drop LF barre
+
 
   return    $content;