X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-unlock_emails.php;h=71926397d824373bd881b7f678c7bb4a35c68885;hb=f5ebd83b36f343022977241bd9b570051ece4b0f;hp=de718c1dc360b5dc3069cd321cf8868bb9f84b26;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index de718c1dc3..71926397d8 100644
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/28/2003 *
- * ===============                              Last change: 07/13/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 09/28/2003 *
+ * ===================                          Last change: 07/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-unlock_emails.php                           *
@@ -57,22 +57,12 @@ WHERE
 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 ((SQL_NUMROWS($result_main) > 0) || (isPostRequestParameterSet('lock'))) {
+	if (isPostRequestParameterSet('accept')) {
+		if (countPostSelection() > 0) {
 			// Accept mail orders
-			foreach (postRequestElement('sel') as $id => $value) {
-				// Secure ID number
+			foreach (postRequestParameter('sel') as $id => $value) {
+				// Secure id number
 				$id = bigintval($id);
 
 				// Order placed in queue...
@@ -92,7 +82,7 @@ LIMIT 1",
 				// Update wents fine?
 				if (SQL_NUMROWS($result) == 1) {
 					// Load data
-					$DATA = SQL_FETCHARRAY($result);
+					$content = SQL_FETCHARRAY($result);
 
 					// Free result
 					SQL_FREERESULT($result);
@@ -101,24 +91,24 @@ LIMIT 1",
 					// @TODO Rewrite these if-blocks to a filter
 					if ((isExtensionActive('surfbar')) && (getConfig('surfbar_migrate_order') == 'Y')) {
 						// Then "migrate" the URL to the surfbar
-						SURFBAR_ADMIN_MIGRATE_URL($DATA['url'], $DATA['sender']);
+						SURFBAR_ADMIN_MIGRATE_URL($content['url'], $content['sender']);
 					} // END - if
 
 					// Check for bonus extension version >= 0.4.4 for the order bonus
 					if ((getExtensionVersion('bonus') >= '0.4.4') && (getConfig('bonus_active') == 'Y')) {
 						// Add points directly
 						SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `bonus_order`=`bonus_order`+".getConfig('bonus_order')." WHERE `userid`=%s LIMIT 1",
-							array(bigintval($DATA['sender'])), __FILE__, __LINE__);
+							array(bigintval($content['sender'])), __FILE__, __LINE__);
 
 						// Subtract bonus points from system
 						handleBonusPoints(getConfig('bonus_order'));
 					} // END - if
 
 					// Load email template
-					$message_user = loadEmailTemplate('order-accept', array(), $DATA['sender']);
+					$message_user = loadEmailTemplate('order-accept', $content, $content['sender']);
 
 					// Send email
-					sendEmail($DATA['sender'], MEMBER_ORDER_ACCEPTED, $message_user);
+					sendEmail($content['sender'], getMessage('MEMBER_ORDER_ACCEPTED'), $message_user);
 
 					// Unlock selected email
 					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='NEW' WHERE `id`=%s AND `data_type`='ADMIN' LIMIT 1",
@@ -135,12 +125,12 @@ LIMIT 1",
 
 		// Mails unlocked for mail delivery
 		loadTemplate('admin_settings_saved', false, $message);
-	} elseif (isPostRequestElementSet(('reject'))) {
-		if ($SEL > 0) {
+	} elseif (isPostRequestParameterSet(('reject'))) {
+		if (countPostSelection() > 0) {
 			// Reject mail orders
 			$OUT = ''; $SW = 2;
-			foreach (postRequestElement('sel') as $id => $value) {
-				// Secure ID number
+			foreach (postRequestParameter('sel') as $id => $value) {
+				// Secure id number
 				$id = bigintval($id);
 
 				// Load URL and subject from pool
@@ -148,27 +138,27 @@ LIMIT 1",
 					array($id), __FILE__, __LINE__);
 
 				// Load data
-				$DATA = SQL_FETCHARRAY($result);
+				$content = SQL_FETCHARRAY($result);
 
 				// Free result
 				SQL_FREERESULT($result);
 
 				// Load email template and send it away
-				$message_user = loadEmailTemplate('order-reject', array(), $DATA['sender']);
-				sendEmail($DATA['sender'], getMessage('MEMBER_ORDER_REJECTED'), $message_user);
+				$message_user = loadEmailTemplate('order-reject', $content, $content['sender']);
+				sendEmail($content['sender'], getMessage('MEMBER_ORDER_REJECTED'), $message_user);
 
 				// If you do not enter an URL to redirect to, your URL will be set!
-				if ((!isPostRequestElementSet(('redirect'))) || (postRequestElement('redirect') == 'http://')) setRequestPostElement('redirect', getConfig('URL'));
+				if ((!isPostRequestParameterSet('redirect')) || (postRequestParameter('redirect') == 'http://')) setPostRequestParameter('redirect', getConfig('URL'));
 
 				// Redirect URL
 				SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET url='%s', `data_type`='NEW' WHERE `id`=%s LIMIT 1",
-					array(postRequestElement('redirect'), $id),__FILE__, __LINE__);
+					array(postRequestParameter('redirect'), $id),__FILE__, __LINE__);
 
 				// Prepare data for the row template
 				$content = array(
 					'sw'  => $SW,
 					'id'  => $id,
-					'url' => postRequestElement('url', $id),
+					'url' => postRequestParameter('url', $id),
 				);
 
 				// Load row template and switch colors
@@ -182,16 +172,16 @@ LIMIT 1",
 			// Nothing selected
 			loadTemplate('admin_settings_saved', false, getMessage('ADMIN_MAILS_NOTHING_CHECKED'));
 		}
-	} elseif ((isPostRequestElementSet('lock')) && ($SEL > 0) && (getConfig('url_blacklist') == 'Y')) {
+	} elseif ((isPostRequestParameterSet('lock')) && (countPostSelection() > 0) && (getConfig('url_blacklist') == 'Y')) {
 		// Lock URLs
-		foreach (postRequestElement('sel') as $id => $url) {
+		foreach (postRequestParameter('sel') as $id => $url) {
 			// Secure id number
 			$id = bigintval($id);
 
 			// 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__);
@@ -203,26 +193,25 @@ LIMIT 1",
 
 		// Output message
 		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_URLS_BLOCKED'));
-	} elseif ((!isPostRequestElementSet('lock')) && (!isPostRequestElementSet('accept')) && (!isPostRequestElementSet(('reject'))) && (getConfig('url_blacklist') == 'Y')) {
+	} elseif ((!isPostRequestParameterSet('lock')) && (!isPostRequestParameterSet('accept')) && (!isPostRequestParameterSet('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
-			// @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("\"", '&quot;', getCategory($content['category'])),
-				'cat_link'  => $content['category'],
-				'pay_title' => str_replace("\"", '&quot;', 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("\"", '&quot;', getCategory($content['category'])),
+				'cat_link'    => $content['category'],
+				'pay_title'   => str_replace("\"", '&quot;', getPaymentTitlePrice($content['payment'], true)),
+				'pay_link'    => $content['payment'],
+				'timestamp'   => generateDateTime($content['timestamp'], 2),
+				'target_send' => $content['target_send'],
 			);
 
 			// Load row template and switch colors
@@ -238,7 +227,7 @@ LIMIT 1",
 
 		// Load main template
 		loadTemplate('admin_unlock_emails', false, $content);
-	} elseif ((isPostRequestElementSet('lock')) && (getConfig('url_blacklist') != 'Y')) {
+	} elseif ((isPostRequestParameterSet('lock')) && (getConfig('url_blacklist') != 'Y')) {
 		// URL blacklist not activated
 		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_URL_BLACKLIST_DISABLED'));
 	} else {