Reverted of changes in 1704, see ticket #160

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

diff --git a/inc/filter-functions.php b/inc/filter-functions.php
index e9afe0281ff808b95073d88d662b671a5d4df121..82747fef797677782a26230abab3c6528210e5a2 100644 (file)
--- a/inc/filter-functions.php
+++ b/inc/filter-functions.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -100,9 +101,9 @@ ORDER BY
 
        // Init filters
        registerFilter('init', 'LOAD_CONFIGURATION');
+       registerFilter('init', 'INIT_RANDOMIZER');
        registerFilter('init', 'LOAD_RUNTIME_INCLUDES');
        registerFilter('init', 'INIT_EXTENSIONS');
-       registerFilter('init', 'INIT_RANDOMIZER');
        registerFilter('init', 'INIT_RANDOM_NUMBER');
        registerFilter('init', 'CHECK_SVN_REVISION');
        registerFilter('init', 'RUN_DAILY_RESET');
@@ -113,6 +114,14 @@ ORDER BY
        registerFilter('init', 'UPDATE_LOGIN_DATA');
        registerFilter('init', 'ACTIVATE_EXCHANGE');
 
+       // Page headers - pre-filter (normally, you want to register here)
+       registerFilter('pre_page_header', 'LOAD_PAGE_HEADER');
+
+       // Page headers - post-filter (normally, you don't want to register here)
+       // ------------------- LAST FILTER FOR THIS CHAIN! ------------------------
+       registerFilter('post_page_header', 'FINISH_PAGE_HEADER');
+       // ------------------- LAST FILTER FOR THIS CHAIN! ------------------------
+
        // Login failures handler
        registerFilter('post_youhere_line', 'CALL_HANDLER_LOGIN_FAILTURES');
 
@@ -242,7 +251,6 @@ 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;
@@ -297,6 +305,12 @@ function countFilterUsage ($filterName, $filterFunction) {
 
 // Prepares the filter array for usage
 function prepareFilterArray () {
+       // Abort here if array is absend (e.g. not cached)
+       if (!isset($GLOBALS['cache_array']['filter']['filter_name'])) {
+               // Abort silently
+               return false;
+       } // END - if
+
        // Init dummy array
        $filterArray = array(
                'chains'  => array(),