Changeset 8917 for extensions/Mail_supervisor/include

Timestamp:

Jan 26, 2011, 3:59:23 PM (13 years ago)

Author:

cljosse

Message:

[Mail_Supervisor] compatibility with piwigo 2.2

Location:

extensions/Mail_supervisor/include

Files:

• Scripts.js (modified) (1 diff)
• fonctions.php (modified) (11 diffs)
• function_test_send.php (modified) (1 diff)

extensions/Mail_supervisor/include/Scripts.js

@@ -1 @@
-function blockToggleDisplay(headerId, contentId)
-{
+function blockToggleDisplay(headerId, contentId){
         var revHeader = document.getElementById(headerId);
         var revContent = document.getElementById(contentId);

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);
+    define ("check_mailto", 0);
+        define ("check_header_carbon",1);
+        define ("check_header_text",2);
+    define ("no_mail_list", 3);
+        define ("no_connect",4);        // empeche l'ip de se connecter au site.
+        define ("set_auto",5);          // Test a l'ouverture et enregistrement 
+    define ("ip",6);                    // dernirre adresse IP
+        define ("set_id",7);            // enregistrment nouvel 
   
   
@@ -288 +293 @@
 //===============================================
 
-function corrige_header($Carbonne,$headers,$args)
+function corrige_header($Carbonne,$headers,$args,$cl_list_mail)
         {
         global $mails_options,$conf_mail,$mailto,$infos_message;
@@ -294 +299 @@
  if (!empty($args[$Carbonne]))
          {
- 
-                if ( count($args[$Carbonne]) > 0 ) 
+                if ( count($args[$Carbonne]) > 0 ) 
                 {
-                 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);
-                 }
+                        if ($mails_options[check_header_carbon] == 'on') {
+                                        $cl_list_mail  =  str_replace(","," , ",get_strict_email_list(implode(',', $args[$Carbonne])))." \n"  ;
+                                        $headers = preg_replace('/.*'.$Carbonne.'(.*).\n/i', $Carbonne.': '.$cl_list_mail, $headers);
+                                }
                 }
+        
         } else {
-        // Raz Bcc, Cc dans headers
+             // Raz Bcc, Cc dans headers
                         $headers = preg_replace('/.*'.$Carbonne.'(.*).\n/i', "" , $headers);
         }
                 
-                
-return $headers;
+                $headers  = str_replace("\n.", "\n..",$headers );
+        $ret->headers = $headers ;
+        $ret->list_mail = $cl_list_mail ;
+        return $ret;
 
                 
@@ -433 +440 @@
                 u.'.$conf['user_fields']['email'].' AS email,
                 ui.status,
-                ui.adviser,
                 ui.enabled_high,
                 ui.level
@@ -765 +771 @@
 //=======================================================================       
 
-if ($mails_options[set_auto] == 'on')
+if ($mails_options[set_auto] == 'nonoui') // ne plus tester automatiquement .
 {
  // $ip="94.102.63.13"; ' Spammeurs 
@@ -887 +893 @@
 function test_spam($ip =0,$user_name ='', $mail_adresse = "")
 {
-$buffer="";
+        $buffer="";
+        global $page,$infos_message;
 
 // fretgpsolodens
-$src = "" ;// "http://www.stopforumspam.com/api?";
-$type=array();
-$result="";
+        $src =  "http://www.stopforumspam.com/api?";
+        $type=array();
+        $result="";
 if (strlen($ip)>3) { 
 //==================  Verifie si l'IP est correct  ================================
 if (clj_is_ip($ip)){     
-      
+     
 } else {  
 //==================  Verifie si l'adresse mail est correcte  ================================ 
       if( clj_is_mail($ip) ){  
-              $mail_adresse=$ip ;
+                          $mail_adresse=$ip ;
               $ip="";
          }
@@ -921 +928 @@
 if ( strlen($mail_adresse) > 3)   $type[]="email=".$mail_adresse ;
 if ( strlen($ip) > 3)   $type[]="ip=".$ip ; 
- 
+
          foreach  ( $type as $fil )
      {    
-           $resultat="";
+          $resultat="";
            if (  clj_fetchRemote($src.$fil , $resultat,1))
                   {
-                  $result .= $resultat.'<br />'  ; 
+                    $result .= $resultat.'<br />'  ; 
                   }  else {
                   
                   }
+                  
       }
 
@@ -960 +968 @@
 function clj_is_mail($mail)
 {     
+
+ if(preg_match('/^[\w.-]+@[\w.-]+\.[a-zA-Z]{2,5}$/' ,$mail)) return true ;      
   if(preg_match('/#^[\w.-]+@[\w.-]+\.[a-zA-Z]{2,5}$#/' ,$mail)) return true ;   
 }          
@@ -967 +977 @@
 {
   // Try to retrieve data from local file?
+ // http://www.stopforumspam.com/api?ip=95.211.1.39
+
+  if ($src=="") return ;
+ 
   if (!url_is_remote($src))
   {
+  
     $content = @file_get_contents($src);
     if ($content !== false)
@@ -980 +995 @@
     }
   }
-
+ 
   // After 3 redirections, return false
   if ($step > 3) return false;
@@ -1072 +1087 @@
 
   }
+
+
+
 ?>

extensions/Mail_supervisor/include/function_test_send.php

@@ -226 +226 @@
 }
 
+
 ?>