More fixes for admin login and to early call of isAdmin()

[mailer.git] / inc / filter-functions.php

diff --git a/inc/filter-functions.php b/inc/filter-functions.php
index d096c8e43bb0c1fe74a1bfb1fcc021254a44b247..509196238260f3ab56da0b569a75353a2e973488 100644 (file)
--- a/inc/filter-functions.php
+++ b/inc/filter-functions.php
@@ -50,30 +50,12 @@ function initFilterSystem () {
        } // END - if
 
        // Load all saved filers if sql_patches is updated
-       if (isset($GLOBALS['cache_array']['filter']['filter_name'])) {
-               // Init dummy array
-               $filterArray = array(
-                       'chains'  => array(),
-                       'loaded'  => array(),
-                       'counter' => array()
-               );
-
-               // Found in cache so rewrite the array
-               foreach ($GLOBALS['cache_array']['filter']['filter_name'] as $idx => $filterName) {
-                       // Get filter function
-                       $filterFunction = $GLOBALS['cache_array']['filter']['filter_function'][$idx];
-
-                       // Add the element with mapped index
-                       $filterArray['counter'][$filterName][$filterFunction] = $GLOBALS['cache_array']['filter']['filter_counter'][$idx];
-                       $filterArray['loaded'][$filterName][$filterFunction]  = true;
-                       $filterArray['chains'][$filterName][$filterFunction]  = $GLOBALS['cache_array']['filter']['filter_active'][$idx];
-               } // END - foreach
+       if ((isset($GLOBALS['cache_array']['filter']['filter_name'])) && (!isset($GLOBALS['cache_array']['filter']['chains']))) {
+               // Prepare filter array
+               prepareFilterArray();
 
                // Mark it as initialized
                $GLOBALS['filter_init'] = true;
-
-               // Remove the cache
-               $GLOBALS['cache_array']['filter'] = $filterArray;
        } elseif ((!isInstallationPhase()) && (isExtensionInstalledAndNewer('sql_patches', '0.5.9'))) {
                // Init add
                $add = '';
@@ -118,9 +100,9 @@ ORDER BY
 
        // Init filters
        registerFilter('init', 'LOAD_CONFIGURATION');
-       registerFilter('init', 'INIT_EXTENSIONS');
        registerFilter('init', 'INIT_RANDOMIZER');
        registerFilter('init', 'LOAD_RUNTIME_INCLUDES');
+       registerFilter('init', 'INIT_EXTENSIONS');
        registerFilter('init', 'INIT_RANDOM_NUMBER');
        registerFilter('init', 'CHECK_SVN_REVISION');
        registerFilter('init', 'RUN_DAILY_RESET');
@@ -187,10 +169,15 @@ ORDER BY
 
        // Member login check. Always keep FETCH_USER_DATA as first entry!
        registerFilter('member_login_check', 'FETCH_USER_DATA');
+
+       // Admin login
+       registerFilter('do_admin_login_done', 'DO_LOGIN_ADMIN');
 }
 
 // "Registers" a new filter function
 function registerFilter ($filterName, $filterFunction, $silentAbort = true, $force = false, $dry_run = false) {
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: filterName=' . $filterName . ',filterFunction=' . $filterFunction);
+
        // Extend the filter function name
        $filterFunction = sprintf("FILTER_%s", strtoupper($filterFunction));
 
@@ -216,7 +203,7 @@ function registerFilter ($filterName, $filterFunction, $silentAbort = true, $for
                } // END - if
 
                // Simply add it to the array
-               //* DEBUG: */ print __FUNCTION__.': filterName='.$filterName.',filterFunction='.$filterFunction.'<br />';
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'REGISTER: filterName=' . $filterName . ',filterFunction=' . $filterFunction);
                $GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction] = 'A';
                $GLOBALS['cache_array']['filter']['counter'][$filterName][$filterFunction] = '0';
        } // END - if
@@ -224,6 +211,8 @@ function registerFilter ($filterName, $filterFunction, $silentAbort = true, $for
 
 // "Unregisters" a filter from the given chain
 function unregisterFilter ($filterName, $filterFunction, $force = false, $dry_run = false) {
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',dry=' . intval($dry_run));
+
        // Extend the filter function name only if not loaded from database
        if (!isset($GLOBALS['cache_array']['filter']['loaded'][$filterName][$filterFunction])) {
                $filterFunction = sprintf("FILTER_%s", strtoupper($filterFunction));
@@ -239,7 +228,7 @@ function unregisterFilter ($filterName, $filterFunction, $force = false, $dry_ru
        // Shall we remove? (default, not while just showing an extension removal)
        if ($dry_run === false) {
                // Mark for filter removal
-               //* DEBUG: */ print __FUNCTION__.': filterName='.$filterName.',filterFunction='.$filterFunction.'<br />';
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'REMOVE: filterName=' . $filterName . ',filterFunction=' . $filterFunction);
                $GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction] = 'R';
        } // END - if
 }
@@ -253,6 +242,7 @@ function runFilterChain ($filterName, $data = null) {
                        // Log it away...
                        logDebugMessage(__FUNCTION__, __LINE__, 'Filter chain ' . $filterName . ' not found!');
                } // END - if
+               if ($filterName == 'sql_admin_extra_data') debug_report_bug(print_r($GLOBALS['cache_array']['filter'] , true));
 
                // Abort here and return content
                return $data;
@@ -278,7 +268,7 @@ function runFilterChain ($filterName, $data = null) {
                        } // END - if
 
                        // Call the filter chain
-                       //* DEBUG: */ print $filterName.'/'.$filterFunction.',[]='.gettype($returnValue).'<br />';
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $filterName.'/'.$filterFunction.',[]='.gettype($returnValue));
                        $returnValue = call_user_func_array($filterFunction, array($returnValue));
 
                        // Update usage counter
@@ -305,5 +295,29 @@ function countFilterUsage ($filterName, $filterFunction) {
        }
 }
 
+// Prepares the filter array for usage
+function prepareFilterArray () {
+       // Init dummy array
+       $filterArray = array(
+               'chains'  => array(),
+               'loaded'  => array(),
+               'counter' => array()
+       );
+
+       // Found in cache so rewrite the array
+       foreach ($GLOBALS['cache_array']['filter']['filter_name'] as $idx => $filterName) {
+               // Get filter function
+               $filterFunction = $GLOBALS['cache_array']['filter']['filter_function'][$idx];
+
+               // Add the element with mapped index
+               $filterArray['counter'][$filterName][$filterFunction] = $GLOBALS['cache_array']['filter']['filter_counter'][$idx];
+               $filterArray['loaded'][$filterName][$filterFunction]  = true;
+               $filterArray['chains'][$filterName][$filterFunction]  = $GLOBALS['cache_array']['filter']['filter_active'][$idx];
+       } // END - foreach
+
+       // Remove the cache
+       $GLOBALS['cache_array']['filter'] = $filterArray;
+}
+
 // [EOF]
 ?>