Changeset 4361 for extensions/Mail_supervisor/include

Timestamp:

Nov 24, 2009, 6:24:29 PM (14 years ago)

Author:

cljosse

Message:

[mail_supervisor] update function test_spam.

Location:

extensions/Mail_supervisor/include

Files:

• constants.php (modified) (1 diff)
• fonctions.php (modified) (9 diffs)

extensions/Mail_supervisor/include/constants.php

@@ -6 +6 @@
 if (!defined('FREE_MAIL_TABLE')) define('FREE_MAIL_TABLE', $prefixeTable.'free_mail');
 
+
+
 ?>

extensions/Mail_supervisor/include/fonctions.php

@@ -166 +166 @@
 function Get_geo()
 {
-global $pays,$region,$ville ;
- if (!isset($_POST['submit'])) {
-   if (!isset($_POST['ville']))  
-     {
+global $ip,$pays,$region,$ville, $latitude ,$longitude,$mails_options;
+         //===================================================================================
+        $info_geo = pwg_get_session_var('info_geo');
+        
+        if (count($info_geo) > 0)  
+        {
+                
+                $pays  = $info_geo[0];
+                $region  = $info_geo[1];
+                $ville  = $info_geo[2];
+                $latitude = $info_geo[3];
+                $longitude = $info_geo[4];
+                $ip = $info_geo[5];
+                return true;
+        }
+//=======================================================================
+
+ if (isset($_POST['pays'])) { 
+                        $pays = isset($_POST['pays']) ? $_POST['pays'] : "";
+                        $region =  isset($_POST['region']) ? $_POST['region'] :"";                              
+                        $ville = (isset($_POST['ville']))   ? $_POST['ville']: ""; 
+                        $latitude =  isset($_POST['latitude']) ? $_POST['latitude'] : "";       
+                        $longitude =  isset($_POST['longitude']) ? $_POST['longitude'] : "";
+                                
+                        $info_geo = array(   $pays ,$region , $ville ,$latitude, $longitude,$_SERVER['REMOTE_ADDR']  );
+                        pwg_set_session_var('info_geo', $info_geo); 
+                        return true;
+ 
+ }else{
+
             $result="";
             $src =  "http://j.maxmind.com/app/geoip.js" ;
-        if ( !fetchRemote($src , $result))
-                {
-         
-                ?>
+        if ( !clj_fetchRemote($src , $result,1))
+                { 
+?>
 <script language="JavaScript" type="text/javascript">
-            var pays     =  "??";
-                        var ville     =  "??";
-                        var region    =  "??";
-                        var latitude  =  "??";
-                        var longitude =  "??";
+            var pays     =  "EARTH";
+                        var ville     =  "NOWHERE";
+                        var region    =  "UNIVERS";
+                        var latitude  =  '0';
+                        var longitude =  '0';
 </script>
-<?php
+<?php     
+        
                 }else{
+                
+        
 ?>
 <script language="JavaScript" src="http://j.maxmind.com/app/geoip.js" type="text/javascript" >
@@ -198 +226 @@
 <?php
                 }
+        
 ?>              
 <form action="" method="post" name="form_connexion" id="form_connexion" style="visibility:hidden">
@@ -207 +236 @@
                 document.write ("<input name=\"longitude\"  type=\"text\" value = "+ longitude + " id = \"longitude\"  >  ");
 </script>       
-</form >
+
+</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 ; 
-                $region =  isset($_POST['region']) ? $_POST['region'] : $region;        
-                
+//=====================================================================================         
 }
 
@@ -601 +627 @@
  
 if (count($mails_options) < 7 ) return false ;
-
-  $ip = $_SERVER['REMOTE_ADDR'] ;
-  if ( !isset($_POST['pays'])) {        
-      if ( !isset($_POST['ip_black_test'])) {
-                            Get_Geo();          
-                        }
-                 return ;       
-                }  else {
-                       $pays = (isset($_POST['pays'])) ? $_POST['pays'] : "" ;
-                       $ville = (isset($_POST['ville']))   ? $_POST['ville'] : "" ; 
-                       $region = ( isset($_POST['region'])) ? $_POST['region'] : "" ;   
-        }
+  Get_Geo();
      $champs=implode(',',$superv_bl_champs);
      $query = "
@@ -634 +649 @@
  // $mail=matusowraber93813@gmail.com ;
  // $username=fretgpsolodens ;
-global $user_name,$mail_adresse,$ip ;
+global $user_name,$mail_adresse;
 
   if (test_spam($ip,$user['username'] ,$user['email']))
@@ -682 +697 @@
 }
  //==============================================================================
-
  if ( $mails_options[6] == $ip ) return ($nb > 0) ;     
- 
    $mails_options[6] =   $ip ;  
    sauve_options();
@@ -775 +788 @@
 //=============================================================================
 }
-$user_name=str_replace(" ","%20",$user_name);
-$mail_adresse =str_replace(" ","%20",$mail_adresse);
+$user_name=str_replace(" ","%20",trim($user_name));
+if ($user_name==l10n('guest')) $user_name="";
+
+$mail_adresse =str_replace(" ","%20",trim($mail_adresse));
+
 if ( strlen($user_name) > 3)      $type[]="username=$user_name" ;
 if ( strlen($mail_adresse) > 3)   $type[]="email=".$mail_adresse ;
@@ -784 +800 @@
      {    
            $resultat="";
-           if (  fetchRemote($src.$fil , $resultat))
+           if (  fetchRemote($src.$fil , $resultat,1))
                   {
                   $result .= $resultat.'<br />'  ; 
@@ -820 +836 @@
 {     
   if(preg_match('#^[\w.-]+@[\w.-]+\.[a-zA-Z]{2,5}$#' ,$mail)) return true ;     
-}               
+}          
+
+ 
+function clj_fetchRemote($src, &$dest, $timeout=1, $user_agent='Piwigo', $step=0)
+{
+  // Try to retrieve data from local file?
+  if (!url_is_remote($src))
+  {
+    $content = @file_get_contents($src);
+    if ($content !== false)
+    {
+      is_resource($dest) ? @fwrite($dest, $content) : $dest = $content;
+      return true;
+    }
+    else
+    {
+      return false;
+    }
+  }
+
+  // After 3 redirections, return false
+  if ($step > 3) return false;
+
+  // Initialize $dest
+  is_resource($dest) or $dest = '';
+
+  // Try curl to read remote file
+  if (function_exists('curl_init'))
+  {
+    $ch = @curl_init();
+    @curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+    @curl_setopt($ch, CURLOPT_URL, $src);
+    @curl_setopt($ch, CURLOPT_HEADER, 1);
+    @curl_setopt($ch, CURLOPT_USERAGENT, $user_agent);
+    @curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+    $content = @curl_exec($ch);
+    $header_length = @curl_getinfo($ch, CURLINFO_HEADER_SIZE);
+    $status = @curl_getinfo($ch, CURLINFO_HTTP_CODE);
+    @curl_close($content);
+    if ($content !== false and $status >= 200 and $status < 400)
+    {
+      if (preg_match('/Location:\s+?(.+)/', substr($content, 0, $header_length), $m))
+      {
+        return autoupdate_fetchRemote($m[1], $dest,$timeout, $user_agent, $step+1);
+      }
+      $content = substr($content, $header_length);
+      is_resource($dest) ? @fwrite($dest, $content) : $dest = $content;
+      return true;
+    }
+  }
+
+  // Try file_get_contents to read remote file
+  if (ini_get('allow_url_fopen'))
+  {
+
+    $opts['http'] = array('timeout' => $timeout);
+    $ctx = stream_context_create($opts);
+    $content = @file_get_contents($src, 0, $ctx);
+    if ($content !== false)
+    {
+      is_resource($dest) ? @fwrite($dest, $content) : $dest = $content;
+      return true;
+    }
+  }
+
+  return false;
+}
+
+        
 ?>