X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-unlock_emails.php;h=e5e116a770db188ef87ef08d6faf8f7dedb32697;hp=5fb789f51cb2cac5cb977318eb18e8d12cbaf9c8;hb=f2aeaab0cd313b2eeb151642455ed558f6b186dc;hpb=4b7f401f2a4680ae46ca41c57f749cfe35163660

diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index 5fb789f51c..e5e116a770 100644
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -47,7 +47,7 @@ addMenuDescription('admin', __FILE__);
 
 // Check for mails
 $result_main = SQL_QUERY("SELECT
-	`id`,`sender`,`subject`,`payment_id` AS `payment`,`timestamp`,`url`,`target_send`,`cat_id` AS category
+	`id`, `sender`, `subject`, `payment_id`, `timestamp`, `url`, `target_send`, `cat_id`
 FROM
 	`{?_MYSQL_PREFIX?}_pool`
 WHERE
@@ -115,10 +115,10 @@ LIMIT 1",
 			} // END - foreach
 
 			// Set message
-			$message = getMessage('ADMIN_MAILS_ACTIVATED');
+			$message = '{--ADMIN_MAILS_ACTIVATED--}';
 		} else {
 			// Nothing checked!
-			$message = getMessage('ADMIN_MAILS_NOTHING_CHECKED');
+			$message = '{--ADMIN_MAILS_NOTHING_CHECKED--}';
 		}
 
 		// Mails unlocked for mail delivery
@@ -168,7 +168,7 @@ LIMIT 1",
 			loadTemplate('admin_unlock_emails_redir', false, $OUT);
 		} else {
 			// Nothing selected
-			loadTemplate('admin_settings_saved', false, getMessage('ADMIN_MAILS_NOTHING_CHECKED'));
+			loadTemplate('admin_settings_saved', false, '{--ADMIN_MAILS_NOTHING_CHECKED--}');
 		}
 	} elseif ((isFormSent('lock')) && (countPostSelection() > 0) && (getConfig('url_blacklist') == 'Y')) {
 		// Lock URLs
@@ -190,27 +190,14 @@ LIMIT 1",
 		} // END - foreach
 
 		// Output message
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_URLS_BLOCKED'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_URLS_BLOCKED--}');
 	} elseif ((!isFormSent('lock')) && (!isFormSent('accept')) && (!isFormSent('reject'))) {
 		// Mail orders are in pool so we can display them
 		$OUT = ''; $SW = 2;
 		while ($content = SQL_FETCHARRAY($result_main)) {
 			// Prepare data for the template
-			$content = array(
-				'sw'          => $SW,
-				'id'          => $content['id'],
-				'sender'      => $content['sender'],
-				'u_link'      => generateUserProfileLink($content['sender']),
-				'subject'     => $content['subject'],
-				'tester'      => generateFrametesterUrl($content['url']),
-				'url'         => $content['url'],
-				'cat_title'   => str_replace("\"", '"', getCategory($content['category'])),
-				'cat_link'    => $content['category'],
-				'pay_title'   => str_replace("\"", '"', getPaymentTitlePrice($content['payment'], true)),
-				'pay_link'    => $content['payment'],
-				'timestamp'   => generateDateTime($content['timestamp'], 2),
-				'target_send' => $content['target_send'],
-			);
+			$content['sw']        = $SW;
+			$content['timestamp'] = generateDateTime($content['timestamp'], 2);
 
 			// Load row template and switch colors
 			$OUT .= loadTemplate('admin_unlock_emails_row', true, $content);
@@ -227,14 +214,14 @@ LIMIT 1",
 		loadTemplate('admin_unlock_emails', false, $content);
 	} elseif ((isFormSent('lock')) && (getConfig('url_blacklist') != 'Y')) {
 		// URL blacklist not activated
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_URL_BLACKLIST_DISABLED'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_URL_BLACKLIST_DISABLED--}');
 	} else {
 		// Wrong call!
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_WRONG_CALL'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_WRONG_CALL--}');
 	}
 } else {
 	// No mail orders fond
-	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MAILS_IN_POOL'));
+	loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MAILS_IN_POOL--}');
 }
 
 // [EOF]