Even more variables renamed and login procedure prepared for filter

[mailer.git] / inc / loader / load_cache-admin.php

diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php
index 2ae06ced10913d45550f2119a2ad14309fb752cf..cd9356dc17f5057cf0bd31e039954c50a1d31aef 100644 (file)
--- a/inc/loader/load_cache-admin.php
+++ b/inc/loader/load_cache-admin.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mehr Cache-Dateien nachladen                     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -85,13 +90,13 @@ if (($GLOBALS['cache_instance']->loadCacheFile("admins")) && ($GLOBALS['cache_in
        $GLOBALS['cache_instance']->storeExtensionVersion("admins");
 
        // Load every data from DB to cache file
-       $ADD = RUN_FILTER('sql_admin_extra_data');
+       $add = runFilterChain('sql_admin_extra_data');
 
        // Query the database about this
-       $result_admins = SQL_QUERY("SELECT id AS aid, login, password, email".$ADD."
+       $result_admins = SQL_QUERY("SELECT id AS aid, login, password, email".$add."
 FROM `{!_MYSQL_PREFIX!}_admins`
 ORDER BY login", __FILE__, __LINE__);
-       while($dummy = SQL_FETCHARRAY($result_admins)) {
+       while ($dummy = SQL_FETCHARRAY($result_admins)) {
                // Save row
                $GLOBALS['cache_instance']->addRow($dummy);
        } // END - while
@@ -102,8 +107,8 @@ ORDER BY login", __FILE__, __LINE__);
        // Close cache
        $GLOBALS['cache_instance']->finalize();
 
-       // Reload the cache
-       LOAD_INC(__FILE__);
+       // Include loader again
+       require(__FILE__);
 }
 
 // Next cached table are the admins_acls...
@@ -111,7 +116,6 @@ if (GET_EXT_VERSION("admins") >= "0.3") {
        // Check for cache file
        if (($GLOBALS['cache_instance']->loadCacheFile("admins_acls")) && ($GLOBALS['cache_instance']->extensionVersionMatches("admins"))) {
                // Load referal system from cache
-               global $GLOBALS['cache_array'];
                $GLOBALS['cache_array']['admin_acls'] = $GLOBALS['cache_instance']->getArrayFromCache();
        } elseif ((getConfig('cache_acls') == "Y") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
                // Create cache file here
@@ -133,8 +137,8 @@ if (GET_EXT_VERSION("admins") >= "0.3") {
                // Close cache
                $GLOBALS['cache_instance']->finalize();
 
-               // Reload the cache
-               LOAD_INC(__FILE__);
+               // Include loader again
+               require(__FILE__);
        }
 } // END - if