diff options
| author | rub <rub@piwigo.org> | 2006-04-19 22:16:08 +0000 |
|---|---|---|
| committer | rub <rub@piwigo.org> | 2006-04-19 22:16:08 +0000 |
| commit | 23250ebd85239f2b202aaee156f5256012ac16f0 (patch) | |
| tree | 640984a36ff11de32fb53cd93ac2a895a9c97556 | |
| parent | 22ba71d83a55be855dcbd208d5a2fde7fe2e44f6 (diff) | |
Issue ID 330/337:
o Fix last bugs
o Change class "errors" to class "infos"
Merge BSF r1213:1214 into branch-1_6
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1215 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | admin/notification_by_mail.php | 12 | ||||
| -rw-r--r-- | template/yoga/admin/notification_by_mail.tpl | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php index a8e0c62d7..7ede9ba61 100644 --- a/admin/notification_by_mail.php +++ b/admin/notification_by_mail.php @@ -82,7 +82,7 @@ function do_timeout_treatment($post_keyname, $check_key_treated = array()) $time_refresh = 0; } $_POST[$post_keyname] = array_diff($_POST[$post_keyname], $check_key_treated); - + $must_repost = true; array_push($page['errors'], sprintf(l10n('nbm_background_treatment_redirect'), $time_refresh)); } @@ -227,7 +227,7 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l $is_list_all_without_test = ($env_nbm['is_sendmail_timeout'] or $conf['nbm_list_all_enabled_users_to_send']); // Check if exist news to list user or send mails - if ((!$is_list_all_without_test == false) or ($is_action_send)) + if ((!$is_list_all_without_test) or ($is_action_send)) { if (count($data_users) > 0) { @@ -605,6 +605,12 @@ switch ($page['mode']) )); foreach ($data_users as $num => $nbm_user) + { + if ( + (!$must_repost) or // Not timeout, normal treatment + (($must_repost) and in_array($nbm_user['check_key'], $_POST['send_selection'])) // Must be repost, show only user to send + ) + { $template->assign_block_vars( $page['mode'].'.send_data.user_send_mail', array( @@ -618,6 +624,8 @@ switch ($page['mode']) 'EMAIL' => $nbm_user['mail_address'], 'LAST_SEND'=> $nbm_user['last_send'] )); + } + } } break; diff --git a/template/yoga/admin/notification_by_mail.tpl b/template/yoga/admin/notification_by_mail.tpl index dcd45a5b0..71a8fd737 100644 --- a/template/yoga/admin/notification_by_mail.tpl +++ b/template/yoga/admin/notification_by_mail.tpl @@ -18,9 +18,9 @@ <form method="post" name="notification_by_mail" id="notification_by_mail" action="{F_ACTION}"> <!-- BEGIN repost --> <fieldset> - <div class="errors"> + <div class="infos"> <p> - <input type="submit" value="{lang:nbm_repost_submit}" name="{REPOST_SUBMIT_NAME}" {TAG_INPUT_ENABLED}/> + <input type="submit" value="{lang:nbm_repost_submit}" name="{repost.REPOST_SUBMIT_NAME}" {TAG_INPUT_ENABLED}/> </p> </div> </fieldset> |