Changeset 1645

Timestamp:

Dec 9, 2006, 1:43:23 AM (17 years ago)

Author:

rub

Message:

Feature Issue ID 0000598:

Possibility to send HTML mail

Optimize, fix little bugs and add footer information

NBM: Replace by / on subscribe/unsubscribe link

Location:

trunk

Files:

• admin/include/functions_notification_by_mail.inc.php (modified) (1 diff)
• include/functions_mail.inc.php (modified) (3 diffs)
• template/yoga/mail/footer.tpl (modified) (1 diff)

trunk/admin/include/functions_notification_by_mail.inc.php

@@ -325 +325 @@
   
   $content .= "___________________________________________________\n\n";
-  $content .= sprintf(l10n('nbm_content_unsubscribe_link'), add_url_params(get_root_url().'/nbm.php', array('unsubscribe' => $nbm_user['check_key'])))."\n";
-  $content .= sprintf(l10n('nbm_content_subscribe_link'), add_url_params(get_root_url().'/nbm.php', array('subscribe' => $nbm_user['check_key'])))."\n";
+  $content .= sprintf(l10n('nbm_content_unsubscribe_link'), add_url_params(get_root_url().'nbm.php', array('unsubscribe' => $nbm_user['check_key'])))."\n";
+  $content .= sprintf(l10n('nbm_content_subscribe_link'), add_url_params(get_root_url().'nbm.php', array('subscribe' => $nbm_user['check_key'])))."\n";
   $content .= sprintf(l10n('nbm_content_subscribe_unsubscribe_contact'), $env_nbm['send_as_mail_address'])."\n";
   $content .= "___________________________________________________\n\n\n\n";

trunk/include/functions_mail.inc.php

@@ -102 +102 @@
 
 /**
+ * Returns an new mail template
+ *
+ * @param none
+ */
+function get_mail_template()
+{
+  global $conf;
+
+  // for mail, default template are used
+  list($tmpl, $thm) = explode('/', $conf['default_template']);
+  $mail_template = new Template(PHPWG_ROOT_PATH.'template/'.$tmpl, $thm);
+
+  return $mail_template;
+}
+
+/**
  * sends an email, using PhpWebGallery specific informations
  */
@@ -147 +163 @@
   }
 
-  list($tmpl, $thm) = explode('/', $conf['default_template']);
-
   $content = '';
 
-  if ($email_format == 'text/html')
-  {
-    $template_mail = new Template(PHPWG_ROOT_PATH.'template/'.$tmpl, $thm);
-
-    $template_mail->set_filenames(array('mail_header'=>'mail/header.tpl'));
-
-    $template_mail->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']
-
-        ));
-
-    $content.= $template_mail->parse('mail_header', true);
-  }
+  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'] = '';
+    }
+  }
+
+  $content.= $conf_mail[$email_format][$lang_info['charset']]['header'];
 
   if (($format_infos == 'text/plain') and ($email_format == 'text/html'))
@@ -181 +205 @@
   }
 
-  if ($email_format == 'text/plain')
-  {
-    $content.= $conf_mail['text_footer'];
-  }
-  else
-  {
-    $template_mail->set_filenames(array('mail_footer'=>'footer.tpl'));
-
-    $template_mail->assign_vars(
-      array(
-        'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '',
-
-        'L_TITLE_MAIL' => urlencode(l10n('title_send_mail')),
-        'MAIL' => get_webmaster_mail_address()
-        ));
-
-    $content.= $template_mail->parse('mail_footer', true);
-  }
+  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 : '',
+
+          'L_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'];
+    }
+  }
+
+  $content.= $conf_mail[$email_format][$lang_info['charset']]['footer'];
 
   if ($conf_mail['mail_options'])

trunk/template/yoga/mail/footer.tpl

@@ -5 +5 @@
           to show the origin of the script...-->
 
+  <a href="{GALLERY_URL}" class="back">{GALLERY_TITLE}</a> - 
   {lang:powered_by} <a href="http://www.phpwebgallery.net" class="back">PhpWebGallery</a>
   {VERSION}
   - {lang:send_mail}
-  <a href="mailto:{contact.MAIL}?subject={L_TITLE_MAIL}">{lang:Webmaster}</a>
+  <a href="mailto:{MAIL}?subject={L_TITLE_MAIL}">{lang:Webmaster}</a>
 
 </div> <!-- copyright -->