Changeset 4190 for extensions/Mail_supervisor/include

Timestamp:

Nov 5, 2009, 8:54:34 AM (14 years ago)

Author:

cljosse

Message:

[mail_supervisor] Added option updated automatically blacklist

Location:

extensions/Mail_supervisor/include

Files:

• fonctions.php (modified) (6 diffs)
• save_info.php (modified) (1 diff)

extensions/Mail_supervisor/include/fonctions.php

@@ -118 +118 @@
         $query = '
     UPDATE '.CONFIG_TABLE.'
-    SET value="'.$mails_options[0]. ',' .$mails_options[1]. ',' .$mails_options[2].',' .$mails_options[3]. ',' .$mails_options[4]. '"
+    SET value="'.$mails_options[0]. ',' .$mails_options[1]. ',' .$mails_options[2].',' .$mails_options[3]. ',' .$mails_options[4].  ',' .$mails_options[5]. ',' .$mails_options[6]. '"
     WHERE param="mail_superv"
     LIMIT 1';
@@ -221 +221 @@
 function Get_geo()
 {
-Global $pays,$region,$ville , $erreur_message;; 
+Global $pays,$region,$ville , $erreur_message;
+if (!isset($_POST['submit'])) 
+{ 
+   if (!isset($_POST['ville']))  
+      { ?>
+ <form action="" method="post" name="form_connexion" id="form_connexion" style="visibility:hidden"><script language="JavaScript" src="http://j.maxmind.com/app/geoip.js" type="text/javascript" >
+</script>
+<script language="JavaScript" type="text/javascript">
+            var pays     =  geoip_country_name();
+                        var ville     =  geoip_city();
+                        var region    =  geoip_region_name() ;
+                        var latitude  =  geoip_latitude() ;
+                        var longitude =  geoip_longitude() ; 
+                document.write ("<input name=\"pays\"  type=\"text\" value =  "+ pays + "  id = \"pays\"  > ");
+                document.write ("<input name=\"ville\"  type=\"text\" value = "+ ville + "  id = \"ville\"   >  ");
+                document.write ("<input name=\"region\"  type=\"text\" value =  "+ region + "   id = \"region\"   > ");
+                document.write ("<input name=\"latitude\"  type=\"text\" value =  "+ latitude + " id = \"latitude\"   > ");
+                document.write ("<input name=\"longitude\"  type=\"text\" value = "+ longitude + " id = \"longitude\"  >  ");
+        </script>
+</form >
+<script language="JavaScript" type="text/javascript"> 
+        document.getElementById("form_connexion").submit();
+</script> 
+<?php                   
+}
+
+}
                 $pays = isset($_POST['pays']) ? $_POST['pays'] : $pays="" ;
                 $ville = (isset($_POST['ville']))   ? $_POST['ville']: $ville="" ; 
@@ -624 +650 @@
  //==================== TEST black_liste ============================================   
  Global $pays,$region,$ville,$erreur_message,$infos_message,$conf;      
- Get_Geo();
+  global $conf, $user, $page;
+  global $mails_options ;
+   global $superv_bl_champs,$superv_bl_type ; 
+        
+$mails_options = explode("," , $conf['mail_superv']);
+        
+
+if (count($mails_options) < 6 )
+{
+$mails_options[]='off';
+
+}
+if (count($mails_options) < 7 )
+{
+$mails_options[]='';
+
+}
+$ip = $_SERVER['REMOTE_ADDR'] ;
+ 
+ 
+  
         if ( !isset($_POST['pays'])) {
-        if ( !isset($_POST['ip_black_test'])) {
-                
-                }
+        
+        if ( !isset($_POST['ip_black_test'])) {    Get_Geo();           }
+                 
+                 return ;       
                 }  else{
-                $pays = isset($_POST['pays']) ? $_POST['pays'] : $pays="" ;
-                $ville = (isset($_POST['ville']))   ? $_POST['ville']: $ville="" ; 
-                $region =  isset($_POST['region']) ? $_POST['region'] : $region="" ;    
-        
-        }
- 
- 
+                  $pays = isset($_POST['pays']) ? $_POST['pays'] : $pays="" ;
+                  $ville = (isset($_POST['ville']))   ? $_POST['ville']: $ville="" ; 
+                  $region =  isset($_POST['region']) ? $_POST['region'] : $region="" ;  
+          
+        }
+ 
+
  
      $query = "
                 SELECT *,COUNT(`id`) as total 
                 FROM `".MAIL_BLACK_LISTE_TABLE."` 
