Flushing template cache is anoying while developing templates, now we can 'debug...

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index 431b5ac367a4b21f71e9f67f895416827fb3aa3a..aeb90d935130489d4aa31d547df3baf99c6c7267 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -66,8 +66,8 @@ function FILTER_FLUSH_FILTERS () {
        } // END - if
 
        // Nothing is added/remove by default
-       $inserted = 0;
-       $removed = 0;
+       $inserted = '0';
+       $removed = '0';
 
        // Prepare SQL queries
        $insertSQL = "INSERT INTO `{?_MYSQL_PREFIX?}_filters` (`filter_name`,`filter_function`,`filter_active`) VALUES";
@@ -283,10 +283,10 @@ function FILTER_UPDATE_LOGIN_DATA () {
        if (!isMember()) return false;
 
        // Secure user id
-       setUserId(getSession('userid'));
+       setMemberId(getSession('userid'));
 
        // Found a userid?
-       if (fetchUserData(getUserId())) {
+       if (fetchUserData(getMemberId())) {
                // Load last module and online time
                $content = getUserDataArray();
 
@@ -307,15 +307,10 @@ function FILTER_UPDATE_LOGIN_DATA () {
                } // END - if
 
                // Update last module / online time
-               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `last_module`='%s', `last_online`=UNIX_TIMESTAMP(), `REMOTE_ADDR`='%s' WHERE `userid`=%s LIMIT 1",
-                       array(
-                               getWhat(),
-                               detectRemoteAddr(),
-                               getUserId()
-                       ), __FUNCTION__, __LINE__);
+               updateLastActivity(getMemberId());
        }  else {
                // Destroy session, we cannot update!
-               destroyUserSession();
+               destroyMemberSession();
        }
 }
 
