X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-unlock_emails.php;h=35c99671363bcb5474a24701629b45ba26e8eba9;hb=6810caae47787689d6f316c5bdd62e3722b363bb;hp=c8d9ef649efa2a8945198ea28e3f834acea11238;hpb=fc162164725588cf75969f707faead9c9cd8e68b;p=mailer.git

diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index c8d9ef649e..35c9967136 100644
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -43,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Check for mails
 $result_main = SQL_QUERY("SELECT
@@ -55,9 +53,9 @@ WHERE
 ORDER BY
 	`timestamp` ASC", __FILE__, __LINE__);
 
-if ((SQL_NUMROWS($result_main) > 0) || (isFormSent('lock'))) {
+if ((!SQL_HASZERONUMS($result_main)) || (isFormSent('lock'))) {
 	if (isFormSent('accept')) {
-		if (countPostSelection() > 0) {
+		if (ifPostContainsSelections()) {
 			// Accept mail orders
 			foreach (postRequestParameter('sel') as $id => $value) {
 				// Secure id number
@@ -82,9 +80,6 @@ LIMIT 1",
 					// Load data
 					$content = SQL_FETCHARRAY($result);
 
-					// Free result
-					SQL_FREERESULT($result);
-
 					// Is the surfbar installed?
 					// @TODO Rewrite these if-blocks to a filter
 					if ((isExtensionActive('surfbar')) && (getConfig('surfbar_migrate_order') == 'Y')) {
@@ -93,7 +88,7 @@ LIMIT 1",
 					} // END - if
 
 					// Check for bonus extension version >= 0.4.4 for the order bonus
-					if ((isExtensionInstalledAndNewer('bonus', '0.4.4')) && (getConfig('bonus_active') == 'Y')) {
+					if ((isExtensionInstalledAndNewer('bonus', '0.4.4')) && (isBonusRallyeActive())) {
 						// Add points directly
 						SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `bonus_order`=`bonus_order`+{?bonus_order?} WHERE `userid`=%s LIMIT 1",
 							array(bigintval($content['sender'])), __FILE__, __LINE__);
@@ -112,6 +107,9 @@ LIMIT 1",
 					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='NEW' WHERE `id`=%s AND `data_type`='ADMIN' LIMIT 1",
 						array($id), __FILE__, __LINE__);
 				} // END - if
+
+				// Free result
+				SQL_FREERESULT($result);
 			} // END - foreach
 
 			// Set message
@@ -123,10 +121,10 @@ LIMIT 1",
 
 		// Mails unlocked for mail delivery
 		loadTemplate('admin_settings_saved', false, $message);
-	} elseif (isPostRequestParameterSet(('reject'))) {
-		if (countPostSelection() > 0) {
+	} elseif (isPostRequestParameterSet('reject')) {
+		if (ifPostContainsSelections()) {
 			// Reject mail orders
-			$OUT = ''; $SW = 2;
+			$OUT = '';
 			foreach (postRequestParameter('sel') as $id => $value) {
 				// Secure id number
 				$id = bigintval($id);
@@ -146,7 +144,7 @@ LIMIT 1",
 				sendEmail($content['sender'], '{--MEMBER_ORDER_REJECTED--}', $message_user);
 
 				// If you do not enter an URL to redirect to, your URL will be set!
-				if ((!isPostRequestParameterSet('redirect')) || (postRequestParameter('redirect') == 'http://')) setPostRequestParameter('redirect', getConfig('URL'));
+				if ((!isPostRequestParameterSet('redirect')) || (postRequestParameter('redirect') == 'http://')) setPostRequestParameter('redirect', getUrl());
 
 				// Redirect URL
 				SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET url='%s', `data_type`='NEW' WHERE `id`=%s LIMIT 1",
@@ -154,15 +152,13 @@ LIMIT 1",
 
 				// Prepare data for the row template
 				$content = array(
-					'sw'  => $SW,
 					'id'  => $id,
 					'url' => postRequestParameter('url', $id),
 				);
 
 				// Load row template and switch colors
 				$OUT .= loadTemplate('admin_unlock_emails_redir_row', true, $content);
-				$SW = 3 - $SW;
-			}
+			} // END - foreach
 
 			// Load main template
 			loadTemplate('admin_unlock_emails_redir', false, $OUT);
@@ -170,7 +166,7 @@ LIMIT 1",
 			// Nothing selected
 			loadTemplate('admin_settings_saved', false, '{--ADMIN_MAILS_NOTHING_CHECKED--}');
 		}
-	} elseif ((isFormSent('lock')) && (countPostSelection() > 0) && (getConfig('url_blacklist') == 'Y')) {
+	} elseif ((isFormSent('lock')) && (ifPostContainsSelections()) && (isUrlBlacklistEnabled())) {
 		// Lock URLs
 		foreach (postRequestParameter('sel') as $id => $url) {
 			// Secure id number
@@ -193,15 +189,13 @@ LIMIT 1",
 		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;
+		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result_main)) {
 			// Prepare data for the template
-			$content['sw']        = $SW;
 			$content['timestamp'] = generateDateTime($content['timestamp'], 2);
 
 			// Load row template and switch colors
 			$OUT .= loadTemplate('admin_unlock_emails_row', true, $content);
-			$SW = 3 - $SW;
 		} // END - while
 
 		// Free memory
@@ -212,7 +206,7 @@ LIMIT 1",
 
 		// Load main template
 		loadTemplate('admin_unlock_emails', false, $content);
-	} elseif ((isFormSent('lock')) && (getConfig('url_blacklist') != 'Y')) {
+	} elseif ((isFormSent('lock')) && (!isUrlBlacklistEnabled())) {
 		// URL blacklist not activated
 		loadTemplate('admin_settings_saved', false, '{--ADMIN_URL_BLACKLIST_DISABLED--}');
 	} else {