X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffilters.php;h=5dd7d6999025ddec270572adfccaf23db5ca54d3;hp=a470fa1275088c7894a2d0231068c9911e53a6e9;hb=30ae22f62ae87c53a56baf0d134569ba91011111;hpb=ffe213c8e3f85119ddd5544214d0de9ecb833d98

diff --git a/inc/filters.php b/inc/filters.php
index a470fa1275..5dd7d69990 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -452,7 +452,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
 	//* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:<pre>'.print_r($matches, true).'</pre>');
 
 	// Default is from outputHtml()
-	$outputMode = getOutputMode();
+	$outputMode = getScriptOutputMode();
 
 	// Some entries found?
 	if ((count($matches) > 0) && (count($matches[3]) > 0)) {
@@ -510,7 +510,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
 	} // END - if
 
 	// Do we have non-HTML mode?
-	if ((getOutputMode() != '0') || ($outputMode != '0')) $code = decodeEntities($code);
+	if ((getScriptOutputMode() != '0') || ($outputMode != '0')) $code = decodeEntities($code);
 
 	// Return compiled code
 	//* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:<pre>'.($code).'</pre>');
@@ -534,7 +534,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'))) && (getScriptOutputMode() == '0')) {
 		// Then abort here
 		debug_report_bug(__FUNCTION__, __LINE__, 'Cannot run reset! enabled='.intval(isResetModeEnabled()).',ext='.intval(isExtensionInstalled('sql_patches')).' Please report this bug. Thanks');
 	} // END - if
@@ -624,14 +624,14 @@ function FILTER_DETERMINE_WHAT_ACTION () {
 	} // END - if
 
 	// Get all values
-	if ((getOutputMode() != 1) && (getOutputMode() != -1)) {
+	if ((getScriptOutputMode() != 1) && (getScriptOutputMode() != -1)) {
 		// Fix module
 		if (!isModuleSet()) {
 			// Is the request element set?
 			if (isGetRequestParameterSet('module')) {
 				// Set module from request
 				setModule(getRequestParameter('module'));
-			} elseif (getOutputMode() == '0') {
+			} elseif (getScriptOutputMode() == '0') {
 				// Set default module 'index'
 				setModule('index');
 			} else {
@@ -653,7 +653,7 @@ function FILTER_DETERMINE_WHAT_ACTION () {
 
 	// Set default 'what' value
 	//* DEBUG: */ debugOutput('-' . getModule() . '/' . getWhat() . '-');
-	if ((!isWhatSet()) && (!isActionSet()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
+	if ((!isWhatSet()) && (!isActionSet()) && (getScriptOutputMode() != 1) && (getScriptOutputMode() != -1)) {
 		if (getModule() == 'admin') {
 			// Set 'action' value to 'login' in admin menu
 			setAction(getActionFromModuleWhat(getModule(), getWhat()));
@@ -670,7 +670,7 @@ function FILTER_DETERMINE_WHAT_ACTION () {
 // Sends out pooled mails
 function FILTER_TRIGGER_SENDING_POOL () {
 	// Are we in normal output mode?
-	if (getOutputMode() != 0) {
+	if (getScriptOutputMode() != 0) {
 		// Only in normal output mode to prevent race-conditons!
 	} // END - if
 
@@ -708,7 +708,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 (((getDay(getConfig('last_update')) != getDay()) || ((isConfigEntrySet('DEBUG_RESET')) && (getConfig('DEBUG_RESET') == 'Y'))) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestParameterSet('register')) && (getOutputMode() != 1)) {
+	if (((getDay(getConfig('last_update')) != getDay()) || ((isConfigEntrySet('DEBUG_RESET')) && (getConfig('DEBUG_RESET') == 'Y'))) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestParameterSet('register')) && (getScriptOutputMode() != 1)) {
 		// Tell every module we are in reset-mode!
 		doReset();
 	} // END - if
@@ -770,7 +770,7 @@ function FILTER_COUNT_MODULE () {
 // Handles fatal errors
 function FILTER_HANDLE_FATAL_ERRORS () {
 	// Do we have errors to handle and right output mode?
-	if ((!ifFatalErrorsDetected()) || (getOutputMode() != '0')) {
+	if ((!ifFatalErrorsDetected()) || (getScriptOutputMode() != '0')) {
 		// Abort executing here
 		return false;
 	} // END - if
@@ -871,7 +871,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') && (!isGetRequestParameterSet('frame'))) || (isInstallationPhase())) && (getOutputMode() == '0') && ($GLOBALS['header_sent'] == 2)) {
+	if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (getConfig('show_timings') == 'Y') && (!isGetRequestParameterSet('frame'))) || (isInstallationPhase())) && (getScriptOutputMode() == '0') && ($GLOBALS['header_sent'] == 2)) {
 		// Then display it here
 		displayParsingTime();
 	} // END - if