Index: /extensions/Mail_supervisor/admin/clear/theme.css
===================================================================
--- /extensions/Mail_supervisor/admin/clear/theme.css	(revision 10418)
+++ /extensions/Mail_supervisor/admin/clear/theme.css	(revision 10419)
@@ -23,5 +23,5 @@
   color: #999;
   cursor: pointer;
-  font-size: 110%;
+  /*font-size: 110%;*/
   overflow: hidden;
   padding: 8px 41px;
Index: /extensions/Mail_supervisor/admin/default/theme.css
===================================================================
--- /extensions/Mail_supervisor/admin/default/theme.css	(revision 10418)
+++ /extensions/Mail_supervisor/admin/default/theme.css	(revision 10419)
@@ -1,3 +1,3 @@
-﻿.bug {
+.bug {
   background-image: url('../../smilies/mouche.gif');
   background-repeat: no-repeat;
Index: /extensions/Mail_supervisor/admin/header_2_1.tpl
===================================================================
--- /extensions/Mail_supervisor/admin/header_2_1.tpl	(revision 10418)
+++ /extensions/Mail_supervisor/admin/header_2_1.tpl	(revision 10419)
@@ -1,3 +1,3 @@
-﻿{known_script id="jquery" src = $ROOT_URL|@cat:"themes/default/js/jquery.packed.js" now=0} 
+{known_script id="jquery" src = $ROOT_URL|@cat:"themes/default/js/jquery.packed.js" now=0}
 {known_script id="jquery.cluetip" src = $ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
 {known_script id="jquery.ui" src= $ROOT_URL|@cat:"themes/default/js/ui/minified/ui.core.min.js"}
@@ -6,3 +6,2 @@
 <link rel="stylesheet" type="text/css" href="{$MAIL_SUPERV_PATH}admin/{$theme}/theme.css" />
 {/html_head}
-<input id="action_spam" name="action_spam" type="hidden" value="{$action_spam}" />
Index: /extensions/Mail_supervisor/admin/header_2_2.tpl
===================================================================
--- /extensions/Mail_supervisor/admin/header_2_2.tpl	(revision 10418)
+++ /extensions/Mail_supervisor/admin/header_2_2.tpl	(revision 10419)
@@ -1,3 +1,3 @@
-﻿{combine_script id="jquery" path= "themes/default/js/jquery.min.js" }
+{combine_script id="jquery" path= "themes/default/js/jquery.min.js" }
 {combine_script id="jquery.cluetip" path= "themes/default/js/plugins/jquery.cluetip.js" require="jquery"}
 {combine_script id="my_script" path= $MAIL_SUPERV_PATH|@cat:"include/Scripts.js" }
Index: /extensions/Mail_supervisor/admin/mail_black_liste.tpl
===================================================================
--- /extensions/Mail_supervisor/admin/mail_black_liste.tpl	(revision 10418)
+++ /extensions/Mail_supervisor/admin/mail_black_liste.tpl	(revision 10419)
@@ -1,17 +1,17 @@
-{* $Id: mail_black_liste.tpl cljosse $ *} 
+{* $Id: mail_black_liste.tpl cljosse $ *}
 <script type="text/javascript">
   var is_supervisor = true;
- var confirm_message = "{'Sv_Are_you_sure'|@translate|@escape:'javascript'}?";  
+ var confirm_message = "{'Sv_Are_you_sure'|@translate|@escape:'javascript'}?";
 </script>
 
 <div class="titrePage">
-		<h2>{'Sv_supervisor'|translate}{'Sv_version'|translate}{$version}</h2>
-</div> 
+        <h2>{'Sv_supervisor'|translate}{'Sv_version'|translate}{$version}</h2>
+</div>
 <div class="bug" ></div>
 <form action='' method="post" name="form_black">
 <fieldset>
 <legend >{'Sv_options'|translate}</legend>
-  <table> 
-    <td><input type="checkbox" name="no_mail_list" value="on" {$no_mail_list}  />&nbsp;&nbsp;{'Sv_no_mail_list'|translate}	</td>
+  <table>
+    <td><input type="checkbox" name="no_mail_list" value="on" {$no_mail_list}  />&nbsp;&nbsp;{'Sv_no_mail_list'|translate}  </td>
     <td style="visibility:hidden" ><input type="checkbox" name="no_connect" value="off" {$no_connect} />&nbsp;&nbsp;{'Sv_no_connect'|translate} </td>
     <td style="visibility:visible" ><input type="checkbox"  name="set_auto" value="off" {$set_auto} />&nbsp;&nbsp;{'Sv_set_auto'|translate} </td>
@@ -25,100 +25,100 @@
 <legend>{'Sv_black_liste'|translate}</legend>
 <table>
- <td><input name="ip_black" id = "ip_black_test" type="text" value="{$ip_black}"	 />
- <input class="cluetip" title="{'Sv_Test'|translate}|{'Sv_hlp_7_3'|translate}"   type="submit" name="submit" value="{'Sv_Test'|translate}"  /> 
- { if $ip_black_len > 0}		
-	{if  $IS_SPAM  == true }
-		<label class="erreur">	{'Sv_is_a_spam'|@translate} </label>
-	{ else }
-			{ if  $istype == 'IP'} 	
-				<label class="erreur">	{'Sv_not_a_spam'|@translate} </label>
-			{ else }
-			   <label class="erreur">	{'Sv_no_verif'|@translate} </label>
-			{/if}			
-	{/if}
+ <td><input name="ip_black" id = "ip_black_test" type="text" value="{$ip_black}"     />
+ <input class="cluetip" title="{'Sv_Test'|translate}|{'Sv_hlp_7_3'|translate}"   type="submit" name="submit" value="{'Sv_Test'|translate}"  />
+ { if $ip_black_len > 0}
+    {if  $IS_SPAM  == true }
+        <label class="erreur">  {'Sv_is_a_spam'|@translate} </label>
+    { else }
+            { if  $istype == 'IP'}
+                <label class="erreur">  {'Sv_not_a_spam'|@translate} </label>
+            { else }
+               <label class="erreur">   {'Sv_no_verif'|@translate} </label>
+            {/if}
+    {/if}
 </td>
-	<td>
-	<input class="bp cluetip" 
-		title="{'Sv_Ajout'|translate}|{'Sv_hlp_7_4'|translate}"
-		type="submit" 
-		name="submit" 
-		rel="ajout:{$ip_black}"
-		value="{'Sv_Ajout'|@translate}" 
-		alt="{'Sv_Ajout'|@translate} : {$ip_black}" 
-	/>
+    <td>
+    <input class="bp cluetip"
+        title="{'Sv_Ajout'|translate}|{'Sv_hlp_7_4'|translate}"
+        type="submit"
+        name="submit"
+        rel="ajout:{$ip_black}"
+        value="{'Sv_Ajout'|@translate}"
+        alt="{'Sv_Ajout'|@translate} : {$ip_black}"
+    />
   </td>
   <td>
- <input type="image" name="submit"   class='bp row1' 
-  src="{$ROOT_URL}{$themeconf.admin_icon_dir}/plug_activate.png" 
+ <input type="image" name="submit"   class='bp row1'
+  src="{$ROOT_URL}{$themeconf.admin_icon_dir}/plug_activate.png"
   rel="ajout:{$ip_black}"
-  id="btn_ajout{$ip_black}" 
-  alt="{'Sv_Ajout'|@translate} : {$ip_black}"  
+  id="btn_ajout{$ip_black}"
+  alt="{'Sv_Ajout'|@translate} : {$ip_black}"
   title="{'Sv_Ajout'|@translate} {$ip_black}" />
 { else }
-		   
+
 {/if}
-			
+
 </td>
-	  
-	
-			    
-	 <td>
-		 <a href="http://www.stopforumspam.com" >  <img src="{$img_logo}"  width="32"/>  http://www.stopforumspam.com
+
+
+
+     <td>
+         <a href="http://www.stopforumspam.com" >  <img src="{$img_logo}"  width="32"/>  http://www.stopforumspam.com
  </a></td>
- </tr>	<tr>   </tr>
-     </table>  
- 
-	<table class="table2" >
-       {if not empty($liste_bl)} 
-	     <tr class="throw">
-    		<th>{$champs_bl[1]|@translate}</th>
-			<th>{$champs_bl[7]|@translate}</th>
-    		<th>{'Sv_blackliste'|@translate}</th>
-  		</tr>
-  		{foreach from=$liste_bl item=group name=group_loop}
-  		  <tr class="{if $smarty.foreach.group_loop.index is odd}row1{else}row2{/if}">
-	      	<td>{$group.ip}</td>
-				
-			<td>{$group.nb}</td>
-    		<td style="text-align:center;">
-			<input type="image" class="bp {if $smarty.foreach.group_loop.index is odd}row1{else}row2{/if}"  
-     				src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png" 
-	 				rel="raz:{$group.ip}"
-	 				id="btn_delete{$group.ip}" 
-      				title="{'Sv_delete'|@translate} {$group.ip}" 
-					alt="{'Sv_delete'|@translate} {$group.ip}" />
-    			</td>
-  		  </tr>
-  		{/foreach}
-		<tr></tr>
-		<tr></tr>
-  		<td> <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png" />{'Sv_unset_black_list'|@translate}</td>
-		<td> <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/plug_activate.png" />{'Sv_set_black_list'|@translate}</td>
+ </tr>  <tr>   </tr>
+     </table>
 
-	  {/if}
-	</table>	  
-</fieldset>	  
+    <table class="table2" >
+       {if not empty($liste_bl)}
+         <tr class="throw">
+            <th>{$champs_bl[1]|@translate}</th>
+            <th>{$champs_bl[7]|@translate}</th>
+            <th>{'Sv_blackliste'|@translate}</th>
+        </tr>
+        {foreach from=$liste_bl item=group name=group_loop}
+          <tr class="{if $smarty.foreach.group_loop.index is odd}row1{else}row2{/if}">
+            <td>{$group.ip}</td>
 
-	<fieldset > 
+            <td>{$group.nb}</td>
+            <td style="text-align:center;">
+            <input type="image" class="bp {if $smarty.foreach.group_loop.index is odd}row1{else}row2{/if}"
+                    src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png"
+                    rel="raz:{$group.ip}"
+                    id="btn_delete{$group.ip}"
+                    title="{'Sv_delete'|@translate} {$group.ip}"
+                    alt="{'Sv_delete'|@translate} {$group.ip}" />
+                </td>
+          </tr>
+        {/foreach}
+        <tr></tr>
+        <tr></tr>
+        <td> <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png" />{'Sv_unset_black_list'|@translate}</td>
+        <td> <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/plug_activate.png" />{'Sv_set_black_list'|@translate}</td>
+
+      {/if}
+    </table>
+</fieldset>
+
+    <fieldset >
         <legend>{'Sv_liste_ip'|translate}</legend>
-	 <p class="Style1">
-	     {'Sv_iP_adress'|translate} : {$IP}
+     <p class="Style1">
+         {'Sv_iP_adress'|translate} : {$IP}
      </p>
-<table class="table"> 	 
-    <td>{'Number of rows per page'|translate}</td>	 
-	   <td><input type="text" name="per_page"  value="{$per_page}" size=5  /></td>
+<table class="table">
+    <td>{'Number of rows per page'|translate}</td>
+       <td><input type="text" name="per_page"  value="{$per_page}" size=5  /></td>
 {if $start >0}
-	   <td><input class="submit" type="submit" name="prev"  value=   "{'previous_page'|translate}" /></td>
-	{ /if}
-  <td>{'page'|translate}</td>	   
+       <td><input class="submit" type="submit" name="prev"  value=   "{'previous_page'|translate}" /></td>
+    { /if}
+  <td>{'page'|translate}</td>
   <td><input type="text" name="start"  value="{$start}" size=5  /></td>
-  <td>/ {$maxipage}  </td>		   
-	{if $start < $maxipage }   
-	   <td><input class="submit" type="submit" name="next"  value=  "{'Next'|translate}"  /></td>
-		{ /if}   
-	   <td><input class="submit" type="submit" name="info" value="{'Sv_list'|translate}" /></td>
- </table>	
+  <td>/ {$maxipage}  </td>
+    {if $start < $maxipage }
+       <td><input class="submit" type="submit" name="next"  value=  "{'Next'|translate}"  /></td>
+        { /if}
+       <td><input class="submit" type="submit" name="info" value="{'Sv_list'|translate}" /></td>
+ </table>
  <table class="table2">
-  <tr class="throw">   
+  <tr class="throw">
    <th>{$champs_ip[0]|@translate}</th>
    <th>{$champs_ip[1]|@translate}</th>
@@ -129,6 +129,6 @@
    <th>{'Sv_blackliste'|@translate}</th>
   </tr>
-  {if not empty($liste_ip)}  
-   {foreach from=$liste_ip item=group name=group_loop}  
+  {if not empty($liste_ip)}
+   {foreach from=$liste_ip item=group name=group_loop}
     <tr class="{if $smarty.foreach.group_loop.index is odd}row1{else}row2{/if}">
     <td>{$group.id}</td>
@@ -139,11 +139,11 @@
     <td>{$group.total}</td>
     <td style="text-align:center;">
-		 <input type="image" 
-		   class="bp {if $smarty.foreach.group_loop.index is odd}row1{else}row2{/if}" 
-		   src="{$ROOT_URL}{$themeconf.admin_icon_dir}/plug_activate.png" 
-		   rel='ajout:{$group.IP}' 
-		   id="btn_permissions{$group.IP}"
-		   title="{'Sv_blacklist'|@translate} {$group.IP}"
-		   alt="{'Sv_blacklist'|@translate} {$group.IP}" />
+         <input type="image"
+           class="bp {if $smarty.foreach.group_loop.index is odd}row1{else}row2{/if}"
+           src="{$ROOT_URL}{$themeconf.admin_icon_dir}/plug_activate.png"
+           rel='ajout:{$group.IP}'
+           id="btn_permissions{$group.IP}"
+           title="{'Sv_blacklist'|@translate} {$group.IP}"
+           alt="{'Sv_blacklist'|@translate} {$group.IP}" />
     </td>
     <td style="text-align:center;"></td>
@@ -151,13 +151,13 @@
    {/foreach}
   {/if}
-  <td> <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/plug_activate.png" /> {'Sv_set_black_list'|@translate}</td> 
+  <td> <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/plug_activate.png" /> {'Sv_set_black_list'|@translate}</td>
  </table>
-</fieldset> 
+</fieldset>
 </form>
-<form action="" method="post" name="form_connexion" id="form_connexion" style="visibility:hidden"> 	
-		<input name="pays"  type="text" value =  ""  id = "pays"  >
-		<input name="ville"  type="text" value = ""  id = "ville"   >
-		<input name="region"  type="text" value =  ""   id = "region"   >
-		<input name="latitude"  type="text" value =  "" id = "latitude"   >
-		<input name="longitude"  type="text" value = "" id = "longitude"  >	
+<form action="" method="post" name="form_connexion" id="form_connexion" style="visibility:hidden">
+        <input name="pays"  type="text" value =  ""  id = "pays"  >
+        <input name="ville"  type="text" value = ""  id = "ville"   >
+        <input name="region"  type="text" value =  ""   id = "region"   >
+        <input name="latitude"  type="text" value =  "" id = "latitude"   >
+        <input name="longitude"  type="text" value = "" id = "longitude"  >
 </form >
Index: /extensions/Mail_supervisor/admin/mail_superv_admin.php
===================================================================
--- /extensions/Mail_supervisor/admin/mail_superv_admin.php	(revision 10418)
+++ /extensions/Mail_supervisor/admin/mail_superv_admin.php	(revision 10419)
@@ -47,19 +47,19 @@
   +1 '.$lang['Hour'].'<br />
   +1 '.$lang['Minute'].'<br />
-  +1 '.$lang['Second'].'<br />';  
- //==============================================================  
- load_language('help/plugin.lang', MAIL_SUPERV_PATH);	
- 
-	if (!isset($_GET['tab']))
-	$page['tab'] = 'mail_superv_admin';
+  +1 '.$lang['Second'].'<br />';
+ //==============================================================
+ load_language('help/plugin.lang', MAIL_SUPERV_PATH);
+
+    if (!isset($_GET['tab']))
+    $page['tab'] = 'mail_superv_admin';
 else
   $page['tab'] = $_GET['tab'];
 
-if (file_exists ( 'admin/themes/clear/icon/help.png')) 
+if (file_exists ( 'admin/themes/clear/icon/help.png'))
 {
 //version 2.1
- 
+
    $icon_path = 'themes/default/icon/help.png';
-   $path_js=  'themes/default/js/' ; 
+   $path_js=  'themes/default/js/' ;
 
  }
@@ -67,8 +67,8 @@
  {
 // version 1.9
-  $path_js=  "template-common/lib/";  
+  $path_js=  "template-common/lib/";
   $icon_path =  "admin/template/goto/theme/clear/icon/help.png";
 }
- 
+
 
 $tabhelp=  '  <img src="'.PHPWG_ROOT_PATH. $icon_path .'"  width=10px   alt="(?)"> ';
@@ -77,18 +77,18 @@
                l10n('Sv_Tab_set'),
                $my_base_url.'&amp;tab=mail_superv_admin');
-			   
+
 $tabsheet->add('mail_superv_test',
                l10n('Sv_Tab_test'),
                $my_base_url.'&amp;tab=mail_superv_test');
-			   
+
 $tabsheet->add( 'mail_black_liste',
                l10n('Sv_blackliste'),
-			   $my_base_url.'&amp;tab=mail_black_liste');
- 
-			   			   
+               $my_base_url.'&amp;tab=mail_black_liste');
+
+
 $tabsheet->add('mail_superv_help',
                 $tabhelp,
                $my_base_url.'&amp;tab=mail_superv_help');
-			   
+
 $tabsheet->select($page['tab']);
 $tabsheet->assign();
@@ -97,8 +97,8 @@
 $error = array();
 
-include_once (MAIL_SUPERV_PATH.'mail_super.inc.php'); 
-include_once (MAIL_SUPERV_PATH.'include/constants.php'); 
-
-  if (!isset($infos_message))	{
+include_once (MAIL_SUPERV_PATH.'mail_super.inc.php');
+include_once (MAIL_SUPERV_PATH.'include/constants.php');
+
+  if (!isset($infos_message))   {
       $infos_message = "";
   }
@@ -108,7 +108,7 @@
 
 if (isset($conf['mail_superv'])) {
-   global $pays,$region,$ville,$ip ;	
-    include_once (MAIL_SUPERV_PATH.'include/fonctions.php'); 
-//================================================================================================	
+   global $pays,$region,$ville,$ip ;
+    include_once (MAIL_SUPERV_PATH.'include/fonctions.php');
+//================================================================================================
 
    $mails_donnees = mail_supervisor::Get_Datas();
@@ -127,69 +127,69 @@
  //=========================================================
   if (!isset($ip)) {
-	  if (getenv("HTTP_CLIENT_IP")){    
-      $ip=getenv("HTTP_CLIENT_IP"); 	
-    } else{   
-      $ip=getenv("REMOTE_ADDR"); 	
-    }
-  }
-               
+      if (getenv("HTTP_CLIENT_IP")){
+      $ip=getenv("HTTP_CLIENT_IP");
+    } else{
+      $ip=getenv("REMOTE_ADDR");
+    }
+  }
+
 //================================================================================
 switch ($page['tab'])
  {
-   
+
 // *************************************************************************
 //                         initialisation                                  |
 // *************************************************************************
   case 'mail_superv_admin':
-	
+
 //=============================================================
 if ( isset($_POST['submit']) ) {
- 
-	if ( $_POST['submit'] == l10n('Sv_refresh')   ) {
-   	 	
-	if ($mails_donnees['nb_mails'] == 0 )  
-	    $mails_donnees['date_mail'] = time();	
-	
-	if ($mails_donnees['nb_spams'] == 0 )
-	   $mails_donnees['date_spam'] = time();
-	
-	
-	if ($mails_donnees['quarantaine'] == false)
-	{ $mails_donnees['reste'] = 0;
-	  $mails_donnees['date_quarantaine']=time();
-	 }
-	 $infos_message .=  l10n('Sv_refresh') .'<br />';
+
+    if ( $_POST['submit'] == l10n('Sv_refresh')   ) {
+
+    if ($mails_donnees['nb_mails'] == 0 )
+        $mails_donnees['date_mail'] = time();
+
+    if ($mails_donnees['nb_spams'] == 0 )
+       $mails_donnees['date_spam'] = time();
+
+
+    if ($mails_donnees['quarantaine'] == false)
+    { $mails_donnees['reste'] = 0;
+      $mails_donnees['date_quarantaine']=time();
+     }
+     $infos_message .=  l10n('Sv_refresh') .'<br />';
      mail_supervisor::sauve_donnees();
- 	 $aff_nb = false ;
- 
-	
-	}
-
-	if ( $_POST['submit'] == l10n('Sv_raz')   ) {
-	 $mails_donnees['date_quarantaine']=time();
-	 $mails_donnees['nb_mails'] = 0  ;
-	 $mails_donnees['nb_spams'] = 0  ;
-	 $mails_donnees['date_mail'] = time();
-	 $mails_donnees['date_spam'] = time();	
-	 $mails_donnees['reste'] = 0;
-	 $mails_donnees['quarantaine']='false';	
+     $aff_nb = false ;
+
+
+    }
+
+    if ( $_POST['submit'] == l10n('Sv_raz')   ) {
+     $mails_donnees['date_quarantaine']=time();
+     $mails_donnees['nb_mails'] = 0  ;
+     $mails_donnees['nb_spams'] = 0  ;
+     $mails_donnees['date_mail'] = time();
+     $mails_donnees['date_spam'] = time();
+     $mails_donnees['reste'] = 0;
+     $mails_donnees['quarantaine']='false';
     mail_supervisor::sauve_donnees();
-	 $infos_message .=  l10n('Sv_raz') .'<br />'; 	
-	}
+     $infos_message .=  l10n('Sv_raz') .'<br />';
+    }
 
   //===================================================================
-	if ( $_POST['submit'] == l10n('Sv_Valider') ) {
-    $mails_options['check_mailto'] = isset($_POST['check_mailto']) ? $_POST['check_mailto'] : 'off' ;               
-    $mails_options['check_header_carbon'] = isset($_POST['check_header_carbon']) ? $_POST['check_header_carbon'] : 'off' ; 
-    $mails_options['check_header_text'] = isset($_POST['check_header_text']) ? $_POST['check_header_text'] : 'off' ;     
-  
-    //donnees  
+    if ( $_POST['submit'] == l10n('Sv_Valider') ) {
+    $mails_options['check_mailto'] = isset($_POST['check_mailto']) ? $_POST['check_mailto'] : 'off' ;
+    $mails_options['check_header_carbon'] = isset($_POST['check_header_carbon']) ? $_POST['check_header_carbon'] : 'off' ;
+    $mails_options['check_header_text'] = isset($_POST['check_header_text']) ? $_POST['check_header_text'] : 'off' ;
+
+    //donnees
     $mails_donnees['nb_mails_maxi'] = isset($_POST['nb_mails_maxi']) ? $_POST['nb_mails_maxi'] :  $mails_donnees['nb_mails_maxi']  ;
-    $mails_donnees['nb_mails_periode'] = isset($_POST['nb_mails_periode']) ? $_POST['nb_mails_periode'] :  $mails_donnees['nb_mails_periode']  ;  
+    $mails_donnees['nb_mails_periode'] = isset($_POST['nb_mails_periode']) ? $_POST['nb_mails_periode'] :  $mails_donnees['nb_mails_periode']  ;
     $mails_donnees['nb_spams_maxi'] = isset($_POST['nb_spams_maxi']) ? $_POST['nb_spams_maxi'] :  $mails_donnees['nb_spams_maxi']  ;
     $mails_donnees['nb_spams_periode'] = isset($_POST['nb_spams_periode']) ? $_POST['nb_spams_periode'] :  $mails_donnees['nb_spams_periode']  ;
 
     $mails_donnees['quarantaine_periode'] = isset($_POST['quarantaine_periode']) ? $_POST['quarantaine_periode'] :  $mails_donnees['quarantaine_periode']  ;
- 
+
     $mails_donnees['message'] = isset($_POST['content']) ? $_POST['content'] :  $mails_donnees['message']  ;
     $mails_donnees['header_text'] = isset($_POST['header_text']) ? $_POST['header_text'] :  $mails_donnees['header_text']  ;
@@ -203,69 +203,69 @@
     $mails_donnees = mail_supervisor::Get_Datas() ;
   }
- }	
-	$mails_donnees = mail_supervisor::Get_Datas();
+ }
+    $mails_donnees = mail_supervisor::Get_Datas();
  verif_mails_donnees();
-//=============================================================================== 
- $rest_mail= $mails_donnees['rest_mail'];  	
- $rest_spam= $mails_donnees['rest_spam'];  	
- $reste= $mails_donnees['reste'];  
- $quarantaine = ($mails_donnees['quarantaine'] == 'true') ? true : false ;	
+//===============================================================================
+ $rest_mail= $mails_donnees['rest_mail'];
+ $rest_spam= $mails_donnees['rest_spam'];
+ $reste= $mails_donnees['reste'];
+ $quarantaine = ($mails_donnees['quarantaine'] == 'true') ? true : false ;
  $template->assign(
-  					array(
+                    array(
                         'check_mailto' => ($mails_options['check_mailto'] == 'on') ? 'checked="checked"' : '' ,
                         'check_header_carbons' => ($mails_options['check_header_carbon'] == 'on') ? 'checked="checked"' : '' ,
                         'check_header_text' => ($mails_options['check_header_text'] == 'on') ? 'checked="checked"' : '' ,
 
-   
+
                         'nb_mails' => $mails_donnees['nb_mails'] ,
                         'date_mail' => "'".date(l10n('Sv_formatdate'),$mails_donnees['date_mail'])."'" ,
-                        'nb_mails_maxi' => $mails_donnees['nb_mails_maxi'] ,	
-                        'nb_mails_periode' => "'". int_to_heure($mails_donnees['nb_mails_periode'])."'" ,	
-                        'time_mails_reste' => "'".int_to_heure( $rest_mail )."'" ,	
-	
+                        'nb_mails_maxi' => $mails_donnees['nb_mails_maxi'] ,
+                        'nb_mails_periode' => "'". int_to_heure($mails_donnees['nb_mails_periode'])."'" ,
+                        'time_mails_reste' => "'".int_to_heure( $rest_mail )."'" ,
+
                         'nb_spams' => $mails_donnees['nb_spams'] ,
                         'date_spam' => "'".date(l10n('Sv_formatdate'),$mails_donnees['date_spam'])."'" ,
-                        'nb_spams_maxi' => $mails_donnees['nb_spams_maxi'] ,	
+                        'nb_spams_maxi' => $mails_donnees['nb_spams_maxi'] ,
                         'nb_spams_periode' => "'".int_to_heure($mails_donnees['nb_spams_periode'])."'" ,
-                        'time_spams_reste' => "'".int_to_heure($rest_spam)."'" ,	
-	 
+                        'time_spams_reste' => "'".int_to_heure($rest_spam)."'" ,
+
                         'quarantaine' => $quarantaine ,
                         'date_quarantaine' => "'".date(l10n('Sv_formatdate'),time()+$reste)."'" ,
                         'quarantaine_periode' => "'".int_to_heure($mails_donnees['quarantaine_periode'])."'" ,
                         'reste' => "'".int_to_heure($reste)."'",
- 
+
                         'message' => $mails_donnees['message'] ,
                         'header_text' => "'".$mails_donnees['header_text']."'" ,
-	
-                        'PHPWG_VERSION' =>	 PHPWG_VERSION ,
-                        'version' =>	 $version ,
+
+                        'PHPWG_VERSION' =>   PHPWG_VERSION ,
+                        'version' =>     $version ,
                         'MAIL_SUPERV_PATH' =>  MAIL_SUPERV_PATH ,
                         'path_js' => $path_js,
                         'MAIL_SUPERV_PATH_ABS' => MAIL_SUPERV_PATH_ABS,
-     
-		 				)
-				);	                  
-	 $template->set_filenames(array('plugin_admin_content' => realpath(MAIL_SUPERV_PATH . 'admin/mail_superv_admin.tpl')));
-	 $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');		
- break; 
+
+                        )
+                );
+     $template->set_filenames(array('plugin_admin_content' => realpath(MAIL_SUPERV_PATH . 'admin/mail_superv_admin.tpl')));
+     $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
+ break;
   // *************************************************************************
 //                        TEST                                             |
 // *************************************************************************
- 
+
    case 'mail_superv_test':
-   		load_language('plugin.lang', MAIL_SUPERV_PATH); 
-   		$mails_donnees = mail_supervisor::Get_Datas() ;
-   		$group_id = isset($_POST['group']) ? $_POST['group'] :  '-1'  ;
-
-		if ($group_id >= 0) {
-      		$query = 'SELECT
-    					name
-  						FROM '.GROUPS_TABLE.'
-  						WHERE id = '.$group_id.'
-						;';
-  			list($group_name) = mysql_fetch_row(pwg_query($query));
-		}	else {
-				$group_name="";		 
-		}		
+        load_language('plugin.lang', MAIL_SUPERV_PATH);
+        $mails_donnees = mail_supervisor::Get_Datas() ;
+        $group_id = isset($_POST['group']) ? $_POST['group'] :  '-1'  ;
+
+        if ($group_id >= 0) {
+            $query = 'SELECT
+                        name
+                        FROM '.GROUPS_TABLE.'
+                        WHERE id = '.$group_id.'
+                        ;';
+            list($group_name) = mysql_fetch_row(pwg_query($query));
+        }   else {
+                $group_name="";
+        }
 
 //================================================
@@ -277,117 +277,117 @@
   set_make_full_url();
 
-  /* TODO: if $category['representative_picture_id'] 
+  /* TODO: if $category['representative_picture_id']
     is empty find child representative_picture_id */
 
 
-	if (function_exists('get_user_language_desc') ) $titre = get_user_language_desc($conf['gallery_title']);
-	else $titre=$conf['gallery_title'];
-
-	$message = empty($_POST['MAIL_CONTENT']) ? $mails_donnees['message_test'] : stripslashes($_POST['MAIL_CONTENT']);
+    if (function_exists('get_user_language_desc') ) $titre = get_user_language_desc($conf['gallery_title']);
+    else $titre=$conf['gallery_title'];
+
+    $message = empty($_POST['MAIL_CONTENT']) ? $mails_donnees['message_test'] : stripslashes($_POST['MAIL_CONTENT']);
 
  if (function_exists('get_user_language_desc') ) $message = get_user_language_desc($message);
 
  if ( $_POST['Submit']==l10n('Sv_Envoyer') ) {
-	 /*
-	 * send en email to user's group
-	 *
-	 * @param:
-	 *   - group_id: mail are sent to group with this Id
-	 *   - email_format: mail format
-	 *   - keyargs_subject: mail subject on l10n_args format
-	 *   - dirname: short name of directory including template
-	 *   - tpl_shortname: short template name without extension
-	 *   - assign_vars: array used to assign_vars to mail template
-	 *   - language_selected: send mail only to user with this selected language
-	 *
-	 * @return boolean (Ok or not)
-	*/   
-  	pwg_mail_group(
-    		$_POST['group'],
-    		get_str_email_format(true),  
-    		get_l10n_args('[%s] ---> %s', array($titre,'Information') ), //sujet
-    		'cat_group_info',  // template 
-    		array    ('CPL_CONTENT' => $message."\n\n".$user['username'] ),
-    		'' );
-	
-	$mails_donnees['message_test']= str_replace('"',"'",$message) ;
-
- 	unset_make_full_url();
-	mail_supervisor::sauve_donnees();
-	$mails_donnees = mail_supervisor::Get_Datas() ;
+     /*
+     * send en email to user's group
+     *
+     * @param:
+     *   - group_id: mail are sent to group with this Id
+     *   - email_format: mail format
+     *   - keyargs_subject: mail subject on l10n_args format
+     *   - dirname: short name of directory including template
+     *   - tpl_shortname: short template name without extension
+     *   - assign_vars: array used to assign_vars to mail template
+     *   - language_selected: send mail only to user with this selected language
+     *
+     * @return boolean (Ok or not)
+    */
+    pwg_mail_group(
+            $_POST['group'],
+            get_str_email_format(true),
+            get_l10n_args('[%s] ---> %s', array($titre,'Information') ), //sujet
+            'cat_group_info',  // template
+            array    ('CPL_CONTENT' => $message."\n\n".$user['username'] ),
+            '' );
+
+    $mails_donnees['message_test']= str_replace('"',"'",$message) ;
+
+    unset_make_full_url();
+    mail_supervisor::sauve_donnees();
+    $mails_donnees = mail_supervisor::Get_Datas() ;
     $query = 'SELECT
-    		name
-  			FROM '.GROUPS_TABLE.'
- 			WHERE id = '.$_POST['group'].'
-			;';
-		list($group_name) = mysql_fetch_row(pwg_query($query));
-		 
-		  array_push(
-					$page['infos'],
-					sprintf( l10n('An information email was sent to group "%s"'),
-							$group_name  )
-					); 
-								$group_id =-1 ;
-  }
-}  
+            name
+            FROM '.GROUPS_TABLE.'
+            WHERE id = '.$_POST['group'].'
+            ;';
+        list($group_name) = mysql_fetch_row(pwg_query($query));
+
+          array_push(
+                    $page['infos'],
+                    sprintf( l10n('An information email was sent to group "%s"'),
+                            $group_name  )
+                    );
+                                $group_id =-1 ;
+  }
+}
 
 //======================================================================================
   $groups[-1] = '---------';
   $query = ' SELECT id, name
