nextcloud / server

apps/user_ldap/lib/IUserLDAP.php

Indentation +19 added lines, -19 removed lines

@@ -24,26 +24,26 @@
 
 interface IUserLDAP {
 
-	//Functions used by LDAPProvider
+    //Functions used by LDAPProvider
 	
-	/**
-	 * Return access for LDAP interaction.
-	 * @param string $uid
-	 * @return Access instance of Access for LDAP interaction
-	 */
-	public function getLDAPAccess($uid);
+    /**
+     * Return access for LDAP interaction.
+     * @param string $uid
+     * @return Access instance of Access for LDAP interaction
+     */
+    public function getLDAPAccess($uid);
 	
-	/**
-	 * Return a new LDAP connection for the specified user.
-	 * @param string $uid
-	 * @return resource of the LDAP connection
-	 */
-	public function getNewLDAPConnection($uid);
+    /**
+     * Return a new LDAP connection for the specified user.
+     * @param string $uid
+     * @return resource of the LDAP connection
+     */
+    public function getNewLDAPConnection($uid);
 
-	/**
-	 * Return the username for the given LDAP DN, if available.
-	 * @param string $dn
-	 * @return string|false with the username
-	 */
-	public function dn2UserName($dn);
+    /**
+     * Return the username for the given LDAP DN, if available.
+     * @param string $dn
+     * @return string|false with the username
+     */
+    public function dn2UserName($dn);
 }

apps/user_ldap/lib/LDAPUtility.php

Indentation +8 added lines, -8 removed lines

@@ -26,13 +26,13 @@
 namespace OCA\User_LDAP;
 
 abstract class LDAPUtility {
-	protected $ldap;
+    protected $ldap;
 
-	/**
-	 * constructor, make sure the subclasses call this one!
-	 * @param ILDAPWrapper $ldapWrapper an instance of an ILDAPWrapper
-	 */
-	public function __construct(ILDAPWrapper $ldapWrapper) {
-		$this->ldap = $ldapWrapper;
-	}
+    /**
+     * constructor, make sure the subclasses call this one!
+     * @param ILDAPWrapper $ldapWrapper an instance of an ILDAPWrapper
+     */
+    public function __construct(ILDAPWrapper $ldapWrapper) {
+        $this->ldap = $ldapWrapper;
+    }
 }

