X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fsponsor_functions.php;h=c6cd2e5b346215a95e884d2022ddcd71f62c4bac;hp=80d000c93f146ec5dacd31c1f1fe10583686e2c9;hb=ff9e8f739bd4b6e184b2a6bf427334196e501da8;hpb=fc162164725588cf75969f707faead9c9cd8e68b

diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index 80d000c93f..c6cd2e5b34 100644
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -141,8 +141,8 @@ function handlSponsorRequest (&$postData, $update=false, $messageArray=array(),
 				$DATA['values'][] = bigintval(getRequestParameter('id'));
 
 				// Generate message
-				$message = getMessageFromIndexedArray(getMessage('ADMIN_SPONSOR_UPDATED'), 'updated', $messageArray);
-				$ret = "updated";
+				$message = getMessageFromIndexedArray('{--ADMIN_SPONSOR_UPDATED--}', 'updated', $messageArray);
+				$ret = 'updated';
 			} elseif (($ALREADY === false) || (($postData['force'] == 1) && (isAdmin()))) {
 				// Add new sponsor, first add more data
 				$DATA['keys'][] = 'sponsor_created'; $DATA['values'][] = time();
@@ -162,14 +162,14 @@ function handlSponsorRequest (&$postData, $update=false, $messageArray=array(),
 				}
 
 				// Implode all data into strings
-				$keyArray   = implode("`, `"  , $DATA['keys']);
+				$keyArray   = implode('`, `'  , $DATA['keys']);
 				$valueArray = str_repeat("%s', '", count($DATA['values']) - 1);
 
 				// Generate string
-				$sql = "INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_data` (`" . $keyArray . "`) VALUES ('" . $valueArray . "%s')";
+				$sql = 'INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_data` (`' . $keyArray . "`) VALUES ('" . $valueArray . "%s')";
 
 				// Generate message
-				$message = getMessageFromIndexedArray(getMessage('ADMIN_SPONSOR_ADDED'), 'added', $messageArray);
+				$message = getMessageFromIndexedArray('{--ADMIN_SPONSOR_ADDED--}', 'added', $messageArray);
 				$ret = 'added';
 			} elseif (($update === true) && (isAdmin())) {
 				// Add all data as hidden data
@@ -205,7 +205,7 @@ function handlSponsorRequest (&$postData, $update=false, $messageArray=array(),
 			} // END - if
 		} else {
 			// Error found!
-			$message = getMessageFromIndexedArray(getMessage('SPONSOR_DATA_NOT_SAVED'), 'failed', $messageArray);
+			$message = getMessageFromIndexedArray('{--SPONSOR_DATA_NOT_SAVED--}', 'failed', $messageArray);
 			loadTemplate('admin_settings_saved', false, $message);
 		}
 
