X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=35b17eef966f73ffca76d2e3d3aa7731d468d2ca;hb=93ccd79d1a3fcb1ee5a101cb6bb670901f154555;hp=20dae9fdb550520baea88f911f4ebd918990ba42;hpb=83574a6475896fbdc231e685e2ebb0ee4f3e6eba;p=mailer.git
diff --git a/inc/filters.php b/inc/filters.php
index 20dae9fdb5..35b17eef96 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -1,7 +1,7 @@
$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,14 +110,14 @@ 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
- foreach ($filterArray as $filterFunction => $cnt) {
+ foreach ($filterArray as $filterFunction => $count) {
// Construct and add the query
addSql(sprintf("UPDATE `{?_MYSQL_PREFIX?}_filters` SET `filter_counter`=%s WHERE `filter_name`='%s' AND `filter_function`='%s' LIMIT 1",
- bigintval($cnt),
+ bigintval($count),
$filterName,
$filterFunction
));
@@ -127,20 +131,20 @@ function FILTER_FLUSH_FILTERS () {
// Should we rebuild cache?
if (($inserted > 0) || ($removed > 0)) {
// Destroy cache
- rebuildCacheFile('filter', 'filter');
+ rebuildCache('filter', 'filter');
} // END - if
}
// Filter for calling the handler for login failures
-function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($data) {
+function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($filterData) {
// Init content
- $content = $data;
+ $content = $filterData;
// 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=' . $filterData['type'] . ',action=' . getAction() . ',what=' . getWhat() . ',level=' . $filterData['access_level']);
+ if ((($filterData['type'] == 'what') || ($filterData['type'] == 'action') && ((!isWhatSet()) || (getWhat() == 'overview') || (getWhat() == getIndexHome()))) && ($filterData['access_level'] != 'guest') && ((isExtensionInstalledAndNewer('sql_patches', '0.4.7')) || (isExtensionInstalledAndNewer('admins', '0.7.6')))) {
// Handle failure
- $content['content'] .= handleLoginFailtures($data['access_level']);
+ $content['content'] .= handleLoginFailures($filterData['access_level']);
} // END - if
// Return the content
@@ -150,7 +154,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'])) {
@@ -163,54 +167,58 @@ function FILTER_REDIRECT_TO_LOGOUT_SQL_PATCHES () {
}
// Filter for auto-activation of a extension
-function FILTER_AUTO_ACTIVATE_EXTENSION ($data) {
+function FILTER_AUTO_ACTIVATE_EXTENSION ($filterData) {
+ // Debug message
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $filterData['ext_name'] . ',isThisExtensionAlwaysActive()=' . intval(isThisExtensionAlwaysActive()));
+
// Is this extension always activated?
- if (getExtensionAlwaysActive() == 'Y') {
+ if (isThisExtensionAlwaysActive()) {
// Then activate the extension
- //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."): ext_name={$data['ext_name']}
");
- doActivateExtension($data['ext_name']);
+ doActivateExtension($filterData['ext_name']);
} // END - if
// Return the data
- return $data;
+ return $filterData;
}
// Filter for solving task given task
-function FILTER_SOLVE_TASK ($data) {
+function FILTER_SOLVE_TASK ($filterData) {
// Don't solve anything if no admin!
- if (!isAdmin()) return $data;
+ if (!isAdmin()) {
+ return $filterData;
+ } // END - if
// Is this a direct task id or array element task_id is found?
- if (is_int($data)) {
+ if (is_int($filterData)) {
// Then solve it...
- adminSolveTask($data);
- } elseif ((is_array($data)) && (isset($data['task_id']))) {
+ adminSolveTask($filterData);
+ } elseif ((is_array($filterData)) && (isset($filterData['task_id']))) {
// Solve it...
- adminSolveTask($data['task_id']);
+ adminSolveTask($filterData['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($filterData), print_r($filterData, true))); } // Return the data - return $data; + return $filterData; } // Filter to load include files -function FILTER_LOAD_INCLUDES ($pool) { +function FILTER_LOAD_INCLUDES ($filterData) { // Is it null? - if (is_null($pool)) { + if (is_null($filterData)) { // 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? - if ((is_array($pool)) && (isset($pool['pool']))) { + if ((is_array($filterData)) && (isset($filterData['pool']))) { // Then use it as pool - $realPool = $pool['pool']; + $realPool = $filterData['pool']; } else { // Default is $data as inclusion list - $realPool = $pool; + $realPool = $filterData; } // Get inc pool @@ -219,7 +227,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']); @@ -235,35 +243,44 @@ function FILTER_LOAD_INCLUDES ($pool) { } // END - if // Continue with processing - return $pool; + return $filterData; } // Filter for running SQL commands -function FILTER_RUN_SQLS ($data) { +function FILTER_RUN_SQLS ($filterData) { // Debug message - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "- Entered!"); + //* DEBUG: */ die('getSqls()=
'.print_r(getSqls(), true).'ext_update_depends=
'.print_r($GLOBALS['ext_update_depends'], true).''); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Entered!'); // Is the array there? - if ((isSqlsValid()) && ((!isset($data['dry_run'])) || ($data['dry_run'] == false))) { + 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 $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($filterData['enable_codes'])) { + $filterData['enable_codes'] = true; + } // END - if + // 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($filterData['enable_codes'])); + SQL_ALTER_TABLE($sql, __FUNCTION__, __LINE__, $filterData['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($filterData['enable_codes'])); + SQL_QUERY($sql, __FUNCTION__, __LINE__, $filterData['enable_codes']); } } // END - if } // END - foreach @@ -271,16 +288,20 @@ 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 function FILTER_UPDATE_LOGIN_DATA () { // Add missing array - if ((!isset($GLOBALS['last_online'])) || (!is_array($GLOBALS['last_online']))) $GLOBALS['last_online'] = array(); + if ((!isset($GLOBALS['last_online'])) || (!is_array($GLOBALS['last_online']))) { + $GLOBALS['last_online'] = array(); + } // END - if // Recheck if logged in - if (!isMember()) return false; + if ((!isMember()) || ((isAdmin()) && (!isDebugModeEnabled()))) { + return false; + } // END - if // Secure user id setMemberId(getSession('userid')); @@ -291,7 +312,9 @@ function FILTER_UPDATE_LOGIN_DATA () { $content = getUserDataArray(); // Maybe first login time? - if (empty($content['last_module'])) $content['last_module'] = 'login'; + if (empty($content['last_module'])) { + $content['last_module'] = 'login'; + } // END - if // This will be displayed on welcome page! :-) if (empty($GLOBALS['last_online']['module'])) { @@ -303,7 +326,9 @@ 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 } // END - if // Update last module / online time @@ -316,21 +341,25 @@ function FILTER_UPDATE_LOGIN_DATA () { // Filter for initializing randomizer function FILTER_INIT_RANDOMIZER () { - // Only execute this filter if installed - if ((!isInstalled()) || (!isExtensionInstalledAndNewer('other', '0.2.5'))) return; - // Take a prime number which is long (if you know a longer one please try it out!) setConfigEntry('_PRIME', 591623); + // Only execute this filter if installed + if ((!isInstalled()) || (!isExtensionInstalledAndNewer('other', '0.2.5'))) { + // Set missing entry + setConfigEntry('_ADD', 0); + return; + } // END - if + // 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() * getCodeLength() + 1))); // Simply init the randomizer with seed and _ADD value mt_srand(generateSeed() + getConfig('_ADD')); } // Filter for removing updates -function FILTER_REMOVE_UPDATES ($data) { +function FILTER_REMOVE_UPDATES ($filterData) { // Init removal list initExtensionRemovalList(); @@ -343,17 +372,17 @@ function FILTER_REMOVE_UPDATES ($data) { // Do we need to remove update depency? if (countExtensionUpdateDependencies() > 0) { // Then find all updates we shall no longer execute - foreach (getExtensionUpdateDependencies() as $id=>$ext_name) { + foreach (getExtensionUpdateDependencies() as $id => $ext_name) { // Shall we remove this update? if (in_array($ext_name, getExtensionRemovalList())) { // Then remove this extension! - removeExtensionUpdateDependency($ext_name); + removeExtensionDependency($ext_name); } // END - if } // END - foreach } // END - if // Return data - return $data; + return $filterData; } // Determines username for current user state @@ -375,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(); @@ -408,13 +437,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 +452,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,52 +463,104 @@ 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] . "\";"); + $eval = "\$GLOBALS['compiled_config'][\$uncompiled] = \"" . $GLOBALS['compiled_config'][$uncompiled] . '";'; + //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:
' . encodeEntities($eval) . ''); + eval($eval); } // END - if // Return compiled code 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 - preg_match_all('/\{%((([a-zA-Z0-9-_]+)=([a-zA-Z0-9-_]+))*)\%\}/', $code, $matches); +// Filter for compiling expression code +function FILTER_COMPILE_EXPRESSION_CODE ($filterData) { + // 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})*%\}/', $filterData, $matches); + //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:
'.print_r($matches, true).''); + + // Default is from outputHtml() + $outputMode = getScriptOutputMode(); // Some entries found? if ((count($matches) > 0) && (count($matches[3]) > 0)) { // Replace all matches - foreach ($matches[3] as $key => $cmd) { - // Init replacer variable - $replacer = ''; - - // Is the extension installed or code provided? - if ($cmd == 'code') { - // Code asked for - $replacer = "\".getCode(\"" . $matches[4][$key] . "\").\""; - } else { - // Construct call-back function name - $functionName = 'getExtension' . ucfirst(strtolower($cmd)); + foreach ($matches[2] as $key => $cmd) { + // Init replacer/call-back variable + $replacer = ''; + $callback = ''; + $extraFunction = ''; + $extraFunction2 = ''; + $value = NULL; + + // Extract command and call-back + $cmdArray = explode(',', $cmd); + $cmd = $cmdArray[0]; + + // Detect call-back function + if (isset($cmdArray[1])) { + // Call-back function detected + $callback = $cmdArray[1]; + } // END - if - // Construct call of the function - $replacer = "\".call_user_func_array('" . $functionName . "', array('" . $matches[4][$key] . "', true)).\""; - } + // Detect extra function + if (isset($cmdArray[2])) { + // Also detected + $extraFunction = $cmdArray[2]; + } // END - if - // Replace it and insert parameter for GET request - $code = str_replace($matches[0][$key], sprintf("&%s=%s&rev=\".getConfig('CURR_SVN_REVISION').\"", $cmd, $replacer), $code); + // 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, + 'output_mode' => getScriptOutputMode(), + 'code' => $filterData, + 'callback' => $callback, + 'extra_func' => $extraFunction, + 'extra_func2' => $extraFunction2, + 'value' => $value + ); + + // Call it + //* DEBUG: */ debugOutput(__FUNCTION__ . '[' . __LINE__ . ']: function=' . $commandFunction); + $filterData = call_user_func($commandFunction, $data); + } else { + // Unsupported command detected + logDebugMessage(__FUNCTION__, __LINE__, 'Command cmd=' . $cmd . ', callback=' . $callback . ', extra=' . $extraFunction . ' is unsupported.'); + } } // END - foreach } // END - if + // Do we have non-HTML mode? + if (!isHtmlOutputMode()) { + $filterData = decodeEntities($filterData); + } // END - if + // Return compiled code - //* DEBUG: */ die('
'.secureString($code).''); - return $code; + //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:
'.($filterData).''); + return $filterData; } // 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 @@ -491,44 +572,67 @@ function FILTER_UPDATE_EXTENSION_DATA ($ext_name) { unset($GLOBALS['update_ver'][$ext_name]); } +// Load more hourly reset scripts +function FILTER_RUN_HOURLY_INCLUDES () { + // Is the reset set or old sql_patches? + if (((!isHourlyResetEnabled()) || (!isExtensionInstalledAndNewer('sql_patches', '0.7.5'))) && (isHtmlOutputMode())) { + // Then abort here + debug_report_bug(__FUNCTION__, __LINE__, 'Cannot run reset! enabled='.intval(isHourlyResetEnabled()).',ext_newer[sql_patches:0.7.5]='.intval(isExtensionInstalledAndNewer('sql_patches', '0.7.5')).' Please report this bug. Thanks'); + } // END - if + + // Get more hourly reset scripts + setIncludePool('hourly', getArrayFromDirectory('inc/hourly/', 'hourly_')); + + // Update database + if ((!isConfigEntrySet('DEBUG_RESET')) || (!isDebugResetEnabled())) { + updateConfiguration('last_hour', getHour()); + } // END - if + + // Run the filter + runFilterChain('load_includes', 'hourly'); +} + // 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 - logDebugMessage(__FUNCTION__, __LINE__, 'Cannot run reset! 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 - setIncludePool('reset', getArrayFromDirectory('inc/reset/', 'reset_')); + setIncludePool('reset', getArrayFromDirectory('inc/daily/', 'daily_')); // Update database - if ((!isConfigEntrySet('DEBUG_RESET')) || (getConfig('DEBUG_RESET') != 'Y')) updateConfiguration('last_update', 'UNIX_TIMESTAMP()'); + if ((!isConfigEntrySet('DEBUG_RESET')) || (!isDebugResetEnabled())) { + updateConfiguration('last_update', 'UNIX_TIMESTAMP()'); + } // END - if // Is the config entry set? if (isExtensionInstalledAndNewer('sql_patches', '0.4.2')) { - // Create current week mark - $currWeek = date('W', time()); - // Has it changed? - if ((getConfig('last_week') != $currWeek) || (getConfig('DEBUG_WEEKLY') == 'Y')) { + if (((isConfigEntrySet('last_week')) && (getConfig('last_week') != getWeek())) || (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', getWeek()); + } // END - if } // 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 ((getLastMonth() != $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 } // END - if @@ -542,11 +646,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 @@ -555,14 +659,17 @@ 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 ((isExtensionActive('holiday')) && (getExtensionVersion('holiday') >= '0.1.3')) { + 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'"; } // END - if @@ -584,14 +691,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 (isGetRequestElementSet('module')) { // Set module from request setModule(getRequestElement('module')); - } elseif (getOutputMode() == '0') { + } elseif (isHtmlOutputMode()) { // Set default module 'index' setModule('index'); } else { @@ -601,10 +708,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(getModeAction(getModule(), getWhat())); + if (!isActionSet()) { + setAction(getActionFromModuleWhat(getModule(), getWhat())); + } // END - if } else { // Set action/what to empty setAction(''); @@ -612,11 +723,11 @@ function FILTER_DETERMINE_WHAT_ACTION () { } // Set default 'what' value - //* DEBUG: */ outputHtml('-'.getModule().'/'.getWhat()."-