Speed improvement, TODOs.txt updated:

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index c079bd698b96652ba1482c62e94e3c9f6ab515bf..9985adf03d5852c2f38047a633125a2484a8a48c 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -508,7 +508,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
                                $data = array(
                                        'matches'     => $matches,
                                        'key'         => $key,
-                                       'mode'        => $outputMode,
+                                       'mode'        => getScriptOutputMode(),
                                        'code'        => $code,
                                        'callback'    => $callback,
                                        'extra_func'  => $extraFunction,
@@ -527,7 +527,9 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
        } // END - if
 
        // Do we have non-HTML mode?
-       if ((!isHtmlOutputMode()) || ($outputMode != '0')) $code = decodeEntities($code);
+       if (!isHtmlOutputMode()) {
+               $code = decodeEntities($code);
+       } // END - if
 
        // Return compiled code
        //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:<pre>'.($code).'</pre>');
@@ -557,7 +559,7 @@ function FILTER_RUN_RESET_INCLUDES () {
        } // END - if
 
        // Get more daily reset scripts
-       setIncludePool('reset', getArrayFromDirectory('inc/reset/', 'reset_'));
+       setIncludePool('reset', getArrayFromDirectory('inc/daily/', 'daily_'));
 
        // Update database
        if ((!isConfigEntrySet('DEBUG_RESET')) || (getConfig('DEBUG_RESET') != 'Y')) updateConfiguration('last_update', 'UNIX_TIMESTAMP()');
@@ -959,11 +961,11 @@ 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($data['pass_hash']))
+               setAdminMd5(encodeHashForCookie($data['pass_hash']))
        ) && (
-               setSession('admin_id', $data['id'])
+               setAdminId($data['id'])
        ) && (
-               setSession('admin_last', time())
+               setAdminLast(time())
        ));
 
        // Return the data for further processing