X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-points.php;h=3f653ba847a322928199e8d873df567cb27f2175;hb=e98608bf2a6208376d30996cf9152e1f091ac369;hp=ebbf566f0ad9d20d030e6185e8430de5dad10ac2;hpb=cc7c700143bca2420ff0497e648d31a18cc9add2;p=mailer.git

diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index ebbf566f0a..3f653ba847 100644
--- a/inc/modules/member/what-points.php
+++ b/inc/modules/member/what-points.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Alle Ihrer gesammelten Punkte                    *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -46,6 +51,7 @@ $result_depths = SQL_QUERY("SELECT level, percents FROM `{!_MYSQL_PREFIX!}_refde
 $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 (!EXT_IS_ACTIVE("bonus")) $depths += 1;
 if (GET_EXT_VERSION("bonus") >= "0.2.2") $depths += 6;
 if (GET_EXT_VERSION("bonus") >= "0.4.4") $depths += 4;
@@ -57,12 +63,12 @@ define('__ROWS_VALUE', ($depths*2+15));
 $TPTS = 0; $TREF = 0; $TLOCK = 0; $OUT = "";
 
 // Load ref levels
-while (list($lvl, $per) = SQL_FETCHROW($result_depths)) {
+while ($content = SQL_FETCHARRAY($result_depths)) {
 	// Initialize ref-count
 	$REFS = 0;
 
 	// Load referal points
-	$result_points = SQL_QUERY_ESC("SELECT points, locked_points FROM `{!_MYSQL_PREFIX!}_user_points` WHERE userid=%s AND ref_depth=%d LIMIT 1", array($GLOBALS['userid'], bigintval($lvl)), __FILE__, __LINE__);
+	$result_points = SQL_QUERY_ESC("SELECT points, locked_points FROM `{!_MYSQL_PREFIX!}_user_points` WHERE userid=%s AND ref_depth=%d LIMIT 1", array(getUserId(), bigintval($content['level'])), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result_points) == 1) {
 		list($points, $locked) = SQL_FETCHROW($result_points);
 		SQL_FREERESULT($result_points);
@@ -74,7 +80,7 @@ while (list($lvl, $per) = SQL_FETCHROW($result_depths)) {
 
 	// Load referal counts
 	$result_refs = SQL_QUERY_ESC("SELECT counter FROM `{!_MYSQL_PREFIX!}_refsystem` WHERE userid=%s AND level='%s' LIMIT 1",
-		array($GLOBALS['userid'], bigintval($lvl)), __FILE__, __LINE__);
+		array(getUserId(), bigintval($content['level'])), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result_refs) == 1) {
 		list($REFS) = SQL_FETCHROW($result_refs);
 		SQL_FREERESULT($result_refs);
@@ -85,8 +91,8 @@ while (list($lvl, $per) = SQL_FETCHROW($result_depths)) {
 
 	// Transfer data to array for template
 	$content = array(
-		'lvl'    => $lvl,
-		'per'    => TRANSLATE_COMMA($per),
+		'lvl'    => $content['level'],
+		'per'    => TRANSLATE_COMMA($content['percents']),
 		'points' => TRANSLATE_COMMA($points),
 		'refs'   => TRANSLATE_COMMA($REFS),
 	);
@@ -102,7 +108,7 @@ SQL_FREERESULT($result_depths);
 define('__REF_LEVEL_ROWS', $OUT);
 
 $result = SQL_QUERY_ESC("SELECT used_points, ref_payout FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-	array($GLOBALS['userid']), __FILE__, __LINE__);
+	array(getUserId()), __FILE__, __LINE__);
 list($USED, $PAY) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
@@ -115,7 +121,7 @@ if (GET_EXT_VERSION("user") >= "0.1.2") {
 	if (GET_EXT_VERSION("user") >= "0.1.4") {
 		$ADD = ", emails_sent, emails_received";
 	}
-	$result = SQL_QUERY_ESC("SELECT mails_confirmed".$ADD." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
+	$result = SQL_QUERY_ESC("SELECT mails_confirmed".$ADD." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
 	list($CONFIRMED, $SENT, $RECEIVED) = SQL_FETCHROW($result);
 	SQL_FREERESULT($result);
 
@@ -146,7 +152,7 @@ if ((GET_EXT_VERSION("bonus") >= "0.2.2") && (EXT_IS_ACTIVE("bonus")) && (getCon
 
 	// Load data
 	$result = SQL_QUERY_ESC("SELECT login_bonus, turbo_bonus".$ADD." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-		array($GLOBALS['userid']), __FILE__, __LINE__);
+		array(getUserId()), __FILE__, __LINE__);
 
 	// We don't add this points now. This will be done after each month
 	list($login, $turbo, $ref, $order, $stats) = SQL_FETCHROW($result);
@@ -191,10 +197,10 @@ if (EXT_IS_ACTIVE("user")) {
 	LOAD_TEMPLATE("member_points");
 } elseif (IS_ADMIN()) {
 	// Missing extension
-	addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "user"));
+	addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "user");
 } else {
 	// Message for user
-	LOAD_TEMPLATE("admin_settings_saved", false, PROBLEM_POINTS_OVERVIEW_UNAVAILABLE);
+	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('PROBLEM_POINTS_OVERVIEW_UNAVAILABLE'));
 }
 
 if (EXT_IS_ACTIVE("payout")) {