Fixed also usage of previously renamed fields as they must be the same

[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 7975df0833ab8eef7cec152aac50ab1ae3384f8f..a1e39d5cdf184121f40eea2845c7cb7dd3430d43 100644 (file)
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -52,7 +52,7 @@ if ((!isExtensionActive('user')) && (!isAdmin())) {
 } // END - if
 
 // Query for referral levels and percents
-$result_depths = SQL_QUERY('SELECT `level`,`percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY `level` ASC', __FILE__, __LINE__);
+$result_depths = SQL_QUERY('SELECT `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY `level` ASC', __FILE__, __LINE__);
 
 // Get total depths
 $numDepths = SQL_NUMROWS($result_depths);
@@ -94,24 +94,24 @@ while ($data = SQL_FETCHARRAY($result_depths)) {
        $content = merge_array($content, $data);
 
        // Default for referral level > 0
-       $depth = 'p.`ref_depth`=%s';
+       $depth = '`p`.`ref_depth`=%s';
        if (is_null($content['level'])) {
-               $depth = 'p.`ref_depth` IS NULL';
+               $depth = '`p`.`ref_depth` IS NULL';
        } // END - if
 
        // Load referral points
        $result_points = SQL_QUERY_ESC('SELECT
        ' . getAllPointColumns('p.', ',') . '
-       r.`counter`
+       `r`.`counter`
 FROM
-       `{?_MYSQL_PREFIX?}_user_points` AS p
+       `{?_MYSQL_PREFIX?}_user_points` AS `p`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_refsystem` AS r
+       `{?_MYSQL_PREFIX?}_refsystem` AS `r`
 ON
-       p.`userid`=r.`userid` AND
-       p.`ref_depth`=r.`level`
+       `p`.`userid`=`r`.`userid` AND
+       `p`.`ref_depth`=`r`.`level`
 WHERE
-       p.`userid`=%s AND
+       `p`.`userid`=%s AND
        ' . $depth . '
 LIMIT 1',
                array(
@@ -119,7 +119,7 @@ LIMIT 1',
                        convertZeroToNull($content['level'])
                ), __FILE__, __LINE__);
 
-       // Do we have an entry?
+       // Is there an entry?
        if (SQL_NUMROWS($result_points) == 1) {
                // Load data
                $content = merge_array($content, SQL_FETCHARRAY($result_points));
@@ -142,7 +142,7 @@ LIMIT 1',
        SQL_FREERESULT($result_points);
 
        // Output row
-       $OUT .= loadTemplate('member_points_row', true, $content);
+       $OUT .= loadTemplate('member_points_row', TRUE, $content);
 } // END - while
 
 // Free memory
@@ -168,10 +168,10 @@ if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonu
        $content['bonus_total_points'] = getUserData('turbo_bonus') + getUserData('login_bonus') + getUserData('bonus_ref') + getUserData('bonus_order') + getUserData('bonus_stats');
 
        // Output rows
-       $content['special_rows'] = loadTemplate('member_points_bonus_rows', true, $content);
+       $content['special_rows'] = loadTemplate('member_points_bonus_rows', TRUE, $content);
 } elseif ((isExtensionActive('bonus')) && (!isBonusRallyeActive())) {
        // Bonus active rallye deactivated
-       $content['special_rows'] = loadTemplate('member_points_bonus_disabled', true);
+       $content['special_rows'] = loadTemplate('member_points_bonus_disabled', TRUE);
 } elseif ((isAdmin()) && (isExtensionInstalledAndOlder('bonus', '0.2.2')) && (isExtensionActive('bonus'))) {
        // Please upgrade your bonus extension to v0.2.2 or newer!
        $content['special_rows'] = loadTemplate('member_points_upgrade');
@@ -180,7 +180,7 @@ if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonu
 // Load final template
 if (isExtensionActive('user')) {
        // Load template when required extension is there
-       loadTemplate('member_points', false, $content);
+       loadTemplate('member_points', FALSE, $content);
 } elseif (isAdmin()) {
        // Missing extension
        displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=user%}');