X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Ffilters.php;h=872936cbdac2e4183d6a45e296fd2aaf912b90cc;hb=840659bfdfe0d0cf891135382818cdc134bf6f2e;hp=260648a31993ed55ca683d1887ebdd876aa77163;hpb=530de02ea7a77f55d743f65a6b6f79938a9067d7;p=mailer.git
diff --git a/inc/filters.php b/inc/filters.php
index 260648a319..872936cbda 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -14,12 +14,10 @@
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * 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 *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -56,12 +54,17 @@ 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__, '{--FILTER_FLUSH_FAILED_NO_DATABASE--}');
+ debug_report_bug(__FUNCTION__, __LINE__, 'No database link is up. Cannot flush filters.');
return false;
} // END - if
- // Is the extension sql_patches updated?
+ // 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
return false;
} // END - if
@@ -107,14 +110,14 @@ function FILTER_FLUSH_FILTERS () {
} // END - if
// Shall we update usage counters (ONLY FOR DEBUGGING!)
- if ((isExtensionInstalledAndNewer('sql_patches', '0.6.0')) && (isConfigEntrySet('update_filter_usage')) && (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
));
@@ -133,15 +136,15 @@ function FILTER_FLUSH_FILTERS () {
}
// 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: */ 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() == 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'] .= handleLoginFailures($data['access_level']);
+ $content['content'] .= handleLoginFailures($filterData['access_level']);
} // END - if
// Return the content
@@ -151,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'])) {
@@ -164,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 (isExtensionAlwaysActive()) {
+ if (isThisExtensionAlwaysActive()) {
// Then activate the extension
- //* DEBUG: */ logDebugMessage(__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(__FUNCTION__, __LINE__, 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(__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 @@ -236,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 @@ -272,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')); @@ -292,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'])) { @@ -304,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 @@ -317,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(); @@ -348,13 +376,13 @@ function FILTER_REMOVE_UPDATES ($data) { // 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 @@ -436,7 +464,7 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) { if ($compiled === true) { // Run the code $eval = "\$GLOBALS['compiled_config'][\$uncompiled] = \"" . $GLOBALS['compiled_config'][$uncompiled] . '";'; - //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:
' . str_replace('$', '$', htmlentities($eval)) . ''); + //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:
' . encodeEntities($eval) . ''); eval($eval); } // END - if @@ -445,24 +473,25 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) { } // Filter for compiling expression code -function FILTER_COMPILE_EXPRESSION_CODE ($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})*%\}/', $code, $matches); + preg_match_all('/\{%(([a-zA-Z0-9-_,]+)(=([^\}]+)){0,1})*%\}/', $filterData, $matches); //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:
'.print_r($matches, true).''); // Default is from outputHtml() - $outputMode = getOutputMode(); + $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 = ''; - $value = ''; + $replacer = ''; + $callback = ''; + $extraFunction = ''; + $extraFunction2 = ''; + $value = NULL; // Extract command and call-back $cmdArray = explode(',', $cmd); @@ -478,43 +507,55 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) { if (isset($cmdArray[2])) { // Also detected $extraFunction = $cmdArray[2]; - } elseif (isset($matches[4][$key])) { + } // 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' . ucfirst(strtolower($cmd)); + $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, - 'value' => $value + 'matches' => $matches, + 'key' => $key, + 'mode' => getScriptOutputMode(), + 'code' => $filterData, + 'callback' => $callback, + 'extra_func' => $extraFunction, + 'extra_func2' => $extraFunction2, + 'value' => $value ); // Call it //* DEBUG: */ debugOutput(__FUNCTION__ . '[' . __LINE__ . ']: function=' . $commandFunction); - $code = call_user_func($commandFunction, $data); + $filterData = call_user_func($commandFunction, $data); } else { // Unsupported command detected - debug_report_bug(__FUNCTION__, __LINE__, 'Command=' . $cmd . ', callback=' . $callback . ', extra=' . $extraFunction . ' is unsupported.'); + logDebugMessage(__FUNCTION__, __LINE__, 'Command cmd=' . $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()) { + $filterData = decodeEntities($filterData); + } // END - if // Return compiled code - //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:
'.($code).''); - return $code; + //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:
'.($filterData).''); + return $filterData; } // Runs some generic filter update steps @@ -531,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 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) || ((isConfigEntrySet('DEBUG_WEEKLY')) && (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) || ((isConfigEntrySet('DEBUG_MONTHLY')) && (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 @@ -624,14 +688,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')) { + if (isGetRequestElementSet('module')) { // Set module from request - setModule(getRequestParameter('module')); - } elseif (getOutputMode() == '0') { + setModule(getRequestElement('module')); + } elseif (isHtmlOutputMode()) { // Set default module 'index' setModule('index'); } else { @@ -641,10 +705,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(''); @@ -653,7 +721,7 @@ function FILTER_DETERMINE_WHAT_ACTION () { // Set default 'what' value //* DEBUG: */ debugOutput('-' . getModule() . '/' . getWhat() . '-'); - if ((!isWhatSet()) && (!isActionSet()) && (getOutputMode() != 1) && (getOutputMode() != -1)) { + if ((!isWhatSet()) && (!isActionSet()) && (!isCssOutputMode()) && (!isRawOutputMode())) { if (getModule() == 'admin') { // Set 'action' value to 'login' in admin menu setAction(getActionFromModuleWhat(getModule(), getWhat())); @@ -670,7 +738,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 (!isHtmlOutputMode()) { // Only in normal output mode to prevent race-conditons! } // END - if @@ -689,15 +757,15 @@ function FILTER_TRIGGER_SENDING_POOL () { } // Filter for checking and updating SVN revision -function FILTER_CHECK_SVN_REVISION () { +function FILTER_CHECK_REPOSITORY_REVISION () { // Only execute this filter if installed and all config entries are there if ((!isInstalled()) || (!isConfigEntrySet('patch_level'))) return; - // Check for patch level differences between databases and current hard-coded - if ((getConfig('CURR_SVN_REVISION') > getConfig('patch_level')) || (getConfig('patch_level') == 'CURR_SVN_REVISION') || (getConfig('patch_ctime') == 'UNIX_TIMES')) { + // Check for patch level differences between database and current hard-coded + if ((getCurrentRepositoryRevision() > getConfig('patch_level')) || (getConfig('patch_level') == 'CURRENT_REPOSITORY_REVISION') || (getConfig('patch_ctime') == 'UNIX_TIMES')) { // Update database and CONFIG array - updateConfiguration(array('patch_level', 'patch_ctime'), array(getConfig('CURR_SVN_REVISION'), 'UNIX_TIMESTAMP()')); - setConfigEntry('patch_level', getConfig('CURR_SVN_REVISION')); + updateConfiguration(array('patch_level', 'patch_ctime'), array(getCurrentRepositoryRevision(), 'UNIX_TIMESTAMP()')); + setConfigEntry('patch_level', getCurrentRepositoryRevision()); setConfigEntry('patch_ctime', time()); } // END - if } @@ -705,21 +773,37 @@ function FILTER_CHECK_SVN_REVISION () { // Filter for running daily reset function FILTER_RUN_DAILY_RESET () { // Only execute this filter if installed - if ((isInstallationPhase()) || (!isInstalled()) || (!isAdminRegistered()) || (!isExtensionInstalled('sql_patches'))) return; + if ((isInstallationPhase()) || (!isInstalled()) || (!isAdminRegistered()) || (!isExtensionInstalled('sql_patches'))) { + return; + } // END - if // Shall we run the reset scripts? If a day has changed, maybe also a week/month has changed... Simple! :D - if (((date('d', getConfig('last_update')) != date('d', time())) || ((isConfigEntrySet('DEBUG_RESET')) && (getConfig('DEBUG_RESET') == 'Y'))) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestParameterSet('register')) && (getOutputMode() != 1)) { + if (((getDay(getConfig('last_update')) != getDay()) || (isDebugResetEnabled())) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestElementSet('register')) && (!isCssOutputMode())) { // Tell every module we are in reset-mode! doReset(); } // END - if } +// Filter for running hourly reset +function FILTER_RUN_HOURLY_RESET () { + // Only execute this filter if installed + if ((isInstallationPhase()) || (!isInstalled()) || (!isAdminRegistered()) || (!isExtensionInstalledAndNewer('sql_patches', '0.7.5'))) { + return; + } // END - if + + // Shall we run the reset scripts? If a day has changed, maybe also a week/month has changed... Simple! :D + if ((((isConfigEntrySet('last_hour')) && (getConfig('last_hour') != getHour())) || (isDebugResetEnabled())) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestElementSet('register')) && (!isCssOutputMode())) { + // Tell every module we are in reset-mode! + doHourly(); + } // END - if +} + // Filter for loading more runtime includes (not for installation) function FILTER_LOAD_RUNTIME_INCLUDES () { // Load more includes - foreach (array('inc/databases.php','inc/session.php','inc/versions.php') as $inc) { + foreach (array('databases', 'session', 'versions') as $inc) { // Load the include - loadIncludeOnce($inc); + loadIncludeOnce('inc/' . $inc . '.php'); } // END - foreach } @@ -738,7 +822,7 @@ function FILTER_CHECK_ADMIN_ACL () { } // END - if // Check for access control line of current menu entry - $ret = adminsCheckAdminAcl($action, getWhat()); + $ret = isAdminsAllowedByAcl($action, getWhat()); } // END - if // Set it here @@ -747,12 +831,12 @@ function FILTER_CHECK_ADMIN_ACL () { // Init random number/cache buster function FILTER_INIT_RANDOM_NUMBER () { - // Is the extension sql_patches installed and at least 0.3.6? + // Is the extension ext-sql_patches installed and at least 0.3.6? if ((isExtensionInstalledAndNewer('sql_patches', '0.3.6')) && (isExtensionInstalledAndNewer('other', '0.2.5'))) { // Generate random number - setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getMemberId(), '')); + setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 99999), getMemberId(), '')); } else { - // Generate weak (!!!) code + // Generate *WEAK* code setConfigEntry('RAND_NUMBER', mt_rand(1000000, 9999999)); } @@ -762,15 +846,17 @@ function FILTER_INIT_RANDOM_NUMBER () { // Update module counter function FILTER_COUNT_MODULE () { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getModule()=' . getModule() . ' - ENTERED!'); // Do count all other modules but not accesses on CSS file css.php! SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `clicks`=`clicks`+1 WHERE `module`='%s' LIMIT 1", array(getModule()), __FUNCTION__, __LINE__); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getModule()=' . getModule() . ',SQL_AFFECTEDROWS()=' . SQL_AFFECTEDROWS() . ' - EXIT!'); } // Handles fatal errors function FILTER_HANDLE_FATAL_ERRORS () { // Do we have errors to handle and right output mode? - if ((!ifFatalErrorsDetected()) || (getOutputMode() != '0')) { + if ((!ifFatalErrorsDetected()) || (!isHtmlOutputMode())) { // Abort executing here return false; } // END - if @@ -781,10 +867,7 @@ function FILTER_HANDLE_FATAL_ERRORS () { // Load config here loadIncludeOnce('inc/load_config.php'); - // Set unset variable - if (empty($check)) $check = ''; - - // Default is none + // Default content is none $content = ''; // Installation phase or regular mode? @@ -825,9 +908,9 @@ function FILTER_HANDLE_FATAL_ERRORS () { // Message to regular users (non-admin) $CORR = '{--FATAL_REPORT_ERRORS--}'; - // PHP warnings fixed - if ($check == 'done') { - if (isAdmin()) $CORR = '{--FATAL_CORRECT_ERRORS--}'; + // Maybe the admin wants to take a look? + if (isAdmin()) { + $CORR = '{--FATAL_CORRECT_ERRORS--}'; } // END - if // Remember all in array @@ -855,7 +938,7 @@ function FILTER_HANDLE_FATAL_ERRORS () { // Filter for displaying copyright line function FILTER_DISPLAY_COPYRIGHT () { // Shall we display the copyright notice? - if ((!isGetRequestParameterSet('frame')) && (basename($_SERVER['PHP_SELF']) != 'mailid_top.php') && ((getConfig('WRITE_FOOTER') == 'Y') || (isInstalling())) && ($GLOBALS['header_sent'] == 2)) { + if ((!isGetRequestElementSet('frame')) && (basename($_SERVER['PHP_SELF']) != 'mailid_top.php') && ((getConfig('WRITE_FOOTER') == 'Y') || (isInstalling())) && ($GLOBALS['header_sent'] == 2)) { // Backlink enabled? if (((isConfigEntrySet('ENABLE_BACKLINK')) && (getConfig('ENABLE_BACKLINK') == 'Y')) || (isInstalling())) { // Copyright with backlink, thanks! :-) @@ -871,7 +954,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') && (!isGetRequestElementSet('frame'))) || (isInstallationPhase())) && (isHtmlOutputMode()) && ($GLOBALS['header_sent'] == 2)) { // Then display it here displayParsingTime(); } // END - if @@ -893,9 +976,11 @@ function FILTER_FLUSH_TEMPLATE_CACHE () { } // Filter for loading user data -function FILTER_FETCH_USER_DATA ($userid = 0) { +function FILTER_FETCH_USER_DATA ($userid = NULL) { // Is the userid not set? Then use member id - if (($userid == '0') || (is_null($userid))) $userid = getMemberId(); + if (!isValidUserId($userid)) { + $userid = getMemberId(); + } // END - if // Get user data if (!fetchUserData($userid)) { @@ -916,13 +1001,13 @@ function FILTER_RESET_USER_LOGIN_FAILURE () { } // END - if // Remmeber login failures if available - if (isExtensionInstalledAndNewer('sql_patches', '0.6.1')) { + if (isExtensionInstalledAndNewer('user', '0.3.7')) { // Reset login failures SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `login_failures`=0, - `last_failure`='0000-00-00 00:00:00' + `last_failure`=NULL WHERE `userid`=%s LIMIT 1", @@ -935,27 +1020,24 @@ LIMIT 1", } // Try to login the admin by setting some session/cookie variables -function FILTER_DO_LOGIN_ADMIN ($data) { +function FILTER_DO_LOGIN_ADMIN ($filterData) { // Now set all session variables and store the result for later processing $GLOBALS['admin_login_success'] = (( - setSession('admin_md5', encodeHashForCookie($data['pass_hash'])) + setAdminMd5(encodeHashForCookie($filterData['pass_hash'])) ) && ( - setSession('admin_login', $data['login']) + setAdminId($filterData['id']) ) && ( - setSession('admin_last', time()) + setAdminLast(time()) )); // Return the data for further processing - return $data; + return $filterData; } // Filter for loading page header, this should be ran first! function FILTER_LOAD_PAGE_HEADER () { - // Determine the page title - $content['header_title'] = determinePageTitle(); - // Output page header code - $GLOBALS['page_header'] = loadTemplate('page_header', true, $content); + $GLOBALS['page_header'] = loadTemplate('page_header', true); // Include meta data in 'guest' module if (getModule() == 'index') { @@ -996,5 +1078,87 @@ function FILTER_CLEANUP_DNS_CACHE () { } // END - if } +// Filter for setting CURRENT_DATE, this is required after initialization of extensions +function FILTER_SET_CURRENT_DATE () { + // Set current date + setConfigEntry('CURRENT_DATE', generateDateTime(time(), '3')); + + // Epoche time for yesterday, today ... all at 00:00 am + setConfigEntry('START_YDAY', makeTime(0, 0, 0, time() - getOneDay())); + setConfigEntry('START_TDAY', makeTime(0, 0, 0, time())); +} + +// Filter for marking extension as installed +function FILTER_EXTENSION_MARK_INSTALLED ($filterData) { + // Mark it as installed + $GLOBALS['ext_is_installed'][$filterData['ext_name']] = true; +} + +// Filter for generating mails links for 'pool' mails +function FILTER_GENERATE_POOL_MAIL_LINKS ($filterData) { + // Is type 'mid'? + if ($filterData['type'] == 'mid') { + // Load template + $filterData['__output'] .= loadTemplate('admin_links_' . strtolower($filterData['mail_status']) . '_pool_mail', true, $filterData); + } // END - if + + // Return data + return $filterData; +} + +// Filter to activate exchange +function FILTER_ACTIVATE_EXCHANGE () { + // Is the extension 'user' there? + if ((!isExtensionActive('user')) || (getActivateXchange() == '0')) { + // Silently abort here + return false; + } // END - if + + // 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"); + + // Run SQLs + runFilterChain('run_sqls'); + + // Update configuration + updateConfiguration('activate_xchange' ,0); + + // Rebuild cache + rebuildCache('modules', 'modules'); + } // END - if +} + +// Filter to handle configuration +function FILTER_HANDLE_HOME_IN_INDEX_SETTING ($filterData) { + // Is ext-sql_patches up-to-date? + if ((isExtensionInstalledAndNewer('sql_patches', '0.8.3')) && (isDisplayHomeInIndexEnabled())) { + // Is 'search' as same as 'index_home'? + if ($filterData['search'] == getIndexHome()) { + // Then set 'content' to link to index.php + $filterData['content'] = $filterData['prefix'] . '' . getTitleFromMenu($filterData['access_level'], $filterData['search'], $filterData['type'], $filterData['add']) . ''; + } // END - if + } // END - if + + // Return data + return $filterData; +} + +// Filter to add history entry +function FILTER_ADD_HISTORY_ENTRY ($filterData) { + // Add the entry + SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_history` (`history_subject`,`history_userid`,`history_value`) VALUES ('%s',%s,'%s')", + $filterData, + __FUNCTION__, __LINE__); + + // Remember insert id for other filters + $filterData['history_id'] = SQL_INSERTID(); + + // Return data + return $filterData; +} + // [EOF] ?>