X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=668eaa2f2570cdb6f817b390ee0e9df589e8e460;hb=5db6eec1f733feda6977091029680a8b12396560;hp=ccdd4176c7bdd18a964ab9e59a6a32236679a875;hpb=ed91696103e27286d50d5dcd9e6b6a6184dd3f16;p=mailer.git diff --git a/inc/filters.php b/inc/filters.php index ccdd4176c7..668eaa2f25 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -80,10 +80,16 @@ function FILTER_FLUSH_FILTERS () { // Is this filter loaded? //* 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: */ 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: */ debugOutput('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); @@ -271,8 +277,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 +301,6 @@ function FILTER_RUN_SQLS ($filterData) { // Debug message //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Left!'); - // Clear any SQL queries - //initSqls(); - // Return counter return $count; } @@ -355,6 +358,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 @@ -554,7 +560,7 @@ 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 @@ -667,7 +673,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 @@ -705,6 +711,12 @@ function FILTER_DETERMINE_WHAT_ACTION () { if ((!isCssOutputMode()) && (!isRawOutputMode())) { // Fix module if (!isModuleSet()) { + // Is the module registered? + if (!isModuleRegistered(getRequestElement('module'))) { + // Is not a valid module + redirectToUrl('modules.php?module=index'); + } // END - if + // Is the request element set? if (isGetRequestElementSet('module')) { // Set module from request @@ -854,7 +866,10 @@ function FILTER_CHECK_ADMIN_ACL () { // Init random number/cache buster function FILTER_INIT_RANDOM_NUMBER () { // 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'))) { + if (isSessionVariableSet('random_number')) { + // Then set it + setConfigEntry('RAND_NUMBER', getSession('random_number')); + } elseif ((isExtensionInstalledAndNewer('sql_patches', '0.3.6')) && (isExtensionInstalledAndNewer('other', '0.2.5'))) { // Generate random number setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 99999), getMemberId(), '')); } else { @@ -862,12 +877,21 @@ function FILTER_INIT_RANDOM_NUMBER () { setConfigEntry('RAND_NUMBER', mt_rand(1000000, 9999999)); } + // Set it in session for faster script execusion + setSession('random_number', getConfig('RAND_NUMBER')); + // Copy it to CACHE_BUSTER setConfigEntry('CACHE_BUSTER', getConfig('RAND_NUMBER')); } // Update module counter function FILTER_COUNT_MODULE () { + // Is installation phase? + if (isInstallationPhase()) { + // Then don't count any modules + return; + } // END - if + //* 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", @@ -960,7 +984,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! :-) @@ -975,8 +999,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 @@ -1067,12 +1091,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 @@ -1238,7 +1262,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 @@ -1288,17 +1312,82 @@ 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) +function FILTER_REDIRECT_WRONG_SERVER_NAME ($filterData) { + // Get URL + $url = getUrl(); + + // Is the configured URL same as SERVER_NAME? + if (extractHostnameFromUrl($url) != detectServerName()) { + // Log all attempts + logWrongServerNameRedirect(); + + // Then redirect to configured URL + redirectToRequestUri(); + } // END - if + + // Return filter data + 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]