X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffilters.php;h=fcafc63c0ea18c7c25b6265986d489f6be06df24;hp=92a0174bb59e2b548634eac357a494c6986846eb;hb=b3154fcf34de56f8069671d850f99eda386127c3;hpb=6f9f29d5caee60a2cceae33a7a53e1b4c7319a0c diff --git a/inc/filters.php b/inc/filters.php index 92a0174bb5..fcafc63c0e 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -404,7 +404,7 @@ function FILTER_DETERMINE_USERNAME () { } // END - if } else { // Hmmm, logged in and no valid userid? - setUsername('{--USERNAME_UNKNOWN--}'); + setUsername('{--USERNAME_UNKNOWN--}'); // Destroy session destroyMemberSession(); @@ -530,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, @@ -603,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 @@ -615,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 @@ -629,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 @@ -659,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'";