X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-unlock_emails.php;h=62814be9db7759317e6ab6538fe9e54051aaeead;hb=9bd8a51d553d07c64aebb230714c5fd87258cc57;hp=658d48788343b4bddf0d06737da950bb2db04587;hpb=950e91ffc2d515dae357d4044294abe301c09b41;p=mailer.git

diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index 658d487883..62814be9db 100644
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -58,21 +58,11 @@ ORDER BY
 	`timestamp` ASC", __FILE__, __LINE__);
 
 if ((SQL_NUMROWS($result_main) > 0) || (isPostRequestElementSet('lock'))) {
-	// Count checked checkboxes
-	$SEL = 0;
-	if (isPostRequestElementSet('sel')) {
-		// Are there checked boxes?
-		if (count(postRequestElement('sel')) > 0) {
-			// Count now... We use an own function for now
-			$SEL = countPostSelection();
-		} // END - if
-	} // END - if
-
 	if (isPostRequestElementSet('accept')) {
-		if ($SEL > 0) {
+		if (countPostSelection() > 0) {
 			// Accept mail orders
 			foreach (postRequestElement('sel') as $id => $value) {
-				// Secure ID number
+				// Secure id number
 				$id = bigintval($id);
 
 				// Order placed in queue...
@@ -136,11 +126,11 @@ LIMIT 1",
 		// Mails unlocked for mail delivery
 		loadTemplate('admin_settings_saved', false, $message);
 	} elseif (isPostRequestElementSet(('reject'))) {
-		if ($SEL > 0) {
+		if (countPostSelection() > 0) {
 			// Reject mail orders
 			$OUT = ''; $SW = 2;
 			foreach (postRequestElement('sel') as $id => $value) {
-				// Secure ID number
+				// Secure id number
 				$id = bigintval($id);
 
 				// Load URL and subject from pool
@@ -182,7 +172,7 @@ LIMIT 1",
 			// Nothing selected
 			loadTemplate('admin_settings_saved', false, getMessage('ADMIN_MAILS_NOTHING_CHECKED'));
 		}
-	} elseif ((isPostRequestElementSet('lock')) && ($SEL > 0) && (getConfig('url_blacklist') == 'Y')) {
+	} elseif ((isPostRequestElementSet('lock')) && (countPostSelection() > 0) && (getConfig('url_blacklist') == 'Y')) {
 		// Lock URLs
 		foreach (postRequestElement('sel') as $id => $url) {
 			// Secure id number
@@ -191,7 +181,7 @@ LIMIT 1",
 			// Lookup in blacklist
 			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_url_blacklist` WHERE `url`='%s' LIMIT 1",
 				array($url), __FILE__, __LINE__);
-			if (SQL_NUMROWS($result) == 0) {
+			if (SQL_NUMROWS($result) == '0') {
 				// Did not find a record so we can add it... :)
 				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_url_blacklist` (`url`,`pool_id`) VALUES ('%s',%s)",
 					array($url, $id), __FILE__, __LINE__);
@@ -208,21 +198,20 @@ LIMIT 1",
 		$OUT = ''; $SW = 2;
 		while ($content = SQL_FETCHARRAY($result_main)) {
 			// Prepare data for the template
-			// @TODO Rewrite in template: subj->subject,ordered->timestamp,tsend->target_send
 			$content = array(
-				'sw'        => $SW,
-				'id'        => $content['id'],
-				'sender'    => $content['sender'],
-				'u_link'    => generateUserProfileLink($content['sender']),
-				'subj'      => $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'],
-				'ordered'   => generateDateTime($content['timestamp'], '2'),
-				'tsend'     => $content['target_send'],
+				'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'],
 			);
 
 			// Load row template and switch colors