Fixes for MT_WORD vs. install vs. installed

[mailer.git] / confirm.php

diff --git a/confirm.php b/confirm.php
index e55e503ee8b6ca6cc2afe00134b91fb04eb562cb..cf27796429a14bf4027ce490db1765970fb28df9 100644 (file)
--- a/confirm.php
+++ b/confirm.php
@@ -32,36 +32,35 @@
  ************************************************************************/
 
 // Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
-require_once("inc/libs/security_functions.php");
+require("inc/libs/security_functions.php");
 
 // Init "action" and "what"
-global $what, $action;
-$GLOBALS['what'] = ""; $GLOBALS['action'] = "";
+$GLOBALS['what'] = "";
+$GLOBALS['action'] = "";
 
 // Set module to confirm
-$GLOBALS['module'] = "confirm"; $CSS = -1;
+$GLOBALS['module'] = "confirm";
+$GLOBALS['output_mode'] = -1;
 
 // Load the required file(s)
 require("inc/config.php");
 
 // Is the script installed?
-if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered'))) {
+if ((isInstalled()) && (isAdminRegistered())) {
        // Base URL for redirection
-       $URL = URL."/modules.php?module=index&what=confirm&hash=";
-       if (empty($_GET['hash'])) {
+       $URL = "modules.php?module=index&what=confirm&hash=";
+       if (!REQUEST_ISSET_GET(('hash'))) {
                // No refid and we add our refid (don't forget to set $def_refid!)
-               $URL = URL."/modules.php?module=index";
+               $URL = "modules.php?module=index";
        } else {
                // We have an refid here. So we simply add it
-               $URL .= $_GET['hash'];
+               $URL .= REQUEST_GET('hash');
        }
 
        // Load the URL
        LOAD_URL($URL);
-
-       // Redirection should be done here
 } else {
-       // You have to configure first!
+       // You have to install first!
        LOAD_URL("install.php");
 }