X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ffilters.php;h=3b198af56b624d6e5c47342160051e042c1e83a7;hb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;hp=3bcc77e333318a1fac6af9edc39d1ac9a55cdd88;hpb=86d7b339631307afe1ba16ceff8ce760c1523be1;p=mailer.git

diff --git a/inc/filters.php b/inc/filters.php
index 3bcc77e333..3b198af56b 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 12/16/2008 *
- * ===============                              Last change: 12/16/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 12/16/2008 *
+ * ===================                          Last change: 12/16/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : filters.php                                      *
@@ -423,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
 
@@ -452,27 +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 or code provided?
 			if ($cmd == 'code') {
 				// Code asked for
-				$replacer = getCode($matches[4][$key]);
-			} elseif (isExtensionActive($matches[4][$key])) {
+				$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;
 }
 
@@ -590,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
 
@@ -844,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