This 'return FALSE' caused that the PHP's error handler was called :( So, do NEVER...

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index ccdd4176c7bdd18a964ab9e59a6a32236679a875..83019226a20f89bd1b43270e53398637cfb2e0a8 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -367,6 +367,9 @@ 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
@@ -705,6 +708,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 +863,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 +874,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",
@@ -1301,5 +1322,23 @@ function FILTER_HANDLE_REFERRER_BANNER_VIEW ($filterData) {
        }
 }
 
+// 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;
+}
+
 // [EOF]
 ?>