Previous attempt fixed

diff --git a/inc/daily/daily_ b/inc/daily/daily_
index e30bb7f2243c200d46f60b23d9332f6867044efa..ed360158a2266e9ae1223ad66055e5ba8562a0dc 100644 (file)
--- 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 3949718466b4bfe6eebd5e3cf0e921617312f008..622e598a90187534466f288531c965b440f62e50 100644 (file)
--- 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 1c84ecc6b08acc3c08382df1de4e10b95a76a219..7d18667b26b16efe4c3a2839f661e786287f6552 100644 (file)
--- 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 a1eef8d7d22df1149a536dfc0f89f42973e7b040..05321b1e814d1dada1e29265e44795bd6cbee987 100644 (file)
--- 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 ec01c57670c403a9ca4081a1ce09a9f46a553925..a724e2220bd51c3561cadfebf3e8900131a81db2 100644 (file)
--- 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 f2ed150e92536788aec6e921eb177175128771b3..47681aeb6070775cbbf11915ac6dd62eecffc62f 100644 (file)
--- 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 d170f7f5bc7f58f349c431aa046d08c38ffc9ecd..b316f9c28a97dd2b8fa09a2d4e75cabea3dfd0cc 100644 (file)
--- 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 d554e53bb53447dccda2b6209e74280fe8dd6f43..f6c0c5d495210ac6f28ab1a7214063affc427fe6 100644 (file)
--- 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 8087a03b3e2bf84868c6c173b2cbf934ce69ea35..dcf962f325913fe64fb9a0053151a8497816d50b 100644 (file)
--- 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 1bf841b6433a19b98648fdaca0af3a767dff8f7d..d424e14c8cbd3ef29d10459263767d8ca518b0ae 100644 (file)
--- 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 2f48a136e56767239edf213d2b09947bd5c1912d..70b0eb96b5882a04e60810b13e90016a87f053a1 100644 (file)
--- 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 a6633a661345536e66eb4a997d44eac7014cfd48..44ad1881407db95aa806a53ff4a081d60779fcd3 100644 (file)
--- 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 591ba21b76e52ba056e7352fbd5e42f29295bf59..a1637f1dd3b1095b62f70c91d7b45d8ee81a5810 100644 (file)
--- 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 9a3ebee5977977d4e4d24df0dc85a7cb29a1a78d..449350faa90ca31a66d999b7c24d6a8853dd7333 100644 (file)
--- 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 3d5be7b72a43c3923770ab2a4f09e25a540d4dcd..d1827deacefcefb192c32a0eef93c3ac9171389c 100644 (file)
--- 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 9d34222d4ae9f97a9be97475727a962057ff7468..9d501114ab9f248f2891968ba785bf1704398a62 100644 (file)
--- 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 7a337e8f8ba7096d25ef695b1708066daefe9c93..ff113267fbe82ae6a637d5bab326df0fb9847af4 100644 (file)
--- 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 75e58be8d8c1f9fbf1cbddf00493bae217c654a6..9c09db69859b77eebf5153832fd8dabc74328911 100644 (file)
--- 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 3c1aa72e47ef5284de557815dd370d169ce23e49..c663790830b35e5198ace5cb4a30c4350708f517 100644 (file)
--- 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 2697b4ded8baa252a37afde92c96893237e0de1d..34927f259599b01736d65f0e07118c133c10d0bb 100644 (file)
--- 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 8b50197a423a335c57d7a5a6024eaddeb68d4a3b..9c73218b6c9bbe9c6e66fd496615c16287d2f975 100644 (file)
--- 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 12636cc772e1c5924f0daa7aed3f26ca62924812..fd2662f93a2d963957e6280ce424f692dc9bed22 100644 (file)
--- 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 d708db7986b9beeb66d7411d957fb065cc8448b8..8d7b7b95886fae2787dc514a74cc97df77d69334 100644 (file)
--- 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;
 }