Installation NG continued (still not fully working)

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index 5f2dc52d1886c224b2e8846905515b2dae4d52c8..e5120cb50ffef667bc390fc2dca5b04b004f1662 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -355,6 +355,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 +370,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
@@ -1309,17 +1309,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)
@@ -1352,5 +1352,27 @@ function FILTER_ADD_INPUT_HIDDEN_SESSION_ID ($filterData) {
        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]
 ?>