Changeset 1215 for branches/branch-1_6/admin/notification_by_mail.php

Timestamp:

Apr 20, 2006, 12:16:08 AM (19 years ago)

Author:

rub

Message:

Issue ID 330/337:

o Fix last bugs
o Change class "errors" to class "infos"

Merge BSF r1213:1214 into branch-1_6

File:

• branches/branch-1_6/admin/notification_by_mail.php (modified) (4 diffs)

branches/branch-1_6/admin/notification_by_mail.php

@@ -83 +83 @@
       }
       $_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));
@@ -228 +228 @@
 
     // 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)
@@ -606 +606 @@
 
       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',
@@ -619 +625 @@
               'LAST_SEND'=> $nbm_user['last_send']
               ));
+        }
+      }
     }