From b1eb9514d46147628b7a9c46740f38e15d775079 Mon Sep 17 00:00:00 2001 From: Loz Calver Date: Sun, 7 Nov 2021 22:56:44 +0000 Subject: [PATCH] FIX Prioritise posix_getuid() when attempting to find current process owner (#10137) --- src/Core/TempFolder.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Core/TempFolder.php b/src/Core/TempFolder.php index 1692f6956..78d923e80 100644 --- a/src/Core/TempFolder.php +++ b/src/Core/TempFolder.php @@ -36,17 +36,20 @@ class TempFolder */ public static function getTempFolderUsername() { - $user = Environment::getEnv('APACHE_RUN_USER'); + $user = ''; + if (function_exists('posix_getpwuid') && function_exists('posix_getuid')) { + $userDetails = posix_getpwuid(posix_getuid()); + $user = $userDetails['name']; + } + if (!$user) { + $user = Environment::getEnv('APACHE_RUN_USER'); + } if (!$user) { $user = Environment::getEnv('USER'); } if (!$user) { $user = Environment::getEnv('USERNAME'); } - if (!$user && function_exists('posix_getpwuid') && function_exists('posix_getuid')) { - $userDetails = posix_getpwuid(posix_getuid()); - $user = $userDetails['name']; - } if (!$user) { $user = 'unknown'; }