Debug code commented out

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index 174dad1ad888c2abbceeb43db94aca371a59eda7..3027b456ac09659e86c18114aaf2477f710062d1 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -282,7 +282,7 @@ function FILTER_UPDATE_LOGIN_DATA () {
        // Recheck if logged in
        if (!isMember()) return false;
 
-       // Secure user ID
+       // Secure user id
        setUserId(getSession('userid'));
 
        // Load last module and last online time
@@ -456,11 +456,17 @@ function FILTER_COMPILE_EXTENSION ($code) {
        if ((count($matches) > 0) && (count($matches[3]) > 0)) {
                // Replace all matches
                foreach ($matches[3] as $key => $cmd) {
-                       // Construct call-back function name
-                       $functionName = 'getExtension' . ucfirst(strtolower($cmd));
+                       // By default we have no extension installed, so 'false' is assumed
+                       $replacer = 'false';
 
-                       // Call the function
-                       $replacer = call_user_func_array($functionName, $matches[4][$key]);
+                       // Is the extension installed?
+                       if (isExtensionActive($matches[4][$key])) {
+                               // Construct call-back function name
+                               $functionName = 'getExtension' . ucfirst(strtolower($cmd));
+
+                               // Call the function
+                               $replacer = call_user_func_array($functionName, $matches[4][$key]);
+                       } // END - if
 
                        // Replace it and insert parameter for GET request
                        $code = str_replace($matches[0][$key], sprintf("&%s=%s&rev=%s", $cmd, $replacer, getConfig('CURR_SVN_REVISION')), $code);
@@ -510,7 +516,7 @@ function FILTER_RUN_RESET_INCLUDES () {
                        mergeIncludePool('reset', getArrayFromDirectory('inc/weekly/', 'weekly_'));
 
                        // Update config
-                       if (getConfig('DEBUG_WEEKLY') != 'Y') updateConfiguration('last_week', $currWeek);
+                       if ((isConfigEntrySet('DEBUG_WEEKLY')) && (getConfig('DEBUG_WEEKLY') != 'Y')) updateConfiguration('last_week', $currWeek);
                } // END - if
 
                // Create current month mark
@@ -522,7 +528,7 @@ function FILTER_RUN_RESET_INCLUDES () {
                        mergeIncludePool('reset', getArrayFromDirectory('inc/monthly/', 'monthly_'));
 
                        // Update config
-                       if (getConfig('DEBUG_MONTHLY') != 'Y') updateConfiguration('last_month', $currMonth);
+                       if ((isConfigEntrySet('DEBUG_MONTHLY')) && (getConfig('DEBUG_MONTHLY') != 'Y')) updateConfiguration('last_month', $currMonth);
                } // END - if
        } // END - if
 
@@ -580,7 +586,16 @@ function FILTER_DETERMINE_WHAT_ACTION () {
        // Get all values
        if ((getOutputMode() != 1) && (getOutputMode() != -1)) {
                // Fix module
-               if (!isModuleSet()) setModule('index');
+               if (!isModuleSet()) {
+                       // Is the request element set?
+                       if (isGetRequestElementSet('module')) {
+                               // Set module from request
+                               setModule(getRequestElement('module'));
+                       } else {
+                               // Set default module 'index'
+                               setModule('index');
+                       }
+               } // END - if
 
                // Fix 'what' if not yet set
                if (!isWhatSet())   setWhat(getWhatFromModule(getModule()));
@@ -699,7 +714,7 @@ function FILTER_CHECK_ADMIN_ACL () {
 // Init random number/cache buster
 function FILTER_INIT_RANDOM_NUMBER () {
        // Is the extension sql_patches installed and at least 0.3.6?
-       if ((isExtensionActive('sql_patches')) && (getExtensionVersion('sql_patches') >= '0.3.6')) {
+       if ((isExtensionInstalledAndNewer('sql_patches', '0.3.6')) && (isExtensionInstalledAndNewer('other', '0.2.5'))) {
                // Generate random number
                setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getUserId(), ''));
        } else {