Migration of stelzi's commit 1022 with some changes so we have a nicer code. See...

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index b98a265a72c202bb21470e0eecd13b8e81c26367..098a2157f952ce2a53cd8b7a794d0a6c616f4012 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -38,7 +38,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
@@ -118,14 +118,14 @@ ORDER BY `filter_id` ASC", __FUNCTION__, __LINE__);
        // Filters for post-extension-registration
        REGISTER_FILTER('post_extension_installed', 'AUTO_ACTIVATE_EXTENSION');
        REGISTER_FILTER('post_extension_installed', 'SOLVE_TASK');
-       REGISTER_FILTER('post_extension_installed', 'LOAD_INCLUDES');
+       REGISTER_FILTER('post_extension_installed', 'loadIncludeLUDES');
        REGISTER_FILTER('post_extension_installed', 'REMOVE_UPDATES');
 
        // Solving tasks
        REGISTER_FILTER('solve_task', 'SOLVE_TASK');
 
        // Loading includes in general
-       REGISTER_FILTER('load_includes', 'LOAD_INCLUDES');
+       REGISTER_FILTER('load_includes', 'loadIncludeLUDES');
 
        // Run SQLs
        REGISTER_FILTER('run_sqls', 'RUN_SQLS');
@@ -163,7 +163,7 @@ function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $fo
        // Shall we add it?
        if (!$dry_run) {
                // Simply add it to the array
-               $GLOBALS['filters']['chains'][$filterName][$filterFunction] = "Y";
+               $GLOBALS['filters']['chains'][$filterName][$filterFunction] = 'Y';
                $GLOBALS['filters']['counter'][$filterName][$filterFunction] = 0;
        } // END - if
 }
@@ -349,11 +349,11 @@ function FILTER_REDIRECT_TO_LOGOUT_SQL_PATCHES () {
        // Is the element set?
        if (isset($GLOBALS['ext_load_mode'])) {
                // Redirect here
-               LOAD_URL("modules.php?module=admin&logout=1&".$GLOBALS['ext_load_mode']."=sql_patches");
+               redirectToUrl('modules.php?module=admin&logout=1&' . $GLOBALS['ext_load_mode'] . '=sql_patches');
        } // END - if
 
        // This should not happen!
-       DEBUG_LOG(__FUNCTION__, __LINE__, "Cannot auto-logout because no extension load-mode has been set.");
+       DEBUG_LOG(__FUNCTION__, __LINE__, 'Cannot auto-logout because no extension load-mode has been set.');
 }
 
 // Filter for auto-activation of a extension
@@ -388,7 +388,7 @@ function FILTER_SOLVE_TASK ($data) {
 }
 
 // Filter to load include files
-function FILTER_LOAD_INCLUDES () {
+function FILTER_loadIncludeLUDES () {
        // Default is $data as inclusion list
        $data = GET_INC_POOL();
 
@@ -405,7 +405,7 @@ function FILTER_LOAD_INCLUDES () {
        if (COUNT_INC_POOL() > 0) {
                // Loads every include file
                foreach (GET_INC_POOL() as $FQFN) {
-                       LOAD_INC_ONCE($FQFN);
+                       loadIncludeOnce($FQFN);
                } // END - foreach
 
                // Reset array
@@ -458,7 +458,7 @@ function FILTER_UPDATE_LOGIN_DATA () {
        if (!IS_MEMBER()) return false;
 
        // Secure user ID
-       setUserId(get_session('userid'));
+       setUserId(getSession('userid'));
 
        // Load last module and last online time
        $result = SQL_QUERY_ESC("SELECT last_module, last_online FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
@@ -481,15 +481,15 @@ function FILTER_UPDATE_LOGIN_DATA () {
                if (empty($GLOBALS['what'])) {
                        // Fix it to default
                        $GLOBALS['what'] = "welcome";
-                       if (getConfig('index_home') != "") $GLOBALS['what'] = getConfig('index_home');
+                       if (getConfig('index_home') != '') $GLOBALS['what'] = getConfig('index_home');
                } // END - if
 
                // Update last module / online time
                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `last_module`='%s', last_online=UNIX_TIMESTAMP(), REMOTE_ADDR='%s' WHERE userid=%s LIMIT 1",
-                       array($GLOBALS['what'], GET_REMOTE_ADDR(), getUserId()), __FUNCTION__, __LINE__);
+                       array($GLOBALS['what'], detectRemoteAddr(), getUserId()), __FUNCTION__, __LINE__);
        }  else {
                // Destroy session, we cannot update!
-               destroy_user_session();
+               destroyUserSession();
        }
 
        // Free the result
@@ -507,11 +507,11 @@ function FILTER_CHECK_ADMIN_ACL () {
                $action = SQL_ESCAPE($GLOBALS['action']);
                if (!empty($GLOBALS['what'])) {
                        // Get action value by what-value
-                       $action = GET_ACTION('admin', $GLOBALS['what']);
+                       $action = getModeAction('admin', $GLOBALS['what']);
                } // END - if
 
                // Check for access control line of current menu entry
-               $ret = ADMINS_CHECK_ACL($action, $GLOBALS['what']);
+               $ret = adminsCheckAdminAcl($action, $GLOBALS['what']);
        } // END - if
 
        // Return result
@@ -521,7 +521,7 @@ function FILTER_CHECK_ADMIN_ACL () {
 // Filter for initializing randomizer
 function FILTER_INIT_RANDOMIZER () {
        // Simply init the randomizer with seed and _ADD value
-       mt_srand(generateSeed() + constant('_ADD'));
+       mt_srand(generateSeed() + getConfig('_ADD'));
 }
 
 // Filter for removing updates