X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fframetester.php;h=09898ff036a0818c34be7ee2463df0cef1fb2e98;hb=84dd2fecd5b013cf6f4c4e7dee8b0d470b6a5f5c;hp=0aaff8376ee67ff118fa0f34a352915d6370a457;hpb=a090e351c49fe021fb3064325694da03402332e0;p=mailer.git

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index 0aaff8376e..09898ff036 100644
--- a/inc/modules/frametester.php
+++ b/inc/modules/frametester.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/24/2003 *
- * ===============                              Last change: 06/30/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 10/24/2003 *
+ * ===================                          Last change: 06/30/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : 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 - 2008 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * 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,89 +37,95 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-}
+	exit();
+} // END - if
 
-$MODE = 'guest';
+$mode = 'guest';
 
-if (REQUEST_ISSET_GET(('order'))) {
+if (isGetRequestElementSet('order')) {
 	// Order number placed, is he also logged in?
-	if (IS_MEMBER()) {
+	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(REQUEST_GET('order')), getUserId()), __FILE__, __LINE__);
+		$result = SQL_QUERY_ESC("SELECT `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?
 		if (SQL_NUMROWS($result) == 1) {
 			// Load subject and URL (but forwhat do we need the subject line here???
-			list($sub, $url) = SQL_FETCHROW($result);
+			list($url) = SQL_FETCHROW($result);
 
 			// This fixes a white page
-			REQUEST_SET_POST('url', $url);
+			setPostRequestElement('url', $url);
 
 			// Mode is member
-			$MODE = 'member';
+			$mode = 'member';
 		} else {
-			// Matching line not found!
-			LOAD_URL("modules.php?module=index&amp;what=login");
+			// Matching line not found
+			redirectToUrl('modules.php?module=index&amp;what=login');
 		}
 
 		// Free memory
 		SQL_FREERESULT($result);
 	} else {
 		// He is no longer logged in
-		LOAD_URL("modules.php?module=index&amp;what=login");
+		redirectToUrl('modules.php?module=index&amp;what=login');
 	}
-}
+} // END - if
 
-if ((REQUEST_ISSET_POST(('url'))) || (REQUEST_ISSET_GET(('url'))) || (REQUEST_ISSET_GET(('frame')))) {
+if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (!isFullPage())) {
 	// Default URL is ours
-	$url = constant('URL');
-
-	// Decode URL if set in GET parameters
-	if (REQUEST_ISSET_GET(('url')))  $url = decodeString(str_replace(" ", "+", compileUriCode(urldecode(REQUEST_GET('url')))));
+	$url = getUrl();
 
-	// Use URL from POST data if set
-	if (REQUEST_ISSET_POST(('url'))) $url = REQUEST_POST('url');
+	// Use URL from POST or GET data if set
+	if (isPostRequestElementSet('url')) {
+		// POST data comes first
+		$url = postRequestElement('url');
+	} elseif (isGetRequestElementSet('url')) {
+		// Then GET data
+	 	$url = decodeString(str_replace(' ', '+', compileUriCode(urldecode(getRequestElement('url')))));
+	}
 
 	// Add missing element
 	$frame = '';
-	if (REQUEST_ISSET_GET(('frame'))) $frame = REQUEST_GET(('frame'));
-	switch ($frame)
-	{
-	case "":
-		switch ($MODE)
-		{
-		case 'member':
-			// Build frameset
-			define('__ORDER_VALUE', bigintval(REQUEST_GET('order')));
-			define('__URL_VALUE'  , DEREFERER($url));
-			LOAD_TEMPLATE("member_order_frametester");
-			break;
+	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(getRequestElement('order'));
+					$content['url']   = generateDereferrerUrl($url);
+					loadTemplate('member_order_frametester', FALSE, $content);
+					break;
 
-		case 'guest':
-			define('__URL_VALUE'  , DEREFERER($url));
-			LOAD_TEMPLATE("guest_frametester");
+				case 'guest':
+					$content['url']   = generateDereferrerUrl($url);
+					loadTemplate('guest_frametester', FALSE, $content);
+					break;
+			} // END - switch
 			break;
-		}
-		break;
 
-	case "test_top":
-		LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"guest_done\">{--GUEST_FRAMETESTER_TOP--}</span>");
-		break;
+		case 'test_top':
+			displayMessage('{--GUEST_FRAMETESTER_TOP--}');
+			break;
 
-	case "back": // Back buttom
-		LOAD_TEMPLATE("member_order_back", false, REQUEST_GET('order'));
-		break;
+		case 'back': // Back buttom
+			loadTemplate('member_order_back', FALSE, getRequestElement('order'));
+			break;
 
-	case "send": // Send mail away
-		LOAD_TEMPLATE("member_order_send", false, REQUEST_GET('order'));
-		break;
-	}
+		case 'send': // Send mail away
+			loadTemplate('member_order_send', FALSE, getRequestElement('order'));
+			break;
+	} // END - switch
 } else {
 	// Go away...
-	LOAD_URL("modules.php?module=login");
+	redirectToUrl('modules.php?module=login');
 }
-//
+
+// [EOF]
 ?>