X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fframetester.php;h=da3dbd84262592e6a3af8a24c77d5a7d88e5f425;hb=067dc339f4058c7834f5e5d2f7d8d44ce6d7cea3;hp=5779deb1bf8ca5b422ba05281994a6e2d8a3ae7f;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index 5779deb1bf..da3dbd8426 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                                  *
@@ -43,12 +43,12 @@ if (!defined('__SECURITY')) {
 
 $mode = 'guest';
 
-if (isGetRequestElementSet('order')) {
+if (isGetRequestParameterSet('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(getRequestElement('order')), getUserId()), __FILE__, __LINE__);
+			array(bigintval(getRequestParameter('order')), getMemberId()), __FILE__, __LINE__);
 
 		// Finally is the entry valid?
 		if (SQL_NUMROWS($result) == 1) {
@@ -56,7 +56,7 @@ if (isGetRequestElementSet('order')) {
 			list($sub, $url) = SQL_FETCHROW($result);
 
 			// This fixes a white page
-			setRequestPostElement('url', $url);
+			setPostRequestParameter('url', $url);
 
 			// Mode is member
 			$mode = 'member';
@@ -73,27 +73,28 @@ if (isGetRequestElementSet('order')) {
 	}
 } // END - if
 
-if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (isGetRequestElementSet('frame'))) {
+if ((isPostRequestParameterSet('url')) || (isGetRequestParameterSet('url')) || (isGetRequestParameterSet('frame'))) {
 	// Default URL is ours
 	$url = getConfig('URL');
 
-	// Decode URL if set in GET parameters
-	if (isGetRequestElementSet('url'))  $url = decodeString(str_replace(' ', '+', compileUriCode(urldecode(getRequestElement('url')))));
-
-	// Use URL from POST data if set
-	if (isPostRequestElementSet('url')) $url = postRequestElement('url');
+	// Use URL from POST or GET data if set
+	if (isPostRequestParameterSet('url')) {
+		// POST data comes first
+		$url = postRequestParameter('url');
+	} elseif (isGetRequestParameterSet('url')) {
+		// Then GET data
+	 	$url = decodeString(str_replace(' ', '+', compileUriCode(urldecode(getRequestParameter('url')))));
+	}
 
 	// Add missing element
 	$frame = '';
-	if (isGetRequestElementSet('frame')) $frame = getRequestElement('frame');
-	switch ($frame)
-	{
+	if (isGetRequestParameterSet('frame')) $frame = getRequestParameter('frame');
+	switch ($frame) {
 		case '':
-			switch ($mode)
-			{
+			switch ($mode) {
 				case 'member':
 					// Build frameset
-					$content['order'] = bigintval(getRequestElement('order'));
+					$content['order'] = bigintval(getRequestParameter('order'));
 					$content['url']   = generateDerefererUrl($url);
 					loadTemplate('member_order_frametester', false, $content);
 					break;
@@ -102,24 +103,25 @@ if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (isGe
 					$content['url']   = generateDerefererUrl($url);
 					loadTemplate('guest_frametester', false, $content);
 					break;
-			}
+			} // END - switch
 			break;
 
-				case 'test_top':
-					loadTemplate('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
-					loadTemplate('member_order_back', false, getRequestElement('order'));
-					break;
+		case 'back': // Back buttom
+			loadTemplate('member_order_back', false, getRequestParameter('order'));
+			break;
 
-				case 'send': // Send mail away
-					loadTemplate('member_order_send', false, getRequestElement('order'));
-					break;
-	}
+		case 'send': // Send mail away
+			loadTemplate('member_order_send', false, getRequestParameter('order'));
+			break;
+	} // END - switch
 } else {
 	// Go away...
 	redirectToUrl('modules.php?module=login');
 }
-//
+
+// [EOF]
 ?>