nextcloud / server

apps/dav/appinfo/v1/publicwebdav.php

Indentation +46 added lines, -46 removed lines

@@ -38,20 +38,20 @@ 
 
 // Backends
 $authBackend = new OCA\DAV\Connector\PublicAuth(
-	\OC::$server->getRequest(),
-	\OC::$server->getShareManager(),
-	\OC::$server->getSession()
+    \OC::$server->getRequest(),
+    \OC::$server->getShareManager(),
+    \OC::$server->getSession()
 );
 
 $serverFactory = new OCA\DAV\Connector\Sabre\ServerFactory(
-	\OC::$server->getConfig(),
-	\OC::$server->getLogger(),
-	\OC::$server->getDatabaseConnection(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getMountManager(),
-	\OC::$server->getTagManager(),
-	\OC::$server->getRequest(),
-	\OC::$server->getPreviewManager()
+    \OC::$server->getConfig(),
+    \OC::$server->getLogger(),
+    \OC::$server->getDatabaseConnection(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getMountManager(),
+    \OC::$server->getTagManager(),
+    \OC::$server->getRequest(),
+    \OC::$server->getPreviewManager()
 );
 
 $requestUri = \OC::$server->getRequest()->getRequestUri();
@@ -60,41 +60,41 @@ 
 $filesDropPlugin = new \OCA\DAV\Files\Sharing\FilesDropPlugin();
 
 $server = $serverFactory->createServer($baseuri, $requestUri, $authBackend, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
-	$isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest');
-	$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
-	$federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
-	if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && !$isAjax) {
-		// this is what is thrown when trying to access a non-existing share
-		throw new \Sabre\DAV\Exception\NotAuthenticated();
-	}
-
-	$share = $authBackend->getShare();
-	$owner = $share->getShareOwner();
-	$isReadable = $share->getPermissions() & \OCP\Constants::PERMISSION_READ;
-	$fileId = $share->getNodeId();
-
-	// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
-	$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
-	\OC\Files\Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
-		return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => $share->getPermissions() | \OCP\Constants::PERMISSION_SHARE));
-	});
-	\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
-
-	OC_Util::setupFS($owner);
-	$ownerView = \OC\Files\Filesystem::getView();
-	$path = $ownerView->getPath($fileId);
-	$fileInfo = $ownerView->getFileInfo($path);
-	$linkCheckPlugin->setFileInfo($fileInfo);
-
-	// If not readble (files_drop) enable the filesdrop plugin
-	if (!$isReadable) {
-		$filesDropPlugin->enable();
-	}
-
-	$view = new \OC\Files\View($ownerView->getAbsolutePath($path));
-	$filesDropPlugin->setView($view);
-
-	return $view;
+    $isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest');
+    $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
+    $federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
+    if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && !$isAjax) {
+        // this is what is thrown when trying to access a non-existing share
+        throw new \Sabre\DAV\Exception\NotAuthenticated();
+    }
+
+    $share = $authBackend->getShare();
+    $owner = $share->getShareOwner();
+    $isReadable = $share->getPermissions() & \OCP\Constants::PERMISSION_READ;
+    $fileId = $share->getNodeId();
+
+    // FIXME: should not add storage wrappers outside of preSetup, need to find a better way
+    $previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
+    \OC\Files\Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
+        return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => $share->getPermissions() | \OCP\Constants::PERMISSION_SHARE));
+    });
+    \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
+
+    OC_Util::setupFS($owner);
+    $ownerView = \OC\Files\Filesystem::getView();
+    $path = $ownerView->getPath($fileId);
+    $fileInfo = $ownerView->getFileInfo($path);
+    $linkCheckPlugin->setFileInfo($fileInfo);
+
+    // If not readble (files_drop) enable the filesdrop plugin
+    if (!$isReadable) {
+        $filesDropPlugin->enable();
+    }
+
+    $view = new \OC\Files\View($ownerView->getAbsolutePath($path));
+    $filesDropPlugin->setView($view);
+
+    return $view;
 });
 
 $server->addPlugin($linkCheckPlugin);

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
 $linkCheckPlugin = new \OCA\DAV\Files\Sharing\PublicLinkCheckPlugin();
 $filesDropPlugin = new \OCA\DAV\Files\Sharing\FilesDropPlugin();
 
