Fixes for extension problems while installing/removing (still double-registration...

[mailer.git] / confirm.php

diff --git a/confirm.php b/confirm.php
index 3ca3a5e3be0e1309f87b7b9c349f6bad1bc09208..41ca856c24b9ff39ca39642aa10aa373794194dd 100644 (file)
--- a/confirm.php
+++ b/confirm.php
@@ -36,25 +36,21 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
-// Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
+// Load security stuff here
 require('inc/libs/security_functions.php');
 
-// Init "action" and "what"
-$GLOBALS['what'] = '';
-$GLOBALS['action'] = '';
-
 // Set module to confirm
 $GLOBALS['module'] = 'confirm';
 $GLOBALS['output_mode'] = -1;
 
 // Load the required file(s)
-require('inc/config.php');
+require('inc/config-global.php');
 
 // Is the script installed?
 if ((isInstalled()) && (isAdminRegistered())) {
        // Base URL for redirection
        $URL = 'modules.php?module=index&what=confirm&hash=';
-       if (!REQUEST_ISSET_GET(('hash'))) {
+       if (!REQUEST_ISSET_GET('hash')) {
                // No refid and we add our refid (don't forget to set $def_refid!)
                $URL = 'modules.php?module=index';
        } else {
@@ -63,10 +59,10 @@ if ((isInstalled()) && (isAdminRegistered())) {
        }
 
        // Load the URL
-       LOAD_URL($URL);
+       redirectToUrl($URL);
 } else {
        // You have to install first!
-       LOAD_URL('install.php');
+       redirectToUrl('install.php');
 }
 
 // Really all done here... ;-)