A lot has been rewritten, ext-teams added, ext-forced continued:

[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 fb050d655264151b139430836a6f13fe563bc4f7..c0e9f07c0906c3e44cbecbdd9df707cb92982903 100644 (file)
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 // Query for referal 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);
@@ -61,25 +61,33 @@ if (isExtensionInstalledAndNewer('bonus', '0.4.4')) $numDepths += 4;
 $content['rowspan'] = ($numDepths * 2 + 15);
 
 // Initialize array elements
-$content['part_points']        = '0.00000';
-$content['part_referals']      = '0';
-$content['part_locked']        = '0.00000';
-$content['part_order']         = '0.00000';
-$content['part_locked_order']  = '0.00000';
-$content['counter']             = '0';
-$content['points']              = '0.00000';
-$content['order_points']        = '0.00000';
-$content['locked_points']       = '0.00000';
-$content['locked_order_points'] = '0.00000';
+$content['part_points']         = '0.00000';
+$content['part_referals']       = '0';
+$content['part_locked']         = '0.00000';
+$content['part_order']          = '0.00000';
+$content['part_locked_order']   = '0.00000';
 
 // And output variable
 $OUT = '';
 
 // Load ref levels
 while ($data = SQL_FETCHARRAY($result_depths)) {
+       // Init points and counter here
+       $content['counter']             = '0';
+       $content['points']              = '0.00000';
+       $content['order_points']        = '0.00000';
+       $content['locked_points']       = '0.00000';
+       $content['locked_order_points'] = '0.00000';
+
        // Merge it together
        $content = merge_array($content, $data);
 
+       // Default for referal level > 0
+       $depth = 'p.`ref_depth`=%s';
+       if (is_null($content['level'])) {
+               $depth = 'p.`ref_depth` IS NULL';
+       } // END - if
+
        // Load referal points
        $result_points = SQL_QUERY_ESC("SELECT
        p.`points`,
@@ -96,11 +104,11 @@ ON
        p.`ref_depth`=r.`level`
 WHERE
        p.`userid`=%s AND
-       p.`ref_depth`=%s
+       ".$depth."
 LIMIT 1",
                array(
                        getMemberId(),
-                       bigintval($content['level'])
+                       makeZeroToNull($content['level'])
                ), __FILE__, __LINE__);
 
        // Do we have an entry?
@@ -126,12 +134,12 @@ LIMIT 1",
 // Free memory
 SQL_FREERESULT($result_depths);
 
+// Add userid
+$content['userid'] = getMemberId();
+
 // Put rows to constant for the main template
 $content['rows'] = $OUT;
 
-// Remember several values in constants
-$content['total_points'] = $content['part_points'] - getUserData('used_points') + $content['part_order'];
-
 // Fixes a bug when there is no bonus extension installed
 if (isExtensionInstalledAndOlder('bonus', '0.4.4')) {
        setConfigEntry('bonus_active', 'X');
@@ -150,7 +158,7 @@ if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonu
 } elseif ((isExtensionActive('bonus')) && (!isBonusRallyeActive())) {
        // Bonus active rallye deactivated
        $content['special_rows'] = loadTemplate('member_points_bonus_disabled', true);
-} elseif ((isAdmin()) && (isExtensionOlder('bonus', '0.2.2')) && (isExtensionActive('bonus'))) {
+} 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');
 }
@@ -161,7 +169,7 @@ if (isExtensionActive('user')) {
        loadTemplate('member_points', false, $content);
 } elseif (isAdmin()) {
        // Missing extension
-       displayMessage(generateExtensionInactiveNotInstalledMessage('user'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=user%}');
 } else {
        // Message for user
        displayMessage('{--PROBLEM_POINTS_OVERVIEW_UNAVAILABLE--}');