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

Timestamp:

Apr 15, 2006, 1:25:48 AM (19 years ago)

Author:

rub

Message:

Issue ID 330:

o Remove "background treatment"
o Add button "Continue treatment"

Report of svn:1177 (BSF Branch)

Warning: functions.inc.php is not the same of BSF/trunk branch (die_on_sql_error)

File:

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

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

@@ -51 +51 @@
 // +-----------------------------------------------------------------------+
 $base_url = get_root_url().'admin.php';
+$must_repost = false;
 
 // +-----------------------------------------------------------------------+
@@ -57 +58 @@
 
 /*
- * Do background treatmetn in order to finish to send mails
+ * Do timeout treatment in order to finish to send mails
  *
  * @param $post_keyname: key of check_key post array
- * @param check_key_treated:array of check_key treated
+ * @param check_key_treated: array of check_key treated
  * @return none
  */
-function do_background_treatment($post_keyname, $check_key_treated = array())
-{
-  global $env_nbm, $base_url;
+function do_timeout_treatment($post_keyname, $check_key_treated = array())
+{
+  global $env_nbm, $base_url, $page, $must_repost;
 
   if ($env_nbm['is_sendmail_timeout'])
@@ -79 +80 @@
       else
       {
-        $time_refresh = 10;
+        $time_refresh = 0;
       }
       $_POST[$post_keyname] = array_diff($_POST[$post_keyname], $check_key_treated);
-      re_post_http($base_url.get_query_string_diff(array()), sprintf(l10n('nbm_background_treatment_redirect'), $time_refresh) , $time_refresh);
+      
+      $must_repost = true;
+      array_push($page['errors'], sprintf(l10n('nbm_background_treatment_redirect'), $time_refresh));
     }
   }
@@ -117 +120 @@
 {
   global $conf, $page, $env_nbm;
-
-  // Treatment of simulate post
-  if (isset($_POST['insert_new_user_nbm']))
-  {
-     $check_key_treated = do_subscribe_unsubcribe_notification_by_mail
-    (
-      true,
-      $conf['nbm_default_value_user_enabled'],
-      $_POST['insert_new_user_nbm']
-    );
-    do_background_treatment('insert_new_user_nbm', $check_key_treated);
-  }
 
   // Set null mail_address empty
@@ -197 +188 @@
     if ($env_nbm['is_sendmail_timeout'])
     {
-      if ($conf['nbm_default_value_user_enabled'])
-      {
-        // Simulate Post
-        $_POST['insert_new_user_nbm'] = $check_key_list;
-        do_background_treatment('insert_new_user_nbm', $check_key_treated);
+      $quoted_check_key_list = quote_check_key_list(array_diff($check_key_list, $check_key_treated));
+      if (count($quoted_check_key_list) != 0 )
+      {
+        $query = 'delete from '.USER_MAIL_NOTIFICATION_TABLE.' where check_key in ('.implode(",", $quoted_check_key_list).');';
+        $result = pwg_query($query);
+
+        redirect($base_url.get_query_string_diff(array()));
       }
     }
@@ -231 +224 @@
     $data_users = get_user_notifications('send', $check_key_list);
 
+    // List all if it's define on options or on timeout
+    $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 (($conf['nbm_list_all_enabled_users_to_send'] == false) or ($is_action_send))
+    if ((!$is_list_all_without_test == false) or ($is_action_send))
     {
       if (count($data_users) > 0)
@@ -241 +237 @@
         if ($is_action_send)
         {
-          $msg_break_timeout = l10n('nbm_nbm_break_timeout_send_mail');
+          $msg_break_timeout = l10n('nbm_break_timeout_send_mail');
         }
         else
@@ -461 +457 @@
     {
       $check_key_treated = unsubcribe_notification_by_mail(true, $_POST['cat_true']);
-      do_background_treatment('cat_true', $check_key_treated);
+      do_timeout_treatment('cat_true', $check_key_treated);
     }
     else
@@ -467 +463 @@
     {
       $check_key_treated = subcribe_notification_by_mail(true, $_POST['cat_false']);
-      do_background_treatment('cat_false', $check_key_treated);
+      do_timeout_treatment('cat_false', $check_key_treated);
     }
     break;
@@ -477 +473 @@
     {
       $check_key_treated = do_action_send_mail_notification('send', $_POST['send_selection'], $_POST['send_customize_mail_content']);
-      do_background_treatment('send_selection', $check_key_treated);
+      do_timeout_treatment('send_selection', $check_key_treated);
     }
   }
@@ -518 +514 @@
 }
 
+if ($must_repost)
+{
+  // Get name of submit button
+  $repost_submit_name = '';
+  if (isset($_POST['falsify']))
+  {
+    $repost_submit_name = 'falsify';
+  }
+  elseif (isset($_POST['trueify']))
+  {
+    $repost_submit_name = 'trueify';
+  }
+  elseif (isset($_POST['send_submit']))
+  {
+    $repost_submit_name = 'send_submit';
+  }
+
+  $template->assign_block_vars
+  (
+    'repost', 
+      array
+      (
+        'REPOST_SUBMIT_NAME' => $repost_submit_name
+      )
+    );
+}
+
 switch ($page['mode'])
 {
@@ -590 +613 @@
               'CHECKED' =>  ( // not check if not selected,  on init select<all
                               isset($_POST['send_selection']) and // not init
-                              !in_array($nbm_user['check_key'],  $_POST['send_selection']) // not selected
+                              !in_array($nbm_user['check_key'], $_POST['send_selection']) // not selected
                             )   ? '' : 'checked="checked"',
               'USERNAME'=> $nbm_user['username'],