From: Roland Häder Date: Tue, 8 Jan 2013 17:36:29 +0000 (+0000) Subject: Less logging if this is not needed X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f3916afac1fa7519a4f30fc932bd2c7c57da4a9d;p=mailer.git Less logging if this is not needed --- diff --git a/inc/daily/daily_ b/inc/daily/daily_ index b0a8316d7d..e30bb7f224 100644 --- a/inc/daily/daily_ +++ b/inc/daily/daily_ @@ -41,7 +41,7 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif (!isExtensionActive('')) { +} elseif ((!isExtensionActive('')) && (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 33111c7de6..3949718466 100644 --- a/inc/daily/daily_100_bonus.php +++ b/inc/daily/daily_100_bonus.php @@ -41,7 +41,7 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif (!isExtensionActive('bonus')) { +} elseif ((!isExtensionActive('bonus')) && (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 f2c4d689a1..1c84ecc6b0 100644 --- a/inc/daily/daily_autopurge.php +++ b/inc/daily/daily_autopurge.php @@ -41,7 +41,7 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif (!isExtensionActive('autopurge')) { +} elseif ((!isExtensionActive('autopurge')) && (isDebugModeEnabled())) { logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-autopurge disabled.'); return; } diff --git a/inc/daily/daily_birthday.php b/inc/daily/daily_birthday.php index b44250769c..ec01c57670 100644 --- a/inc/daily/daily_birthday.php +++ b/inc/daily/daily_birthday.php @@ -41,7 +41,7 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode return; -} elseif (!isExtensionActive('birthday')) { +} elseif ((!isExtensionActive('birthday')) && (isDebugModeEnabled())) { // Extension not active/installed 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 4faf7a0f6e..f2ed150e92 100644 --- a/inc/daily/daily_bonus.php +++ b/inc/daily/daily_bonus.php @@ -41,7 +41,7 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif (!isExtensionActive('bonus')) { +} elseif ((!isExtensionActive('bonus')) && (isDebugModeEnabled())) { logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-bonus disabled.'); return; } diff --git a/inc/daily/daily_earning.php b/inc/daily/daily_earning.php index de4a03e82e..d554e53bb5 100644 --- a/inc/daily/daily_earning.php +++ b/inc/daily/daily_earning.php @@ -41,7 +41,7 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif (!isExtensionActive('earning')) { +} elseif ((!isExtensionActive('earning')) && (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 e1488dd0bf..8087a03b3e 100644 --- a/inc/daily/daily_holiday.php +++ b/inc/daily/daily_holiday.php @@ -41,7 +41,7 @@ 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')) { +} elseif ((!isExtensionActive('holiday')) && (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 39b5f64e19..1bf841b643 100644 --- a/inc/daily/daily_order.php +++ b/inc/daily/daily_order.php @@ -41,7 +41,7 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif (!isExtensionActive('order')) { +} elseif ((!isExtensionActive('order')) && (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 70b0eb96b5..2f48a136e5 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')) { +} elseif ((!isExtensionActive('profile')) && (isDebugModeEnabled())) { 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 b1d1db4cec..a6633a6613 100644 --- a/inc/daily/daily_surfbar.php +++ b/inc/daily/daily_surfbar.php @@ -41,7 +41,7 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif (!isExtensionActive('surfbar')) { +} elseif ((!isExtensionActive('surfbar')) && (isDebugModeEnabled())) { logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-surfbar disabled.'); return; } diff --git a/inc/daily/daily_yoomedia.php b/inc/daily/daily_yoomedia.php index 682f20e3db..3d5be7b72a 100644 --- a/inc/daily/daily_yoomedia.php +++ b/inc/daily/daily_yoomedia.php @@ -41,7 +41,7 @@ if (!defined('__SECURITY')) { } elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) { // Do not execute when script is in CSS mode or no daily reset return; -} elseif (!isExtensionActive('yoomedia')) { +} elseif ((!isExtensionActive('yoomedia')) && (isDebugModeEnabled())) { logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-yoomedia disabled.'); return; } diff --git a/inc/hourly/hourly_ b/inc/hourly/hourly_ index a1a2a2e369..9d34222d4a 100644 --- a/inc/hourly/hourly_ +++ b/inc/hourly/hourly_ @@ -41,7 +41,7 @@ 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('')) { +} elseif ((!isExtensionActive('')) && (isDebugModeEnabled())) { logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext- disabled.'); return; } diff --git a/inc/monthly/monthly_ b/inc/monthly/monthly_ index 2e13923e7c..7a337e8f8b 100644 --- a/inc/monthly/monthly_ +++ b/inc/monthly/monthly_ @@ -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('')) { +} elseif ((!isExtensionActive('')) && (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 03bc6e65f1..75e58be8d8 100644 --- a/inc/monthly/monthly_beg.php +++ b/inc/monthly/monthly_beg.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('beg')) || (!isBegRallyeEnabled())) { +} elseif (((!isExtensionActive('beg')) || (!isBegRallyeEnabled())) && (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 c2222424b7..3c1aa72e47 100644 --- a/inc/monthly/monthly_bonus.php +++ b/inc/monthly/monthly_bonus.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('bonus')) { +} elseif ((!isExtensionActive('bonus')) && (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 34927f2595..2697b4ded8 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')) { +} elseif ((!isExtensionActive('newsletter')) && (isDebugModeEnabled())) { 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 9c73218b6c..8b50197a42 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')) { +} elseif ((!isExtensionActive('surfbar')) && (isDebugModeEnabled())) { logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-surfbar disabled.'); return; } diff --git a/inc/weekly/weekly_ b/inc/weekly/weekly_ index 82aefb8d52..12636cc772 100644 --- a/inc/weekly/weekly_ +++ b/inc/weekly/weekly_ @@ -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('')) { +} elseif ((!isExtensionActive('')) && (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 8d7b7b9588..d708db7986 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')) { +} elseif ((!isExtensionActive('surfbar')) && (isDebugModeEnabled())) { logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-surfbar disabled.'); return; }