X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ffilters.php;h=8c2606b05c9094ed384f4da04f1eb4796716b917;hb=3082135522e6e32a26061fd2363ddb5354a1272a;hp=83019226a20f89bd1b43270e53398637cfb2e0a8;hpb=ad97b034f89416e998f04e045d7f37009e5d1b80;p=mailer.git diff --git a/inc/filters.php b/inc/filters.php index 83019226a2..8c2606b05c 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -51,11 +51,12 @@ function FILTER_FLUSH_FILTERS () { reportBug(__FUNCTION__, __LINE__, 'No database link is up. Cannot flush filters.'); } elseif ((isInstallationPhase()) && (!SQL_IS_LINK_UP())) { // If the link is not up in installation phase, skip flushing filters + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cannot flush filters: No link is up.'); return; } - // Is the extension ext-sql_patches updated and not in installation phase? - if ((!isInstallationPhase()) && ((!isExtensionInstalled('sql_patches')) || (isExtensionInstalledAndOlder('sql_patches', '0.5.9')))) { + // Is the extension ext-sql_patches updated? + if (((!isExtensionInstalled('sql_patches')) || (isExtensionInstalledAndOlder('sql_patches', '0.5.9'))) && (!isInstallationPhase())) { // Log only in debug mode if (isDebugModeEnabled()) { logDebugMessage(__FUNCTION__, __LINE__, 'Cannot flush filters, ext-sql_patches might be missing. isExtensionInstalled()=' . intval(isExtensionInstalled('sql_patches')) . ',isExtensionInstalledAndOlder()=' . intval(isExtensionInstalledAndOlder('sql_patches', '0.5.9'))); @@ -78,21 +79,30 @@ function FILTER_FLUSH_FILTERS () { // Walk through all filters foreach ($filterArray as $filterFunction => $active) { // Is this filter loaded? - //* DEBUG: */ debugOutput('FOUND:'.$filterName.'/'.$filterFunction.'='.$active); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '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: */ debugOutput('ADD:'.$filterName.'/'.$filterFunction); - $insertSQL .= sprintf("('%s','%s','Y'),", $filterName, $filterFunction); - $inserted++; + // Is this filter already in database? + if (countSumTotalData($filterFunction, 'filters', 'filter_name', 'filter_function', TRUE, sprintf(" AND `filter_name`='%s'", SQL_ESCAPE($filterName))) == 0) { + // Add this filter (all filters are active by default) + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ADD:'.$filterName.'/'.$filterFunction); + $insertSQL .= sprintf("('%s','%s','Y'),", $filterName, $filterFunction); + $inserted++; + } elseif (isDebugModeEnabled()) { + // Log already registered filters + logDebugMessage(__FUNCTION__, __LINE__, 'Already registered: filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',active=' . $active); + } } elseif ($active == 'R') { // Remove this filter - //* DEBUG: */ debugOutput('REMOVE:'.$filterName.'/'.$filterFunction); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'REMOVE:'.$filterName.'/'.$filterFunction); $removeSQL .= sprintf(" (`filter_name`='%s' AND `filter_function`='%s') OR", $filterName, $filterFunction); $removed++; } } // END - foreach } // END - foreach + // Debug message + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'inserted=' . $inserted . ',removed=' . $removed . ' - AFTER COLLECTION'); + // Something has been added? if ($inserted > 0) { // Finish SQL command and add it @@ -147,21 +157,6 @@ function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($filterData) { return $content; } -// Filter for redirecting to logout if ext-sql_patches has been installed -function FILTER_REDIRECT_TO_LOGOUT_SQL_PATCHES () { - // Remove this filter - unregisterFilter(__FUNCTION__, __LINE__, 'shutdown', __FUNCTION__); - - // Is the element set? - if (isset($GLOBALS['ext_load_mode'])) { - // Redirect here - redirectToUrl('modules.php?module=admin&logout=1&' . $GLOBALS['ext_load_mode'] . '=sql_patches'); - } // END - if - - // This should not happen! - logDebugMessage(__FUNCTION__, __LINE__, 'Cannot auto-logout because no extension load-mode has been set.'); -} - // Filter for auto-activation of a extension function FILTER_AUTO_ACTIVATE_EXTENSION ($filterData) { // Debug message @@ -271,8 +266,8 @@ function FILTER_RUN_SQLS ($filterData) { // Is there still a query left? if (!empty($sql)) { - // Is there an "ALTER TABLE" command? - if (substr(strtolower($sql), 0, 11) == 'alter table') { + // Is there an "ALTER TABLE" command? Exclude installation phase here as it would cause this query to fail + if ((substr(strtolower($sql), 0, 11) == 'alter table') && (!isset($filterData['ext_installing']))) { // Analyse the alteration command //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Alterting table: ' . $sql . ',enable_codes=' . intval($filterData['enable_codes'])); SQL_ALTER_TABLE($sql, __FUNCTION__, __LINE__, $filterData['enable_codes']); @@ -295,9 +290,6 @@ function FILTER_RUN_SQLS ($filterData) { // Debug message //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Left!'); - // Clear any SQL queries - //initSqls(); - // Return counter return $count; } @@ -355,6 +347,9 @@ function FILTER_INIT_RANDOMIZER () { // Take a prime number which is long (if you know a longer one please try it out!) setConfigEntry('_PRIME', 591623); + // Initialize array with all allowed chars + $GLOBALS['_abc'] = explode(',', 'a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,1,2,3,4,6,7,8,9,-,+,_,/,.'); + // Only execute this filter if installed if ((!isInstalled()) || (!isExtensionInstalledAndNewer('other', '0.2.5'))) { // Set missing entry @@ -367,9 +362,6 @@ function FILTER_INIT_RANDOMIZER () { // Simply init the randomizer with seed and _ADD value mt_srand(generateSeed() + getConfig('_ADD')); - - // Initialize array with all allowed chars - $GLOBALS['_abc'] = explode(',', 'a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,1,2,3,4,6,7,8,9,-,+,_,/,.'); } // Filter for removing updates @@ -557,13 +549,13 @@ function FILTER_COMPILE_EXPRESSION_CODE ($filterData) { $filterData = call_user_func($etiFunction, $data); } else { // Unsupported command detected - logDebugMessage(__FUNCTION__, __LINE__, 'eti=' . $eti . ', callback=' . $callback . ', extra=' . $extraFunction . ' - unsupported'); + logDebugMessage(__FUNCTION__, __LINE__, 'eti=' . $eti . ',etiFunction=' . $etiFunction . ',callback=' . $callback . ',extraFunction=' . $extraFunction . ',extraFunction2=' . $extraFunction2 . ' - UNSUPPORTED'); } } // END - foreach } // END - if - // Is there non-HTML mode? - if (!isHtmlOutputMode()) { + // Is there non-HTML/AJAX mode? + if ((!isHtmlOutputMode()) && (!isAjaxOutputMode())) { $filterData = decodeEntities($filterData); } // END - if @@ -670,7 +662,7 @@ function FILTER_REMOVE_EXTENSION () { // Filter for flushing the output function FILTER_FLUSH_OUTPUT () { // Simple, he? - outputHtml(''); + outputHtml(); } // Prepares an SQL statement part for HTML mail and/or holiday dependency @@ -981,7 +973,7 @@ function FILTER_HANDLE_FATAL_ERRORS () { // Filter for displaying copyright line function FILTER_DISPLAY_COPYRIGHT () { // Shall we display the copyright notice? - if ((isFullPage()) && ((getConfig('WRITE_FOOTER') == 'Y') || (isInstalling())) && ($GLOBALS['__header_sent'] == 2) && (ifCopyrightFooterEnabled())) { + if ((isFullPage()) && ((getWriteFooter() == 'Y') || (isInstalling())) && ($GLOBALS['__header_sent'] == 2) && (ifCopyrightFooterEnabled())) { // Backlink enabled? if (((isConfigEntrySet('ENABLE_BACKLINK')) && (getConfig('ENABLE_BACKLINK') == 'Y')) || (isInstalling())) { // Copyright with backlink, thanks! :-) @@ -996,8 +988,8 @@ function FILTER_DISPLAY_COPYRIGHT () { // Filter for displaying parsing time function FILTER_DISPLAY_PARSING_TIME () { // Shall we display the parsing time and number of queries? - // 1234 5 54 4 5 5 4 4 5543 3 4432 2 332 2 21 - if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (getConfig('show_timings') == 'Y') && (isFullPage())) && (!isInstallationPhase())) && (isHtmlOutputMode()) && ($GLOBALS['__header_sent'] == 2)) { + // 1234 5 54 4 554 4 5543 3 4432 2 332 2 21 + if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (isShowTimingsEnabled()) && (isFullPage())) && (!isInstallationPhase())) && (isHtmlOutputMode()) && ($GLOBALS['__header_sent'] == 2)) { // Then display it here displayParsingTime(); } // END - if @@ -1006,14 +998,14 @@ 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()) { + if (isDebugTemplateCacheEnabled()) { // Do not flush templates in debug-mode return; } // END - if // Is there cached eval() data? if ((isset($GLOBALS['template_eval'])) && (count($GLOBALS['template_eval']) > 0)) { - // Now flush all + // Flush all foreach ($GLOBALS['template_eval'] as $prefix => $templateArray) { foreach ($templateArray as $template => $eval) { // Flush the cache (if not yet found) @@ -1025,19 +1017,23 @@ function FILTER_FLUSH_TEMPLATE_CACHE () { // Filter for loading user data function FILTER_FETCH_USER_DATA ($userid = NULL) { - // Is the userid not set? Then use member id + // Is the userid not set? if (!isValidUserId($userid)) { + // Then use member id $userid = getMemberId(); } // END - if // Get user data if (!fetchUserData($userid)) { // Userid is not valid - reportBug(__FUNCTION__, __LINE__, 'User id '.$userid . ' is invalid.'); + reportBug(__FUNCTION__, __LINE__, 'User id ' . $userid . ' is invalid.'); } // END - if // Set member id setMemberId($userid); + + // Continue with next filter + return $userid; } // Filter for reseting users' last login failure, only available with latest ext-sql_patches @@ -1088,12 +1084,12 @@ function FILTER_LOAD_PAGE_HEADER () { $GLOBALS['__page_header'] = loadTemplate('page_header', TRUE); // Include meta data in 'guest' module - if ((isModuleSet()) && (getModule() == 'index')) { + if (isModuleSet()) { // Load meta data template - $GLOBALS['__page_header'] .= loadTemplate('metadata', TRUE); + $GLOBALS['__page_header'] .= loadTemplate(getMenuModeFromModule() . '_metadata', TRUE); // Add meta description to header - if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) { + if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP()) && (getModule() == 'index')) { // Add meta description not in admin and login module and when the script is installed generateMetaDescriptionCode(); } // END - if @@ -1259,7 +1255,7 @@ function FILTER_INIT_SESSION ($filterData) { // Filter for sending "build mail" to admin function FILTER_SEND_BUILD_MAIL ($filterData) { // Was one line updated? - if ($filterData['affected'] > 0) { + if (($filterData['affected'] > 0) || (isDebugBuildMailsEnabled())) { // Then call the proper function call_user_func_array('sendGenericBuildMails', $filterData); } // END - if @@ -1309,17 +1305,17 @@ function FILTER_HANDLE_REFERRER_BANNER_VIEW ($filterData) { // Redirect redirectToUrl($data['url'], FALSE); - } else { - // @TODO No banner found, output some default banner - logDebugMessage(__FUNCTION__, __LINE__, 'Banner ' . bigintval(getRequestElement('banner')) . ' not dound.'); - } + } // END - if + + // @TODO No banner found, output some default banner + logDebugMessage(__FUNCTION__, __LINE__, 'Banner ' . bigintval(getRequestElement('banner')) . ' not found.'); // Free memory SQL_FREERESULT($result); - } else { - // Do nothing for now - redirectToUrl('modules.php?module=index'); - } + } // END - if + + // Do nothing for now + redirectToUrl('modules.php?module=index'); } // Filter for redirecting on wrong server name (e.g. bad.your-server.tld will be redirected to your-server.tld) @@ -1340,5 +1336,52 @@ function FILTER_REDIRECT_WRONG_SERVER_NAME ($filterData) { return $filterData; } +// Filter for adding hidden session id +function FILTER_ADD_INPUT_HIDDEN_SESSION_ID ($filterData) { + // Is a spider detected? + if ((!isSpider()) && (!isSessionValid()) && ($filterData['__form_method'] == 'get')) { + // No, then add the hidden field + $filterData['__replacer'] .= ''; + } // END - if + + // Return filter data + return $filterData; +} + +// Filter for purging old SERVER_NAME entries +function FILTER_SERVER_NAME_EXTRA_AUTOPURGE ($filterData) { + // Is purging configured? + if ((isApServerNameEnabled()) && (getApServerNameSince() > 0)) { + // Then start purging + SQL_QUERY('DELETE LOW_PRIORITY FROM + `{?_MYSQL_PREFIX?}_server_name_log` +WHERE + (UNIX_TIMESTAMP() - UNIX_TIMESTAMP(`server_name_added`)) >= {?ap_server_name_since?}', + __FILE__, __LINE__); + + // Are some entries deleted? + if (SQL_AFFECTEDROWS() > 0) { + // Okay, then send an email to the admin + sendAdminNotification('{--ADMIN_PURGE_USER_SERVER_NAME_LOG_SUBJECT--}', 'admin_purge_user_server_name_log', SQL_AFFECTEDROWS()); + } // END - if + } // END - if + + // Return filter data + return $filterData; +} + +// Filter for detecting menu mode +function FILTER_DETERMINE_MENU_MODE_GENERIC ($filterData) { + // "Detect" it + switch (getModule()) { + case 'confirm': // Login script is 'member' + $filterData = 'member'; + break; + } // END - switch + + // Return filter data + return $filterData; +} + // [EOF] ?>