More rewrites, and output-mode fixed (we should documentate this)

[mailer.git] / inc / mysql-connect.php

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 09c836ba704d2e53a9c0bbf73e38284134eba1ae..e0914d2dd293524b5298152799fe49863cecdae6 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -77,7 +77,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        loadIncludeOnce('inc/db/lib.php');
 
        // Set missing module
-       if (!isModuleSet()) setModule(getRequestElement('module'));
+       if ((!isModuleSet()) && (isGetRequestElementSet('module'))) setModule(getRequestElement('module'));
        if (!isModuleSet()) setModule('index');
 
        // Load configuration file(s) here
@@ -112,15 +112,6 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                                // Run the init filter chain
                                runFilterChain('init');
 
-                               // Is the extension sql_patches installed and at least 0.3.6?
-                               if ((isExtensionActive('sql_patches')) && (getExtensionVersion('sql_patches') >= '0.3.6')) {
-                                       // Generate random number
-                                       setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getUserId(), ''));
-                               } else {
-                                       // Generate weak (!!!) code
-                                       setConfigEntry('RAND_NUMBER', mt_rand(1000000, 9999999));
-                               }
-
                                // Check module for permissions
                                $checkModule = checkModulePermissions();
 
@@ -158,13 +149,13 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        setConfigEntry('OUTPUT_MODE', 'direct');
 
        // This hack prevents a backtrace in CSS output
-       if (getOutputMode() == '1') {
+       if (getOutputMode() == 1) {
                // Problem with config so set output mode
                setConfigEntry('OUTPUT_MODE', 'render');
        } // END - if
 
        // Set other missing variables
-       if (!isOutputModeSet()) setOutputMode('0');
+       if (!isOutputModeSet()) setOutputMode(0);
 
        // Include more
        foreach (array('inc/databases.php','inc/db/lib.php','inc/session.php','inc/versions.php','inc/install-functions.php','inc/load_config.php') as $inc) {
@@ -176,7 +167,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        loadIncludeOnce('inc/load_config.php');
 
        // Are we installation routine?
-       if ((!isInstalling()) && (getOutputMode() != '1') && (getOutputMode() != -1)) {
+       if ((!isInstalling()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
                // You have to install first!
                redirectToUrl('install.php');
        } // END - if