From 5f898dcc5ee244e4adbd6aa83b607c844d432fb6 Mon Sep 17 00:00:00 2001 From: Luc SANCHEZ <4697568+ColonelMoutarde@users.noreply.github.com> Date: Sun, 26 Mar 2023 14:17:22 +0200 Subject: Modernize Constants and use new constant for string 'currentUser' (#5089) * Modernize Constants and use new constant 'currentUser' * Add FreshRSS_Context::currentUser() function and use * Add FreshRSS_Context::currentUser() function and use * Add FreshRSS_Context::currentUser() function and use * Add FreshRSS_Context::currentUser() function and use * Add FreshRSS_Context::currentUser() function and use * Update app/Controllers/userController.php * Update app/Controllers/userController.php * Update app/Controllers/userController.php * Update app/Models/Auth.php * Update p/api/greader.php * Update p/api/greader.php * Update p/api/greader.php * Update app/Models/Context.php * Update app/Models/LogDAO.php * Update lib/Minz/Log.php * Update p/api/greader.php * Update app/layout/header.phtml * Update app/views/helpers/export/articles.phtml * Update cli/do-install.php * Remarque's from Alkarex * Remarque's from Alkarex * Refactor using new Minz_User class * Consistent naming of public constants --------- Co-authored-by: Luc Co-authored-by: Alexandre Alapetite --- lib/Minz/Log.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'lib/Minz/Log.php') diff --git a/lib/Minz/Log.php b/lib/Minz/Log.php index 43f3c9d6d..117f231ac 100644 --- a/lib/Minz/Log.php +++ b/lib/Minz/Log.php @@ -31,14 +31,9 @@ class Minz_Log { } if (! ($env === 'silent' || ($env === 'production' && ($level >= LOG_NOTICE)))) { - $username = Minz_Session::param('currentUser', ''); - if ($username == '') { - $username = '_'; - } + $username = Minz_User::name() ?? Minz_User::INTERNAL_USER; if ($file_name == null) { $file_name = join_path(USERS_PATH, $username, LOG_FILENAME); - } else { - $username = '_'; } switch ($level) { -- cgit v1.2.3