-			FROM '.GROUPS_TABLE.'
-			ORDER BY name ASC
-			;';
+            FROM '.GROUPS_TABLE.'
+            ORDER BY name ASC
+            ;';
 
   $result = pwg_query($query);
-//----------------------------------------------------------------	
+//----------------------------------------------------------------
   while ($row = mysql_fetch_array($result,MYSQL_ASSOC))
   {    $groups[$row['id']] = $row['name'];  }
- //--------------------------------------------------------------- 
+ //---------------------------------------------------------------
 if ( isset($_POST['Submit'])) $group_id=-1;
   $template->assign(
-    	'Group',
-   		array( 'group_options'=> $groups,
-				'selected' => $group_id 
-			)
- 		);
+        'Group',
+        array( 'group_options'=> $groups,
+                'selected' => $group_id
+            )
+        );
 //=================================================================
 $destinataires= implode("<br />",get_liste($group_id));
 if( $destinataires !="" )
 $infos_message .= " List :<hr>" .  $destinataires . "<hr>" ;
- 
+
   $template->assign(
-  					array(
+                    array(
               'Groupe'     => $groups,
               'message_test' => $mails_donnees['message_test'] ,
               'liste' => $destinataires ,
-              'version' =>	 $version ,
+              'version' =>   $version ,
               'MAIL_CONTENT' => $mails_donnees['message_test'],
               'path_js' => $path_js,
               'MAIL_SUPERV_PATH_ABS' => MAIL_SUPERV_PATH_ABS,
               'MAIL_SUPERV_PATH' => MAIL_SUPERV_PATH ,
-		 				)
-				);	
-				
+                        )
+                );
+
    $template->set_filenames(array('plugin_admin_content' => realpath(MAIL_SUPERV_PATH . 'admin/mail_superv_test.tpl')));
    $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
-//=========================================================================		
-		$toolbar = 'Basic';
-  		$width = '750px';
-  		$height = '200px';
-  		$areas = array();
-  		$areas[]='MAIL_CONTENT';
-		if (!empty($areas)){
-  				if (function_exists('set_fckeditor_instance'))
-    				set_fckeditor_instance($areas, $toolbar, $width, $height);
-  			}
-			
+//=========================================================================
+        $toolbar = 'Basic';
+        $width = '750px';
+        $height = '200px';
+        $areas = array();
+        $areas[]='MAIL_CONTENT';
+        if (!empty($areas)){
+                if (function_exists('set_fckeditor_instance'))
+                    set_fckeditor_instance($areas, $toolbar, $width, $height);
+            }
+
    break;
 // *************************************************************************
 //              BLACK LISTE                                         |
-// *************************************************************************   
- case 'mail_black_liste': 
+// *************************************************************************
+ case 'mail_black_liste':
   global $user_name,$mail_adresse,$ip ;
   $aff_nb=false;
-  //=======================================================================================	
+  //=======================================================================================
   $info_ip = (isset($info_ip)) ? $info_ip : '' ;
   $info_ip = (isset($_POST['info1'])) ? $_POST['info1'] : $info_ip ;
@@ -398,16 +398,16 @@
   $ip_black = trim($val[1]) ;
   if (isset($_POST['ip_black']))   $ip_black = ($ip_black == "" ) ? $_POST['ip_black'] : $ip_black ;
