From c26f6e1ccd30d9db4bda085fa5bc377da7da3066 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 8 Jan 2013 23:47:25 +0000 Subject: [PATCH] Previous attempt fixed --- inc/daily/daily_ | 4 ++-- inc/daily/daily_100_bonus.php | 4 ++-- inc/daily/daily_autopurge.php | 4 ++-- inc/daily/daily_beg.php | 4 ++-- inc/daily/daily_birthday.php | 4 ++-- inc/daily/daily_bonus.php | 4 ++-- inc/daily/daily_doubler.php | 2 +- inc/daily/daily_earning.php | 4 ++-- inc/daily/daily_holiday.php | 4 ++-- inc/daily/daily_order.php | 4 ++-- inc/daily/daily_profile.php | 2 +- inc/daily/daily_surfbar.php | 4 ++-- inc/daily/daily_user.php | 4 ++-- inc/daily/daily_user_subids.php | 2 +- inc/daily/daily_yoomedia.php | 4 ++-- inc/hourly/hourly_ | 4 ++-- inc/monthly/monthly_ | 4 ++-- inc/monthly/monthly_beg.php | 4 ++-- inc/monthly/monthly_bonus.php | 4 ++-- inc/monthly/monthly_newsletter.php | 2 +- inc/monthly/monthly_surfbar.php | 2 +- inc/weekly/weekly_ | 4 ++-- inc/weekly/weekly_surfbar.php | 2 +- 23 files changed, 40 insertions(+), 40 deletions(-) diff --git a/inc/daily/daily_ b/inc/daily/daily_ index e30bb7f224..ed360158a2 100644 --- a/inc/daily/daily_ +++ b/inc/daily/daily_ @@ -41,8 +41,8 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif ((!isExtensionActive('')) && (isDebugModeEnabled())) { - logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext- disabled.'); +} elseif (!isExtensionActive('')) { + if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext- disabled.'); return; } diff --git a/inc/daily/daily_100_bonus.php b/inc/daily/daily_100_bonus.php index 3949718466..622e598a90 100644 --- a/inc/daily/daily_100_bonus.php +++ b/inc/daily/daily_100_bonus.php @@ -41,8 +41,8 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif ((!isExtensionActive('bonus')) && (isDebugModeEnabled())) { - logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-bonus disabled.'); +} elseif (!isExtensionActive('bonus')) { + if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-bonus disabled.'); return; } diff --git a/inc/daily/daily_autopurge.php b/inc/daily/daily_autopurge.php index 1c84ecc6b0..7d18667b26 100644 --- a/inc/daily/daily_autopurge.php +++ b/inc/daily/daily_autopurge.php @@ -41,8 +41,8 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif ((!isExtensionActive('autopurge')) && (isDebugModeEnabled())) { - logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-autopurge disabled.'); +} elseif (!isExtensionActive('autopurge')) { + if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-autopurge disabled.'); return; } diff --git a/inc/daily/daily_beg.php b/inc/daily/daily_beg.php index a1eef8d7d2..05321b1e81 100644 --- a/inc/daily/daily_beg.php +++ b/inc/daily/daily_beg.php @@ -41,8 +41,8 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif ((!isExtensionActive('beg')) || (!isBegRallyeEnabled())) { - logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-beg disabled.'); +} elseif (!isExtensionActive('beg')) { + if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-beg disabled.'); return; } diff --git a/inc/daily/daily_birthday.php b/inc/daily/daily_birthday.php index ec01c57670..a724e2220b 100644 --- a/inc/daily/daily_birthday.php +++ b/inc/daily/daily_birthday.php @@ -41,9 +41,9 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode return; -} elseif ((!isExtensionActive('birthday')) && (isDebugModeEnabled())) { +} elseif (!isExtensionActive('birthday')) { // Extension not active/installed - logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-birthday disabled.'); + if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-birthday disabled.'); return; } diff --git a/inc/daily/daily_bonus.php b/inc/daily/daily_bonus.php index f2ed150e92..47681aeb60 100644 --- a/inc/daily/daily_bonus.php +++ b/inc/daily/daily_bonus.php @@ -41,8 +41,8 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif ((!isExtensionActive('bonus')) && (isDebugModeEnabled())) { - logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-bonus disabled.'); +} elseif (!isExtensionActive('bonus')) { + if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-bonus disabled.'); return; } diff --git a/inc/daily/daily_doubler.php b/inc/daily/daily_doubler.php index d170f7f5bc..b316f9c28a 100644 --- a/inc/daily/daily_doubler.php +++ b/inc/daily/daily_doubler.php @@ -42,7 +42,7 @@ if (!defined('__SECURITY')) { // Do not execute when script is in CSS mode or no daily reset return; } elseif ((!isExtensionActive('doubler')) || (getDoublerSendMode() != 'RESET')) { - logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-doubler disabled.'); + if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-doubler disabled.'); return; } diff --git a/inc/daily/daily_earning.php b/inc/daily/daily_earning.php index d554e53bb5..f6c0c5d495 100644 --- a/inc/daily/daily_earning.php +++ b/inc/daily/daily_earning.php @@ -41,8 +41,8 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif ((!isExtensionActive('earning')) && (isDebugModeEnabled())) { - logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-earning disabled.'); +} elseif (!isExtensionActive('earning')) { + if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-earning disabled.'); return; } diff --git a/inc/daily/daily_holiday.php b/inc/daily/daily_holiday.php index 8087a03b3e..dcf962f325 100644 --- a/inc/daily/daily_holiday.php +++ b/inc/daily/daily_holiday.php @@ -41,8 +41,8 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || ((!isResetModeEnabled()) && (getConfig('holiday_mode') == 'RESET'))) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif ((!isExtensionActive('holiday')) && (isDebugModeEnabled())) { - logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-holiday disabled.'); +} elseif (!isExtensionActive('holiday')) { + if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-holiday disabled.'); return; } diff --git a/inc/daily/daily_order.php b/inc/daily/daily_order.php index 1bf841b643..d424e14c8c 100644 --- a/inc/daily/daily_order.php +++ b/inc/daily/daily_order.php @@ -41,8 +41,8 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif ((!isExtensionActive('order')) && (isDebugModeEnabled())) { - logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-order disabled.'); +} elseif (!isExtensionActive('order')) { + if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-order disabled.'); return; } diff --git a/inc/daily/daily_profile.php b/inc/daily/daily_profile.php index 2f48a136e5..70b0eb96b5 100644 --- a/inc/daily/daily_profile.php +++ b/inc/daily/daily_profile.php @@ -42,7 +42,7 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif ((!isExtensionActive('profile')) && (isDebugModeEnabled())) { +} elseif (!isExtensionActive('profile')) { logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-profile disabled.'); return; } diff --git a/inc/daily/daily_surfbar.php b/inc/daily/daily_surfbar.php index a6633a6613..44ad188140 100644 --- a/inc/daily/daily_surfbar.php +++ b/inc/daily/daily_surfbar.php @@ -41,8 +41,8 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif ((!isExtensionActive('surfbar')) && (isDebugModeEnabled())) { - logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-surfbar disabled.'); +} elseif (!isExtensionActive('surfbar')) { + if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-surfbar disabled.'); return; } diff --git a/inc/daily/daily_user.php b/inc/daily/daily_user.php index 591ba21b76..a1637f1dd3 100644 --- a/inc/daily/daily_user.php +++ b/inc/daily/daily_user.php @@ -41,8 +41,8 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif ((!isExtensionActive('sql_patches')) || (!isExtensionActive('user'))) { - logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension(s) ext-sql_patches/ext-user disabled.'); +} elseif (!isExtensionActive('sql_patches')) { + if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension(s) ext-sql_patches/ext-user disabled.'); return; } diff --git a/inc/daily/daily_user_subids.php b/inc/daily/daily_user_subids.php index 9a3ebee597..449350faa9 100644 --- a/inc/daily/daily_user_subids.php +++ b/inc/daily/daily_user_subids.php @@ -42,7 +42,7 @@ if (!defined('__SECURITY')) { // Do not execute when script is in CSS mode or no daily reset return; } elseif (!isExtensionInstalledAndNewer('user', '0.5.8')) { - logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-user disabled or out-dated.'); + if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-user disabled or out-dated.'); return; } diff --git a/inc/daily/daily_yoomedia.php b/inc/daily/daily_yoomedia.php index 3d5be7b72a..d1827deace 100644 --- a/inc/daily/daily_yoomedia.php +++ b/inc/daily/daily_yoomedia.php @@ -41,8 +41,8 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif ((!isExtensionActive('yoomedia')) && (isDebugModeEnabled())) { - logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-yoomedia disabled.'); +} elseif (!isExtensionActive('yoomedia')) { + if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-yoomedia disabled.'); return; } diff --git a/inc/hourly/hourly_ b/inc/hourly/hourly_ index 9d34222d4a..9d501114ab 100644 --- a/inc/hourly/hourly_ +++ b/inc/hourly/hourly_ @@ -41,8 +41,8 @@ if (!defined('__SECURITY')) { } elseif ((isCssOutputMode()) || (isHourlyResetEnabled()) || (!isExtensionInstalledAndNewer('sql_patches', '0.7.5'))) { // Do not execute when script is in CSS mode or no hourly reset return; -} elseif ((!isExtensionActive('')) && (isDebugModeEnabled())) { - logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext- disabled.'); +} elseif (!isExtensionActive('')) { + if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext- disabled.'); return; } diff --git a/inc/monthly/monthly_ b/inc/monthly/monthly_ index 7a337e8f8b..ff113267fb 100644 --- a/inc/monthly/monthly_ +++ b/inc/monthly/monthly_ @@ -41,8 +41,8 @@ if (!defined('__SECURITY')) { } elseif ((isCssOutputMode()) || (isResetModeEnabled())) { // Do not execute when script is in CSS mode or no hourly reset return; -} elseif ((!isExtensionActive('')) && (isDebugModeEnabled())) { - logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext- disabled.'); +} elseif (!isExtensionActive('')) { + if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext- disabled.'); return; } diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php index 75e58be8d8..9c09db6985 100644 --- a/inc/monthly/monthly_beg.php +++ b/inc/monthly/monthly_beg.php @@ -41,8 +41,8 @@ if (!defined('__SECURITY')) { } elseif ((isCssOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no hourly reset return; -} elseif (((!isExtensionActive('beg')) || (!isBegRallyeEnabled())) && (isDebugModeEnabled())) { - logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-beg disabled.'); +} elseif ((!isExtensionActive('beg')) || (!isBegRallyeEnabled())) { + if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-beg disabled.'); return; } diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php index 3c1aa72e47..c663790830 100644 --- a/inc/monthly/monthly_bonus.php +++ b/inc/monthly/monthly_bonus.php @@ -41,8 +41,8 @@ if (!defined('__SECURITY')) { } elseif ((isCssOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no hourly reset return; -} elseif ((!isExtensionActive('bonus')) && (isDebugModeEnabled())) { - logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-bonus disabled.'); +} elseif (!isExtensionActive('bonus')) { + if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-bonus disabled.'); return; } diff --git a/inc/monthly/monthly_newsletter.php b/inc/monthly/monthly_newsletter.php index 2697b4ded8..34927f2595 100644 --- a/inc/monthly/monthly_newsletter.php +++ b/inc/monthly/monthly_newsletter.php @@ -41,7 +41,7 @@ if (!defined('__SECURITY')) { } elseif ((isCssOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no hourly reset return; -} elseif ((!isExtensionActive('newsletter')) && (isDebugModeEnabled())) { +} elseif (!isExtensionActive('newsletter')) { logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-newsletter disabled.'); return; } diff --git a/inc/monthly/monthly_surfbar.php b/inc/monthly/monthly_surfbar.php index 8b50197a42..9c73218b6c 100644 --- a/inc/monthly/monthly_surfbar.php +++ b/inc/monthly/monthly_surfbar.php @@ -41,7 +41,7 @@ if (!defined('__SECURITY')) { } elseif ((isCssOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no hourly reset return; -} elseif ((!isExtensionActive('surfbar')) && (isDebugModeEnabled())) { +} elseif (!isExtensionActive('surfbar')) { logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-surfbar disabled.'); return; } diff --git a/inc/weekly/weekly_ b/inc/weekly/weekly_ index 12636cc772..fd2662f93a 100644 --- a/inc/weekly/weekly_ +++ b/inc/weekly/weekly_ @@ -41,8 +41,8 @@ if (!defined('__SECURITY')) { } elseif ((isCssOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif ((!isExtensionActive('')) && (isDebugModeEnabled())) { - logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext- disabled.'); +} elseif (!isExtensionActive('')) { + if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext- disabled.'); return; } diff --git a/inc/weekly/weekly_surfbar.php b/inc/weekly/weekly_surfbar.php index d708db7986..8d7b7b9588 100644 --- a/inc/weekly/weekly_surfbar.php +++ b/inc/weekly/weekly_surfbar.php @@ -41,7 +41,7 @@ if (!defined('__SECURITY')) { } elseif ((isCssOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif ((!isExtensionActive('surfbar')) && (isDebugModeEnabled())) { +} elseif (!isExtensionActive('surfbar')) { logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-surfbar disabled.'); return; } -- 2.39.5