X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fsponsor%2Faccount.php;h=b5f9a51493a3c0045d560746126402ea3297f79c;hp=70c8f4b1284c7e13c06ee30709b4e565b4c1ee03;hb=7989ec603971c0dc8dc35d8be4e72f8098b83baa;hpb=e71e9e1380d65ccd06beef6fbc594bec10371f5f

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index 70c8f4b128..b5f9a51493 100644
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -35,11 +35,11 @@ if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
 	require($INC);
 } elseif ((!EXT_IS_ACTIVE("sponsor"))
-	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE);
+	addFatalMessage(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "sponsor");
 	return;
 } elseif (!IS_SPONSOR()) {
 	// No sponsor!
-	ADD_FATAL(SPONSOR_ONLY_AREA_ENTERED);
+	addFatalMessage(getMessage('SPONSOR_ONLY_AREA_ENTERED'));
 	return;
 }
 
@@ -48,9 +48,11 @@ $result = SQL_QUERY_ESC("SELECT company, position, tax_ident,
 gender, surname, family, street_nr1, street_nr2, zip, city, country,
 phone, fax, cell, email, url,
 status, receive_warnings
-FROM "._MYSQL_PREFIX."_sponsor_data
+FROM `{!_MYSQL_PREFIX!}_sponsor_data`
 WHERE id='%s' AND password='%s' LIMIT 1",
- array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__);
+	array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__);
+
+// Entry found?
 if (SQL_NUMROWS($result) == 1) {
 	// Load sponsor data
 	$content = SQL_FETCHARRAY($result);
@@ -60,22 +62,22 @@ if (SQL_NUMROWS($result) == 1) {
 			// Check passwords
 			if (empty($_POST['pass_old'])) {
 				// No current password entered
-				$MSG = SPONSOR_NO_CURRENT_PASSWORD_ENTERED;
+				$MSG = getMessage('SPONSOR_NO_CURRENT_PASSWORD_ENTERED');
 			} elseif (md5($_POST['pass_old']) != get_session('sponsorpass')) {
 				// Entered password didn't match password in DB
-				$MSG = SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB;
+				$MSG = getMessage('SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB');
 			} elseif ((!empty($_POST['pass1'])) && (!empty($_POST['pass2'])) && ($_POST['pass1'] != $_POST['pass2'])) {
 				// Both new passwords did not match
-				$MSG = SPONSOR_BOTH_NEW_PASSWORDS_DIDNOT_MATCH;
+				$MSG = getMessage('SPONSOR_BOTH_NEW_PASSWORDS_DIDNOT_MATCH');
 			} elseif ((empty($_POST['pass1'])) && (!empty($_POST['pass2']))) {
 				// No password one entered
-				$MSG = SPONSOR_PASSWORD_ONE_EMPTY;
+				$MSG = getMessage('SPONSOR_PASSWORD_ONE_EMPTY');
 			} elseif ((!empty($_POST['pass1'])) && (empty($_POST['pass2']))) {
 				// No password two entered
-				$MSG = SPONSOR_PASSWORD_TWO_EMPTY;
+				$MSG = getMessage('SPONSOR_PASSWORD_TWO_EMPTY');
 			} elseif ((!empty($_POST['pass1'])) && (strlen($_POST['pass1']) < getConfig('pass_len'))) {
 				// Too short password
-				$MSG = SPONSOR_PASSWORD_TOO_SHORT_1.getConfig('pass_len').SPONSOR_PASSWORD_TOO_SHORT_2;
+				$MSG = sprintf(getMessage('SPONSOR_PASSWORD_TOO_SHORT'), getConfig('pass_len'));
 			} else {
 				// Default is we don't want to change password!
 				$PASS_AND = ""; $PASS_DATA = "";
@@ -107,7 +109,7 @@ if (SQL_NUMROWS($result) == 1) {
 				$OUT = LOAD_TEMPLATE("admin_settings_saved", true, $MSG);
 			} else {
 				// No message generated
-				$OUT = LOAD_TEMPLATE("admin_settings_saved", true, SPONSOR_NO_MESSAGE_GENERATED);
+				$OUT = LOAD_TEMPLATE("admin_settings_saved", true, getMessage('SPONSOR_NO_MESSAGE_GENERATED'));
 			}
 		} else {
 			// Check for gender selection
@@ -142,7 +144,7 @@ if (SQL_NUMROWS($result) == 1) {
 	}
 } else {
 	// Sponsor account not found!
-	$OUT = LOAD_TEMPLATE("admin_settings_saved", true, SPONSOR_ACCOUNT_404_1.get_session('sponsorid').SPONSOR_ACCOUNT_404_2);
+	$OUT = LOAD_TEMPLATE("admin_settings_saved", true, sprintf(getMessage('SPONSOR_ACCOUNT_404'), get_session('sponsorid')));
 }
 
 // Free memory