-		$istype="";
-	if ( isset($_POST['submit']) ){
-	 if (clj_is_ip($ip_black)) $istype='IP';
-	 else if (clj_is_mail($ip_black))  $istype='MAIL';
-      else   $istype='LOGIN';	 
-    if (  $_POST['submit'] == l10n('Sv_Ajout') )	{
+        $istype="";
+    if ( isset($_POST['submit']) ){
+     if (clj_is_ip($ip_black)) $istype='IP';
+     else if (clj_is_mail($ip_black))  $istype='MAIL';
+      else   $istype='LOGIN';
+    if (  $_POST['submit'] == l10n('Sv_Ajout') )    {
       $info_ip = 'Ajout' ;
       $ip_black = trim( $_POST['ip_black']) ;
-      $infos_message .= $info_ip . '---->'. $ip_black ;   
-    }
-	 if (  $_POST['submit'] == l10n('Sv_Valider') )	{
-    
+      $infos_message .= $info_ip . '---->'. $ip_black ;
+    }
+     if (  $_POST['submit'] == l10n('Sv_Valider') ) {
+
      $mails_options['no_mail_list'] = isset($_POST['no_mail_list']) ? "on" : "off" ;
      $mails_options['no_connect'] = isset($_POST['no_connect']) ? "on" : "off" ;
@@ -415,10 +415,10 @@
      $mails_options['set_id'] = isset($_POST['set_id']) ? "on" : "off" ;
      mail_supervisor::sauve_options();
-     $infos_message .=  l10n('Sv_save_config') . '<br />'; 
+     $infos_message .=  l10n('Sv_save_config') . '<br />';
   }
 }
 if (!isset($params)) $params=array();
 if (!isset($params['per_page'])) $params['per_page'] = 20 ;
-if (!isset($params['start']))	 $params['start'] = 0 ;
+if (!isset($params['start']))    $params['start'] = 0 ;
 
 if (isset($_POST['per_page'])) $params['per_page'] =$_POST['per_page'];
@@ -427,16 +427,16 @@
 if (isset($_POST['prev']))  $params['start'] -=   1;
  $params['start']= ($params['start']>=0) ? $params['start'] : 0 ;
-//=======================================================================================	
- include  (MAIL_SUPERV_PATH.'include/save_info.php'); 	   
-  $maxipage=(int) (	$nbip  / $params['per_page']) ;
-	$f_action  = $my_base_url.'&amp;tab=mail_black_liste' ;
-	$champs_ip=array();
-	$champs_bl=array();
-	if (!empty($liste_ip))	$champs_ip=array_keys($liste_ip[0]);
-	if (!empty($liste_bl))  $champs_bl=array_keys($liste_bl[0]);
-	   $smile_bonjour=MAIL_SUPERV_PATH."smilies/mouche.gif" ; 
-	   $img_logo=MAIL_SUPERV_PATH."smilies/logo.png" ; 
+//=======================================================================================
+ include  (MAIL_SUPERV_PATH.'include/save_info.php');
+  $maxipage=(int) ( $nbip  / $params['per_page']) ;
+    $f_action  = $my_base_url.'&amp;tab=mail_black_liste' ;
+    $champs_ip=array();
+    $champs_bl=array();
+    if (!empty($liste_ip))  $champs_ip=array_keys($liste_ip[0]);
+    if (!empty($liste_bl))  $champs_bl=array_keys($liste_bl[0]);
+       $smile_bonjour=MAIL_SUPERV_PATH."smilies/mouche.gif" ;
+       $img_logo=MAIL_SUPERV_PATH."smilies/logo.png" ;
      $template->assign(
-  					array(
+                    array(
                         'start' => $params['start'],
                         'per_page' => $params['per_page'] ,
@@ -444,7 +444,7 @@
                         'smile_bonjour' => $smile_bonjour ,
                         'img_logo' => $img_logo ,
-                        'champs_ip' => $champs_ip ,					
+                        'champs_ip' => $champs_ip ,
                         'liste_ip' => $liste_ip,
-                        'champs_bl' =>  $champs_bl 	 ,	
+                        'champs_bl' =>  $champs_bl   ,
                         'liste_bl' => $liste_bl ,
                         //'conf_admin_layout' => $conf['admin_layout'] ,
@@ -456,88 +456,88 @@
                         'path_js' => $path_js ,
                         'F_ACTION' => $f_action ,
-						
+
                         'no_mail_list' => ($mails_options['no_mail_list'] == 'on') ? 'checked="checked"' : '' ,
                         'no_connect' => ($mails_options['no_connect'] == 'on') ? 'checked="checked"' : '' ,
                         'set_auto' => ($mails_options['set_auto'] == 'on') ? 'checked="checked"' : '' ,
                         'set_id' => ($mails_options['set_id'] == 'on') ? 'checked="checked"' : '' ,
-                        'IP' =>  $ip ,						
+                        'IP' =>  $ip ,
                         'PAYS' =>  $pays  ,
                         'VILLE' =>  $ville ,
-                        'REGION' =>  $region ,	
-                        'version' =>	 $version ,
+                        'REGION' =>  $region ,
+                        'version' =>     $version ,
                         'MAIL_SUPERV_PATH_ABS' => MAIL_SUPERV_PATH_ABS,
-                      
-		 			)
-				);			 
-	 //===============================================================					 
+
+                    )
+                );
+     //===============================================================
   $template->set_filenames(array('plugin_admin_content' => realpath(MAIL_SUPERV_PATH . 'admin/mail_black_liste.tpl')));
   $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
-      
-
-   break; 
+
+
+   break;
 
 // *************************************************************************
 //                      AIDE                                               |
-// *************************************************************************   
+// *************************************************************************
      case 'mail_superv_help':
 
- 
-	  $aff_nb=false;
-	  $smile_bonjour=MAIL_SUPERV_PATH."smilies/bonjour.gif" ; 
+
+      $aff_nb=false;
+      $smile_bonjour=MAIL_SUPERV_PATH."smilies/bonjour.gif" ;
       $template->assign(
-  					array(
+                    array(
               'smile_bonjour' => $smile_bonjour ,
-              'version' =>	 $version ,
+              'version' =>   $version ,
               'MAIL_SUPERV_PATH' =>  MAIL_SUPERV_PATH ,
               'path_js' => $path_js,
               'MAIL_SUPERV_PATH_ABS' => MAIL_SUPERV_PATH_ABS
-					)
-			);		
-	$aff_nb = false;
-	;
-	 
-	 	$template->set_filenames(array('plugin_admin_content' => realpath(MAIL_SUPERV_PATH . 'admin/mail_superv_help.tpl')));
-		$template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
-   break; 
+                    )
+            );
+    $aff_nb = false;
+    ;
+
+        $template->set_filenames(array('plugin_admin_content' => realpath(MAIL_SUPERV_PATH . 'admin/mail_superv_help.tpl')));
+        $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
+   break;
  //====================================================================
   }
 //================================================================================
 
-	   
-
-	if  ( $mails_donnees['reste'] < 0 ) {
-	    $mails_donnees['quarantaine'] =false ;
-	    $mails_donnees['date_quarantaine']= time()  ;	
-		$mails_donnees['nb_spams'] = 0 ;
-	    $modif == true ;
-	}
-	 
-	  
- 	$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();
-	   $modif = true ;
-	}
-	
-	$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();
-	   $modif = true ;
-	}
-	if ( $modif == true ) 	{ 
-				mail_supervisor::sauve_donnees();
- 				$modif = false ;
- 		}
-
-		if ($aff_nb == true) {
-		 $infos_message .= 'Mails    : '.$mails_donnees['nb_mails']. '  \\  ' . $mails_donnees['nb_mails_maxi'];
-		 $infos_message .= "\n".'Spams : '.$mails_donnees['nb_spams']. '  \\  ' . $mails_donnees['nb_spams_maxi'];
-		}
-
-
-	 mail_supervisor::affiche_message();
-//========================================================================	
+
+
+    if  ( $mails_donnees['reste'] < 0 ) {
+        $mails_donnees['quarantaine'] =false ;
+        $mails_donnees['date_quarantaine']= time()  ;
+        $mails_donnees['nb_spams'] = 0 ;
+        $modif == true ;
+    }
+
+
+    $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();
+       $modif = true ;
+    }
+
+    $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();
+       $modif = true ;
+    }
+    if ( $modif == true )   {
+                mail_supervisor::sauve_donnees();
+                $modif = false ;
+        }
+
+        if ($aff_nb == true) {
+         $infos_message .= 'Mails    : '.$mails_donnees['nb_mails']. '  \\  ' . $mails_donnees['nb_mails_maxi'];
+         $infos_message .= "\n".'Spams : '.$mails_donnees['nb_spams']. '  \\  ' . $mails_donnees['nb_spams_maxi'];
+        }
+
+
+     mail_supervisor::affiche_message();
+//========================================================================
 ?>
Index: /extensions/Mail_supervisor/admin/mail_superv_admin.tpl
===================================================================
--- /extensions/Mail_supervisor/admin/mail_superv_admin.tpl	(revision 10418)
+++ /extensions/Mail_supervisor/admin/mail_superv_admin.tpl	(revision 10419)
@@ -3,5 +3,5 @@
 </script>
 <div class="titrePage">
-		<h2>{'Sv_supervisor'|translate}{'Sv_version'|translate}{$version}</h2>
+        <h2>{'Sv_supervisor'|translate}{'Sv_version'|translate}{$version}</h2>
 </div>
   <span>{'Sv_Howto'|translate}</span>
@@ -10,14 +10,14 @@
   <fieldset>
     <legend>{'Sv_admin_titre'|translate}</legend>
-	  <fieldset>
+      <fieldset>
     <legend>{'Sv_options'|translate}</legend>
 
     <table>
 <tr><td><input type="checkbox" name="check_mailto" value="on" {$check_mailto} />&nbsp;{'Sv_check_mailto'|translate}</td><td><input type="checkbox" name="check_header_carbon" value="on" {$check_header_carbons} />&nbsp;{'Sv_check_header_carbon'|translate}</td>
-  { if  $PHPWG_VERSION <= '2.0.4' } 
+  { if  $PHPWG_VERSION <= '2.0.4' }
 <td><input type="checkbox" name="check_header_text" value="on" {$check_header_text} />&nbsp;
 {'Sv_check_header_text'|translate}</td>
 <td><input type="text" name="header_text"  value={$header_text} /></td>
-	{/if}
+    {/if}
 </tr>
 </table>
@@ -35,60 +35,60 @@
 
   <td><input type="text" name="nb_mails" size='10%' value={$nb_mails} readonly="true"  class="row2" /></td>
-  <td>{'Sv_mails'|translate}</td>	   
-	   <td><input type="text" name="date_mail"  value={$date_mail} readonly="true"  class="row2" /></td>
-	   <td><input type="text" name="nb_mails_maxi" size="10%" value={$nb_mails_maxi} /></td>
-	    <td><input class="cluetip" title="{'Sv_format'|translate}|{'Sv_format_d'|translate}" type="text" name="nb_mails_periode" size="30%" value={$nb_mails_periode} /></td>
-		<td><input type="text" name="time_mails_reste" size="50%" value={$time_mails_reste} readonly="true"  class="row2"  /></td>  
-    </tr> 
- 
-	   <tr>  
-	   <td><input type="text" name="nb_spams"  size='10%'  value={$nb_spams} readonly="true"  class="row2" /></td>
-	   <td>{'Sv_spams'|translate}</td>
+  <td>{'Sv_mails'|translate}</td>
+       <td><input type="text" name="date_mail"  value={$date_mail} readonly="true"  class="row2" /></td>
+       <td><input type="text" name="nb_mails_maxi" size="10%" value={$nb_mails_maxi} /></td>
+        <td><input class="cluetip" title="{'Sv_format'|translate}|{'Sv_format_d'|translate}" type="text" name="nb_mails_periode" size="30%" value={$nb_mails_periode} /></td>
+        <td><input type="text" name="time_mails_reste" size="50%" value={$time_mails_reste} readonly="true"  class="row2"  /></td>
+    </tr>
 
-	   <td><input type="text" name="date_spam"  value={$date_spam}readonly="true"  class="row2"  /></td>
-	   <td><input type="text" name="nb_spams_maxi" size="10%" value={$nb_spams_maxi} /></td>
-	    <td><input type="text"  class="cluetip" name="nb_spams_periode" size="30%" value={$nb_spams_periode} title="{'Sv_format'|translate}|{'Sv_format_d'|translate}"/></td>
-		<td><input type="text" name="time_spams_reste" size="50%" value={$time_spams_reste} readonly="true"  class="row2"  /></td>  
-	    </tr> 
+       <tr>
+       <td><input type="text" name="nb_spams"  size='10%'  value={$nb_spams} readonly="true"  class="row2" /></td>
+       <td>{'Sv_spams'|translate}</td>
+
+       <td><input type="text" name="date_spam"  value={$date_spam}readonly="true"  class="row2"  /></td>
+       <td><input type="text" name="nb_spams_maxi" size="10%" value={$nb_spams_maxi} /></td>
+        <td><input type="text"  class="cluetip" name="nb_spams_periode" size="30%" value={$nb_spams_periode} title="{'Sv_format'|translate}|{'Sv_format_d'|translate}"/></td>
+        <td><input type="text" name="time_spams_reste" size="50%" value={$time_spams_reste} readonly="true"  class="row2"  /></td>
+        </tr>
     </table>
  </fieldset>
- 
+
 <fieldset>
     <legend>{'Sv_state'|translate}</legend>
-	       <table >		
-	   <tr>  
-	 	
-	  { if  $quarantaine }
-		<td style="color:#FF0000">{'Sv_quarantaine'|translate}</td>'
-			 <td> </td>
-		 	<td><input type="text" name="date_quarantaine"  value={$date_quarantaine} />		 	</td><td> </td>
-			
-		  <td><input type="text"  class="cluetip" name="quarantaine_periode" size="30%" value={$quarantaine_periode} title="{'Sv_format'|translate}|{'Sv_format_d'|translate}" /></td>
-		   <td><input type="text" name="reste" size="50%" value={$reste} /></td> 
-		{/if}
-		 { if  !$quarantaine }
-		 <td> </td>
-		 <td> {'Sv_Quarantaine'|translate} </td>
-		 <td> </td>
-		 <td> </td>
-		 <td><input type="text"  class="cluetip" name="quarantaine_periode" size="10%" value={$quarantaine_periode} title="{'Sv_format'|translate}|{'Sv_format_d'|translate}" /></td>
-		
-	 {/if}	      </tr> 	
-	 	
+           <table >
+       <tr>
+
+      { if  $quarantaine }
+        <td style="color:#FF0000">{'Sv_quarantaine'|translate}</td>'
+             <td> </td>
+            <td><input type="text" name="date_quarantaine"  value={$date_quarantaine} />            </td><td> </td>
+
+          <td><input type="text"  class="cluetip" name="quarantaine_periode" size="30%" value={$quarantaine_periode} title="{'Sv_format'|translate}|{'Sv_format_d'|translate}" /></td>
+           <td><input type="text" name="reste" size="50%" value={$reste} /></td>
+        {/if}
+         { if  !$quarantaine }
+         <td> </td>
+         <td> {'Sv_Quarantaine'|translate} </td>
+         <td> </td>
+         <td> </td>
+         <td><input type="text"  class="cluetip" name="quarantaine_periode" size="10%" value={$quarantaine_periode} title="{'Sv_format'|translate}|{'Sv_format_d'|translate}" /></td>
+
+     {/if}        </tr>
+
     </table>
  </fieldset>
- 
+
 <fieldset>
     <legend>{'Sv_admin_description'|translate}</legend>
-	       <table >
-           <tr><td><textarea name="content"  rows="11" cols="100">{$message}</textarea></td>         </tr> 
-		 
+           <table >
+           <tr><td><textarea name="content"  rows="11" cols="100">{$message}</textarea></td>         </tr>
+
            </table>
-	</fieldset>
-	      <p>
-		     <input class="submit" type="submit" name="submit" value="{'Sv_Valider'|translate}" />
-	         <input class="submit" type="submit" name="submit" value="{'Sv_raz'|translate}" />
+    </fieldset>
+          <p>
+             <input class="submit" type="submit" name="submit" value="{'Sv_Valider'|translate}" />
+             <input class="submit" type="submit" name="submit" value="{'Sv_raz'|translate}" />
              <input class="submit" type="submit" name="submit" value="{'Sv_refresh'|translate}" />
-	  </p> 
+      </p>
 </fieldset>
 </form>
Index: /extensions/Mail_supervisor/admin/mail_superv_help.tpl
===================================================================
--- /extensions/Mail_supervisor/admin/mail_superv_help.tpl	(revision 10418)
+++ /extensions/Mail_supervisor/admin/mail_superv_help.tpl	(revision 10419)
@@ -3,5 +3,5 @@
 <fieldset style=" position:relative ; top:15px">
   <legend>{'Sv_admin_titre'|translate}</legend>
-<div id="instructionFonction" class="instructionBlock" > 
+<div id="instructionFonction" class="instructionBlock" >
   <div
     id="fonction_header"
@@ -17,6 +17,6 @@
   >
     <p>{'Sv_oversees_management_emails'|translate}.</p>
-    <ol>      
-	  <li>{'Sv_hlp_1_1'|translate}</li>
+    <ol>
+      <li>{'Sv_hlp_1_1'|translate}</li>
       <li>{'Sv_hlp_1_2'|translate}</li>
       <li>{'Sv_hlp_1_3'|translate}</li>
@@ -43,5 +43,5 @@
   >
 
- 
+
 
 <ol>
@@ -51,9 +51,9 @@
 </ul>
   <li ><span  class="throw">{'Sv_check_header_carbon'|translate}</span></li>
-  
+
    <ul>
  <li>{'Sv_hlp_2_2'|translate}</li>
 </ul>
-  <li><span  class="throw">{'Sv_check_header_text'|translate}</span> </li> 
+  <li><span  class="throw">{'Sv_check_header_text'|translate}</span> </li>
   <ul>
  <li>{'Sv_hlp_2_3'|translate}</li>
@@ -84,19 +84,19 @@
 
 <ul>
-    <ul>      
-	  <li ><i><span class="throw">{'Sv_nb'|translate}</span></i>       {'Sv_hlp_3_1'|translate}</li>
+    <ul>
+      <li ><i><span class="throw">{'Sv_nb'|translate}</span></i>       {'Sv_hlp_3_1'|translate}</li>
       <li><i><span class="throw">{'Sv_depuis_le'|translate}</span></i> {'Sv_hlp_3_2'|translate}</li>
       <li><i><span class="throw">{'Sv_nb_maxi'|translate}</span></i>   {'Sv_hlp_3_3'|translate}</li>
       <li><i><span class="throw">{'Sv_periode'|translate}</span></i>   {'Sv_hlp_3_4'|translate}
-	  {'Sv_hlp_3_4_0'|translate}
-	  </li>
+      {'Sv_hlp_3_4_0'|translate}
+      </li>
       <li><i><span class="throw">{'Sv_rest'|translate}</span></i>          {'Sv_hlp_3_5'|translate}</li>
