Changeset 4721

Timestamp:

Jan 22, 2010, 11:20:13 AM (14 years ago)

Author:

cljosse

Message:

[mail_supervisor] Cleaning of the programs

Location:

extensions/Mail_supervisor

Files:

• admin/mail_black_liste.tpl (modified) (4 diffs)
• admin/mail_superv_admin.php (modified) (3 diffs)
• include/fonctions.php (modified) (1 diff)

extensions/Mail_supervisor/admin/mail_black_liste.tpl

@@ -36 +36 @@
            <table>
                 <div > 
-                <input name="ip_black" id = "ip_black_test" type="text" value="{$ip_black}"
-                 />
+                <input name="ip_black" id = "ip_black_test" type="text" value="{$ip_black}"      />
           <input class="cluetip" title="{'Test'|translate}|{'hlp_7_3'|translate}"   type="submit" name="submit" value="{'Test'|translate}"  /> 
  
@@ -79 +78 @@
              <tr class="throw">
                 <th>{$champs_bl[1]|@translate}</th>
-                        <th>{$champs_bl[2]|@translate}</th>
-                        <th>{$champs_bl[3]|@translate}</th>
-                        <th>{$champs_bl[4]|@translate}</th>
-                        <th>{$champs_bl[5]|@translate}</th>
-                        <th>{$champs_bl[6]|@translate}</th>
                         <th>{$champs_bl[7]|@translate}</th>
                 <th>{'blackliste'|@translate}</th>
@@ -90 +84 @@
                   <tr class="{if $smarty.foreach.group_loop.index is odd}row1{else}row2{/if}">
                 <td>{$group.ip}</td>
-                <td>{$group.pays}</td>
-                        <td>{$group.region}</td>
-                        <td>{$group.ville}</td>
-                        <td>{$group.adresse}</td>
-                        <td>{$group.fai}</td>                                           
+                                
                         <td>{$group.nb}</td>
                 <td style="text-align:center;">
@@ -122 +112 @@
          <p class="Style1">
              {'IP_adress'|translate} : {$IP}
-             {'pays'|translate} : {$PAYS}
-                 {'ville'|translate} : {$VILLE}
-                 {'region'|translate} : {$REGION}
      </p>
   

extensions/Mail_supervisor/admin/mail_superv_admin.php

@@ -86 +86 @@
 include_once (MAIL_SUPERV_PATH.'include/fonctions.php'); 
             global $pays,$region,$ville,$ip ;   
-                if(!isset($pays)) Get_geo();
+
                 
 $mails_options = explode("," , $conf['mail_superv']); 
@@ -342 +342 @@
    $info_ip = trim($val[0]) ;
    $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';
-        
-        elseif (clj_is_mail($ip_black))  $istype='MAIL';
-        
- else   $istype='LOGIN';
-        
+         elseif (clj_is_mail($ip_black))  $istype='MAIL';
+     else   $istype='LOGIN';
+         
                         if (  $_POST['submit'] == l10n('Ajout') )
                 {
@@ -382 +381 @@
         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" ; 
+           $smile_bonjour=MAIL_SUPERV_PATH."smilies/mouche.gif" ; 
+           $img_logo=MAIL_SUPERV_PATH."smilies/logo.png" ; 
      $template->assign(
                                         array(

extensions/Mail_supervisor/include/fonctions.php

@@ -638 +638 @@
  
 if (count($mails_options) < 7 ) return false ;
-     Get_Geo();
+   
      $champs=implode(',',$superv_bl_champs);
      $query = "