A little better debugging, handling of percent char

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index ecfa95f2698085585572c575bb5853e39f468f35..83019226a20f89bd1b43270e53398637cfb2e0a8 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -863,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 {
@@ -871,6 +874,9 @@ 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'));
 }
@@ -1318,8 +1324,14 @@ 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(getUrl()) != detectServerName()) {
+       if (extractHostnameFromUrl($url) != detectServerName()) {
+               // Log all attempts
+               logWrongServerNameRedirect();
+
                // Then redirect to configured URL
                redirectToRequestUri();
        } // END - if