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 1bff771c2f38ed19e76cfd950037450960917236..a22d755644126ce4929bc2d73fae4dceb711e0eb 100644 (file)
--- a/inc/modules/frametester.php
+++ b/inc/modules/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 - 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 *
@@ -43,12 +42,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')), getMemberId()), __FILE__, __LINE__);
+                       array(bigintval(getRequestParameter('order')), getMemberId()), __FILE__, __LINE__);
 
                // Finally is the entry valid?
                if (SQL_NUMROWS($result) == 1) {
@@ -56,7 +55,7 @@ if (isGetRequestElementSet('order')) {
                        list($sub, $url) = SQL_FETCHROW($result);
 
                        // This fixes a white page
-                       setPostRequestElement('url', $url);
+                       setPostRequestParameter('url', $url);
 
                        // Mode is member
                        $mode = 'member';
@@ -73,28 +72,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');
+       $url = getUrl();
 
        // Use URL from POST or GET data if set
-       if (isPostRequestElementSet('url')) {
+       if (isPostRequestParameterSet('url')) {
                // POST data comes first
-               $url = postRequestElement('url');
-       } elseif (isGetRequestElementSet('url')) {
+               $url = postRequestParameter('url');
+       } elseif (isGetRequestParameterSet('url')) {
                // Then GET data
-               $url = decodeString(str_replace(' ', '+', compileUriCode(urldecode(getRequestElement('url')))));
+               $url = decodeString(str_replace(' ', '+', compileUriCode(urldecode(getRequestParameter('url')))));
        }
 
        // Add missing element
        $frame = '';
-       if (isGetRequestElementSet('frame')) $frame = getRequestElement('frame');
+       if (isGetRequestParameterSet('frame')) $frame = getRequestParameter('frame');
        switch ($frame) {
                case '':
                        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;
@@ -107,15 +106,15 @@ if ((isPostRequestElementSet('url')) || (isGetRequestElementSet('url')) || (isGe
                        break;
 
                case 'test_top':
-                       loadTemplate('admin_settings_saved', false, '<div class="guest_done">{--GUEST_FRAMETESTER_TOP--}</span>');
+                       loadTemplate('admin_settings_saved', false, '{--GUEST_FRAMETESTER_TOP--}');
                        break;
 
                case 'back': // Back buttom
-                       loadTemplate('member_order_back', false, getRequestElement('order'));
+                       loadTemplate('member_order_back', false, getRequestParameter('order'));
                        break;
 
                case 'send': // Send mail away
-                       loadTemplate('member_order_send', false, getRequestElement('order'));
+                       loadTemplate('member_order_send', false, getRequestParameter('order'));
                        break;
        } // END - switch
 } else {