X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_points.php;h=a37e7414d79b3e063fc2a30cc9bb60743fb59fba;hp=9af8f84fb0f098d961f4e996ea61f65bf870f721;hb=3f51c40f4fede87228216f9285b745a339e3891d;hpb=914d484ab057c32afea9c7cde1e1089cc44a5ce7

diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php
index 9af8f84fb0..a37e7414d7 100644
--- a/inc/modules/admin/what-config_points.php
+++ b/inc/modules/admin/what-config_points.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Einstellen der Willkommensgutschrift usw.        *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $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                  *
@@ -33,149 +38,163 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
-
-if (!empty($_GET['sub'])) {
-	switch ($_GET['sub'])
-	{
-	case "points":
-		if ((empty($_POST['points_register'])) || (empty($_POST['points_ref']))) {
-			unset($_POST['ok']);
-		}
-		break;
+ADD_DESCR('admin', __FILE__);
+
+// Init variables
+$message = '';
+
+// Is the 'sub' parameter set?
+if (REQUEST_ISSET_GET('sub')) {
+	// Yes, then do some sanity-checks
+	switch (REQUEST_GET('sub')) {
+		case 'points':
+			if ((!REQUEST_ISSET_POST(('points_register'))) || (!REQUEST_ISSET_POST(('points_ref')))) {
+				REQUEST_UNSET_POST('ok');
+			}
+			break;
 
-	case "ref":
-		if (isset($_GET['do'])) {
-			if (((empty($_POST['lvl'])) || (empty($_POST['perc']))) && ($_GET['do'] == "add")) {
-				unset($_POST['ok']);
+		case 'ref':
+			if (REQUEST_ISSET_GET('do')) {
+				if (((!REQUEST_ISSET_POST(('lvl'))) || (!REQUEST_ISSET_POST(('perc')))) && (REQUEST_GET('do') == 'add')) {
+					REQUEST_UNSET_POST('ok');
+				}
 			}
-		}
-		break;
+			break;
 	}
 } else {
 	// Display overview
-	$_GET['sub'] = "overview";
+	REQUEST_SET_GET('sub', 'overview');
 }
 
-if (isset($_POST['ok'])) {
-	$SQLs = array();
-	switch ($_GET['sub'])
-	{
-	case "points":
-		$SQLs[] = "UPDATE `"._MYSQL_PREFIX."_config` SET points_register='".$_POST['points_register']."', points_ref='".$_POST['points_ref']."' WHERE config=0 LIMIT 1";
-		break;
-
-	case "ref":
-		switch ($_GET['do'])
-		{
-		case "add":
-			$SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_refdepths (level, percents) VALUES ('".$_POST['lvl']."','".$_POST['perc']."')";
+if (isFormSent()) {
+	INIT_SQLS();
+	switch (REQUEST_GET('sub')) {
+		case 'points':
+			ADD_SQL("UPDATE `{!_MYSQL_PREFIX!}_config` SET points_register='".REQUEST_POST('points_register')."', points_ref='".REQUEST_POST('points_ref')."' WHERE config=0 LIMIT 1");
 			break;
 
-		case "edit": // Change entries
-			foreach ($_POST['lvl'] as $id => $value) {
-				// Secure ID
-				$id = bigintval($id);
-
-				// Revert german commata
-				$_POST['perc'][$id] = REVERT_COMMA($_POST['perc'][$id]);
-
-				// Update entry
-				SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_refdepths SET level='%s', percents='%s' WHERE id=%s LIMIT 1",
-					array(bigintval($value), $_POST['perc'][$id], $id), __FILE__, __LINE__);
+		case 'ref':
+			switch (REQUEST_GET('do'))
+			{
+				case 'add':
+					ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_refdepths` (level, percents) VALUES ('".REQUEST_POST('lvl')."','".REQUEST_POST('perc')."')");
+					break;
+
+				case 'edit': // Change entries
+					foreach (REQUEST_POST('lvl') as $id => $value) {
+						// Secure ID
+						$id = bigintval($id);
+
+						// Revert german commata
+						REQUEST_SET_POST('perc', array($id => convertCommaToDot(REQUEST_POST('perc', $id))));
+
+						// Update entry
+						SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_refdepths` SET level='%s', percents='%s' WHERE `id`=%s LIMIT 1",
+						array(bigintval($value), REQUEST_POST('perc', $id), $id), __FILE__, __LINE__);
+					}
+					$message = getMessage('REF_DEPTHS_SAVED');
+					break;
+
+				case 'del':
+					foreach (REQUEST_POST('id') as $id => $value) {
+						SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_refdepths` WHERE `id`=%s LIMIT 1",
+						array(bigintval($id)), __FILE__, __LINE__);
+					}
+					$message = getMessage('REF_DEPTHS_DELETED');
+					break;
 			}
-			$TEXT = REF_DEPTHS_SAVED;
-			break;
 
-		case "del":
-			foreach ($_POST['id'] as $id => $value) {
-				SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_refdepths WHERE id=%s LIMIT 1",
-					array(bigintval($id)), __FILE__, __LINE__);
+			// Update cache file
+			if (GET_EXT_VERSION('cache') >= '0.1.2') {
+				if ($GLOBALS['cache_instance']->loadCacheFile("refdepths")) $GLOBALS['cache_instance']->destroyCacheFile();
 			}
-			$TEXT = REF_DEPTHS_DELETED;
 			break;
-		}
 
-		// Update cache file
-		if (GET_EXT_VERSION("cache") >= "0.1.2") {
-			if ($cacheInstance->loadCacheFile("refdepths")) $cacheInstance->destroyCacheFile();
-		}
-		break;
-
-	case "settings":
-		$REF = bigintval($_POST['ref_payout']);
-		$SQLs[] = sprintf("UPDATE `"._MYSQL_PREFIX."_config` SET
+				case "settings":
+					$REF = bigintval(REQUEST_POST('ref_payout'));
+					ADD_SQL(sprintf("UPDATE `{!_MYSQL_PREFIX!}_config` SET
 allow_direct_pay='%s',
 reg_points_mode='%s',
 ref_payout='%s'
 WHERE config=0 LIMIT 1",
- $_POST['allow_direct_pay'],
- $_POST['reg_points_mode'],
- $REF
-		);
-		if ((getConfig('ref_payout') == 0) && ($_POST['ref_payout'] > 0))
-		{
-			// Update account's ref_payout for "must-confirm"
-			$SQLs[] = sprintf("UPDATE `"._MYSQL_PREFIX."_user_data` SET ref_payout=(%s - mails_confirmed)
-WHERE mails_confirmed < %s", $REF, $REF);
-		}
-		 elseif ((getConfig('ref_payout') > 0) && ($_POST['ref_payout'] == 0))
-		{
-			// Update account's ref_payout for "not-must-confirm"
-			$SQLs[] = "UPDATE `"._MYSQL_PREFIX."_user_data` SET ref_payout=0 WHERE ref_payout > 0";
-			$SQLs[] = "UPDATE "._MYSQL_PREFIX."_user_points SET points=points+locked_points WHERE locked_points>0";
-			$SQLs[] = "UPDATE "._MYSQL_PREFIX."_user_points SET locked_points=0 WHERE locked_points>0";
-		}
-		break;
+					REQUEST_POST('allow_direct_pay'),
+					REQUEST_POST('reg_points_mode'),
+					$REF
+					));
+					if ((getConfig('ref_payout') == 0) && (REQUEST_POST('ref_payout') > 0)) {
+						// Update account's ref_payout for "must-confirm"
+						ADD_SQL(sprintf("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET ref_payout=(%s - mails_confirmed)
+WHERE mails_confirmed < %s", $REF, $REF));
+					} elseif ((getConfig('ref_payout') > 0) && (REQUEST_POST('ref_payout') == 0)) {
+						// Update account's ref_payout for "not-must-confirm"
+						ADD_SQL("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET ref_payout=0 WHERE ref_payout > 0");
+						ADD_SQL("UPDATE `{!_MYSQL_PREFIX!}_user_points` SET points=points+locked_points WHERE locked_points>0");
+						ADD_SQL("UPDATE `{!_MYSQL_PREFIX!}_user_points` SET locked_points=0 WHERE locked_points>0");
+					}
+					break;
 	}
 
-	if ((isset($SQLs)) && (is_array($SQLs)) && (!empty($SQLs[0]))) {
-		if (strpos($SQLs[0], "INSERT") > -1)
-		{
-			$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_refdepths WHERE level='%s' LIMIT 1",
-				array(bigintval($_POST['lvl'])), __FILE__, __LINE__);
+	if ((IS_SQLS_VALID()) && (IS_SQLS_VALID())) {
+		if (strpos($GLOBALS['sqls'][0], "INSERT") > -1) {
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_refdepths` WHERE level='%s' LIMIT 1",
+			array(bigintval(REQUEST_POST('lvl'))), __FILE__, __LINE__);
 			SQL_FREERESULT($result);
-		}
-		if (count($SQLs) > 0) {
+		} // END - if
+
+		if (COUNT_SQLS() > 0) {
 			// Run all SQL commands
-			RUN_FILTER('run_sqls', array('dry_run' => false, 'sqls' => $SQLs));
+			runFilterChain('run_sqls');
 
-			$content = "<SPAN class=\"admin_done\">".SETTINGS_SAVED."</SPAN>";
+			// Entry saved...
+			$message = getMessage('SETTINGS_SAVED');
 
 			// Destroy config cache file here...
-			REBUILD_CACHE("config", "config");
+			rebuildCacheFiles("config", "config");
 		} else {
-			$content = "<SPAN class=\"admin_failed\">".SETTINGS_NOT_SAVED."</SPAN>";
+			// Prepare failed-message
+			$message = "<span class=\"admin_failed\">{--SETTINGS_NOT_SAVED--}</span>";
 		}
-		unset($SQLs);
-		LOAD_TEMPLATE("admin_settings_saved", false, $content);
-	} elseif (isset($TEXT)) {
-		LOAD_TEMPLATE("admin_settings_saved", false, $TEXT);
+
+		// Remove SQL queries
+		UNSET_SQLS();
+	}
+
+	// Shall we display a message?
+	if (!empty($message)) {
+		// When do so...
+		LOAD_TEMPLATE('admin_settings_saved', false, $message);
 	}
-} elseif ($_GET['sub'] == "settings") {
+} elseif (REQUEST_GET('sub') == "settings") {
 	// Setup some settings like direct pay and so on
 	// Including new add-mode for one-time referal bonus
 	switch (getConfig('allow_direct_pay')) {
-	case "Y":
-		define('__DIRECT_Y', " checked=\"checked\"");
-		define('__DIRECT_N', "");
-		break;
-
-	case "N":
-		define('__DIRECT_Y', "");
-		define('__DIRECT_N', " checked=\"checked\"");
-		break;
+		case 'Y':
+			define('__DIRECT_Y', ' checked="checked"');
+			define('__DIRECT_N', '');
+			break;
+
+		case 'N':
+			define('__DIRECT_Y', '');
+			define('__DIRECT_N', ' checked="checked"');
+			break;
 	}
 
 	// One-time referal bonus add-mode
 	switch (getConfig('reg_points_mode')) {
-		case "ref"   : define('__MODE_REF', " checked=\"checked\""); define('__MODE_DIRECT', "");         break;
-		case "direct": define('__MODE_REF', "");         define('__MODE_DIRECT', " checked=\"checked\""); break;
+		case 'ref'   :
+			define('__MODE_REF', ' checked="checked"');
+			define('__MODE_DIRECT', '');
+			break;
+
+		case 'direct':
+			define('__MODE_REF', '');
+			define('__MODE_DIRECT', ' checked="checked"');
+			break;
 	}
 
 	// Referal payout value
@@ -183,13 +202,14 @@ WHERE mails_confirmed < %s", $REF, $REF);
 
 	// Load template
 	LOAD_TEMPLATE("admin_config_point_settings");
-} elseif ($_GET['sub'] == "ref") {
-	if ((isset($_POST['del'])) && ((SELECTION_COUNT($_POST['sel']) > 0) || (isset($_POST['sel'][0])))) {
+} elseif (REQUEST_GET('sub') == "ref") {
+	// 12                  3     32    2                  3     32    2               3            4     43    21
+	if ((REQUEST_ISSET_POST('del')) && (REQUEST_ISSET_POST('sel')) && (countPostSelection() > 0)) {
 		// Delete entries
-		$SW = 2; $OUT = "";
-		foreach ($_POST['sel'] as $id => $value) {
-			$result = SQL_QUERY_ESC("SELECT level, percents FROM "._MYSQL_PREFIX."_refdepths WHERE id=%s LIMIT 1",
-				array(bigintval($id)), __FILE__, __LINE__);
+		$OUT = ''; $SW = 2;
+		foreach (REQUEST_POST('sel') as $id => $value) {
+			$result = SQL_QUERY_ESC("SELECT level, percents FROM `{!_MYSQL_PREFIX!}_refdepths` WHERE `id`=%s LIMIT 1",
+			array(bigintval($id)), __FILE__, __LINE__);
 			list($lvl, $perc) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
 
@@ -198,7 +218,7 @@ WHERE mails_confirmed < %s", $REF, $REF);
 				'sw'  => $SW,
 				'id'  => $id,
 				'lvl' => $lvl,
-				'per' => TRANSLATE_COMMA($perc),
+				'per' => translateComma($perc),
 			);
 
 			// Load row template and switch color
@@ -209,12 +229,12 @@ WHERE mails_confirmed < %s", $REF, $REF);
 
 		// Load main template
 		LOAD_TEMPLATE("admin_points_del");
-	} elseif ((isset($_POST['edit'])) && ((SELECTION_COUNT($_POST['sel']) > 0) || (isset($_POST['sel'][0])))) {
+	} elseif ((REQUEST_ISSET_POST('edit')) && (REQUEST_ISSET_POST('sel')) && (countPostSelection() > 0)) {
 		// Edit entries
-		$SW = 2; $OUT = "";
-		foreach ($_POST['sel'] as $id => $value) {
-			$result = SQL_QUERY_ESC("SELECT level, percents FROM "._MYSQL_PREFIX."_refdepths WHERE id=%s LIMIT 1",
-			 array(bigintval($id)), __FILE__, __LINE__);
+		$OUT = ''; $SW = 2;
+		foreach (REQUEST_POST('sel') as $id => $value) {
+			$result = SQL_QUERY_ESC("SELECT level, percents FROM `{!_MYSQL_PREFIX!}_refdepths` WHERE `id`=%s LIMIT 1",
+			array(bigintval($id)), __FILE__, __LINE__);
 			list($lvl, $perc) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
 
@@ -223,7 +243,7 @@ WHERE mails_confirmed < %s", $REF, $REF);
 				'sw'  => $SW,
 				'id'  => $id,
 				'lvl' => $lvl,
-				'per' => TRANSLATE_COMMA($perc),
+				'per' => translateComma($perc),
 			);
 
 			// Load row template and switch color
@@ -236,23 +256,24 @@ WHERE mails_confirmed < %s", $REF, $REF);
 		LOAD_TEMPLATE("admin_points_edit");
 	} else {
 		// Referal levels
-		$result = SQL_QUERY("SELECT id, level, percents FROM "._MYSQL_PREFIX."_refdepths ORDER BY level", __FILE__, __LINE__);
+		$result = SQL_QUERY("SELECT `id`, `level`, `percents` FROM `{!_MYSQL_PREFIX!}_refdepths` ORDER BY `level` ASC", __FILE__, __LINE__);
 		if (SQL_NUMROWS($result) > 0) {
 			// Make referal levels editable and deletable
-			$SW = 2; $OUT = "";
+			$OUT = ''; $SW = 2;
 
 			// List already existing categories for editing
-			while (list($id, $lvl, $perc) = SQL_FETCHROW($result)) {
+			while ($content = SQL_FETCHARRAY($result)) {
 				// Prepare data for the row template
+				// @TODO Rewritings: lvl->level, per->percents in template
 				$content = array(
 					'sw'  => $SW,
-					'id'  => $id,
-					'lvl' => $lvl,
-					'per' => TRANSLATE_COMMA($perc),
+					'id'  => $content['id'],
+					'lvl' => $content['level'],
+					'per' => translateComma($content['percents']),
 				);
 
 				// Load row template and switch color
-				$OUT .= LOAD_TEMPLATE("admin_points_row", true, $content);
+				$OUT .= LOAD_TEMPLATE('admin_points_row', true, $content);
 				$SW = 3 - $SW;
 			}
 
@@ -261,22 +282,22 @@ WHERE mails_confirmed < %s", $REF, $REF);
 			define('__LEVEL_ROWS', $OUT);
 
 			// Load main template
-			LOAD_TEMPLATE("admin_points");
+			LOAD_TEMPLATE('admin_points');
 		}
 
 		// Form for adding new referal levels
-		LOAD_TEMPLATE("admin_add_reflvl");
+		LOAD_TEMPLATE('admin_add_reflvl');
 	}
-} elseif ($_GET['sub'] == "points") {
+} elseif (REQUEST_GET('sub') == 'points') {
 	// First points for registration and other fixed points including new add-mode for one-time referal bonus...
 	define('P_REG_VALUE', getConfig('points_register'));
 	define('P_REF_VALUE', getConfig('points_ref'));
 
 	// Load templates
-	LOAD_TEMPLATE("admin_config_sub_points");
+	LOAD_TEMPLATE('admin_config_sub_points');
 } else {
 	// Display selection box
-	LOAD_TEMPLATE("admin_config_points");
+	LOAD_TEMPLATE('admin_config_points');
 }
 
 //