Changeset 4054 for extensions/Mail_supervisor

Timestamp:

Oct 17, 2009, 4:47:20 PM (15 years ago)

Author:

cljosse

Message:

[mail_supervisor] new gestion of copy carbon

Location:

extensions/Mail_supervisor

Files:

• admin/mail_superv_admin.php (modified) (5 diffs)
• include/fonctions.php (modified) (4 diffs)
• include/function_test_send.php (modified) (5 diffs)
• main.inc.php (modified) (3 diffs)
• maintain.inc.php (modified) (2 diffs)

extensions/Mail_supervisor/admin/mail_superv_admin.php

@@ -30 +30 @@
 
 
-global $user, $lang, $conf, $errors;
+
+
+
+// +-----------------------------------------------------------------------+
+// | Check Access and exit when user status is not ok                      |
+// +-----------------------------------------------------------------------+
+check_status(ACCESS_ADMINISTRATOR);
+
+global $user, $lang, $conf, $errors,$mails_données;
 global $args, $conf_mail,$infos_message,$erreur_message ;
-
- load_language('plugin.lang', MAIL_SUPERV_PATH);
-// +-----------------------------------------------------------------------+
-// | Check Access and exit when user status is not ok                      |
-// +-----------------------------------------------------------------------+
-check_status(ACCESS_ADMINISTRATOR);
 
 include_once (PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php');
@@ -50 +52 @@
 
 
-
+ load_language('plugin.lang', MAIL_SUPERV_PATH);
+ 
 $mails_options = explode("," , $conf['mail_superv']);
 $mails_données=Get_Datas();
@@ -211 +214 @@
                 ;';
                 list($group_name) = mysql_fetch_row(pwg_query($query));
-                 
-                 
+                }       else {
+                                $group_name="";          
                 }               
 //================================================
@@ -219 +222 @@
         
 if ( isset($_POST['test_envoie']) ) {
-        if ($group_id >= 0) {
+        
                 $mails_données['message_test'] = isset($_POST['content']) ? $_POST['content'] :  $mails_données['message_test']  ;
                 $message=$mails_données['message_test'];
@@ -225 +228 @@
                 test_envoie($message,$group_name,$group_id);   
                 $mails_données = Get_Datas() ;
-        }       
+                
   } 
 

extensions/Mail_supervisor/include/fonctions.php

@@ -186 +186 @@
 //===============================================
 
