X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fmember%2Fwhat-payout.php;h=5c6e5e2c9ec04fa73a8f350ea070b36f6ba03ca6;hb=5071030af40e69ca4284642f44758964e18f5be8;hp=ab2147a05e14581e45d13b32d79502d38a1ede37;hpb=aa63aed07428a99ea09002c8d072990677700080;p=mailer.git

diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index ab2147a05e..5c6e5e2c9e 100644
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -43,9 +43,9 @@ if (!defined('__SECURITY')) {
 	require($INC);
 } elseif (!IS_MEMBER()) {
 	// Not logged in
-	LOAD_URL('modules.php?module=index');
+	redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('payout')) && (!IS_ADMIN())) {
-	addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'payout');
+	addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'payout'));
 	return;
 }
 
@@ -57,7 +57,7 @@ $TPTS = 0;
 while ($content = SQL_FETCHARRAY($result_depths)) {
 	// Load referal points
 	$result_points = SQL_QUERY_ESC("SELECT points FROM `{!_MYSQL_PREFIX_user_points!}` WHERE userid=%s AND ref_depth=%d LIMIT 1",
-		array(getUserId(), bigintval($content['level'])), __FILE__, __LINE__);
+	array(getUserId(), bigintval($content['level'])), __FILE__, __LINE__);
 
 	// Entry found?
 	if (SQL_NUMROWS($result_points) == 1) {
@@ -79,7 +79,7 @@ SQL_FREERESULT($result_depths);
 $USED = GET_TOTAL_DATA(getUserId(), "user_data", "used_points");
 
 // Translate point into comma
-$TPTS = TRANSLATE_COMMA($TPTS - $USED);
+$TPTS = translateComma($TPTS - $USED);
 
 // Sanity check...
 if (empty($TPTS)) $TPTS = "0.00000";
@@ -89,7 +89,8 @@ if (!REQUEST_ISSET_GET(('payout'))) {
 	$result = SQL_QUERY_ESC("SELECT id, type, rate, min_points, allow_url
 FROM `{!_MYSQL_PREFIX!}_payout_types`
 WHERE %s >= min_points
-ORDER BY type", array(REVERT_COMMA($TPTS)), __FILE__, __LINE__);
+ORDER BY type ASC",
+	array(convertCommaToDot($TPTS)), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) > 0) {
 		// Free memory
 		SQL_FREERESULT($result);
@@ -101,7 +102,7 @@ LEFT JOIN `{!_MYSQL_PREFIX!}_payout_types` AS t
 ON p.payout_id = t.id
 WHERE p.userid = %s
 ORDER BY p.payout_timestamp DESC",
-		 array(getUserId()), __FILE__, __LINE__);
+		array(getUserId()), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result_payouts) > 0) {
 			// List all his requests
 			$OUT = ''; $SW = 2;
@@ -132,9 +133,9 @@ ORDER BY p.payout_timestamp DESC",
 				$content = array(
 					'sw'     => $SW,
 					'acc'    => $content['target_account'],
-					'points' => TRANSLATE_COMMA($content['payout_total'])." ".COMPILE_CODE($content['type']),
+					'points' => translateComma($content['payout_total'])." ".COMPILE_CODE($content['type']),
 					'bank'   => $content['target_bank'],
-					'stamp'  => MAKE_DATETIME($content['payout_timestamp'], "2"),
+					'stamp'  => generateDateTime($content['payout_timestamp'], '2'),
 					'status' => $content['status']
 				);
 
@@ -159,8 +160,8 @@ ORDER BY p.payout_timestamp DESC",
 	}
 } else {
 	// Chedk if he can get paid by selected type
-	$result = SQL_QUERY_ESC("SELECT type, rate, min_points, allow_url AS allow FROM `{!_MYSQL_PREFIX!}_payout_types` WHERE id=%s LIMIT 1",
-		array(bigintval(REQUEST_GET('payout'))), __FILE__, __LINE__);
+	$result = SQL_QUERY_ESC("SELECT type, rate, min_points, allow_url AS allow FROM `{!_MYSQL_PREFIX!}_payout_types` WHERE `id`=%s LIMIT 1",
+	array(bigintval(REQUEST_GET('payout'))), __FILE__, __LINE__);
 
 	if (SQL_NUMROWS($result) == 1) {
 		// ID is valid so load the data
@@ -182,7 +183,7 @@ ORDER BY p.payout_timestamp DESC",
 		define('PAYOUT_MAX_VALUE' , $max);
 		define('PAYOUT_TYPE_VALUE', COMPILE_CODE($content['type']));
 
-		if (REVERT_COMMA($TPTS) >= $content['min_points']) {
+		if (convertCommaToDot($TPTS) >= $content['min_points']) {
 			// Ok, he can get be paid
 			if ((IS_FORM_SENT()) && ($PAYOUT <= $PAY_MAX) && ($PAYOUT >= $content['min_points'])) {
 				// Calculate exact value
@@ -197,14 +198,14 @@ ORDER BY p.payout_timestamp DESC",
 					// Banner/textlink ordered
 					SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_payouts` (userid, payout_total, payout_id, payout_timestamp, status, target_url, link_text, banner_url)
 VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')",
- array(
-	getUserId(),
-	bigintval(REQUEST_POST('payout')),
-	bigintval(REQUEST_GET('payout')),
-	REQUEST_POST('turl'),
-	REQUEST_POST('alt'),
-	REQUEST_POST('banner')
-), __FILE__, __LINE__);
+					array(
+					getUserId(),
+					bigintval(REQUEST_POST('payout')),
+					bigintval(REQUEST_GET('payout')),
+					REQUEST_POST('turl'),
+					REQUEST_POST('alt'),
+					REQUEST_POST('banner')
+					), __FILE__, __LINE__);
 
 					// Load templates
 					$msg_mem = LOAD_EMAIL_TEMPLATE("member_payout_request_banner", array(), getUserId());
@@ -217,21 +218,22 @@ VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')",
 					// e-currency payout requested
 					SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_payouts` (userid, payout_total, target_account, target_bank, payout_id, payout_timestamp, status, password)
 VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
- array(
-	getUserId(),
-	bigintval(REQUEST_POST('payout')),
-	bigintval(REQUEST_POST('account')),
-	REQUEST_POST('bank'),
-	bigintval(REQUEST_GET('payout')),
-	REQUEST_POST('pass')
-), __FILE__, __LINE__);
+					array(
+					getUserId(),
+					bigintval(REQUEST_POST('payout')),
+					bigintval(REQUEST_POST('account')),
+					REQUEST_POST('bank'),
+					bigintval(REQUEST_GET('payout')),
+					REQUEST_POST('pass')
+					), __FILE__, __LINE__);
 
 					// Load templates
 					$msg_mem = LOAD_EMAIL_TEMPLATE("member_payout_request", array(), getUserId());
 					$msg_adm = LOAD_EMAIL_TEMPLATE("admin_payout_request", array(), getUserId());
 					$admin_tpl = '';
-					if (GET_EXT_VERSION('admins') >= '0.4.1')
-					{
+
+					// @TODO Rewrite this to a filter
+					if (GET_EXT_VERSION('admins') >= '0.4.1') {
 						$admin_tpl = "admin_payout_request";
 					}
 				}
@@ -239,16 +241,16 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
 				// Generate task
 				SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (assigned_admin, status, task_type, subject, text, task_created, userid)
 VALUES (0, 'NEW','PAYOUT_REQUEST','[payout:] {--PAYOUT_REQUEST_ADMIN--}','%s', UNIX_TIMESTAMP(), %s)",
- array(
-	$msg_adm,
-	getUserId()
-), __FILE__, __LINE__);
+				array(
+				$msg_adm,
+				getUserId()
+				), __FILE__, __LINE__);
 
 				// Send out mails
-				SEND_EMAIL(getUserId(), getMessage('PAYOUT_REQUEST_MEMBER'), $msg_mem);
+				sendEmail(getUserId(), getMessage('PAYOUT_REQUEST_MEMBER'), $msg_mem);
 
 				// To admin(s)
-				SEND_ADMIN_NOTIFICATION(getMessage('PAYOUT_REQUEST_ADMIN'), $admin_tpl, array(), getUserId());
+				sendAdminNotification(getMessage('PAYOUT_REQUEST_ADMIN'), $admin_tpl, array(), getUserId());
 
 				// Load template and output it
 				LOAD_TEMPLATE('admin_settings_saved', false, getMessage('PAYOUT_REQUEST_SENT'));