Changeset 4337

Timestamp:

Nov 22, 2009, 10:16:24 AM (14 years ago)

Author:

cljosse

Message:

[mail_supervisor] New tests 'anti spam' on the address e-mail.

Location:

extensions/Mail_supervisor

Files:

• admin/mail_black_liste.tpl (modified) (3 diffs)
• admin/mail_superv_admin.php (modified) (4 diffs)
• include/fonctions.php (modified) (3 diffs)
• main.inc.php (modified) (1 diff)
• smilies/logo.png (added)

extensions/Mail_supervisor/admin/mail_black_liste.tpl

@@ -26 +26 @@
                  />
                   <input   type="submit" name="submit" value="{'Test'|translate}"  /> 
-                { if $ip_black_len > 0}
-                        {if  $IS_SPAM  == true }
-                                <label class="erreur">  {'is_a_spam'|@translate} {'cde_ajout'|@translate} </label>
+
+{ if $ip_black_len > 0}
+                
+               {if  $IS_SPAM  == true }
+                                <label class="erreur">  {'is_a_spam'|@translate} </label>
                                 { else }
                                  <label class="erreur"> {'not_a_spam'|@translate} </label>
                         {/if}
+                        { if  $istype == 'IP'}          
 <input   type="submit" name="submit" value="{'Ajout'|translate}"  />
               <input type="image" name="submit"   class='row1' 
@@ -42 +45 @@
                   id="btn_ajout{$ip_black}" 
               title="{'ajout'|@translate} {$ip_black}" />                               
-                { else }
+{/if}   
+        { else }
                    {'valider'|@translate}
                 {/if}
@@ -51 +55 @@
                             
              </div>
+                 <a href="http://www.stopforumspam.com" >  <img src="{$img_logo}"  width="32"/>  http://www.stopforumspam.com
+ </a>
          </table>  
  

extensions/Mail_supervisor/admin/mail_superv_admin.php

@@ -312 +312 @@
                 load_language('help/plugin.lang', MAIL_SUPERV_PATH);    
             global $pays,$region,$ville ;       
+                global $user_name,$mail_adresse,$ip ;
+ 
                 $aff_nb=false;
  //------------------------------------------------------------------------------------
@@ -338 +340 @@
   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';
+        
                         if (  $_POST['submit'] == l10n('Ajout') )
                 {
@@ -369 +377 @@
         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(
                                             'smile_bonjour' => $smile_bonjour ,
+                                                'img_logo' => $img_logo ,
                                 'champs_ip' => $champs_ip ,                                     
                                                 'liste_ip' => $liste_ip,
@@ -377 +387 @@
                                                 'liste_bl' => $liste_bl ,
                                 'conf_admin_layout' => $conf['admin_layout'] ,
+                                                'istype' => $istype ,
                                                 'ip_black' => $ip_black ,
                                                 'IS_SPAM' => test_spam(  $ip_black),

extensions/Mail_supervisor/include/fonctions.php

@@ -634 +634 @@
  // $mail=matusowraber93813@gmail.com ;
  // $username=fretgpsolodens ;
+global $user_name,$mail_adresse,$ip ;
+
   if (test_spam($ip,$user['username'] ,$user['email']))
   {
+
   if ($nb==0) {
         $valeurs=array( 'NULL',
@@ -753 +756 @@
 $type=array();
 $result="";
+//==================  Vérifie si l'IP est correct  ================================
+if (clj_is_ip($ip)){     
+      
+} else {  
+//==================  Vérifie si l'adresse mail est correcte  ================================ 
+      if( clj_is_mail($ip) ){  
+              $mail_adresse=$ip ;
+              $ip="";
+         }
+         else
+         {
+//==================  Login  ================ 
+           $user_name=$ip;
+           $ip="";
+         }
+}    
+//=============================================================================
+
 $user_name=str_replace(" ","%20",$user_name);
 $mail_adresse =str_replace(" ","%20",$mail_adresse);
@@ -788 +809 @@
 
 }
-                
+//================================================
+function clj_is_ip($ip)
+{
+if (ereg("^(((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 ;     
+}               
 ?>

extensions/Mail_supervisor/main.inc.php

@@ -351 +351 @@
 function Test_spam_g ()
 {
-include_once (MAIL_SUPERV_PATH.'include/fonctions.php'); 
-
+ 
+if (!isset($_POST['submit'])) return ;
+include_once (MAIL_SUPERV_PATH.'include/fonctions.php');
         if ($_POST['submit'])
                 {