- 
+
     </ul>
- 
- 
-
-</ul>
-  </div> <!-- configuration_content --> 
+
+
+
+</ul>
+  </div> <!-- configuration_content -->
 </div> <!-- instructionconfiguration -->
 
@@ -120,7 +120,7 @@
       <li><i><span  class="throw">{'Sv_quarantaine'|translate}</span></i>     {'Sv_hlp_4_2'|translate}</li>
 
-  
-</ul>
-  </div> <!-- etat_content --> 
+
+</ul>
+  </div> <!-- etat_content -->
 </div> <!-- instructionetat -->
 
@@ -147,15 +147,15 @@
   <p>.</p>
 
-  </div> <!-- lastmessage_content --> 
+  </div> <!-- lastmessage_content -->
 </div> <!-- instructionlastmessage -->
  <img src="{$smile_bonjour}" />
  Redaction en cours....
  </fieldset>
- 
- 
+
+
  <fieldset >
   <legend>{'Sv_Test'|translate}</legend>
 <div id="testFonction" class="instructionBlock" >
- 
+
   <div
     id="test_header"
@@ -170,5 +170,5 @@
     style="display:none"
   >
-     
+
     <p></p>
   </div> <!-- Fonction -->
@@ -177,11 +177,11 @@
 
  </fieldset>
- 
+
 <fieldset >
   <legend>{'Sv_blackliste'|translate}</legend>
 <div id="blacklisteFonction" class="instructionBlock" >
- 
+
   <script type="text/javascript">
-    var is_supervisor = true;  
+    var is_supervisor = true;
   </script>
   <div
@@ -198,13 +198,13 @@
   >
      <p>{'Sv_hlp_7_1'|translate}
-	 </p>
-	<p><input type="checkbox"  value=""   />         {'Sv_hlp_7_1_1'|translate} </p>
-	
-	<p><input type="checkbox"   value="on"   />      {'Sv_hlp_7_1_3'|translate} </p>
-	<p><input  type="text"   />                      {'Sv_hlp_7_2'|translate}   </p>
-	<p> <input   type="button"   value="{'Sv_Test'|translate}"  /> {'Sv_hlp_7_3'|translate}</p>
+     </p>
+    <p><input type="checkbox"  value=""   />         {'Sv_hlp_7_1_1'|translate} </p>
+
+    <p><input type="checkbox"   value="on"   />      {'Sv_hlp_7_1_3'|translate} </p>
+    <p><input  type="text"   />                      {'Sv_hlp_7_2'|translate}   </p>
+    <p> <input   type="button"   value="{'Sv_Test'|translate}"  /> {'Sv_hlp_7_3'|translate}</p>
   <p><input type="button" value="{'Sv_Ajout'|translate}" /></p>
-	<p><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/plug_activate.png" />
-	{'Sv_hlp_7_4'|translate}</p>
+    <p><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/plug_activate.png" />
+    {'Sv_hlp_7_4'|translate}</p>
   </div> <!-- Fonction -->
 </div> <!-- Fonctions -->
Index: /extensions/Mail_supervisor/admin/mail_superv_test.tpl
===================================================================
--- /extensions/Mail_supervisor/admin/mail_superv_test.tpl	(revision 10418)
+++ /extensions/Mail_supervisor/admin/mail_superv_test.tpl	(revision 10419)
@@ -3,10 +3,10 @@
 </script>
 <div class="titrePage">
-	<h2>{'Sv_supervisor'|translate}{'Sv_version'|translate}{$version}</h2>
+    <h2>{'Sv_supervisor'|translate}{'Sv_version'|translate}{$version}</h2>
 </div>
 <form action="" method="post" name="form">
   <fieldset>
     <legend>{'Sv_Tab_test'|translate}</legend>
-	      <fieldset>
+          <fieldset>
     <legend>{'Sv_message_to_send'|translate}</legend>
 
@@ -16,10 +16,10 @@
       <td>
         <select name="group" onchange="this.form.submit();" >
-          {html_options options=$Group.group_options  selected=$Group.selected}		  
+          {html_options options=$Group.group_options  selected=$Group.selected}
         </select>
       </td>
-		  <td  >
-	 		{$liste}
-	     </td>
+          <td  >
+            {$liste}
+         </td>
     </tr>
 
@@ -31,11 +31,11 @@
     </tr>
 
-  </table>		   
-	</fieldset>
+  </table>
+    </fieldset>
       <p>
-	  <input class="submit" type="submit" name="Submit" value="{'Sv_refresh'|@translate}" {$tag_input_enabled} />
-	  <input class="submit" type="submit" name="Submit" id="Envoyer"  value="{'Sv_Envoyer'|@translate}" {$tag_input_enabled} />
-	
-	  </p> 
+      <input class="submit" type="submit" name="Submit" value="{'Sv_refresh'|@translate}" {$tag_input_enabled} />
+      <input class="submit" type="submit" name="Submit" id="Envoyer"  value="{'Sv_Envoyer'|@translate}" {$tag_input_enabled} />
+
+      </p>
 </fieldset>
 </form>
Index: /extensions/Mail_supervisor/admin/roma/theme.css
===================================================================
--- /extensions/Mail_supervisor/admin/roma/theme.css	(revision 10418)
+++ /extensions/Mail_supervisor/admin/roma/theme.css	(revision 10419)
@@ -1,3 +1,3 @@
-﻿.bug {
+.bug {
   background-image: url('../../smilies/mouche.gif');
   background-repeat: no-repeat;
@@ -22,5 +22,5 @@
   text-align: left;
 }
-.instructionBlockHeaderCollapsed span, .instructionBlockHeaderExpanded span{  
+.instructionBlockHeaderCollapsed span, .instructionBlockHeaderExpanded span{
 border-bottom: none;
 }
Index: /extensions/Mail_supervisor/include/constants.php
===================================================================
--- /extensions/Mail_supervisor/include/constants.php	(revision 10418)
+++ /extensions/Mail_supervisor/include/constants.php	(revision 10419)
@@ -5,64 +5,64 @@
 if (!defined('MAIL_BLACK_LISTE_TABLE')) define('MAIL_BLACK_LISTE_TABLE', $prefixeTable.'mail_black_list');
 if (!defined('Sv_MAIL_TABLE')) define('Sv_MAIL_TABLE', $prefixeTable.'Sv_mail');
-global 	$superv_champs , $superv_type ,$superv_bl_champs , $superv_bl_type ; 
+global  $superv_champs , $superv_type ,$superv_bl_champs , $superv_bl_type ;
 $superv_champs = array(
   "id",
   "nb_mails",
   "date_mail",
-  "nb_mails_maxi",		
-  "nb_mails_periode",	
+  "nb_mails_maxi",
+  "nb_mails_periode",
   "nb_spams",
-  "date_spam",	
-  "nb_spams_maxi",	
-  "nb_spams_periode",	
+  "date_spam",
+  "nb_spams_maxi",
+  "nb_spams_periode",
   "quarantaine",
   "date_quarantaine",
-  "quarantaine_periode",	
-  "message", 
-  "message_test", 
-  "header_text",				
-		);	
-									
- 	$superv_type = array(
-	                " SMALLINT( 5 ) NOT NULL DEFAULT '0'"      ,
-					"INT NOT NULL DEFAULT '0'"  ,
-					"INT NOT NULL DEFAULT '0'"  ,
-					"INT NOT NULL DEFAULT '2000'",		
-					"TEXT"  ,	
-					"INT NOT NULL DEFAULT '0'",
-					"INT NOT NULL DEFAULT '0'",	
-					"INT NOT NULL DEFAULT '10'",	
-					"TEXT"  ,	
-					"TEXT" ,
-					"INT NOT NULL DEFAULT '0'",
-					"TEXT"  ,	
-					"TEXT"  , 
-					"TEXT"  , 
-					"TEXT"  ,
-					
-					);		
-					
- 
-	  $superv_bl_champs = array(
-	  				"id",
-					"ip",
-					"pays",
-					"region",		
-					"ville",	
-					"adresse",
-					"fai",	
-					"nb"
-					);
-					
- 	$superv_bl_type = array(
-	                " smallint(5) UNSIGNED NOT NULL auto_increment ",
- 					"TEXT"  ,
- 					"TEXT"  ,
- 					"TEXT"  ,
- 					"TEXT"  ,
- 					"TEXT"  ,
- 					"TEXT"  ,
-					" smallint(5) UNSIGNED "
-					);																	
+  "quarantaine_periode",
+  "message",
+  "message_test",
+  "header_text",
+        );
+
+    $superv_type = array(
+                    " SMALLINT( 5 ) NOT NULL DEFAULT '0'"      ,
+                    "INT NOT NULL DEFAULT '0'"  ,
+                    "INT NOT NULL DEFAULT '0'"  ,
+                    "INT NOT NULL DEFAULT '2000'",
+                    "TEXT"  ,
+                    "INT NOT NULL DEFAULT '0'",
+                    "INT NOT NULL DEFAULT '0'",
+                    "INT NOT NULL DEFAULT '10'",
+                    "TEXT"  ,
+                    "TEXT" ,
+                    "INT NOT NULL DEFAULT '0'",
+                    "TEXT"  ,
+                    "TEXT"  ,
+                    "TEXT"  ,
+                    "TEXT"  ,
+
+                    );
+
+
+      $superv_bl_champs = array(
+                    "id",
+                    "ip",
+                    "pays",
+                    "region",
+                    "ville",
+                    "adresse",
+                    "fai",
+                    "nb"
+                    );
+
+    $superv_bl_type = array(
+                    " smallint(5) UNSIGNED NOT NULL auto_increment ",
+                    "TEXT"  ,
+                    "TEXT"  ,
+                    "TEXT"  ,
+                    "TEXT"  ,
+                    "TEXT"  ,
+                    "TEXT"  ,
+                    " smallint(5) UNSIGNED "
+                    );
 
 ?>
Index: /extensions/Mail_supervisor/include/fonctions.php
===================================================================
--- /extensions/Mail_supervisor/include/fonctions.php	(revision 10418)
+++ /extensions/Mail_supervisor/include/fonctions.php	(revision 10419)
@@ -26,5 +26,5 @@
 
 
-global 	$superv_champs , $superv_type ,$superv_bl_champs , $superv_bl_type ; 
+global  $superv_champs , $superv_type ,$superv_bl_champs , $superv_bl_type ;
 // if (!isset($_COOKIE[session_name()])){}
 
@@ -32,22 +32,22 @@
 global $template ;
 //===============================================
-function corrige_header($Carbonne,$headers,$args,$cl_list_mail,$mailto="")	{
+function corrige_header($Carbonne,$headers,$args,$cl_list_mail,$mailto="")  {
   global $mails_options,$conf_mail,$infos_message;
   if (!empty($args[$Carbonne]) && count($args[$Carbonne]) > 0 ){
-    $cl_list_mail  =  str_replace(","," , ",get_strict_email_list(implode(',', $args[$Carbonne])))." \n"  ;  
+    $cl_list_mail  =  str_replace(","," , ",get_strict_email_list(implode(',', $args[$Carbonne])))." \n"  ;
     $cl_liste_dest = implode(', ', $args[$Carbonne])." \n";
-    if ($mails_options['check_header_carbon'] == 'on') {    
-        $headers = preg_replace('/.*'.$Carbonne.':(.*).\n/i', $Carbonne.': '.  $cl_list_mail, $headers);         
-    }  
-    $ret->list_mail = $cl_list_mail ;         
+    if ($mails_options['check_header_carbon'] == 'on') {
+        $headers = preg_replace('/.*'.$Carbonne.':(.*).\n/i', $Carbonne.': '.  $cl_list_mail, $headers);
+    }
+    $ret->list_mail = $cl_list_mail ;
   } else {
     // Raz Bcc, Cc dans headers
     $headers = preg_replace('/.*'.$Carbonne.'(.*).\n/i', "" , $headers);
-    $ret->list_mail = "" ; 
-  }
-  $ret->headers = $headers ; 
-  return $ret;		
-}
-	
+    $ret->list_mail = "" ;
+  }
+  $ret->headers = $headers ;
+  return $ret;
+}
+
 function int_to_heure($int){
   global $lang,$mails_donnees ;
@@ -56,26 +56,26 @@
 
 
-	$delta=(7*24*60*60) ;
-	$week = (int) ($int/$delta); 
-	$int= $int-($week*$delta) ;  
-
-	$delta=(24*60*60) ;
-	$day= (int) ($int/$delta); 
-	$int=$int-($day*$delta);
-
-	$delta=(60*60) ;
-	$heures=(int) ($int/$delta);
-	$int=$int-($heures*$delta);
-
-	$delta=(60) ;
-	$minutes=(int) ($int/$delta);
-	$int= $int - ($minutes*$delta);
-
-	$secondes=(int) ($int);
-	$day      = substr ('00'.    $day,-2,2);   
-	$heures   = substr ('00'. $heures,-2,2);   
-	$minutes  = substr ('00'.$minutes,-2,2);
-	$secondes = substr ('00'.$secondes,-2,2);
-	
+    $delta=(7*24*60*60) ;
+    $week = (int) ($int/$delta);
+    $int= $int-($week*$delta) ;
+
+    $delta=(24*60*60) ;
+    $day= (int) ($int/$delta);
+    $int=$int-($day*$delta);
+
+    $delta=(60*60) ;
+    $heures=(int) ($int/$delta);
+    $int=$int-($heures*$delta);
+
+    $delta=(60) ;
+    $minutes=(int) ($int/$delta);
+    $int= $int - ($minutes*$delta);
+
+    $secondes=(int) ($int);
+    $day      = substr ('00'.    $day,-2,2);
+    $heures   = substr ('00'. $heures,-2,2);
+    $minutes  = substr ('00'.$minutes,-2,2);
+    $secondes = substr ('00'.$secondes,-2,2);
+
   $retour="";
   $Week=explode(" ",l10n('Week %d'));
@@ -88,36 +88,36 @@
   if ($secondes > 0) $retour .= "+" . $secondes." " .l10n('Second');
   $retour=str_replace("+0","+",$retour);
-  //================================================================================================   
+  //================================================================================================
   return $retour;
-}	  
-
-	
+}
+
+
 function verif_base(){
   global $lang,$superv_champs,$superv_type,$superv_bl_champs,$superv_bl_type;
   load_language('plugin.lang', MAIL_SUPERV_PATH);
-  //==============================================================================		
+  //==============================================================================
   create_table(MAIL_BLACK_LISTE_TABLE,$superv_bl_champs,$superv_bl_type) ;
-  ajust_table(MAIL_BLACK_LISTE_TABLE,$superv_bl_champs,$superv_bl_type)  ; 
-  //==============================================================================		
+  ajust_table(MAIL_BLACK_LISTE_TABLE,$superv_bl_champs,$superv_bl_type)  ;
+  //==============================================================================
   create_table(mail_superv_TABLE,$superv_champs,$superv_type) ;
   ajust_table(mail_superv_TABLE,$superv_champs,$superv_type)  ;
-  //==============================================================================		
-    $valeurs= array (	1,
-						          0,
-			           time(),
-	                 2000,
-	          '"604800"' ,
-	                    0,
-	               time(),
-	                   10,
-	           '"172800"',
-	            '"false"',
-	               time(),
-	           '"172800"',
-	             '"Init"',
+  //==============================================================================
+    $valeurs= array (   1,
+                                  0,
+                       time(),
+                     2000,
+              '"604800"' ,
+                        0,
+                   time(),
+                       10,
+               '"172800"',
+                '"false"',
+                   time(),
+               '"172800"',
+                 '"Init"',
    '"'.l10n('Sv_supervisor').'"',
-	'"'.l10n('hello').'"',
-	 );
-	ajout_ligne(mail_superv_TABLE,$superv_champs, $valeurs,false ) ;
+    '"'.l10n('hello').'"',
+     );
+    ajout_ligne(mail_superv_TABLE,$superv_champs, $valeurs,false ) ;
 }
 //=================================================================================
@@ -134,5 +134,5 @@
       array_push($columns_of, $row[0]);
     }
- 
+
   return $columns_of;
 }
@@ -152,17 +152,17 @@
     LEFT JOIN '.USER_GROUP_TABLE.' AS ug
       ON u.'.$conf['user_fields']['id'].' = ug.user_id
-  WHERE ug.group_id='.$group_id.' '; 
+  WHERE ug.group_id='.$group_id.' ';
  $groups=array();
-  $datas = pwg_query($query); 
-  
+  $datas = pwg_query($query);
+
   if (!empty($datas)) {
-    while ($group = mysql_fetch_array($datas,MYSQL_ASSOC)){	
-      if (!empty($group['email'])){  
+    while ($group = mysql_fetch_array($datas,MYSQL_ASSOC)){
+      if (!empty($group['email'])){
          array_push($groups, format_email($group['username'], $group['email'] ));
       }
     }
-  } 
+  }
   return $groups ;
-  
+
 }
 //=================================================================================
@@ -170,6 +170,6 @@
 function create_table($nom_table,$champs,$types)  //mail_superv_TABLE
 {
-	$i=0;
- 	$valeurs=array();
+    $i=0;
+    $valeurs=array();
   foreach ( $champs as $champ) {
       $champ = trim($champ);
@@ -179,14 +179,14 @@
 
 
-	
-	if ( count($valeurs) == 0) return ;
+
+    if ( count($valeurs) == 0) return ;
 
     $valeurs=implode(", ",$valeurs) ;
-	//===============================================================================
-		$query = "CREATE TABLE IF NOT EXISTS  `" . $nom_table . "` (". $valeurs . " , PRIMARY KEY  (`id` ) ) ENGINE=MyISAM  ;";   
-			 if ( pwg_query($query) ) return ;  
-				die("ERREUR CREATION ".$query);  	
-      
-	 
+    //===============================================================================
+        $query = "CREATE TABLE IF NOT EXISTS  `" . $nom_table . "` (". $valeurs . " , PRIMARY KEY  (`id` ) ) ENGINE=MyISAM  ;";
+             if ( pwg_query($query) ) return ;
+                die("ERREUR CREATION ".$query);
+
+
 }
 function ajust_table($nom_table,$champs,$types)  //mail_superv_TABLE
@@ -194,54 +194,54 @@
 global $infos_message ;
 $colonnes = Get_colonnes_de($nom_table);
-	$data = 	$types ;
-	$i=0;
- 	$valeurs=array();
+    $data =     $types ;
+    $i=0;
+    $valeurs=array();
 foreach ( $champs as $champ)
    {
      $champ = trim($champ);
-	  if (!in_array( $champ,$colonnes)) {
+      if (!in_array( $champ,$colonnes)) {
          array_push($valeurs , " ADD `".$champ."`" . '  ' . $data[  $i] )  ;
-	 }
-	 $i +=1;
-	 
-    }
-//=============================================================================	
-	if ( count($valeurs) == 0) return ;
-	
+     }
+     $i +=1;
+
+    }
+//=============================================================================
+    if ( count($valeurs) == 0) return ;
+
   $infos_message .=  "AJUSTE TABLE : ". $nom_table . "<br />" . "NB (col) : ". count($colonnes) . mail_supervisor::Memo_Var($valeurs) . "<br />" ;
