Changeset 1818 for trunk

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.

Location:

trunk

Files:

• admin/notification_by_mail.php (modified) (2 diffs)
• include/functions_mail.inc.php (modified) (8 diffs)
• include/picture_comment.inc.php (modified) (3 diffs)
• register.php (modified) (1 diff)

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

trunk/include/functions_mail.inc.php

@@ -4 +4 @@
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
-// | Copyright (C) 2006 Ruben ARNAUD - team@phpwebgallery.net              |
+// | Copyright (C) 2006-2007 Ruben ARNAUD - team@phpwebgallery.net         |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
@@ -27 +27 @@
 // +-----------------------------------------------------------------------+
 
-/**
- * - Extract mail fonctions of password.php
- * - Modify pwg_mail (add pararameters + news fonctionnalities)
- * - Var conf_mail, function get_mail_configuration, format_email, pwg_mail
- */
-
 // +-----------------------------------------------------------------------+
 // |                               functions                               |
@@ -100 +94 @@
 
 /**
- * Return an completed array template/theme
+ * Returns an completed array template/theme
  * completed with $conf['default_template']
  *
@@ -162 +156 @@
 
 /**
+ * Returns email of all administrator
+ *
+ * @return string
+ */
+function get_administrators_email()
+{
+  global $conf;
+
+  $result = array();
+
+  $query = '
+select
+  U.'.$conf['user_fields']['username'].' as username,
+  U.'.$conf['user_fields']['email'].' as mail_address
+from
+  '.USERS_TABLE.' as U,
+  '.USER_INFOS_TABLE.' as I
+where
+  I.user_id =  U.'.$conf['user_fields']['id'].' and
+  I.status in (\'webmaster\',  \'admin\') and
+  '.$conf['user_fields']['email'].' is not null
+order by
+  username
+';
+
+  $datas = pwg_query($query);
+  if (!empty($datas))
+  {
+    while ($admin = mysql_fetch_array($datas))
+    {
+      if (!empty($admin['mail_address']))
+      {
+        array_push($result, format_email($admin['username'], $admin['mail_address']));
+      }
+    }
+  }
+
+  return $result;
+}
+
+/**
  * sends an email, using PhpWebGallery specific informations
  *
@@ -168 +203 @@
  *   - args: function params of mail function:
  *       o from: sender [default value webmaster email]
+ *       o Cc: array of carbon copy receivers of the mail. [default value empty]
+ *       o Bcc: array of blind carbon copy receivers of the mail. [default value empty]
  *       o subject  [default value 'PhpWebGallery']
  *       o content: content of mail    [default value '']
@@ -175 +212 @@
  *       o theme: template to use [default $conf['default_template']]
  */
-//function pwg_mail($to, $from = '', $subject = 'PhpWebGallery', $infos = '', $infos_format = 'text/plain', $email_format = null)
 function pwg_mail($to, $args = array())
 {
@@ -223 +259 @@
   }
 
+  if ($conf_mail['send_bcc_mail_webmaster'])
+  {
+    $args['Bcc'][] = $conf_mail['formated_email_webmaster'];
+  }
+
   if (($args['content_format'] == 'text/html') and ($args['email_format'] == 'text/plain'))
   {
@@ -233 +274 @@
   $headers = 'From: '.$args['from']."\n";
   $headers.= 'Reply-To: '.$args['from']."\n";
+
+  if (!empty($args['Cc']))
+  {
+    $headers.= 'Cc: '.implode(',', $args['Cc'])."\n";
+  }
+
+  if (!empty($args['Bcc']))
+  {
+    $headers.= 'Bcc: '.implode(',', $args['Bcc'])."\n";
+  }
+
   $headers.= 'Content-Type: multipart/alternative;'."\n";
   $headers.= '  boundary="---='.$conf_mail['boundary_key'].'";'."\n";
   $headers.= '  reply-type=original'."\n";
   $headers.= 'MIME-Version: 1.0'."\n";
-
-  if ($conf_mail['send_bcc_mail_webmaster'])
-  {
-    $headers.= 'Bcc: '.$conf_mail['formated_email_webmaster']."\n";
-  }
 
   $content = '';

trunk/include/picture_comment.inc.php

@@ -210 +210 @@
       include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
 
+      $val_url = get_absolute_root_url().'comments.php?validate='.$comm['id'];
       $del_url = get_absolute_root_url().'comments.php?delete='.$comm['id'];
 
@@ -217 +218 @@
         .'IP: '.$comm['ip']."\n"
         .'Browser: '.$comm['agent']."\n\n"
+        .'Validate: '.$val_url."\n"
         .'Delete: '.$del_url."\n";
       if ($comment_action!='validate')
@@ -224 +226 @@
           .'comments.php?validate='.$comm['id'];
       }
-      pwg_mail(get_webmaster_mail_address(),
-        array('subject' => 'PWG comment by '.$comm['author'], 'content' => $content));
+      pwg_mail
+      (
+        format_email('administrators', get_webmaster_mail_address()),
+        array
+        (
+          'subject' => 'PWG comment by '.$comm['author'], 
+          'content' => $content,
+          'Bcc' => get_administrators_email()
+        )
+      );
     }
   }

trunk/register.php

@@ -71 +71 @@
         .l10n('admin').': '.$admin_url;
 
-      pwg_mail(get_webmaster_mail_address(),
+      pwg_mail
+      (
+        format_email('administrators', get_webmaster_mail_address()),
         array
         (
           'subject' => 'PWG '.l10n('register_title').' '.$username,
-          'content' => $content
+          'content' => $content,
+          'Bcc' => get_administrators_email()
         )
       );