apps/user_ldap/appinfo/routes.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 $application->registerRoutes($this, [
 	'ocs' => [
 		['name' => 'ConfigAPI#create', 'url' => '/api/v1/config', 'verb' => 'POST'],
-		['name' => 'ConfigAPI#show',   'url' => '/api/v1/config/{configID}', 'verb' => 'GET'],
+		['name' => 'ConfigAPI#show', 'url' => '/api/v1/config/{configID}', 'verb' => 'GET'],
 		['name' => 'ConfigAPI#modify', 'url' => '/api/v1/config/{configID}', 'verb' => 'PUT'],
 		['name' => 'ConfigAPI#delete', 'url' => '/api/v1/config/{configID}', 'verb' => 'DELETE'],
 	]

Indentation +19 added lines, -19 removed lines

@@ -27,37 +27,37 @@
  *
  */
 $this->create('user_ldap_ajax_clearMappings', 'apps/user_ldap/ajax/clearMappings.php')
-	->actionInclude('user_ldap/ajax/clearMappings.php');
+    ->actionInclude('user_ldap/ajax/clearMappings.php');
 $this->create('user_ldap_ajax_deleteConfiguration', 'apps/user_ldap/ajax/deleteConfiguration.php')
-	->actionInclude('user_ldap/ajax/deleteConfiguration.php');
+    ->actionInclude('user_ldap/ajax/deleteConfiguration.php');
 $this->create('user_ldap_ajax_getConfiguration', 'apps/user_ldap/ajax/getConfiguration.php')
-	->actionInclude('user_ldap/ajax/getConfiguration.php');
+    ->actionInclude('user_ldap/ajax/getConfiguration.php');
 $this->create('user_ldap_ajax_getNewServerConfigPrefix', 'apps/user_ldap/ajax/getNewServerConfigPrefix.php')
-	->actionInclude('user_ldap/ajax/getNewServerConfigPrefix.php');
+    ->actionInclude('user_ldap/ajax/getNewServerConfigPrefix.php');
 $this->create('user_ldap_ajax_setConfiguration', 'apps/user_ldap/ajax/setConfiguration.php')
-	->actionInclude('user_ldap/ajax/setConfiguration.php');
+    ->actionInclude('user_ldap/ajax/setConfiguration.php');
 $this->create('user_ldap_ajax_testConfiguration', 'apps/user_ldap/ajax/testConfiguration.php')
-	->actionInclude('user_ldap/ajax/testConfiguration.php');
+    ->actionInclude('user_ldap/ajax/testConfiguration.php');
 $this->create('user_ldap_ajax_wizard', 'apps/user_ldap/ajax/wizard.php')
-	->actionInclude('user_ldap/ajax/wizard.php');
+    ->actionInclude('user_ldap/ajax/wizard.php');
 
 $application = new \OCP\AppFramework\App('user_ldap');
 $application->registerRoutes($this, [
-	'ocs' => [
-		['name' => 'ConfigAPI#create', 'url' => '/api/v1/config', 'verb' => 'POST'],
-		['name' => 'ConfigAPI#show',   'url' => '/api/v1/config/{configID}', 'verb' => 'GET'],
-		['name' => 'ConfigAPI#modify', 'url' => '/api/v1/config/{configID}', 'verb' => 'PUT'],
-		['name' => 'ConfigAPI#delete', 'url' => '/api/v1/config/{configID}', 'verb' => 'DELETE'],
-	]
+    'ocs' => [
+        ['name' => 'ConfigAPI#create', 'url' => '/api/v1/config', 'verb' => 'POST'],
+        ['name' => 'ConfigAPI#show',   'url' => '/api/v1/config/{configID}', 'verb' => 'GET'],
+        ['name' => 'ConfigAPI#modify', 'url' => '/api/v1/config/{configID}', 'verb' => 'PUT'],
+        ['name' => 'ConfigAPI#delete', 'url' => '/api/v1/config/{configID}', 'verb' => 'DELETE'],
+    ]
 ]);
 
 /** @var \OCA\User_LDAP\AppInfo\Application $application */
 $application = \OC::$server->query(\OCA\User_LDAP\AppInfo\Application::class);
 $application->registerRoutes($this, [
-	'routes' => [
-		['name' => 'renewPassword#tryRenewPassword', 'url' => '/renewpassword', 'verb' => 'POST'],
-		['name' => 'renewPassword#showRenewPasswordForm', 'url' => '/renewpassword/{user}', 'verb' => 'GET'],
-		['name' => 'renewPassword#cancel', 'url' => '/renewpassword/cancel', 'verb' => 'GET'],
-		['name' => 'renewPassword#showLoginFormInvalidPassword', 'url' => '/renewpassword/invalidlogin/{user}', 'verb' => 'GET'],
-	]
+    'routes' => [
+        ['name' => 'renewPassword#tryRenewPassword', 'url' => '/renewpassword', 'verb' => 'POST'],
+        ['name' => 'renewPassword#showRenewPasswordForm', 'url' => '/renewpassword/{user}', 'verb' => 'GET'],
+        ['name' => 'renewPassword#cancel', 'url' => '/renewpassword/cancel', 'verb' => 'GET'],
+        ['name' => 'renewPassword#showLoginFormInvalidPassword', 'url' => '/renewpassword/invalidlogin/{user}', 'verb' => 'GET'],
+    ]
 ]);

apps/files_external/ajax/applicable.php

Spacing +3 added lines, -3 removed lines

@@ -30,13 +30,13 @@
 $limit = null;
 $offset = null;
 if (isset($_GET['pattern'])) {
-	$pattern = (string)$_GET['pattern'];
+	$pattern = (string) $_GET['pattern'];
 }
 if (isset($_GET['limit'])) {
-	$limit = (int)$_GET['limit'];
+	$limit = (int) $_GET['limit'];
 }
 if (isset($_GET['offset'])) {
-	$offset = (int)$_GET['offset'];
+	$offset = (int) $_GET['offset'];
 }
 
 $groups = [];

Indentation +5 added lines, -5 removed lines

@@ -32,23 +32,23 @@
 $limit = null;
 $offset = null;
 if (isset($_GET['pattern'])) {
-	$pattern = (string)$_GET['pattern'];
+    $pattern = (string)$_GET['pattern'];
 }
 if (isset($_GET['limit'])) {
-	$limit = (int)$_GET['limit'];
+    $limit = (int)$_GET['limit'];
 }
 if (isset($_GET['offset'])) {
-	$offset = (int)$_GET['offset'];
+    $offset = (int)$_GET['offset'];
 }
 
 $groups = [];
 foreach (\OC::$server->getGroupManager()->search($pattern, $limit, $offset) as $group) {
-	$groups[$group->getGID()] = $group->getDisplayName();
+    $groups[$group->getGID()] = $group->getDisplayName();
 }
 
 $users = [];
 foreach (\OC::$server->getUserManager()->searchDisplayName($pattern, $limit, $offset) as $user) {
-	$users[$user->getUID()] = $user->getDisplayName();
+    $users[$user->getUID()] = $user->getDisplayName();
 }
 
 $results = ['groups' => $groups, 'users' => $users];

apps/files_external/lib/Service/ImportLegacyStoragesService.php

Indentation +18 added lines, -18 removed lines

@@ -24,25 +24,25 @@
 namespace OCA\Files_External\Service;
 
 class ImportLegacyStoragesService extends LegacyStoragesService {
-	private $data;
+    private $data;
 
-	/**
-	 * @param BackendService $backendService
-	 */
-	public function __construct(BackendService $backendService) {
-		$this->backendService = $backendService;
-	}
+    /**
+     * @param BackendService $backendService
+     */
+    public function __construct(BackendService $backendService) {
+        $this->backendService = $backendService;
+    }
 
-	public function setData($data) {
-		$this->data = $data;
-	}
+    public function setData($data) {
+        $this->data = $data;
+    }
 
-	/**
-	 * Read legacy config data
-	 *
-	 * @return array list of mount configs
-	 */
-	protected function readLegacyConfig() {
-		return $this->data;
-	}
+    /**
+     * Read legacy config data
+     *
+     * @return array list of mount configs
+     */
+    protected function readLegacyConfig() {
+        return $this->data;
+    }
 }

apps/files_external/lib/Service/GlobalStoragesService.php

Spacing +2 added lines, -2 removed lines

@@ -172,11 +172,11 @@
 	public function getStorageForAllUsers() {
 		$mounts = $this->dbConfig->getAllMounts();
 		$configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts);
-		$configs = array_filter($configs, function ($config) {
+		$configs = array_filter($configs, function($config) {
 			return $config instanceof StorageConfig;
 		});
 
-		$keys = array_map(function (StorageConfig $config) {
+		$keys = array_map(function(StorageConfig $config) {
 			return $config->getId();
 		}, $configs);
 

Indentation +147 added lines, -147 removed lines

@@ -36,151 +36,151 @@
  * Service class to manage global external storage
  */
 class GlobalStoragesService extends StoragesService {
-	/**
-	 * Triggers $signal for all applicable users of the given
-	 * storage
-	 *
-	 * @param StorageConfig $storage storage data
-	 * @param string $signal signal to trigger
-	 */
-	protected function triggerHooks(StorageConfig $storage, $signal) {
-		// FIXME: Use as expression in empty once PHP 5.4 support is dropped
-		$applicableUsers = $storage->getApplicableUsers();
-		$applicableGroups = $storage->getApplicableGroups();
-		if (empty($applicableUsers) && empty($applicableGroups)) {
-			// raise for user "all"
-			$this->triggerApplicableHooks(
-				$signal,
-				$storage->getMountPoint(),
-				\OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
-				['all']
-			);
-			return;
-		}
-
-		$this->triggerApplicableHooks(
-			$signal,
-			$storage->getMountPoint(),
-			\OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
-			$applicableUsers
-		);
-		$this->triggerApplicableHooks(
-			$signal,
-			$storage->getMountPoint(),
-			\OCA\Files_External\MountConfig::MOUNT_TYPE_GROUP,
-			$applicableGroups
-		);
-	}
-
-	/**
-	 * Triggers signal_create_mount or signal_delete_mount to
-	 * accommodate for additions/deletions in applicableUsers
-	 * and applicableGroups fields.
-	 *
-	 * @param StorageConfig $oldStorage old storage config
-	 * @param StorageConfig $newStorage new storage config
-	 */
-	protected function triggerChangeHooks(StorageConfig $oldStorage, StorageConfig $newStorage) {
-		// if mount point changed, it's like a deletion + creation
-		if ($oldStorage->getMountPoint() !== $newStorage->getMountPoint()) {
-			$this->triggerHooks($oldStorage, Filesystem::signal_delete_mount);
-			$this->triggerHooks($newStorage, Filesystem::signal_create_mount);
-			return;
-		}
-
-		$userAdditions = array_diff($newStorage->getApplicableUsers(), $oldStorage->getApplicableUsers());
-		$userDeletions = array_diff($oldStorage->getApplicableUsers(), $newStorage->getApplicableUsers());
-		$groupAdditions = array_diff($newStorage->getApplicableGroups(), $oldStorage->getApplicableGroups());
-		$groupDeletions = array_diff($oldStorage->getApplicableGroups(), $newStorage->getApplicableGroups());
-
-		// FIXME: Use as expression in empty once PHP 5.4 support is dropped
-		// if no applicable were set, raise a signal for "all"
-		$oldApplicableUsers = $oldStorage->getApplicableUsers();
-		$oldApplicableGroups = $oldStorage->getApplicableGroups();
-		if (empty($oldApplicableUsers) && empty($oldApplicableGroups)) {
-			$this->triggerApplicableHooks(
-				Filesystem::signal_delete_mount,
-				$oldStorage->getMountPoint(),
-				\OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
-				['all']
-			);
-		}
-
-		// trigger delete for removed users
-		$this->triggerApplicableHooks(
-			Filesystem::signal_delete_mount,
-			$oldStorage->getMountPoint(),
-			\OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
-			$userDeletions
-		);
-
-		// trigger delete for removed groups
-		$this->triggerApplicableHooks(
-			Filesystem::signal_delete_mount,
-			$oldStorage->getMountPoint(),
-			\OCA\Files_External\MountConfig::MOUNT_TYPE_GROUP,
-			$groupDeletions
-		);
-
-		// and now add the new users
-		$this->triggerApplicableHooks(
-			Filesystem::signal_create_mount,
-			$newStorage->getMountPoint(),
-			\OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
-			$userAdditions
-		);
-
-		// and now add the new groups
-		$this->triggerApplicableHooks(
-			Filesystem::signal_create_mount,
-			$newStorage->getMountPoint(),
-			\OCA\Files_External\MountConfig::MOUNT_TYPE_GROUP,
-			$groupAdditions
-		);
-
-		// FIXME: Use as expression in empty once PHP 5.4 support is dropped
-		// if no applicable, raise a signal for "all"
-		$newApplicableUsers = $newStorage->getApplicableUsers();
-		$newApplicableGroups = $newStorage->getApplicableGroups();
-		if (empty($newApplicableUsers) && empty($newApplicableGroups)) {
-			$this->triggerApplicableHooks(
-				Filesystem::signal_create_mount,
-				$newStorage->getMountPoint(),
-				\OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
-				['all']
-			);
-		}
-	}
-
-	/**
-	 * Get the visibility type for this controller, used in validation
-	 *
-	 * @return string BackendService::VISIBILITY_* constants
-	 */
-	public function getVisibilityType() {
-		return BackendService::VISIBILITY_ADMIN;
-	}
-
-	protected function isApplicable(StorageConfig $config) {
-		return true;
-	}
-
-	/**
-	 * Get all configured admin and personal mounts
-	 *
-	 * @return StorageConfig[] map of storage id to storage config
-	 */
-	public function getStorageForAllUsers() {
-		$mounts = $this->dbConfig->getAllMounts();
-		$configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts);
-		$configs = array_filter($configs, function ($config) {
-			return $config instanceof StorageConfig;
-		});
-
-		$keys = array_map(function (StorageConfig $config) {
-			return $config->getId();
-		}, $configs);
-
-		return array_combine($keys, $configs);
-	}
+    /**
+     * Triggers $signal for all applicable users of the given
+     * storage
+     *
+     * @param StorageConfig $storage storage data
+     * @param string $signal signal to trigger
+     */
+    protected function triggerHooks(StorageConfig $storage, $signal) {
+        // FIXME: Use as expression in empty once PHP 5.4 support is dropped
+        $applicableUsers = $storage->getApplicableUsers();
+        $applicableGroups = $storage->getApplicableGroups();
+        if (empty($applicableUsers) && empty($applicableGroups)) {
+            // raise for user "all"
+            $this->triggerApplicableHooks(
+                $signal,
+                $storage->getMountPoint(),
+                \OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
+                ['all']
+            );
+            return;
+        }
+
+        $this->triggerApplicableHooks(
+            $signal,
+            $storage->getMountPoint(),
+            \OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
+            $applicableUsers
+        );
+        $this->triggerApplicableHooks(
+            $signal,
+            $storage->getMountPoint(),
+            \OCA\Files_External\MountConfig::MOUNT_TYPE_GROUP,
+            $applicableGroups
+        );
+    }
+
+    /**
+     * Triggers signal_create_mount or signal_delete_mount to
+     * accommodate for additions/deletions in applicableUsers
+     * and applicableGroups fields.
+     *
+     * @param StorageConfig $oldStorage old storage config
+     * @param StorageConfig $newStorage new storage config
+     */
+    protected function triggerChangeHooks(StorageConfig $oldStorage, StorageConfig $newStorage) {
+        // if mount point changed, it's like a deletion + creation
+        if ($oldStorage->getMountPoint() !== $newStorage->getMountPoint()) {
+            $this->triggerHooks($oldStorage, Filesystem::signal_delete_mount);
+            $this->triggerHooks($newStorage, Filesystem::signal_create_mount);
+            return;
+        }
+
+        $userAdditions = array_diff($newStorage->getApplicableUsers(), $oldStorage->getApplicableUsers());
+        $userDeletions = array_diff($oldStorage->getApplicableUsers(), $newStorage->getApplicableUsers());
+        $groupAdditions = array_diff($newStorage->getApplicableGroups(), $oldStorage->getApplicableGroups());
+        $groupDeletions = array_diff($oldStorage->getApplicableGroups(), $newStorage->getApplicableGroups());
+
+        // FIXME: Use as expression in empty once PHP 5.4 support is dropped
+        // if no applicable were set, raise a signal for "all"
+        $oldApplicableUsers = $oldStorage->getApplicableUsers();
+        $oldApplicableGroups = $oldStorage->getApplicableGroups();
+        if (empty($oldApplicableUsers) && empty($oldApplicableGroups)) {
+            $this->triggerApplicableHooks(
+                Filesystem::signal_delete_mount,
+                $oldStorage->getMountPoint(),
+                \OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
+                ['all']
+            );
+        }
+
+        // trigger delete for removed users
+        $this->triggerApplicableHooks(
+            Filesystem::signal_delete_mount,
+            $oldStorage->getMountPoint(),
+            \OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
+            $userDeletions
+        );
+
+        // trigger delete for removed groups
+        $this->triggerApplicableHooks(
+            Filesystem::signal_delete_mount,
+            $oldStorage->getMountPoint(),
+            \OCA\Files_External\MountConfig::MOUNT_TYPE_GROUP,
+            $groupDeletions
+        );
+
+        // and now add the new users
+        $this->triggerApplicableHooks(
+            Filesystem::signal_create_mount,
+            $newStorage->getMountPoint(),
+            \OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
+            $userAdditions
+        );
+
+        // and now add the new groups
+        $this->triggerApplicableHooks(
+            Filesystem::signal_create_mount,
+            $newStorage->getMountPoint(),
+            \OCA\Files_External\MountConfig::MOUNT_TYPE_GROUP,
+            $groupAdditions
+        );
+
+        // FIXME: Use as expression in empty once PHP 5.4 support is dropped
+        // if no applicable, raise a signal for "all"
+        $newApplicableUsers = $newStorage->getApplicableUsers();
+        $newApplicableGroups = $newStorage->getApplicableGroups();
+        if (empty($newApplicableUsers) && empty($newApplicableGroups)) {
+            $this->triggerApplicableHooks(
+                Filesystem::signal_create_mount,
+                $newStorage->getMountPoint(),
+                \OCA\Files_External\MountConfig::MOUNT_TYPE_USER,
+                ['all']
+            );
+        }
+    }
+
+    /**
+     * Get the visibility type for this controller, used in validation
+     *
+     * @return string BackendService::VISIBILITY_* constants
+     */
+    public function getVisibilityType() {
+        return BackendService::VISIBILITY_ADMIN;
+    }
+
+    protected function isApplicable(StorageConfig $config) {
+        return true;
+    }
+
+    /**
+     * Get all configured admin and personal mounts
+     *
+     * @return StorageConfig[] map of storage id to storage config
+     */
+    public function getStorageForAllUsers() {
+        $mounts = $this->dbConfig->getAllMounts();
+        $configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts);
+        $configs = array_filter($configs, function ($config) {
+            return $config instanceof StorageConfig;
+        });
+
+        $keys = array_map(function (StorageConfig $config) {
+            return $config->getId();
+        }, $configs);
+
+        return array_combine($keys, $configs);
+    }
 }

apps/files_external/lib/Command/Applicable.php

Spacing +3 added lines, -3 removed lines

@@ -103,7 +103,7 @@ 
 		try {
 			$mount = $this->globalService->getStorage($mountId);
 		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts</error>');
+			$output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts</error>');
 			return 404;
 		}
 
@@ -123,13 +123,13 @@ 
 		if ((count($addUsers) + count($removeUsers) + count($addGroups) + count($removeGroups) > 0) || $input->getOption('remove-all')) {
 			foreach ($addUsers as $addUser) {
 				if (!$this->userManager->userExists($addUser)) {
-					$output->writeln('<error>User "' . $addUser . '" not found</error>');
+					$output->writeln('<error>User "'.$addUser.'" not found</error>');
 					return 404;
 				}
 			}
 			foreach ($addGroups as $addGroup) {
 				if (!$this->groupManager->groupExists($addGroup)) {
-					$output->writeln('<error>Group "' . $addGroup . '" not found</error>');
+					$output->writeln('<error>Group "'.$addGroup.'" not found</error>');
 					return 404;
 				}
 			}

Indentation +108 added lines, -108 removed lines

@@ -37,123 +37,123 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Applicable extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	protected $globalService;
+    /**
+     * @var GlobalStoragesService
+     */
+    protected $globalService;
 
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
 
-	/**
-	 * @var IGroupManager
-	 */
-	private $groupManager;
+    /**
+     * @var IGroupManager
+     */
+    private $groupManager;
 
-	public function __construct(
-		GlobalStoragesService $globalService,
-		IUserManager $userManager,
-		IGroupManager $groupManager
-	) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-	}
+    public function __construct(
+        GlobalStoragesService $globalService,
+        IUserManager $userManager,
+        IGroupManager $groupManager
+    ) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:applicable')
-			->setDescription('Manage applicable users and groups for a mount')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'The id of the mount to edit'
-			)->addOption(
-				'add-user',
-				'',
-				InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
-				'user to add as applicable'
-			)->addOption(
-				'remove-user',
-				'',
-				InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
-				'user to remove as applicable'
-			)->addOption(
-				'add-group',
-				'',
-				InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
-				'group to add as applicable'
-			)->addOption(
-				'remove-group',
-				'',
-				InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
-				'group to remove as applicable'
-			)->addOption(
-				'remove-all',
-				'',
-				InputOption::VALUE_NONE,
-				'Set the mount to be globally applicable'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:applicable')
+            ->setDescription('Manage applicable users and groups for a mount')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'The id of the mount to edit'
+            )->addOption(
+                'add-user',
+                '',
+                InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
+                'user to add as applicable'
+            )->addOption(
+                'remove-user',
+                '',
+                InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
+                'user to remove as applicable'
+            )->addOption(
+                'add-group',
+                '',
+                InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
+                'group to add as applicable'
+            )->addOption(
+                'remove-group',
+                '',
+                InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
+                'group to remove as applicable'
+            )->addOption(
+                'remove-all',
+                '',
+                InputOption::VALUE_NONE,
+                'Set the mount to be globally applicable'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$mountId = $input->getArgument('mount_id');
-		try {
-			$mount = $this->globalService->getStorage($mountId);
-		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts</error>');
-			return 404;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $mountId = $input->getArgument('mount_id');
+        try {
+            $mount = $this->globalService->getStorage($mountId);
+        } catch (NotFoundException $e) {
+            $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts</error>');
+            return 404;
+        }
 
-		if ($mount->getType() === StorageConfig::MOUNT_TYPE_PERSONAl) {
-			$output->writeln('<error>Can\'t change applicables on personal mounts</error>');
-			return 1;
-		}
+        if ($mount->getType() === StorageConfig::MOUNT_TYPE_PERSONAl) {
+            $output->writeln('<error>Can\'t change applicables on personal mounts</error>');
+            return 1;
+        }
 
-		$addUsers = $input->getOption('add-user');
-		$removeUsers = $input->getOption('remove-user');
-		$addGroups = $input->getOption('add-group');
-		$removeGroups = $input->getOption('remove-group');
+        $addUsers = $input->getOption('add-user');
+        $removeUsers = $input->getOption('remove-user');
+        $addGroups = $input->getOption('add-group');
+        $removeGroups = $input->getOption('remove-group');
 
-		$applicableUsers = $mount->getApplicableUsers();
-		$applicableGroups = $mount->getApplicableGroups();
+        $applicableUsers = $mount->getApplicableUsers();
+        $applicableGroups = $mount->getApplicableGroups();
 
-		if ((count($addUsers) + count($removeUsers) + count($addGroups) + count($removeGroups) > 0) || $input->getOption('remove-all')) {
-			foreach ($addUsers as $addUser) {
-				if (!$this->userManager->userExists($addUser)) {
-					$output->writeln('<error>User "' . $addUser . '" not found</error>');
-					return 404;
-				}
-			}
-			foreach ($addGroups as $addGroup) {
-				if (!$this->groupManager->groupExists($addGroup)) {
-					$output->writeln('<error>Group "' . $addGroup . '" not found</error>');
-					return 404;
-				}
-			}
+        if ((count($addUsers) + count($removeUsers) + count($addGroups) + count($removeGroups) > 0) || $input->getOption('remove-all')) {
+            foreach ($addUsers as $addUser) {
+                if (!$this->userManager->userExists($addUser)) {
+                    $output->writeln('<error>User "' . $addUser . '" not found</error>');
+                    return 404;
+                }
+            }
+            foreach ($addGroups as $addGroup) {
+                if (!$this->groupManager->groupExists($addGroup)) {
+                    $output->writeln('<error>Group "' . $addGroup . '" not found</error>');
+                    return 404;
+                }
+            }
 
-			if ($input->getOption('remove-all')) {
-				$applicableUsers = [];
-				$applicableGroups = [];
-			} else {
-				$applicableUsers = array_unique(array_merge($applicableUsers, $addUsers));
-				$applicableUsers = array_values(array_diff($applicableUsers, $removeUsers));
-				$applicableGroups = array_unique(array_merge($applicableGroups, $addGroups));
-				$applicableGroups = array_values(array_diff($applicableGroups, $removeGroups));
-			}
-			$mount->setApplicableUsers($applicableUsers);
-			$mount->setApplicableGroups($applicableGroups);
-			$this->globalService->updateStorage($mount);
-		}
+            if ($input->getOption('remove-all')) {
+                $applicableUsers = [];
+                $applicableGroups = [];
+            } else {
+                $applicableUsers = array_unique(array_merge($applicableUsers, $addUsers));
+                $applicableUsers = array_values(array_diff($applicableUsers, $removeUsers));
+                $applicableGroups = array_unique(array_merge($applicableGroups, $addGroups));
+                $applicableGroups = array_values(array_diff($applicableGroups, $removeGroups));
+            }
+            $mount->setApplicableUsers($applicableUsers);
+            $mount->setApplicableGroups($applicableGroups);
+            $this->globalService->updateStorage($mount);
+        }
 
-		$this->writeArrayInOutputFormat($input, $output, [
-			'users' => $applicableUsers,
-			'groups' => $applicableGroups
-		]);
-		return 0;
-	}
+        $this->writeArrayInOutputFormat($input, $output, [
+            'users' => $applicableUsers,
+            'groups' => $applicableGroups
+        ]);
+        return 0;
+    }
 }

apps/files_external/lib/Command/Config.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 		try {
 			$mount = $this->globalService->getStorage($mountId);
 		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
+			$output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts"</error>');
 			return 404;
 		}
 

Indentation +78 added lines, -78 removed lines

@@ -34,88 +34,88 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Config extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	protected $globalService;
+    /**
+     * @var GlobalStoragesService
+     */
+    protected $globalService;
 
-	public function __construct(GlobalStoragesService $globalService) {
-		parent::__construct();
-		$this->globalService = $globalService;
-	}
+    public function __construct(GlobalStoragesService $globalService) {
+        parent::__construct();
+        $this->globalService = $globalService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:config')
-			->setDescription('Manage backend configuration for a mount')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'The id of the mount to edit'
-			)->addArgument(
-				'key',
-				InputArgument::REQUIRED,
-				'key of the config option to set/get'
-			)->addArgument(
-				'value',
-				InputArgument::OPTIONAL,
-				'value to set the config option to, when no value is provided the existing value will be printed'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:config')
+            ->setDescription('Manage backend configuration for a mount')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'The id of the mount to edit'
+            )->addArgument(
+                'key',
+                InputArgument::REQUIRED,
+                'key of the config option to set/get'
+            )->addArgument(
+                'value',
+                InputArgument::OPTIONAL,
+                'value to set the config option to, when no value is provided the existing value will be printed'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$mountId = $input->getArgument('mount_id');
-		$key = $input->getArgument('key');
-		try {
-			$mount = $this->globalService->getStorage($mountId);
-		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
-			return 404;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $mountId = $input->getArgument('mount_id');
+        $key = $input->getArgument('key');
+        try {
+            $mount = $this->globalService->getStorage($mountId);
+        } catch (NotFoundException $e) {
+            $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
+            return 404;
+        }
 
-		$value = $input->getArgument('value');
-		if ($value !== null) {
-			$this->setOption($mount, $key, $value, $output);
-		} else {
-			$this->getOption($mount, $key, $output);
-		}
-		return 0;
-	}
+        $value = $input->getArgument('value');
+        if ($value !== null) {
+            $this->setOption($mount, $key, $value, $output);
+        } else {
+            $this->getOption($mount, $key, $output);
+        }
+        return 0;
+    }
 
-	/**
-	 * @param StorageConfig $mount
-	 * @param string $key
-	 * @param OutputInterface $output
-	 */
-	protected function getOption(StorageConfig $mount, $key, OutputInterface $output) {
-		if ($key === 'mountpoint' || $key === 'mount_point') {
-			$value = $mount->getMountPoint();
-		} else {
-			$value = $mount->getBackendOption($key);
-		}
-		if (!is_string($value) && json_decode(json_encode($value)) === $value) { // show bools and objects correctly
-			$value = json_encode($value);
-		}
-		$output->writeln($value);
-	}
+    /**
+     * @param StorageConfig $mount
+     * @param string $key
+     * @param OutputInterface $output
+     */
+    protected function getOption(StorageConfig $mount, $key, OutputInterface $output) {
+        if ($key === 'mountpoint' || $key === 'mount_point') {
+            $value = $mount->getMountPoint();
+        } else {
+            $value = $mount->getBackendOption($key);
+        }
+        if (!is_string($value) && json_decode(json_encode($value)) === $value) { // show bools and objects correctly
+            $value = json_encode($value);
+        }
+        $output->writeln($value);
+    }
 
-	/**
-	 * @param StorageConfig $mount
-	 * @param string $key
-	 * @param string $value
-	 * @param OutputInterface $output
-	 */
-	protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) {
-		$decoded = json_decode($value, true);
-		if (!is_null($decoded) && json_encode($decoded) === $value) {
-			$value = $decoded;
-		}
-		if ($key === 'mountpoint' || $key === 'mount_point') {
-			$mount->setMountPoint($value);
-		} else {
-			$mount->setBackendOption($key, $value);
-		}
-		$this->globalService->updateStorage($mount);
-	}
+    /**
+     * @param StorageConfig $mount
+     * @param string $key
+     * @param string $value
+     * @param OutputInterface $output
+     */
+    protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) {
+        $decoded = json_decode($value, true);
+        if (!is_null($decoded) && json_encode($decoded) === $value) {
+            $value = $decoded;
+        }
+        if ($key === 'mountpoint' || $key === 'mount_point') {
+            $mount->setMountPoint($value);
+        } else {
+            $mount->setBackendOption($key, $value);
+        }
+        $this->globalService->updateStorage($mount);
+    }
 }

