Adding of request parameters partialy finished

[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 152bd3cef7aa66e70343ca8ea67f9a77c7214cde..38ae7595f088fd2ad529288bd355349add8a9663 100644 (file)
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -53,45 +53,63 @@ $depths = 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')) $depths += 1;
-if (getExtensionVersion('bonus') >= '0.2.2') $depths += 6;
-if (getExtensionVersion('bonus') >= '0.4.4') $depths += 4;
+if (isExtensionInstalledAndNewer('bonus', '0.2.2')) $depths += 6;
+if (isExtensionInstalledAndNewer('bonus', '0.4.4')) $depths += 4;
 
 // Remember row count in constant
 $content['rowspan'] = ($depths*2+15);
 
 // Init some vars...
-$totalPoints = '0'; $TREF = '0'; $TLOCK = '0'; $OUT = '';
+$totalPoints = '0';
+$totalReferals = '0';
+$totalLocked = '0';
+$OUT = '';
 
 // Load ref levels
 while ($data = SQL_FETCHARRAY($result_depths)) {
        // Merge it together
        $content = merge_array($content, $data);
 
-       // Initialize ref-count
-       $REFS = '0';
+       // Initialize array elements
+       $content['counter'] = '0';
+       $content['points'] = '0.00000';
+       $content['locked_points'] = '0.00000';
 
        // Load referal points
-       $result_points = SQL_QUERY_ESC("SELECT `points`, `locked_points` FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s AND `ref_depth`='%s' LIMIT 1", array(getMemberId(), bigintval($content['level'])), __FILE__, __LINE__);
+       $result_points = SQL_QUERY_ESC("SELECT `points`, `locked_points` FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s AND `ref_depth`='%s' LIMIT 1",
+               array(
+                       getMemberId(),
+                       bigintval($content['level'])
+               ), __FILE__, __LINE__);
+
+       // Do we have an entry?
        if (SQL_NUMROWS($result_points) == 1) {
-                       list($points, $locked) = SQL_FETCHROW($result_points);
-               // Also count locked points
-               $totalPoints += $points; $TLOCK += $locked;
-       } else {
-               $points = '0.00000'; $locked = '0.00000';
-       }
+               // Load data
+               $content = merge_array($content, SQL_FETCHARRAY($result_points));
+
+               // Add both points
+               $totalPoints += $content['points'];
+               $totalLocked += $content['locked_points'];
+       } // END - if
 
        // Free result
        SQL_FREERESULT($result_points);
 
        // Load referal counts
        $result_refs = SQL_QUERY_ESC("SELECT `counter` FROM `{?_MYSQL_PREFIX?}_refsystem` WHERE `userid`=%s AND `level`='%s' LIMIT 1",
-               array(getMemberId(), bigintval($content['level'])), __FILE__, __LINE__);
+               array(
+                       getMemberId(),
+                       bigintval($content['level'])
+               ), __FILE__, __LINE__);
+
+       // Do we have an entry?
        if (SQL_NUMROWS($result_refs) == 1) {
-               list($REFS) = SQL_FETCHROW($result_refs);
-               $TREF += $REFS;
-       } else {
-               $REFS = '0';
-       }
+               // Load data
+               $content = merge_array($content, SQL_FETCHARRAY($result_refs));
+
+               // Add them to total refs
+               $totalReferals += $content['counter'];
+       } // END - if
 
        // Free result
        SQL_FREERESULT($result_refs);
@@ -100,8 +118,8 @@ while ($data = SQL_FETCHARRAY($result_depths)) {
        $row = array(
                'level'    => $content['level'],
                'percents' => translateComma($content['percents']),
-               'points'   => translateComma($points),
-               'refs'     => translateComma($REFS),
+               'points'   => translateComma($content['points']),
+               'refs'     => translateComma($content['counter']),
        );
 
        // Output row
@@ -114,17 +132,11 @@ SQL_FREERESULT($result_depths);
 // Put rows to constant for the main template
 $content['rows'] = $OUT;
 
-// Fetch user account
-if (!fetchUserData(getMemberId())) {
-       // Something really bad happened
-       debug_report_bug('User account ' . getMemberId() . ' not found.');
-} // END - if
-
 // Initialize variables
 $CONFIRMED = '---'; $SENT = '---'; $RECEIVED = '---';
 
 // Only user >= v0.1.2: Fetch confirmed mails counter
-if (getExtensionVersion('user') >= '0.1.2') {
+if (isExtensionInstalledAndNewer('user', '0.1.2')) {
        $add = '';
        $CONFIRMED = getUserData('mails_confirmed');
 
@@ -142,22 +154,21 @@ if (getExtensionVersion('user') >= '0.1.2') {
 }
 
 // If TLOCK is 0 add 3 zeros for floating
-if ($TLOCK == '0') $TLOCK = '0.00000';
+if ($totalLocked == '0') $totalLocked = '0.00000';
 
 // Remember several values in constants
-$content['used']  = translateComma(getUserData('used_points'));
 $content['sum']   = translateComma($totalPoints - getUserData('used_points'));
-$content['tref']  = $TREF;
-$content['tlock'] = translateComma($TLOCK);
+$content['tref']  = $totalReferals;
+$content['tlock'] = translateComma($totalLocked);
 
 // Fixes a bug when there is no bonus extension installed
-if (isExtensionOlder('bonus', '0.4.4')) setConfigEntry('bonus_active', "X");
+if (isExtensionInstalledAndOlder('bonus', '0.4.4')) setConfigEntry('bonus_active', "X");
 
 // Members shall see no special rows here
 $content['special_rows'] = '';
 
 // Display login bonus and turbo-click bonus
-if ((getExtensionVersion('bonus') >= '0.2.2') && (isExtensionActive('bonus')) && (getConfig('bonus_active') == 'Y')) {
+if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonus')) && (getConfig('bonus_active') == 'Y')) {
        // Fetch some data and init others (to avoid a notice here)
        $content['login'] = getUserData('login_bonus');
        $content['turbo'] = getUserData('turbo_bonus');
@@ -188,7 +199,7 @@ if ((getExtensionVersion('bonus') >= '0.2.2') && (isExtensionActive('bonus')) &&
 
        // Output rows
        $content['special_rows'] = loadTemplate('member_points_bonus_rows', true, $content);
-} elseif (getConfig('bonus_active') != 'Y') {
+} elseif ((isExtensionActive('bonus')) && (getConfig('bonus_active') != 'Y')) {
        // Bonus active rallye deactivated
        $content['special_rows'] = loadTemplate('member_points_bonus_disabled', true);
 } elseif ((isAdmin()) && (isExtensionOlder('bonus', '0.2.2')) && (isExtensionActive('bonus'))) {
@@ -198,7 +209,6 @@ if ((getExtensionVersion('bonus') >= '0.2.2') && (isExtensionActive('bonus')) &&
 
 // Remeber values for the final template
 $content['receive']   = $RECEIVED;
-$content['pay']       = getUserData('ref_payout');
 $content['confirmed'] = $CONFIRMED;
 $content['sent']      = $SENT;