X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffilters.php;h=fd55e5785abbc2c10312add003fcb4cde87837d5;hp=4426a95aa66ce611a60ba19814e5edac3a55e83d;hb=2a54b10c7d9da3b47d245b2911bed17b21a70414;hpb=916bba4f00ee924f0d88b8fc273dee5bfb798aed diff --git a/inc/filters.php b/inc/filters.php index 4426a95aa6..fd55e5785a 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -1,7 +1,7 @@ ".__LINE__."):type={$data['type']},action={getAction()},what={getWhat()},level={$data['access_level']}
"); + //* 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')))) { // Handle failure $content['content'] .= handleLoginFailtures($data['access_level']); @@ -167,7 +167,7 @@ function FILTER_AUTO_ACTIVATE_EXTENSION ($data) { // Is this extension always activated? if (getExtensionAlwaysActive() == 'Y') { // Then activate the extension - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."): ext_name={$data['ext_name']}
"); + //* DEBUG: */ outputHtml(__FUNCTION__ . '(' . __LINE__."): ext_name={$data['ext_name']}
"); doActivateExtension($data['ext_name']); } // END - if @@ -307,12 +307,7 @@ function FILTER_UPDATE_LOGIN_DATA () { } // END - if // Update last module / online time - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `last_module`='%s', `last_online`=UNIX_TIMESTAMP(), `REMOTE_ADDR`='%s' WHERE `userid`=%s LIMIT 1", - array( - getWhat(), - detectRemoteAddr(), - getMemberId() - ), __FUNCTION__, __LINE__); + updateLastActivity(getMemberId()); } else { // Destroy session, we cannot update! destroyMemberSession(); @@ -348,7 +343,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! @@ -413,13 +408,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]] = "\" . getConfig('" . $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]] = "\" . getConfig('" . '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]] = "\" . getMessage('". 'DEFAULT_' . strtoupper($matches[1][$key]) . "') . \""; } else { // Unhandled! $GLOBALS['compile_config'][$matches[1][$key]] = '!' . $matches[1][$key] . '!'; @@ -428,7 +423,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('
'.secureString($code).'
'); } // END - foreach } // END - if @@ -439,42 +434,68 @@ 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('
' . 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('
'.print_r($matches, true).'
'); + + // Default is from OUTPUT_HTML + $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? - if (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]); - } // 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); + foreach ($matches[2] as $key => $cmd) { + // Init replacer/call-back variable + $replacer = ''; + $callback = ''; + $extraFunction = ''; + + // 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]; + + // 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 + ); + + // Call it + $code = call_user_func($commandFunction, $data); + } else { + // Unsupported command detected + debug_report_bug('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: */ die('
'.htmlentities($code).'
'); return $code; } @@ -495,9 +516,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'))) && (getOutputMode() == '0')) { // Then abort here - logDebugMessage(__FUNCTION__, __LINE__, 'Cannot run reset! Please report this bug. Thanks'); + debug_report_bug('Cannot run reset! enabled='.intval(isResetModeEnabled()).',ext='.intval(isExtensionInstalled('sql_patches')).' Please report this bug. Thanks'); } // END - if // Get more daily reset scripts @@ -589,12 +610,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 @@ -602,7 +626,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(''); @@ -614,7 +638,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'); @@ -633,7 +657,7 @@ function FILTER_TRIGGER_SENDING_POOL () { } // END - if // Init counter - $GLOBALS['pool_cnt'] = 0; + $GLOBALS['pool_cnt'] = '0'; // Init & set the include pool initIncludePool('pool'); @@ -663,11 +687,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 @@ -701,7 +724,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 @@ -737,7 +760,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 ((getTotalFatalErrors() == '0') || (getOutputMode() != 0)) { // Abort executing here return false; } // END - if @@ -822,14 +845,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 } @@ -838,7 +861,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 @@ -846,15 +869,60 @@ 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('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('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()), __FILE__, __LINE__); + + // Store it in session + setSession('mxchange_member_failures' , getUserData('login_failures')); + setSession('mxchange_member_last_fail', getUserData('last_failure')); + } // END - if +} + // [EOF] ?>