X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=20dae9fdb550520baea88f911f4ebd918990ba42;hb=83574a6475896fbdc231e685e2ebb0ee4f3e6eba;hp=56d82c0f92669b38beb84bdb2296a88faf103638;hpb=48329d370d84b30c0107a55c95630d4528e6bdf5;p=mailer.git

diff --git a/inc/filters.php b/inc/filters.php
index 56d82c0f92..20dae9fdb5 100644
--- 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";
@@ -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,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;
 }
 
@@ -490,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
@@ -587,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
 
@@ -628,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');
@@ -732,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
@@ -833,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