From 572e4b0f128dc3e7c44331d21f366fb8b19665e4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 13 Sep 2008 17:54:53 +0000 Subject: [PATCH] pool delivery won't no longer work on daily reset, daily reset won't work in DEBUG_MODE=true --- inc/check-reset.php | 4 ++-- inc/databases.php | 2 +- inc/pool-update.php | 16 +++++++++------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/inc/check-reset.php b/inc/check-reset.php index 7596a8d6d4..0f13b5ff84 100644 --- a/inc/check-reset.php +++ b/inc/check-reset.php @@ -37,8 +37,8 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) { require($INC); } -// 01 2 2 2 3321 1 2 21 1 2 21 1 2 21 1 2 21 1 10 -if ((date("d", $_CONFIG['last_update']) != date("d", time())) && (!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && (!isset($_GET['register'])) && ($CSS != 1)) { +// 01 2 2 2 3321 1 2 21 1 2 21 1 2 21 1 2 21 1 1 1 2 210 +if ((date("d", $_CONFIG['last_update']) != date("d", time())) && (!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && (!isset($_GET['register'])) && ($CSS != 1) && (!isBooleanConstantAndTrue('DEBUG_MODE'))) { // Do daily things in external PHP file but only when script is completely setup // Daily reset was run! define('__DAILY_RESET', true); diff --git a/inc/databases.php b/inc/databases.php index ad65169cee..4405b66707 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -114,7 +114,7 @@ define('USAGE_BASE', "usage"); define('SERVER_URL', "http://www.mxchange.org"); // This current patch level -define('CURR_SVN_REVISION', "320"); +define('CURR_SVN_REVISION', "321"); // Take a prime number which is long (if you know a longer one please try it out!) define('_PRIME', 591623); diff --git a/inc/pool-update.php b/inc/pool-update.php index a6ef8e18eb..58a1bb91cd 100644 --- a/inc/pool-update.php +++ b/inc/pool-update.php @@ -32,23 +32,25 @@ ************************************************************************/ // Some security stuff... -if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) -{ +if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) { $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; require($INC); } +// Don't run on daily reset +if (defined('__DAILY_RESET')) { + // Skip here + return false; +} // END - if + // Test html extensions once $HTML_EXT = EXT_IS_ACTIVE("html_mail", true); // Check for freed mail orders to send out -if ($HTML_EXT) -{ +if ($HTML_EXT) { // 0 1 2 3 4 5 6 7 8 9 10 $result_main = SQL_QUERY("SELECT id, sender, subject, text, receivers, payment_id, timestamp, url, target_send, cat_id, html_msg FROM "._MYSQL_PREFIX."_pool WHERE data_type='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__); -} - else -{ +} else { // 0 1 2 3 4 5 6 7 8 9 10 $result_main = SQL_QUERY("SELECT id, sender, subject, text, receivers, payment_id, timestamp, url, target_send, cat_id, id FROM "._MYSQL_PREFIX."_pool WHERE data_type='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__); } -- 2.39.5