Changeset 4049

Timestamp:

Oct 16, 2009, 10:26:40 AM (15 years ago)

Author:

cljosse

Message:

[mail_supervisor] modif bug in fonctions.php

Location:

extensions/Mail_supervisor

Files:

• admin (modified) (1 prop)
• include/fonctions.php (modified) (5 diffs)
• language (modified) (1 prop)
• language/fr_FR (modified) (1 prop)
• main.inc.php (modified) (3 diffs)
• maintain.inc.php (modified) (2 diffs)

extensions/Mail_supervisor/include/fonctions.php

@@ -29 +29 @@
 if (!defined('MAIL_SUPERV_PATH')) define('MAIL_SUPERV_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
 
-load_language('plugin.lang', MAIL_SUPERV_PATH);
+
 include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 
 include_once (MAIL_SUPERV_PATH.'include/function_test_send.php'); 
+
+load_language('plugin.lang', MAIL_SUPERV_PATH);
 
 global $period_search,$period_match ;
@@ -79 +81 @@
                         
                         `message`          = "'.$mails_données['message'].'",
-                        `message_test`          = "'.$mails_données['message_test'].'",
+                        `message_test`     = "'.$mails_données['message_test'].'",
                         `header_text`      = "'.$mails_données['header_text'].'"
                 WHERE `id` =1 LIMIT 1 ';
@@ -177 +179 @@
          return $data;
 }
+//===============================================
+function not_is_empty($variable)
+{
+global $args;
+
+ echo $variable." ".count($args[$variable]) ;
+ if (isset($args[$variable]))
+ 
+  {
+ 
+     if ( count($args[$variable]) > 0) ;
+        {
+ echo count($args[$variable]) ;
+        $args[$variable]=array_filter($args[$variable]);
+ echo count($args[$variable]) ;
+ 
+         }
+  }
+}
+        
 
 //=================================================================================
@@ -182 +204 @@
         {
         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;
+        $headers = preg_replace('/.*'.$Carbonne.'(.*).\n/i', $Carbonne.' : '.get_strict_email_list()."\n", $headers);
+return $headers;
 
                 
@@ -340 +361 @@
         '.time().',
         2000,
-        "1 week",
+        "1 "'.l10n('Week').'",
         
         0,
         '.time().',
         10,
-        "2 day",
+        "2 "'.l10n('Day').'",
         
         false,
         '.time().',
-        "2 day",
+        "2 "'.l10n('Day').'",
         
         "Init.",
+        "'.l10n('supervisor').'",
          "'.l10n('hello').'"
          )

extensions/Mail_supervisor/main.inc.php

@@ -96 +96 @@
                 }    
  if ($mailto<>"" )            $nb_destinataires +=1; 
- if (!empty($args['Cc']))     $nb_destinataires += count($args['Cc']);
- if (!empty($args['Bcc']))    $nb_destinataires += count($args['Bcc']);
+
+                if (!empty($args['Bcc']))  {  
+                        $nb_destinataires += count($args['Bcc']); 
+                        } 
+                if (!empty($args['Cc']))  {   
+                        $nb_destinataires += count($args['Cc']); 
+                        }
    //================= réécriture de l'entête ===============================
 if ( $nb_destinataires  == 1 )
@@ -103 +108 @@
                 if ($mailto == "" ) 
                   {
-                  
-                          if (!empty($args['Cc']))  $mailto  = get_strict_email_list(implode(',', $args['Cc'])) ;
-                          if (!empty($args['Bcc'])) $mailto  = get_strict_email_list(implode(',', $args['Bcc'])) ;
-                          
+                          if (!empty($args['Cc']) and count($args['Cc']) > 0 )  $mailto  = get_strict_email_list(implode(',', $args['Cc'])) ;
+                          if (!empty($args['Bcc']) and count($args['Bcc']) > 0 ) $mailto  = get_strict_email_list(implode(',', $args['Bcc'])) ;
+                         
                                 $headers = preg_replace('/.*Bcc(.*).\n/i', '', $headers);
                                 $headers = preg_replace('/.*Cc(.*).\n/i', '', $headers);
+                                
                   }
         }else{
-
    
                 if (!empty($args['Cc']))
@@ -147 +151 @@
                  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

@@ -67 +67 @@
 
          
-
+   pwg_query( $q );
+      $q = '
+      DELETE FROM '.CONFIG_TABLE.'
+      WHERE param="mail_superv"
+    ;';
+    pwg_query($q);
                 
   
@@ -77 +82 @@
 
 
-vérif_base();
+        vérif_base();
 
 }