X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ffilters.php;h=fcafc63c0ea18c7c25b6265986d489f6be06df24;hb=b3154fcf34de56f8069671d850f99eda386127c3;hp=b4726417fee7c8707fcb6621cb1ededdc22c3233;hpb=20741b93fd58620af677a7f1039ffd16ea6ec689;p=mailer.git

diff --git a/inc/filters.php b/inc/filters.php
index b4726417fe..fcafc63c0e 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -60,8 +60,12 @@ function FILTER_FLUSH_FILTERS () {
 
 	// Is the extension ext-sql_patches updated?
 	if ((!isExtensionInstalled('sql_patches')) || (isExtensionInstalledAndOlder('sql_patches', '0.5.9'))) {
+		// Log only in debug mode
+		if (isDebugModeEnabled()) {
+			logDebugMessage(__FUNCTION__, __LINE__, 'Cannot flush filters, sql_patches might be missing. isExtensionInstalled()=' . intval(isExtensionInstalled('sql_patches')) . ',isExtensionInstalledAndOlder()=' . intval(isExtensionInstalledAndOlder('sql_patches', '0.5.9')));
+		} // END - if
+
 		// Abort silently here
-		logDebugMessage(__FUNCTION__, __LINE__, 'Cannot flush filters, sql_patches might be missing. isExtensionInstalled()=' . isExtensionInstalled('sql_patches') . ',isExtensionInstalledAndOlder()=' . isExtensionInstalledAndOlder('sql_patches', '0.5.9'));
 		return false;
 	} // END - if
 
@@ -252,7 +256,7 @@ function FILTER_RUN_SQLS ($filterData) {
 	if ((isSqlsValid()) && ((!isset($filterData['dry_run'])) || ($filterData['dry_run'] == false))) {
 		// Run SQL commands
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Found ' . countSqls() . ' queries to run.');
-		foreach (getSqls() as $mode=>$sqls) {
+		foreach (getSqls() as $mode => $sqls) {
 			// Debug message
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'mode=' . $mode . ',count()=' . count($sqls));
 
@@ -400,7 +404,7 @@ function FILTER_DETERMINE_USERNAME () {
 			} // END - if
 		} else {
 			// Hmmm, logged in and no valid userid?
-			setUsername('<em>{--USERNAME_UNKNOWN--}</em>');
+			setUsername('<span class="bad">{--USERNAME_UNKNOWN--}</span>');
 
 			// Destroy session
 			destroyMemberSession();
@@ -526,7 +530,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($filterData) {
 				$data = array(
 					'matches'     => $matches,
 					'key'         => $key,
-					'mode'        => getScriptOutputMode(),
+					'output_mode' => getScriptOutputMode(),
 					'code'        => $filterData,
 					'callback'    => $callback,
 					'extra_func'  => $extraFunction,
@@ -599,8 +603,8 @@ function FILTER_RUN_RESET_INCLUDES () {
 	// Get more daily reset scripts
 	setIncludePool('reset', getArrayFromDirectory('inc/daily/', 'daily_'));
 
-	// Update database
-	if ((!isConfigEntrySet('DEBUG_RESET')) || (!isDebugResetEnabled())) {
+	// Update configuration if this reset is not being debugged
+	if (!isDebugResetEnabled()) {
 		updateConfiguration('last_update', 'UNIX_TIMESTAMP()');
 	} // END - if
 
@@ -611,7 +615,7 @@ function FILTER_RUN_RESET_INCLUDES () {
 			// Include weekly reset scripts
 			mergeIncludePool('reset', getArrayFromDirectory('inc/weekly/', 'weekly_'));
 
-			// Update config if not in debug mode
+			// Update configuration if this reset is not being debugged
 			if (!isWeeklyResetDebugEnabled()) {
 				updateConfiguration('last_week', getWeek());
 			} // END - if
@@ -625,7 +629,7 @@ function FILTER_RUN_RESET_INCLUDES () {
 			// Include monthly reset scripts
 			mergeIncludePool('reset', getArrayFromDirectory('inc/monthly/', 'monthly_'));
 
-			// Update config
+			// Update configuration if this reset is not being debugged
 			if (!isMonthlyResetDebugEnabled()) {
 				updateConfiguration('last_month', $currMonth);
 			} // END - if
@@ -655,13 +659,16 @@ function FILTER_FLUSH_OUTPUT () {
 	outputHtml('');
 }
 
-// Prepares an SQL statement part for HTML mail and/or holiday depency
+// Prepares an SQL statement part for HTML mail and/or holiday dependency
 function FILTER_HTML_INCLUDE_USERS ($mode) {
 	// Exclude no users by default
 	$MORE = '';
 
 	// HTML mail?
-	if ($mode == 'html') $MORE = " AND `html`='Y'";
+	if ($mode == 'html') {
+		$MORE = " AND `html`='Y'";
+	} // END - if
+
 	if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
 		// Add something for the holiday extension
 		$MORE .= " AND `holiday_active`='N'";
@@ -1113,8 +1120,8 @@ function FILTER_ACTIVATE_EXCHANGE () {
 	// Check total amount of users
 	if (getTotalConfirmedUser() >= getActivateXchange()) {
 		// Activate System
-		addSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `mem_only`='Y' WHERE `module`='order' LIMIT 1");
-		addSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='order' OR `what`='unconfirmed' LIMIT 2");
+		addSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N',`hidden`='N',`mem_only`='Y' WHERE `module`='order' LIMIT 1");
+		addSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='order' OR `what`='unconfirmed' LIMIT 2");
 
 		// Run SQLs
 		runFilterChain('run_sqls');