Changeset 25360 for trunk/admin/include/functions_notification_by_mail.inc.php

Timestamp:

Nov 6, 2013, 6:57:53 PM (10 years ago)

Author:

mistic100

Message:

feature 2995: New email template
restore get_l10n_args removed at r25357
apply changes to NBM

File:

• trunk/admin/include/functions_notification_by_mail.inc.php (modified) (3 diffs)

trunk/admin/include/functions_notification_by_mail.inc.php

@@ -257 +257 @@
   if ($is_action_send)
   {
-    $nbm_user['theme'] = $user['theme'];
-    $env_nbm['mail_template'] = get_mail_template($env_nbm['email_format'], $nbm_user['theme']);
+    $env_nbm['mail_template'] = get_mail_template($env_nbm['email_format']);
     $env_nbm['mail_template']->set_filename('notification_by_mail', 'notification_by_mail.tpl');
   }
@@ -424 +423 @@
         set_user_on_env_nbm($nbm_user, true);
 
-        $subject = '['.$conf['gallery_title'].']: '.($is_subscribe ? l10n('Subscribe to notification by mail'): l10n('Unsubscribe from notification by mail'));
+        $subject = '['.$conf['gallery_title'].'] '.($is_subscribe ? l10n('Subscribe to notification by mail'): l10n('Unsubscribe from notification by mail'));
 
         // Assign current var for nbm mail
@@ -440 +439 @@
           )
         );
-
-        if (pwg_mail
-            (
-              format_email(stripslashes($nbm_user['username']), $nbm_user['mail_address']),
-              array
-              (
-                'from' => $env_nbm['send_as_mail_formated'],
-                'subject' => $subject,
-                'email_format' => $env_nbm['email_format'],
-                'content' => $env_nbm['mail_template']->parse('notification_by_mail', true),
-                'content_format' => $env_nbm['email_format'],
-                'theme' => $nbm_user['theme']
-              )
-            ))
+        
+        $ret = pwg_mail(
+          array(
+            'name' => stripslashes($nbm_user['username']),
+            'email' => $nbm_user['mail_address'],
+            ),
+          array(
+            'from' => $env_nbm['send_as_mail_formated'],
+            'subject' => $subject,
+            'email_format' => $env_nbm['email_format'],
+            'content' => $env_nbm['mail_template']->parse('notification_by_mail', true),
+            'content_format' => $env_nbm['email_format'],
+            )
+          );
+
+        if ($ret)
         {
           inc_mail_sent_success($nbm_user);