-$server = $serverFactory->createServer($baseuri, $requestUri, $authBackend, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
+$server = $serverFactory->createServer($baseuri, $requestUri, $authBackend, function(\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
 	$isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest');
 	$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
 	$federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
@@ -75,7 +75,7 @@ 
 
 	// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
 	$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
-	\OC\Files\Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
+	\OC\Files\Filesystem::addStorageWrapper('sharePermissions', function($mountPoint, $storage) use ($share) {
 		return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => $share->getPermissions() | \OCP\Constants::PERMISSION_SHARE));
 	});
 	\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);

apps/dav/appinfo/app.php

Indentation +14 added lines, -14 removed lines

@@ -30,27 +30,27 @@
 $app->registerHooks();
 
 \OC::$server->registerService('CardDAVSyncService', function() use ($app) {
-	return $app->getSyncService();
+    return $app->getSyncService();
 });
 
 $eventDispatcher = \OC::$server->getEventDispatcher();
 
 $eventDispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
-	function(GenericEvent $event) use ($app) {
-		/** @var CardDavBackend $cardDavBackend */
-		$cardDavBackend = $app->getContainer()->query(CardDavBackend::class);
-		$addressBookUri = $event->getSubject();
-		$addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
-		if (!is_null($addressBook)) {
-			$cardDavBackend->deleteAddressBook($addressBook['id']);
-		}
-	}
+    function(GenericEvent $event) use ($app) {
+        /** @var CardDavBackend $cardDavBackend */
+        $cardDavBackend = $app->getContainer()->query(CardDavBackend::class);
+        $addressBookUri = $event->getSubject();
+        $addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
+        if (!is_null($addressBook)) {
+            $cardDavBackend->deleteAddressBook($addressBook['id']);
+        }
+    }
 );
 
 $cm = \OC::$server->getContactsManager();
 $cm->register(function() use ($cm, $app) {
-	$user = \OC::$server->getUserSession()->getUser();
-	if (!is_null($user)) {
-		$app->setupContactsProvider($cm, $user->getUID());
-	}
+    $user = \OC::$server->getUserSession()->getUser();
+    if (!is_null($user)) {
+        $app->setupContactsProvider($cm, $user->getUID());
+    }
 });

apps/dav/bin/chunkperf.php

Indentation +17 added lines, -17 removed lines

@@ -23,8 +23,8 @@ 
 require '../../../../3rdparty/autoload.php';
 
 if ($argc !== 6) {
-	echo "Invalid number of arguments" . PHP_EOL;
-	exit;
+    echo "Invalid number of arguments" . PHP_EOL;
+    exit;
 }
 
 /**
@@ -33,15 +33,15 @@ 
  * @return mixed
  */
 function request($client, $method, $uploadUrl, $data = null, $headers = []) {
-	echo "$method $uploadUrl ... ";
-	$t0 = microtime(true);
-	$result = $client->request($method, $uploadUrl, $data, $headers);
-	$t1 = microtime(true);
-	echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL;
-	if (!in_array($result['statusCode'],  [200, 201])) {
-		echo $result['body'] . PHP_EOL;
-	}
-	return $result;
+    echo "$method $uploadUrl ... ";
+    $t0 = microtime(true);
+    $result = $client->request($method, $uploadUrl, $data, $headers);
+    $t1 = microtime(true);
+    echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL;
+    if (!in_array($result['statusCode'],  [200, 201])) {
+        echo $result['body'] . PHP_EOL;
+    }
+    return $result;
 }
 
 $baseUri = $argv[1];
@@ -51,9 +51,9 @@ 
 $chunkSize = $argv[5] * 1024 * 1024;
 
 $client = new \Sabre\DAV\Client([
-	'baseUri' => $baseUri,
-	'userName' => $userName,
-	'password' => $password
+    'baseUri' => $baseUri,
+    'userName' => $userName,
+    'password' => $password
 ]);
 
 $transfer = uniqid('transfer', true);
