X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fframetester.php;h=61ffa739d2a257957ed54899a54b37e7d712a625;hb=ec653e165cf26f662e41d4040522ee135c539d22;hp=5779deb1bf8ca5b422ba05281994a6e2d8a3ae7f;hpb=1ebf518b9552f71ee95de6f4b80e6de3a27716d1;p=mailer.git

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index 5779deb1bf..61ffa739d2 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                                  *
@@ -48,7 +48,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) {
@@ -77,20 +77,21 @@ if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (isGe
 	// 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 (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)
-	{
+	switch ($frame) {
 		case '':
-			switch ($mode)
-			{
+			switch ($mode) {
 				case 'member':
 					// Build frameset
 					$content['order'] = bigintval(getRequestElement('order'));
@@ -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, 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]
 ?>