Some code cleanups

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index 0b07e67b7eec01c714a4e8d4944ab105e3c5f55b..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 *
@@ -137,7 +137,7 @@ function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($data) {
 
        // Handle failed logins here if not in guest
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "type=".$data['type'].",action=".getAction().",what=".getWhat().",level=".$data['access_level']."<br />");
-       if ((($data['type'] == 'what') || ($data['type'] == 'action') && ((!isWhatSet()) || (getWhat() == 'overview') || (getWhat() == getIndexHome()))) && ($data['access_level'] != 'guest') && ((isExtensionInstalledAndNewer('sql_patches', '0.4.7')) || (isExtensionInstalledAndNewer('admins', '0.7.0')))) {
+       if ((($data['type'] == 'what') || ($data['type'] == 'action') && ((!isWhatSet()) || (getWhat() == 'overview') || (getWhat() == getIndexHome()))) && ($data['access_level'] != 'guest') && ((isExtensionInstalledAndNewer('sql_patches', '0.4.7')) || (isExtensionInstalledAndNewer('admins', '0.7.6')))) {
                // Handle failure
                $content['content'] .= handleLoginFailures($data['access_level']);
        } // END - if
@@ -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()');
@@ -714,7 +716,7 @@ function FILTER_CHECK_REPOSITORY_REVISION () {
        // Only execute this filter if installed and all config entries are there
        if ((!isInstalled()) || (!isConfigEntrySet('patch_level'))) return;
 
-       // Check for patch level differences between databases and current hard-coded
+       // Check for patch level differences between database and current hard-coded
        if ((getCurrentRepositoryRevision() > getConfig('patch_level')) || (getConfig('patch_level') == 'CURRENT_REPOSITORY_REVISION') || (getConfig('patch_ctime') == 'UNIX_TIMES')) {
                // Update database and CONFIG array
                updateConfiguration(array('patch_level', 'patch_ctime'), array(getCurrentRepositoryRevision(), 'UNIX_TIMESTAMP()'));
@@ -738,9 +740,9 @@ function FILTER_RUN_DAILY_RESET () {
 // Filter for loading more runtime includes (not for installation)
 function FILTER_LOAD_RUNTIME_INCLUDES () {
        // Load more includes
-       foreach (array('inc/databases.php','inc/session.php','inc/versions.php') as $inc) {
+       foreach (array('databases', 'session', 'versions') as $inc) {
                // Load the include
-               loadIncludeOnce($inc);
+               loadIncludeOnce('inc/' . $inc . '.php');
        } // END - foreach
 }
 
@@ -937,13 +939,13 @@ function FILTER_RESET_USER_LOGIN_FAILURE () {
        } // END - if
 
        // Remmeber login failures if available
-       if (isExtensionInstalledAndNewer('sql_patches', '0.6.1')) {
+       if (isExtensionInstalledAndNewer('user', '0.3.7')) {
                // Reset login failures
                SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
 SET
        `login_failures`=0,
-       `last_failure`='0000-00-00 00:00:00'
+       `last_failure`=NULL
 WHERE
        `userid`=%s
 LIMIT 1",
@@ -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