X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fmember%2Fwhat-points.php;h=59abf34a1342ddd2287bc1b34aad924ac040d5d0;hb=7b0f17cd637e388049d2167811e4332cec1e979b;hp=bebd685edf13ccffe4f72410d87b1f1ce7700ce8;hpb=60494e212a67fe360bfbb481eb4928480a6f379b;p=mailer.git

diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php
index bebd685edf..59abf34a13 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                  *
@@ -32,73 +37,64 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+if (!defined('__SECURITY')) {
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
-}
- elseif (!IS_LOGGED_IN())
-{
-	LOAD_URL("modules.php?module=index");
+} elseif (!IS_MEMBER()) {
+	redirectToUrl('modules.php?module=index');
 }
 
 // Add description as navigation point
-ADD_DESCR("member", basename(__FILE__));
+ADD_DESCR('member', __FILE__);
 
-OPEN_TABLE("100%", "member_content member_content_align", "");
-$result_depths = SQL_QUERY("SELECT level, percents FROM "._MYSQL_PREFIX."_refdepths ORDER BY level", __FILE__, __LINE__);
+$result_depths = SQL_QUERY("SELECT level, percents FROM `{!_MYSQL_PREFIX!}_refdepths` ORDER BY level", __FILE__, __LINE__);
 $depths = SQL_NUMROWS($result_depths);
 
 // Add many more rows for the login/turbo/ref/order bonus
-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;
+// @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;
 
 // Remember row count in constant
 define('__ROWS_VALUE', ($depths*2+15));
 
 // Init some vars...
-$TPTS = "0"; $TREF = "0"; $TLOCK = "0"; $OUT = "";
+$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";
+	$REFS = 0;
 
