Changeset 19004

Timestamp:

Nov 13, 2012, 7:47:49 PM (11 years ago)

Author:

cljosse

Message:

[extensions] mail_superviseur fix compatibility with contactform)

Location:

extensions/Mail_supervisor

Files:

• mail_send.inc.php (modified) (6 diffs)
• main.inc.php (modified) (2 diffs)

extensions/Mail_supervisor/mail_send.inc.php

@@ -67 +67 @@
 *************************************/
 static public function send_mail_content($content){
+global $myclContent;
+$myclContent=$content ;
 
 return $content;
@@ -138 +140 @@
   $cvt_subject = encode_mime_header($cvt_subject); 
 
-  if (!isset($args['content']))  {
-    $args['content'] = '';
-  }
+  
 
   if (empty($args['content_format']))  {
@@ -336 +336 @@
      if(count($content_type_list)>1) 
        $content.= $conf_mail[$cache_key]['header'];
+              
+             global $myclContent;
+             if (!isset($args['content']))  {
+    $args['content'] = '';
+ 
+
+             if($myclContent && $myclContent!="" ){
+                  $args['content'] = "Hello myclContent: ".$myclContent;
+                  $myclContent="";
+                  $content_type="";
+                }
+     }             
 
     // Content
@@ -345 +357 @@
                                  htmlspecialchars($args['content']))).
                   '</p>';
-    }
-    else if (($args['content_format'] == 'text/html') and ($content_type == 'text/plain'))
-    {
+    } else if (($args['content_format'] == 'text/html') and ($content_type == 'text/plain')) {
       // convert html text to plain text
       $content.= strip_tags($args['content']);
@@ -353 +363 @@
       $content.= $args['content'];
     }
-
+    
     // Footer
     $content.= $conf_mail[$cache_key]['footer'];
@@ -401 +411 @@
 
 //===========================================
+
 
    // Undo Compute root_path in order have complete path

extensions/Mail_supervisor/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Mail supervisor
-Version: auto
+Version: 1.5.8
 Description: Mail supervisor surveille l'envoie des mails.
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=315
@@ -59 +59 @@
   include_once (MAIL_SUPERV_PATH.'include/fonctions.php');
   load_language('plugin.lang', MAIL_SUPERV_PATH);
-
+  
   $arg_trigg= array($mailto, $subject, $content, $headers, $args);
     trigger_event('mail_supervisor_clj_mail',$arg_trigg);