Changeset 1784 for trunk/include/functions_mail.inc.php

Timestamp:

Feb 6, 2007, 11:55:12 PM (17 years ago)

Author:

rub

Message:

Issue 0000598: NBM: Add new informations

Notification by mail:
Add new informations about last categories and last images like new feature of RSS notification.

2 parts:

• Possibility to send HTML mail
• Include last categories and last images on HTML format into notification mail

ccs & HTML experts! Please! Check, fix, improve and enhance HTML mail content!

Location:

trunk

Files:

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

trunk

@@ -2 +2 @@
 gal2
 feed.xml
+testmail

@@ -2 +2 @@
 gal2
 feed.xml
+testmail

trunk/include/functions_mail.inc.php

@@ -65 +65 @@
     format_email($conf['gallery_title'], $conf_mail['email_webmaster']);
 
-  // what to display at the bottom of each mail ?
-  $conf_mail['text_footer'] =
-    "\n\n-- \nPhpWebGallery ".($conf['show_version'] ? PHPWG_VERSION : '');
-  
   return $conf_mail;
 }
@@ -106 +102 @@
  * @param none
  */
-function get_mail_template()
+function get_mail_template($email_format)
 {
   global $conf;
@@ -113 +109 @@
   list($tmpl, $thm) = explode('/', $conf['default_template']);
   $mail_template = new Template(PHPWG_ROOT_PATH.'template/'.$tmpl, $thm);
+  $mail_template->set_rootdir(PHPWG_ROOT_PATH.'template/'.$tmpl.'/mail/'.$email_format);
 
   return $mail_template;
@@ -118 +115 @@
 
 /**
+ * Return string email format (html or not) 
+ *
+ * @param string format
+ */
+function get_str_email_format($is_html)
+{
+  return ($is_html ? 'text/html' : 'text/plain');
+}
+
+/**
  * sends an email, using PhpWebGallery specific informations
  */
 function pwg_mail($to, $from = '', $subject = 'PhpWebGallery', $infos = '', $format_infos = 'text/plain', $email_format = null)
 {
-  global $conf, $conf_mail, $lang_info, $user, $page;
+  global $conf, $conf_mail, $lang_info, $page;
 
   $cvt7b_subject = str_translate_to_ascii7bits($subject);
@@ -171 +178 @@
   $content = '';
 
-  if (!isset($conf_mail[$email_format][$lang_info['charset']]['header']))
-  {
-    if ($email_format == 'text/html')
-    {
-      $mail_template = get_mail_template();
-
-      $mail_template->set_filenames(array('mail_header'=>'mail/header.tpl'));
-
-      $mail_template->assign_vars(
-        array(
-          'BODY_ID' =>
-            isset($page['body_id']) ?
-              $page['body_id'] : '',
-
-          'CONTENT_ENCODING' => $lang_info['charset'],
-          'LANG' => $lang_info['code'],
-          'DIR' => $lang_info['direction']
-          ));
-
-      $conf_mail[$email_format][$lang_info['charset']]['header'] =
-        $mail_template->parse('mail_header', true);
-    }
-    else
-    {
-      $conf_mail[$email_format][$lang_info['charset']]['header'] = '';
-    }
+  if (!isset($conf_mail[$email_format][$lang_info['charset']]))
+  {
+    if (!isset($mail_template))
+    {
+      $mail_template = get_mail_template($email_format);
+    }
+
+    $mail_template->set_filename('mail_header', 'header.tpl');
+    $mail_template->set_filename('mail_footer', 'footer.tpl');
+
+    $mail_template->assign_vars(
+      array(
+        //Header
+        'BODY_ID' =>
+          isset($page['body_id']) ?
+            $page['body_id'] : '',
+
+        'CONTENT_ENCODING' => $lang_info['charset'],
+        'LANG' => $lang_info['code'],
+        'DIR' => $lang_info['direction'],
+        
+        // Footer
+        'GALLERY_URL' =>
+          isset($page['gallery_url']) ?
+                $page['gallery_url'] : $conf['gallery_url'],
+        'GALLERY_TITLE' =>
+          isset($page['gallery_title']) ?
+                $page['gallery_title'] : $conf['gallery_title'],
+        'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '',
+        'PHPWG_URL' => PHPWG_URL,
+
+        'TITLE_MAIL' => urlencode(l10n('title_send_mail')),
+        'MAIL' => get_webmaster_mail_address()
+        ));
+
+    // what are displayed on the header of each mail ?
+    $conf_mail[$email_format][$lang_info['charset']]['header'] =
+      $mail_template->parse('mail_header', true);
+
+    // what are displayed on the footer of each mail ?
+    $conf_mail[$email_format][$lang_info['charset']]['footer'] =
+      $mail_template->parse('mail_footer', true);
   }
 
@@ -208 +231 @@
   {
     $content.= $infos;
-  }
-
-  if (!isset($conf_mail[$email_format][$lang_info['charset']]['footer']))
-  {
-    if ($email_format == 'text/html')
-    {
-      $mail_template->set_filenames(array('mail_footer'=>'mail/footer.tpl'));
-
-      $mail_template->assign_vars(
-        array(
-          'GALLERY_URL' =>
-            isset($page['gallery_url']) ?
-                  $page['gallery_url'] : $conf['gallery_url'],
-          'GALLERY_TITLE' =>
-            isset($page['gallery_title']) ?
-                  $page['gallery_title'] : $conf['gallery_title'],
-          'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '',
-          'PHPWG_URL' => PHPWG_URL,
-
-          'TITLE_MAIL' => urlencode(l10n('title_send_mail')),
-          'MAIL' => get_webmaster_mail_address()
-          ));
-
-      $conf_mail[$email_format][$lang_info['charset']]['footer'] =
-        $mail_template->parse('mail_footer', true);
-    }
-    else
-    {
-      $conf_mail[$email_format][$lang_info['charset']]['footer'] = $conf_mail['text_footer'];
-    }
   }
 
@@ -248 +241 @@
   }
 
+  /*Testing block
+  {
+    global $user;
+    @mkdir(PHPWG_ROOT_PATH.'testmail');
+    $filename = PHPWG_ROOT_PATH.'testmail/mail.'.$user['username'];
+    if ($format_infos == 'text/plain')
+    {
+      $filename .= '.txt';
+    }
+    else
+    {
+      $filename .= '.html';
+    }
+    $file = fopen($filename, 'w+');
+    fwrite($file, $content);
+    fclose($file);
+    return true;
+  }
+  */
+
   if ($conf_mail['mail_options'])
   {

@@ -2 +2 @@
 gal2
 feed.xml
+testmail