Several rewrites/renames, fixes for installation. Resolves #104

[mailer.git] / inc / modules / admin / admin-inc.php

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index a8f107f87f3c548b99473a2904b79b47df4282a9..f96c247a98d1e07dbe9edf4f3e6bdc095520c4fe 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -86,7 +86,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
                } // END - if
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Add extra data via filter now
-               $ADD = RUN_FILTER('sql_admin_extra_data');
+               $ADD = runFilterChain('sql_admin_extra_data');
 
                // Get password from DB
                $result = SQL_QUERY_ESC("SELECT password".$ADD." FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
@@ -147,7 +147,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
                }
 
                // Rebuild cache
-               REBUILD_CACHE("admins", "admin");
+               rebuildCacheFiles("admins", "admin");
 
                // Login has failed by default... ;-)
                $ret = "failed";
@@ -175,7 +175,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
                        array($aid), __FUNCTION__, __LINE__);
 
                // Rebuild cache
-               REBUILD_CACHE("admins", "admin");
+               rebuildCacheFiles("admins", "admin");
        } // END - if
 
        // Return the result
@@ -192,7 +192,7 @@ function LOGIN_ADMIN ($adminLogin, $passHash) {
                        array($adminLogin), __FUNCTION__, __LINE__);
 
                // Rebuild cache
-               REBUILD_CACHE("admins", "admin");
+               rebuildCacheFiles("admins", "admin");
        } // END - if
 
        // Now set all session variables and return the result
@@ -640,7 +640,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName = "_config", $whereStatement =
        SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
        // Rebuild cache
-       REBUILD_CACHE("config", "config");
+       rebuildCacheFiles("config", "config");
 
        // Settings saved
        LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));
@@ -1235,7 +1235,7 @@ function ADMIN_RESET_PASSWORD ($login, $password) {
                array($passHash, $login), __FUNCTION__, __LINE__);
 
        // Run filters
-       RUN_FILTER('post_admin_reset_pass', array('login' => $login, 'hash' => $passHash));
+       runFilterChain('post_admin_reset_pass', array('login' => $login, 'hash' => $passHash));
 
        // Return output
        return ADMIN_PASSWORD_RESET_DONE;