Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.

[mailer.git] / inc / libs / bonus_functions.php

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index b053c1d19392ab1567e865184613df7021879785..b37f45c61cbd173e657aa5d7e231da8dcc1d5b0e 100644 (file)
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -157,7 +157,7 @@ function addBonusRanks ($data, $type, $userid) {
        // Load rankings
        $result = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE `%s`=%s ORDER BY `level` ASC LIMIT {?bonus_lines?}",
                array($type, $data), __FUNCTION__, __LINE__);
-       if (!ifSqlHasZeroNums($result)) {
+       if (!ifSqlHasZeroNumRows($result)) {
                // Output all ranks (levels)
                for ($rank = 1; $rank <= sqlNumRows($result); $rank++) {
                        // Load data
@@ -200,7 +200,7 @@ LIMIT 1",
                // No entries found
                // @TODO Move this HTML to a template
                $OUT = '<tr>
-  <td colspan="3" align="center" height="30" class="bottom">
+  <td colspan="3" align="center" class="bottom">
     <div class="bad">{%message,MEMBER_BONUS_NO_RANKS=' . $data . '%}</div>
   </td>
 </tr>';
@@ -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