X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffilters.php;h=6b33ba7f8a117af4cc7d0815ccb818c4f1e3d7d7;hp=3bcc77e333318a1fac6af9edc39d1ac9a55cdd88;hb=4b7f401f2a4680ae46ca41c57f749cfe35163660;hpb=86d7b339631307afe1ba16ceff8ce760c1523be1 diff --git a/inc/filters.php b/inc/filters.php index 3bcc77e333..6b33ba7f8a 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -1,7 +1,7 @@ $filterArray) { @@ -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 ((isExtensionInstalledAndNewer('sql_patches', '0.6.0')) && (isConfigEntrySet('update_filter_usage')) && (getConfig('update_filter_usage') == 'Y')) { // 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']}
"); + //* 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')))) { // Handle failure - $content['content'] .= handleLoginFailtures($data['access_level']); + $content['content'] .= handleLoginFailures($data['access_level']); } // END - if // Return the content @@ -165,9 +166,9 @@ function FILTER_REDIRECT_TO_LOGOUT_SQL_PATCHES () { // Filter for auto-activation of a extension function FILTER_AUTO_ACTIVATE_EXTENSION ($data) { // Is this extension always activated? - if (getExtensionAlwaysActive() == 'Y') { + if (isExtensionAlwaysActive()) { // Then activate the extension - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."): ext_name={$data['ext_name']}
"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "ext_name={$data['ext_name']}
"); doActivateExtension($data['ext_name']); } // END - if @@ -189,7 +190,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 +202,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 +220,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']); @@ -343,7 +344,7 @@ 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! @@ -408,13 +409,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 +424,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('
'.htmlentities($code).'
'); + //* DEBUG: */ if (($match == '{?URL?}') && (strlen($code) > 10000)) die(__FUNCTION__.'['.__LINE__.']:
'.secureString($code).'
'); } // END - foreach } // END - if @@ -434,45 +435,85 @@ 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: */ print(__FUNCTION__.'['.__LINE__.']:
' . str_replace('$', '$', htmlentities($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 ($code) { + // 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(__FUNCTION__.'['.__LINE__.']:
'.print_r($matches, true).'
'); + + // Default is from outputHtml() + $outputMode = getOutputMode(); // Some entries found? if ((count($matches) > 0) && (count($matches[3]) > 0)) { // Replace all matches - foreach ($matches[3] as $key => $cmd) { - // By default we have no extension installed, so 'false' is assumed - $replacer = 'false'; - - // Is the extension installed or code provided? - if ($cmd == 'code') { - // Code asked for - $replacer = getCode($matches[4][$key]); - } elseif (isExtensionActive($matches[4][$key])) { - // Construct call-back function name - $functionName = 'getExtension' . ucfirst(strtolower($cmd)); - - // Call the function - $replacer = call_user_func_array($functionName, $matches[4][$key]); + foreach ($matches[2] as $key => $cmd) { + // Init replacer/call-back variable + $replacer = ''; + $callback = ''; + $extraFunction = ''; + $value = ''; + + // 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 - // Replace it and insert parameter for GET request - $code = str_replace($matches[0][$key], sprintf("&%s=%s&rev=%s", $cmd, $replacer, getConfig('CURR_SVN_REVISION')), $code); + // Detect extra function + if (isset($cmdArray[2])) { + // Also detected + $extraFunction = $cmdArray[2]; + } elseif (isset($matches[4][$key])) { + // Use this as value + $value = $matches[4][$key]; + } + + // Construct call-back function name for the command + $commandFunction = 'doExpression' . ucfirst(strtolower($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 + ); + + // Call it + //* DEBUG: */ print __FUNCTION__ . '[' . __LINE__ . ']: function=' . $commandFunction . "
\n"; + $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); + // Return compiled code + //* DEBUG: */ print(__FUNCTION__.'['.__LINE__.']:
'.($code).'
'); return $code; } @@ -495,7 +536,7 @@ function FILTER_RUN_RESET_INCLUDES () { // Is the reset set or old sql_patches? if (((!isResetModeEnabled()) || (!isExtensionInstalled('sql_patches'))) && (getOutputMode() == '0')) { // 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 @@ -510,24 +551,24 @@ function FILTER_RUN_RESET_INCLUDES () { $currWeek = date('W', time()); // Has it changed? - if ((getConfig('last_week') != $currWeek) || (getConfig('DEBUG_WEEKLY') == 'Y')) { + if ((getConfig('last_week') != $currWeek) || ((isConfigEntrySet('DEBUG_WEEKLY')) && (getConfig('DEBUG_WEEKLY') == 'Y'))) { // Include weekly reset scripts mergeIncludePool('reset', getArrayFromDirectory('inc/weekly/', 'weekly_')); // Update config - if ((isConfigEntrySet('DEBUG_WEEKLY')) && (getConfig('DEBUG_WEEKLY') != 'Y')) updateConfiguration('last_week', $currWeek); + if ((!isConfigEntrySet('DEBUG_WEEKLY')) || (getConfig('DEBUG_WEEKLY') != 'Y')) updateConfiguration('last_week', $currWeek); } // END - if // Create current month mark $currMonth = date('m', time()); // Has it changed? - if ((getConfig('last_month') != $currMonth) || (getConfig('DEBUG_MONTHLY') == 'Y')) { + if ((getConfig('last_month') != $currMonth) || ((isConfigEntrySet('DEBUG_MONTHLY')) && (getConfig('DEBUG_MONTHLY') == 'Y'))) { // 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 ((!isConfigEntrySet('DEBUG_MONTHLY')) || (getConfig('DEBUG_MONTHLY') != 'Y')) updateConfiguration('last_month', $currMonth); } // END - if } // END - if @@ -541,11 +582,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 @@ -561,7 +602,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 @@ -587,12 +628,15 @@ function FILTER_DETERMINE_WHAT_ACTION () { // Fix module if (!isModuleSet()) { // Is the request element set? - if (isGetRequestElementSet('module')) { + if (isGetRequestParameterSet('module')) { // Set module from request - setModule(getRequestElement('module')); - } else { + setModule(getRequestParameter('module')); + } elseif (getOutputMode() == '0') { // Set default module 'index' setModule('index'); + } else { + // Unknown module + setModule('unknown'); } } // END - if @@ -600,7 +644,7 @@ function FILTER_DETERMINE_WHAT_ACTION () { if (!isWhatSet()) setWhat(getWhatFromModule(getModule())); // Fix 'action' if not yet set - if (!isActionSet()) setAction(getModeAction(getModule(), getWhat())); + if (!isActionSet()) setAction(getActionFromModuleWhat(getModule(), getWhat())); } else { // Set action/what to empty setAction(''); @@ -612,7 +656,7 @@ function FILTER_DETERMINE_WHAT_ACTION () { if ((!isWhatSet()) && (!isActionSet()) && (getOutputMode() != 1) && (getOutputMode() != -1)) { if (getModule() == 'admin') { // Set 'action' value to 'login' in admin menu - setAction(getModeAction(getModule(), getWhat())); + setAction(getActionFromModuleWhat(getModule(), getWhat())); } elseif ((getModule() == 'index') || (getModule() == 'login')) { // Set 'what' value to 'welcome' in guest and member menu setWhatFromConfig('index_home'); @@ -661,11 +705,10 @@ function FILTER_CHECK_SVN_REVISION () { // Filter for running daily reset function FILTER_RUN_DAILY_RESET () { // Only execute this filter if installed - if ((!isInstalled()) || (!isAdminRegistered())) return; + if ((isInstallationPhase()) || (!isInstalled()) || (!isAdminRegistered()) || (!isExtensionInstalled('sql_patches'))) return; // Shall we run the reset scripts? If a day has changed, maybe also a week/month has changed... Simple! :D - // 012 3 4 43 3 4432 2 3 3 21 1 221 1 221 1 2 21 1 22 10 - if (((date('d', getConfig('last_update')) != date('d', time())) || ((isConfigEntrySet('DEBUG_RESET')) && (getConfig('DEBUG_RESET') == 'Y'))) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestElementSet('register')) && (getOutputMode() != 1)) { + if (((date('d', getConfig('last_update')) != date('d', time())) || ((isConfigEntrySet('DEBUG_RESET')) && (getConfig('DEBUG_RESET') == 'Y'))) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestParameterSet('register')) && (getOutputMode() != 1)) { // Tell every module we are in reset-mode! doReset(); } // END - if @@ -678,14 +721,6 @@ function FILTER_LOAD_RUNTIME_INCLUDES () { // Load the include loadIncludeOnce($inc); } // END - foreach - - // Load admin include file if he is admin - if (isAdmin()) { - // Administrative functions - loadIncludeOnce('inc/modules/admin/admin-inc.php'); - } // END - if - //* DEBUG: */ addPointsThroughReferalSystem('test', 36, 1000); - //* DEBUG: */ die(); } // Filter for checking admin ACL @@ -699,7 +734,7 @@ function FILTER_CHECK_ADMIN_ACL () { $action = getAction(); if (isWhatSet()) { // Get action value by what-value - $action = getModeAction('admin', getWhat()); + $action = getActionFromModuleWhat('admin', getWhat()); } // END - if // Check for access control line of current menu entry @@ -735,7 +770,7 @@ function FILTER_COUNT_MODULE () { // Handles fatal errors function FILTER_HANDLE_FATAL_ERRORS () { // Do we have errors to handle and right output mode? - if ((getTotalFatalErrors() == '0') || (getOutputMode() != 0)) { + if ((!ifFatalErrorsDetected()) || (getOutputMode() != '0')) { // Abort executing here return false; } // END - if @@ -820,14 +855,14 @@ function FILTER_HANDLE_FATAL_ERRORS () { // Filter for displaying copyright line function FILTER_DISPLAY_COPYRIGHT () { // Shall we display the copyright notice? - if ((!isGetRequestElementSet('frame')) && (basename($_SERVER['PHP_SELF']) != 'mailid_top.php') && ((getConfig('WRITE_FOOTER') == 'Y') || (isInstalling())) && ($GLOBALS['header_sent'] == 2)) { + if ((!isGetRequestParameterSet('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! :-) - loadTemplate('copyright_backlink'); + $GLOBALS['page_footer'] .= loadTemplate('copyright_backlink', true); } else { // No backlink in Copyright note - loadTemplate('copyright'); + $GLOBALS['page_footer'] .= loadTemplate('copyright', true); } } // END - if } @@ -836,7 +871,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') && (!isGetRequestElementSet('frame'))) || (isInstallationPhase())) && (getOutputMode() == '0') && ($GLOBALS['header_sent'] == 2)) { + if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (getConfig('show_timings') == 'Y') && (!isGetRequestParameterSet('frame'))) || (isInstallationPhase())) && (getOutputMode() == '0') && ($GLOBALS['header_sent'] == 2)) { // Then display it here displayParsingTime(); } // END - if @@ -844,15 +879,122 @@ function FILTER_DISPLAY_PARSING_TIME () { // Filter for flushing template cache function FILTER_FLUSH_TEMPLATE_CACHE () { + // Do not flush when debugging the template cache + if (isDebuggingTemplateCache()) return; + // Do we have cached eval() data? if ((isset($GLOBALS['template_eval'])) && (count($GLOBALS['template_eval']) > 0)) { // Now flush all - foreach ($GLOBALS['template_eval'] as $template=>$eval) { + foreach ($GLOBALS['template_eval'] as $template => $eval) { // Flush the cache (if not yet found) flushTemplateCache($template, $eval); } // END - if } // END - if } +// Filter for loading user data +function FILTER_FETCH_USER_DATA ($userid = 0) { + // Is the userid not set? Then use member id + if (($userid == '0') || (is_null($userid))) $userid = getMemberId(); + + // Get user data + if (!fetchUserData($userid)) { + // Userid is not valid + debug_report_bug(__FUNCTION__, __LINE__, 'User id '.$userid . ' is invalid.'); + } // END - if + + // Set member id + setMemberId($userid); +} + +// Filter for reseting users' last login failure, only available with latest ext-sql_patches +function FILTER_RESET_USER_LOGIN_FAILURE () { + // Is the user data valid? + if (!isMember()) { + // Do only run for logged in members + debug_report_bug(__FUNCTION__, __LINE__, 'Please only run this filter for logged in users.'); + } // END - if + + // Remmeber login failures if available + if (isExtensionInstalledAndNewer('sql_patches', '0.6.1')) { + // Reset login failures + SQL_QUERY_ESC("UPDATE + `{?_MYSQL_PREFIX?}_user_data` +SET + `login_failures`=0, + `last_failure`='0000-00-00 00:00:00' +WHERE + `userid`=%s +LIMIT 1", + array(getMemberId()), __FUNCTION__, __LINE__); + + // Store it in session + setSession('mailer_member_failures' , getUserData('login_failures')); + setSession('mailer_member_last_failure', getUserData('last_failure')); + } // END - if +} + +// Try to login the admin by setting some session/cookie variables +function FILTER_DO_LOGIN_ADMIN ($data) { + // Now set all session variables and store the result for later processing + $GLOBALS['admin_login_success'] = (( + setSession('admin_md5', encodeHashForCookie($data['pass_hash'])) + ) && ( + setSession('admin_login', $data['login']) + ) && ( + setSession('admin_last', time()) + )); + + // Return the data for further processing + return $data; +} + +// 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); + + // Include meta data in 'guest' module + if (getModule() == 'index') { + // Load meta data template + $GLOBALS['page_header'] .= loadTemplate('metadata', true); + + // Add meta description to header + if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) { + // Add meta description not in admin and login module and when the script is installed + generateMetaDescriptionCode(); + } // END - if + } // END - if +} + +// Filter for adding style sheet, closing page header +function FILTER_FINISH_PAGE_HEADER () { + // Include stylesheet + loadIncludeOnce('inc/stylesheet.php'); + + // Closing HEAD tag + $GLOBALS['page_header'] .= ''; +} + +// Cleans up the DNS cache if sql_patches is at least 0.7.0 +function FILTER_CLEANUP_DNS_CACHE () { + // Is the latest version installed? + if (isExtensionInstalledAndNewer('sql_patches', '0.7.0')) { + // Load class file + loadIncludeOnce('inc/classes/resolver.class.php'); + + // Instance the resolver + $resolver = new HostnameResolver(); + + // Purge entries + $resolver->purgeEntries(); + + // Cute, isn't it? ;-) + } // END - if +} + // [EOF] ?>