From eae23867f2faa2f0683eac549d2dd287d7d78215 Mon Sep 17 00:00:00 2001 From: yemkareems Date: Fri, 14 Jun 2024 10:14:44 +0530 Subject: fix: renameParams named as renamedNodes and code changed accordingly as suggested in review comments Signed-off-by: yemkareems --- apps/admin_audit/lib/Actions/Files.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'apps') diff --git a/apps/admin_audit/lib/Actions/Files.php b/apps/admin_audit/lib/Actions/Files.php index 3ed0c6bdfb6..ee40a4e1476 100644 --- a/apps/admin_audit/lib/Actions/Files.php +++ b/apps/admin_audit/lib/Actions/Files.php @@ -27,7 +27,7 @@ use Psr\Log\LoggerInterface; */ class Files extends Action { - private array|null $renameParams = null; + private array $renamedNodes = []; /** * Logs file read actions * @@ -60,17 +60,13 @@ class Files extends Action { public function beforeRename(BeforeNodeRenamedEvent $event): void { try { $source = $event->getSource(); - $params = [ - 'oldid' => $source->getId(), - 'oldpath' => mb_substr($source->getInternalPath(), 5), - ]; + $this->renamedNodes[$source->getId()] = $source; } catch (InvalidPathException|NotFoundException $e) { \OCP\Server::get(LoggerInterface::class)->error( "Exception thrown in file rename: ".$e->getMessage(), ['app' => 'admin_audit', 'exception' => $e] ); return; } - $this->renameParams = $params; } /** @@ -81,10 +77,10 @@ class Files extends Action { public function afterRename(NodeRenamedEvent $event): void { try { $target = $event->getTarget(); - $renameParams = $this->renameParams; + $originalSource = $this->renamedNodes[$target->getId()]; $params = [ 'newid' => $target->getId(), - 'oldpath' => $renameParams['oldpath'], + 'oldpath' => mb_substr($originalSource->getInternalPath(), 5), 'newpath' => mb_substr($target->getInternalPath(), 5), ]; } catch (InvalidPathException|NotFoundException $e) { -- cgit v1.2.3