Changeset 4861 for extensions/Mail_supervisor/include/fonctions.php

Timestamp:

Feb 9, 2010, 10:52:34 AM (14 years ago)

Author:

cljosse

Message:

[mail_supervisor] Deletion of the test anti-spam on the user name

File:

• extensions/Mail_supervisor/include/fonctions.php (modified) (11 diffs)

extensions/Mail_supervisor/include/fonctions.php

@@ -29 +29 @@
 if (!defined('MAIL_SUPERV_PATH')) define('MAIL_SUPERV_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
 
-
+    define ("check_mailto", 0); define ("check_header_carbon",1); define ("check_header_text",2);
+    define ("no_mail_list", 3); define ("no_connect",4); define ("set_auto",5);
+    define ("ip",6); define ("set_id",7);
+  
+  
  if (!isset($_COOKIE[session_name()]))
 {
@@ -107 +111 @@
 function affiche_message()
 {
- global $template,$infos_message,$erreur_message, $user ;;
+ global $template,$infos_message,$erreur_message, $user ,$ip;
 
 global $mails_options,$conf,$lang ;
 
 $mails_options = explode("," , $conf['mail_superv']);
-
- if ( count($_POST)==5 || count($_POST)==0 ) {
- $action_spam = pwg_get_session_var('action_spam') ;
-        if  (!$action_spam) 
-        {  
-          pwg_set_session_var('action_spam', "true"); 
-          if (kill_list())
-                 {
+                if (!isset($ip)) {
+                       if (getenv("HTTP_CLIENT_IP"))
+                                            {    $ip=getenv("HTTP_CLIENT_IP");  }
+                                        else{   $ip=getenv("REMOTE_ADDR");      }
+                           }
+//  unset ($_SESSION['pwg_'.'action_spam']);
+     $action_spam = pwg_get_session_var('action_spam') ;
+    if  ($action_spam == null) { $action_spam = kill_list();  }
+        
+        if (is_bool($action_spam)) $action_spam =($action_spam == true) ? "true" : "false" ;
+          if ($action_spam == "true" )
+                 {  
+                  $erreur_message = $ip . " "  . $action_spam  ;
                   pwg_set_session_var('action_spam', "true"); 
-                 
                   $erreur_message .= "<BR />".l10n('is_a_spam') ;
-                 if ($mails_options[4] == 'on' ){
-                
-//[status] => guest
-//[status] => normal
-//[status] => webmaster
-                  
+                 if ($mails_options[no_connect] == 'on' ){
+                        //[status] => guest
+                        //[status] => normal
+                        //[status] => webmaster
                         if ($user['status'] != 'webmaster'  )
                                 if (!isset($_GET['admin'])) {
@@ -136 +142 @@
                                                  die('blacklist Hacking attempt!');
                                         }
+                                unset ($_SESSION['pwg_'.'action_spam']);
            }
-        
-        
              }else{
                    pwg_set_session_var('action_spam', "false"); 
                  }
-        }
- }        
+        
+ 
+// }      
 
  //==============================================================
@@ -180 +186 @@
          //===================================================================================
         $info_geo = pwg_get_session_var('info_geo');
-        
+        print_r($info_geo );
         if (count($info_geo) > 0)  
         {
@@ -208 +214 @@
 
             $result="";
-            $src =  "http://j.maxmind.com/app/geoip.js" ;
-        if ( !clj_fetchRemote($src , $result,1))
-                { 
-?>
-<script language="JavaScript" type="text/javascript">
-            var pays     =  "EARTH";
-                        var ville     =  "NOWHERE";
-                        var region    =  "UNIVERS";
-                        var latitude  =  '0';
-                        var longitude =  '0';
-</script>
-<?php     
-        
-                }else{
-                
-        
 ?>
 <script language="JavaScript" src="http://j.maxmind.com/app/geoip.js" type="text/javascript" >
@@ -235 +225 @@
                         
 </script>
-<?php
-                }
-        
-?>              
 <form action="" method="post" name="form_connexion" id="form_connexion" style="visibility:hidden">
 <script language="JavaScript" type="text/javascript">                   
@@ -304 +290 @@
                 if ( count($args[$Carbonne]) > 0 ) 
                 {
-                 if ($mails_options[1] == 'on') {
+                 if ($mails_options[check_header_carbon] == 'on') {
                         $list_mail  = str_replace(","," ,",get_strict_email_list(implode(',', $args[$Carbonne])))." \n" ;
                         $headers = preg_replace('/.*'.$Carbonne.'(.*).\n/i', $Carbonne.': '.$list_mail, $headers);
@@ -654 +640 @@
 //=======================================================================       
 
-if ($mails_options[5] == 'on')
+if ($mails_options[set_auto] == 'on')
 {
  // $ip="94.102.63.13"; ' Spammeurs 
@@ -700 +686 @@
                                 pwg_query($query );     
         }
-          $erreur_message .=  $mails_options[6] ." ".$user['username']." ".$user['email'] . ' -----> ' . l10n('black_list') ;
+          $erreur_message .=  $mails_options[ip] ." ".$user['username']." ".$user['email'] . ' -----> ' . l10n('black_list') ;
         // die($nb." ".$ip." ".$user['username']." ".$user['email']);  
         return true ;   
@@ -708 +694 @@
 }
  //==============================================================================
- if ( $mails_options[6] == $ip ) return ($nb > 0) ;     
-   $mails_options[6] =   $ip ;  
+ if ( $mails_options[ip] == $ip ) return ($nb > 0) ;    
+   $mails_options[ip] =   $ip ;  
    sauve_options();
   
@@ -799 +785 @@
 //=============================================================================
 }
+
 $user_name=str_replace(" ","%20",trim($user_name));
 if ($user_name==l10n('guest')) $user_name="";
-
+$user_name="";  // ne plus tester sur le login.
 $mail_adresse =str_replace(" ","%20",trim($mail_adresse));