Rewrites to use filters instead of mass if() blocks

[mailer.git] / inc / load_cache.php

diff --git a/inc/load_cache.php b/inc/load_cache.php
index fb6c7aa633f69b24fe9d58d07ab044073b4b2337..a4099c3aafeadb388103c085fcb20d3f62f583a1 100644 (file)
--- a/inc/load_cache.php
+++ b/inc/load_cache.php
@@ -14,11 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -42,7 +41,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Init cache instance and array
-$GLOBALS['cache_instance'] = null;
+$GLOBALS['cache_instance'] = NULL;
 
 // Init cache first
 initCacheInstance();
@@ -55,19 +54,25 @@ $GLOBALS['cache_array']['always_active'] = array();
 
 // Init & set the INC_POOL
 initIncludePool('cache');
-setIncludePool('cache', getArrayFromDirectory('inc/loader/', 'load_cache-'));
+setIncludePool('cache', getArrayFromDirectory('inc/loader/', 'load-'));
 
 // Pre-load filter cacher
-loadIncludeOnce('inc/loader/load_cache-filter.php');
+loadIncludeOnce('inc/loader/load-filter.php');
 
 // Pre-load extensions cacher
-loadIncludeOnce('inc/loader/load_cache-extension.php');
+loadIncludeOnce('inc/loader/load-extension.php');
+
+// Load all includes
+loadIncludePool('cache');
 
 // Init filter system
 initFilterSystem();
 
-// Load all includes
-loadIncludePool('cache');
+// Init system here
+runFilterChain('init');
+
+// Run post-initialization (e.g. determining username)
+runFilterChain('post_init');
 
 // [EOF]
 ?>