@@ -66,12 +66,12 @@ 
 
 $index = 0;
 while(!feof($stream)) {
-	request($client, 'PUT', "$uploadUrl/$index", fread($stream, $chunkSize));
-	$index++;
+    request($client, 'PUT', "$uploadUrl/$index", fread($stream, $chunkSize));
+    $index++;
 }
 
 $destination = pathinfo($file, PATHINFO_BASENAME);
 //echo "Moving $uploadUrl/.file to it's final destination $baseUri/files/$userName/$destination" . PHP_EOL;
 request($client, 'MOVE', "$uploadUrl/.file", null, [
-	'Destination' => "$baseUri/files/$userName/$destination"
+    'Destination' => "$baseUri/files/$userName/$destination"
 ]);

Spacing +5 added lines, -5 removed lines

@@ -23,7 +23,7 @@ 
 require '../../../../3rdparty/autoload.php';
 
 if ($argc !== 6) {
-	echo "Invalid number of arguments" . PHP_EOL;
+	echo "Invalid number of arguments".PHP_EOL;
 	exit;
 }
 
@@ -37,9 +37,9 @@ 
 	$t0 = microtime(true);
 	$result = $client->request($method, $uploadUrl, $data, $headers);
 	$t1 = microtime(true);
-	echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL;
-	if (!in_array($result['statusCode'],  [200, 201])) {
-		echo $result['body'] . PHP_EOL;
+	echo $result['statusCode']." - ".($t1 - $t0).' seconds'.PHP_EOL;
+	if (!in_array($result['statusCode'], [200, 201])) {
+		echo $result['body'].PHP_EOL;
 	}
 	return $result;
 }
@@ -65,7 +65,7 @@ 
 $stream = fopen($file, 'r');
 
 $index = 0;
