More constant rewrites

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

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index 9a0dd6c95fb55bf9136b84fad8b9971228d78609..bd090bdd7e4963fde51527a39b81fc489153631e 100644 (file)
--- a/inc/modules/frametester.php
+++ b/inc/modules/frametester.php
@@ -39,12 +39,12 @@ if (!defined('__SECURITY')) {
 
 $MODE = "guest";
 
-if (!empty($_GET['order'])) {
+if (REQUEST_ISSET_GET(('order'))) {
        // Order number placed, is he also logged in?
        if (IS_MEMBER()) {
                // 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($_GET['order']), $GLOBALS['userid']), __FILE__, __LINE__);
+                array(bigintval(REQUEST_GET('order')), $GLOBALS['userid']), __FILE__, __LINE__);
 
                // Finally is the entry valid?
                if (SQL_NUMROWS($result) == 1) {
@@ -52,7 +52,7 @@ if (!empty($_GET['order'])) {
                        list($sub, $url) = SQL_FETCHROW($result);
 
                        // This fixes a white page
-                       $_POST['url'] = $url;
+                       REQUEST_SET_POST('url', $url);
 
                        // Mode is member
                        $MODE = "member";
@@ -69,19 +69,19 @@ if (!empty($_GET['order'])) {
        }
 }
 
-if ((!empty($_POST['url'])) || (!empty($_GET['url'])) || (!empty($_GET['frame']))) {
+if ((REQUEST_ISSET_POST(('url'))) || (REQUEST_ISSET_GET(('url'))) || (REQUEST_ISSET_GET(('frame')))) {
        // Default URL is ours
        $url = constant('URL');
 
        // Decode URL if set in GET parameters
-       if (!empty($_GET['url']))  $url = gzuncompress(base64_decode(str_replace(" ", "+", COMPILE_CODE(urldecode($_GET['url'])))));
+       if (REQUEST_ISSET_GET(('url')))  $url = decodeString(str_replace(" ", "+", compileUriCode(urldecode(REQUEST_GET('url')))));
 
        // Use URL from POST data if set
-       if (!empty($_POST['url'])) $url = $_POST['url'];
+       if (REQUEST_ISSET_POST(('url'))) $url = REQUEST_POST('url');
 
        // Add missing element
        $frame = "";
-       if (!empty($_GET['frame'])) $frame = SQL_ESCAPE($_GET['frame']);
+       if (REQUEST_ISSET_GET(('frame'))) $frame = REQUEST_GET(('frame'));
        switch ($frame)
        {
        case "":
@@ -89,7 +89,7 @@ if ((!empty($_POST['url'])) || (!empty($_GET['url'])) || (!empty($_GET['frame'])
                {
                case "member":
                        // Build frameset
-                       define('__ORDER_VALUE', bigintval($_GET['order']));
+                       define('__ORDER_VALUE', bigintval(REQUEST_GET('order')));
                        define('__URL_VALUE'  , DEREFERER($url));
                        LOAD_TEMPLATE("member_order_frametester");
                        break;
@@ -102,15 +102,15 @@ if ((!empty($_POST['url'])) || (!empty($_GET['url'])) || (!empty($_GET['frame'])
                break;
 
        case "test_top":
-               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"guest_done\">".GUEST_FRAMETESTER_TOP."</span>");
+               LOAD_TEMPLATE("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']);
+               LOAD_TEMPLATE("member_order_back", false, REQUEST_GET('order'));
                break;
 
        case "send": // Send mail away
-               LOAD_TEMPLATE("member_order_send", false, $_GET['order']);
+               LOAD_TEMPLATE("member_order_send", false, REQUEST_GET('order'));
                break;
        }
 } else {