upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Check for owner before call getUserFolder

Browse source 
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
This commit is contained in:
Git'Fellow 2023-11-28 10:14:12 +01:00 committed by GitHub
parent 9e67ab7fb8
commit 61d7328cae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
apps/files_versions/lib/Listener/FileEventsListener.php
View file

@ -59,11 +59,10 @@ use OCP\Files\Folder;
use OCP\Files\IMimeTypeLoader;
use OCP\Files\IRootFolder;
use OCP\Files\Node;
use OCP\IUserSession;
use Psr\Log\LoggerInterface;
class FileEventsListener implements IEventListener {
private IRootFolder $rootFolder;
private IVersionManager $versionManager;
/**
* @var array<int, array>
*/
@ -76,19 +75,14 @@ class FileEventsListener implements IEventListener {
* @var array<string, Node>
*/
private array $versionsDeleted = [];
private IMimeTypeLoader $mimeTypeLoader;
private LoggerInterface $logger;
public function __construct(
IRootFolder $rootFolder,
IVersionManager $versionManager,
IMimeTypeLoader $mimeTypeLoader,
LoggerInterface $logger,
private IRootFolder $rootFolder,
private IVersionManager $versionManager,
private IMimeTypeLoader $mimeTypeLoader,
private IUserSession $userSession,
private LoggerInterface $logger,
) {
$this->rootFolder = $rootFolder;
$this->versionManager = $versionManager;
$this->mimeTypeLoader = $mimeTypeLoader;
$this->logger = $logger;
}
public function handle(Event $event): void {
@ -351,17 +345,23 @@ class FileEventsListener implements IEventListener {
/**
* Retrieve the path relative to the current user root folder.
* If no user is connected, use the node's owner.
* If no user is connected, try to use the node's owner.
*/
private function getPathForNode(Node $node): ?string {
try {
$user = $this->userSession->getUser()?->getUID();
if ($user) {
return $this->rootFolder
->getUserFolder(\OC_User::getUser())
->getRelativePath($node->getPath());
} catch (\Throwable $ex) {
return $this->rootFolder
->getUserFolder($node->getOwner()->getUid())
->getUserFolder($user)
->getRelativePath($node->getPath());
}
$owner = $node->getOwner()?->getUid();
if ($owner) {
return $this->rootFolder
->getUserFolder($owner)
->getRelativePath($node->getPath());
}
return null;
}
}