-	
+
      $valeurs=implode(", ",$valeurs) ;
-	//===============================================================================
-		$query = "ALTER TABLE `" . $nom_table . "` ". $valeurs ;
-			if (   pwg_query($query)) return ;            
-		die($query);
-}
-//==============================================================================	
+    //===============================================================================
+        $query = "ALTER TABLE `" . $nom_table . "` ". $valeurs ;
+            if (   pwg_query($query)) return ;
+        die($query);
+}
+//==============================================================================
 function ajout_ligne($nom_table,$champs,$valeurs,$force)
 {
   if (!$force) {
      $query = "
-    		SELECT `id` , COUNT(`id`) as total 
-    		FROM `".$nom_table."` GROUP by  `id`
-  		;";	
-	  list($count) = mysql_fetch_row(pwg_query($query));
-
-		
+            SELECT `id` , COUNT(`id`) as total
+            FROM `".$nom_table."` GROUP by  `id`
+        ;";
+      list($count) = mysql_fetch_row(pwg_query($query));
+
+
 }else{
 
-    	$count = 0 ;
-}
- 
+        $count = 0 ;
+}
+
   if ($count == 0)
   {
       $n_champs=implode(",",$champs);
       $n_valeurs=implode(",",$valeurs);
-	   $query = "
-    	INSERT INTO `".$nom_table."` (". $n_champs.") 
-        VALUES ( ".	$n_valeurs .")";
-		
-		if (pwg_query($query)) return ;
-		die($query);
-		
+       $query = "
+        INSERT INTO `".$nom_table."` (". $n_champs.")
+        VALUES ( ". $n_valeurs .")";
+
+        if (pwg_query($query)) return ;
+        die($query);
+
   }
 }
@@ -260,15 +260,15 @@
 if (!is_numeric($mails_donnees['quarantaine_periode'])){
   $periode=Str_To_Time( $mails_donnees['quarantaine_periode'],0);
-  $mails_donnees['quarantaine_periode']= ($periode > 0) ? $periode : '172800' ; 
+  $mails_donnees['quarantaine_periode']= ($periode > 0) ? $periode : '172800' ;
  }
     if  ($infos_message != "")  {
         array_push($page['infos'],  $infos_message);
         $infos_message="";
-    }		 
+    }
     if  ($erreur_message != "")  {
         array_push($page['errors'], $erreur_message);
         $erreur_message ="";
-    }	
-		 
+    }
+
 }
 //=======================================================================
@@ -295,38 +295,38 @@
   $lang['Sv_'. $lang['Sv_second']] = 'second';
 
-} 
-//--- traduction --> anglais --- 
+}
+//--- traduction --> anglais ---
 
  //========= suppression numeric et symbole ==========
-$new_valeur =( preg_replace("/[0-9+\-.*\/()%]/"," ",$a_ajouter)); 
+$new_valeur =( preg_replace("/[0-9+\-.*\/()%]/"," ",$a_ajouter));
 $nv =  trim( sup_double_espace($new_valeur)) ;
- 
- 
- 
- 	$conv['week']= (7*24*60*60);
-	$conv['day']= (24*60*60);
-	$conv['hour']=  (60*60) ;
-	$conv['minute']=  60 ;
-	$conv['second']= 1;
+
+
+
+    $conv['week']= (7*24*60*60);
+    $conv['day']= (24*60*60);
+    $conv['hour']=  (60*60) ;
+    $conv['minute']=  60 ;
+    $conv['second']= 1;
 
   $nv = explode(" ", $nv );
-  
+
   foreach($nv as $nv1){
     if (!isset($lang['Sv_'. $nv1]) ) {
-    //==== au cas pluriel ===  
-      $nv0 =  substr($nv1, 0,-1) ;   
+    //==== au cas pluriel ===
+      $nv0 =  substr($nv1, 0,-1) ;
       $a_ajouter= str_replace( $nv1,$nv0,   $a_ajouter);
-      $nv1 = $nv0 ;     
-    }  
+      $nv1 = $nv0 ;
+    }
     if (!isset($lang['Sv_'. $nv1]) ) {
-      $erreur_message .= $nv1. " ".l10n('not_found')."<br />";  
-	  //  die($erreur_message);	  
+      $erreur_message .= $nv1. " ".l10n('not_found')."<br />";
+      //  die($erreur_message);
     }else {
-      ob_start();  
+      ob_start();
       $match = $conv[strtolower($lang['Sv_'. $nv1])] ;
       $a_ajouter = str_replace($nv1," ". $match  ." ",$a_ajouter) ;
       $erreur_message .= ob_get_contents();
       ob_end_clean();
-	  }		  
+      }
   }
 
@@ -338,5 +338,5 @@
   $new_valeur =  str_replace($v1,$v2,$a_ajouter) ;
   $new_valeur =  str_replace('++','+',$new_valeur ) ;
-			
+
   return   $new_valeur;
 }
@@ -347,8 +347,8 @@
   global $erreur_message,$infos_message,$user;
   global $lang;
-  
+
   $ajout=ucwords ($ajout);
-  
-  
+
+
 if (is_numeric($ajout))
  $valeur=   $ajout ;
@@ -356,7 +356,7 @@
 {
  $valeur= Date_to_numeric( $ajout) ;
- 
+
  }
- 
+
 $new_valeur = explode( "|", $valeur );
 
@@ -365,68 +365,68 @@
 $erreur = false;
 
-	//$new_valeur = $a_ajouter + $init_date ;
-	foreach($new_valeur as $nv)
-	{
-	$return = matheval($nv) ;
-		 if (strpos("error",$return)===false) {
-		    $p += $return ;
-		 }else {
-		    $erreur_message .=   "[" . $ajout . "] --> " . l10n('Sv_syntax_error') . " : " .  $nv ."<br />";
-			$erreur = true;
-		 }
-			
-	 
-	}
-	if ($erreur) $p = -1000 ;
+    //$new_valeur = $a_ajouter + $init_date ;
+    foreach($new_valeur as $nv)
+    {
+    $return = matheval($nv) ;
+         if (strpos("error",$return)===false) {
+            $p += $return ;
+         }else {
+            $erreur_message .=   "[" . $ajout . "] --> " . l10n('Sv_syntax_error') . " : " .  $nv ."<br />";
+            $erreur = true;
+         }
+
+
+    }
+    if ($erreur) $p = -1000 ;
 return    intval($p) ;
- 
+
 }
 //=====================================================================================
-function matheval($equation) 
-  { 
+function matheval($equation)
+  {
 
   $return="error";
 
-  
-    $equation = preg_replace("/[^0-9+\-.*\/()%]/","",$equation); 
-    $equation = preg_replace("/([+-])([0-9]{1})(%)/","*(1\$1.0\$2)",$equation); 
-    $equation = preg_replace("/([+-])([0-9]+)(%)/","*(1\$1.\$2)",$equation); 
-    $equation = preg_replace("/([0-9]+)(%)/",".\$1",$equation); 
-	
-    if ( $equation == "" ) 
-    { 
-      $return = 0; 
-    }     else  { 
-       @eval("\$return=" . $equation . ";" ); 
-    }
- return $return; 
-   
-  } 
+
+    $equation = preg_replace("/[^0-9+\-.*\/()%]/","",$equation);
+    $equation = preg_replace("/([+-])([0-9]{1})(%)/","*(1\$1.0\$2)",$equation);
+    $equation = preg_replace("/([+-])([0-9]+)(%)/","*(1\$1.\$2)",$equation);
+    $equation = preg_replace("/([0-9]+)(%)/",".\$1",$equation);
+
+    if ( $equation == "" )
+    {
+      $return = 0;
+    }     else  {
+       @eval("\$return=" . $equation . ";" );
+    }
+ return $return;
+
+  }
 
 //======================================================================================
 function sup_double_espace($chaine){
 global $erreur_message;
-	$str_temp = $chaine." ";
-	$sep=" ";
-	$chaine = trim($chaine);
+    $str_temp = $chaine." ";
+    $sep=" ";
+    $chaine = trim($chaine);
     if ($chaine=="") return ;
-	$existe = (strpos($sep.$sep,$chaine )===false) ;
-	 while  ($existe ){
-    	 $str_temp = str_replace($sep.$sep, $sep, $chaine );  
-    		if($str_temp == $chaine ) return $chaine ;
-//			$erreur_message .= mail_supervisor::Memo_Var($str_temp) ;
-    		$chaine  = $str_temp;
-			$existe =  (strpos($sep.$sep,$chaine )===false) ;
-  		}
-	return $chaine;
-}
-//==================== TEST black_liste ============================================	
+    $existe = (strpos($sep.$sep,$chaine )===false) ;
+     while  ($existe ){
+         $str_temp = str_replace($sep.$sep, $sep, $chaine );
+            if($str_temp == $chaine ) return $chaine ;
+//          $erreur_message .= mail_supervisor::Memo_Var($str_temp) ;
+            $chaine  = $str_temp;
+            $existe =  (strpos($sep.$sep,$chaine )===false) ;
+        }
+    return $chaine;
+}
+//==================== TEST black_liste ============================================
 function kill_list() {
   global $pays,$region,$ville,$ip ;
-  global $erreur_message,$infos_message,$conf;	
+  global $erreur_message,$infos_message,$conf;
   global $conf, $user, $page;
   global $mails_options ;
-  global $superv_bl_champs,$superv_bl_type ; 
-  global $nb ; 
+  global $superv_bl_champs,$superv_bl_type ;
+  global $nb ;
   if (!isset($ip)) {
     if (getenv("HTTP_CLIENT_IP"))   {
@@ -437,115 +437,115 @@
   }
   $champs=implode(',',$superv_bl_champs);
-   $query = "SELECT ".$champs.",COUNT(`ip`) as total 
-  FROM `".MAIL_BLACK_LISTE_TABLE."` 
-		WHERE '".$ip."' LIKE `ip` 
-		GROUP by `ip` 
-  ;";	
-	$result = @pwg_query($query);
-	 if (!$result) {
-			verif_base();
-	 		$result = @pwg_query($query);
-			}
-	  $datas = mysql_fetch_array($result,MYSQL_ASSOC);
-  	$nb = $datas['total']|0; 
-    //=======================================================================	
-    if ($mails_options['set_auto'] == 'on') {  
+   $query = "SELECT ".$champs.",COUNT(`ip`) as total
+  FROM `".MAIL_BLACK_LISTE_TABLE."`
+        WHERE '".$ip."' LIKE `ip`
+        GROUP by `ip`
+  ;";
+    $result = @pwg_query($query);
+     if (!$result) {
+            verif_base();
+            $result = @pwg_query($query);
+            }
+      $datas = mysql_fetch_array($result,MYSQL_ASSOC);
+    $nb = $datas['total']|0;
+    //=======================================================================
+    if ($mails_options['set_auto'] == 'on') {
       global $user_name,$mail_adresse;
 
        if (isset($nb) && $nb>0) {
-       //if (test_spam($ip,$user['username'] ,$user['email']))  // ne plus tester automatiquement . 
+       //if (test_spam($ip,$user['username'] ,$user['email']))  // ne plus tester automatiquement .
             if ($nb==0) {
-  	          $valeurs=array( 'NULL',
-		           "'".$ip."'",
-					        "'".$pays."'",
-					        "'".$region."'",	
-					        "'".$ville."'",
-					        "'".$user['email']."'",
-					        "'".$user['username']."'",	
-					        $nb+1
-	            );
- 	          ajout_ligne(MAIL_BLACK_LISTE_TABLE,$superv_bl_champs, $valeurs,$nb==0) ;	
-	        }else{	
-            mail_supervisor::Get_geo();    
-            $nb +=1;	
-		         $query ="UPDATE " . MAIL_BLACK_LISTE_TABLE . " SET ";
-		         if (isset($_POST['pays']))	
-		         $query .= "`pays` = '". $pays ."',
-			        `region` = '" . $region ."',
-			        `ville` = '" . $ville . "',			
-			        ";			
-		         $query .= "`adresse` = '".$user['email']."',		
-			        `fai` = '".$user['username']."',		
-			        `nb` = " . $nb . "
-		         WHERE '".$ip."' like `ip` ";		
-				       pwg_query($query );	
-	        }
- 	     $erreur_message .= $pays . $ip ." <br />User Name :".$user['username']."<br />User Mail :".$user['email'] . ' -----> ' . l10n('Sv_black_liste') ;
-       // die($nb." ".$ip." ".$user['username']." ".$user['email']);  
- 
-       return true ;	
-      }  
+              $valeurs=array( 'NULL',
+                   "'".$ip."'",
+                            "'".$pays."'",
+                            "'".$region."'",
+                            "'".$ville."'",
+                            "'".$user['email']."'",
+                            "'".$user['username']."'",
+                            $nb+1
+                );
+              ajout_ligne(MAIL_BLACK_LISTE_TABLE,$superv_bl_champs, $valeurs,$nb==0) ;
+            }else{
+            mail_supervisor::Get_geo();
+            $nb +=1;
+                 $query ="UPDATE " . MAIL_BLACK_LISTE_TABLE . " SET ";
+                 if (isset($_POST['pays']))
+                 $query .= "`pays` = '". $pays ."',
+                    `region` = '" . $region ."',
+                    `ville` = '" . $ville . "',
+                    ";
+                 $query .= "`adresse` = '".$user['email']."',
+                    `fai` = '".$user['username']."',
+                    `nb` = " . $nb . "
+                 WHERE '".$ip."' like `ip` ";
+                       pwg_query($query );
+            }
+         $erreur_message .= $pays . $ip ." <br />User Name :".$user['username']."<br />User Mail :".$user['email'] . ' -----> ' . l10n('Sv_black_liste') ;
+       // die($nb." ".$ip." ".$user['username']." ".$user['email']);
+
+       return true ;
+      }
     }
  //==============================================================================
 
- if ( $mails_options['ip'] == $ip ) return ($nb > 0) ;	 
+ if ( $mails_options['ip'] == $ip ) return ($nb > 0) ;
    $ip0= $mails_options['ip'] ;
-   $mails_options['ip'] = $ip ;  
-   mail_supervisor::sauve_options();  
- 	if (  $nb > 0 )
-	{
-	       $query = "
-    		SELECT ".$champs.",COUNT(`id`) as total 
-    		FROM `".MAIL_BLACK_LISTE_TABLE."` 
-		    WHERE '".$ip."' = `ip` 
-			GROUP by `ip` 
-  		;";	
-		 $result = @pwg_query($query);
- 
-	if (!$result) {
-					verif_base();
-	 				$result = @pwg_query($query);
-					}
-	    $datas = mysql_fetch_array($result,MYSQL_ASSOC);
-		 $nb = $datas['total']; 
-		 
-	    $row  = mysql_fetch_row(pwg_query($query));
-	    $nb =  ($row[7]);
-        $erreur_message .= $ip0 . ' | ' .$ip . ' | ' . $pays . ' | ' . $region . ' | ' . $ville . ' ' . $nb . ' ==> ';	
-  
-  	 if ($nb == 0)
-		 {
-		   	$valeurs=array( 'NULL',
-		            "'".$ip."'",
-					"'".$pays."'",
-					"'".$region."'",	
-					"'".$ville."'",
-					"'".$user['email']."'",		
-			  "'".$user['username']."'",		
-					1
-	      );
-		  ajout_ligne(MAIL_BLACK_LISTE_TABLE,$superv_bl_champs, $valeurs,true) ;	
-		 
-		 } else {
-		  $nb += 1;
-	 $query ="
-			UPDATE " . MAIL_BLACK_LISTE_TABLE . " 
-			SET ";
-		if (isset($_POST['pays']))	
-		 $query .= "	
-			`pays` = '". $pays ."',
-			`region` = '" . $region ."',
-			`ville` = '" . $ville . "',
-			";
-		 $query .= "	
-		    `adresse` = '".$user['email']."',
-			`fai` = '".$user['username']."',			
-			`nb` = " . $nb . "
-		    WHERE '".$ip."' = `ip` 
-        	";
-		
-				pwg_query($query );	
-				}
-	}
+   $mails_options['ip'] = $ip ;
+   mail_supervisor::sauve_options();
+    if (  $nb > 0 )
+    {
+           $query = "
+            SELECT ".$champs.",COUNT(`id`) as total
+            FROM `".MAIL_BLACK_LISTE_TABLE."`
+            WHERE '".$ip."' = `ip`
+            GROUP by `ip`
+        ;";
+         $result = @pwg_query($query);
+
+    if (!$result) {
+                    verif_base();
+                    $result = @pwg_query($query);
+                    }
+        $datas = mysql_fetch_array($result,MYSQL_ASSOC);
+         $nb = $datas['total'];
+
+        $row  = mysql_fetch_row(pwg_query($query));
+        $nb =  ($row[7]);
+        $erreur_message .= $ip0 . ' | ' .$ip . ' | ' . $pays . ' | ' . $region . ' | ' . $ville . ' ' . $nb . ' ==> ';
+
+     if ($nb == 0)
+         {
+            $valeurs=array( 'NULL',
+                    "'".$ip."'",
+                    "'".$pays."'",
+                    "'".$region."'",
+                    "'".$ville."'",
+                    "'".$user['email']."'",
+              "'".$user['username']."'",
+                    1
+          );
+          ajout_ligne(MAIL_BLACK_LISTE_TABLE,$superv_bl_champs, $valeurs,true) ;
+
+         } else {
+          $nb += 1;
+     $query ="
+            UPDATE " . MAIL_BLACK_LISTE_TABLE . "
+            SET ";
+        if (isset($_POST['pays']))
+         $query .= "
+            `pays` = '". $pays ."',
+            `region` = '" . $region ."',
+            `ville` = '" . $ville . "',
+            ";
+         $query .= "
+            `adresse` = '".$user['email']."',
+            `fai` = '".$user['username']."',
+            `nb` = " . $nb . "
+            WHERE '".$ip."' = `ip`
+            ";
+
+                pwg_query($query );
+                }
+    }
  return ($nb > 0) ;
 }
@@ -558,21 +558,21 @@
  $result="";
  $ip= sup_double_espace($ip);
