X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fbonus_functions.php;h=5a5f7f1e8a1156a5f5c714b558f0759e150d2af8;hb=936a7baf6967cd03d65a84acef3b9b4de8fcec6a;hp=f18d919011e194f616dc511ccceb1084e3135d9f;hpb=e5dffd4249c97200cbad02f3f4eaf5c373fdb89a;p=mailer.git

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index f18d919011..5a5f7f1e8a 100644
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -289,25 +289,25 @@ function purgeExpiredTurboBonus () {
 // Determines whether the "bonus rallye" is active
 function isBonusRallyeActive () {
 	// Is there cache?
-	if (!isset($GLOBALS['bonus_rallye_active'])) {
+	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Just determine it
-		$GLOBALS['bonus_rallye_active'] = (getBonusActive() == 'Y');
+		$GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('bonus', '0.4.4')) && (isConfigEntrySet('bonus_active')) && (getBonusActive() == 'Y'));
 	} // END - if
 
 	// Return cache
-	return $GLOBALS['bonus_rallye_active'];
+	return $GLOBALS[__FUNCTION__];
 }
 
 // Determines whether the "bonus new_member_notify" is active
 function isBonusNewMemberNotifyEnabled () {
 	// Is there cache?
-	if (!isset($GLOBALS['bonus_new_member_notify_active'])) {
+	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Just determine it
-		$GLOBALS['bonus_new_member_notify_active'] = (getBonusNewMemberNotify() == 'Y');
+		$GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('bonus', '0.7.7')) && (isConfigEntrySet('bonus_new_member_notify')) && (getBonusNewMemberNotify() == 'Y'));
 	} // END - if
 
 	// Return cache
-	return $GLOBALS['bonus_new_member_notify_active'];
+	return $GLOBALS[__FUNCTION__];
 }
 
 // Getter for bonus_timeout
@@ -555,7 +555,7 @@ function isIncludeBonusClickEnabled () {
 	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
-		$GLOBALS[__FUNCTION__] = (getIncludeBonusClick() == 'Y');
+		$GLOBALS[__FUNCTION__] = ((isConfigEntrySet('include_bonus_click')) && (getIncludeBonusClick() == 'Y'));
 	} // END - if
 
 	// Return cache
@@ -567,7 +567,7 @@ function getIncludeBonusLogin () {
 	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
-		$GLOBALS[__FUNCTION__] = getConfig('include_bonus_login');
+		$GLOBALS[__FUNCTION__] = ((isConfigEntrySet('include_bonus_login')) && getConfig('include_bonus_login'));
 	} // END - if
 
 	// Return cache
@@ -579,7 +579,7 @@ function isIncludeBonusLoginEnabled () {
 	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
-		$GLOBALS[__FUNCTION__] = (getIncludeBonusLogin() == 'Y');
+		$GLOBALS[__FUNCTION__] = ((isConfigEntrySet('include_bonus_login')) && (getIncludeBonusLogin() == 'Y'));
 	} // END - if
 
 	// Return cache
@@ -603,7 +603,7 @@ function isIncludeBonusOrderEnabled () {
 	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
-		$GLOBALS[__FUNCTION__] = (getIncludeBonusOrder() == 'Y');
+		$GLOBALS[__FUNCTION__] = ((isConfigEntrySet('include_bonus_order')) && (getIncludeBonusOrder() == 'Y'));
 	} // END - if
 
 	// Return cache
@@ -627,7 +627,7 @@ function isIncludeBonusRefEnabled () {
 	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
-		$GLOBALS[__FUNCTION__] = (getIncludeBonusRef() == 'Y');
+		$GLOBALS[__FUNCTION__] = ((isConfigEntrySet('include_bonus_ref')) && (getIncludeBonusRef() == 'Y'));
 	} // END - if
 
 	// Return cache
@@ -651,7 +651,7 @@ function isIncludeBonusStatsEnabled () {
 	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
-		$GLOBALS[__FUNCTION__] = (getIncludeBonusStats() == 'Y');
+		$GLOBALS[__FUNCTION__] = ((isConfigEntrySet('include_bonus_stats')) && (getIncludeBonusStats() == 'Y'));
 	} // END - if
 
 	// Return cache