@@ -272,22 +272,36 @@ LIMIT 1",
 //
 function addSponsorMenu ($current) {
 	$OUT = '';
-	$WHERE = " AND active='Y'";
+	$WHERE = " AND `active`='Y'";
 	if (isAdmin()) $WHERE = '';
 
 	// Load main menu entries
-	$result_main = SQL_QUERY("SELECT action AS main_action, title AS main_title FROM `{?_MYSQL_PREFIX?}_sponsor_menu`
-WHERE (`what`='' OR `what` IS NULL) ".$WHERE."
-ORDER BY `sort`", __FUNCTION__, __LINE__);
-	if (SQL_NUMROWS($result_main) > 0) {
+	$result_main = SQL_QUERY("SELECT
+	`action` AS `main_action`, `title` AS `main_title`
+FROM
+	`{?_MYSQL_PREFIX?}_sponsor_menu`
+WHERE
+	(`what`='' OR `what` IS NULL)
+	" . $WHERE . "
+ORDER BY
+	`sort` ASC", __FUNCTION__, __LINE__);
+	if (!SQL_HASZERONUMS($result_main)) {
 		// Load every menu and it's sub menus
 		while ($content = SQL_FETCHARRAY($result_main)) {
 			// Load sub menus
-			$result_sub = SQL_QUERY_ESC("SELECT what AS sub_what, title AS sub_title FROM `{?_MYSQL_PREFIX?}_sponsor_menu`
-WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$WHERE."
-ORDER BY `sort`",
+			$result_sub = SQL_QUERY_ESC("SELECT
+	`what` AS `sub_what`, `title` AS `sub_title`
+FROM
+	`{?_MYSQL_PREFIX?}_sponsor_menu`
+WHERE
+	`action`='%s' AND
+	`what` != '' AND
+	`what` IS NOT NULL
+	" . $WHERE . "
+ORDER BY
+	`sort` ASC",
 			array($content['main_action']), __FUNCTION__, __LINE__);
-			if (SQL_NUMROWS($result_sub) > 0) {
+			if (!SQL_HASZERONUMS($result_sub)) {
 				// Load sub menus
 				$SUB = '';
 				while ($content2 = SQL_FETCHARRAY($result_sub)) {
@@ -409,7 +423,7 @@ function saveSponsorData ($postData, $content) {
 	$sql = "UPDATE `{?_MYSQL_PREFIX?}_sponsor_data` SET";
 	foreach ($postData as $key => $value) {
 		// Mmmmm, too less security here???
-		$sql   .= " `".secureString($key)."`='%s',";
+		$sql   .= " `" . secureString($key) . "`='%s',";
 
 		// We will secure this later inside the SQL_QUERY_ESC() function
 		$DATA[] = secureString($value);
@@ -434,7 +448,7 @@ function saveSponsorData ($postData, $content) {
 	$sql = substr($sql, 0, -1);
 
 	// Add SQL tail data
-	$sql .= " WHERE `id`=%s AND password='%s' LIMIT 1";
+	$sql .= " WHERE `id`=%s AND `password`='%s' LIMIT 1";
 	$DATA[] = bigintval(getSession('sponsorid'));
 	$DATA[] = getSession('sponsorpass');
 
@@ -444,11 +458,11 @@ function saveSponsorData ($postData, $content) {
 			if ($EMAIL === true) {
 				$message = '{--SPONSOR_ACCOUNT_EMAIL_CHANGED--}';
 				$templ   = 'admin_sponsor_change_email';
-				$subj    = '{--ADMIN_SPONSOR_ACC_EMAIL_SUBJ--}';
+				$subj    = '{--ADMIN_SPONSOR_ACC_EMAIL_SUBJECT--}';
 			} else {
 				$message = '{--SPONSOR_ACCOUNT_DATA_SAVED--}';
 				$templ   = 'admin_sponsor_change_data';
-				$subj    = '{--ADMIN_SPONSOR_ACC_DATA_SUBJ--}';
+				$subj    = '{--ADMIN_SPONSOR_ACC_DATA_SUBJECT--}';
 			}
 			break;
 
@@ -456,7 +470,7 @@ function saveSponsorData ($postData, $content) {
 			// Set message template and subject for admin
 			$message = '{--SPONSOR_SETTINGS_SAVED--}';
 			$templ   = 'admin_sponsor_settings';
-			$subj    = '{--ADMIN_SPONSOR_SETTINGS_SUBJ--}';
+			$subj    = '{--ADMIN_SPONSOR_SETTINGS_SUBJECT--}';
 			break;
 
 		default: // Unknown sponsor what value!
@@ -491,7 +505,7 @@ function saveSponsorData ($postData, $content) {
 				switch (getWhat()) {
 					case 'account': // Change account data
 						$email_msg = loadEmailTemplate('sponsor_change_data', $content);
-						sendEmail($content['email'], '{--SPONSOR_ACC_DATA_SUBJ--}', $email_msg);
+						sendEmail($content['email'], '{--SPONSOR_ACC_DATA_SUBJECT--}', $email_msg);
 
 						if ($EMAIL === true) {
 							// Add hash code to content array
@@ -499,14 +513,14 @@ function saveSponsorData ($postData, $content) {
 
 							// Second mail goes to the new address
 							$email_msg = loadEmailTemplate('sponsor_change_email', $content);
-							sendEmail($content['email'], '{--SPONSOR_ACC_EMAIL_SUBJ--}', $email_msg);
+							sendEmail($content['email'], '{--SPONSOR_ACC_EMAIL_SUBJECT--}', $email_msg);
 						} // END - if
 						break;
 
 					case 'settings': // Change settings
 						// Send email
 						$email_msg = loadEmailTemplate('sponsor_settings', $content);
-						sendEmail($content['email'], '{--SPONSOR_SETTINGS_SUBJ--}', $email_msg);
+						sendEmail($content['email'], '{--SPONSOR_SETTINGS_SUBJECT--}', $email_msg);
 						break;
 				} // END - switch
 			} // END - if