Changeset 4040 for extensions/Mail_supervisor/include

Timestamp:

Oct 15, 2009, 10:09:57 AM (15 years ago)

Author:

cljosse

Message:

[mail_supervisor] insert multi tabs

File:

• extensions/Mail_supervisor/include/fonctions.php (modified) (7 diffs)

extensions/Mail_supervisor/include/fonctions.php

@@ -30 +30 @@
 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'); 
+
 global $period_search,$period_match ;
+
+
+
         $period_search=array("D","H","M","S","W");
         array_push($period_search,l10n('Week'),l10n('Day'),l10n('Hour'),l10n('Minute'),l10n('Seconde'));
@@ -71 +78 @@
                         
                         `message`          = "'.$mails_données['message'].'",
+                        `message_test`          = "'.$mails_données['message_test'].'",
                         `header_text`      = "'.$mails_données['header_text'].'"
                 WHERE `id` =1 LIMIT 1 ';
                 
 
-      pwg_query($query);
+    if (  pwg_query($query)) return;
+        
+        vérif_base() ;
+        if (  pwg_query($query)) return;
+
+        
+        ;
 
 
@@ -262 +276 @@
                 `nb_spams_periode` TEXT  ,      
                 
-                `quarantaine` TEXT NOT NULL ,
+                `quarantaine` TEXT ,
                 `date_quarantaine` INT NOT NULL DEFAULT '0',
                 `quarantaine_periode` TEXT  ,   
                         
                 
-                `message` TEXT NOT NULL , 
-                `header_text` TEXT NOT NULL , 
+                `message` TEXT  , 
+                `message_test` TEXT  , 
+                `header_text` TEXT , 
         PRIMARY KEY  (`id` )
          )
@@ -306 +321 @@
                                                         
                 if (!in_array( "quarantaine",$table)) { 
-          $query = "ALTER TABLE `".MAIL_SUPERV_TABLE."` ADD `quarantaine` TEXT NOT NULL , ";
+          $query = "ALTER TABLE `".MAIL_SUPERV_TABLE."` ADD `quarantaine` TEXT  , ";
                            pwg_query($query);            }      
                            
@@ -320 +335 @@
           $query = "ALTER TABLE `".MAIL_SUPERV_TABLE."` ADD `message` TEXT   ";
                            pwg_query($query);            }      
+                           
+                if (!in_array( "message_test",$table)) {        
+          $query = "ALTER TABLE `".MAIL_SUPERV_TABLE."` ADD `message_test` TEXT   ";
+                           pwg_query($query);            }                                 
                            
                 if (!in_array( "header_text",$table)) { 
@@ -380 +399 @@
 }
 
-function test_envoie()
-{
-global $infos_message,$erreur_message ,$conf,$user ;
-
-
-//$infos_message=memo_var($user);
-
-$admins = array();
+function get_liste($group_id)
+{
+global $conf ;
+
   $query = '
-select
-  U.'.$conf['user_fields']['username'].' as username,
-  U.'.$conf['user_fields']['email'].' as mail_address
-from
-  '.USERS_TABLE.' as U,
-  '.USER_INFOS_TABLE.' as I
-where
-  I.user_id =  U.'.$conf['user_fields']['id'].' and
-  I.status in (\'webmaster\',  \'admin\') and
-  I.adviser = \'false\' and
-  '.$conf['user_fields']['email'].' is not null and
-  I.user_id <> '.$user['id'].'
-order by
-  username
-';
-//==================================================================================
-
+SELECT DISTINCT u.'.$conf['user_fields']['id'].' AS id,
+                u.'.$conf['user_fields']['username'].' AS username,
+                u.'.$conf['user_fields']['email'].' AS email,
+                ui.status,
+                ui.adviser,
+                ui.enabled_high,
+                ui.level
+  FROM '.USERS_TABLE.' AS u
+    INNER JOIN '.USER_INFOS_TABLE.' AS ui
+      ON u.'.$conf['user_fields']['id'].' = ui.user_id
+    LEFT JOIN '.USER_GROUP_TABLE.' AS ug
+      ON u.'.$conf['user_fields']['id'].' = ug.user_id
+  WHERE ug.group_id='.$group_id.' ';
+
+
+ 
+ $groups=array();
   $datas = pwg_query($query);
   
@@ -411 +426 @@
   if (!empty($datas))
   {
-    while ($admin = mysql_fetch_array($datas))
+    while ($group = mysql_fetch_array($datas))
     {
-      if (!empty($admin['mail_address']))
+
+        
+      if (!empty($group['email']))
       {
-        array_push($admins, format_email($admin['username'], $admin['mail_address']));
-        
+        array_push($groups, format_email($group['username'], $group['email'] ));
       }
     }
-  }
-
-  if (count($admins) > 0)
-  {
-  
-  ob_start();
-        $erreur_message ="";
- //     $infos_message .=   memo_var($admins);
-        
-
-          
- //===========================================================
-        $args = array();
-        $args['Bcc']=$admins;
-        $message_texte="Bonjour.";
-        $message_html="Test";
-/*
-        $limite = "_parties_".generate_key(32);; 
- //     $limite=$conf_mail['boundary_key'];
-                $nom ='piwigo_logo_sombre_214x100.png'; 
-                $typemime='image/jpeg';
-
-  $attachement = "-----=".$limite."\n"; 
-  $attachement .= "Content-Type: ".$typemime."; name=\"".$nom."\"\n"; 
-  $attachement .= "Content-Transfer-Encoding: base64\n"; 
-  $attachement .= "Content-Disposition: attachment; filename=\"".$nom."\"\n\n"; 
-  $fd = fopen( $fichier, "r" ); 
-  $contenu = fread( $fd, filesize( $fichier ) ); 
-  fclose( $fd ); 
-  $attachement .= chunk_split(base64_encode($contenu)); 
-  $attachement .= "\n\n\n-----=".$limite."\n"; 
-  */
- //==========================================================================
-
- $args['subject']="Plugin Piwigo TEST";
- $args['content']="TEST ";
- 
-          $infos_message .="ARGUMENTS.".memo_var($args);
-   $infos_message .="TEST ENVOIE [admin].".memo_var($admins);
-
-        $ret= pwg_mail( "", $args); 
-                $m= ob_get_contents();
-        ob_end_clean();
-                $erreur_message .=$m;
-        }
+  } 
+  return $groups ;
+  
 }