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 bb118906a0236de3714c53e885b94cc2404a512f..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 *
@@ -96,14 +96,14 @@ function addTurboBonus ($id, $userid, $type) {
        }
 
        // Add points to his account directly
-       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `turbo_bonus`=`turbo_bonus`+%s WHERE `userid`=%s LIMIT 1",
+       sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `turbo_bonus`=`turbo_bonus`+%s WHERE `userid`=%s LIMIT 1",
                array(
                        $points,
                        bigintval($userid)
                ), __FUNCTION__, __LINE__);
 
        // Rember this whole data for displaying ranking list
-       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus_turbo` (`userid`, `mail_id`, `bonus_id`, `level`, `points`, `timemark`) VALUES (%s, %s, %s, %s, %s, UNIX_TIMESTAMP())",
+       sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_bonus_turbo` (`userid`, `mail_id`, `bonus_id`, `level`, `points`, `timemark`) VALUES (%s, %s, %s, %s, %s, UNIX_TIMESTAMP())",
                array(
                        bigintval($userid),
                        $mailId,
@@ -132,7 +132,7 @@ function addBonusRanks ($data, $type, $userid) {
        $ranks = count(explode(';', getTurboRates())) + 1;
 
        // Load current user's data
-       $result = SQL_QUERY_ESC("SELECT `level`, `points`, `timemark` FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE `%s`=%s AND `userid`=%s LIMIT 1",
+       $result = sqlQueryEscaped("SELECT `level`, `points`, `timemark` FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE `%s`=%s AND `userid`=%s LIMIT 1",
                array(
                        $type,
                        $data,
@@ -140,9 +140,9 @@ function addBonusRanks ($data, $type, $userid) {
                ), __FUNCTION__, __LINE__);
 
        // Entry found?
-       if (SQL_NUMROWS($result) == 1) {
+       if (sqlNumRows($result) == 1) {
                // Load data
-               $GLOBALS['ranking_content'] = merge_array($GLOBALS['ranking_content'], SQL_FETCHARRAY($result));
+               $GLOBALS['ranking_content'] = merge_array($GLOBALS['ranking_content'], sqlFetchArray($result));
 
                // Remember all values for later use
                $self = TRUE;
@@ -155,13 +155,13 @@ function addBonusRanks ($data, $type, $userid) {
        } // END - if
 
        // Load rankings
-       $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE `%s`=%s ORDER BY `level` ASC LIMIT {?bonus_lines?}",
+       $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 (!SQL_HASZERONUMS($result)) {
+       if (!ifSqlHasZeroNumRows($result)) {
                // Output all ranks (levels)
-               for ($rank = 1; $rank <= SQL_NUMROWS($result); $rank++) {
+               for ($rank = 1; $rank <= sqlNumRows($result); $rank++) {
                        // Load data
-                       $result_users = SQL_QUERY_ESC("SELECT
+                       $result_users = sqlQueryEscaped("SELECT
        `userid`,
        `points`
 FROM
@@ -177,13 +177,13 @@ LIMIT 1",
                        $rows['points'] = '---';
 
                        // Are you one of them?
-                       if (SQL_NUMROWS($result_users) == 1) {
+                       if (sqlNumRows($result_users) == 1) {
                                // Load data
-                               $rows = merge_array($rows, SQL_FETCHARRAY($result_users));
+                               $rows = merge_array($rows, sqlFetchArray($result_users));
                        } // END - if
 
                        // Free result
-                       SQL_FREERESULT($result_users);
+                       sqlFreeResult($result_users);
 
                        // Add more
                        $rows['rank'] = $rank;
@@ -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>';
@@ -274,11 +274,11 @@ function handleBonusPoints ($mode, $userid) {
 // Purges expired fast-click bonus entries
 function purgeExpiredTurboBonus () {
        // Remove entries
-       $result = SQL_QUERY('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE (UNIX_TIMESTAMP() - `timemark`) >= {?bonus_timeout?}', __FUNCTION__, __LINE__);
+       $result = sqlQuery('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE (UNIX_TIMESTAMP() - `timemark`) >= {?bonus_timeout?}', __FUNCTION__, __LINE__);
 
-       if (!SQL_HASZEROAFFECTED()) {
+       if (!ifSqlHasZeroAffectedRows()) {
                // Send out email to admin
-               sendAdminNotification('{--ADMIN_AUTOPURGE_TURBO_SUBJECT--}', 'admin_purge_turbo', SQL_AFFECTEDROWS());
+               sendAdminNotification('{--ADMIN_AUTOPURGE_TURBO_SUBJECT--}', 'admin_purge_turbo', sqlAffectedRows());
        } // END - if
 }
 
@@ -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