X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fframetester.php;h=c8899186684ff6c35febd8717c701ba87a000f75;hb=a2c7de83aee38352745f21273b04dc43963da9b7;hp=1bff771c2f38ed19e76cfd950037450960917236;hpb=bc72f913ef9ef26f4103d3deddb4d8be5337a1e5;p=mailer.git

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index 1bff771c2f..c889918668 100644
--- a/inc/modules/frametester.php
+++ b/inc/modules/frametester.php
@@ -14,11 +14,10 @@
  * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -38,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } // END - if
 
 $mode = 'guest';
@@ -47,7 +46,7 @@ if (isGetRequestElementSet('order')) {
 	// Order number placed, is he also logged in?
 	if (isMember()) {
 		// Ok, test passed... :)
-		$result = SQL_QUERY_ESC("SELECT `subject`, `url` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s AND `sender`=%s 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(getRequestElement('order')), getMemberId()), __FILE__, __LINE__);
 
 		// Finally is the entry valid?
@@ -61,7 +60,7 @@ if (isGetRequestElementSet('order')) {
 			// Mode is member
 			$mode = 'member';
 		} else {
-			// Matching line not found!
+			// Matching line not found
 			redirectToUrl('modules.php?module=index&what=login');
 		}
 
@@ -73,9 +72,9 @@ if (isGetRequestElementSet('order')) {
 	}
 } // END - if
 
-if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (isGetRequestElementSet('frame'))) {
+if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (!isFullPage())) {
 	// Default URL is ours
-	$url = getConfig('URL');
+	$url = getUrl();
 
 	// Use URL from POST or GET data if set
 	if (isPostRequestElementSet('url')) {
@@ -88,7 +87,12 @@ if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (isGe
 
 	// Add missing element
 	$frame = '';
-	if (isGetRequestElementSet('frame')) $frame = getRequestElement('frame');
+	if (!isFullPage()) {
+		$frame = getRequestElement('frame');
+	} // END - if
+
+	// Switch on 'frame'
+	// @TODO Rewrite this somehow
 	switch ($frame) {
 		case '':
 			switch ($mode) {
@@ -107,7 +111,7 @@ if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (isGe
 			break;
 
 		case 'test_top':
-			loadTemplate('admin_settings_saved', false, '<div class="guest_done">{--GUEST_FRAMETESTER_TOP--}</span>');
+			displayMessage('{--GUEST_FRAMETESTER_TOP--}');
 			break;
 
 		case 'back': // Back buttom