-while(!feof($stream)) {
+while (!feof($stream)) {
 	request($client, 'PUT', "$uploadUrl/$index", fread($stream, $chunkSize));
 	$index++;
 }

apps/admin_audit/lib/auditlogger.php

Spacing +6 added lines, -6 removed lines

@@ -83,15 +83,15 @@ 
 	private function userManagementHooks() {
 		$userActions = new UserManagement($this->logger);
 
-		Util::connectHook('OC_User', 'post_createUser',	$userActions, 'create');
-		Util::connectHook('OC_User', 'post_deleteUser',	$userActions, 'delete');
+		Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
+		Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete');
 		$this->userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
 	}
 	
-	private function groupHooks()  {
+	private function groupHooks() {
 		$groupActions = new GroupManagement($this->logger);
-		$this->groupManager->listen('\OC\Group', 'postRemoveUser',  [$groupActions, 'removeUser']);
-		$this->groupManager->listen('\OC\Group', 'postAddUser',  [$groupActions, 'addUser']);
+		$this->groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']);
+		$this->groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']);
 	}
 
 	/**
@@ -173,7 +173,7 @@ 
 	public function versionsHooks() {
 		$versionsActions = new Versions($this->logger);
 		Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
-		Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete');
+		Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete');
 	}
 
 	/**

Indentation +157 added lines, -157 removed lines

@@ -43,163 +43,163 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class AuditLogger {
-	/** @var ILogger */
-	private $logger;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/**
-	 * AuditLogger constructor.
-	 *
-	 * @param ILogger $logger
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param EventDispatcherInterface $eventDispatcher
-	 */
-	public function __construct(ILogger $logger,
-								IUserSession $userSession, 
-								IGroupManager $groupManager,
-								EventDispatcherInterface $eventDispatcher) {
-		$this->logger = $logger;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->eventDispatcher = $eventDispatcher;
-	}
-
-	/**
-	 * Register hooks in order to log them
-	 */
-	public function registerHooks() {
-		$this->userManagementHooks();
-		$this->groupHooks();
-		$this->sharingHooks();
-		$this->authHooks();
-		$this->fileHooks();
-		$this->trashbinHooks();
-		$this->versionsHooks();
-	}
-
-	/**
-	 * Connect to user management hooks
-	 */
-	private function userManagementHooks() {
-		$userActions = new UserManagement($this->logger);
-
-		Util::connectHook('OC_User', 'post_createUser',	$userActions, 'create');
-		Util::connectHook('OC_User', 'post_deleteUser',	$userActions, 'delete');
-		$this->userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
-	}
+    /** @var ILogger */
+    private $logger;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /**
+     * AuditLogger constructor.
+     *
+     * @param ILogger $logger
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     * @param EventDispatcherInterface $eventDispatcher
+     */
+    public function __construct(ILogger $logger,
+                                IUserSession $userSession, 
+                                IGroupManager $groupManager,
+                                EventDispatcherInterface $eventDispatcher) {
+        $this->logger = $logger;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->eventDispatcher = $eventDispatcher;
+    }
+
+    /**
+     * Register hooks in order to log them
+     */
+    public function registerHooks() {
+        $this->userManagementHooks();
+        $this->groupHooks();
+        $this->sharingHooks();
+        $this->authHooks();
+        $this->fileHooks();
+        $this->trashbinHooks();
+        $this->versionsHooks();
+    }
+
+    /**
+     * Connect to user management hooks
+     */
+    private function userManagementHooks() {
+        $userActions = new UserManagement($this->logger);
+
+        Util::connectHook('OC_User', 'post_createUser',	$userActions, 'create');
+        Util::connectHook('OC_User', 'post_deleteUser',	$userActions, 'delete');
+        $this->userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
+    }
 	
-	private function groupHooks()  {
-		$groupActions = new GroupManagement($this->logger);
-		$this->groupManager->listen('\OC\Group', 'postRemoveUser',  [$groupActions, 'removeUser']);
-		$this->groupManager->listen('\OC\Group', 'postAddUser',  [$groupActions, 'addUser']);
-	}
-
-	/**
-	 * connect to sharing events
-	 */
-	private function sharingHooks() {
-		$shareActions = new Sharing($this->logger);
-
-		Util::connectHook('OCP\Share', 'post_shared', $shareActions, 'shared');
-		Util::connectHook('OCP\Share', 'post_unshare', $shareActions, 'unshare');
-		Util::connectHook('OCP\Share', 'post_update_permissions', $shareActions, 'updatePermissions');
-		Util::connectHook('OCP\Share', 'post_update_password', $shareActions, 'updatePassword');
-		Util::connectHook('OCP\Share', 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
-		Util::connectHook('OCP\Share', 'share_link_access', $shareActions, 'shareAccessed');
-	}
-
-	/**
-	 * connect to authentication event and related actions
-	 */
-	private function authHooks() {
-		$authActions = new Auth($this->logger);
-
-		Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
-		Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
-		Util::connectHook('OC_User', 'logout', $authActions, 'logout');
-	}
-
-	/**
-	 * Connect to file hooks
-	 */
-	private function fileHooks() {
-		$fileActions = new Files($this->logger);
-		$this->eventDispatcher->addListener(
-			IPreview::EVENT,
-			function(GenericEvent $event) use ($fileActions) {
-				/** @var File $file */
-				$file = $event->getSubject();
-				$fileActions->preview([
-					'path' => substr($file->getInternalPath(), 5),
-					'width' => $event->getArguments()['width'],
-					'height' => $event->getArguments()['height'],
-					'crop' => $event->getArguments()['crop'],
-					'mode'  => $event->getArguments()['mode']
-				]);
-			}
-		);
-
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_rename,
-			$fileActions,
-			'rename'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_create,
-			$fileActions,
-			'create'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_copy,
-			$fileActions,
-			'copy'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_write,
-			$fileActions,
-			'write'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_update,
-			$fileActions,
-			'update'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_read,
-			$fileActions,
-			'read'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_delete,
-			$fileActions,
-			'delete'
-		);
-	}
-
-	public function versionsHooks() {
-		$versionsActions = new Versions($this->logger);
-		Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
-		Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete');
-	}
-
-	/**
-	 * Connect to trash bin hooks
-	 */
-	private function trashbinHooks() {
-		$trashActions = new Trashbin($this->logger);
-		Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
-		Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
-	}
+    private function groupHooks()  {
+        $groupActions = new GroupManagement($this->logger);
+        $this->groupManager->listen('\OC\Group', 'postRemoveUser',  [$groupActions, 'removeUser']);
+        $this->groupManager->listen('\OC\Group', 'postAddUser',  [$groupActions, 'addUser']);
+    }
+
+    /**
+     * connect to sharing events
+     */
+    private function sharingHooks() {
+        $shareActions = new Sharing($this->logger);
+
+        Util::connectHook('OCP\Share', 'post_shared', $shareActions, 'shared');
+        Util::connectHook('OCP\Share', 'post_unshare', $shareActions, 'unshare');
+        Util::connectHook('OCP\Share', 'post_update_permissions', $shareActions, 'updatePermissions');
+        Util::connectHook('OCP\Share', 'post_update_password', $shareActions, 'updatePassword');
+        Util::connectHook('OCP\Share', 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
+        Util::connectHook('OCP\Share', 'share_link_access', $shareActions, 'shareAccessed');
+    }
+
+    /**
+     * connect to authentication event and related actions
+     */
+    private function authHooks() {
+        $authActions = new Auth($this->logger);
+
+        Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
+        Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
+        Util::connectHook('OC_User', 'logout', $authActions, 'logout');
+    }
+
+    /**
+     * Connect to file hooks
+     */
+    private function fileHooks() {
+        $fileActions = new Files($this->logger);
+        $this->eventDispatcher->addListener(
+            IPreview::EVENT,
+            function(GenericEvent $event) use ($fileActions) {
+                /** @var File $file */
+                $file = $event->getSubject();
+                $fileActions->preview([
+                    'path' => substr($file->getInternalPath(), 5),
+                    'width' => $event->getArguments()['width'],
+                    'height' => $event->getArguments()['height'],
+                    'crop' => $event->getArguments()['crop'],
+                    'mode'  => $event->getArguments()['mode']
+                ]);
+            }
+        );
+
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_rename,
+            $fileActions,
+            'rename'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_create,
+            $fileActions,
+            'create'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_copy,
+            $fileActions,
+            'copy'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_write,
+            $fileActions,
+            'write'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_update,
+            $fileActions,
+            'update'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_read,
+            $fileActions,
+            'read'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_delete,
+            $fileActions,
+            'delete'
+        );
+    }
+
+    public function versionsHooks() {
+        $versionsActions = new Versions($this->logger);
+        Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
+        Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete');
+    }
+
+    /**
+     * Connect to trash bin hooks
+     */
+    private function trashbinHooks() {
+        $trashActions = new Trashbin($this->logger);
+        Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
+        Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
+    }
 
 }

apps/admin_audit/lib/actions/groupmanagement.php

Indentation +34 added lines, -34 removed lines

@@ -37,40 +37,40 @@
  */
 class GroupManagement extends Action {
 
-	/**
-	 * log add user to group event
-	 *
-	 * @param IGroup $group
-	 * @param IUser $user
-	 */
-	public function addUser(IGroup $group, IUser $user) {
-		$this->log('User "%s" added to group "%s"',
-			[
-				'group' => $group->getGID(),
-				'user' => $user->getUID()
-			],
-			[
-				'user', 'group'
-			]
-		);
-	}
+    /**
+     * log add user to group event
+     *
+     * @param IGroup $group
+     * @param IUser $user
+     */
+    public function addUser(IGroup $group, IUser $user) {
+        $this->log('User "%s" added to group "%s"',
+            [
+                'group' => $group->getGID(),
+                'user' => $user->getUID()
+            ],
+            [
+                'user', 'group'
+            ]
+        );
+    }
 
-	/**
-	 * log remove user from group event
-	 *
-	 * @param IGroup $group
-	 * @param IUser $user
-	 */
-	public function removeUser(IGroup $group, IUser $user) {
-		$this->log('User "%s" removed from group "%s"',
-			[
-				'group' => $group->getGID(),
-				'user' => $user->getUID()
-			],
-			[
-				'user', 'group'
-			]
-		);
-	}
+    /**
+     * log remove user from group event
+     *
+     * @param IGroup $group
+     * @param IUser $user
+     */
+    public function removeUser(IGroup $group, IUser $user) {
+        $this->log('User "%s" removed from group "%s"',
+            [
+                'group' => $group->getGID(),
+                'user' => $user->getUID()
+            ],
+            [
+                'user', 'group'
+            ]
+        );
+    }
 
 }

apps/admin_audit/lib/actions/usermanagement.php

Indentation +46 added lines, -46 removed lines

@@ -30,52 +30,52 @@
  * @package OCA\Admin_Audit\Actions
  */
 class UserManagement extends Action {
-	/**
-	 * Log creation of users
-	 *
-	 * @param array $params
-	 */
-	public function create(array $params) {
-		$this->log(
-			'User created: "%s"',
-			$params,
-			[
-				'uid',
-			]
-		);
-	}
+    /**
+     * Log creation of users
+     *
+     * @param array $params
+     */
+    public function create(array $params) {
+        $this->log(
+            'User created: "%s"',
+            $params,
+            [
+                'uid',
+            ]
+        );
+    }
 
-	/**
-	 * Log deletion of users
-	 *
-	 * @param array $params
-	 */
-	public function delete(array $params) {
-		$this->log(
-			'User deleted: "%s"',
-			$params,
-			[
-				'uid',
-			]
-		);
-	}
+    /**
+     * Log deletion of users
+     *
+     * @param array $params
+     */
+    public function delete(array $params) {
+        $this->log(
+            'User deleted: "%s"',
+            $params,
+            [
+                'uid',
+            ]
+        );
+    }
 
-	/**
-	 * Logs changing of the user scope
-	 *
-	 * @param IUser $user
-	 */
-	public function setPassword(IUser $user) {
-		if($user->getBackendClassName() === 'Database') {
-			$this->log(
-				'Password of user "%s" has been changed',
-				[
-					'user' => $user->getUID(),
-				],
-				[
-					'user',
-				]
-			);
-		}
-	}
+    /**
+     * Logs changing of the user scope
+     *
+     * @param IUser $user
+     */
+    public function setPassword(IUser $user) {
+        if($user->getBackendClassName() === 'Database') {
+            $this->log(
+                'Password of user "%s" has been changed',
+                [
+                    'user' => $user->getUID(),
+                ],
+                [
+                    'user',
+                ]
+            );
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 	 * @param IUser $user
 	 */
 	public function setPassword(IUser $user) {
-		if($user->getBackendClassName() === 'Database') {
+		if ($user->getBackendClassName() === 'Database') {
 			$this->log(
 				'Password of user "%s" has been changed',
 				[

apps/admin_audit/lib/actions/action.php

Indentation +56 added lines, -56 removed lines

@@ -25,64 +25,64 @@
 use OCP\ILogger;
 
 class Action {
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	/**
-	 * @param ILogger $logger
-	 */
-	public function __construct(ILogger $logger) {
-		$this->logger = $logger;
-	}
+    /**
+     * @param ILogger $logger
+     */
+    public function __construct(ILogger $logger) {
+        $this->logger = $logger;
+    }
 
-	/**
-	 * Log a single action with a log level of info
-	 *
-	 * @param string $text
-	 * @param array $params
-	 * @param array $elements
-	 * @param bool $obfuscateParameters
-	 */
-	public function log($text,
-						array $params,
-						array $elements,
-						$obfuscateParameters = false) {
-		foreach($elements as $element) {
-			if(!isset($params[$element])) {
-				if ($obfuscateParameters) {
-					$this->logger->critical(
-						'$params["'.$element.'"] was missing.',
-						['app' => 'admin_audit']
-					);
-				} else {
-					$this->logger->critical(
-						sprintf(
-							'$params["'.$element.'"] was missing. Transferred value: %s',
-							print_r($params, true)
-						),
-						['app' => 'admin_audit']
-					);
-				}
-				return;
-			}
-		}
+    /**
+     * Log a single action with a log level of info
+     *
+     * @param string $text
+     * @param array $params
+     * @param array $elements
+     * @param bool $obfuscateParameters
+     */
+    public function log($text,
+                        array $params,
+                        array $elements,
+                        $obfuscateParameters = false) {
+        foreach($elements as $element) {
+            if(!isset($params[$element])) {
+                if ($obfuscateParameters) {
+                    $this->logger->critical(
+                        '$params["'.$element.'"] was missing.',
+                        ['app' => 'admin_audit']
+                    );
+                } else {
+                    $this->logger->critical(
+                        sprintf(
+                            '$params["'.$element.'"] was missing. Transferred value: %s',
+                            print_r($params, true)
+                        ),
+                        ['app' => 'admin_audit']
+                    );
+                }
+                return;
+            }
+        }
 
-		$replaceArray = [];
-		foreach($elements as $element) {
-			if($params[$element] instanceof \DateTime) {
-				$params[$element] = $params[$element]->format('Y-m-d H:i:s');
-			}
-			$replaceArray[] = $params[$element];
-		}
+        $replaceArray = [];
+        foreach($elements as $element) {
+            if($params[$element] instanceof \DateTime) {
+                $params[$element] = $params[$element]->format('Y-m-d H:i:s');
+            }
+            $replaceArray[] = $params[$element];
+        }
 
-		$this->logger->info(
-			vsprintf(
-				$text,
-				$replaceArray
-			),
-			[
-				'app' => 'admin_audit'
-			]
-		);
-	}
+        $this->logger->info(
+            vsprintf(
+                $text,
+                $replaceArray
+            ),
+            [
+                'app' => 'admin_audit'
+            ]
+        );
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -47,8 +47,8 @@ 
 						array $params,
 						array $elements,
 						$obfuscateParameters = false) {
-		foreach($elements as $element) {
-			if(!isset($params[$element])) {
+		foreach ($elements as $element) {
+			if (!isset($params[$element])) {
 				if ($obfuscateParameters) {
 					$this->logger->critical(
 						'$params["'.$element.'"] was missing.',
@@ -68,8 +68,8 @@ 
 		}
 
 		$replaceArray = [];
-		foreach($elements as $element) {
-			if($params[$element] instanceof \DateTime) {
+		foreach ($elements as $element) {
+			if ($params[$element] instanceof \DateTime) {
 				$params[$element] = $params[$element]->format('Y-m-d H:i:s');
 			}
 			$replaceArray[] = $params[$element];

apps/admin_audit/lib/actions/auth.php

Indentation +27 added lines, -27 removed lines

@@ -28,33 +28,33 @@
  * @package OCA\Admin_Audit\Actions
  */
 class Auth extends Action {
-	public function loginAttempt(array $params) {
-		$this->log(
-			'Login attempt: "%s"',
-			$params,
-			[
-				'uid',
-			],
-			true
-		);
-	}
+    public function loginAttempt(array $params) {
+        $this->log(
+            'Login attempt: "%s"',
+            $params,
+            [
+                'uid',
+            ],
+            true
+        );
+    }
 
-	public function loginSuccessful(array $params) {
-		$this->log(
-			'Login successful: "%s"',
-			$params,
-			[
-				'uid',
-			],
-			true
-		);
-	}
+    public function loginSuccessful(array $params) {
+        $this->log(
+            'Login successful: "%s"',
+            $params,
+            [
+                'uid',
+            ],
+            true
+        );
+    }
 
-	public function logout(array $params) {
-		$this->log(
-			'Logout occurred',
-			[],
-			[]
-		);
-	}
+    public function logout(array $params) {
+        $this->log(
+            'Logout occurred',
+            [],
+            []
+        );
+    }
 }

apps/admin_audit/lib/actions/versions.php

Indentation +15 added lines, -15 removed lines

@@ -27,21 +27,21 @@
 
 class Versions extends Action {
 
-	public function rollback($params) {
-		$this->log('Version "%s" of "%s" was restored.',
-			[
-				'version' => $params['revision'],
-				'path' => $params['path']
-			],
-			['version', 'path']
-		);
-	}
+    public function rollback($params) {
+        $this->log('Version "%s" of "%s" was restored.',
+            [
+                'version' => $params['revision'],
+                'path' => $params['path']
+            ],
+            ['version', 'path']
+        );
+    }
 
-	public function delete($params) {
-		$this->log('Version "%s" was deleted.',
-			['path' => $params['path']],
-			['path']
-		);
-	}
+    public function delete($params) {
+        $this->log('Version "%s" was deleted.',
+            ['path' => $params['path']],
+            ['path']
+        );
+    }
 
 }