X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=c28d8fb3b01214bb93070408ad9ff854ed0c3ec8;hb=27fed6ed8bbc0d91404947d91db1a07e36c1ea60;hp=1019759bdee08d74e290dda0760ec7cbc0122c71;hpb=0cbe2bfe902d26f0e99be6005140a9d8c350f017;p=mailer.git

diff --git a/inc/filters.php b/inc/filters.php
index 1019759bde..c28d8fb3b0 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -443,11 +443,10 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) {
 	return $GLOBALS['compiled_config'][$uncompiled];
 }
 
-// Filter for compiling extension data
-function FILTER_COMPILE_EXTENSION ($code) {
-	// Compile {%cmd=some_value%} to get extension data
-	// Support cmd is:
-	//   - version -> getExtensionVersion() call
+// Filter for compiling expression code
+function FILTER_COMPILE_EXPRESSION_CODE ($code) {
+	// Compile {%cmd=some_value%} to get expression code snippets
+	// See switch() command below for supported commands
 	preg_match_all('/\{%(([a-zA-Z0-9-_,]+)(=([^\}]+)){0,1})*%\}/', $code, $matches);
 	//* DEBUG: */ print('<pre>'.print_r($matches, true).'</pre>');
 
@@ -555,6 +554,14 @@ function FILTER_COMPILE_EXTENSION ($code) {
 					$code = str_replace($matches[0][$key], $configValue, $code);
 					break;
 
+				case 'filter':
+					// Construct replacement
+					$replacer = "\" . runFilterChain('" . $matches[4][$key] . "') . \"";
+
+					// Run the filter and insert result
+					$code = str_replace($matches[0][$key], $replacer, $code);
+					break;
+
 				default:
 					// Unsupported command detected
 					debug_report_bug('Command=' . $cmd . ', callback=' . $callback . ', extra=' . $extraFunction . ' is unsupported.');
@@ -682,9 +689,9 @@ function FILTER_DETERMINE_WHAT_ACTION () {
 		// Fix module
 		if (!isModuleSet()) {
 			// Is the request element set?
-			if (isGetRequestElementSet('module')) {
+			if (isGetRequestParameterSet('module')) {
 				// Set module from request
-				setModule(getRequestElement('module'));
+				setModule(getRequestParameter('module'));
 			} elseif (getOutputMode() == '0') {
 				// Set default module 'index'
 				setModule('index');
@@ -762,7 +769,7 @@ function FILTER_RUN_DAILY_RESET () {
 	if ((isInstallationPhase()) || (!isInstalled()) || (!isAdminRegistered()) || (!isExtensionInstalled('sql_patches'))) return;
 
 	// Shall we run the reset scripts? If a day has changed, maybe also a week/month has changed... Simple! :D
-	if (((date('d', getConfig('last_update')) != date('d', time())) || ((isConfigEntrySet('DEBUG_RESET')) && (getConfig('DEBUG_RESET') == 'Y'))) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestElementSet('register')) && (getOutputMode() != 1)) {
+	if (((date('d', getConfig('last_update')) != date('d', time())) || ((isConfigEntrySet('DEBUG_RESET')) && (getConfig('DEBUG_RESET') == 'Y'))) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestParameterSet('register')) && (getOutputMode() != 1)) {
 		// Tell every module we are in reset-mode!
 		doReset();
 	} // END - if
@@ -917,7 +924,7 @@ function FILTER_HANDLE_FATAL_ERRORS () {
 // Filter for displaying copyright line
 function FILTER_DISPLAY_COPYRIGHT () {
 	// Shall we display the copyright notice?
-	if ((!isGetRequestElementSet('frame')) && (basename($_SERVER['PHP_SELF']) != 'mailid_top.php') && ((getConfig('WRITE_FOOTER') == 'Y') || (isInstalling())) && ($GLOBALS['header_sent'] == 2)) {
+	if ((!isGetRequestParameterSet('frame')) && (basename($_SERVER['PHP_SELF']) != 'mailid_top.php') && ((getConfig('WRITE_FOOTER') == 'Y') || (isInstalling())) && ($GLOBALS['header_sent'] == 2)) {
 		// Backlink enabled?
 		if (((isConfigEntrySet('ENABLE_BACKLINK')) && (getConfig('ENABLE_BACKLINK') == 'Y')) || (isInstalling())) {
 			// Copyright with backlink, thanks! :-)
@@ -933,7 +940,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') && (!isGetRequestParameterSet('frame'))) || (isInstallationPhase())) && (getOutputMode() == '0') && ($GLOBALS['header_sent'] == 2)) {
 		// Then display it here
 		displayParsingTime();
 	} // END - if