Functions imported, some dev-scripts added

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

diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php
index 49b06b359e17ef12edd66f6b8d131012cad1f3bb..aae2439303bb903a1ba88d9e109c88c7c38c7780 100644 (file)
--- a/inc/modules/frametester.php
+++ b/inc/modules/frametester.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
@@ -41,9 +41,9 @@ $MODE = "guest";
 
 if (!empty($_GET['order'])) {
        // Order number placed, is he also logged in?
-       if(IS_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",
+               $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__);
 
                // Finally is the entry valid?
@@ -54,8 +54,7 @@ if (!empty($_GET['order'])) {
                        // This fixes a white page
                        $_POST['url'] = $url;
 
-                       // Update his login data
-                       UPDATE_LOGIN_DATA();
+                       // Mode is member
                        $MODE = "member";
                } else {
                        // Matching line not found!
@@ -72,10 +71,10 @@ if (!empty($_GET['order'])) {
 
 if ((!empty($_POST['url'])) || (!empty($_GET['url'])) || (!empty($_GET['frame']))) {
        // Default URL is ours
-       $url = URL;
+       $url = constant('URL');
 
        // Decode URL if set in GET parameters
-       if (!empty($_GET['url']))  $url = COMPILE_CODE(gzuncompress(base64_decode(urldecode($_GET['url']))));
+       if (!empty($_GET['url']))  $url = decodeString(str_replace(" ", "+", compileUriCode(urldecode($_GET['url']))));
 
        // Use URL from POST data if set
        if (!empty($_POST['url'])) $url = $_POST['url'];
@@ -103,7 +102,7 @@ if ((!empty($_POST['url'])) || (!empty($_GET['url'])) || (!empty($_GET['frame'])
                break;
 
        case "test_top":
-               OUTPUT_HTML("<STRONG 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