wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #164 from nextcloud/fix_audit_log

Browse source 
don't try to log the currently logged in user, this fails on cronjobs…
This commit is contained in:
Morris Jobke 2016-06-20 13:27:25 +02:00 committed by GitHub
commit 1cba82ae7d
2 changed files with 5 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
apps/admin_audit/lib/actions/trashbin.php
View file

@ -28,41 +28,15 @@ use OCP\IUserSession;
class Trashbin extends Action { class Trashbin extends Action {
/** @var IUserSession */
private $userSession;
/**
* Trashbin constructor.
*
* @param ILogger $logger
* @param IUserSession $userSession
*/
public function __construct(ILogger $logger, IUserSession $userSession) {
parent::__construct($logger);
$this->userSession = $userSession;
}
public function delete($params) { public function delete($params) {
$this->log('File "%s" deleted from trash bin by "%s"', $this->log('File "%s" deleted from trash bin.',
[ ['path' => $params['path']], ['path']
'path' => $params['path'],
'user' => $this->userSession->getUser()->getUID()
],
[
'path', 'user'
]
); );
} }
public function restore($params) { public function restore($params) {
$this->log('File "%s" restored from trash bin by "%s"', $this->log('File "%s" restored from trash bin.',
[ ['path' => $params['filePath']], ['path']
'path' => $params['filePath'],
'user' => $this->userSession->getUser()->getUID()
],
[
'path', 'user'
]
); );
} }

2
apps/admin_audit/lib/auditlogger.php
View file

@ -178,7 +178,7 @@ class AuditLogger {
* connect to trash bin hooks * connect to trash bin hooks
*/ */
private function trashbinHooks() { private function trashbinHooks() {
$trashActions = new Trashbin($this->logger, $this->userSession); $trashActions = new Trashbin($this->logger);
Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete'); Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore'); Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
} }