X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-points.php;h=fb050d655264151b139430836a6f13fe563bc4f7;hp=cf69736aad413f60309403d6193073fb585049f5;hb=cd951a117b88c07a2dcbf3e97587b4c370973b85;hpb=e8ca54fe91872ab95a6ffdc4f1268bf18889021d

diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index cf69736aad..fb050d6552 100644
--- 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, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -60,10 +60,19 @@ if (isExtensionInstalledAndNewer('bonus', '0.4.4')) $numDepths += 4;
 // Remember row count in constant
 $content['rowspan'] = ($numDepths * 2 + 15);
 
-// Init some vars...
-$content['total_points'] = '0';
-$content['total_referals'] = '0';
-$content['total_locked'] = '0';
+// 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';
+
+// And output variable
 $OUT = '';
 
 // Load ref levels
@@ -71,13 +80,24 @@ while ($data = SQL_FETCHARRAY($result_depths)) {
 	// Merge it together
 	$content = merge_array($content, $data);
 
-	// 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",
+	$result_points = SQL_QUERY_ESC("SELECT
+	p.`points`,
+	p.`order_points`,
+	p.`locked_points`,
+	p.`locked_order_points`,
+	r.`counter`
+FROM
+	`{?_MYSQL_PREFIX?}_user_points` AS p
+LEFT JOIN
+	`{?_MYSQL_PREFIX?}_refsystem` AS r
+ON
+	p.`userid`=r.`userid` AND
+	p.`ref_depth`=r.`level`
+WHERE
+	p.`userid`=%s AND
+	p.`ref_depth`=%s
+LIMIT 1",
 		array(
 			getMemberId(),
 			bigintval($content['level'])
@@ -88,33 +108,17 @@ while ($data = SQL_FETCHARRAY($result_depths)) {
 		// Load data
 		$content = merge_array($content, SQL_FETCHARRAY($result_points));
 
-		// Add both points
-		$content['total_points'] += $content['points'];
-		$content['total_locked'] += $content['locked_points'];
+		// Add all entries
+		$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'];
+		$content['part_referals']     += $content['counter'];
 	} // 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__);
-
-	// Do we have an entry?
-	if (SQL_NUMROWS($result_refs) == 1) {
-		// Load data
-		$content = merge_array($content, SQL_FETCHARRAY($result_refs));
-
-		// Add them to total refs
-		$content['total_referals'] += $content['counter'];
-	} // END - if
-
-	// Free result
-	SQL_FREERESULT($result_refs);
-
 	// Output row
 	$OUT .= loadTemplate('member_points_row', true, $content);
 } // END - while
@@ -126,10 +130,12 @@ SQL_FREERESULT($result_depths);
 $content['rows'] = $OUT;
 
 // Remember several values in constants
-$content['total_points']  = ($content['total_points'] - getUserData('used_points'));
+$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');
+if (isExtensionInstalledAndOlder('bonus', '0.4.4')) {
+	setConfigEntry('bonus_active', 'X');
+} // END - if
 
 // Members shall see no special rows here
 $content['special_rows'] = '';
@@ -137,7 +143,7 @@ $content['special_rows'] = '';
 // Display login bonus and turbo-click bonus
 if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonus')) && (isBonusRallyeActive())) {
 	// Total bonus points
-	$content['total'] = getUserData('turbo_bonus') + getUserData('login_bonus') + getUserData('bonus_ref') + getUserData('bonus_order') + getUserData('bonus_stats');
+	$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);
@@ -155,15 +161,15 @@ if (isExtensionActive('user')) {
 	loadTemplate('member_points', false, $content);
 } elseif (isAdmin()) {
 	// Missing extension
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('user'));
+	displayMessage(generateExtensionInactiveNotInstalledMessage('user'));
 } else {
 	// Message for user
-	loadTemplate('admin_settings_saved', false, '{--PROBLEM_POINTS_OVERVIEW_UNAVAILABLE--}');
+	displayMessage('{--PROBLEM_POINTS_OVERVIEW_UNAVAILABLE--}');
 }
 
 if (isExtensionActive('payout')) {
 	// Payput extension is installed and active so we can check if the user has enougth points
-	outputPayoutList($content['total_points'] - getUserData('used_points'));
+	outputPayoutList($content['part_points'] - getUserData('used_points'));
 } // END - if
 
 // [EOF]