Changeset 4156 for extensions/Mail_supervisor/include

Timestamp:

Oct 30, 2009, 2:59:24 PM (14 years ago)

Author:

cljosse

Message:

[mail_supervisor] update design black list

Location:

extensions/Mail_supervisor

Files:

• . (modified) (1 prop)
• include/fonctions.php (modified) (7 diffs)
• include/save_info.php (modified) (1 diff)

extensions/Mail_supervisor

@@ -1 +1 @@
 _notes
+obsolete.list
+pem_metadata.txt

@@ -1 +1 @@
 _notes
+obsolete.list
+pem_metadata.txt

extensions/Mail_supervisor/include/fonctions.php

@@ -165 +165 @@
  global $template,$infos_message,$erreur_message, $user ;;
 
-        
+global $mails_options,$conf,$lang ;
+$mails_options = explode("," , $conf['mail_superv']);
+ if ( !isset($_POST['submit']) ) {
+ if ($mails_options[4] == 'on'){
+        if (kill_list())
+                 {
+                    $erreur_message .= l10n('is_a_spam') ;
+                        if ($user['status'] == 'guest')
+                                if (!isset($_GET['admin'])) {
+                                                 die('Blacklist : <br />' .$erreur_message. '<br /> Hacking attempt!');
+                                }elseif   ($_GET['admin'] != 'piwigo')
+                                        {
+                                                 die('blacklist Hacking attempt!');
+                                        }
+           }
+        }
+ }        
+
+ //==============================================================
   if (isset($erreur_message))
                 {       
@@ -188 +206 @@
                         }
                 }
-                                
-        if (kill_list() && $user['status'] == 'guest')
-        
-        if (!isset($_GET['admin'])) {
-          // die('blacklist Hacking attempt!');
-          }else{
-          if   ($_GET['admin'] != 'piwigo')
-                        {
-                //      die('blacklist Hacking attempt!');
-                        }
-          }
+                //=============================================================
+                
          
                 
@@ -472 +481 @@
 function ajout_ligne($nom_table,$champs,$valeurs,$force)
 {
-
-        
-
   if (!$force) {
      $query = "
@@ -482 +488 @@
 //==============================================================================                
                 list($count) = mysql_fetch_row(pwg_query($query));
-
 }else{
 
@@ -490 +495 @@
   if ($count == 0)
   {
-  $n_champs=implode(",",$champs);
-  $n_valeurs=implode(",",$valeurs);
-  
-
-        
+      $n_champs=implode(",",$champs);
+      $n_valeurs=implode(",",$valeurs);
            $query = "
         INSERT INTO `".$nom_table."` (". $n_champs.") 
@@ -593 +595 @@
 function kill_list()
 {
-
-
  //==================== TEST black_liste ============================================           
      $query = "
                 SELECT *,COUNT(`id`) as total 
                 FROM `".MAIL_BLACK_LISTE_TABLE."` 
-                    WHERE ip='".$_SERVER['REMOTE_ADDR']."'
+                    WHERE `ip` LIKE '".$_SERVER['REMOTE_ADDR']."'
                 ;";     
-//==============================================================================                
-        $row = mysql_fetch_row(pwg_query($query));
-        if (count($row) > 0)
+                 $datas = mysql_fetch_array(pwg_query($query),MYSQL_ASSOC);
+                 $nb = $datas['total']; 
+//==============================================================================        
+        if (  $nb > 0 )
         {
+            $row  = mysql_fetch_row(pwg_query($query));
             $nb =  ($row[7])+1;
                 $pays = isset($_POST['pays']) ? $_POST['pays'] : $pays="" ;
@@ -627 +629 @@
                 
         }
-return (count($row) > 0) ;
-}
-
-
+return ($nb > 0) ;
+}
+
+function test_spam($ip)
+{
+$buffer="";
+
+
+if (isset($ip))
+        {
+        if (strlen($ip) > 3)
+        {
+
+        $handle =  @fopen("http://www.stopforumspam.com/api?ip=$ip","r"); 
+        if ($handle) {
+                while (!feof($handle)) { 
+                $buffer .= fgets($handle, 4096);
+                          }   
+                          fclose($handle);
+                          }
+                        return  !(strpos(  $buffer,'yes' ) === false) ;
+
+        }
+        
+         }
+          return  false;
+}
         
 ?>

extensions/Mail_supervisor/include/save_info.php

@@ -7 +7 @@
 if (!defined('MAIL_SUPERV_PATH')) define('MAIL_SUPERV_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
 
-
-
 //include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
 include_once (MAIL_SUPERV_PATH.'include/constants.php'); 
 include_once (MAIL_SUPERV_PATH.'include/fonctions.php'); 
 
-  $info_ip = (isset($info_ip)) ? $info_ip : '' ;
-  $info_ip = (isset($_POST['info1'])) ? $_POST['info1'] : $info_ip ;
+    $info_ip = (isset($info_ip)) ? $info_ip : '' ;
+    $info_ip = (isset($_POST['info1'])) ? $_POST['info1'] : $info_ip ;
     $info_ip = (isset($_POST['info'])) ? $_POST['info'] : $info_ip ;
-$info_ip .= ":";
+    $info_ip .= ":";
  
- $val=explode(":",$info_ip);
- $info_ip = trim($val[0]) ;
- $ip_black = trim($val[1]) ;
+   $val=explode(":",$info_ip);
+   $info_ip = trim($val[0]) ;
+   $ip_black = trim($val[1]) ;
  
- if (isset($_POST['ip_black']))
- $ip_black = ($ip_black == "" ) ? $_POST['ip_black'] : $ip_black ;
+  if (isset($_POST['ip_black']))
+   $ip_black = ($ip_black == "" ) ? $_POST['ip_black'] : $ip_black ;
 global $n ;
 

@@ -1 +1 @@
 _notes
+obsolete.list
+pem_metadata.txt