More globals rewritten, see #100

[mailer.git] / doubler.php

diff --git a/doubler.php b/doubler.php
index 182b473cbb838430740923d87086f7b4f7491682..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("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']));
@@ -208,10 +203,10 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        if (!defined('__ERROR_MSG'))   define('__ERROR_MSG'  , "");
 
        // Shall I check for points immediately?
-       if (getConfig('doubler_send_mode') == "DIRECT") require(PATH."inc/doubler_send.php");
+       if (getConfig('doubler_send_mode') == "DIRECT") LOAD_INC("inc/doubler_send.php");
 
        // Output header
-       require(PATH."inc/header.php");
+       LOAD_INC("inc/header.php");
 
        // Banner in text
        define('__DOUBLER_BANNER', LOAD_TEMPLATE("doubler_banner", true));
@@ -272,7 +267,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
        LOAD_TEMPLATE("doubler_index");
 
        // Output footer
-       require(PATH."inc/footer.php");
+       LOAD_INC("inc/footer.php");
 } else {
        // You have to install first!
        LOAD_URL("install.php");