Fixes for a lot bug tickets. (Sorry for lame comment)

[mailer.git] / confirm.php

diff --git a/confirm.php b/confirm.php
index e844c6c77e3ebde2d872673b69c73f058ba1fe49..e55e503ee8b6ca6cc2afe00134b91fb04eb562cb 100644 (file)
--- a/confirm.php
+++ b/confirm.php
@@ -37,38 +37,33 @@ require_once("inc/libs/security_functions.php");
 // Init "action" and "what"
 global $what, $action;
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
 
 // Set module to confirm
 $GLOBALS['module'] = "confirm"; $CSS = -1;
 
 // Load the required file(s)
-require ("inc/config.php");
+require("inc/config.php");
 
 // Is the script installed?
-if (defined('mxchange_installed') && (mxchange_installed) && (admin_registered))
-{
+if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered'))) {
        // Base URL for redirection
        $URL = URL."/modules.php?module=index&what=confirm&hash=";
-       if (empty($_GET['hash']))
-       {
+       if (empty($_GET['hash'])) {
                // No refid and we add our refid (don't forget to set $def_refid!)
                $URL = URL."/modules.php?module=index";
-       }
-        else
-       {
+       } else {
                // We have an refid here. So we simply add it
                $URL .= $_GET['hash'];
        }
+
        // Load the URL
        LOAD_URL($URL);
+
        // Redirection should be done here
-}
- else
-{
+} else {
        // You have to configure first!
-       LOAD_URL(URL."/install.php");
+       LOAD_URL("install.php");
 }
+
 // Really all done here... ;-)
 ?>