Extension ext-surfbar continued:

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index ecfa95f2698085585572c575bb5853e39f468f35..38193a20596f899e1c675581fb71d02c1c7540d3 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -557,7 +557,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
@@ -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'));
 }
@@ -1253,7 +1259,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
@@ -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
@@ -1328,5 +1340,39 @@ 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'] .= '<input type="hidden" name="' . session_name() . '" value="' . session_id() . '" />';
+       } // 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;
+}
+
 // [EOF]
 ?>