X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-unlock_emails.php;h=a89fab4d145394edce1192b1b3e87bcbedc55b15;hb=d90ace91b5fce766924e587d20450f45318ccc64;hp=1d79858caadf95b6ed2bfa1569aa3ff9242c4529;hpb=80e2def8ef2125fd4d7d1312ee3993ab613f0846;p=mailer.git

diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index 1d79858caa..a89fab4d14 100644
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -32,13 +32,13 @@
  ************************************************************************/
 
 // 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__));
+ADD_DESCR("admin", __FILE__);
 
 // Define some variables
 global $DATA;
@@ -64,27 +64,29 @@ if ((SQL_NUMROWS($result_main) > 0) || (isset($_POST['lock']))) {
 				// Secure ID number
 				$id = bigintval($id);
 
-				// 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__);
-
-				// Update wents fine?
-				if (SQL_AFFECTEDROWS() == 1) {
-					// Order placed in queue...        0         1           2           3             4
-					$result = SQL_QUERY_ESC("SELECT po.url, po.subject, po.sender, pay.payment, po.payment_id
+				// 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__);
+					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")) {
 						// Add points directly
@@ -96,10 +98,14 @@ LIMIT 1",
 					} // END - if
 
 					// Load email template
-					$msg_user = LOAD_EMAIL_TEMPLATE("order-accept", "", $DATA['sender']);
+					$msg_user = LOAD_EMAIL_TEMPLATE("order-accept", array(), $DATA['sender']);
 
 					// Send email
 					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
 
@@ -131,7 +137,7 @@ LIMIT 1",
 				SQL_FREERESULT($result);
 
 				// Load email template and send it away
-				$msg_user = LOAD_EMAIL_TEMPLATE("order-reject", "", $DATA['sender']);
+				$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!
@@ -212,7 +218,7 @@ LIMIT 1",
 		}
 
 		// Free memory
-		SQL_FREERESULT($result);
+		SQL_FREERESULT($result_main);
 		define('__UNLOCK_ROWS', $OUT);
 
 		// Prepare rejection URL