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

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index 5779deb1bf..93c5eb126a 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 - 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';
@@ -48,7 +47,7 @@ if (isGetRequestElementSet('order')) {
 	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(getRequestElement('order')), getMemberId()), __FILE__, __LINE__);
 
 		// Finally is the entry valid?
 		if (SQL_NUMROWS($result) == 1) {
@@ -56,12 +55,12 @@ if (isGetRequestElementSet('order')) {
 			list($sub, $url) = SQL_FETCHROW($result);
 
 			// This fixes a white page
-			setRequestPostElement('url', $url);
+			setPostRequestElement('url', $url);
 
 			// Mode is member
 			$mode = 'member';
 		} else {
-			// Matching line not found!
+			// Matching line not found
 			redirectToUrl('modules.php?module=index&amp;what=login');
 		}
 
@@ -73,53 +72,60 @@ 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();
 
-	// 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 (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 (isGetRequestElementSet('frame')) $frame = getRequestElement('frame');
-	switch ($frame)
-	{
+	if (!isFullPage()) {
+		$frame = getRequestElement('frame');
+	} // END - if
+
+	// Switch on 'frame'
+	// @TODO Rewrite this somehow
+	switch ($frame) {
 		case '':
-			switch ($mode)
-			{
+			switch ($mode) {
 				case 'member':
 					// Build frameset
 					$content['order'] = bigintval(getRequestElement('order'));
-					$content['url']   = generateDerefererUrl($url);
-					loadTemplate('member_order_frametester', false, $content);
+					$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, '<div class="guest_done">{--GUEST_FRAMETESTER_TOP--}</span>');
-					break;
+		case 'test_top':
+			displayMessage('{--GUEST_FRAMETESTER_TOP--}');
+			break;
 
-				case 'back': // Back buttom
-					loadTemplate('member_order_back', false, getRequestElement('order'));
-					break;
+		case 'back': // Back buttom
+			loadTemplate('member_order_back', FALSE, getRequestElement('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, getRequestElement('order'));
+			break;
+	} // END - switch
 } else {
 	// Go away...
 	redirectToUrl('modules.php?module=login');
 }
-//
+
+// [EOF]
 ?>