apps/files_external/lib/Command/Option.php

Indentation +44 added lines, -44 removed lines

@@ -28,50 +28,50 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Option extends Config {
-	protected function configure() {
-		$this
-			->setName('files_external:option')
-			->setDescription('Manage mount options for a mount')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'The id of the mount to edit'
-			)->addArgument(
-				'key',
-				InputArgument::REQUIRED,
-				'key of the mount option to set/get'
-			)->addArgument(
-				'value',
-				InputArgument::OPTIONAL,
-				'value to set the mount option to, when no value is provided the existing value will be printed'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:option')
+            ->setDescription('Manage mount options for a mount')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'The id of the mount to edit'
+            )->addArgument(
+                'key',
+                InputArgument::REQUIRED,
+                'key of the mount option to set/get'
+            )->addArgument(
+                'value',
+                InputArgument::OPTIONAL,
+                'value to set the mount option to, when no value is provided the existing value will be printed'
+            );
+    }
 
-	/**
-	 * @param StorageConfig $mount
-	 * @param string $key
-	 * @param OutputInterface $output
-	 */
-	protected function getOption(StorageConfig $mount, $key, OutputInterface $output) {
-		$value = $mount->getMountOption($key);
-		if (!is_string($value)) { // show bools and objects correctly
-			$value = json_encode($value);
-		}
-		$output->writeln($value);
-	}
+    /**
+     * @param StorageConfig $mount
+     * @param string $key
+     * @param OutputInterface $output
+     */
+    protected function getOption(StorageConfig $mount, $key, OutputInterface $output) {
+        $value = $mount->getMountOption($key);
+        if (!is_string($value)) { // show bools and objects correctly
+            $value = json_encode($value);
+        }
+        $output->writeln($value);
+    }
 
-	/**
-	 * @param StorageConfig $mount
-	 * @param string $key
-	 * @param string $value
-	 * @param OutputInterface $output
-	 */
-	protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) {
-		$decoded = json_decode($value, true);
-		if (!is_null($decoded)) {
-			$value = $decoded;
-		}
-		$mount->setMountOption($key, $value);
-		$this->globalService->updateStorage($mount);
-	}
+    /**
+     * @param StorageConfig $mount
+     * @param string $key
+     * @param string $value
+     * @param OutputInterface $output
+     */
+    protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) {
+        $decoded = json_decode($value, true);
+        if (!is_null($decoded)) {
+            $value = $decoded;
+        }
+        $mount->setMountOption($key, $value);
+        $this->globalService->updateStorage($mount);
+    }
 }