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

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index 0b42976a8d..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                                  *
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Testet die Mitgliedsseite gegen Frame-Killer     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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                           *
+ * 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 *
@@ -32,93 +37,91 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-}
+if (!defined('__SECURITY')) {
+	die();
+} // END - if
 
-$MODE = "guest";
+$mode = 'guest';
 
-if (!empty($_GET['order']))
-{
+if (isGetRequestParameterSet('order')) {
 	// Order number placed, is he also logged in?
-	if(IS_LOGGED_IN())
-	{
+	if (isMember()) {
 		// Ok, test passed... :)
-		$result = SQL_QUERY_ESC("SELECT subject, url FROM "._MYSQL_PREFIX."_pool WHERE id=%d AND sender=%d AND data_type='TEMP' LIMIT 1",
-		 array(bigintval($_GET['order']), $GLOBALS['userid']), __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(getRequestParameter('order')), getMemberId()), __FILE__, __LINE__);
 
 		// Finally is the entry valid?
-		if (SQL_NUMROWS($result) == 1)
-		{
+		if (SQL_NUMROWS($result) == 1) {
 			// Load subject and URL (but forwhat do we need the subject line here???
 			list($sub, $url) = SQL_FETCHROW($result);
 
 			// This fixes a white page
-			$_POST['url'] = $url;
+			setPostRequestParameter('url', $url);
 
-			// Update his login data
-			UPDATE_LOGIN_DATA();
-			$MODE = "member";
-		}
-		 else
-		{
+			// Mode is member
+			$mode = 'member';
+		} else {
 			// Matching line not found!
-			LOAD_URL(URL."/modules.php?module=index&amp;what=login");
+			redirectToUrl('modules.php?module=index&amp;what=login');
 		}
 
 		// Free memory
 		SQL_FREERESULT($result);
-	}
-	 else
-	{
+	} else {
 		// He is no longer logged in
-		LOAD_URL(URL."/modules.php?module=index&amp;what=login");
+		redirectToUrl('modules.php?module=index&amp;what=login');
 	}
-}
+} // END - if
 
-if ((!empty($_POST['url'])) || (!empty($_GET['url'])) || (!empty($_GET['frame'])))
-{
-	$url = URL;
-	if (!empty($_POST['url'])) $url = $_POST['url'];
-	if (!empty($_GET['url']))  $url = base64_decode(urldecode(COMPILE_CODE($_GET['url'])));
-	switch ($_GET['frame'])
-	{
-	case "":
-		switch ($MODE)
-		{
-		case "member":
-			// Build frameset
-			define('__ORDER_VALUE', bigintval($_GET['order']));
-			define('__URL_VALUE'  , DEREFERER($url));
-			LOAD_TEMPLATE("member_order_frametester");
-			break;
+if ((isPostRequestParameterSet('url')) || (isGetRequestParameterSet('url')) || (isGetRequestParameterSet('frame'))) {
+	// Default URL is ours
+	$url = getConfig('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')))));
+	}
 
-		case "guest":
-			define('__URL_VALUE'  , DEREFERER($url));
-			LOAD_TEMPLATE("guest_frametester");
+	// Add missing element
+	$frame = '';
+	if (isGetRequestParameterSet('frame')) $frame = getRequestParameter('frame');
+	switch ($frame) {
+		case '':
+			switch ($mode) {
+				case 'member':
+					// Build frameset
+					$content['order'] = bigintval(getRequestParameter('order'));
+					$content['url']   = generateDerefererUrl($url);
+					loadTemplate('member_order_frametester', false, $content);
+					break;
+
+				case 'guest':
+					$content['url']   = generateDerefererUrl($url);
+					loadTemplate('guest_frametester', false, $content);
+					break;
+			} // END - switch
 			break;
-		}
-		break;
 
-	case "test_top":
-		OUTPUT_HTML("<STRONG 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, $_GET['order']);
-		break;
+		case 'back': // Back buttom
+			loadTemplate('member_order_back', false, getRequestParameter('order'));
+			break;
 
-	case "send": // Send mail away
-		LOAD_TEMPLATE("member_order_send", false, $_GET['order']);
-		break;
-	}
-}
- else
-{
+		case 'send': // Send mail away
+			loadTemplate('member_order_send', false, getRequestParameter('order'));
+			break;
+	} // END - switch
+} else {
 	// Go away...
-	LOAD_URL(URL."/modules.php?module=login");
+	redirectToUrl('modules.php?module=login');
 }
-//
+
+// [EOF]
 ?>