mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don't try to log the currently logged in user, this fails on cronjobs. The users are logged anyway

This commit is contained in:
Bjoern Schiessle 2016-06-20 11:21:27 +02:00
parent e4996305fc
commit f9fd7093c0
No known key found for this signature in database
GPG Key ID: 2378A753E2BF04F6
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 {
/** @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) {
$this->log('File "%s" deleted from trash bin by "%s"',
[
'path' => $params['path'],
'user' => $this->userSession->getUser()->getUID()
],
[
'path', 'user'
]
$this->log('File "%s" deleted from trash bin.',
['path' => $params['path']], ['path']
);
}
public function restore($params) {
$this->log('File "%s" restored from trash bin by "%s"',
[
'path' => $params['filePath'],
'user' => $this->userSession->getUser()->getUID()
],
[
'path', 'user'
]
$this->log('File "%s" restored from trash bin.',
['path' => $params['filePath']], ['path']
);
}

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

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