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

Timestamp:

Apr 15, 2011, 4:09:41 PM (13 years ago)

Author:

cljosse

Message:

[extensions] mail_supervisor fix bug format_email

File:

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

extensions/Mail_supervisor/main.inc.php

@@ -11 +11 @@
 if (!defined('mail_superv_DIR')) define('mail_superv_DIR' , basename(dirname(__FILE__)));
 if (!defined('MAIL_SUPERV_PATH')) define('MAIL_SUPERV_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
-$MAIL_SUPERV_PATH_ABS=str_replace('\\','/',dirname(__FILE__) );
+
+$MAIL_SUPERV_PATH_ABS = str_replace('\\','/',dirname(__FILE__) );
 if (!defined('MAIL_SUPERV_PATH_ABS')) define(  'MAIL_SUPERV_PATH_ABS',   $MAIL_SUPERV_PATH_ABS."/");
+
 global $conf,$mails_options ;
 include_once (MAIL_SUPERV_PATH.'include/constants.php'); 
 include_once(MAIL_SUPERV_PATH.'mail_super.inc.php');
+
 $mail_supervisor = new mail_supervisor();
 add_event_handler('get_admin_plugin_menu_links', array(&$mail_supervisor,'admin_menu')  );
@@ -23 +26 @@
 //
 //
+include_once (PHPWG_ROOT_PATH.'include/functions_mail.inc.php' );
 include_once (MAIL_SUPERV_PATH.'include/fonctions.php');  
 //===============loc_begin_index==============loc_after_page_header=============================================================
-add_event_handler('loc_after_page_header',  array(&$mail_supervisor,'init')  );
+add_event_handler('loc_begin_page_header',  array(&$mail_supervisor,'init')  );
 add_event_handler('loc_begin_page_tail',  array(&$mail_supervisor,'affiche_message')  );
 
@@ -31 +35 @@
 add_event_handler('send_mail', 'clj_mail',EVENT_HANDLER_PRIORITY_NEUTRAL - 10, 6);
 function clj_mail($result, $mailto, $subject, $content, $headers, $args) {
-    global $conf, $user, $lang_info;  
-    global $conf_mail,$mails_options,$mails_donnees ;
-    global  $template,$page ,$erreur_message,$infos_message, $lang; 
-    global $errors;
- 
-        // lecture config table -------------
-          include_once (MAIL_SUPERV_PATH.'include/fonctions.php'); 
-   load_language('plugin.lang', MAIL_SUPERV_PATH); 
-         if (isset($_POST["Submit"]) ) {
-            if ($_POST["Submit"] != l10n('Sv_Envoyer') ) return true ;
-         }  
-   // remove_event_handler('send_mail', 'pwg_send_mail');
-     
-           $message ="";
-    if (!isset($infos_message)) {       $infos_message = "";    }
-    if (!isset($erreur_message))        {       $erreur_message = '';   }        
+  global $conf, $user, $lang_info;  
+  global $conf_mail,$mails_options,$mails_donnees ;
+  global  $template,$page ,$erreur_message,$infos_message, $lang; 
+  global $errors;
+  // lecture config table -------------
+  include_once (MAIL_SUPERV_PATH.'include/fonctions.php'); 
+  load_language('plugin.lang', MAIL_SUPERV_PATH); 
+  if (isset($_POST["Submit"]) ) {
+    if ($_POST["Submit"] != l10n('Sv_Envoyer') ) return true ;
+  }  
+  // remove_event_handler('send_mail', 'pwg_send_mail');     
+        $message ="";
+  if (!isset($infos_message))   {       $infos_message = "";    }
+  if (!isset($erreur_message))  {       $erreur_message = '';   }          
    
-   // $mails_options = explode("," , $conf['mail_superv']);
-    $envoie_ok=true ;
-//======== verification si envoie de mail ou blocage connexion =====================
-
-        if ($mails_options['no_mail_list']=='on' || $mails_options['no_connect'] == 'on' )      { 
+  // $mails_options = explode("," , $conf['mail_superv']);
+  $envoie_ok=true ;
+  //======== verification si envoie de mail ou blocage connexion =====================
+
+  if ($mails_options['no_mail_list']=='on' || $mails_options['no_connect'] == 'on' )    { 
                 if (kill_list()) {
       $nb_destinataires=0; ;
@@ -58 +60 @@
       $erreur_message .= "<BR />".l10n('Sv_is_a_spam') ;
       $infos_message = l10n('Sv_mail_not_send')."<BR />"; 
-                   if ($mails_options['no_connect'] == 'on' ){
-                   if ($user['status'] == 'webmaster'  )                {  
-                          //---------- continuer si web master ----------
-
-                          }else{
-                                  if (!isset($_GET['admin'])) {
-                                                 die('Blacklist : <br />' .$erreur_message. '<br /> Hacking attempt!');
-                                       }elseif   ($_GET['admin'] != 'piwigo')
-                                               {
-                                                 die('blacklist Hacking attempt!');
-                                        }
-                     
-                          } 
-                         
-                        }
-
+      if ($mails_options['no_connect'] == 'on' ){
+              if ($user['status'] == 'webmaster'){  
+              //---------- continuer si web master ----------
+              }else{
+                      if (!isset($_GET['admin'])) {
+                                      die('Blacklist : <br />' .$erreur_message. '<br /> Hacking attempt!');
+                                        }elseif   ($_GET['admin'] != 'piwigo')
+                                                {
+                                      die('blacklist Hacking attempt!');
+                      }              
+              }                          
+      }
          return true;
                 }
         }
-        // lecture donnees       -------------
- $mails_donnees = mail_supervisor::Get_Datas();
- 
-        $nb_mails         =     $mails_donnees['nb_mails'] ;
-        $next_day  =  $mails_donnees['date_mail'] ;
-        
-        $reste =    $mails_donnees['reste'] ;
-        
-        
-        $rest_mail =    $mails_donnees['rest_mail'] ;
+  // lecture donnees       -------------
+  $mails_donnees = mail_supervisor::Get_Datas(); 
+  $nb_mails       =     $mails_donnees['nb_mails'] ;
+  $next_day  =  $mails_donnees['date_mail'] ;   
+  $reste =    $mails_donnees['reste'] ;         
+        $rest_mail =    $mails_donnees['rest_mail'] ;  
         if ($rest_mail <=0 || $mails_donnees['nb_mails'] ==0 ){
            $mails_donnees['nb_mails'] =0 ;
            $mails_donnees['date_mail'] = time();
-        }
-        
+        }       
         $rest_spam =    $mails_donnees['rest_spam'] ;
         if ($rest_spam <=0 || $mails_donnees['nb_spams'] ==0 ){
            $mails_donnees['nb_spams'] =0 ;
            $mails_donnees['date_spam'] = time();
-        }
-        
-        $alerte =   ( $mails_donnees['reste'] >0 ) ? true : false ; 
-        
+        }       
+        $alerte =   ( $mails_donnees['reste'] >0 ) ? true : false ;     
         $alerte_mail =    ( $mails_donnees['nb_mails'] >   $mails_donnees['nb_mails_maxi']-1 ) ? true : false ;
-        $alerte_spam =    (  $mails_donnees['nb_spams'] >   $mails_donnees['nb_spams_maxi']-1 ) ? true : false ;
-        
- 
-    if ( ( !$alerte  && !$alerte_spam  && !$alerte_mail ) ) {            
-            $nb_destinataires=0;
-                    if ($mails_options['check_mailto'] == 'on') {
-                            if ($mailto == "" ) $mailto = $conf_mail['email_webmaster'];
-                    }    
-            if ($mailto<>"" )            $nb_destinataires +=1; 
-                    if (!empty($args['Bcc'])) { $nb_destinataires += count($args['Bcc']);       } 
-                    if (!empty($args['Cc']))  { $nb_destinataires += count($args['Cc']);        }
-
-   
-                $infos_message .= "<hr> Theme :" . ($args['theme'] ) ."<br />";
-            $infos_message .="nombre de destinataire:".$nb_destinataires." <br />" ;
-
-           //================= reecriture de l'entete ===============================
-            $match=array("<",">");
-            $string=array("&lt;","&gt;") ;      
-        
-            if ( $nb_destinataires  == 1 && $mailto != "" )
-                    {   
-                    $infos_message .="--> Mailto: " . $mailto." \n" ;
-    
-                            if ($mailto != "" ) 
-                                {
-
-                            $mailto  = $mailto ." \n"   ;
-                            $headers =  preg_replace('/.*Bcc(.*).\n/i', '', $headers);
-                                            $headers =  preg_replace('/.*Cc(.*).\n/i', '', $headers);
-                
-                        
-                                }
-                    //=============================================================================
+        $alerte_spam =    ( $mails_donnees['nb_spams'] >   $mails_donnees['nb_spams_maxi']-1 ) ? true : false ;
+
+  if ( ( !$alerte  && !$alerte_spam  && !$alerte_mail ) ) {              
+    $nb_destinataires=0;  
+  //====================================================
+    $match_email = $conf_mail['email_webmaster'];     
+    $new_args=array();
+    foreach($args['Bcc'] as $key => $val){ 
+      if (!preg_match('/'. $match_email.'/', $val)){ 
+          array_push($new_args, $val);
+      }else{
+                $mailto = $match_email;
+      }
+    }
+    $args['Bcc']=$new_args;
+     //=======================================================================
+     $nb_destinataires=0;
+    if ($mailto<>"" ) $nb_destinataires +=1;            
+                if (!empty($args['Cc']))  {     
+        $nb_destinataires += count($args['Cc']); 
+        
+    }  
+                if (!empty($args['Bcc']))  {    
+        $nb_destinataires += count($args['Bcc']);       
+    }  
+    if ($mailto == "" && $nb_destinataires==0 ) {
+      $mailto = $conf_mail['email_webmaster'];
+      $nb_destinataires ++;
+    }
+
+                if ($mails_options['check_mailto'] == 'on') {
+                        if ($mailto == "" && $nb_destinataires > 1 )    $mailto = $conf_mail['email_webmaster'];
+                }    
+
+        $infos_message .= "nb_destinataires : $nb_destinataires Theme :" . ($args['theme'] ) ."<br />";
+    //================= réecriture de l'entete ===============================
+    $match=array("<",">");
+    $string=array("&lt;","&gt;") ;                      
+    if ( $nb_destinataires  == 1 ) {   
+      if ($mailto == "" ) {     
+        if (!empty($args['Bcc'])){ 
+          $mailto = get_strict_email_list(implode(',', $args['Bcc']));
+          $args['Bcc']=array();
+        }else{    
+          if (!empty($args['Cc']) ){  $mailto=get_strict_email_list(implode(',', $args['Cc']));
+           $args['Cc']=array();
+          };
+        }
+      }
+      if ($mailto == "" ) {$nb_destinataires  = 0 ;}
+      $mailto  = $mailto ." \n"   ;
+      $headers =  preg_replace('/.*Bcc(.*).\n/i', '', $headers);
+      $headers =  preg_replace('/.*Cc(.*).\n/i', '', $headers);
+      $infos_message .="Destinataire:" .$mailto ;
+      //=============================================================================
+       
+    }else{
+          //=== plusieurs destinataires ===========
+      $cl_list_mail="";
+      if ($mailto !="") $infos_message .="To: " . $mailto . " "."<br />" ;     
+      if (!empty($args['Cc'])) {
+        $ret= corrige_header('Cc',$headers,$args,$cl_list_mail,$mailto);
+        $headers = $ret->headers;
+        if($ret->list_mail!="") $infos_message .="Cc: " .  ( $ret->list_mail)."  <br />" ;
              
-            
-                            if (!empty($args['Bcc']) ) $infos_message .="Bcc: " . mail_supervisor::Memo_Var($args['Bcc']) ." \n";
-                            if (!empty($args['Cc']) ) $infos_message .="Cc: " . mail_supervisor::Memo_Var($args['Cc'])." \n" ;
-                            $infos_message .="Mailto: [" . $mailto . "]"." \n".$headers;             
-          
-                    }else{
-                    //=== plusieurs destinataires ===========
-                    $cl_list_mail="";
-
-                    if ($mailto !="") $infos_message .="To: " . $mailto . " "." /n" ;     
-                    if (!empty($args['Cc'])) {
-                    $ret= corrige_header('Cc',$headers,$args,$cl_list_mail);
-                        $headers = $ret->headers;
-                        $infos_message .="Cc: " .  ( $ret->list_mail)."  <br />" ;
-                    }
-                    if (!empty($args['Bcc'])){ 
-                        $ret    = corrige_header('Bcc',$headers,$args,$cl_list_mail); 
-          
-                        $headers = $ret->headers ;
-                        $infos_message .="Bcc: " . ( $ret->list_mail) ."  <br />";
-                    }
+      }
+      if (!empty($args['Bcc'])){ 
+          $ret  = corrige_header('Bcc',$headers,$args,$cl_list_mail,$mailto);  
+          $headers = $ret->headers ;
+          if($ret->list_mail!="") $infos_message .="Bcc: " . ( $ret->list_mail) ."  <br />";
+           
+       }      
+             $infos_message .=  " " ;
+    }
+     
       
-                    $infos_message .=  " " ;
-            }
-            // $infos_message .= $content ;
             //=============================================================================
             if ($mails_options['check_header_text']=='on')   {
@@ -171 +178 @@
               $texte .= "\n\n";         
               $content =$texte .$content ;
-            }
- 
-            $ret=false;
-                //======== Non mise en quarantaine =============
+            }    
+            // corrige erreur 'mail dropped, bare LF found'
+          /*   if ( preg_match('/\n\./',$content)){ 
+             $content=preg_replace('/\n\./', '/\n\.\./', $content);
+
+   //   $infos_message .= $content ;
+             }
+             $content = str_replace("\n.", "\n/./.", $content);
+             $headers = str_replace("\n.", "\n..", $headers); 
+            $subject = str_replace("\n.", "\n..", $subject);
+             $mailto = str_replace("\n.", "\n..", $mailto);
+       */
+             
+            $ret=false; 
+                //======== Non mise en quarantaine =============  
+          
+         
                     ob_start();
-                    $ret = false;
-                      if ($nb_destinataires > 0) {
-                         // corrige erreur 'mail dropped, bare LF found'
-                         $content = str_replace("\n.", "\n..", $content);
-                         $headers = str_replace("\n.", "\n..", $headers);
-                         $subject = str_replace("\n.", "\n..", $subject);
-                         $mailto = str_replace("\n.", "\n..", $mailto);
-                if( $envoie_ok)  $ret = mail($mailto, $subject, $content, $headers);
-        
-                          }else{
-                               $message .= l10n('Sv_no_receiver_available');
-                          }
-                            $message .= ob_get_contents();
-                ob_end_clean();
-                            $mails_donnees['message']=$message; 
-                            Gestion_erreurs($message,$ret,$nb_destinataires,$headers,$mailto);
+                      if ($nb_destinataires > 0) {   
+
+            if( $envoie_ok)  $ret = mail($mailto, $subject,$content, $headers); 
+            
+          }else{
+            $message .= l10n('Sv_no_receiver_available');
+          }
+        $message .= ob_get_contents();
+        ob_end_clean();
+        $mails_donnees['message']=$message;     
+        Gestion_erreurs($message,$ret,$nb_destinataires,$headers,$mailto);
             } else {
                     //================== Est en quarantaine =======================     
@@ -225 +240 @@
             }
             $infos_message .= l10n('Sv_mail_not_send'); 
-            }                   
+            }           
+           $infos_message .= "<hr>";    
     mail_supervisor::sauve_donnees();
     mail_supervisor::affiche_message();