diff options
| author | mistic100 <mistic@piwigo.org> | 2013-11-06 17:57:53 +0000 |
|---|---|---|
| committer | mistic100 <mistic@piwigo.org> | 2013-11-06 17:57:53 +0000 |
| commit | fc3b787b70ba83613990860c182e9d7cc20cf1c8 (patch) | |
| tree | 279057c62bc5a7bd2cf915d51fa4a047b1583032 /admin/notification_by_mail.php | |
| parent | 68636067e98ab30914237ed28d5015cbf8dd6fe4 (diff) | |
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
Diffstat (limited to 'admin/notification_by_mail.php')
| -rw-r--r-- | admin/notification_by_mail.php | 30 |
1 files changed, 16 insertions, 14 deletions
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); |