fix: address review 2

Signed-off-by: Simon L <szaimen@e.mail.de>
nextcloud · May 24, 2024 · 1afe55b · 1afe55b
1 parent 137986f
commit 1afe55b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/console.php b/console.php
@@ -43,12 +43,13 @@ function exceptionHandler($exception) {
 
 	$user = posix_getuid();
 	$userNameArray = posix_getpwuid($user);
+	$username = null;
 	if ($userNameArray !== false) {
 		$userName = $userNameArray['name'];
 	}
 	$configUser = fileowner(OC::$configDir . 'config.php');
 	$configuredUser = $config->getSystemValueString('php.user', '');
-	if ($user !== $configUser && $userName !== $configuredUser) {
+	if ($user !== $configUser && $username !== null && $userName !== $configuredUser) {
 		echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL;
 		echo "Current user id: " . $user . PHP_EOL;
 		echo "Owner id of config.php: " . $configUser . PHP_EOL;

diff --git a/cron.php b/cron.php
@@ -131,12 +131,13 @@
 
 		$user = posix_getuid();
 		$userNameArray = posix_getpwuid($user);
-		if ($userNameArray !== false)) {
+		$username = null;
+		if ($userNameArray !== false) {
 			$userName = $userNameArray['name'];
 		}
 		$configUser = fileowner(OC::$configDir . 'config.php');
 		$configuredUser = $config->getSystemValueString('php.user', '');
-		if ($user !== $configUser && $userName !== $configuredUser) {
+		if ($user !== $configUser && $username !== null && $userName !== $configuredUser) {
 			echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL;
 			echo "Current user id: " . $user . PHP_EOL;
 			echo "Owner id of config.php: " . $configUser . PHP_EOL;