Merge pull request #164 from nextcloud/fix_audit_log

don't try to log the currently logged in user, this fails on cronjobs…
nextcloud · Jun 20, 2016 · 1cba82a · 1cba82a
2 parents fffe1be + f9fd709
commit 1cba82a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 31 deletions.
diff --git a/apps/admin_audit/lib/actions/trashbin.php b/apps/admin_audit/lib/actions/trashbin.php
@@ -28,41 +28,15 @@
 
 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']
 		);
 	}
 

diff --git a/apps/admin_audit/lib/auditlogger.php b/apps/admin_audit/lib/auditlogger.php
@@ -178,7 +178,7 @@ public function versionsHooks() {
 	 * 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');
 	}