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 563eab9f39e225bf86089a8da62c64400a19c0d2..a1e39d5cdf184121f40eea2845c7cb7dd3430d43 100644 (file)
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       die();
+       exit();
 } elseif (!isMember()) {
        redirectToIndexMemberOnlyModule();
 }
@@ -45,17 +45,28 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 addYouAreHereLink('member', __FILE__);
 
+// Extension ext-user is highly required
+if ((!isExtensionActive('user')) && (!isAdmin())) {
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=user%}');
+       return;
+} // 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);
 
 // Add many more rows for the login/turbo/ref/order bonus
 // @TODO Should we rewrite this to a filter?
-if (!isExtensionActive('bonus')) $numDepths += 1;
-if (isExtensionInstalledAndNewer('bonus', '0.2.2')) $numDepths += 6;
-if (isExtensionInstalledAndNewer('bonus', '0.4.4')) $numDepths += 4;
+if (isExtensionActive('bonus')) {
+       // Extension ext-bonus is there, okay
+       if (isExtensionInstalledAndNewer('bonus', '0.2.2')) $numDepths += 6;
+       if (isExtensionInstalledAndNewer('bonus', '0.4.4')) $numDepths += 4;
+} else {
+       // Not installed ext-bonus
+       $numDepths += 1;
+}
 
 // Remember row count in constant
 $content['rowspan'] = ($numDepths * 2 + 15);
@@ -83,44 +94,47 @@ 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
-       p.`points`,
-       p.`order_points`,
-       p.`locked_points`,
-       p.`locked_order_points`,
-       r.`counter`
+       $result_points = SQL_QUERY_ESC('SELECT
+       ' . getAllPointColumns('p.', ',') . '
+       `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
-       ".$depth."
-LIMIT 1",
+       `p`.`userid`=%s AND
+       ' . $depth . '
+LIMIT 1',
                array(
                        getMemberId(),
                        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));
 
-               // Add all entries
+               // Add locked-/points
                $content['part_points']       += $content['points'];
-               $content['part_order']        += $content['order_points'];
                $content['part_locked']       += $content['locked_points'];
-               $content['part_locked_order'] += $content['locked_order_points'];
+
+               // For these columns, ext-order must be installed as well
+               if (isExtensionInstalled('order')) {
+                       $content['part_order']        += $content['order_points'];
+                       $content['part_locked_order'] += $content['locked_order_points'];
+               } // END - if
+
+               // Add referral counter
                $content['part_referrals']    += $content['counter'];
        } // END - if
 
@@ -128,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
@@ -154,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');
@@ -166,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%}');
@@ -175,6 +189,7 @@ if (isExtensionActive('user')) {
        displayMessage('{--PROBLEM_POINTS_OVERVIEW_UNAVAILABLE--}');
 }
 
+// Is ext-payout installed?
 if (isExtensionActive('payout')) {
        // Payput extension is installed and active so we can check if the user has enougth points
        outputPayoutList($content['part_points'] - getUserData('used_points'));