X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-unlock_emails.php;h=45281dd170fc475e66c3a66997d7192e57728445;hp=ddc051d56eecb756aab1ab6cd3510d24fc689869;hb=ca7455674c0f02d34cbfc22a823393ba629a5160;hpb=307a4e11763f0914e73dc756b219356e1c29ab25

diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index ddc051d56e..45281dd170 100644
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -32,112 +32,119 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
+
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
 
 // Define some variables
-global $DATA, $link;
+global $DATA;
 
 // Check for mails
 $result_main = SQL_QUERY("SELECT id, sender, subject, payment_id, timestamp, url, target_send, cat_id FROM "._MYSQL_PREFIX."_pool WHERE data_type='ADMIN' ORDER BY timestamp", __FILE__, __LINE__);
 
-OPEN_TABLE("100%", "admin_content admin_content_align", "");
-if ((SQL_NUMROWS($result_main) > 0) || (isset($_POST['lock'])))
-{
+if ((SQL_NUMROWS($result_main) > 0) || (isset($_POST['lock']))) {
 	// Count checked checkboxes
 	$SEL = 0;
-	if (isset($_POST['sel']))
-	{
+	if (isset($_POST['sel'])) {
 		// Are there checked boxes?
-		if (count($_POST['sel']) > 0)
-		{
+		if (count($_POST['sel']) > 0) {
 			// Count now... We use an own function for now
 			$SEL = SELECTION_COUNT($_POST['sel']);
-		}
-	}
-	if (isset($_POST['accept']))
-	{
-		if ($SEL > 0)
-		{
+		} // END - if
+	} // END - if
+
+	if (isset($_POST['accept'])) {
+		if ($SEL > 0) {
 			// Accept mail orders
-			foreach ($_POST['sel'] as $id=>$value)
-			{
+			foreach ($_POST['sel'] as $id => $value) {
 				// Secure ID number
 				$id = bigintval($id);
 
-				// Unlock selected email
-				$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='NEW' WHERE id=%d AND data_type='ADMIN' LIMIT 1",
-				 array($id), __FILE__, __LINE__);
-				if (SQL_AFFECTEDROWS($link, __FILE__, __LINE__) == 1)
-				{
-					// Order placed in queue...
-					$result = SQL_QUERY_ESC("SELECT url, subject, sender FROM "._MYSQL_PREFIX."_pool WHERE id=%d LIMIT 1",
-					 array($id), __FILE__, __LINE__);
-					$DATA = SQL_FETCHROW($result);
+				// Order placed in queue...
+				$result = SQL_QUERY_ESC("SELECT po.url, po.subject, po.sender, pay.payment, po.payment_id
+FROM "._MYSQL_PREFIX."_pool AS po
+INNER JOIN "._MYSQL_PREFIX."_payments AS pay
+ON po.payment_id=pay.id
+WHERE po.id=%s
+LIMIT 1",
+					array($id), __FILE__, __LINE__);
+
+				// Update wents fine?
+				if (SQL_NUMROWS($result) == 1) {
+					// Load data
+					$DATA = SQL_FETCHARRAY($result);
+
+					// Free result
 					SQL_FREERESULT($result);
 
+					// Is the surfbar installed?
+					if ((EXT_IS_ACTIVE("surfbar")) && ($_CONFIG['surfbar_migrate_order'] == "Y")) {
+						// Then "migrate" the URL to the surfbar
+						SURFBAR_ADMIN_MIGRATE_URL($DATA['url'], $DATA['sender']);
+					} // END - if
+
 					// Check for bonus extension version >= 0.4.4 for the order bonus
-					if ((GET_EXT_VERSION("bonus") >= "0.4.4") && ($_CONFIG['bonus_active'] == "Y"))
-					{
+					if ((GET_EXT_VERSION("bonus") >= "0.4.4") && ($_CONFIG['bonus_active'] == "Y")) {
 						// Add points directly
-						$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET bonus_order=bonus_order+".$_CONFIG['bonus_order']." WHERE userid=%d LIMIT 1",
-						 array(bigintval($DATA[2])), __FILE__, __LINE__);
+						$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET bonus_order=bonus_order+".$_CONFIG['bonus_order']." WHERE userid=%s LIMIT 1",
+						 array(bigintval($DATA['sender'])), __FILE__, __LINE__);
 
 						// Subtract bonus points from system
 						BONUS_POINTS_HANDLER($_CONFIG['bonus_order']);
-					}
+					} // END - if
 
 					// Load email template
-					$msg_user = LOAD_EMAIL_TEMPLATE("order-accept", "", $DATA[2]);
+					$msg_user = LOAD_EMAIL_TEMPLATE("order-accept", array(), $DATA['sender']);
 
 					// Send email
-					SEND_EMAIL($DATA[2], MEMBER_ORDER_ACCEPTED, $msg_user);
-				}
-			}
+					SEND_EMAIL($DATA['sender'], MEMBER_ORDER_ACCEPTED, $msg_user);
+
+					// Unlock selected email
+					$result = 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
+			} // END - foreach
 
 			// Set message
 			$MSG = ADMIN_MAILS_ACTIVATED;
-		}
-		 else
-		{
+		} else {
 			// Nothing checked!
 			$MSG = ADMIN_MAILS_NOTHING_CHECKED;
 		}
 
 		// Mails unlocked for mail delivery
 		LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
-	}
-	 elseif (isset($_POST['reject']))
-	{
-		if ($SEL > 0)
-		{
+	} elseif (isset($_POST['reject'])) {
+		if ($SEL > 0) {
 			// Reject mail orders
 			$SW = 2; $OUT = "";
-			foreach ($_POST['sel'] as $id=>$value)
-			{
+			foreach ($_POST['sel'] as $id => $value) {
 				// Secure ID number
 				$id = bigintval($id);
 
 				// Load URL and subject from pool
-				$result = SQL_QUERY_ESC("SELECT url, subject, sender FROM "._MYSQL_PREFIX."_pool WHERE id=%d LIMIT 1",
+				$result = SQL_QUERY_ESC("SELECT url, subject, sender FROM "._MYSQL_PREFIX."_pool WHERE id=%s LIMIT 1",
 				 array($id), __FILE__, __LINE__);
-				$DATA = SQL_FETCHROW($result);
+
+				// Load data
+				$DATA = SQL_FETCHARRAY($result);
+
+				// Free result
 				SQL_FREERESULT($result);
 
 				// Load email template and send it away
-				$msg_user = LOAD_EMAIL_TEMPLATE("order-reject", "", $DATA[2]);
-				SEND_EMAIL($DATA[2], MEMBER_ORDER_REJECTED, $msg_user);
+				$msg_user = LOAD_EMAIL_TEMPLATE("order-reject", array(), $DATA['sender']);
+				SEND_EMAIL($DATA['sender'], MEMBER_ORDER_REJECTED, $msg_user);
 
 				// If you do not enter an URL to redirect to, your URL will be set!
 				if ((empty($_POST['redirect'])) || ($_POST['redirect'] == "http://")) $_POST['redirect'] = URL;
 
 				// Redirect URL
-				$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET url='%s', data_type='NEW' WHERE id=%d LIMIT 1",
+				$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET url='%s', data_type='NEW' WHERE id=%s LIMIT 1",
 				 array($_POST['redirect'], $id),__FILE__, __LINE__);
 
 				// Prepare data for the row template
@@ -155,30 +162,22 @@ if ((SQL_NUMROWS($result_main) > 0) || (isset($_POST['lock'])))
 
 			// Load main template
 			LOAD_TEMPLATE("admin_unlock_emails_redir");
-		}
-		 else
-		{
+		} else {
 			// Nothing selected
 			LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_MAILS_NOTHING_CHECKED);
 		}
-	}
-	 elseif ((isset($_POST['lock'])) || ($SEL > 0))
-	{
-		if ($SEL > 0)
-		{
+	} elseif ((isset($_POST['lock'])) || ($SEL > 0)) {
+		if ($SEL > 0) {
 			// Lock URLs
-			foreach ($_POST['sel'] as $id=>$url)
-			{
+			foreach ($_POST['sel'] as $id => $url) {
+				// Lookup in blacklist
 				$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_url_blist 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... :)
 					$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_url_blist (url, timestamp) VALUES ('%s', UNIX_TIMESTAMP())",
 					 array($url), __FILE__, __LINE__);
-				}
-				 else
-				{
+				} else {
 					// Free memory
 					SQL_FREERESULT($result);
 				}
@@ -186,16 +185,12 @@ if ((SQL_NUMROWS($result_main) > 0) || (isset($_POST['lock'])))
 
 			// Set message
 			$MSG = ADMIN_URLS_BLOCKED;
-		}
-		 else
-		{
+		} else {
 			// Nothing selected
 			$MSG = ADMIN_MAILS_NOTHING_CHECKED;
 		}
 		LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
-	}
-	 elseif ((empty($_POST['lock'])) && (empty($_POST['accept'])) && (empty($_POST['reject'])))
-	{
+	} elseif ((empty($_POST['lock'])) && (empty($_POST['accept'])) && (empty($_POST['reject']))) {
 		// Mail orders are in pool so we can display them
 		$SW = 2; $OUT = "";
 		while (list($id, $sender, $subj, $pay, $time, $url, $tsend, $cat) = SQL_FETCHROW($result_main))
@@ -233,19 +228,14 @@ if ((SQL_NUMROWS($result_main) > 0) || (isset($_POST['lock'])))
 
 		// Load main template
 		LOAD_TEMPLATE("admin_unlock_emails");
-	}
-	 else
-	{
+	} else {
 		// Wrong call!
 		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_WRONG_CALL);
 	}
-}
- else
-{
+} else {
 	// No mail orders fond
 	LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MAILS_IN_POOL);
 }
 
-CLOSE_TABLE();
 //
 ?>