Fixes for 'Can't use function return value in write context in /foo/bar.php'

[mailer.git] / inc / modules / member / what-points.php

diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index f3904443f0916b15a4109ee0356e89161accbc1d..cdf9dcbd77bf0a704156e751dafa41fb10ff920f 100644 (file)
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-ADD_DESCR("member", basename(__FILE__));
+ADD_DESCR("member", __FILE__);
 
 $result_depths = SQL_QUERY("SELECT level, percents FROM "._MYSQL_PREFIX."_refdepths ORDER BY level", __FILE__, __LINE__);
 $depths = SQL_NUMROWS($result_depths);
@@ -101,8 +101,8 @@ SQL_FREERESULT($result_depths);
 // Put rows to constant for the main template
 define('__REF_LEVEL_ROWS', $OUT);
 
-$result = SQL_QUERY_ESC("SELECT used_points, ref_payout FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
- array($GLOBALS['userid']), __FILE__, __LINE__);
+$result = SQL_QUERY_ESC("SELECT used_points, ref_payout FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
+       array($GLOBALS['userid']), __FILE__, __LINE__);
 list($USED, $PAY) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
@@ -115,7 +115,7 @@ if (GET_EXT_VERSION("user") >= "0.1.2") {
        if (GET_EXT_VERSION("user") >= "0.1.4") {
                $ADD = ", emails_sent, emails_received";
        }
-       $result = SQL_QUERY_ESC("SELECT mails_confirmed".$ADD." FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT mails_confirmed".$ADD." FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
        list($CONFIRMED, $SENT, $RECEIVED) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
@@ -140,13 +140,13 @@ define('__TLOCK_VALUE', TRANSLATE_COMMA($TLOCK));
 if (EXT_VERSION_IS_OLDER("bonus", "0.4.4")) $_CONFIG['bonus_active'] = "X";
 
 // Display login bonus and turbo-click bonus
-if ((GET_EXT_VERSION("bonus") >= "0.2.2") && (EXT_IS_ACTIVE("bonus")) && ($_CONFIG['bonus_active'] == "Y")) {
+if ((GET_EXT_VERSION("bonus") >= "0.2.2") && (EXT_IS_ACTIVE("bonus")) && (getConfig('bonus_active') == "Y")) {
        $ADD = ", 0, 0, 0";
        if (GET_EXT_VERSION("bonus") >= "0.4.4") $ADD = ", bonus_ref, bonus_order, bonus_stats";
 
        // Load data
-       $result = SQL_QUERY_ESC("SELECT login_bonus, turbo_bonus".$ADD." FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
-        array($GLOBALS['userid']), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT login_bonus, turbo_bonus".$ADD." FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
+               array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // We don't add this points now. This will be done after each month
        list($login, $turbo, $ref, $order, $stats) = SQL_FETCHROW($result);
@@ -168,7 +168,7 @@ if ((GET_EXT_VERSION("bonus") >= "0.2.2") && (EXT_IS_ACTIVE("bonus")) && ($_CONF
 
        // Output rows
        define('__SPECIAL_ROWS', LOAD_TEMPLATE("member_points_bonus_rows", true));
-} elseif ($_CONFIG['bonus_active'] == "N") {
+} elseif (getConfig('bonus_active') == "N") {
        // Bonus active rallye deactivated
        define('__SPECIAL_ROWS', LOAD_TEMPLATE("member_points_bonus_disabled", true));
 } elseif ((IS_ADMIN()) && (EXT_VERSION_IS_OLDER("bonus", "0.2.2")) && (EXT_IS_ACTIVE("bonus"))) {