Changeset 1642

Timestamp:

Dec 8, 2006, 12:49:52 AM (17 years ago)

Author:

rub

Message:

Feature Issue ID 0000598:

Possibility to send HTML mail

Location:

trunk

Files:

• include/config_default.inc.php (modified) (1 diff)
• include/functions_mail.inc.php (modified) (5 diffs)
• template/yoga/mail (added)
• template/yoga/mail/admin (added)
• template/yoga/mail/admin/index.php (added)
• template/yoga/mail/footer.tpl (added)
• template/yoga/mail/header.tpl (added)
• template/yoga/mail/index.php (added)

trunk/include/config_default.inc.php

@@ -225 +225 @@
 $conf['enabled_format_email'] = true;
 
+// default_email_format:
+//  Define the default email format use to send email
+//  Value could be text/plain  or text/html
+$conf['default_email_format'] = 'text/plain';
+
 // check_upgrade_feed: check if there are database upgrade required. Set to
 // true, a message will strongly encourage you to upgrade your database if

trunk/include/functions_mail.inc.php

@@ -55 +55 @@
     'mail_options' => $conf['mail_options'],
     'send_bcc_mail_webmaster' => $conf['send_bcc_mail_webmaster'],
+    'default_email_format' => $conf['default_email_format']
     );
 
@@ -103 +104 @@
  * sends an email, using PhpWebGallery specific informations
  */
-function pwg_mail($to, $from = '', $subject = 'PhpWebGallery', $infos = '')
+function pwg_mail($to, $from = '', $subject = 'PhpWebGallery', $infos = '', $format_infos = 'text/plain', $email_format = null)
 {
-  global $conf, $conf_mail, $lang_info;
+  global $conf, $conf_mail, $lang_info, $user;
 
   $cvt7b_subject = str_translate_to_ascii7bits($subject);
@@ -112 +113 @@
   {
     $conf_mail = get_mail_configuration();
+  }
+
+  if (is_null($email_format))
+  {
+    $email_format = $conf_mail['default_email_format'];
+  }
+
+  if (($format_infos == 'text/html') and ($email_format == 'text/plain'))
+  {
+    // Todo find function to convert html text to plain text
+    return false;
   }
 
@@ -127 +139 @@
   $headers = 'From: '.$from."\n";
   $headers.= 'Reply-To: '.$from."\n";
-  $headers.= 'Content-Type: text/plain;format=flowed;charset="'.$lang_info['charset'].'";';
+  $headers.= 'Content-Type: '.$email_format.';format=flowed;charset="'.$lang_info['charset'].'";';
   $headers.= 'reply-type=original'."\n";
 
@@ -134 +146 @@
     $headers.= 'Bcc: '.$conf_mail['formated_email_webmaster']."\n";
   }
-  
-  $content = $infos;
-  $content.= $conf_mail['text_footer'];
+
+  list($tmpl, $thm) = explode('/', $conf['default_template']);
+  $template_mail = new Template(PHPWG_ROOT_PATH.'template/'.$tmpl, $thm);
+
+  $content = '';
+
+  if ($email_format == 'text/html')
+  {
+    $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 (($format_infos == 'text/plain') and ($email_format == 'text/html'))
+  {
+    $content.= '<pre>'.htmlentities($infos).'</pre>';
+  }
+  else
+  {
+    $content.= $infos;
+  }
+
+  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 ($conf_mail['mail_options'])