upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

fix: rename params old path passed from before rename to after rename to have one log for rename event

Browse source 
Signed-off-by: yemkareems <yemkareems@gmail.com>
This commit is contained in:
yemkareems 2024-06-13 17:35:15 +05:30
parent 3e355c4db1
commit 953358fdc8
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/admin_audit/lib/Actions/Files.php
View file

@ -26,6 +26,8 @@ use Psr\Log\LoggerInterface;
* @package OCA\AdminAudit\Actions
*/
class Files extends Action {
private array|null $renameParams = null;
/**
* Logs file read actions
*
@ -68,12 +70,7 @@ class Files extends Action {
);
return;
}
$this->log(
'File with id "%s" renamed from "%s"',
$params,
array_keys($params)
);
$this->renameParams = $params;
}
/**
@ -84,8 +81,10 @@ class Files extends Action {
public function afterRename(NodeRenamedEvent $event): void {
try {
$target = $event->getTarget();
$renameParams = $this->renameParams;
$params = [
'newid' => $target->getId(),
'oldpath' => $renameParams['oldpath'],
'newpath' => mb_substr($target->getInternalPath(), 5),
];
} catch (InvalidPathException|NotFoundException $e) {
@ -96,7 +95,7 @@ class Files extends Action {
}
$this->log(
'File with id "%s" renamed to "%s"',
'File renamed with id "%s" from "%s" to "%s"',
$params,
array_keys($params)
);

12
apps/admin_audit/lib/AppInfo/Application.php
View file

@ -181,16 +181,16 @@ class Application extends App implements IBootstrap {
);
$eventDispatcher->addListener(
NodeRenamedEvent::class,
function (NodeRenamedEvent $event) use ($fileActions) {
$fileActions->afterRename($event);
BeforeNodeRenamedEvent::class,
function (BeforeNodeRenamedEvent $event) use ($fileActions) {
$fileActions->beforeRename($event);
}
);
$eventDispatcher->addListener(
BeforeNodeRenamedEvent::class,
function (BeforeNodeRenamedEvent $event) use ($fileActions) {
$fileActions->beforeRename($event);
NodeRenamedEvent::class,
function (NodeRenamedEvent $event) use ($fileActions) {
$fileActions->afterRename($event);
}
);