浏览代码

Remove posix_getpwuid and compare only userid

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Daniel Kesselberg 5 年之前
父节点
当前提交
2e5d8ecca4
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      settings/Controller/CheckSetupController.php

+ 4 - 4
settings/Controller/CheckSetupController.php

@@ -543,7 +543,7 @@ Raw output
 	 * @return array
 	 */
 	protected function getAppDirsWithDifferentOwner(): array {
-		$currentUser = posix_getpwuid(posix_getuid());
+		$currentUser = posix_getuid();
 		$appDirsWithDifferentOwner = [[]];
 
 		foreach (OC::$APPSROOTS as $appRoot) {
@@ -561,11 +561,11 @@ Raw output
 	/**
 	 * Tests if the directories for one apps directory are writable by the current user.
 	 *
-	 * @param array $currentUser The current user
+	 * @param int $currentUser The current user
 	 * @param array $appRoot The app root config
 	 * @return string[] The none writable directory paths inside the app root
 	 */
-	private function getAppDirsWithDifferentOwnerForAppRoot(array $currentUser, array $appRoot): array {
+	private function getAppDirsWithDifferentOwnerForAppRoot($currentUser, array $appRoot): array {
 		$appDirsWithDifferentOwner = [];
 		$appsPath = $appRoot['path'];
 		$appsDir = new DirectoryIterator($appRoot['path']);
@@ -573,7 +573,7 @@ Raw output
 		foreach ($appsDir as $fileInfo) {
 			if ($fileInfo->isDir() && !$fileInfo->isDot()) {
 				$absAppPath = $appsPath . DIRECTORY_SEPARATOR . $fileInfo->getFilename();
-				$appDirUser = posix_getpwuid(fileowner($absAppPath));
+				$appDirUser = fileowner($absAppPath);
 				if ($appDirUser !== $currentUser) {
 					$appDirsWithDifferentOwner[] = $absAppPath;
 				}