Changeset 4206

Timestamp:

Nov 5, 2009, 5:15:31 PM (14 years ago)

Author:

cljosse

Message:

[mail_supervisor] update file help 2

Location:

extensions/Mail_supervisor

Files:

• admin/mail_black_liste.tpl (modified) (1 diff)
• admin/mail_superv_admin.php (modified) (6 diffs)
• admin/mail_superv_help.tpl (modified) (1 diff)
• include/fonctions.php (modified) (2 diffs)
• language/fr_FR/help/plugin.lang.php (modified) (1 diff)
• main.inc.php (modified) (1 diff)
• maintain.inc.php (modified) (3 diffs)

extensions/Mail_supervisor/admin/mail_black_liste.tpl

@@ -11 +11 @@
     <legend >{'options'|translate}</legend>
  <table> 
- 
-<td><input type="checkbox" name="NO_MAIL_LIST" value="on" {$no_mail_list}  />&nbsp;&nbsp;{'no_mail_list'|translate}     </td>
-<td><input type="checkbox" name="NO_CONNECT" value="on" {$no_connect} />&nbsp;&nbsp;{'no_connect'|translate}</td>
-<td><input type="checkbox" name="SET_AUTO" value="on" {$set_auto} />&nbsp;&nbsp;{'set_auto'|translate}</td>
 
+<td><input type="checkbox" name="NO_MAIL_LIST" value="on" {$NO_MAIL_LIST}  />&nbsp;&nbsp;{'no_mail_list'|translate}     </td>
+<td><input type="checkbox" name="NO_CONNECT" value="on" {$NO_CONNECT} />&nbsp;&nbsp;{'no_connect'|translate}</td>
+<td><input type="checkbox" name="SET_AUTO" value="on" {$SET_AUTO} />&nbsp;&nbsp;{'set_auto'|translate}</td>
 
 <tr><td>

extensions/Mail_supervisor/admin/mail_superv_admin.php

@@ -51 +51 @@
  load_language('plugin.lang', MAIL_SUPERV_PATH);
 
- 
-
-$mails_options = explode("," , $conf['mail_superv']);
-
-
-if (count($mails_options) < 6 )
-{
-$mails_options[]='off';
-
-}
-if (count($mails_options) < 7 )
-{
-$mails_options[]='';
-
-}
-
-$mails_données=Get_Datas();
 
         if (!isset($_GET['tab']))
@@ -105 +88 @@
 $error = array();
 
+
+$mails_options = explode("," , $conf['mail_superv']);
+  
+$mails_données=Get_Datas();
 vérif_base();
 
@@ -159 +146 @@
          $infos_message .=  l10n('save_config') ;
         }
-        
+
 if ( isset($_POST['submit']) )
 {
 //Options
-  $mails_options[0] = isset($_POST['check_mailto']) ? $_POST['check_mailto'] : '' ;
-  $mails_options[1] = isset($_POST['check_header_carbon']) ? $_POST['check_header_carbon'] : '' ;
-  $mails_options[2] = isset($_POST['check_header_text']) ? $_POST['check_header_text'] : '' ;
-
+
+
+  $mails_options[0] = isset($_POST['check_mailto']) ? $_POST['check_mailto'] : 'off' ;
+  $mails_options[1] = isset($_POST['check_header_carbon']) ? $_POST['check_header_carbon'] : 'off' ;
+  $mails_options[2] = isset($_POST['check_header_text']) ? $_POST['check_header_text'] : 'off' ;
   
 //données  
@@ -181 +169 @@
          sauve_données();
 //=======================================================================================================
-                $infos_message .=  l10n('save_config') ;
+                $infos_message .=  l10n('save_config')  ;
 }
 
-        $mails_options = explode("," , $conf['mail_superv']);
+        
         $mails_données = Get_Datas();
 
@@ -199 +187 @@
 $template->assign(
                                         array(
-   'check_mailto' => $mails_options[0] == 'on' ? 'checked="checked"' : '' ,
-   'check_header_carbons' => $mails_options[1] == 'on' ? 'checked="checked"' : '' ,
-   'check_header_text' => $mails_options[2] == 'on' ? 'checked="checked"' : '' ,
+   'check_mailto' => ($mails_options[0] == 'on') ? 'checked="checked"' : '' ,
+   'check_header_carbons' => ($mails_options[1] == 'on') ? 'checked="checked"' : '' ,
+   'check_header_text' => ($mails_options[2] == 'on') ? 'checked="checked"' : '' ,
 
    
@@ -329 +317 @@
                 $ip_black="";
                 $info_ip ="";
+                 
 
                 include  (MAIL_SUPERV_PATH.'include/save_info.php'); 

extensions/Mail_supervisor/admin/mail_superv_help.tpl

@@ -209 +209 @@
 </div> <!-- Fonctions -->
 
-
  </fieldset></div>

extensions/Mail_supervisor/include/fonctions.php

@@ -116 +116 @@
 {
 global $mails_options ;
-        $query = '
-    UPDATE '.CONFIG_TABLE.'
-    SET value="'.$mails_options[0]. ',' .$mails_options[1]. ',' .$mails_options[2].',' .$mails_options[3]. ',' .$mails_options[4].  ',' .$mails_options[5]. ',' .$mails_options[6]. '"
-    WHERE param="mail_superv"
-    LIMIT 1';
- pwg_query($query);
-
+ if ( isset($mails_options) )
+        {
+          if ( count($mails_options) > 6 ) 
+           {
+                $valeurs = implode( ',',$mails_options);
+                $query = '
+                UPDATE '.CONFIG_TABLE.'
+                SET value="'. $valeurs . '"
+                WHERE param = "mail_superv"
+                LIMIT 1';
+                        pwg_query($query);
+          }
+        }
 }
 //=================================================================================
@@ -653 +659 @@
   global $mails_options ;
    global $superv_bl_champs,$superv_bl_type ; 
-        
-$mails_options = explode("," , $conf['mail_superv']);
-        
-
-if (count($mails_options) < 6 )
-{
-$mails_options[]='off';
-
-}
-if (count($mails_options) < 7 )
-{
-$mails_options[]='';
-
-}
+
+ 
+if (count($mails_options) < 6 ) return false ;
+ 
 $ip = $_SERVER['REMOTE_ADDR'] ;
  

extensions/Mail_supervisor/language/fr_FR/help/plugin.lang.php

@@ -46 +46 @@
 
 $lang['hlp_5_1']='Dernier message renvoyé par la fonction mail().';
-//=====================================================================
 
 

extensions/Mail_supervisor/main.inc.php

@@ -23 +23 @@
         // lecture config table -------------
  load_language('plugin.lang', MAIL_SUPERV_PATH);
-   
-   
+ 
         $mails_options = explode("," , $conf['mail_superv']);
         

extensions/Mail_supervisor/maintain.inc.php

@@ -76 +76 @@
   $q = '
     INSERT INTO '.CONFIG_TABLE.' (param, value, comment)
-    VALUES ("mail_superv","off,off,off ,off,off,127.0.0.1","Parametres du plugin Mail superviseur")
+    VALUES ("mail_superv","off,off,off,off,off,off,127.0.0.1","Parametres du plugin Mail superviseur")
   ;';
   pwg_query($q);
@@ -102 +102 @@
 
     pwg_query($q);
-  }
+  
    $q = 'DROP TABLE IF EXISTS  '.MAIL_BLACK_LISTE_TABLE.';';
    pwg_query( $q );  
@@ -108 +108 @@
    pwg_query( $q );
    
- 
+ }
   
 }