- if (strlen($ip)>3) { 
+ if (strlen($ip)>3) {
    //==================  Verifie si l'IP est correct  ================================
-   if (clj_is_ip($ip)){     
-     
-   } else {  
-   //==================  Verifie si l'adresse mail est correcte  ================================ 
-         if( clj_is_mail($ip) ){  
-	 		 $mail_adresse=$ip ;
-	         $ip="";
-	    }
-	    else
-	    {
-   //==================  Login  ================ 
-	      $user_name=$ip;
-	      $ip="";
-	    }
-   }    
+   if (clj_is_ip($ip)){
+
+   } else {
+   //==================  Verifie si l'adresse mail est correcte  ================================
+         if( clj_is_mail($ip) ){
+             $mail_adresse=$ip ;
+             $ip="";
+        }
+        else
+        {
+   //==================  Login  ================
+          $user_name=$ip;
+          $ip="";
+        }
+   }
    //=============================================================================
  }
@@ -582,27 +582,27 @@
  $user_name="";  // ne plus tester sur le login.
  $mail_adresse =str_replace(" ","%20",trim($mail_adresse));
- if ( strlen($user_name) > 3)  	  $type[]="username=$user_name" ;
+ if ( strlen($user_name) > 3)     $type[]="username=$user_name" ;
  if ( strlen($mail_adresse) > 3)   $type[]="email=".$mail_adresse ;
- if ( strlen($ip) > 3)   $type[]="ip=".$ip ; 
- foreach  ( $type as $fil ) {    
+ if ( strlen($ip) > 3)   $type[]="ip=".$ip ;
+ foreach  ( $type as $fil ) {
   $resultat="";
   if (  clj_fetchRemote($src.$fil , $resultat,1))
-   $result .= $resultat.'<br />'  ; 		  
+   $result .= $resultat.'<br />'  ;
  }
 
  return !(strpos(  $result ,'yes' ) === false) ;
-  
+
 }
 //==================================================================
 function lire_fichier_distant($fichier){
   $buffer="";
-  $handle =  @fopen($fichier,"r"); 
+  $handle =  @fopen($fichier,"r");
   if ($handle) {
-    while (!feof($handle)) { 
+    while (!feof($handle)) {
         $buffer .= fgets($handle, 4096);
-		  }   
-			  fclose($handle);
-	  }
-				 
+          }
+              fclose($handle);
+      }
+
   return  $buffer ;
 
@@ -611,15 +611,15 @@
 function clj_is_ip($ip){
 if (preg_match("/^(((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]{1}[0-9]|[1-9])\.){1}((25[0-5]|2[0-4][0-9]|[1]{1}[0-9]{2}|[1-9]{1}[0-9]|[0-9])\.){2}((25[0-5]|2[0-4][0-9]|[1]{1}[0-9]{2}|[1-9]{1}[0-9]|[0-9]){1}))$/",$ip))    return true ;
-		 
+
 }
 
 function clj_is_mail($mail)
-{     
-
- if(preg_match('/^[\w.-]+@[\w.-]+\.[a-zA-Z]{2,5}$/' ,$mail)) return true ;	
-  if(preg_match('/#^[\w.-]+@[\w.-]+\.[a-zA-Z]{2,5}$#/' ,$mail)) return true ;	
-}	   
-
- 
+{
+
+ if(preg_match('/^[\w.-]+@[\w.-]+\.[a-zA-Z]{2,5}$/' ,$mail)) return true ;
+  if(preg_match('/#^[\w.-]+@[\w.-]+\.[a-zA-Z]{2,5}$#/' ,$mail)) return true ;
+}
+
+
 function clj_fetchRemote($src, &$dest, $timeout=1, $user_agent='Piwigo', $step=0)
 {
@@ -628,8 +628,8 @@
 
   if ($src=="") return ;
- 
+
   if (!url_is_remote($src))
   {
-  
+
     $content = @file_get_contents($src);
     if ($content !== false)
@@ -643,5 +643,5 @@
     }
   }
- 
+
   // After 3 redirections, return false
   if ($step > 3) return false;
Index: /extensions/Mail_supervisor/include/function_test_send.php
===================================================================
--- /extensions/Mail_supervisor/include/function_test_send.php	(revision 10418)
+++ /extensions/Mail_supervisor/include/function_test_send.php	(revision 10419)
@@ -23,35 +23,35 @@
 
 if ( !defined('PHPWG_ROOT_PATH'))   die('Hacking attempt!');
-function test_envoie($message,$group_name,$group_id){    
+function test_envoie($message,$group_name,$group_id){
   global $infos_message,$erreur_message ,$conf,$user,$conf_mail,$mail_donnees,$args,$lang ;
-	$mailto="";	
+    $mailto="";
  load_language('plugin.lang', MAIL_SUPERV_PATH);
- 
+
 //==================================================================================
 if (!isset($infos_message))
-	{
-    	$infos_message = "";
-	}
+    {
+        $infos_message = "";
+    }
 if (!isset($erreur_message))
-	{
-    	$erreur_message = '';
-	}
+    {
+        $erreur_message = '';
+    }
 if (!isset($mails_donnees))
-	{
-    	$mails_donnees = mail_supervisor::Get_Datas();
-	}		
+    {
+        $mails_donnees = mail_supervisor::Get_Datas();
+    }
 if (!isset($conf_mail))
   {
-    	$conf_mail = get_mail_configuration();
+        $conf_mail = get_mail_configuration();
   }
-  	  if (isset($args))
-  { 
+      if (isset($args))
+  {
     $infos_message=mail_supervisor::Memo_Var($args);
   }else{
-  	$args = array();
-	}
+    $args = array();
+    }
 //=====================================================================================================
 
-  
+
 
 $groups=get_liste($group_id);
@@ -62,41 +62,41 @@
        $args['Bcc']=$groups;
    }   else {
-       $mailto = $conf_mail['formated_email_webmaster']; 
-   } 
-   
+       $mailto = $conf_mail['formated_email_webmaster'];
+   }
+
 $args['from'] =(function_exists('get_user_language_desc')) ? get_user_language_desc($conf_mail['formated_email_webmaster']):$conf_mail['formated_email_webmaster'];
 $message_html =$message;
       if (function_exists('get_user_language_desc') and isset($message) and $message <> '')
         $message = get_user_language_desc($message)."\n\n";
-  
-	//==================================================================
-	 $message_texte=sprintf(
+
+    //==================================================================
+     $message_texte=sprintf(
         l10n('Sv_message_texte %s %s %s %s'),
         format_date( date("Y-m-d H:i:s")),
-		$group_name,
-		$message,
-		$args['from']
-        );	
- 	//==================================================================
-	$message_html .= "</br>" . $message . "</br>" . $message_texte;
+        $group_name,
+        $message,
+        $args['from']
+        );
+    //==================================================================
+    $message_html .= "</br>" . $message . "</br>" . $message_texte;
  //==========================================================================
 
-    	$args['subject']="Plugin Piwigo TEST";
-    	$args['content']=$message_html;
-		$infos_message .="To :" . $mailto;
-		
-        $ret= pwg_mail($mailto , $args); 
-	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('Sv_mail_sent_to'), $mailto ).'<br />';
-		 		}
-		 
-	}else{
-	       $infos_message .='<br />'.l10n('Sv_no_receiver_available') ;
-	}
+        $args['subject']="Plugin Piwigo TEST";
+        $args['content']=$message_html;
+        $infos_message .="To :" . $mailto;
+
+        $ret= pwg_mail($mailto , $args);
+    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('Sv_mail_sent_to'), $mailto ).'<br />';
+                }
+
+    }else{
+           $infos_message .='<br />'.l10n('Sv_no_receiver_available') ;
+    }
 }
 //===============================================================================================================
@@ -105,5 +105,5 @@
 
     $mails_donnees = mail_supervisor::Get_Datas();
-	  if (!isset($conf_mail))
+      if (!isset($conf_mail))
   {
     $conf_mail = get_mail_configuration();
@@ -112,15 +112,15 @@
  load_language('plugin.lang', MAIL_SUPERV_PATH);
 
-  		$nom ='piwigo_logo_sombre_214x100.png'; 
-		$fichier=PHPWG_ROOT_PATH.'admin/template/goto/theme/roma/images/piwigo_logo_sombre_214x100.png' ;
-		$typemime='image/jpeg';
-				
-		$fd = fopen( $fichier, "r" ); 
-  		$contenu = fread( $fd, filesize( $fichier ) ); 
-  		fclose( $fd ); 
-  		$piecejointe  = chunk_split(base64_encode($contenu)); 
-		
-		
-	 $from=$args['from'];
+        $nom ='piwigo_logo_sombre_214x100.png';
+        $fichier=PHPWG_ROOT_PATH.'admin/template/goto/theme/roma/images/piwigo_logo_sombre_214x100.png' ;
+        $typemime='image/jpeg';
+
+        $fd = fopen( $fichier, "r" );
+        $contenu = fread( $fd, filesize( $fichier ) );
+        fclose( $fd );
+        $piecejointe  = chunk_split(base64_encode($contenu));
+
+
+     $from=$args['from'];
 $to="";
 
@@ -128,20 +128,20 @@
         l10n('Sv_message_texte %s %s %s'),
         format_date( date("Y-m-d H:i:s")),
-		$to,
-		$from
-        );	
-		
- 
-  $message_html =  	'<img src="'.PHPWG_ROOT_PATH.'admin/template/goto/theme/roma/images/piwigo_logo_sombre_214x100.png" />';
-  ob_start();	
- 
+        $to,
+        $from
+        );
+
+
+  $message_html =   '<img src="'.PHPWG_ROOT_PATH.'admin/template/goto/theme/roma/images/piwigo_logo_sombre_214x100.png" />';
+  ob_start();
+
   echo str_replace("\n","<br />",$message_texte);
-	
+
   $message_html .= ob_get_contents()."\n";
   //ob_flush();
   ob_end_clean();
 
-  $limite=$conf_mail['boundary_key'];   
-  $headers =   date("Y-m-d H:i:s") ."\n"; 
+  $limite=$conf_mail['boundary_key'];
+  $headers =   date("Y-m-d H:i:s") ."\n";
 
   //=======================================================================================
@@ -149,14 +149,14 @@
     $headers.= "Reply-To: ".$args['from']."\n";
     $nb_destinataires=0;
-    $destinataire = $conf_mail['email_webmaster'];  
+    $destinataire = $conf_mail['email_webmaster'];
     if (!empty($args['Cc'])){
       $nb_destinataires += count($args['Cc']);
       $to= explode(',', $args['Cc']);
-      $headers	.= get_strict_email_list($to) ;		    
-  	}
-    if (!empty($args['Bcc'])){  
-      $nb_destinataires += count($args['Bcc']); 
+      $headers  .= get_strict_email_list($to) ;
+    }
+    if (!empty($args['Bcc'])){
+      $nb_destinataires += count($args['Bcc']);
       $to = implode(',', $args['Bcc']);
-      $headers	.= 'Bcc :'.get_strict_email_list($to)."\n" ;		   
+      $headers  .= 'Bcc :'.get_strict_email_list($to)."\n" ;
     }
 
@@ -166,26 +166,26 @@
     $headers.= 'MIME-Version: 1.0'."\n";
     $headers.= 'X-Mailer: Piwigo Mailer'."\n";
-    //Le message en texte simple pour les navigateurs qui n'acceptent pas le HTML 
-    $texte = "This is a multi-part message in MIME format.\n"; 	
-    $texte .= "-----=".$limite."\n"; 
-    $texte .= "Ceci est un message est au format MIME.\n"; 
-    $texte .= 'Content-Type: text/plain; charset="UTF-8"'."\n"; 
-    $texte .= 'Content-Transfer-Encoding: 8bit'."\n\n";  
-    $texte .= $message_texte ; 
-    $texte .= "\n\n"; 		
-    $texte .= "-----=".$limite."\n"; 
-    $texte .= 'Content-Type: text/html; charset="UTF-8"'."\n"; 
-    $texte .= 'Content-Transfer-Encoding: 8bit'."\n\n";  
-    $texte .= $message_html; 
-    $texte .= "\n\n"; 
-    $attachement = "-----=".$limite."\n"; 
-    $attachement .= "Content-Type: ".$typemime."; name=\"".$nom."\"\n"; 
-    $attachement .= "Content-Transfer-Encoding: base64\n"; 
-    $attachement .= "Content-Disposition: attachment; filename=\"".$nom."\"\n\n"; 
-    $attachement .= $piecejointe; 
-    $attachement .= "\n\n\n-----=".$limite."\n"; 
+    //Le message en texte simple pour les navigateurs qui n'acceptent pas le HTML
+    $texte = "This is a multi-part message in MIME format.\n";
+    $texte .= "-----=".$limite."\n";
+    $texte .= "Ceci est un message est au format MIME.\n";
+    $texte .= 'Content-Type: text/plain; charset="UTF-8"'."\n";
+    $texte .= 'Content-Transfer-Encoding: 8bit'."\n\n";
+    $texte .= $message_texte ;
+    $texte .= "\n\n";
+    $texte .= "-----=".$limite."\n";
+    $texte .= 'Content-Type: text/html; charset="UTF-8"'."\n";
+    $texte .= 'Content-Transfer-Encoding: 8bit'."\n\n";
+    $texte .= $message_html;
+    $texte .= "\n\n";
+    $attachement = "-----=".$limite."\n";
+    $attachement .= "Content-Type: ".$typemime."; name=\"".$nom."\"\n";
+    $attachement .= "Content-Transfer-Encoding: base64\n";
+    $attachement .= "Content-Disposition: attachment; filename=\"".$nom."\"\n\n";
+    $attachement .= $piecejointe;
+    $attachement .= "\n\n\n-----=".$limite."\n";
     $ret=false;
     ob_start();
-    $ret= mail( $destinataire, $args['subject'], $texte.$attachement, $headers); 
+    $ret= mail( $destinataire, $args['subject'], $texte.$attachement, $headers);
     $message =  ob_get_contents() ;
   //ob_flush();
@@ -195,5 +195,5 @@
     $infos_message =  "-------------------";
   }
-  return  $ret;  
+  return  $ret;
 }
 ?>
Index: /extensions/Mail_supervisor/include/save_info.php
===================================================================
--- /extensions/Mail_supervisor/include/save_info.php	(revision 10418)
+++ /extensions/Mail_supervisor/include/save_info.php	(revision 10419)
@@ -4,81 +4,81 @@
 switch (strtolower($info_ip))
  {
-  case  'ajout' :  
+  case  'ajout' :
  $ip_black=str_replace("*","%",$ip_black);
  if (!($ip_black == '')) {
    $query = "
-    		SELECT `ip` 
-    		FROM `".MAIL_BLACK_LISTE_TABLE."` 
-		    WHERE  '".$ip_black."' LIKE ip 
-  		;";	
-	//==============================================================================		
+            SELECT `ip`
+            FROM `".MAIL_BLACK_LISTE_TABLE."`
+            WHERE  '".$ip_black."' LIKE ip
+        ;";
+    //==============================================================================
   list($count) = mysql_fetch_row(pwg_query($query));
-  //==============================================================================	
+  //==============================================================================
   $valeurs=array( 'NULL',
-		            "'".$ip_black."'",
-					         "'".$pays."'",
-					         "'".$region."'",	
-					         "'".$ville."'",
-					         '"adresse"',
-					         '"fai" ',
-					         $count + 1
-	        );
- 	ajout_ligne(MAIL_BLACK_LISTE_TABLE,$superv_bl_champs, $valeurs,($count==0)) ;	
+                    "'".$ip_black."'",
+                             "'".$pays."'",
+                             "'".$region."'",
+                             "'".$ville."'",
+                             '"adresse"',
+                             '"fai" ',
+                             $count + 1
+            );
+    ajout_ligne(MAIL_BLACK_LISTE_TABLE,$superv_bl_champs, $valeurs,($count==0)) ;
  }
- 
+
  break;
  //================================================================================================
   case 'raz':
     $ip_black=str_replace('*',"%",$ip_black);
-  		$query = "DELETE FROM `".MAIL_BLACK_LISTE_TABLE."` WHERE `ip`  like '%".$ip_black."%' ";
-			 pwg_query($query);
-   
+        $query = "DELETE FROM `".MAIL_BLACK_LISTE_TABLE."` WHERE `ip`  like '%".$ip_black."%' ";
+             pwg_query($query);
+
     unset ($_SESSION['pwg_'.'action_spam']);
    break;
-   
-    default:				
+
+    default:
    break;
-   
-  } 
+
+  }
 //================ Liste Black liste =================
   $query = "
-     SELECT *,  COUNT(`ip`) as total ,	`ip` as blacklist, `ip` as U_DELETE 
+     SELECT *,  COUNT(`ip`) as total ,  `ip` as blacklist, `ip` as U_DELETE
      FROM ".MAIL_BLACK_LISTE_TABLE."
-     GROUP by ip 
+     GROUP by ip
      ;";
-	$liste_bl = array();
+    $liste_bl = array();
  $result = pwg_query($query);
-		while ($row = mysql_fetch_array($result,MYSQL_ASSOC))	{
-    			 array_push($liste_bl,$row);
-   				}	   
-//================ Liste IP ==============		
-$req = mysql_query('SELECT count(distinct(`IP`)) FROM '.HISTORY_TABLE.'    '); 
+        while ($row = mysql_fetch_array($result,MYSQL_ASSOC))   {
+                 array_push($liste_bl,$row);
+                }
+//================ Liste IP ==============
+$req = mysql_query('SELECT count(distinct(`IP`)) FROM '.HISTORY_TABLE.'    ');
 $nbip =  array_pop(mysql_fetch_row($req)) ;
 
-	$query = 'SELECT DISTINCT 	H.`id`,
+    $query = 'SELECT DISTINCT   H.`id`,
             H.`date`,
             H.`time`,
             H.`user_id`,
-            H.`IP`, 
-            COUNT(H.`IP`) as total  
-            FROM '.HISTORY_TABLE.'  AS H 
-            WHERE  "'.$ip.'"not LIKE H.`IP` 	';//
-	if (count($liste_bl)>0){
-	$query .= '	AND  H.`IP` not IN ( SELECT `ip`
+            H.`IP`,
+            COUNT(H.`IP`) as total
+            FROM '.HISTORY_TABLE.'  AS H
+            WHERE  "'.$ip.'"not LIKE H.`IP`     ';//
+    if (count($liste_bl)>0){
+    $query .= ' AND  H.`IP` not IN ( SELECT `ip`
     FROM '.MAIL_BLACK_LISTE_TABLE.' ) ';
-	}
- 
-	$query .= '	
-	GROUP by H.`IP` 
-	ORDER by `id` DESC
-	LIMIT '.(int)($params['per_page']*$params['start']).','.(int)$params['per_page'].'	
-	'   ;
+    }
 
