X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=beg.php;h=d69cd6b49e678a3511fbc4fec8a31f2a7404e4c6;hp=6d4e6c5cc6344665dc3054eb3818d905757d544d;hb=15cfa3538ae057219dce740ce61d3a164c1dde87;hpb=05e9ddd952a47d42b9970a9d2afef20d77d3aecf

diff --git a/beg.php b/beg.php
index 6d4e6c5cc6..d69cd6b49e 100644
--- a/beg.php
+++ b/beg.php
@@ -51,7 +51,7 @@ $GLOBALS['output_mode'] = -1;
 $msg = null;
 
 // Load the required file(s)
-require('inc/config.php');
+require('inc/config-global.php');
 
 // Is the 'beg' extension active?
 REDIRCT_ON_UNINSTALLED_EXTENSION('beg');
@@ -69,11 +69,11 @@ if (isInstalled()) {
 		$pay = false;
 
 		// Validate if it is not a number
-		if ("".(REQUEST_GET('uid') + 0)."" !== "".REQUEST_GET('uid')."") {
+		if (''.(REQUEST_GET('uid') + 0).'' !== ''.REQUEST_GET('uid').'') {
 			if (EXT_IS_ACTIVE('nickname')) {
 				// Maybe we have found a nickname?
 				$result = SQL_QUERY_ESC("SELECT userid, beg_clicks, ref_payout, status, last_online FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' LIMIT 1",
-					array(REQUEST_GET('uid')), __FILE__, __LINE__);
+				array(REQUEST_GET('uid')), __FILE__, __LINE__);
 			} else {
 				// Nickname entered but nickname is not active
 				$msg = getCode('EXTENSION_PROBLEM');
@@ -82,11 +82,11 @@ if (isInstalled()) {
 		} else {
 			// Direct userid
 			$result = SQL_QUERY_ESC("SELECT userid, beg_clicks, ref_payout, status, last_online FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-				array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
+			array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
 		}
 
 		// Check if locked in so don't pay points
-		$status = "failed";
+		$status = 'failed';
 
 		// Check if account was found
 		if (SQL_NUMROWS($result) == 1) {
@@ -106,7 +106,7 @@ if (isInstalled()) {
 				// Set nickname / userid for the template(s
 				define('__BEG_UID'   , REQUEST_GET('uid'));
 				define('__BEG_CLICKS', ($clicks + 1));
-				define('__BEG_BANNER', LOAD_TEMPLATE("beg_banner", true));
+				define('__BEG_BANNER', LOAD_TEMPLATE('beg_banner', true));
 				define('__BEG_POINTS', translateComma($points));
 			} else {
 				// Other status
@@ -121,14 +121,14 @@ if (isInstalled()) {
 		if (($uid > 0) && (getConfig('beg_uid') != $uid)) {
 			// Update counter
 			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET beg_clicks=beg_clicks+1 WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
-				array($uid), __FILE__, __LINE__);
+			array($uid), __FILE__, __LINE__);
 
 			// Check for last entry for userid w/o IP number
 			$result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_beg_ips` WHERE (timeout > (UNIX_TIMESTAMP() - ".getConfig('beg_timeout').") OR (timeout > (UNIX_TIMESTAMP() - ".getConfig('beg_uid_timeout').") AND `userid`=%s)) AND (remote_ip='%s' OR sid='%s') LIMIT 1",
-				array($uid, detectRemoteAddr(), session_id()), __FILE__, __LINE__);
+			array($uid, detectRemoteAddr(), session_id()), __FILE__, __LINE__);
 
 			// Entry not found, points set and not logged in?
-			if (((SQL_NUMROWS($result) == 0) || (IS_ADMIN())) && ($points > 0) && (!IS_MEMBER()) && (getConfig('beg_pay_mode') == "NONE")) {
+			if (((SQL_NUMROWS($result) == 0) || (IS_ADMIN())) && ($points > 0) && (!IS_MEMBER()) && (getConfig('beg_pay_mode') == 'NONE')) {
 
 				// Admin is testing?
 				if (!IS_ADMIN()) {
@@ -136,13 +136,10 @@ if (isInstalled()) {
 					// but only when there is no admin begging.
 					// Admins shall be able to test it!
 					SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_beg_ips` (userid, remote_ip,sid, timeout) VALUES ('%s','%s','%s', UNIX_TIMESTAMP())",
-						array($uid, detectRemoteAddr(), session_id()), __FILE__, __LINE__);
+					array($uid, detectRemoteAddr(), session_id()), __FILE__, __LINE__);
 
 					// Was is successfull?
-					if (SQL_AFFECTEDROWS() == 1) {
-						// Okay!
-						$pay = true;
-					} // END - if
+					$pay (SQL_AFFECTEDROWS() == 1);
 				} else {
 					// Is admin!
 					$pay = true;
@@ -153,19 +150,19 @@ if (isInstalled()) {
 					// Add points to user or begging rallye account
 					if (BEG_ADD_POINTS($uid, $points)) {
 						// Set 'done' message
-						define('__BEG_MSG', LOAD_TEMPLATE("beg_done", true));
+						$content['msg'] = LOAD_TEMPLATE('beg_done', true);
 					} else {
 						// Error!
-						define('__BEG_MSG', LOAD_TEMPLATE("beg_failed", true));
+						$content['msg'] = LOAD_TEMPLATE('beg_failed', true);
 					}
 				} else {
 					// Error!
-					define('__BEG_MSG', LOAD_TEMPLATE("beg_failed", true));
+					$content['msg'] = LOAD_TEMPLATE('beg_failed', true);
 				}
 			} elseif (IS_MEMBER()) {
 				// Logged in user found!
-				define('__BEG_MSG', LOAD_TEMPLATE("beg_login", true));
-			} elseif (getConfig('beg_pay_mode') != "NONE") { // Other pay-mode active!
+				$content['msg'] = LOAD_TEMPLATE('beg_login', true);
+			} elseif (getConfig('beg_pay_mode') != 'NONE') { // Other pay-mode active!
 				// Prepare content for template
 				$content = array(
 					'clicks' => constant('__BEG_CLICKS'),
@@ -174,11 +171,11 @@ if (isInstalled()) {
 				);
 
 				// Load message template depending on pay-mode
-				define('__BEG_MSG', LOAD_TEMPLATE("beg_pay_mode_".strtolower(getConfig('beg_pay_mode')), true, $content));
+				$content['msg'] = LOAD_TEMPLATE('beg_pay_mode_'.strtolower(getConfig('beg_pay_mode')), true, $content);
 				$pay = true;
 			} else {
 				// Clicked received while reload lock is active
-				define('__BEG_MSG', LOAD_TEMPLATE("beg_failed", true));
+				$content['msg'] = LOAD_TEMPLATE('beg_failed', true);
 			}
 
 			// Free memory
@@ -188,31 +185,31 @@ if (isInstalled()) {
 			loadIncludeOnce('inc/header.php');
 
 			// Load final template
-			LOAD_TEMPLATE("beg_link");
+			LOAD_TEMPLATE('beg_link', false, $content);
 
 			// Tracker code enabled? (We don't track users here!
-			if ((getConfig('beg_pay_mode') != "NONE") && ($pay)) {
+			if ((getConfig('beg_pay_mode') != 'NONE') && ($pay === true)) {
 				// Prepare content for template
 				// @TODO Opps, what is missing here???
 				$content = array(
 				);
 
 				// Include config-depending template
-				LOAD_TEMPLATE("beg_pay_code_".strtolower(getConfig('beg_pay_mode')), false, $content);
-			} elseif ((!$pay) && (!defined('__BEG_MSG'))) {
+				LOAD_TEMPLATE('beg_pay_code_'.strtolower(getConfig('beg_pay_mode')), false, $content);
+			} elseif ((!$pay) && (!isset($content['msg']))) {
 				// Cannot pay! :-(
-				define('__BEG_MSG', LOAD_TEMPLATE("beg_failed", true));
+				$content['msg'] = LOAD_TEMPLATE('beg_failed', true);
 			}
 
 			// Include footer
 			loadIncludeOnce('inc/footer.php');
-		} elseif (($status != 'CONFIRMED') && ($status != "failed")) {
+		} elseif (($status != 'CONFIRMED') && ($status != 'failed')) {
 			// Maybe locked/unconfirmed account?
 			$msg = generateErrorCodeFromUserStatus($status);
-		} elseif (($uid == '0') || ($status == "failed")) {
+		} elseif (($uid == '0') || ($status == 'failed')) {
 			// Inalid or locked account, so let's find out
 			$result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' LIMIT 1",
-				array(REQUEST_GET('uid')), __FILE__, __LINE__);
+			array(REQUEST_GET('uid')), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 1) {
 				// Locked account
 				$msg = getCode('ACCOUNT_LOCKED');