X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-primera.php;h=3a3e730f1bbaa62c7eeafbebdb25519083d18efd;hp=ae24e03d4940feee5f5ab4bddac5937aec504af8;hb=c47144dd555bbab4acdf9085e4623900dedb0e7c;hpb=f9a9c09e1ae257449bfd98f8854e321efba1dc3c

diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php
index ae24e03d49..3a3e730f1b 100644
--- a/inc/modules/member/what-primera.php
+++ b/inc/modules/member/what-primera.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
 	LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("primera")) && (!IS_ADMIN())) {
 	// Extension "primera" is not activated
-	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "primera");
+	addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "primera");
 	return;
 }
 
@@ -63,7 +63,7 @@ if (!isset($_GET['mode'])) {
 	$content['refid'] = bigintval(getConfig('primera_refid'));
 
 	// Get Primus id
-	$result = SQL_QUERY_ESC("SELECT primera_userid FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT primera_userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
 		array($GLOBALS['userid']), __FILE__, __LINE__);
 
 	// Are there some entries?
@@ -81,7 +81,7 @@ if (!isset($_GET['mode'])) {
 		$_GET['mode'] = "list";
 
 		// And load all rows!
-		$result = SQL_QUERY_ESC("SELECT `id`, `primera_account`, `primera_amount`, `primera_timestamp`, `primera_type` FROM "._MYSQL_PREFIX."_user_primera WHERE `userid` = %s ORDER BY `primera_timestamp` DESC",
+		$result = SQL_QUERY_ESC("SELECT `id`, `primera_account`, `primera_amount`, `primera_timestamp`, `primera_type` FROM `{!_MYSQL_PREFIX!}_user_primera` WHERE `userid` = %s ORDER BY `primera_timestamp` DESC",
 			array($GLOBALS['userid']), __FILE__, __LINE__);
 
 		// Load all rows
@@ -133,7 +133,7 @@ if ($_GET['mode'] == "pay") {
 
 	// Get Primera id
 	$content['primera_nickname'] = "";
-	$result = SQL_QUERY_ESC("SELECT primera_userid FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT primera_userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
 		array($GLOBALS['userid']), __FILE__, __LINE__);
 
 	// Are there some entries?
@@ -159,27 +159,21 @@ if ((isset($_POST['ok'])) && (isset($_GET['mode']))) {
 			if (empty($_POST['primera_nickname'])) {
 				// Nothing entered in Primus nickname
 				LOAD_TEMPLATE("admin_settings_saved", false, PRIMERA_MEMBER_EMPTY_USERNAME);
-				OUTPUT_HTML("<br />");
 			} elseif (empty($_POST['primera_password'])) {
 				// Nothing entered in Primera password
 				LOAD_TEMPLATE("admin_settings_saved", false, PRIMERA_MEMBER_EMPTY_PASSWORD);
-				OUTPUT_HTML("<br />");
 			} elseif (empty($_POST['amount'])) {
 				// Nothing entered in amount
 				LOAD_TEMPLATE("admin_settings_saved", false, PRIMERA_MEMBER_EMPTY_AMOUNT);
-				OUTPUT_HTML("<br />");
 			} elseif ($_POST['amount'] != bigintval($_POST['amount'])) {
 				// Only numbers in amount!
 				LOAD_TEMPLATE("admin_settings_saved", false, PRIMERA_MEMBER_INVALID_AMOUNT);
-				OUTPUT_HTML("<br />");
 			} elseif ($_POST['amount'] < getConfig('primera_min_payout')) {
 				// Not enougth entered!
 				LOAD_TEMPLATE("admin_settings_saved", false, sprintf(PRIMERA_MEMBER_AMOUNT_SMALLER_MIN, bigintval(getConfig('primera_min_payout'))));
-				OUTPUT_HTML("<br />");
 			} elseif ($_POST['amount'] > $points) {
 				// Not enougth points left!
 				LOAD_TEMPLATE("admin_settings_saved", false, sprintf(PRIMERA_MEMBER_PAYOUT_POINTS_DEPLETED, bigintval($_POST['amount']), bigintval($points)));
-				OUTPUT_HTML("<br />");
 			} else {
 				// All is fine here so do the payout
 				$success = PRIMERA_EXECUTE_PAYOUT($_POST['primera_nickname'], md5($_POST['primera_password']), $_POST['amount']);
@@ -197,7 +191,7 @@ if ((isset($_POST['ok'])) && (isset($_GET['mode']))) {
 					SUB_POINTS("primera_payout", $GLOBALS['userid'], $_POST['amount']);
 
 					// Update primera nickname
-					$result = SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET `primera_userid`=%s WHERE userid=%s LIMIT 1",
+					SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `primera_userid`=%s WHERE userid=%s LIMIT 1",
 						array($_POST['primera_nickname'], $GLOBALS['userid']), __FILE__, __LINE__);
 
 					// All done!
@@ -206,11 +200,9 @@ if ((isset($_POST['ok'])) && (isset($_GET['mode']))) {
 				} elseif ((GET_PRIMERA_ERROR_CODE() == "user_failed") || (GET_PRIMERA_ERROR_CODE() == "own_failed") || (GET_PRIMERA_ERROR_CODE() == "amount_failed") || (GET_PRIMERA_ERROR_CODE() == "api_amount_failed")) {
 					// Wrong login data
 					LOAD_TEMPLATE("admin_settings_saved", false, GET_PRIMERA_ERROR_MESSAGE());
-					OUTPUT_HTML("<br />");
 				} else {
 					// Something went wrong
 					LOAD_TEMPLATE("admin_settings_saved", false, sprintf(PRIMERA_MEMBER_PAYOUT_FAILED, GET_PRIMERA_ERROR_MESSAGE()));
-					OUTPUT_HTML("<br />");
 				}
 			}
 			break;