More globals rewritten, see #100

[mailer.git] / doubler.php

diff --git a/doubler.php b/doubler.php
index 2b0d5c6dd7f262e0ca038f3cdc805fc155d9cc52..92ebdc48e6f55102f3086e73d57c3189ef712321 100644 (file)
--- a/doubler.php
+++ b/doubler.php
@@ -32,10 +32,9 @@
  ************************************************************************/
 
 // 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, $startTime;
 $GLOBALS['startTime'] = microtime(true);
 $GLOBALS['what'] = "";
 $GLOBALS['action'] = "";
@@ -43,16 +42,13 @@ $GLOBALS['action'] = "";
 // Set module
 $GLOBALS['module'] = "doubler";
 $GLOBALS['refid'] = 0;
-$CSS = 0;
+$GLOBALS['output_mode'] = 0;
 
 // Load the required file(s)
-require_once("inc/config.php");
+require("inc/config.php");
 
 // Is the "doubler" extension active?
-if (!EXT_IS_ACTIVE("doubler")) {
-       // Redirect to index
-       LOAD_URL("modules.php?module=index&msg={!CODE_EXTENSION_PROBLEM!}&ext=doubler");
-} // END - if
+REDIRECT_ON_UNINSTALLED_EXTENSION("doubler");
 
 // Is the script installed?
 if (isBooleanConstantAndTrue('mxchange_installed')) {
@@ -161,7 +157,6 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 
                                        // Update usage counter
                                        UPDATE_CONFIG("doubler_counter", 1, "+");
-                                       incrementCondigEntry('doubler_counter');
 
                                        // Set constant
                                        define('__DOUBLER_MSG', LOAD_TEMPLATE("doubler_reflink", true, $_POST['userid']));