-	// Load referral points
-	$result_points = SQL_QUERY_ESC("SELECT points, locked_points FROM "._MYSQL_PREFIX."_user_points WHERE userid=%d AND ref_depth=%d LIMIT 1", array($GLOBALS['userid'], bigintval($lvl)), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result_points) == 1)
-	{
-		list($points, $LOCKED) = SQL_FETCHROW($result_points);
+	// 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(getUserId(), bigintval($content['level'])), __FILE__, __LINE__);
+	if (SQL_NUMROWS($result_points) == 1) {
+		list($points, $locked) = SQL_FETCHROW($result_points);
 		SQL_FREERESULT($result_points);
 		// Also count locked points
-		$TPTS += $points; $TLOCK += $LOCKED;
-	}
-	 else
-	{
-		$points = "0.00000"; $LOCKED = "0.00000";
+		$TPTS += $points; $TLOCK += $locked;
+	} else {
+		$points = "0.00000"; $locked = "0.00000";
 	}
 
-	// Load referral counts
-	$result_refs = SQL_QUERY_ESC("SELECT counter FROM "._MYSQL_PREFIX."_refsystem WHERE userid=%d AND level='%s' LIMIT 1", array($GLOBALS['userid'], bigintval($lvl)), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result_refs) == 1)
-	{
+	// Load referal counts
+	$result_refs = SQL_QUERY_ESC("SELECT counter FROM `{!_MYSQL_PREFIX!}_refsystem` WHERE userid=%s AND level='%s' LIMIT 1",
+		array(getUserId(), bigintval($content['level'])), __FILE__, __LINE__);
+	if (SQL_NUMROWS($result_refs) == 1) {
 		list($REFS) = SQL_FETCHROW($result_refs);
 		SQL_FREERESULT($result_refs);
 		$TREF += $REFS;
-	}
-	 else
-	{
-		$REFS = "0";
+	} else {
+		$REFS = 0;
 	}
 
 	// Transfer data to array for template
 	$content = array(
-		'lvl'    => $lvl,
-		'per'    => $per,
-		'points' => TRANSLATE_COMMA($points),
-		'refs'   => $REFS,
+		'lvl'    => $content['level'],
+		'per'    => translateComma($content['percents']),
+		'points' => translateComma($points),
+		'refs'   => translateComma($REFS),
 	);
 
 	// Output row
@@ -111,94 +107,82 @@ SQL_FREERESULT($result_depths);
 // Put rows to constant for the main template
 define('__REF_LEVEL_ROWS', $OUT);
 
-$result = SQL_QUERY_ESC("SELECT used_points, ref_payout FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1",
- array($GLOBALS['userid']), __FILE__, __LINE__);
+$result = SQL_QUERY_ESC("SELECT used_points, ref_payout FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+	array(getUserId()), __FILE__, __LINE__);
 list($USED, $PAY) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
 // Initialize variables
-$CONFIRMED = "---"; $SENT = "---"; $RECEIVED = "---";
+$CONFIRMED = '---'; $SENT = '---'; $RECEIVED = '---';
 
 // Only user >= v0.1.2: Fetch confirmed mails counter
-if (GET_EXT_VERSION("user") >= "0.1.2")
-{
-	$ADD = "";
-	if (GET_EXT_VERSION("user") >= "0.1.4")
-	{
-		$ADD = ", emails_sent, emails_received";
+if (GET_EXT_VERSION('user') >= '0.1.2') {
+	$add = '';
+	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=%d 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);
 
 	// Please update the user extension if you see 3 dashes
-	if (empty($SENT))     $SENT     = "---";
-	if (empty($RECEIVED)) $RECEIVED = "---";
-}
- else
-{
+	if (empty($SENT))     $SENT     = '---';
+	if (empty($RECEIVED)) $RECEIVED = '---';
+} else {
 	// Please update!
-	$CONFIRMED = "---";
+	$CONFIRMED = '---';
 }
 
 // If TLOCK is 0 add 3 zeros for floating
-if ($TLOCK == "0") $TLOCK = "0.00000";
+if ($TLOCK == '0') $TLOCK = "0.00000";
 
 // Remember several values in constants
-define('__USED_VALUE' , TRANSLATE_COMMA($USED));
-define('__TPTS_VALUE' , TRANSLATE_COMMA($TPTS - $USED));
+define('__USED_VALUE' , translateComma($USED));
+define('__TPTS_VALUE' , translateComma($TPTS - $USED));
 define('__TREF_VALUE' , $TREF);
-define('__TLOCK_VALUE', TRANSLATE_COMMA($TLOCK));
+define('__TLOCK_VALUE', translateComma($TLOCK));
 
 // Fixes a bug when there is no bonus extension installed
-if (GET_EXT_VERSION("bonus") < "0.4.4") $_CONFIG['bonus_active'] = "X";
+if (EXT_VERSION_IS_OLDER('bonus', '0.4.4')) setConfigEntry('bonus_active', "X");
 
 // Display login bonus and turbo-click bonus
-if ((GET_EXT_VERSION("bonus") >= "0.2.2") && (EXT_IS_ACTIVE("bonus")) && ($_CONFIG['bonus_active'] == 'Y'))
-{
-	$ADD = ", 0, 0, 0";
-	if (GET_EXT_VERSION("bonus") >= "0.4.4") $ADD = ", bonus_ref, bonus_order, bonus_stats";
+if ((GET_EXT_VERSION('bonus') >= '0.2.2') && (EXT_IS_ACTIVE('bonus')) && (getConfig('bonus_active') == 'Y')) {
+	$add = ", 0, 0, 0";
+	if (GET_EXT_VERSION('bonus') >= '0.4.4') $add = ", bonus_ref, bonus_order, bonus_stats";
 
 	// Load data
-	$result = SQL_QUERY_ESC("SELECT login_bonus, turbo_bonus".$ADD." FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1",
-	 array($GLOBALS['userid']), __FILE__, __LINE__);
+	$result = SQL_QUERY_ESC("SELECT login_bonus, turbo_bonus".$add." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+		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);
 	SQL_FREERESULT($result);
 
 	// Prepare constants
-	define('__TURBO_VALUE',  TRANSLATE_COMMA($turbo));
-	define('__LOGIN_VALUE',  TRANSLATE_COMMA($login));
-
-	if (GET_EXT_VERSION("bonus") >= "0.4.4")
-	{
-		// Add referral, stats and order bonys
-		define('__REF_VALUE'  ,  TRANSLATE_COMMA($ref));
-		define('__ORDER_VALUE',  TRANSLATE_COMMA($order));
-		define('__STATS_VALUE',  TRANSLATE_COMMA($stats));
+	define('__TURBO_VALUE',  translateComma($turbo));
+	define('__LOGIN_VALUE',  translateComma($login));
+
+	if (GET_EXT_VERSION('bonus') >= '0.4.4') {
+		// Add referal, stats and order bonys
+		define('__REF_VALUE'  ,  translateComma($ref));
+		define('__ORDER_VALUE',  translateComma($order));
+		define('__STATS_VALUE',  translateComma($stats));
 	}
 
 	// Total bonus points
-	define('__TTOTAL_VALUE', TRANSLATE_COMMA($turbo + $login + $ref + $order + $stats));
+	define('__TTOTAL_VALUE', translateComma($turbo + $login + $ref + $order + $stats));
 
 	// Output rows
 	define('__SPECIAL_ROWS', LOAD_TEMPLATE("member_points_bonus_rows", true));
-}
- elseif ($_CONFIG['bonus_active'] == 'N')
-{
+} elseif (getConfig('bonus_active') != 'Y') {
 	// Bonus active rallye deactivated
 	define('__SPECIAL_ROWS', LOAD_TEMPLATE("member_points_bonus_disabled", true));
-}
- elseif ((IS_ADMIN()) && (GET_EXT_VERSION("bonus") < "0.2.2") && (EXT_IS_ACTIVE("bonus")))
-{
+} elseif ((IS_ADMIN()) && (EXT_VERSION_IS_OLDER('bonus', '0.2.2')) && (EXT_IS_ACTIVE('bonus'))) {
 	// Please upgrade your bonus extension to v0.2.2 or newer!
 	define('__SPECIAL_ROWS', LOAD_TEMPLATE("member_points_upgrade"));
-}
- else
-{
+} else {
 	// Members shall see no special rows here
-	define('__SPECIAL_ROWS', "");
+	define('__SPECIAL_ROWS', '');
 }
 
 // Remeber values for the final template
@@ -208,27 +192,21 @@ define('__RECEIVE_VALUE'  , $RECEIVED);
 define('__SENT_VALUE'     , $SENT);
 
 // Load final template
-if (EXT_IS_ACTIVE("user")) {
+if (EXT_IS_ACTIVE('user')) {
 	// Load template when required extension is there
 	LOAD_TEMPLATE("member_points");
 } elseif (IS_ADMIN()) {
 	// Missing extension
-	ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "user"));
+	addFatalMessage(__FILE__, __LINE__, sprintf(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"))
-{
+if (EXT_IS_ACTIVE('payout')) {
 	// Payput extension is installed and active so we can check if the user has enougth points
-	PAYOUT_OUTPUT_PAYOUT_LIST(str_replace(",", ".", ($TPTS - $USED)));
+	PAYOUT_OUTPUT_PAYOUT_LIST(convertCommaToDot(($TPTS - $USED)));
 }
-if (EXT_IS_ACTIVE("wernis"))
-{
-	// Payput extension is installed and active so we can check if the user has enougth points
-	WERNIS_OUTPUT_WERNIS_LIST(str_replace(",", ".", ($TPTS - $USED)));
-}
-CLOSE_TABLE();
+
 //
 ?>