Changeset 19018

Timestamp:

Nov 15, 2012, 8:34:42 AM (11 years ago)

Author:

cljosse

Message:

[extensions] mail_superviseur fix compatibility with contactform (option text/html)

Location:

extensions/Mail_supervisor

Files:

• mail_send.inc.php (modified) (5 diffs)
• main.inc.php (modified) (1 diff)

extensions/Mail_supervisor/mail_send.inc.php

@@ -60 +60 @@
 *************************************/
 static public function send_mail_subject($cvt_subject){
-
+global $cl_cvt_subject;
+$cl_cvt_subject=$cvt_subject;
 return $cvt_subject;
 }
@@ -67 +68 @@
 *************************************/
 static public function send_mail_content($content){
-global $myclContent;
+global $myclContent,$cl_externe_content;
 $myclContent=$content ;
-
+$cl_externe_content=true ;
 return $content;
 }
@@ -135 +136 @@
     $args['subject'] = 'Piwigo';
   }
+
+  global $cl_cvt_subject;
+  if($cl_cvt_subject)
+$args['subject']=$cl_cvt_subject;
+
   // Spring cleaning
   $cvt_subject = trim(preg_replace('#[\n\r]+#s', '', $args['subject']));
@@ -335 +341 @@
     // Header
      if(count($content_type_list)>1) 
-       $content.= $conf_mail[$cache_key]['header'];
-              
-             global $myclContent;
+                 $content.= $conf_mail[$cache_key]['header'];
+    global $myclContent,$cl_externe_content;    
              if (!isset($args['content']))  {
-    $args['content'] = '';
- 
-
-             if($myclContent && $myclContent!="" ){
+                  $args['content'] = '';
+             if($cl_externe_content && $myclContent!="" ){
                   $args['content'] = $myclContent;
                   $myclContent="";
-                  $content_type="";
+                  if ($conf['ContactForm']['cf_mail_type'] == 'text/plain'){
+
+                      }else if ($conf['ContactForm']['cf_mail_type'] == 'text/html'){
+                      $content_type =""; 
+                                     };
                 }
      }             
-
+ 
     // Content
     if (($args['content_format'] == 'text/plain') and ($content_type == 'text/html'))    {
@@ -363 +370 @@
       $content.= $args['content'];
     }
-    
+    if(!$cl_externe_content){
     // Footer
     $content.= $conf_mail[$cache_key]['footer'];
-
+    }
   // Close boundary
   if(count($content_type_list)>1)

extensions/Mail_supervisor/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Mail supervisor
-Version: 1.5.8.a
+Version: 1.5.9
 Description: Mail supervisor surveille l'envoie des mails.
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=315