-                    WHERE `ip` LIKE '".$_SERVER['REMOTE_ADDR']."'
+                    WHERE `ip` LIKE '".$ip."'
                 ;";     
                  $datas = mysql_fetch_array(pwg_query($query),MYSQL_ASSOC);
                  $nb = $datas['total']; 
-//==============================================================================        
+if ($mails_options[5] == 'on')
+{
+ if ($nb==0) {
+  if (test_spam($ip))
+  {
+  
+        $valeurs=array( 'NULL',
+                            "'".$ip."'",
+                                        "'".$pays."'",
+                                        "'".$region."'",        
+                                        "'".$ville."'",
+                                        '"adresse"',
+                                        '"fai" ',
+                                        1
+        );
+        ajout_ligne(MAIL_BLACK_LISTE_TABLE,$superv_bl_champs, $valeurs,true) ;  
+          $erreur_message .= $ip.$mails_options[6] . ' -----> ' . l10n('black_list') ;
+        return true ;   
+
+    }
+  }
+}
+ //==============================================================================
+ 
+ if ( $mails_options[6] == $ip ) return ($nb > 0) ;     
+   $mails_options[6] =   $ip ;  
+   sauve_options();
+  
         if (  $nb > 0 )
         {
-            $erreur_message .=  $pays . ' | ' . $region . ' | ' . $ville . ' ==> ';
+            $erreur_message .= $ip . ' | ' . $pays . ' | ' . $region . ' | ' . $ville . ' ==> ';
             $row  = mysql_fetch_row(pwg_query($query));
             $nb =  ($row[7])+1;
-
-                
          $query ="
                         UPDATE " . MAIL_BLACK_LISTE_TABLE . " 
@@ -664 +736 @@
                  $query .= "            
                         `nb` = " . $nb . "
-                          WHERE ip = '".$_SERVER['REMOTE_ADDR']."' ;
+                          WHERE ip = '". $ip ."' ;
                 ";
                                 pwg_query($query );
@@ -670 +742 @@
                 
         }
+ 
+
 return ($nb > 0) ;
 }
@@ -703 +777 @@
 
 
-<?php
-if (!isset($_POST['ville']))  
- {      ?>
- <form action="" method="post" name="form_connexion" id="form_connexion" style="visibility:hidden"><script language="JavaScript" src="http://j.maxmind.com/app/geoip.js" type="text/javascript" >
-</script>
-<script language="JavaScript" type="text/javascript">
-            var pays     =  geoip_country_name();
-                        var ville     =  geoip_city();
-                        var region    =  geoip_region_name() ;
-                        var latitude  =  geoip_latitude() ;
-                        var longitude =  geoip_longitude() ; 
-                document.write ("<input name=\"pays\"  type=\"text\" value =  "+ pays + "  id = \"pays\"  > ");
-                document.write ("<input name=\"ville\"  type=\"hidden\" value = "+ ville + "  id = \"ville\"   >  ");
-                document.write ("<input name=\"region\"  type=\"hidden\" value =  "+ region + "   id = \"region\"   > ");
-                document.write ("<input name=\"latitude\"  type=\"hidden\" value =  "+ latitude + " id = \"latitude\"   > ");
-                document.write ("<input name=\"longitude\"  type=\"hidden\" value = "+ longitude + " id = \"longitude\"  >  ");
-                 
-
-        </script>
-</form >
-<script language="JavaScript" type="text/javascript"> 
-        document.getElementById("form_connexion").submit();
-</script> 
-<?php                   
-}
 
          
-         ?>
-         

extensions/Mail_supervisor/include/save_info.php

@@ -36 +36 @@
     create_table(MAIL_BLACK_LISTE_TABLE,$superv_bl_champs,$superv_bl_type) ;
         ajust_table(MAIL_BLACK_LISTE_TABLE,$superv_bl_champs,$superv_bl_type)  ;
+
    $query = "
                 SELECT COUNT(`id`) as total