More misc fixes and rewrites (sorry, lame description)

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

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index 3c81aa5e3b2d37874a516d5db4f94405e572d5f3..40060662c263304822689a5d5eed36f5c144dba5 100644 (file)
--- a/inc/modules/frametester.php
+++ b/inc/modules/frametester.php
@@ -40,16 +40,16 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
-}
+} // END - if
 
 $mode = 'guest';
 
-if (REQUEST_ISSET_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(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(REQUEST_GET('order')), getUserId()), __FILE__, __LINE__);
 
                // Finally is the entry valid?
                if (SQL_NUMROWS($result) == 1) {
@@ -72,21 +72,21 @@ if (REQUEST_ISSET_GET(('order'))) {
                // He is no longer logged in
                redirectToUrl('modules.php?module=index&what=login');
        }
-}
+} // END - if
 
-if ((REQUEST_ISSET_POST(('url'))) || (REQUEST_ISSET_GET(('url'))) || (REQUEST_ISSET_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 (REQUEST_ISSET_GET(('url')))  $url = decodeString(str_replace(' ', '+', compileUriCode(urldecode(REQUEST_GET('url')))));
+       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');
+       if (REQUEST_ISSET_POST('url')) $url = REQUEST_POST('url');
 
        // Add missing element
        $frame = '';
-       if (REQUEST_ISSET_GET(('frame'))) $frame = REQUEST_GET(('frame'));
+       if (REQUEST_ISSET_GET('frame')) $frame = REQUEST_GET('frame');
        switch ($frame)
        {
                case '':