Changeset 1156 for trunk/admin/include

Timestamp:

Apr 13, 2006, 12:49:42 AM (18 years ago)

Author:

rub

Message:

Issue ID 330:

o Change NBM configuration in order to avoid lose treatment action when occurred timeout
o Add news redirect/repost functions

File:

• trunk/admin/include/functions_notification_by_mail.inc.php (modified) (9 diffs)

trunk/admin/include/functions_notification_by_mail.inc.php

@@ -28 +28 @@
 
 /* nbm_global_var */
-$env_nbm = array();
+$env_nbm = array
+          (
+            'start_time' => get_moment(),
+            'sendmail_timeout' => (intval(ini_get('max_execution_time')) * $conf['nbm_max_treatment_timeout_percent']),
+            'is_sendmail_timeout' => false
+          );
+
 
 /*
@@ -56 +62 @@
     }
   }
+}
+
+/*
+ * Check sendmail timeout state
+ *
+ * @return true, if it's timeout
+ */
+function check_sendmail_timeout()
+{
+  global $env_nbm;
+
+  $env_nbm['is_sendmail_timeout'] = ((get_moment() - $env_nbm['start_time']) > $env_nbm['sendmail_timeout']);
+
+  return $env_nbm['is_sendmail_timeout'];
 }
 
@@ -319 +339 @@
  * check_key list where action will be done
  *
- * @return updated data count
+ * @return check_key lisr treated
  */
 function do_subscribe_unsubcribe_notification_by_mail($is_admin_request, $is_subscribe = false, $check_key_list = array())
@@ -325 +345 @@
   global $conf, $page, $env_nbm, $conf;
 
+  $check_key_treated = array();
   $updated_data_count = 0;
   $error_on_updated_data_count = 0;
@@ -345 +366 @@
     $data_users = get_user_notifications('subscribe', $check_key_list, !$is_subscribe);
 
+    // Prepare message after change language
+    $msg_break_timeout = l10n('nbm_nbm_break_timeout_send_mail');
+
     // Begin nbm users environment
     begin_users_env_nbm(true);
@@ -350 +374 @@
     foreach ($data_users as $nbm_user)
     {
-      if (($env_nbm['error_on_mail_count'] + $env_nbm['sent_mail_count']) >= $conf['nbm_max_mails_send'])
+      if (check_sendmail_timeout())
       {
         // Stop fill list on 'send', if the quota is override
-        array_push($page['errors'], sprintf(l10n('nbm_nbm_break_send_mail'), $conf['nbm_max_mails_send']));
+        array_push($page['errors'], $msg_break_timeout);
         break;
       }
+
+      // Fill return list
+      array_push($check_key_treated, $nbm_user['check_key']);
 
       $do_update = true;
@@ -437 +464 @@
   }
 
-  return $updated_data_count;
+  return $check_key_treated;
 }
 
@@ -445 +472 @@
  * check_key list where action will be done
  *
- * @return updated data count
+ * @return check_key lisr treated
  */
 function unsubcribe_notification_by_mail($is_admin_request, $check_key_list = array())
@@ -457 +484 @@
  * check_key list where action will be done
  *
- * @return updated data count
+ * @return check_key lisr treated
  */
 function subcribe_notification_by_mail($is_admin_request, $check_key_list = array())