Possible final fixes for user login, debug lines rewritten to logfile, some old lost...

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index 6626a7655b5a20731033120be57140290861fc5c..627a4007b89bc12e39c14db67edfe2de6421aae4 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -127,7 +127,7 @@ function FILTER_FLUSH_FILTERS () {
        // Should we rebuild cache?
        if (($inserted > 0) || ($removed > 0)) {
                // Destroy cache
-               rebuildCacheFile('filter', 'filter');
+               rebuildCache('filter', 'filter');
        } // END - if
 }
 
@@ -475,11 +475,12 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
                        if (function_exists($commandFunction)) {
                                // Prepare $matches, $key, $outputMode, etc.
                                $data = array(
-                                       'matches'  => $matches,
-                                       'key'      => $key,
-                                       'mode'     => $outputMode,
-                                       'code'     => $code,
-                                       'callback' => $callback
+                                       'matches'    => $matches,
+                                       'key'        => $key,
+                                       'mode'       => $outputMode,
+                                       'code'       => $code,
+                                       'callback'   => $callback,
+                                       'extra_func' => $extraFunction
                                );
 
                                // Call it
@@ -568,7 +569,7 @@ function FILTER_REMOVE_EXTENSION () {
        removeExtensionFromArray();
 
        // Remove the cache
-       rebuildCacheFile('extension', 'extension');
+       rebuildCache('extension', 'extension');
 }
 
 // Filter for flushing the output
@@ -703,14 +704,6 @@ function FILTER_LOAD_RUNTIME_INCLUDES () {
                // Load the include
                loadIncludeOnce($inc);
        } // END - foreach
-
-       // Load admin include file if he is admin
-       if (isAdmin()) {
-               // Administrative functions
-               loadIncludeOnce('inc/modules/admin/admin-inc.php');
-       } // END - if
-       //* DEBUG: */ addPointsThroughReferalSystem('test', 36, 1000);
-       //* DEBUG: */ die();
 }
 
 // Filter for checking admin ACL
@@ -928,7 +921,7 @@ LIMIT 1",
 function FILTER_DO_LOGIN_ADMIN ($data) {
        // Now set all session variables and store the result for later processing
        $GLOBALS['admin_login_success'] = ((
-               setSession('admin_md5', encodeHashForCookie(generateHash($data['pass_hash'], '', false)))
+               setSession('admin_md5', encodeHashForCookie($data['pass_hash']))
        ) && (
                setSession('admin_login', $data['login'])
        ) && (