Renamed function so it might be more understandable

[mailer.git] / inc / modules / frametester.php

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index ef0af221055c67e0e0d3972c95d2bab58de8f534..a22d755644126ce4929bc2d73fae4dceb711e0eb 100644 (file)
--- 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,10 +14,9 @@
  * $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                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,18 +37,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 (isGetRequestParameterSet('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(getRequestParameter('order')), getMemberId()), __FILE__, __LINE__);
 
                // Finally is the entry valid?
                if (SQL_NUMROWS($result) == 1) {
@@ -57,7 +55,7 @@ if (REQUEST_ISSET_GET('order')) {
                        list($sub, $url) = SQL_FETCHROW($result);
 
                        // This fixes a white page
-                       REQUEST_SET_POST('url', $url);
+                       setPostRequestParameter('url', $url);
 
                        // Mode is member
                        $mode = 'member';
@@ -74,53 +72,55 @@ if (REQUEST_ISSET_GET('order')) {
        }
 } // END - if
 
-if ((REQUEST_ISSET_POST('url')) || (REQUEST_ISSET_GET('url')) || (REQUEST_ISSET_GET('frame'))) {
+if ((isPostRequestParameterSet('url')) || (isGetRequestParameterSet('url')) || (isGetRequestParameterSet('frame'))) {
        // Default URL is ours
-       $url = getConfig('URL');
+       $url = getUrl();
 
-       // Decode URL if set in GET parameters
-       if (REQUEST_ISSET_GET('url'))  $url = decodeString(str_replace(' ', '+', compileUriCode(urldecode(REQUEST_GET('url')))));
-
-       // Use URL from POST data if set
-       if (REQUEST_ISSET_POST('url')) $url = REQUEST_POST('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 (REQUEST_ISSET_GET('frame')) $frame = REQUEST_GET('frame');
-       switch ($frame)
-       {
+       if (isGetRequestParameterSet('frame')) $frame = getRequestParameter('frame');
+       switch ($frame) {
                case '':
-                       switch ($mode)
-                       {
+                       switch ($mode) {
                                case 'member':
                                        // Build frameset
-                                       define('__ORDER_VALUE', bigintval(REQUEST_GET('order')));
-                                       define('__URL_VALUE'  , DEREFERER($url));
-                                       LOAD_TEMPLATE('member_order_frametester');
+                                       $content['order'] = bigintval(getRequestParameter('order'));
+                                       $content['url']   = generateDerefererUrl($url);
+                                       loadTemplate('member_order_frametester', false, $content);
                                        break;
 
                                case 'guest':
-                                       define('__URL_VALUE'  , DEREFERER($url));
-                                       LOAD_TEMPLATE('guest_frametester');
+                                       $content['url']   = generateDerefererUrl($url);
+                                       loadTemplate('guest_frametester', false, $content);
                                        break;
-                       }
+                       } // END - switch
                        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, '{--GUEST_FRAMETESTER_TOP--}');
+                       break;
 
-                               case 'back': // Back buttom
-                                       LOAD_TEMPLATE('member_order_back', false, REQUEST_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, REQUEST_GET('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]
 ?>