X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Ffilters.php;h=fe1a36c00990c04e4831d5c539ca6c0d81e8110b;hb=5e9e2e145dc720e1459a6f1f51f2a32f1fcc9b6d;hp=35ff120eb7067af5178da838051dafbb9822e897;hpb=4fbcc6c31cd21218a4b243eb4869989ad82efd65;p=mailer.git
diff --git a/inc/filters.php b/inc/filters.php
index 35ff120eb7..fe1a36c009 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -18,6 +18,7 @@
* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -55,7 +56,7 @@ function FILTER_FLUSH_FILTERS () {
// Is a database link here and not in installation mode?
if ((!SQL_IS_LINK_UP()) && (!isInstalling())) {
// Abort here
- addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FLUSH_FAILED_NO_DATABASE'));
+ addFatalMessage(__FUNCTION__, __LINE__, '{--FILTER_FLUSH_FAILED_NO_DATABASE--}');
return false;
} // END - if
@@ -70,23 +71,23 @@ function FILTER_FLUSH_FILTERS () {
$removed = '0';
// Prepare SQL queries
- $insertSQL = "INSERT INTO `{?_MYSQL_PREFIX?}_filters` (`filter_name`,`filter_function`,`filter_active`) VALUES";
- $removeSQL = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_filters` WHERE";
+ $insertSQL = 'INSERT INTO `{?_MYSQL_PREFIX?}_filters` (`filter_name`,`filter_function`,`filter_active`) VALUES';
+ $removeSQL = 'DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_filters` WHERE';
// Write all filters to database
foreach ($GLOBALS['cache_array']['filter']['chains'] as $filterName => $filterArray) {
// Walk through all filters
foreach ($filterArray as $filterFunction => $active) {
// Is this filter loaded?
- //* DEBUG: */ print 'FOUND:'.$filterName.'/'.$filterFunction.'='.$active.'
';
+ //* DEBUG: */ debugOutput('FOUND:'.$filterName.'/'.$filterFunction.'='.$active);
if (((!isset($GLOBALS['cache_array']['filter']['loaded'][$filterName][$filterFunction])) && ($active != 'R')) || ($active == 'A')) {
// Add this filter (all filters are active by default)
- //* DEBUG: */ print 'ADD:'.$filterName.'/'.$filterFunction.'
';
+ //* DEBUG: */ debugOutput('ADD:'.$filterName.'/'.$filterFunction);
$insertSQL .= sprintf("('%s','%s','Y'),", $filterName, $filterFunction);
$inserted++;
} elseif ($active == 'R') {
// Remove this filter
- //* DEBUG: */ print 'REMOVE:'.$filterName.'/'.$filterFunction.'
';
+ //* DEBUG: */ debugOutput('REMOVE:'.$filterName.'/'.$filterFunction);
$removeSQL .= sprintf(" (`filter_name`='%s' AND `filter_function`='%s') OR", $filterName, $filterFunction);
$removed++;
}
@@ -106,7 +107,7 @@ function FILTER_FLUSH_FILTERS () {
} // END - if
// Shall we update usage counters (ONLY FOR DEBUGGING!)
- if (getConfig('update_filter_usage') == 'Y') {
+ if (isFilterUsageUpdateEnabled()) {
// Update all counters
foreach ($GLOBALS['cache_array']['filter']['counter'] as $filterName => $filterArray) {
// Walk through all filters
@@ -127,7 +128,7 @@ function FILTER_FLUSH_FILTERS () {
// Should we rebuild cache?
if (($inserted > 0) || ($removed > 0)) {
// Destroy cache
- rebuildCacheFile('filter', 'filter');
+ rebuildCache('filter', 'filter');
} // END - if
}
@@ -137,10 +138,10 @@ function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($data) {
$content = $data;
// Handle failed logins here if not in guest
- //* DEBUG: */ outputHtml(__FUNCTION__ . '(' . __LINE__."):type={$data['type']},action={getAction()},what={getWhat()},level={$data['access_level']}
");
- if ((($data['type'] == 'what') || ($data['type'] == 'action') && ((!isWhatSet()) || (getWhat() == 'overview') || (getWhat() == getConfig('index_home')))) && ($data['access_level'] != 'guest') && ((isExtensionInstalledAndNewer('sql_patches', '0.4.7')) || (isExtensionInstalledAndNewer('admins', '0.7.0')))) {
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "type=".$data['type'].",action=".getAction().",what=".getWhat().",level=".$data['access_level']."
");
+ if ((($data['type'] == 'what') || ($data['type'] == 'action') && ((!isWhatSet()) || (getWhat() == 'overview') || (getWhat() == getIndexHome()))) && ($data['access_level'] != 'guest') && ((isExtensionInstalledAndNewer('sql_patches', '0.4.7')) || (isExtensionInstalledAndNewer('admins', '0.7.0')))) {
// Handle failure
- $content['content'] .= handleLoginFailtures($data['access_level']);
+ $content['content'] .= handleLoginFailures($data['access_level']);
} // END - if
// Return the content
@@ -150,7 +151,7 @@ function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($data) {
// Filter for redirecting to logout if sql_patches has been installed
function FILTER_REDIRECT_TO_LOGOUT_SQL_PATCHES () {
// Remove this filter
- unregisterFilter('shutdown', __FUNCTION__);
+ unregisterFilter(__FUNCTION__, __LINE__, 'shutdown', __FUNCTION__);
// Is the element set?
if (isset($GLOBALS['ext_load_mode'])) {
@@ -164,10 +165,12 @@ function FILTER_REDIRECT_TO_LOGOUT_SQL_PATCHES () {
// Filter for auto-activation of a extension
function FILTER_AUTO_ACTIVATE_EXTENSION ($data) {
+ // Debug message
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $data['ext_name'] . ',isExtensionAlwaysActive()=' . intval(isExtensionAlwaysActive()));
+
// Is this extension always activated?
- if (getExtensionAlwaysActive() == 'Y') {
+ if (isExtensionAlwaysActive()) {
// Then activate the extension
- //* DEBUG: */ outputHtml(__FUNCTION__ . '(' . __LINE__."): ext_name={$data['ext_name']}
");
doActivateExtension($data['ext_name']);
} // END - if
@@ -189,7 +192,7 @@ function FILTER_SOLVE_TASK ($data) {
adminSolveTask($data['task_id']);
} else {
// Not detectable!
- debug_report_bug(sprintf("Cannot resolve task. data[%s]=
%s", gettype($data), print_r($data, true))); + debug_report_bug(__FUNCTION__, __LINE__, sprintf("Cannot resolve task. data[%s]=
%s", gettype($data), print_r($data, true))); } // Return the data @@ -201,7 +204,7 @@ function FILTER_LOAD_INCLUDES ($pool) { // Is it null? if (is_null($pool)) { // This should not happen! - debug_report_bug('pool is null.'); + debug_report_bug(__FUNCTION__, __LINE__, 'pool is null.'); } // END - if // Is the pool an array and 'pool' set? @@ -219,7 +222,7 @@ function FILTER_LOAD_INCLUDES ($pool) { // Is it an array? if ((!isset($data)) || (!is_array($data))) { // Then abort here - debug_report_bug(sprintf("INC_POOL is no array! Type: %s", gettype($data))); + debug_report_bug(__FUNCTION__, __LINE__, sprintf("INC_POOL is no array! Type: %s", gettype($data))); } elseif (isset($data['inc_pool'])) { // Use this as new inclusion pool! setIncludePool($realPool, $data['inc_pool']); @@ -241,29 +244,35 @@ function FILTER_LOAD_INCLUDES ($pool) { // Filter for running SQL commands function FILTER_RUN_SQLS ($data) { // Debug message - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "- Entered!"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Entered!'); // Is the array there? if ((isSqlsValid()) && ((!isset($data['dry_run'])) || ($data['dry_run'] == false))) { // Run SQL commands - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "- Found ".countSqls()." queries to run."); - foreach (getSqls() as $sqls) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Found ' . countSqls() . ' queries to run.'); + foreach (getSqls() as $mode=>$sqls) { + // Debug message + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'mode=' . $mode . ',count()=' . count($sqls)); + // New cache format... foreach ($sqls as $sql) { // Trim spaces away $sql = trim($sql); + // Is 'enable_codes' not set? Then set it to true + if (!isset($data['enable_codes'])) $data['enable_codes'] = true; + // Is there still a query left? if (!empty($sql)) { // Do we have an "ALTER TABLE" command? if (substr(strtolower($sql), 0, 11) == 'alter table') { // Analyse the alteration command - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Alterting table: {$sql}"); - SQL_ALTER_TABLE($sql, __FUNCTION__, __LINE__); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Alterting table: ' . $sql . ',enable_codes=' . intval($data['enable_codes'])); + SQL_ALTER_TABLE($sql, __FUNCTION__, __LINE__, $data['enable_codes']); } else { // Run regular SQL command - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Running regular query: {$sql}"); - SQL_QUERY($sql, __FUNCTION__, __LINE__, false); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Running regular query: ' . $sql . ',enable_codes=' . intval($data['enable_codes'])); + SQL_QUERY($sql, __FUNCTION__, __LINE__, $data['enable_codes']); } } // END - if } // END - foreach @@ -271,7 +280,7 @@ function FILTER_RUN_SQLS ($data) { } // END - if // Debug message - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "- Left!"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Left!'); } // Filter for updating/validating login data @@ -303,7 +312,7 @@ function FILTER_UPDATE_LOGIN_DATA () { if (!isWhatSet()) { // Fix it to default setWhat('welcome'); - if (getConfig('index_home') != '') setWhatFromConfig('index_home'); + if (getIndexHome() != '') setWhatFromConfig('index_home'); } // END - if // Update last module / online time @@ -323,7 +332,7 @@ function FILTER_INIT_RANDOMIZER () { setConfigEntry('_PRIME', 591623); // Calculate "entropy" with the prime number (for code generation) - setConfigEntry('_ADD', (getConfig('_PRIME') * getConfig('_PRIME') / (pi() * getConfig('code_length') + 1))); + setConfigEntry('_ADD', (getPrime() * getPrime() / (pi() * getConfig('code_length') + 1))); // Simply init the randomizer with seed and _ADD value mt_srand(generateSeed() + getConfig('_ADD')); @@ -408,13 +417,13 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) { // Is the config valid? if (isConfigEntrySet($matches[1][$key])) { // Set it for caching - $GLOBALS['compile_config'][$matches[1][$key]] = "\" . getConfig('" . $matches[1][$key] . "') . \""; + $GLOBALS['compile_config'][$matches[1][$key]] = '{%config=' . $matches[1][$key] . '%}'; } elseif (isConfigEntrySet('default_' . strtoupper($matches[1][$key]))) { // Use default value - $GLOBALS['compile_config'][$matches[1][$key]] = "\" . getConfig('" . 'DEFAULT_' . strtoupper($matches[1][$key]) . "') . \""; + $GLOBALS['compile_config'][$matches[1][$key]] = '{%config=' . 'DEFAULT_' . strtoupper($matches[1][$key]) . '%}'; } elseif (isMessageIdValid('DEFAULT_' . strtoupper($matches[1][$key]))) { // No config, try the language system - $GLOBALS['compile_config'][$matches[1][$key]] = "\" . getMessage('". 'DEFAULT_' . strtoupper($matches[1][$key]) . "') . \""; + $GLOBALS['compile_config'][$matches[1][$key]] = '{%message,DEFAULT_' . strtoupper($matches[1][$key]) . '%}'; } else { // Unhandled! $GLOBALS['compile_config'][$matches[1][$key]] = '!' . $matches[1][$key] . '!'; @@ -423,7 +432,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('
'.secureString($code).''); + //* DEBUG: */ if (($match == '{?URL?}') && (strlen($code) > 10000)) die(__FUNCTION__.'['.__LINE__.']:
'.secureString($code).''); } // END - foreach } // END - if @@ -434,8 +443,8 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) { // Should we compile it? if ($compiled === true) { // Run the code - $eval = "\$GLOBALS['compiled_config'][\$uncompiled] = \"" . $GLOBALS['compiled_config'][$uncompiled] . "\";"; - //* DEBUG: */ print('
' . str_replace('$', '$', htmlentities($eval)) . ''); + $eval = "\$GLOBALS['compiled_config'][\$uncompiled] = \"" . $GLOBALS['compiled_config'][$uncompiled] . '";'; + //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:
' . encodeEntities($eval) . ''); eval($eval); } // END - if @@ -445,142 +454,91 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) { // Filter for compiling expression code function FILTER_COMPILE_EXPRESSION_CODE ($code) { - // Compile {%cmd=some_value%} to get expression code snippets + // Compile {%cmd,callback,extraFunction=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('
'.print_r($matches, true).''); + //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:
'.print_r($matches, true).''); - // Default is from OUTPUT_HTML - $outputMode = getOutputMode(); + // Default is from outputHtml() + $outputMode = getScriptOutputMode(); // Some entries found? if ((count($matches) > 0) && (count($matches[3]) > 0)) { // Replace all matches foreach ($matches[2] as $key => $cmd) { // Init replacer/call-back variable - $replacer = ''; - $callback = ''; - $extraFunction = ''; + $replacer = ''; + $callback = ''; + $extraFunction = ''; + $extraFunction2 = ''; + $value = ''; // Extract command and call-back $cmdArray = explode(',', $cmd); $cmd = $cmdArray[0]; - if (isset($cmdArray[1])) $callback = $cmdArray[1]; - if (isset($cmdArray[2])) $extraFunction = $cmdArray[2]; - - // Is the extension installed or code provided? - // @TODO This whole switch-block is very static - switch ($cmd) { - case 'code': // Code asked for - $code = str_replace($matches[0][$key], "\" . getCode('" . $matches[4][$key] . "') . \"", $code); - break; - - case 'url': - // Do we have JS-mode? - if (substr($cmd, -2, 2) == 'js') $outputMode = 1; - - // Handle an URL here - $replacer = "\" . encodeUrl(\"" . $matches[4][$key] . "\", " . $outputMode . ") . \""; - - // Replace it - $code = str_replace($matches[0][$key], $replacer, $code); - break; - - case 'server': - // This will make 'foo_bar' to detectFooBar() - $functionName = "'detect' . implode('', array_map('ucfirst', explode('_', '" . $callback . "')))"; - - // Replace it - $code = str_replace($matches[0][$key], "\" . call_user_func(" . $functionName . ") . \"", $code); - break; - - case 'user': - // Use current userid by default - $functionName = 'getMemberId()'; - - // User-related data, so is there a userid? - if (!empty($matches[4][$key])) { - // Do we have a userid or $userid? - if ($matches[4][$key] == '$userid') { - // Use dynamic call - $functionName = "getFetchedUserData('userid', \$userid, '" . $callback . "')"; - } elseif ($matches[4][$key] > 0) { - // User data found - $functionName = "getFetchedUserData('userid', " . $matches[4][$key] . ", " . $callback . "')"; - } // END - if - } elseif ((!empty($callback)) && (isUserDataValid())) { - // "Call-back" alias column for current logged in user's data - $functionName = "getUserData('" . $callback . "')"; - } - // Do we have another function to run (e.g. translations) - if (!empty($extraFunction)) { - // Surround the original function call with it - $functionName = $extraFunction . '(' . $functionName . ')'; - } // END - if - - // Now replace the code - $code = str_replace($matches[0][$key], "\" . " . $functionName . " . \"", $code); - break; - - case 'ext': - // Not installed is default - $replacer = 'false'; - - // Is the extension installed? - if (isExtensionInstalled($matches[4][$key])) { - // Construct call-back function name - $functionName = 'getExtension' . ucfirst(strtolower($callback)); - - // Construct call of the function - $replacer = "\" . call_user_func_array('" . $functionName . "', array('" . $matches[4][$key] . "', true)) . \""; - } // END - if - - // Replace it and insert parameter for GET request - $code = str_replace($matches[0][$key], sprintf("&ext=%s&ver=%s&rev=\" . getConfig('CURR_SVN_REVISION') . \"", $matches[4][$key], $replacer), $code); - break; - - case 'config': // @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again - // Read configuration - $configValue = getConfig($matches[4][$key]); - - // Do we have a call-back? - if (!empty($callback)) { - // Parse it through this function - $configValue = call_user_func_array($callback, array($configValue)); - } // END - if - - // Replace the config entry - $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.'); - break; - } // END - switch + // Detect call-back function + if (isset($cmdArray[1])) { + // Call-back function detected + $callback = $cmdArray[1]; + } // END - if + + // Detect extra function + if (isset($cmdArray[2])) { + // Also detected + $extraFunction = $cmdArray[2]; + } // END - if + + // Detect extra function 2 + if (isset($cmdArray[3])) { + // Also detected + $extraFunction2 = $cmdArray[3]; + } // END - if + + // And value + if (isset($matches[4][$key])) { + // Use this as value + $value = $matches[4][$key]; + } // END - if + + // Construct call-back function name for the command + $commandFunction = 'doExpression' . capitalizeUnderscoreString($cmd); + + // Is this function there? + if (function_exists($commandFunction)) { + // Prepare $matches, $key, $outputMode, etc. + $data = array( + 'matches' => $matches, + 'key' => $key, + 'mode' => $outputMode, + 'code' => $code, + 'callback' => $callback, + 'extra_func' => $extraFunction, + 'extra_func2' => $extraFunction2, + 'value' => $value + ); + + // Call it + //* DEBUG: */ debugOutput(__FUNCTION__ . '[' . __LINE__ . ']: function=' . $commandFunction); + $code = call_user_func($commandFunction, $data); + } else { + // Unsupported command detected + debug_report_bug(__FUNCTION__, __LINE__, 'Command=' . $cmd . ', callback=' . $callback . ', extra=' . $extraFunction . ' is unsupported.'); + } } // END - foreach } // END - if // Do we have non-HTML mode? - if ((getOutputMode() != '0') || ($outputMode != '0')) $code = decodeEntities($code); + if ((!isHtmlOutputMode()) || ($outputMode != '0')) $code = decodeEntities($code); // Return compiled code - //* DEBUG: */ die('
'.htmlentities($code).''); + //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:
'.($code).''); return $code; } // Runs some generic filter update steps function FILTER_UPDATE_EXTENSION_DATA ($ext_name) { - // Create task + // Create task (we ignore the task id here) createExtensionUpdateTask(getCurrentAdminId(), $ext_name, $GLOBALS['update_ver'][$ext_name], SQL_ESCAPE(getExtensionNotes(getExtensionNotes()))); // Update extension's version @@ -595,9 +553,9 @@ 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'))) && (isHtmlOutputMode())) { // Then abort here - debug_report_bug('Cannot run reset! enabled='.intval(isResetModeEnabled()).',ext='.intval(isExtensionInstalled('sql_patches')).' Please report this bug. Thanks'); + debug_report_bug(__FUNCTION__, __LINE__, 'Cannot run reset! enabled='.intval(isResetModeEnabled()).',ext='.intval(isExtensionInstalled('sql_patches')).' Please report this bug. Thanks'); } // END - if // Get more daily reset scripts @@ -609,27 +567,27 @@ function FILTER_RUN_RESET_INCLUDES () { // Is the config entry set? if (isExtensionInstalledAndNewer('sql_patches', '0.4.2')) { // Create current week mark - $currWeek = date('W', time()); + $currWeek = getWeek(); // Has it changed? - if ((getConfig('last_week') != $currWeek) || (getConfig('DEBUG_WEEKLY') == 'Y')) { + if ((getConfig('last_week') != $currWeek) || (isWeeklyResetDebugEnabled())) { // Include weekly reset scripts mergeIncludePool('reset', getArrayFromDirectory('inc/weekly/', 'weekly_')); - // Update config - if ((isConfigEntrySet('DEBUG_WEEKLY')) && (getConfig('DEBUG_WEEKLY') != 'Y')) updateConfiguration('last_week', $currWeek); + // Update config if not in debug mode + if (!isWeeklyResetDebugEnabled()) updateConfiguration('last_week', $currWeek); } // END - if // Create current month mark - $currMonth = date('m', time()); + $currMonth = getMonth(); // Has it changed? - if ((getConfig('last_month') != $currMonth) || (getConfig('DEBUG_MONTHLY') == 'Y')) { + if ((getConfig('last_month') != $currMonth) || (isMonthlyResetDebugEnabled())) { // Include monthly reset scripts mergeIncludePool('reset', getArrayFromDirectory('inc/monthly/', 'monthly_')); // Update config - if ((isConfigEntrySet('DEBUG_MONTHLY')) && (getConfig('DEBUG_MONTHLY') != 'Y')) updateConfiguration('last_month', $currMonth); + if (!isMonthlyResetDebugEnabled()) updateConfiguration('last_month', $currMonth); } // END - if } // END - if @@ -643,11 +601,11 @@ function FILTER_REMOVE_EXTENSION () { SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1", array(getCurrentExtensionName()), __FUNCTION__, __LINE__); - // Remove the extension from global cache array as well + // Remove the extension from cache array as well removeExtensionFromArray(); // Remove the cache - rebuildCacheFile('extension', 'extension'); + rebuildCache('extension', 'extension'); } // Filter for flushing the output @@ -663,7 +621,7 @@ function FILTER_HTML_INCLUDE_USERS ($mode) { // HTML mail? if ($mode == 'html') $MORE = " AND `html`='Y'"; - if ((isExtensionActive('holiday')) && (getExtensionVersion('holiday') >= '0.1.3')) { + if (isExtensionInstalledAndNewer('holiday', '0.1.3')) { // Add something for the holiday extension $MORE .= " AND `holiday_active`='N'"; } // END - if @@ -685,14 +643,14 @@ function FILTER_DETERMINE_WHAT_ACTION () { } // END - if // Get all values - if ((getOutputMode() != 1) && (getOutputMode() != -1)) { + if ((!isCssOutputMode()) && (!isRawOutputMode())) { // Fix module if (!isModuleSet()) { // Is the request element set? if (isGetRequestParameterSet('module')) { // Set module from request setModule(getRequestParameter('module')); - } elseif (getOutputMode() == '0') { + } elseif (isHtmlOutputMode()) { // Set default module 'index' setModule('index'); } else { @@ -702,10 +660,14 @@ function FILTER_DETERMINE_WHAT_ACTION () { } // END - if // Fix 'what' if not yet set - if (!isWhatSet()) setWhat(getWhatFromModule(getModule())); + if (!isWhatSet()) { + setWhat(getWhatFromModule(getModule())); + } // END - if // Fix 'action' if not yet set - if (!isActionSet()) setAction(getActionFromModuleWhat(getModule(), getWhat())); + if (!isActionSet()) { + setAction(getActionFromModuleWhat(getModule(), getWhat())); + } // END - if } else { // Set action/what to empty setAction(''); @@ -713,8 +675,8 @@ function FILTER_DETERMINE_WHAT_ACTION () { } // Set default 'what' value - //* DEBUG: */ outputHtml('-'.getModule().'/'.getWhat()."-