X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fframetester.php;h=4e3f4f305400f05a757f135d01a4c2aba88dfeca;hp=48ff5cc346718b6c90f8791683774fdfba22ceb3;hb=2cce06a4f4ff6bdbf0a14dcf7d2a89944b472c69;hpb=a05706f3f5f5e6ae26c2114d2fd3ede01d5fe093

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index 48ff5cc346..4e3f4f3054 100644
--- a/inc/modules/frametester.php
+++ b/inc/modules/frametester.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
@@ -41,9 +41,9 @@ $MODE = "guest";
 
 if (!empty($_GET['order'])) {
 	// Order number placed, is he also logged in?
-	if(IS_LOGGED_IN()) {
+	if(IS_MEMBER()) {
 		// Ok, test passed... :)
-		$result = SQL_QUERY_ESC("SELECT subject, url FROM "._MYSQL_PREFIX."_pool WHERE id=%d AND sender=%d AND data_type='TEMP' LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT subject, url FROM "._MYSQL_PREFIX."_pool WHERE id=%s AND sender=%s AND data_type='TEMP' LIMIT 1",
 		 array(bigintval($_GET['order']), $GLOBALS['userid']), __FILE__, __LINE__);
 
 		// Finally is the entry valid?
@@ -54,8 +54,7 @@ if (!empty($_GET['order'])) {
 			// This fixes a white page
 			$_POST['url'] = $url;
 
-			// Update his login data
-			UPDATE_LOGIN_DATA();
+			// Mode is member
 			$MODE = "member";
 		} else {
 			// Matching line not found!
@@ -71,11 +70,14 @@ if (!empty($_GET['order'])) {
 }
 
 if ((!empty($_POST['url'])) || (!empty($_GET['url'])) || (!empty($_GET['frame']))) {
+	// Default URL is ours
 	$url = URL;
-	if (!empty($_POST['url'])) $url = $_POST['url'];
 
-	// Decode URL if set
-	if (!empty($_GET['url']))  $url = COMPILE_CODE(gzuncompress(base64_decode(urldecode($_GET['url']))));
+	// Decode URL if set in GET parameters
+	if (!empty($_GET['url']))  $url = gzuncompress(base64_decode(str_replace(" ", "+", COMPILE_CODE(urldecode($_GET['url'])))));
+
+	// Use URL from POST data if set
+	if (!empty($_POST['url'])) $url = $_POST['url'];
 
 	// Add missing element
 	$frame = "";