X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffilters.php;h=40fb713d99717057726f740728e1541e1455260b;hp=4426a95aa66ce611a60ba19814e5edac3a55e83d;hb=3bcb292dd0b55177499600c226d5d2aa8a932ce7;hpb=916bba4f00ee924f0d88b8fc273dee5bfb798aed

diff --git a/inc/filters.php b/inc/filters.php
index 4426a95aa6..40fb713d99 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";
@@ -307,12 +307,7 @@ 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(),
-				getMemberId()
-			), __FUNCTION__, __LINE__);
+		updateLastActivity(getMemberId());
 	}  else {
 		// Destroy session, we cannot update!
 		destroyMemberSession();
@@ -428,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
 
@@ -457,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;
 }
 
@@ -495,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
@@ -633,7 +632,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');
@@ -737,7 +736,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
@@ -838,7 +837,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
@@ -851,7 +850,7 @@ function FILTER_FLUSH_TEMPLATE_CACHE () {
 		// Now flush all
 		foreach ($GLOBALS['template_eval'] as $template=>$eval) {
 			// Flush the cache (if not yet found)
-			flushTemplateCache($template, $eval);
+			//flushTemplateCache($template, $eval);
 		} // END - if
 	} // END - if
 }