-	$result = pwg_query($query);
-	$liste_ip=array();
-	while ($row = mysql_fetch_array($result,MYSQL_ASSOC))	{ 
+    $query .= '
+    GROUP by H.`IP`
+    ORDER by `id` DESC
+    LIMIT '.(int)($params['per_page']*$params['start']).','.(int)$params['per_page'].'
+    '   ;
 
-    		  array_push($liste_ip, $row);
-   				}
+    $result = pwg_query($query);
+    $liste_ip=array();
+    while ($row = mysql_fetch_array($result,MYSQL_ASSOC))   {
+
+              array_push($liste_ip, $row);
+                }
 
 ?>
Index: /extensions/Mail_supervisor/language/en_UK/plugin.lang.php
===================================================================
--- /extensions/Mail_supervisor/language/en_UK/plugin.lang.php	(revision 10418)
+++ /extensions/Mail_supervisor/language/en_UK/plugin.lang.php	(revision 10419)
@@ -6,5 +6,5 @@
 //=======================================================
 $lang['Sv_Datas'] =  'Datas' ;
-$lang['Sv_Group'] = $lang['Group']; 
+$lang['Sv_Group'] = $lang['Group'];
 $lang['Sv_mail_content'] =  '';
 $lang['Sv_options'] =   'Options' ;
@@ -13,5 +13,5 @@
 $lang['Sv_config'] =  'Configuration' ;
 
-$lang['Sv_rest'] = 'Remain';    
+$lang['Sv_rest'] = 'Remain';
 $lang['Sv_iP_list'] = 'IP\'s list';
 $lang['Sv_iP_adress'] = 'IP address';
@@ -84,6 +84,6 @@
 $lang['Sv_To_day_is'] = 'Today is:'.date('d-M-Y H:i:s') ;
 
-$lang['Sv_formatdate'] = 'd-M-Y H:i:s'; 
-$lang['Sv_format'] = 'Accepted values:'; 
+$lang['Sv_formatdate'] = 'd-M-Y H:i:s';
+$lang['Sv_format'] = 'Accepted values:';
 
 
@@ -91,5 +91,5 @@
                             ON QUARANTINE!<br />'.
                             'Number of %s sent: %s  <br />'.
-                            'From             : %s  <br />'.       
+                            'From             : %s  <br />'.
                             'You still have     %s  before unblocking<br />'.
                               ' The       %s <br />' ;
@@ -99,5 +99,5 @@
                             'You overpassed the number of mails within the acceptable period. <br />'.
                             'Number of %s sent: %s  <br />'.
-                            'From             : %s  <br />'.       
+                            'From             : %s  <br />'.
                             'You still have     %s before unblocking<br />'.
                               ' The       %s <br />' ;
@@ -113,7 +113,7 @@
 $lang['Sv_message_texte "%s" "%s" "%s" "%s"'] ='
  %s
-	 '. l10n('hello') .'  "%s"  ,
+     '. l10n('hello') .'  "%s"  ,
   %s
-	 '. l10n('See you soon.') .'  %s
-	  '; 
+     '. l10n('See you soon.') .'  %s
+      ';
 ?>
Index: /extensions/Mail_supervisor/language/fr_FR/help/plugin.lang.php
===================================================================
--- /extensions/Mail_supervisor/language/fr_FR/help/plugin.lang.php	(revision 10418)
+++ /extensions/Mail_supervisor/language/fr_FR/help/plugin.lang.php	(revision 10419)
@@ -9,5 +9,5 @@
 $lang['Sv_Fonctionality']='Fonctionnalites';
 
-$lang['Sv_oversees_management_emails']='Supervise la gestion des mails et bloque l\' envoie des mails lors de la mise en quarantaine';	
+$lang['Sv_oversees_management_emails']='Supervise la gestion des mails et bloque l\' envoie des mails lors de la mise en quarantaine';
 $lang['Sv_hlp_1_1']='Compte le nombre de mails envoyes par le site.';
 $lang['Sv_hlp_1_2']='Detecte les differents messages d\'alertes generes par la fonction mail[]';
@@ -46,34 +46,34 @@
 $lang['Sv_hlp_4_1']='Date limite de la mise en quarantaine.';
 $lang['Sv_hlp_4_2']='Duree restante avant l\' anulation de la mise en quarantaine.';
-	 
+
 $lang['Sv_last_message']='Dernier message renvoye.';
 $lang['Sv_hlp_5_1']='Dernier message renvoye par la fonction mail() en cas d\'erreur.';
 
 
-//====================================================================== 
+//======================================================================
 $lang['Sv_hlp_7_1']='Ce module permet de creer une liste noire contenant les adresses IP indesirables.<br />
-          ' ;	
+          ' ;
 $lang['Sv_hlp_7_1_1']='Option 1 Bloque l\' emission de mail si l\' adresse IP est dans la liste noire. <br />
-		  ' ;	
+          ' ;
 $lang['Sv_hlp_7_1_2']='Option 2 Rejet de l\' adresse IP .<br />
-		  ' ;	
+          ' ;
 $lang['Sv_hlp_7_1_3']='Option 2 A chaque nouvelle connexion, le module teste l\'adresses IP et la compare à la liste noire si le test est positif.<br />
-		   Un compteur dans cette liste indique le nombre de tentative de connexion.<br />
-		   Des informations sur le pays et la ville du FAI sont egalement stockees.<br />
-		   
-		   		' ;	
+           Un compteur dans cette liste indique le nombre de tentative de connexion.<br />
+           Des informations sur le pays et la ville du FAI sont egalement stockees.<br />
+
+                ' ;
 $lang['Sv_hlp_7_2']= 'Ajout manuel des adresses indesirables.<br />
-		   
-				  Les jockers (*) pour remplacer un groupe d\'adresse  sont autorises.<br />
-				    Exemple : 94.102.63.* :
-				  Exclusion de toutes les adresses IP de 94.102.63.0 à 94.102.63.255 <br />
-				  	Exemple : 94.102.*.13 :
-				  Exclusion de toutes les adresses IP de 94.102.0.13 à 94.102.255.13 <br />
-				  
-		' ;	
-$lang['Sv_hlp_7_3']= ' Cliquez ici pour verifier si l\'adresse IP ou le nom de l\'utilisateur ou l\'adresse courriel introduit dans le champs texte est dans la base de donnee de stopforumspam.Les jockers ne sont pas admis. Pour plus de renseignements voir http://www.stopforumspam.com' ;	
+
+                  Les jockers (*) pour remplacer un groupe d\'adresse  sont autorises.<br />
+                    Exemple : 94.102.63.* :
+                  Exclusion de toutes les adresses IP de 94.102.63.0 à 94.102.63.255 <br />
+                    Exemple : 94.102.*.13 :
+                  Exclusion de toutes les adresses IP de 94.102.0.13 à 94.102.255.13 <br />
+
+        ' ;
+$lang['Sv_hlp_7_3']= ' Cliquez ici pour verifier si l\'adresse IP ou le nom de l\'utilisateur ou l\'adresse courriel introduit dans le champs texte est dans la base de donnee de stopforumspam.Les jockers ne sont pas admis. Pour plus de renseignements voir http://www.stopforumspam.com' ;
 
 $lang['Sv_hlp_7_4']= ' Si vous decidez de bloquer cette adresse cliquez ici où sur l\'icône \'ajout\' pour mettre à jour la liste noire .<BR />
-	 
-' ;	
+
+' ;
 ?>
Index: /extensions/Mail_supervisor/language/fr_FR/plugin.lang.php
===================================================================
--- /extensions/Mail_supervisor/language/fr_FR/plugin.lang.php	(revision 10418)
+++ /extensions/Mail_supervisor/language/fr_FR/plugin.lang.php	(revision 10419)
@@ -6,17 +6,17 @@
 //=======================================================
 
-$lang['Sv_Are_you_sure'] =  'Etes-vous sûr' ; 
-$lang['Sv_no_verif'] =  'IP Non vérifié.' ; 
-$lang['Sv_delete'] =  'Supprimer' ; 
-$lang['Sv_Datas'] =  'Datas' ; 
-$lang['Sv_Group'] = $lang['Group']; 
+$lang['Sv_Are_you_sure'] =  'Etes-vous sûr' ;
+$lang['Sv_no_verif'] =  'IP Non vérifié.' ;
+$lang['Sv_delete'] =  'Supprimer' ;
+$lang['Sv_Datas'] =  'Datas' ;
+$lang['Sv_Group'] = $lang['Group'];
 $lang['Sv_mail_content'] =  '';
 $lang['Sv_options'] =   'Options' ;
-$lang['Sv_raz'] =  'raz' ; 
-$lang['Sv_Quarantaine'] =  'Quarantaine' ; 
-$lang['Sv_config'] =  'Configuration' ; 
-	 
-$lang['Sv_rest'] = 'Reste';	 
-$lang['Sv_iP_list'] = 'Liste des IP'; 
+$lang['Sv_raz'] =  'raz' ;
+$lang['Sv_Quarantaine'] =  'Quarantaine' ;
+$lang['Sv_config'] =  'Configuration' ;
+
+$lang['Sv_rest'] = 'Reste';
+$lang['Sv_iP_list'] = 'Liste des IP';
 $lang['Sv_iP_adress'] = 'IP adresse';
 $lang['Sv_Test'] = 'Test';
@@ -86,27 +86,27 @@
 $lang['Sv_supervisor'] = 'Superviseur de MAILS';
 //========================================================================
-$lang['Sv_To_day_is'] = 'Nous sommes le:'.date('d-M-Y H:i:s') ; 
+$lang['Sv_To_day_is'] = 'Nous sommes le:'.date('d-M-Y H:i:s') ;
 
-$lang['Sv_formatdate'] = 'd-M-Y H:i:s';  
-$lang['Sv_format'] = 'Valeurs acceptées:';  
+$lang['Sv_formatdate'] = 'd-M-Y H:i:s';
+$lang['Sv_format'] = 'Valeurs acceptées:';
 
 
 $lang['Sv_mise_en_quarantaine %s %s %s %s %s'] = '
-							MISE EN QUARANTAINE !<br />'.
-							'Nombre de %s envoyés  : %s  <br />'.
-							'Depuis le             : %s  <br />'.		
-							'Il vous reste encore    %s  avant le déblocage<br />'.
-  							' Le        %s <br />' ;
-	
+                            MISE EN QUARANTAINE !<br />'.
+                            'Nombre de %s envoyés  : %s  <br />'.
+                            'Depuis le             : %s  <br />'.
+                            'Il vous reste encore    %s  avant le déblocage<br />'.
+                            ' Le        %s <br />' ;
+
 
 $lang['Sv_alerte_mail %s %s %s %s %s'] = '
-                    		ALERTE !!! DANGER DE MISE EN QUARANTAINE PAR VOTRE FAI <br />'.
-							'Vous avez dépassé le nombre de mails admissibles par période. <br />'.
-							'Nombre de %s envoyés  : %s  <br />'.
-							'Depuis le             : %s  <br />'.		
-							'Il vous reste encore    %s  avant le déblocage<br />'.
-  							' Le        %s <br />' ;
-					
-$lang['Sv_debug_message']=	'
+                            ALERTE !!! DANGER DE MISE EN QUARANTAINE PAR VOTRE FAI <br />'.
+                            'Vous avez dépassé le nombre de mails admissibles par période. <br />'.
+                            'Nombre de %s envoyés  : %s  <br />'.
+                            'Depuis le             : %s  <br />'.
+                            'Il vous reste encore    %s  avant le déblocage<br />'.
+                            ' Le        %s <br />' ;
+
+$lang['Sv_debug_message']=  '
 La fonction mail à retourné [%s] <br />
 MESSAGE erreur : [ %s ] <br />
@@ -118,7 +118,7 @@
 $lang['Sv_message_texte "%s" "%s" "%s" "%s"'] ='
  %s
-	 '. l10n('hello') .'  "%s"  ,
+     '. l10n('hello') .'  "%s"  ,
   %s
-	 '. l10n('See you soon.') .'  %s
-	  '; 
+     '. l10n('See you soon.') .'  %s
+      ';
 ?>
Index: /extensions/Mail_supervisor/mail_super.inc.php
===================================================================
--- /extensions/Mail_supervisor/mail_super.inc.php	(revision 10418)
+++ /extensions/Mail_supervisor/mail_super.inc.php	(revision 10419)
@@ -39,5 +39,5 @@
  */
  static public function init() {
-  global  $template,$version,$icon_path;    
+  global  $template,$version,$icon_path;
   $action_spam = pwg_get_session_var('action_spam') ;
   $theme="default";
@@ -48,8 +48,8 @@
   if (PHPWG_VERSION < 2.2 ) {
     $file =MAIL_SUPERV_PATH_ABS.'admin/header_2_1.tpl' ;
-  
+
   } else {
     $file = MAIL_SUPERV_PATH_ABS.'admin/header_2_2.tpl' ;
-    
+
   }
   if(isset($_GET['action_spam']) and $_GET['action_spam']=="no"){
@@ -62,6 +62,6 @@
   $profile=array('theme' => $theme,
             'PHPWG_VERSION' => PHPWG_VERSION ,
-            'MAIL_SUPERV_PATH' => $MAIL_SUPERV_PATH  ,             
-            'MAIL_SUPERV_PATH_ABS' => MAIL_SUPERV_PATH_ABS           
+            'MAIL_SUPERV_PATH' => $MAIL_SUPERV_PATH  ,
+            'MAIL_SUPERV_PATH_ABS' => MAIL_SUPERV_PATH_ABS
           );
 
@@ -86,13 +86,13 @@
           $ip=getenv("REMOTE_ADDR");
       }
-    }    
+    }
       //  unset ($_SESSION['pwg_'.'action_spam']);
       $action_spam = pwg_get_session_var('action_spam') ;
-        
+
       if  ($action_spam == null or $action_spam == 'false') {
         $action_spam = kill_list();
       }
 
-      if (is_bool($action_spam)) $action_spam =($action_spam == true) ? "true" : "false" ; 
+      if (is_bool($action_spam)) $action_spam =($action_spam == true) ? "true" : "false" ;
       if ($action_spam == "true" ) {
         $erreur_message .= $ip . " "  . $action_spam  ;
@@ -122,5 +122,5 @@
         else $page['infos']=Array($infos_message);
         $infos_message="";
-      }    
+      }
     if (isset($erreur_message))
       if  ($erreur_message != "")  {
@@ -130,5 +130,5 @@
         else $page['errors']=Array($erreur_message);
         $erreur_message ="";
-      } 
+      }
     return $action_spam;
   } //fin Affiche_message
@@ -140,6 +140,6 @@
   static public function Get_geo() {
     global  $info_geo,$ip,$pays,$region,$ville, $latitude ,$longitude,$mails_options;
-    //===================================================================================   
-    $info_geo = pwg_get_session_var('info_geo'); 
+    //===================================================================================
+    $info_geo = pwg_get_session_var('info_geo');
     if (count($info_geo) > 0){
         $pays  = $info_geo[0];
@@ -177,7 +177,7 @@
     if(count($variables)>1){
     foreach($variables as $key => $line){
-      echo  $key . " =>  " . $line ; 
+      echo  $key . " =>  " . $line ;
       echo "<br />";
-    }       
+    }
     }else{
         echo "<i>".$variables."</i><br />";
@@ -233,5 +233,5 @@
     global $conf,$mails_options ;
   $mails_options=  $conf[$str_index];
- 
+
  if(isset($mails_options))
    if ( preg_match("|s:(.*)|", $mails_options, $val) )
@@ -239,30 +239,30 @@
    else{
      $parametres=explode(",",$mails_options);
-   
+
     $def_para->check_mailto="on";
     $def_para->check_header_carbon="on";
     $def_para->check_header_text="on";
     $def_para->no_mail_list="on";
-    $def_para->no_connect="on";	// empeche l'ip de se connecter au site.
-    $def_para->set_auto="on";		// Test a l'ouverture et enregistrement 
-    $def_para->ip="127.0.0.1";		// dernièrre adresse IP
-    $def_para->set_id="on";		  // enregistrment nouvel  
+    $def_para->no_connect="on"; // empeche l'ip de se connecter au site.
+    $def_para->set_auto="on";       // Test a l'ouverture et enregistrement
+    $def_para->ip="127.0.0.1";      // dernièrre adresse IP
+    $def_para->set_id="on";       // enregistrment nouvel
     $i=0;
     foreach ($def_para as $key => $value) {
         $value=$parametres[$i];
         unset( $parametres[$i]) ;
-        $parametres[$key]= $value  ; 
+        $parametres[$key]= $value  ;
         $i++;
     }
      }
   return mail_supervisor::Set_Options($parametres,$str_index);
-  }	  
+  }
   //==========================================================