-function corrige_header($Carbonne,$headers)
+function corrige_header($Carbonne,$headers,$args)
         {
-        global $mails_options,$conf_mail,$mailto,$args,$infos_message;
- 
-        if (!empty($args[$Carbonne]))
+        global $mails_options,$conf_mail,$mailto,$infos_message;
+
+ if (!empty($args[$Carbonne]))
          {
  
                 if ( count($args[$Carbonne]) > 0 ) 
                 {
-                  if ($mails_options[1] == 'on') {
-                  // Correction "< >"
-                        $list_mail  = get_strict_email_list(implode(',', $args[$Carbonne])) ;
-                        $headers = preg_replace('/.*'.$Carbonne.'(.*).\n/i', $Carbonne.' : '.$list_mail."\n", $headers);
-                        }
+                 if ($mails_options[1] == 'on') {
+                        $list_mail  = str_replace(","," ,",get_strict_email_list(implode(',', $args[$Carbonne])))." \n" ;
+                        $headers = preg_replace('/.*'.$Carbonne.'(.*).\n/i', $Carbonne.': '.$list_mail, $headers);
+                 }
                 }
         } else {
@@ -207 +206 @@
                 
                 
- 
 return $headers;
 
@@ -259 +257 @@
 function vérif_base()
 {
+
+global $lang;
+ load_language('plugin.lang', MAIL_SUPERV_PATH);
 
 $q = "
@@ -393 +394 @@
         } 
 }
+
+
 function Get_colonnes_de($table)
 {

extensions/Mail_supervisor/include/function_test_send.php

@@ -31 +31 @@
 function test_envoie($message,$group_name,$group_id)
 {
-    global $infos_message,$erreur_message ,$conf,$user,$conf_mail,$mail_données,$args ;
+    global $infos_message,$erreur_message ,$conf,$user,$conf_mail,$mail_données,$args,$lang ;
         $mailto="";  
         
-
+ load_language('plugin.lang', MAIL_SUPERV_PATH);
+ 
 //==================================================================================
 if (!isset($infos_message))
@@ -69 +70 @@
   if (count($groups) > 0)
   {
- //===========================================================
-        $args['Bcc']=$groups;
+       $args['Bcc']=$groups;
+   }   else {
+       $mailto = $conf_mail['formated_email_webmaster']; 
+   } 
+   
         $args['from'] = $conf_mail['formated_email_webmaster'];
         //==================================================================
@@ -88 +92 @@
         $args['subject']="Plugin Piwigo TEST";
         $args['content']=$message_html;
+                $infos_message .="To :" . $mailto;
+                
         $ret= pwg_mail($mailto , $args); 
-                
-                 $infos_message .=    sprintf( l10n('An information email was sent to group "%s"'), $group_name ).'<br />';
-
+        if ( $group_name <> '' or $mailto <> '' )
+        {       
+                if ($group_name<>'') {
+                 $infos_message .=  '<br />'.  sprintf( l10n('An information email was sent to group "%s"'), $group_name ).'<br />';
+                        }
+                        if ($mailto <> '') {
+                                $infos_message .=  '<br />'.  sprintf( l10n('mail_sent_to'), $mailto ).'<br />';
+                                }
                  
         }else{
-               $infos_message .=l10n('no_receiver_available') ;
+               $infos_message .='<br />'.l10n('no_receiver_available') ;
         }
         
@@ -101 +112 @@
 function mail_attachement($args)
 {
- global $infos_message,$erreur_message ,$conf,$user,$conf_mail,$mail_données ;
+ global $infos_message,$erreur_message ,$conf,$user,$conf_mail,$mail_données,$lang ;
 
     $mails_données = Get_Datas();
@@ -109 +120 @@
   }
 
-
+ load_language('plugin.lang', MAIL_SUPERV_PATH);
 
                 $nom ='piwigo_logo_sombre_214x100.png'; 

extensions/Mail_supervisor/main.inc.php

@@ -24 +24 @@
 /*
 Plugin Name: Mail supervisor
-Version: 1.1.5
+Version: 1.1.6
 Description:  Mail supervisor surveille l'envoie des mails. 
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=315
@@ -117 +117 @@
         }else{
    
-                if (!empty($args['Cc']))
+  
+     }
+
+//=============================================================================         
+if (!empty($args['Cc']))
                         {
-                         $headers= corrige_header('Cc',$headers);
-                                 
+                         $headers= corrige_header('Cc',$headers,$args);
                         }
                 if (!empty($args['Bcc']))
                         {   
-                                   $headers     = corrige_header('Bcc',$headers); 
-                        }
-
-  
-     }
-
+                                   $headers     = corrige_header('Bcc',$headers,$args); 
+                        }
+//=============================================================================                 
 if ($mails_options[2]=='on')   {
 
@@ -152 +152 @@
                  if ($nb_destinataires > 0) {
                    $ret = mail($mailto, $subject, $content, $headers);
-/* <br />
-<b>Warning</b>:  mail() [<a href='function.mail'>function.mail</a>]: Trop de spam. Fonction mail() bloque.
- in <b>/mnt/102/sdb/9/5/cl.josse/Galerie/plugins/mail_supervisor/main.inc.php</b> on line <b>132</b><br />
-*/
+
                         }else{
                            $message .='Nombre de destinataires = 0';

extensions/Mail_supervisor/maintain.inc.php

@@ -31 +31 @@
 
 include_once (MAIL_SUPERV_PATH.'include/constants.php');
-global $lang;
+
 include_once (MAIL_SUPERV_PATH.'include/fonctions.php');
 
@@ -41 +41 @@
   SELECT  count(`id`) as total   FROM `'.PLUGINS_TABLE.'` WHERE `id` LIKE "free_mail"   ;';
      $plugs = mysql_fetch_array(pwg_query($q));
- $nb= $plugs['total'];
+         $nb= $plugs['total'];
 
   if (count($nb)>=1) {