X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fframetester.php;h=5779deb1bf8ca5b422ba05281994a6e2d8a3ae7f;hb=7fabfadce30a7bea7ce3ad1f1e2e7e5e616f2669;hp=80e829565226a8a54125e90a22836e87a747a304;hpb=7b0f17cd637e388049d2167811e4332cec1e979b;p=mailer.git

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index 80e8295652..5779deb1bf 100644
--- a/inc/modules/frametester.php
+++ b/inc/modules/frametester.php
@@ -17,7 +17,7 @@
  * 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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,18 +38,17 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-}
+	die();
+} // END - if
 
 $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 `subject`, `url` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s AND `sender`=%s AND `data_type`='TEMP' LIMIT 1",
+			array(bigintval(getRequestElement('order')), getUserId()), __FILE__, __LINE__);
 
 		// Finally is the entry valid?
 		if (SQL_NUMROWS($result) == 1) {
@@ -57,7 +56,7 @@ if (REQUEST_ISSET_GET(('order'))) {
 			list($sub, $url) = SQL_FETCHROW($result);
 
 			// This fixes a white page
-			REQUEST_SET_POST('url', $url);
+			setRequestPostElement('url', $url);
 
 			// Mode is member
 			$mode = 'member';
@@ -72,51 +71,51 @@ if (REQUEST_ISSET_GET(('order'))) {
 		// He is no longer logged in
 		redirectToUrl('modules.php?module=index&what=login');
 	}
-}
+} // END - if
 
-if ((REQUEST_ISSET_POST(('url'))) || (REQUEST_ISSET_GET(('url'))) || (REQUEST_ISSET_GET(('frame')))) {
+if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (isGetRequestElementSet('frame'))) {
 	// Default URL is ours
-	$url = constant('URL');
+	$url = getConfig('URL');
 
 	// Decode URL if set in GET parameters
-	if (REQUEST_ISSET_GET(('url')))  $url = decodeString(str_replace(' ', '+', compileUriCode(urldecode(REQUEST_GET('url')))));
+	if (isGetRequestElementSet('url'))  $url = decodeString(str_replace(' ', '+', compileUriCode(urldecode(getRequestElement('url')))));
 
 	// Use URL from POST data if set
-	if (REQUEST_ISSET_POST(('url'))) $url = REQUEST_POST('url');
+	if (isPostRequestElementSet('url')) $url = postRequestElement('url');
 
 	// Add missing element
 	$frame = '';
-	if (REQUEST_ISSET_GET(('frame'))) $frame = REQUEST_GET(('frame'));
+	if (isGetRequestElementSet('frame')) $frame = getRequestElement('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;
+		case '':
+			switch ($mode)
+			{
+				case 'member':
+					// Build frameset
+					$content['order'] = bigintval(getRequestElement('order'));
+					$content['url']   = generateDerefererUrl($url);
+					loadTemplate('member_order_frametester', false, $content);
+					break;
 
-		case 'guest':
-			define('__URL_VALUE'  , DEREFERER($url));
-			LOAD_TEMPLATE('guest_frametester');
+				case 'guest':
+					$content['url']   = generateDerefererUrl($url);
+					loadTemplate('guest_frametester', false, $content);
+					break;
+			}
 			break;
-		}
-		break;
 
-	case 'test_top':
-		LOAD_TEMPLATE('admin_settings_saved', false, '<div class="guest_done">{--GUEST_FRAMETESTER_TOP--}</span>');
-		break;
+				case 'test_top':
+					loadTemplate('admin_settings_saved', false, '<div class="guest_done">{--GUEST_FRAMETESTER_TOP--}</span>');
+					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;
 	}
 } else {
 	// Go away...