-  function Set_Options($parametres,$str_index){  
+  function Set_Options($parametres,$str_index){
   global $infos_message,$conf;
-      foreach ($parametres as $key => $value) { 
+      foreach ($parametres as $key => $value) {
        $parametres[$key]=(isset($_POST[$key]))? "on" : $value ;
      }
-   $parametres['no_connect']= 'off' ;     
+   $parametres['no_connect']= 'off' ;
      return $parametres ;
   }
@@ -274,12 +274,12 @@
 
  if ( isset($mails_parametres) )
- 	{		$query = '
-    		UPDATE '.CONFIG_TABLE.'
-    		SET value="'.addslashes(serialize($mails_parametres)).'"
-    		WHERE param = "mail_superv"
-    		LIMIT 1';
- 			pwg_query($query);
-	  }
-	  
+    {       $query = '
+            UPDATE '.CONFIG_TABLE.'
+            SET value="'.addslashes(serialize($mails_parametres)).'"
+            WHERE param = "mail_superv"
+            LIMIT 1';
+            pwg_query($query);
+      }
+
  }
 
@@ -287,15 +287,15 @@
   function sauve_donnees(){
   global $mails_donnees,$superv_champs,$superv_type,$erreur_message ;
-  //=====================================================================	
+  //=====================================================================
   $clefs = $superv_champs ;
   $valeurs = array();
   foreach ( $clefs as $champ){
-        $champ = trim($champ);     
-	    if ( isset($mails_donnees[  $champ ]) ) {
-	      $sep= (is_string($mails_donnees[ $champ ])) ? '"' : '' ;
+        $champ = trim($champ);
+        if ( isset($mails_donnees[  $champ ]) ) {
+          $sep= (is_string($mails_donnees[ $champ ])) ? '"' : '' ;
           array_push($valeurs , "`".$champ."`" . ' = ' . $sep . $mails_donnees[  $champ ] . $sep)  ;
-	    }else{	 
-	      array_push($valeurs , "`".$champ."`" . ' = ' .  "0"  )  ;
-	    }	 
+        }else{
+          array_push($valeurs , "`".$champ."`" . ' = ' .  "0"  )  ;
+        }
       }
   $valeurs = implode(", ",$valeurs) ;
@@ -304,6 +304,6 @@
           UPDATE '.mail_superv_TABLE.'
           SET '. $valeurs .'
-		  WHERE `id` = 1 LIMIT 1 ';
-		  ;
+          WHERE `id` = 1 LIMIT 1 ';
+          ;
   ob_start();
   $ret=  pwg_query($query)    ;
@@ -316,30 +316,30 @@
     global $superv_champs ;
     $champs = implode(",",$superv_champs );
-      $query = "SELECT ".$champs." 
+      $query = "SELECT ".$champs."
       FROM ".mail_superv_TABLE."
       ;";
-		$result = @pwg_query($query); 
+        $result = @pwg_query($query);
     if (!$result) {
-			verif_base();
-	 		$result = @pwg_query($query);
-		}					
+            verif_base();
+            $result = @pwg_query($query);
+        }
     $data = mysql_fetch_array($result,MYSQL_ASSOC);
     //====================================================================================
-    $next_day = Str_To_Time( $data['nb_mails_periode'], $data['date_mail'] ); 
-    $next_day = ($next_day >0) ? $next_day :  (604800  + time()) ; 
+    $next_day = Str_To_Time( $data['nb_mails_periode'], $data['date_mail'] );
+    $next_day = ($next_day >0) ? $next_day :  (604800  + time()) ;
     $data['rest_mail'] =    $next_day - time() ;
     $next_day = Str_To_Time( $data['nb_spams_periode'],$data['date_spam']);
     $next_day = ($next_day >0) ? $next_day :  (172800  + time()) ;
     $data['rest_spam'] =  $next_day - time() ;
-    $next_day = Str_To_Time($data['quarantaine_periode'] ,$data['date_quarantaine']);	
+    $next_day = Str_To_Time($data['quarantaine_periode'] ,$data['date_quarantaine']);
     $next_day = ($next_day >0) ? $next_day :  (172800 + time()) ;
-	
+
     if ($data['quarantaine'] == 'true' ) {
-		    $data['reste'] =   ( $next_day )-time() ;
+            $data['reste'] =   ( $next_day )-time() ;
     }else{
-		    $data['reste'] = 0;
-    }
-	
-	    return $data;
+            $data['reste'] = 0;
+    }
+
+        return $data;
   }
  }
Index: /extensions/Mail_supervisor/main.inc.php
===================================================================
--- /extensions/Mail_supervisor/main.inc.php	(revision 10418)
+++ /extensions/Mail_supervisor/main.inc.php	(revision 10419)
@@ -16,5 +16,5 @@
 
 global $conf,$mails_options ;
-include_once (MAIL_SUPERV_PATH.'include/constants.php'); 
+include_once (MAIL_SUPERV_PATH.'include/constants.php');
 include_once(MAIL_SUPERV_PATH.'mail_super.inc.php');
 
@@ -23,9 +23,9 @@
 
 $mails_options = mail_supervisor::Get_Options($mails_options,"mail_superv");
-/* EVENT_HANDLER_PRIORITY_NEUTRAL  */ 	
+/* EVENT_HANDLER_PRIORITY_NEUTRAL  */
 //
 //
 include_once (PHPWG_ROOT_PATH.'include/functions_mail.inc.php' );
-include_once (MAIL_SUPERV_PATH.'include/fonctions.php');  
+include_once (MAIL_SUPERV_PATH.'include/fonctions.php');
 //===============loc_begin_index==============loc_after_page_header=============================================================
 add_event_handler('loc_begin_page_header',  array(&$mail_supervisor,'init')  );
@@ -35,74 +35,75 @@
 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, $user, $lang_info;
   global $conf_mail,$mails_options,$mails_donnees ;
-  global  $template,$page ,$erreur_message,$infos_message, $lang; 
+  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 = '';	}	   
-   
+  include_once (MAIL_SUPERV_PATH.'include/fonctions.php');
+  load_language('plugin.lang', MAIL_SUPERV_PATH);
+   trigger_event('cl_begin_send_mail');
+
+ // 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' )	{ 
-		if (kill_list()) {
+  if ($mails_options['no_mail_list']=='on' || $mails_options['no_connect'] == 'on' )    {
+        if (kill_list()) {
       $nb_destinataires=0; ;
       $envoie_ok= false ;
       $erreur_message .= "<BR />".l10n('Sv_is_a_spam') ;
-      $infos_message = l10n('Sv_mail_not_send')."<BR />"; 
+      $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 ($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;
-		}
-	}
+       trigger_event('cl_kill_send_mail', $ip);
+         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'] ;  
-	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_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;  
+  $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_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;
   //====================================================
-    $match_email = $conf_mail['email_webmaster'];     
+    $match_email = $conf_mail['email_webmaster'];
+
     $new_args=array();
     if( isset($args['Bcc']))
-    foreach($args['Bcc'] as $key => $val){ 
-      if (!preg_match('/'. $match_email.'/', $val)){ 
+    foreach($args['Bcc'] as $key => $val){
+      if (!preg_match('/'. $match_email.'/', $val)){
           array_push($new_args, $val);
       }else{
-         	$mailto = $match_email;
+            $mailto = $match_email;
       }
     }
@@ -110,31 +111,31 @@
      //=======================================================================
      $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 )	{
+    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 />";
+        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'] ) ."{". $lang_info['language_name'] ."}"."<br />";
     //================= réecriture de l'entete ===============================
     $match=array("<",">");
-    $string=array("&lt;","&gt;") ;	             	
-    if ( $nb_destinataires  == 1 ) {   
-      if ($mailto == "" ) {     
-        if (!empty($args['Bcc'])){ 
+    $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{    
+        }else{
           if (!empty($args['Cc']) ){  $mailto=get_strict_email_list(implode(',', $args['Cc']));
            $args['Cc']=array();
@@ -148,38 +149,38 @@
       $infos_message .="Destinataire:" .$mailto ;
       //=============================================================================
-       
+
     }else{
           //=== plusieurs destinataires ===========
       $cl_list_mail="";
-      if ($mailto !="") $infos_message .="To: " . $mailto . " "."<br />" ;     
+      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'])){ 
-          $ret	= corrige_header('Bcc',$headers,$args,$cl_list_mail,$mailto);  
+      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 .=  " " ;
+    }
+
+
             //=============================================================================
             if ($mails_options['check_header_text']=='on')   {
-              $texte = "This is a multi-part message in MIME format.\n"; 	
-              $texte .= "-----=".$conf_mail['boundary_key']."\n"; 
-              $texte .= "Ceci est un message est au format MIME.\n"; 
-              $texte .= 'Content-Type: text/plain; charset="UTF-8"'."\n"; 
-              $texte .= 'Content-Transfer-Encoding: 8bit'."\n\n";  
-              $texte .= $mails_donnees['header_text']; // A voir texte brut...	   
-              $texte .= "\n\n"; 	
+              $texte = "This is a multi-part message in MIME format.\n";
+              $texte .= "-----=".$conf_mail['boundary_key']."\n";
+              $texte .= "Ceci est un message est au format MIME.\n";
+              $texte .= 'Content-Type: text/plain; charset="UTF-8"'."\n";
+              $texte .= 'Content-Transfer-Encoding: 8bit'."\n\n";
+              $texte .= $mails_donnees['header_text']; // A voir texte brut...
+              $texte .= "\n\n";
               $content =$texte .$content ;
-            }    
+            }
             // corrige erreur 'mail dropped, bare LF found'
-          /*   if ( preg_match('/\n\./',$content)){ 
+          /*   if ( preg_match('/\n\./',$content)){
              $content=preg_replace('/\n\./', '/\n\.\./', $content);
 
@@ -187,18 +188,18 @@
              }
              $content = str_replace("\n.", "\n/./.", $content);
-             $headers = str_replace("\n.", "\n..", $headers); 
+             $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();
-		      if ($nb_destinataires > 0) {   
-
-            if( $envoie_ok)  $ret = mail($mailto, $subject,$content, $headers);	
-            
+
+            $ret=false;
+            //======== Non mise en quarantaine =============
+
+
+            ob_start();
+              if ($nb_destinataires > 0) {
+
+            if( $envoie_ok)  $ret = mail($mailto, $subject,$content, $headers);
+
           }else{
             $message .= l10n('Sv_no_receiver_available');
@@ -206,94 +207,94 @@
         $message .= ob_get_contents();
         ob_end_clean();
-        $mails_donnees['message']=$message;	
+        $mails_donnees['message']=$message;
         Gestion_erreurs($message,$ret,$nb_destinataires,$headers,$mailto);
             } else {
-	            //================== Est en quarantaine =======================	
-		        $erreur_message .= 	l10n('Sv_To_day_is')."<br />";
-			    if ($alerte_spam ) { 
-		                $type="Spams";				
-				        $d1=$mails_donnees['nb_spams'] . '  \\  ' . $mails_donnees['nb_spams_maxi'];
-				        $d2=$mails_donnees['nb_spams'];
- 				        $d3= $mails_donnees['rest_spam'];
-				        $d4=time()+$d3 ;
- 			    }  
-			    if ($alerte_mail) {
-                    $type="Mails";		        
+                //================== Est en quarantaine =======================
+                $erreur_message .=  l10n('Sv_To_day_is')."<br />";
+                if ($alerte_spam ) {
+                        $type="Spams";
+                        $d1=$mails_donnees['nb_spams'] . '  \\  ' . $mails_donnees['nb_spams_maxi'];
+                        $d2=$mails_donnees['nb_spams'];
+                        $d3= $mails_donnees['rest_spam'];
+                        $d4=time()+$d3 ;
+                }
+                if ($alerte_mail) {
+                    $type="Mails";
                     $d1=$mails_donnees['nb_mails']. '  \\  ' . $mails_donnees['nb_mails_maxi'];;
                     $d2=$mails_donnees['date_mail'];
                     $d3= $mails_donnees['rest_mail'];
                     $d4=time()+$d3 ;
- 			    }
-			    if ($alerte) {
-		        $type="Spams(Quarantaine)";
-				    $d1=$mails_donnees['nb_spams'] . '  \\  ' . $mails_donnees['nb_spams_maxi'];
-				    $d2=$mails_donnees['date_quarantaine'];
- 				    $d3= $mails_donnees['reste'];
-				    $d4=time()+$d3 ;
- 			    } 
+                }
+                if ($alerte) {
+                $type="Spams(Quarantaine)";
+                    $d1=$mails_donnees['nb_spams'] . '  \\  ' . $mails_donnees['nb_spams_maxi'];
+                    $d2=$mails_donnees['date_quarantaine'];
+                    $d3= $mails_donnees['reste'];
+                    $d4=time()+$d3 ;
+                }
             $d2=date(l10n('Sv_formatdate'),$d2);
             $d3=int_to_heure($d3) ;
             $d4=date(l10n('Sv_formatdate'),$d4);
             if ($alerte_mail) {
-	            $erreur_message .='<br />'.sprintf(l10n('Sv_alerte_mail %s %s %s %s %s'),$type,$d1,$d2,$d3,$d4).'<br />';
+                $erreur_message .='<br />'.sprintf(l10n('Sv_alerte_mail %s %s %s %s %s'),$type,$d1,$d2,$d3,$d4).'<br />';
             }else{
-		        $erreur_message .='<br />'.sprintf(l10n('Sv_mise_en_quarantaine %s %s %s %s %s'),$type,$d1,$d2,$d3,$d4).'<br />';
-            }
-            $infos_message .= l10n('Sv_mail_not_send'); 
-            }		
-           $infos_message .= "<hr>";  	
+                $erreur_message .='<br />'.sprintf(l10n('Sv_mise_en_quarantaine %s %s %s %s %s'),$type,$d1,$d2,$d3,$d4).'<br />';
+            }
+            $infos_message .= l10n('Sv_mail_not_send');
+            }
+           $infos_message .= "<hr>";
     mail_supervisor::sauve_donnees();
     mail_supervisor::affiche_message();
     return true ;
 }
-//===========================================================================================	
-function Gestion_erreurs($message,$ret,$nb_destinataires,$headers,$mailto){			
-	 global $conf, $user,  $conf_mail,$mails_options,$mails_donnees , $template,$page ,$infos_message,$erreur_message,$args,$lang, $lang_info; 
+//===========================================================================================
+function Gestion_erreurs($message,$ret,$nb_destinataires,$headers,$mailto){
+     global $conf, $user,  $conf_mail,$mails_options,$mails_donnees , $template,$page ,$infos_message,$erreur_message,$args,$lang, $lang_info;
      $match=array("<",">");
-    $string=array("&lt;","&gt;") ;	 
-//Warning: mail() has been disabled for security reasons 
-	
-	$est_un_spam =!(strpos(strtolower($message), 'spam') === false);
-	$headers=str_replace( $match,$string, $headers); 
-	
-	if ( ($ret==false) || ($est_un_spam==true) || ($nb_destinataires == 0) ) {
-		 ;				// Bad recipient address syntax 
- 		$pos1 = strpos(strtolower($message), 'bad recipient address syntax');
-		if (  !($pos1 === false) ){
-			$erreur_message .= l10n('Sv_detection_de').' Bad recipient address syntax .';
- 			$erreur_message .= l10n('Sv_verifiez_les_destinataires').' (Bcc,Cc,To)<br />';
- 			}	
-	
-	$erreur_message .= sprintf(l10n('Sv_debug_message'),
-	($ret==true)? "true" : "false",
-	$message ,
-	$mailto ,
-	$headers ,
-	$nb_destinataires );
-       //=============== La fonction mail retourne une erreur =========================		
-				}	
-				
-    	if ($est_un_spam == false) 
-			{
-    			if ($mails_donnees['nb_mails']==0) {	$mails_donnees['date_mail'] =  time();	} 	
- 	    		$mails_donnees['nb_mails'] += $nb_destinataires;
-			}
-			else
-			{
-				$mails_donnees['nb_spams'] += $nb_destinataires;			
-			    //--- Detection de spam ------------------
-				if ($mails_donnees['nb_spams']==0) {$mails_donnees['date_spam'] = time(); 	}
-
-				$trop_de_spam =!(strpos(strtolower($message), 'trop de spam') === false);
-				if ( $trop_de_spam ) {
-						$mails_donnees['nb_spams_maxi']=$mails_donnees['nb_spams'];
-
-						$mails_donnees['date_quarantaine']= time()  ;	
-						$mails_donnees['quarantaine']= true    ;	
-						$infos_message .= mail_supervisor::Memo_Var($mails_donnees);
-					}
- 			}
+    $string=array("&lt;","&gt;") ;
+//Warning: mail() has been disabled for security reasons
+
+    $est_un_spam =!(strpos(strtolower($message), 'spam') === false);
+    $headers=str_replace( $match,$string, $headers);
+
+    if ( ($ret==false) || ($est_un_spam==true) || ($nb_destinataires == 0) ) {
+         ;              // Bad recipient address syntax
+        $pos1 = strpos(strtolower($message), 'bad recipient address syntax');
+        if (  !($pos1 === false) ){
+            $erreur_message .= l10n('Sv_detection_de').' Bad recipient address syntax .';
+            $erreur_message .= l10n('Sv_verifiez_les_destinataires').' (Bcc,Cc,To)<br />';
+            }
+
+    $erreur_message .= sprintf(l10n('Sv_debug_message'),
+    ($ret==true)? "true" : "false",
+    $message ,
+    $mailto ,
+    $headers ,
+    $nb_destinataires );
+       //=============== La fonction mail retourne une erreur =========================
+                }
+
+        if ($est_un_spam == false)
+            {
+                if ($mails_donnees['nb_mails']==0) {    $mails_donnees['date_mail'] =  time();  }
+                $mails_donnees['nb_mails'] += $nb_destinataires;
+            }
+            else
+            {
+                $mails_donnees['nb_spams'] += $nb_destinataires;
+                //--- Detection de spam ------------------
+                if ($mails_donnees['nb_spams']==0) {$mails_donnees['date_spam'] = time();   }
+
+                $trop_de_spam =!(strpos(strtolower($message), 'trop de spam') === false);
+                if ( $trop_de_spam ) {
+                        $mails_donnees['nb_spams_maxi']=$mails_donnees['nb_spams'];
+
+                        $mails_donnees['date_quarantaine']= time()  ;
+                        $mails_donnees['quarantaine']= true    ;
+                        $infos_message .= mail_supervisor::Memo_Var($mails_donnees);
+                    }
+            }
  $ret=true;
- return $ret ; 
+ return $ret ;
 }
 ?>
Index: /extensions/Mail_supervisor/maintain.inc.php
===================================================================
--- /extensions/Mail_supervisor/maintain.inc.php	(revision 10418)
+++ /extensions/Mail_supervisor/maintain.inc.php	(revision 10419)
@@ -24,5 +24,5 @@
 if (!defined('MAIL_SUPERV_PATH')) define('MAIL_SUPERV_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
  include_once (MAIL_SUPERV_PATH.'include/constants.php');
-  
+
 function plugin_install(){
   global $conf ;
@@ -33,13 +33,13 @@
     $my_para['check_header_text']="on";
     $my_para['no_mail_list']="on";
-    $my_para['no_connect']="off";	// empeche l'ip de se connecter au site.
-    $my_para['set_auto']="on";		// Test a l'ouverture et enregistrement 
-    $my_para['ip']="127.0.0.1";		// dernièrre adresse IP
-    $my_para['set_id']="on";		  // enregistrment nouvel  
+    $my_para['no_connect']="off";   // empeche l'ip de se connecter au site.
+    $my_para['set_auto']="on";      // Test a l'ouverture et enregistrement
+    $my_para['ip']="127.0.0.1";     // dernièrre adresse IP
+    $my_para['set_id']="on";          // enregistrment nouvel
     $mails_values=  addslashes(serialize($my_para));
     $query = 'INSERT INTO '.CONFIG_TABLE.' (param, value, comment)
     VALUES ("mail_superv", "'.$mails_values.'" ,"Parametres du plugin Mail superviseur");';
     pwg_query($query);
-  } 
+  }
 }
 function plugin_uninstall(){
@@ -50,11 +50,11 @@
     pwg_query($query);
     $query = 'DROP TABLE IF EXISTS  '.MAIL_BLACK_LISTE_TABLE.';';
-    pwg_query( $query );  
+    pwg_query( $query );
     $query = 'DROP TABLE IF EXISTS  '.mail_superv_TABLE.';';
-    pwg_query( $query);  
+    pwg_query( $query);
 }
 
 function plugin_activate(){
-include_once (MAIL_SUPERV_PATH.'include/fonctions.php'); 
+include_once (MAIL_SUPERV_PATH.'include/fonctions.php');
  verif_base() ;
 }
