Changeset 1818 for trunk/admin/notification_by_mail.php

Timestamp:

Feb 14, 2007, 11:53:04 PM (17 years ago)

Author:

rub

Message:

My last improvements before 1.7.0RC1.

Can include Cc & Bcc on mail.
Send mail to all administrators on new comment or new users.
Add validate link on new comment mail.
Try to detect if the NBM complementary content is HTML or plain text. With plain text, this content is convert to readable HTML.

File:

• trunk/admin/notification_by_mail.php (modified) (2 diffs)

trunk/admin/notification_by_mail.php

@@ -227 +227 @@
     $is_action_send = ($action == 'send');
 
-    if (!isset($customize_mail_content))
-    {
-      $customize_mail_content = $conf['nbm_complementary_mail_content'];
-    }
-
     // disabled and null mail_address are not selected in the list
     $data_users = get_user_notifications('send', $check_key_list);
@@ -244 +239 @@
       {
         $datas = array();
+
+        if (!isset($customize_mail_content))
+        {
+          $customize_mail_content = $conf['nbm_complementary_mail_content'];
+        }
+
+        if ($conf['nbm_send_html_mail'] and !(strpos($customize_mail_content, '<') === 0))
+        {
+          // On HTML mail, detects if the content are HTML format.
+          // If it's plain text format, convert content to readable HTML
+          $customize_mail_content = nl2br(htmlentities($customize_mail_content));
+        }
 
         // Prepare message after change language