From fc3b787b70ba83613990860c182e9d7cc20cf1c8 Mon Sep 17 00:00:00 2001
From: mistic100 <mistic@piwigo.org>
Date: Wed, 6 Nov 2013 17:57:53 +0000
Subject: feature 2995: New email template restore get_l10n_args removed at
 r25357 apply changes to NBM

git-svn-id: http://piwigo.org/svn/trunk@25360 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 .../include/functions_notification_by_mail.inc.php | 33 +++++++++++-----------
 admin/notification_by_mail.php                     | 30 +++++++++++---------
 2 files changed, 33 insertions(+), 30 deletions(-)

(limited to 'admin')

diff --git a/admin/include/functions_notification_by_mail.inc.php b/admin/include/functions_notification_by_mail.inc.php
index 9d5e7ecfc..81d374b0d 100644
--- a/admin/include/functions_notification_by_mail.inc.php
+++ b/admin/include/functions_notification_by_mail.inc.php
@@ -256,8 +256,7 @@ function set_user_on_env_nbm(&$nbm_user, $is_action_send)
 
   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');
   }
 }
@@ -423,7 +422,7 @@ function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_su
         // set env nbm user
         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
         assign_vars_nbm_mail_content($nbm_user);
@@ -439,20 +438,22 @@ function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_su
             'GOTO_GALLERY_URL' => get_gallery_home_url(),
           )
         );
+        
+        $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 (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']
-              )
-            ))
+        if ($ret)
         {
           inc_mail_sent_success($nbm_user);
         }
diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php
index cd3445f7c..8c2f5e278 100644
--- a/admin/notification_by_mail.php
+++ b/admin/notification_by_mail.php
@@ -305,7 +305,7 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l
 
             if ($exist_data)
             {
-              $subject = '['.$conf['gallery_title'].']: '.l10n('New photos added');
+              $subject = '['.$conf['gallery_title'].'] '.l10n('New photos added');
 
               // Assign current var for nbm mail
               assign_vars_nbm_mail_content($nbm_user);
@@ -377,20 +377,22 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l
                   'SEND_AS_NAME'      => $env_nbm['send_as_name'],
                 )
               );
+              
+              $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 (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']
-                    )
-                  ))
+              if ($ret)
               {
                 inc_mail_sent_success($nbm_user);
 
-- 
cgit v1.2.3