X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fframetester.php;h=93c5eb126a212c20ac7e5fff3b88ab9ccfba84a1;hb=8c46238f94898e46f98e775855e10f9d96ee6628;hp=a153bcb2e8ed1837a0f105cbe9bc3afc4ce0e998;hpb=6914ebaaae909093df86d010e4c754a43d1a1aed;p=mailer.git

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index a153bcb2e8..93c5eb126a 100644
--- a/inc/modules/frametester.php
+++ b/inc/modules/frametester.php
@@ -14,12 +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                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * 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 *
@@ -39,17 +37,17 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } // END - if
 
 $mode = 'guest';
 
-if (isGetRequestParameterSet('order')) {
+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",
-			array(bigintval(getRequestParameter('order')), getMemberId()), __FILE__, __LINE__);
+			array(bigintval(getRequestElement('order')), getMemberId()), __FILE__, __LINE__);
 
 		// Finally is the entry valid?
 		if (SQL_NUMROWS($result) == 1) {
@@ -57,12 +55,12 @@ if (isGetRequestParameterSet('order')) {
 			list($sub, $url) = SQL_FETCHROW($result);
 
 			// This fixes a white page
-			setPostRequestParameter('url', $url);
+			setPostRequestElement('url', $url);
 
 			// Mode is member
 			$mode = 'member';
 		} else {
-			// Matching line not found!
+			// Matching line not found
 			redirectToUrl('modules.php?module=index&what=login');
 		}
 
@@ -74,49 +72,54 @@ if (isGetRequestParameterSet('order')) {
 	}
 } // END - if
 
-if ((isPostRequestParameterSet('url')) || (isGetRequestParameterSet('url')) || (isGetRequestParameterSet('frame'))) {
+if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (!isFullPage())) {
 	// Default URL is ours
 	$url = getUrl();
 
 	// Use URL from POST or GET data if set
-	if (isPostRequestParameterSet('url')) {
+	if (isPostRequestElementSet('url')) {
 		// POST data comes first
-		$url = postRequestParameter('url');
-	} elseif (isGetRequestParameterSet('url')) {
+		$url = postRequestElement('url');
+	} elseif (isGetRequestElementSet('url')) {
 		// Then GET data
-	 	$url = decodeString(str_replace(' ', '+', compileUriCode(urldecode(getRequestParameter('url')))));
+	 	$url = decodeString(str_replace(' ', '+', compileUriCode(urldecode(getRequestElement('url')))));
 	}
 
 	// Add missing element
 	$frame = '';
-	if (isGetRequestParameterSet('frame')) $frame = getRequestParameter('frame');
+	if (!isFullPage()) {
+		$frame = getRequestElement('frame');
+	} // END - if
+
+	// Switch on 'frame'
+	// @TODO Rewrite this somehow
 	switch ($frame) {
 		case '':
 			switch ($mode) {
 				case 'member':
 					// Build frameset
-					$content['order'] = bigintval(getRequestParameter('order'));
-					$content['url']   = generateDerefererUrl($url);
-					loadTemplate('member_order_frametester', false, $content);
+					$content['order'] = bigintval(getRequestElement('order'));
+					$content['url']   = generateDereferrerUrl($url);
+					loadTemplate('member_order_frametester', FALSE, $content);
 					break;
 
 				case 'guest':
-					$content['url']   = generateDerefererUrl($url);
-					loadTemplate('guest_frametester', false, $content);
+					$content['url']   = generateDereferrerUrl($url);
+					loadTemplate('guest_frametester', FALSE, $content);
 					break;
 			} // END - switch
 			break;
 
 		case 'test_top':
-			loadTemplate('admin_settings_saved', false, '{--GUEST_FRAMETESTER_TOP--}');
+			displayMessage('{--GUEST_FRAMETESTER_TOP--}');
 			break;
 
 		case 'back': // Back buttom
-			loadTemplate('member_order_back', false, getRequestParameter('order'));
+			loadTemplate('member_order_back', FALSE, getRequestElement('order'));
 			break;
 
 		case 'send': // Send mail away
-			loadTemplate('member_order_send', false, getRequestParameter('order'));
+			loadTemplate('member_order_send', FALSE, getRequestElement('order'));
 			break;
 	} // END - switch
 } else {