A lot code rewritten:

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index 1d96aa316c814c10171bb7fa0324e03afe017154..9a3b441a7ab30fb8604ba51e1e411ebd6facda92 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -56,7 +56,7 @@ function FILTER_FLUSH_FILTERS () {
        // Is a database link here and not in installation mode?
        if ((!SQL_IS_LINK_UP()) && (!isInstalling())) {
                // Abort here
-               addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FLUSH_FAILED_NO_DATABASE'));
+               addFatalMessage(__FUNCTION__, __LINE__, '{--FILTER_FLUSH_FAILED_NO_DATABASE--}');
                return false;
        } // END - if
 
@@ -436,7 +436,7 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) {
        if ($compiled === true) {
                // Run the code
                $eval = "\$GLOBALS['compiled_config'][\$uncompiled] = \"" . $GLOBALS['compiled_config'][$uncompiled] . '";';
-               //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:<pre>' . str_replace('$', '&#36;', htmlentities($eval)) . '</pre>');
+               //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:<pre>' . encodeEntities($eval) . '</pre>');
                eval($eval);
        } // END - if
 
@@ -519,7 +519,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
 
 // Runs some generic filter update steps
 function FILTER_UPDATE_EXTENSION_DATA ($ext_name) {
-       // Create task
+       // Create task (we ignore the task id here)
        createExtensionUpdateTask(getCurrentAdminId(), $ext_name, $GLOBALS['update_ver'][$ext_name], SQL_ESCAPE(getExtensionNotes(getExtensionNotes())));
 
        // Update extension's version
@@ -823,11 +823,11 @@ function FILTER_HANDLE_FATAL_ERRORS () {
        }
 
        // Message to regular users (non-admin)
-       $CORR = getMessage('FATAL_REPORT_ERRORS');
+       $CORR = '{--FATAL_REPORT_ERRORS--}';
 
        // PHP warnings fixed
        if ($check == 'done') {
-               if (isAdmin()) $CORR = getMessage('FATAL_CORRECT_ERRORS');
+               if (isAdmin()) $CORR = '{--FATAL_CORRECT_ERRORS--}';
        } // END - if
 
        // Remember all in array
@@ -940,7 +940,7 @@ function FILTER_DO_LOGIN_ADMIN ($data) {
        $GLOBALS['admin_login_success'] = ((
                setSession('admin_md5', encodeHashForCookie($data['pass_hash']))
        ) && (
-               setSession('admin_login', $data['login'])
+               setSession('admin_id', $data['id'])
        ) && (
                setSession('admin_last', time())
        ));