'NO-ACL' is more clear that we don't have an ACL for the given admin than three aster...

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index 9dad8b42b286d5ba148f1cb0fe15d81ec17d7de8..c8b52da2c81ef4dabc3415d27884e8f91c2e18bd 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -164,10 +164,10 @@ function FILTER_REDIRECT_TO_LOGOUT_SQL_PATCHES () {
 // Filter for auto-activation of a extension
 function FILTER_AUTO_ACTIVATE_EXTENSION ($data) {
        // Debug message
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $data['ext_name'] . ',isExtensionAlwaysActive()=' . intval(isExtensionAlwaysActive()));
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $data['ext_name'] . ',isThisExtensionAlwaysActive()=' . intval(isThisExtensionAlwaysActive()));
 
        // Is this extension always activated?
-       if (isExtensionAlwaysActive()) {
+       if (isThisExtensionAlwaysActive()) {
                // Then activate the extension
                doActivateExtension($data['ext_name']);
        } // END - if
@@ -304,7 +304,9 @@ function FILTER_UPDATE_LOGIN_DATA () {
                $content = getUserDataArray();
 
                // Maybe first login time?
-               if (empty($content['last_module'])) $content['last_module'] = 'login';
+               if (empty($content['last_module'])) {
+                       $content['last_module'] = 'login';
+               } // END - if
 
                // This will be displayed on welcome page! :-)
                if (empty($GLOBALS['last_online']['module'])) {
@@ -316,7 +318,9 @@ function FILTER_UPDATE_LOGIN_DATA () {
                if (!isWhatSet()) {
                        // Fix it to default
                        setWhat('welcome');
-                       if (getIndexHome() != '') setWhatFromConfig('index_home');
+                       if (getIndexHome() != '') {
+                               setWhatFromConfig('index_home');
+                       } // END - if
                } // END - if
 
                // Update last module / online time
@@ -809,7 +813,7 @@ function FILTER_CHECK_ADMIN_ACL () {
                } // END - if
 
                // Check for access control line of current menu entry
-               $ret = adminsCheckAdminAcl($action, getWhat());
+               $ret = isAdminsAllowedByAcl($action, getWhat());
        } // END - if
 
        // Set it here
@@ -1069,7 +1073,7 @@ function FILTER_SET_CURRENT_DATE () {
        // Set current date
        setConfigEntry('CURRENT_DATE', generateDateTime(time(), '3'));
 
-       // Timestamp for yesterday, today ... all at 00:00 am
+       // Epoche time for yesterday, today ... all at 00:00 am
        setConfigEntry('START_YDAY', makeTime(0, 0, 0, time() - getOneDay()));
        setConfigEntry('START_TDAY', makeTime(0, 0, 0, time()));
 }