@@ -366,7 +361,7 @@ function FILTER_DETERMINE_USERNAME () {
        // Check if logged in
        if (isMember()) {
                // Is still logged in so we welcome him with his name
-               if (fetchUserData(getUserId())) {
+               if (fetchUserData(getMemberId())) {
                        // Load surname and family's name and build the username
                        $content = getUserDataArray();
 
@@ -383,10 +378,7 @@ function FILTER_DETERMINE_USERNAME () {
                        setUsername('<em>{--USERNAME_UNKNOWN--}</em>');
 
                        // Destroy session
-                       destroyUserSession();
-
-                       // Kill userid
-                       setUserId(0);
+                       destroyMemberSession();
                }
        } elseif (isAdmin()) {
                // Admin is there
@@ -431,7 +423,7 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) {
 
                                // Use this for replacing
                                $code = str_replace($match, $GLOBALS['compile_config'][$matches[1][$key]], $code);
-                               //* DEBUG: */ if (($match == '{?URL?}') && (strlen($code) > 10000)) die('<pre>'.htmlentities($code).'</pre>');
+                               //* DEBUG: */ if (($match == '{?URL?}') && (strlen($code) > 10000)) die('<pre>'.secureString($code).'</pre>');
                        } // END - foreach
                } // END - if
 
@@ -460,24 +452,28 @@ function FILTER_COMPILE_EXTENSION ($code) {
        if ((count($matches) > 0) && (count($matches[3]) > 0)) {
                // Replace all matches
                foreach ($matches[3] as $key => $cmd) {
-                       // By default we have no extension installed, so 'false' is assumed
-                       $replacer = 'false';
+                       // Init replacer variable
+                       $replacer = '';
 
-                       // Is the extension installed?
-                       if (isExtensionActive($matches[4][$key])) {
+                       // Is the extension installed or code provided?
+                       if ($cmd == 'code') {
+                               // Code asked for
+                               $replacer = "\".getCode(\"" . $matches[4][$key] . "\").\"";
+                       } else {
                                // Construct call-back function name
                                $functionName = 'getExtension' . ucfirst(strtolower($cmd));
 
-                               // Call the function
-                               $replacer = call_user_func_array($functionName, $matches[4][$key]);
-                       } // END - if
+                               // Construct call of the function
+                               $replacer = "\".call_user_func_array('" . $functionName . "', array('" . $matches[4][$key] . "', true)).\"";
+                       }
 
                        // Replace it and insert parameter for GET request
-                       $code = str_replace($matches[0][$key], sprintf("&amp;%s=%s&amp;rev=%s", $cmd, $replacer, getConfig('CURR_SVN_REVISION')), $code);
+                       $code = str_replace($matches[0][$key], sprintf("&amp;%s=%s&amp;rev=\".getConfig('CURR_SVN_REVISION').\"", $cmd, $replacer), $code);
                } // END - foreach
        } // END - if
 
        // Return compiled code
+       //* DEBUG: */ die('<pre>'.secureString($code).'</pre>');
        return $code;
 }
 
@@ -498,7 +494,7 @@ function FILTER_UPDATE_EXTENSION_DATA ($ext_name) {
 // Load more reset scripts
 function FILTER_RUN_RESET_INCLUDES () {
        // Is the reset set or old sql_patches?
-       if (((!isResetModeEnabled()) || (!isExtensionInstalled('sql_patches'))) && (getOutputMode() == 0)) {
+       if (((!isResetModeEnabled()) || (!isExtensionInstalled('sql_patches'))) && (getOutputMode() == '0')) {
                // Then abort here
                logDebugMessage(__FUNCTION__, __LINE__, 'Cannot run reset! Please report this bug. Thanks');
        } // END - if
@@ -595,9 +591,12 @@ function FILTER_DETERMINE_WHAT_ACTION () {
                        if (isGetRequestElementSet('module')) {
                                // Set module from request
                                setModule(getRequestElement('module'));
-                       } else {
+                       } elseif (getOutputMode() == '0') {
                                // Set default module 'index'
                                setModule('index');
+                       } else {
+                               // Unknown module
+                               setModule('unknown');
                        }
                } // END - if
 
@@ -636,7 +635,7 @@ function FILTER_TRIGGER_SENDING_POOL () {
        } // END - if
 
        // Init counter
-       $GLOBALS['pool_cnt'] = 0;
+       $GLOBALS['pool_cnt'] = '0';
 
        // Init & set the include pool
        initIncludePool('pool');
@@ -720,7 +719,7 @@ function FILTER_INIT_RANDOM_NUMBER () {
        // Is the extension sql_patches installed and at least 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(), ''));
+               setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getMemberId(), ''));
        } else {
                // Generate weak (!!!) code
                setConfigEntry('RAND_NUMBER', mt_rand(1000000, 9999999));
@@ -740,7 +739,7 @@ function FILTER_COUNT_MODULE () {
 // Handles fatal errors
 function FILTER_HANDLE_FATAL_ERRORS () {
        // Do we have errors to handle and right output mode?
-       if ((getTotalFatalErrors() == 0) || (getOutputMode() != 0)) {
+       if ((getTotalFatalErrors() == '0') || (getOutputMode() != 0)) {
                // Abort executing here
                return false;
        } // END - if
@@ -841,7 +840,7 @@ function FILTER_DISPLAY_COPYRIGHT () {
 function FILTER_DISPLAY_PARSING_TIME () {
        // Shall we display the parsing time and number of queries?
        // 1234                            5                      54    4         5              5       4    4                       5       543    3                   4432    2             33     2    2                              21
-       if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (getConfig('show_timings') == 'Y') && (!isGetRequestElementSet('frame'))) || (isInstallationPhase())) && (getOutputMode() == 0) && ($GLOBALS['header_sent'] == 2)) {
+       if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (getConfig('show_timings') == 'Y') && (!isGetRequestElementSet('frame'))) || (isInstallationPhase())) && (getOutputMode() == '0') && ($GLOBALS['header_sent'] == 2)) {
                // Then display it here
                displayParsingTime();
        } // END - if
@@ -849,6 +848,9 @@ function FILTER_DISPLAY_PARSING_TIME () {
 
 // Filter for flushing template cache
 function FILTER_FLUSH_TEMPLATE_CACHE () {
+       // Do not flush when debugging the template cache
+       if (isDebuggingTemplateCache()) return;
+
        // Do we have cached eval() data?
        if ((isset($GLOBALS['template_eval'])) && (count($GLOBALS['template_eval']) > 0)) {
                // Now flush all