Changeset 25358 for trunk/include

Timestamp:

Nov 6, 2013, 5:21:31 PM (10 years ago)

Author:

mistic100

Message:

feature feature 2995: New email template
improve mail cache system
fix font-size in Thunderbird

File:

• trunk/include/functions_mail.inc.php (modified) (7 diffs)

trunk/include/functions_mail.inc.php

@@ -308 +308 @@
  * current user (if admin) is excluded
  * @see pwg_mail()
+ * @since 2.6
  *
  * @param array $args - as in pwg_mail()
@@ -583 +584 @@
     // key compose of indexes witch allow to cache mail data
     $cache_key = $content_type.'-'.$lang_info['code'];
-    $cache_key.= '-'.crc32(@$args['mail_title'] . @$args['mail_subtitle']); // TODO: find a way to not cache by mail_title
 
     if (!isset($conf_mail[$cache_key]))
@@ -606 +606 @@
           'CONTENT_ENCODING' => get_pwg_charset(),
           'CONTACT_MAIL' => $conf_mail['email_webmaster'],
-          'MAIL_TITLE' => $args['mail_title'],
-          'MAIL_SUBTITLE' => $args['mail_subtitle'],
           )
         );
@@ -625 +623 @@
         }
       }
-
-      $conf_mail[$cache_key]['header'] = $template->parse('mail_header', true);
-      $conf_mail[$cache_key]['footer'] = $template->parse('mail_footer', true);
-    }
+    }
+    
+    $template = &$conf_mail[$cache_key]['theme'];
+    $template->assign(
+      array(
+        'MAIL_TITLE' => $args['mail_title'],
+        'MAIL_SUBTITLE' => $args['mail_subtitle'],
+        )
+      );
 
     // Header
-    $contents[$content_type] = $conf_mail[$cache_key]['header'];
+    $contents[$content_type] = $template->parse('mail_header', true);
 
     // Content
@@ -663 +666 @@
     if (isset($tpl['filename']))
     {
-      $template = &$conf_mail[$cache_key]['theme'];
       if (isset($tpl['dirname']))
       {
@@ -689 +691 @@
 
     // Footer
-    $contents[$content_type].= $conf_mail[$cache_key]['footer'];
+    $contents[$content_type].= $template->parse('mail_footer', true);
   }
 
@@ -796 +798 @@
 
   $e = new Emogrifier($content);
-  $e->preserveStyleTag = true;
+  // $e->preserveStyleTag = true;
   return $e->emogrify();
 }