nextcloud / server

apps/user_ldap/lib/LDAPProvider.php

Indentation +138 added lines, -138 removed lines

@@ -33,155 +33,155 @@
  */
 class LDAPProvider implements ILDAPProvider, IDeletionFlagSupport {
 
-	private $backend;
-	private $logger;
-	private $helper;
-	private $deletedUsersIndex;
+    private $backend;
+    private $logger;
+    private $helper;
+    private $deletedUsersIndex;
 	
-	/**
-	 * Create new LDAPProvider
-	 * @param \OCP\IServerContainer $serverContainer
-	 * @throws \Exception if user_ldap app was not enabled
-	 */
-	public function __construct(IServerContainer $serverContainer, Helper $helper, DeletedUsersIndex $deletedUsersIndex) {
-		$this->logger = $serverContainer->getLogger();
-		$this->helper = $helper;
-		$this->deletedUsersIndex = $deletedUsersIndex;
-		foreach ($serverContainer->getUserManager()->getBackends() as $backend){
-			$this->logger->debug('instance '.get_class($backend).' backend.', ['app' => 'user_ldap']);
-			if ($backend instanceof IUserLDAP) {
-				$this->backend = $backend;
-				return;
-			}
+    /**
+     * Create new LDAPProvider
+     * @param \OCP\IServerContainer $serverContainer
+     * @throws \Exception if user_ldap app was not enabled
+     */
+    public function __construct(IServerContainer $serverContainer, Helper $helper, DeletedUsersIndex $deletedUsersIndex) {
+        $this->logger = $serverContainer->getLogger();
+        $this->helper = $helper;
+        $this->deletedUsersIndex = $deletedUsersIndex;
+        foreach ($serverContainer->getUserManager()->getBackends() as $backend){
+            $this->logger->debug('instance '.get_class($backend).' backend.', ['app' => 'user_ldap']);
+            if ($backend instanceof IUserLDAP) {
+                $this->backend = $backend;
+                return;
+            }
         }
-		throw new \Exception('To use the LDAPProvider, user_ldap app must be enabled');
-	}
+        throw new \Exception('To use the LDAPProvider, user_ldap app must be enabled');
+    }
 	
-	/**
-	 * Translate an user id to LDAP DN
-	 * @param string $uid user id
-	 * @return string with the LDAP DN
-	 * @throws \Exception if translation was unsuccessful
-	 */
-	public function getUserDN($uid) {
-		if(!$this->backend->userExists($uid)){
-			throw new \Exception('User id not found in LDAP');
-		}
-		$result = $this->backend->getLDAPAccess($uid)->username2dn($uid);
-		if(!$result){
-			throw new \Exception('Translation to LDAP DN unsuccessful');
-		}
-		return $result;
-	}
+    /**
+     * Translate an user id to LDAP DN
+     * @param string $uid user id
+     * @return string with the LDAP DN
+     * @throws \Exception if translation was unsuccessful
+     */
+    public function getUserDN($uid) {
+        if(!$this->backend->userExists($uid)){
+            throw new \Exception('User id not found in LDAP');
+        }
+        $result = $this->backend->getLDAPAccess($uid)->username2dn($uid);
+        if(!$result){
+            throw new \Exception('Translation to LDAP DN unsuccessful');
+        }
+        return $result;
+    }
 	
-	/**
-	 * Translate a LDAP DN to an internal user name. If there is no mapping between 
-	 * the DN and the user name, a new one will be created.
-	 * @param string $dn LDAP DN
-	 * @return string with the internal user name
-	 * @throws \Exception if translation was unsuccessful
-	 */
-	public function getUserName($dn) {
-		$result = $this->backend->dn2UserName($dn);
-		if(!$result){
-			throw new \Exception('Translation to internal user name unsuccessful');
-		}
-		return $result;
-	}
+    /**
+     * Translate a LDAP DN to an internal user name. If there is no mapping between 
+     * the DN and the user name, a new one will be created.
+     * @param string $dn LDAP DN
+     * @return string with the internal user name
+     * @throws \Exception if translation was unsuccessful
+     */
+    public function getUserName($dn) {
+        $result = $this->backend->dn2UserName($dn);
+        if(!$result){
+            throw new \Exception('Translation to internal user name unsuccessful');
+        }
+        return $result;
+    }
 	
-	/**
-	 * Convert a stored DN so it can be used as base parameter for LDAP queries.
-	 * @param string $dn the DN in question
-	 * @return string
-	 */
-	public function DNasBaseParameter($dn) {
-		return $this->helper->DNasBaseParameter($dn);
-	}
+    /**
+     * Convert a stored DN so it can be used as base parameter for LDAP queries.
+     * @param string $dn the DN in question
+     * @return string
+     */
+    public function DNasBaseParameter($dn) {
+        return $this->helper->DNasBaseParameter($dn);
+    }
 	
-	/**
-	 * Sanitize a DN received from the LDAP server.
-	 * @param array $dn the DN in question
-	 * @return array the sanitized DN
-	 */
-	public function sanitizeDN($dn) {
-		return $this->helper->sanitizeDN($dn);
-	}
+    /**
+     * Sanitize a DN received from the LDAP server.
+     * @param array $dn the DN in question
+     * @return array the sanitized DN
+     */
+    public function sanitizeDN($dn) {
+        return $this->helper->sanitizeDN($dn);
+    }
 	
-	/**
-	 * Return a new LDAP connection resource for the specified user. 
-	 * The connection must be closed manually.
-	 * @param string $uid user id
-	 * @return resource of the LDAP connection
-	 * @throws \Exception if user id was not found in LDAP
-	 */
-	public function getLDAPConnection($uid) {
-		if(!$this->backend->userExists($uid)){
-			throw new \Exception('User id not found in LDAP');
-		}
-		return $this->backend->getNewLDAPConnection($uid);
-	}
+    /**
+     * Return a new LDAP connection resource for the specified user. 
+     * The connection must be closed manually.
+     * @param string $uid user id
+     * @return resource of the LDAP connection
+     * @throws \Exception if user id was not found in LDAP
+     */
+    public function getLDAPConnection($uid) {
+        if(!$this->backend->userExists($uid)){
+            throw new \Exception('User id not found in LDAP');
+        }
+        return $this->backend->getNewLDAPConnection($uid);
+    }
 	
-	/**
-	 * Get the LDAP base for users.
-	 * @param string $uid user id
-	 * @return string the base for users
-	 * @throws \Exception if user id was not found in LDAP
-	 */
-	public function getLDAPBaseUsers($uid) {
-		if(!$this->backend->userExists($uid)){
-			throw new \Exception('User id not found in LDAP');
-		}	
-		return $this->backend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_users'];
-	}
+    /**
+     * Get the LDAP base for users.
+     * @param string $uid user id
+     * @return string the base for users
+     * @throws \Exception if user id was not found in LDAP
+     */
+    public function getLDAPBaseUsers($uid) {
+        if(!$this->backend->userExists($uid)){
+            throw new \Exception('User id not found in LDAP');
+        }	
+        return $this->backend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_users'];
+    }
 	
-	/**
-	 * Get the LDAP base for groups.
-	 * @param string $uid user id
-	 * @return string the base for groups
-	 * @throws \Exception if user id was not found in LDAP
-	 */
-	public function getLDAPBaseGroups($uid) {
-		if(!$this->backend->userExists($uid)){
-			throw new \Exception('User id not found in LDAP');
-		}
-		return $this->backend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_groups'];
-	}
+    /**
+     * Get the LDAP base for groups.
+     * @param string $uid user id
+     * @return string the base for groups
+     * @throws \Exception if user id was not found in LDAP
+     */
+    public function getLDAPBaseGroups($uid) {
+        if(!$this->backend->userExists($uid)){
+            throw new \Exception('User id not found in LDAP');
+        }
+        return $this->backend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_groups'];
+    }
 	
-	/**
-	 * Clear the cache if a cache is used, otherwise do nothing.
-	 * @param string $uid user id
-	 * @throws \Exception if user id was not found in LDAP
-	 */
-	public function clearCache($uid) {
-		if(!$this->backend->userExists($uid)){
-			throw new \Exception('User id not found in LDAP');
-		}
-		$this->backend->getLDAPAccess($uid)->getConnection()->clearCache();
-	}
+    /**
+     * Clear the cache if a cache is used, otherwise do nothing.
+     * @param string $uid user id
+     * @throws \Exception if user id was not found in LDAP
+     */
+    public function clearCache($uid) {
+        if(!$this->backend->userExists($uid)){
+            throw new \Exception('User id not found in LDAP');
+        }
+        $this->backend->getLDAPAccess($uid)->getConnection()->clearCache();
+    }
 	
-	/**
-	 * Check whether a LDAP DN exists
-	 * @param string $dn LDAP DN
-	 * @return bool whether the DN exists
-	 */
-	public function dnExists($dn) {
-		$result = $this->backend->dn2UserName($dn);
-		return !$result ? false : true;
-	}
+    /**
+     * Check whether a LDAP DN exists
+     * @param string $dn LDAP DN
+     * @return bool whether the DN exists
+     */
+    public function dnExists($dn) {
+        $result = $this->backend->dn2UserName($dn);
+        return !$result ? false : true;
+    }
 	
-	/**
-	 * Flag record for deletion.
-	 * @param string $uid user id
-	 */
-	public function flagRecord($uid) {
-		$this->deletedUsersIndex->markUser($uid);
-	}
+    /**
+     * Flag record for deletion.
+     * @param string $uid user id
+     */
+    public function flagRecord($uid) {
+        $this->deletedUsersIndex->markUser($uid);
+    }
 	
-	/**
-	 * Unflag record for deletion.
-	 * @param string $uid user id
-	 */
-	public function unflagRecord($uid) {
-		//do nothing
-	}
+    /**
+     * Unflag record for deletion.
+     * @param string $uid user id
+     */
+    public function unflagRecord($uid) {
+        //do nothing
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -47,7 +47,7 @@ 
 		$this->logger = $serverContainer->getLogger();
 		$this->helper = $helper;
 		$this->deletedUsersIndex = $deletedUsersIndex;
-		foreach ($serverContainer->getUserManager()->getBackends() as $backend){
+		foreach ($serverContainer->getUserManager()->getBackends() as $backend) {
 			$this->logger->debug('instance '.get_class($backend).' backend.', ['app' => 'user_ldap']);
 			if ($backend instanceof IUserLDAP) {
 				$this->backend = $backend;
@@ -64,11 +64,11 @@ 
 	 * @throws \Exception if translation was unsuccessful
 	 */
 	public function getUserDN($uid) {
-		if(!$this->backend->userExists($uid)){
+		if (!$this->backend->userExists($uid)) {
 			throw new \Exception('User id not found in LDAP');
 		}
 		$result = $this->backend->getLDAPAccess($uid)->username2dn($uid);
-		if(!$result){
+		if (!$result) {
 			throw new \Exception('Translation to LDAP DN unsuccessful');
 		}
 		return $result;
@@ -83,7 +83,7 @@ 
 	 */
 	public function getUserName($dn) {
 		$result = $this->backend->dn2UserName($dn);
-		if(!$result){
+		if (!$result) {
 			throw new \Exception('Translation to internal user name unsuccessful');
 		}
 		return $result;
@@ -115,7 +115,7 @@ 
 	 * @throws \Exception if user id was not found in LDAP
 	 */
 	public function getLDAPConnection($uid) {
-		if(!$this->backend->userExists($uid)){
+		if (!$this->backend->userExists($uid)) {
 			throw new \Exception('User id not found in LDAP');
 		}
 		return $this->backend->getNewLDAPConnection($uid);
@@ -128,7 +128,7 @@ 
 	 * @throws \Exception if user id was not found in LDAP
 	 */
 	public function getLDAPBaseUsers($uid) {
-		if(!$this->backend->userExists($uid)){
+		if (!$this->backend->userExists($uid)) {
 			throw new \Exception('User id not found in LDAP');
 		}	
 		return $this->backend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_users'];
@@ -141,7 +141,7 @@ 
 	 * @throws \Exception if user id was not found in LDAP
 	 */
 	public function getLDAPBaseGroups($uid) {
-		if(!$this->backend->userExists($uid)){
+		if (!$this->backend->userExists($uid)) {
 			throw new \Exception('User id not found in LDAP');
 		}
 		return $this->backend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_groups'];
@@ -153,7 +153,7 @@ 
 	 * @throws \Exception if user id was not found in LDAP
 	 */
 	public function clearCache($uid) {
-		if(!$this->backend->userExists($uid)){
+		if (!$this->backend->userExists($uid)) {
 			throw new \Exception('User id not found in LDAP');
 		}
 		$this->backend->getLDAPAccess($uid)->getConnection()->clearCache();

apps/user_ldap/lib/LDAPProviderFactory.php

Indentation +26 added lines, -26 removed lines

@@ -28,32 +28,32 @@
 use OCA\User_LDAP\Mapping\UserMapping;
 
 class LDAPProviderFactory implements ILDAPProviderFactory {
-	/**
-	 * Server container
-	 *
-	 * @var IServerContainer
-	 */
-	private $serverContainer;
+    /**
+     * Server container
+     *
+     * @var IServerContainer
+     */
+    private $serverContainer;
 	
-	/**
-	 * Constructor for the LDAP provider factory
-	 *
-	 * @param IServerContainer $serverContainer server container
-	 */
-	public function __construct(IServerContainer $serverContainer) {
-		$this->serverContainer = $serverContainer;
-	}
+    /**
+     * Constructor for the LDAP provider factory
+     *
+     * @param IServerContainer $serverContainer server container
+     */
+    public function __construct(IServerContainer $serverContainer) {
+        $this->serverContainer = $serverContainer;
+    }
 	
-	/**
-	 * creates and returns an instance of the ILDAPProvider
-	 *
-	 * @return OCP\LDAP\ILDAPProvider
-	 */
-	public function getLDAPProvider() {
-		$dbConnection = $this->serverContainer->getDatabaseConnection();
-		$userMapping = new UserMapping($dbConnection);
-		return new LDAPProvider($this->serverContainer, new Helper($this->serverContainer->getConfig()),
-					new DeletedUsersIndex($this->serverContainer->getConfig(), 
-					$dbConnection, $userMapping));
-	}
+    /**
+     * creates and returns an instance of the ILDAPProvider
+     *
+     * @return OCP\LDAP\ILDAPProvider
+     */
+    public function getLDAPProvider() {
+        $dbConnection = $this->serverContainer->getDatabaseConnection();
+        $userMapping = new UserMapping($dbConnection);
+        return new LDAPProvider($this->serverContainer, new Helper($this->serverContainer->getConfig()),
+                    new DeletedUsersIndex($this->serverContainer->getConfig(), 
+                    $dbConnection, $userMapping));
+    }
 }

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

@@ -23,36 +23,36 @@
 
 /** @var $this \OCP\Route\IRouter */
 $this->create('user_ldap_ajax_clearMappings', 'ajax/clearMappings.php')
-	->actionInclude('user_ldap/ajax/clearMappings.php');
+    ->actionInclude('user_ldap/ajax/clearMappings.php');
 $this->create('user_ldap_ajax_deleteConfiguration', 'ajax/deleteConfiguration.php')
-	->actionInclude('user_ldap/ajax/deleteConfiguration.php');
+    ->actionInclude('user_ldap/ajax/deleteConfiguration.php');
 $this->create('user_ldap_ajax_getConfiguration', 'ajax/getConfiguration.php')
-	->actionInclude('user_ldap/ajax/getConfiguration.php');
+    ->actionInclude('user_ldap/ajax/getConfiguration.php');
 $this->create('user_ldap_ajax_getNewServerConfigPrefix', 'ajax/getNewServerConfigPrefix.php')
-	->actionInclude('user_ldap/ajax/getNewServerConfigPrefix.php');
+    ->actionInclude('user_ldap/ajax/getNewServerConfigPrefix.php');
 $this->create('user_ldap_ajax_setConfiguration', 'ajax/setConfiguration.php')
-	->actionInclude('user_ldap/ajax/setConfiguration.php');
+    ->actionInclude('user_ldap/ajax/setConfiguration.php');
 $this->create('user_ldap_ajax_testConfiguration', 'ajax/testConfiguration.php')
-	->actionInclude('user_ldap/ajax/testConfiguration.php');
+    ->actionInclude('user_ldap/ajax/testConfiguration.php');
 $this->create('user_ldap_ajax_wizard', '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'],
+    ]
 ]);
 
 $application = new OCA\User_LDAP\AppInfo\Application();
 $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/templates/list.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
 <div id="emptycontent" class="hidden">
 	<div class="icon-external"></div>
 	<h2><?php p($l->t('No external storage configured')); ?></h2>
-	<p><a href="<?php p(link_to('', 'index.php/settings/personal#files_external' )); ?>"><?php p($l->t('You can add external storages in the personal settings')); ?></a></p>
+	<p><a href="<?php p(link_to('', 'index.php/settings/personal#files_external')); ?>"><?php p($l->t('You can add external storages in the personal settings')); ?></a></p>
 </div>
 
 <input type="hidden" name="dir" value="" id="dir">
@@ -17,7 +17,7 @@ 
 		<tr>
 			<th id='headerName' class="hidden column-name">
 				<div id="headerName-container">
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
 				</div>
 			</th>
 			<th id="headerBackend" class="hidden column-backend">

apps/files_external/templates/settings.php

Switch Indentation +18 added lines, -18 removed lines

@@ -41,44 +41,44 @@
 		$is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL);
 
 		switch ($parameter->getType()) {
-		case DefinitionParameter::VALUE_PASSWORD: ?>
-			<?php if ($is_optional) { $classes[] = 'optional'; } ?>
-			<input type="password"
+		    case DefinitionParameter::VALUE_PASSWORD: ?>
+    			<?php if ($is_optional) { $classes[] = 'optional'; } ?>
+    			<input type="password"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
-				data-parameter="<?php p($parameter->getName()); ?>"
+    				data-parameter="<?php p($parameter->getName()); ?>"
 				value="<?php p($value); ?>"
 				placeholder="<?php p($placeholder); ?>"
 			/>
 			<?php
-			break;
-		case DefinitionParameter::VALUE_BOOLEAN: ?>
-			<?php $checkboxId = uniqid("checkbox_"); ?>
+			    break;
+		    case DefinitionParameter::VALUE_BOOLEAN: ?>
+    			<?php $checkboxId = uniqid("checkbox_"); ?>
 			<div>
 			<label>
 			<input type="checkbox"
 				id="<?php p($checkboxId); ?>"
 				<?php if (!empty($classes)): ?> class="checkbox <?php p(implode(' ', $classes)); ?>"<?php endif; ?>
-				data-parameter="<?php p($parameter->getName()); ?>"
+    				data-parameter="<?php p($parameter->getName()); ?>"
 				<?php if ($value === true): ?> checked="checked"<?php endif; ?>
-			/>
+    			/>
 			<?php p($placeholder); ?>
 			</label>
 			</div>
 			<?php
-			break;
-		case DefinitionParameter::VALUE_HIDDEN: ?>
-			<input type="hidden"
+			    break;
+		    case DefinitionParameter::VALUE_HIDDEN: ?>
+    			<input type="hidden"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
-				data-parameter="<?php p($parameter->getName()); ?>"
+    				data-parameter="<?php p($parameter->getName()); ?>"
 				value="<?php p($value); ?>"
 			/>
 			<?php
-			break;
-		default: ?>
-			<?php if ($is_optional) { $classes[] = 'optional'; } ?>
-			<input type="text"
+			    break;
+		    default: ?>
+    			<?php if ($is_optional) { $classes[] = 'optional'; } ?>
+    			<input type="text"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
-				data-parameter="<?php p($parameter->getName()); ?>"
+    				data-parameter="<?php p($parameter->getName()); ?>"
 				value="<?php p($value); ?>"
 				placeholder="<?php p($placeholder); ?>"
 			/>

Indentation +56 added lines, -56 removed lines

@@ -1,47 +1,47 @@ 
 <?php
-	use \OCA\Files_External\Lib\Backend\Backend;
-	use \OCA\Files_External\Lib\Auth\AuthMechanism;
-	use \OCA\Files_External\Lib\DefinitionParameter;
-	use \OCA\Files_External\Service\BackendService;
+    use \OCA\Files_External\Lib\Backend\Backend;
+    use \OCA\Files_External\Lib\Auth\AuthMechanism;
+    use \OCA\Files_External\Lib\DefinitionParameter;
+    use \OCA\Files_External\Service\BackendService;
 
-	$canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN || $_['allowUserMounting'];
+    $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN || $_['allowUserMounting'];
 
-	$l->t("Enable encryption");
-	$l->t("Enable previews");
-	$l->t("Enable sharing");
-	$l->t("Check for changes");
-	$l->t("Never");
-	$l->t("Once every direct access");
+    $l->t("Enable encryption");
+    $l->t("Enable previews");
+    $l->t("Enable sharing");
+    $l->t("Check for changes");
+    $l->t("Never");
+    $l->t("Once every direct access");
 
-	script('files_external', 'settings');
-	style('files_external', 'settings');
+    script('files_external', 'settings');
+    style('files_external', 'settings');
 
-	// load custom JS
-	foreach ($_['backends'] as $backend) {
-		/** @var Backend $backend */
-		$scripts = $backend->getCustomJs();
-		foreach ($scripts as $script) {
-			script('files_external', $script);
-		}
-	}
-	foreach ($_['authMechanisms'] as $authMechanism) {
-		/** @var AuthMechanism $authMechanism */
-		$scripts = $authMechanism->getCustomJs();
-		foreach ($scripts as $script) {
-			script('files_external', $script);
-		}
-	}
+    // load custom JS
+    foreach ($_['backends'] as $backend) {
+        /** @var Backend $backend */
+        $scripts = $backend->getCustomJs();
+        foreach ($scripts as $script) {
+            script('files_external', $script);
+        }
+    }
+    foreach ($_['authMechanisms'] as $authMechanism) {
+        /** @var AuthMechanism $authMechanism */
+        $scripts = $authMechanism->getCustomJs();
+        foreach ($scripts as $script) {
+            script('files_external', $script);
+        }
+    }
 
-	function writeParameterInput($parameter, $options, $classes = []) {
-		$value = '';
-		if (isset($options[$parameter->getName()])) {
-			$value = $options[$parameter->getName()];
-		}
-		$placeholder = $parameter->getText();
-		$is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL);
+    function writeParameterInput($parameter, $options, $classes = []) {
+        $value = '';
+        if (isset($options[$parameter->getName()])) {
+            $value = $options[$parameter->getName()];
+        }
+        $placeholder = $parameter->getText();
+        $is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL);
 
-		switch ($parameter->getType()) {
-		case DefinitionParameter::VALUE_PASSWORD: ?>
+        switch ($parameter->getType()) {
+        case DefinitionParameter::VALUE_PASSWORD: ?>
 			<?php if ($is_optional) { $classes[] = 'optional'; } ?>
 			<input type="password"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
@@ -50,8 +50,8 @@ 
 				placeholder="<?php p($placeholder); ?>"
 			/>
 			<?php
-			break;
-		case DefinitionParameter::VALUE_BOOLEAN: ?>
+            break;
+        case DefinitionParameter::VALUE_BOOLEAN: ?>
 			<?php $checkboxId = uniqid("checkbox_"); ?>
 			<div>
 			<label>
@@ -65,16 +65,16 @@ 
 			</label>
 			</div>
 			<?php
-			break;
-		case DefinitionParameter::VALUE_HIDDEN: ?>
+            break;
+        case DefinitionParameter::VALUE_HIDDEN: ?>
 			<input type="hidden"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
 				data-parameter="<?php p($parameter->getName()); ?>"
 				value="<?php p($value); ?>"
 			/>
 			<?php
-			break;
-		default: ?>
+            break;
+        default: ?>
 			<?php if ($is_optional) { $classes[] = 'optional'; } ?>
 			<input type="text"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
@@ -83,8 +83,8 @@ 
 				placeholder="<?php p($placeholder); ?>"
 			/>
 			<?php
-		}
-	}
+        }
+    }
 ?>
 
 <form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
@@ -122,13 +122,13 @@ 
 							<?php p($l->t('Add storage')); ?>
 						</option>
 						<?php
-							$sortedBackends = array_filter($_['backends'], function($backend) use ($_) {
-								return $backend->isVisibleFor($_['visibilityType']);
-							});
-							uasort($sortedBackends, function($a, $b) {
-								return strcasecmp($a->getText(), $b->getText());
-							});
-						?>
+                            $sortedBackends = array_filter($_['backends'], function($backend) use ($_) {
+                                return $backend->isVisibleFor($_['visibilityType']);
+                            });
+                            uasort($sortedBackends, function($a, $b) {
+                                return strcasecmp($a->getText(), $b->getText());
+                            });
+                        ?>
 						<?php foreach ($sortedBackends as $backend): ?>
 							<?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?>
 							<option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option>
@@ -175,10 +175,10 @@ 
 		<p id="userMountingBackends"<?php if ($_['allowUserMounting'] !== 'yes'): ?> class="hidden"<?php endif; ?>>
 			<?php p($l->t('Allow users to mount the following external storage')); ?><br />
 			<?php
-				$userBackends = array_filter($_['backends'], function($backend) {
-					return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL);
-				});
-			?>
+                $userBackends = array_filter($_['backends'], function($backend) {
+                    return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL);
+                });
+            ?>
 			<?php $i = 0; foreach ($userBackends as $backend): ?>
 				<?php if ($deprecateTo = $backend->getDeprecateTo()): ?>
 					<input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" />

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
 	}
 ?>
 
-<form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
+<form data-can-create="<?php echo $canCreateMounts ? 'true' : 'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled'] ? 'true' : 'false'; ?>">
 	<h2 data-anchor-name="external-storage"><?php p($l->t('External storages')); ?></h2>
 	<?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) print_unescaped(''.$_['dependencies'].''); ?>
 	<table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'>

Braces +24 added lines, -6 removed lines

@@ -89,7 +89,10 @@ 
 
 <form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
 	<h2 data-anchor-name="external-storage"><?php p($l->t('External storages')); ?></h2>
-	<?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) print_unescaped(''.$_['dependencies'].''); ?>
+	<?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) {
+    print_unescaped(''.$_['dependencies'].'');
+}
+?>
 	<table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'>
 		<thead>
 			<tr>
@@ -98,7 +101,10 @@ 
 				<th><?php p($l->t('External storage')); ?></th>
 				<th><?php p($l->t('Authentication')); ?></th>
 				<th><?php p($l->t('Configuration')); ?></th>
-				<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) print_unescaped('<th>'.$l->t('Available for').'</th>'); ?>
+				<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) {
+    print_unescaped('<th>'.$l->t('Available for').'</th>');
+}
+?>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 			</tr>
@@ -130,7 +136,10 @@ 
 							});
 						?>
 						<?php foreach ($sortedBackends as $backend): ?>
-							<?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?>
+							<?php if ($backend->getDeprecateTo()) {
+    continue;
+}
+// ignore deprecated backends ?>
 							<option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option>
 						<?php endforeach; ?>
 					</select>
@@ -169,7 +178,10 @@ 
 
 	<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN): ?>
 		<input type="checkbox" name="allowUserMounting" id="allowUserMounting" class="checkbox"
-			value="1" <?php if ($_['allowUserMounting'] === 'yes') print_unescaped(' checked="checked"'); ?> />
+			value="1" <?php if ($_['allowUserMounting'] === 'yes') {
+    print_unescaped(' checked="checked"');
+}
+?> />
 		<label for="allowUserMounting"><?php p($l->t('Allow users to mount external storage')); ?></label> <span id="userMountingMsg" class="msg"></span>
 
 		<p id="userMountingBackends"<?php if ($_['allowUserMounting'] !== 'yes'): ?> class="hidden"<?php endif; ?>>
@@ -182,8 +194,14 @@ 
 			<?php $i = 0; foreach ($userBackends as $backend): ?>
 				<?php if ($deprecateTo = $backend->getDeprecateTo()): ?>
 					<input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" />
-				<?php else: ?>
-					<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) print_unescaped(' checked="checked"'); ?> />
+				<?php else {
+    : ?>
+					<input type="checkbox" id="allowUserMountingBackends<?php p($i);
+}
+?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) {
+    print_unescaped(' checked="checked"');
+}
+?> />
 					<label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br />
 				<?php endif; ?>
 				<?php $i++; ?>

apps/files_external/ajax/applicable.php

Indentation +5 added lines, -5 removed lines

@@ -30,23 +30,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->getGID();
+    $groups[$group->getGID()] = $group->getGID();
 }
 
 $users = [];
 foreach (\OC::$server->getUserManager()->searchDisplayName($pattern, $limit, $offset) as $user) {
-	$users[$user->getUID()] = $user->getDisplayName();
+    $users[$user->getUID()] = $user->getDisplayName();
 }
 
 $results = array('groups' => $groups, 'users' => $users);

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 = [];

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/UserGlobalStoragesService.php

Indentation +163 added lines, -163 removed lines

@@ -34,167 +34,167 @@
  */
 class UserGlobalStoragesService extends GlobalStoragesService {
 
-	use UserTrait;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/**
-	 * @param BackendService $backendService
-	 * @param DBConfigService $dbConfig
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param IUserMountCache $userMountCache
-	 */
-	public function __construct(
-		BackendService $backendService,
-		DBConfigService $dbConfig,
-		IUserSession $userSession,
-		IGroupManager $groupManager,
-		IUserMountCache $userMountCache
-	) {
-		parent::__construct($backendService, $dbConfig, $userMountCache);
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-	}
-
-	/**
-	 * Replace config hash ID with real IDs, for migrating legacy storages
-	 *
-	 * @param StorageConfig[] $storages Storages with real IDs
-	 * @param StorageConfig[] $storagesWithConfigHash Storages with config hash IDs
-	 */
-	protected function setRealStorageIds(array &$storages, array $storagesWithConfigHash) {
-		// as a read-only view, storage IDs don't need to be real
-		foreach ($storagesWithConfigHash as $storage) {
-			$storages[$storage->getId()] = $storage;
-		}
-	}
-
-	protected function readDBConfig() {
-		$userMounts = $this->dbConfig->getAdminMountsFor(DBConfigService::APPLICABLE_TYPE_USER, $this->getUser()->getUID());
-		$globalMounts = $this->dbConfig->getAdminMountsFor(DBConfigService::APPLICABLE_TYPE_GLOBAL, null);
-		$groups = $this->groupManager->getUserGroupIds($this->getUser());
-		if (is_array($groups) && count($groups) !== 0) {
-			$groupMounts = $this->dbConfig->getAdminMountsForMultiple(DBConfigService::APPLICABLE_TYPE_GROUP, $groups);
-		} else {
-			$groupMounts = [];
-		}
-		return array_merge($userMounts, $groupMounts, $globalMounts);
-	}
-
-	public function addStorage(StorageConfig $newStorage) {
-		throw new \DomainException('UserGlobalStoragesService writing disallowed');
-	}
-
-	public function updateStorage(StorageConfig $updatedStorage) {
-		throw new \DomainException('UserGlobalStoragesService writing disallowed');
-	}
-
-	/**
-	 * @param integer $id
-	 */
-	public function removeStorage($id) {
-		throw new \DomainException('UserGlobalStoragesService writing disallowed');
-	}
-
-	/**
-	 * Get unique storages, in case two are defined with the same mountpoint
-	 * Higher priority storages take precedence
-	 *
-	 * @return StorageConfig[]
-	 */
-	public function getUniqueStorages() {
-		$storages = $this->getStorages();
-
-		$storagesByMountpoint = [];
-		foreach ($storages as $storage) {
-			$storagesByMountpoint[$storage->getMountPoint()][] = $storage;
-		}
-
-		$result = [];
-		foreach ($storagesByMountpoint as $storageList) {
-			$storage = array_reduce($storageList, function ($carry, $item) {
-				if (isset($carry)) {
-					$carryPriorityType = $this->getPriorityType($carry);
-					$itemPriorityType = $this->getPriorityType($item);
-					if ($carryPriorityType > $itemPriorityType) {
-						return $carry;
-					} elseif ($carryPriorityType === $itemPriorityType) {
-						if ($carry->getPriority() > $item->getPriority()) {
-							return $carry;
-						}
-					}
-				}
-				return $item;
-			});
-			$result[$storage->getID()] = $storage;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Get a priority 'type', where a bigger number means higher priority
-	 * user applicable > group applicable > 'all'
-	 *
-	 * @param StorageConfig $storage
-	 * @return int
-	 */
-	protected function getPriorityType(StorageConfig $storage) {
-		$applicableUsers = $storage->getApplicableUsers();
-		$applicableGroups = $storage->getApplicableGroups();
-
-		if ($applicableUsers && $applicableUsers[0] !== 'all') {
-			return 2;
-		}
-		if ($applicableGroups) {
-			return 1;
-		}
-		return 0;
-	}
-
-	protected function isApplicable(StorageConfig $config) {
-		$applicableUsers = $config->getApplicableUsers();
-		$applicableGroups = $config->getApplicableGroups();
-
-		if (count($applicableUsers) === 0 && count($applicableGroups) === 0) {
-			return true;
-		}
-		if (in_array($this->getUser()->getUID(), $applicableUsers, true)) {
-			return true;
-		}
-		$groupIds = $this->groupManager->getUserGroupIds($this->getUser());
-		foreach ($groupIds as $groupId) {
-			if (in_array($groupId, $applicableGroups, true)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-
-	/**
-	 * Gets all storages for the user, admin, personal, global, etc
-	 *
-	 * @return StorageConfig[] array of storage configs
-	 */
-	public function getAllStoragesForUser() {
-		if (is_null($this->getUser())) {
-			return [];
-		}
-		$groupIds = $this->groupManager->getUserGroupIds($this->getUser());
-		$mounts = $this->dbConfig->getMountsForUser($this->getUser()->getUID(), $groupIds);
-		$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);
-
-		$storages = array_combine($keys, $configs);
-		return array_filter($storages, [$this, 'validateStorage']);
-	}
+    use UserTrait;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /**
+     * @param BackendService $backendService
+     * @param DBConfigService $dbConfig
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     * @param IUserMountCache $userMountCache
+     */
+    public function __construct(
+        BackendService $backendService,
+        DBConfigService $dbConfig,
+        IUserSession $userSession,
+        IGroupManager $groupManager,
+        IUserMountCache $userMountCache
+    ) {
+        parent::__construct($backendService, $dbConfig, $userMountCache);
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+    }
+
+    /**
+     * Replace config hash ID with real IDs, for migrating legacy storages
+     *
+     * @param StorageConfig[] $storages Storages with real IDs
+     * @param StorageConfig[] $storagesWithConfigHash Storages with config hash IDs
+     */
+    protected function setRealStorageIds(array &$storages, array $storagesWithConfigHash) {
+        // as a read-only view, storage IDs don't need to be real
+        foreach ($storagesWithConfigHash as $storage) {
+            $storages[$storage->getId()] = $storage;
+        }
+    }
+
+    protected function readDBConfig() {
+        $userMounts = $this->dbConfig->getAdminMountsFor(DBConfigService::APPLICABLE_TYPE_USER, $this->getUser()->getUID());
+        $globalMounts = $this->dbConfig->getAdminMountsFor(DBConfigService::APPLICABLE_TYPE_GLOBAL, null);
+        $groups = $this->groupManager->getUserGroupIds($this->getUser());
+        if (is_array($groups) && count($groups) !== 0) {
+            $groupMounts = $this->dbConfig->getAdminMountsForMultiple(DBConfigService::APPLICABLE_TYPE_GROUP, $groups);
+        } else {
+            $groupMounts = [];
+        }
+        return array_merge($userMounts, $groupMounts, $globalMounts);
+    }
+
+    public function addStorage(StorageConfig $newStorage) {
+        throw new \DomainException('UserGlobalStoragesService writing disallowed');
+    }
+
+    public function updateStorage(StorageConfig $updatedStorage) {
+        throw new \DomainException('UserGlobalStoragesService writing disallowed');
+    }
+
+    /**
+     * @param integer $id
+     */
+    public function removeStorage($id) {
+        throw new \DomainException('UserGlobalStoragesService writing disallowed');
+    }
+
+    /**
+     * Get unique storages, in case two are defined with the same mountpoint
+     * Higher priority storages take precedence
+     *
+     * @return StorageConfig[]
+     */
+    public function getUniqueStorages() {
+        $storages = $this->getStorages();
+
+        $storagesByMountpoint = [];
+        foreach ($storages as $storage) {
+            $storagesByMountpoint[$storage->getMountPoint()][] = $storage;
+        }
+
+        $result = [];
+        foreach ($storagesByMountpoint as $storageList) {
+            $storage = array_reduce($storageList, function ($carry, $item) {
+                if (isset($carry)) {
+                    $carryPriorityType = $this->getPriorityType($carry);
+                    $itemPriorityType = $this->getPriorityType($item);
+                    if ($carryPriorityType > $itemPriorityType) {
+                        return $carry;
+                    } elseif ($carryPriorityType === $itemPriorityType) {
+                        if ($carry->getPriority() > $item->getPriority()) {
+                            return $carry;
+                        }
+                    }
+                }
+                return $item;
+            });
+            $result[$storage->getID()] = $storage;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get a priority 'type', where a bigger number means higher priority
+     * user applicable > group applicable > 'all'
+     *
+     * @param StorageConfig $storage
+     * @return int
+     */
+    protected function getPriorityType(StorageConfig $storage) {
+        $applicableUsers = $storage->getApplicableUsers();
+        $applicableGroups = $storage->getApplicableGroups();
+
+        if ($applicableUsers && $applicableUsers[0] !== 'all') {
+            return 2;
+        }
+        if ($applicableGroups) {
+            return 1;
+        }
+        return 0;
+    }
+
+    protected function isApplicable(StorageConfig $config) {
+        $applicableUsers = $config->getApplicableUsers();
+        $applicableGroups = $config->getApplicableGroups();
+
+        if (count($applicableUsers) === 0 && count($applicableGroups) === 0) {
+            return true;
+        }
+        if (in_array($this->getUser()->getUID(), $applicableUsers, true)) {
+            return true;
+        }
+        $groupIds = $this->groupManager->getUserGroupIds($this->getUser());
+        foreach ($groupIds as $groupId) {
+            if (in_array($groupId, $applicableGroups, true)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    /**
+     * Gets all storages for the user, admin, personal, global, etc
+     *
+     * @return StorageConfig[] array of storage configs
+     */
+    public function getAllStoragesForUser() {
+        if (is_null($this->getUser())) {
+            return [];
+        }
+        $groupIds = $this->groupManager->getUserGroupIds($this->getUser());
+        $mounts = $this->dbConfig->getMountsForUser($this->getUser()->getUID(), $groupIds);
+        $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);
+
+        $storages = array_combine($keys, $configs);
+        return array_filter($storages, [$this, 'validateStorage']);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -114,7 +114,7 @@ 
 
 		$result = [];
 		foreach ($storagesByMountpoint as $storageList) {
-			$storage = array_reduce($storageList, function ($carry, $item) {
+			$storage = array_reduce($storageList, function($carry, $item) {
 				if (isset($carry)) {
 					$carryPriorityType = $this->getPriorityType($carry);
 					$itemPriorityType = $this->getPriorityType($item);
@@ -186,11 +186,11 @@ 
 		$groupIds = $this->groupManager->getUserGroupIds($this->getUser());
 		$mounts = $this->dbConfig->getMountsForUser($this->getUser()->getUID(), $groupIds);
 		$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);
 

apps/files_external/lib/Service/BackendService.php

Indentation +245 added lines, -245 removed lines

@@ -35,249 +35,249 @@
  */
 class BackendService {
 
-	/** Visibility constants for VisibilityTrait */
-	const VISIBILITY_NONE = 0;
-	const VISIBILITY_PERSONAL = 1;
-	const VISIBILITY_ADMIN = 2;
-	//const VISIBILITY_ALIENS = 4;
-
-	const VISIBILITY_DEFAULT = 3; // PERSONAL | ADMIN
-
-	/** Priority constants for PriorityTrait */
-	const PRIORITY_DEFAULT = 100;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var bool */
-	private $userMountingAllowed = true;
-
-	/** @var string[] */
-	private $userMountingBackends = [];
-
-	/** @var Backend[] */
-	private $backends = [];
-
-	/** @var IBackendProvider[] */
-	private $backendProviders = [];
-
-	/** @var AuthMechanism[] */
-	private $authMechanisms = [];
-
-	/** @var IAuthMechanismProvider[] */
-	private $authMechanismProviders = [];
-
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(
-		IConfig $config
-	) {
-		$this->config = $config;
-
-		// Load config values
-		if ($this->config->getAppValue('files_external', 'allow_user_mounting', 'yes') !== 'yes') {
-			$this->userMountingAllowed = false;
-		}
-		$this->userMountingBackends = explode(',',
-			$this->config->getAppValue('files_external', 'user_mounting_backends', '')
-		);
-
-		// if no backend is in the list an empty string is in the array and user mounting is disabled
-		if ($this->userMountingBackends === ['']) {
-			$this->userMountingAllowed = false;
-		}
-	}
-
-	/**
-	 * Register a backend provider
-	 *
-	 * @since 9.1.0
-	 * @param IBackendProvider $provider
-	 */
-	public function registerBackendProvider(IBackendProvider $provider) {
-		$this->backendProviders[] = $provider;
-	}
-
-	private function loadBackendProviders() {
-		foreach ($this->backendProviders as $provider) {
-			$this->registerBackends($provider->getBackends());
-		}
-		$this->backendProviders = [];
-	}
-
-	/**
-	 * Register an auth mechanism provider
-	 *
-	 * @since 9.1.0
-	 * @param IAuthMechanismProvider $provider
-	 */
-	public function registerAuthMechanismProvider(IAuthMechanismProvider $provider) {
-		$this->authMechanismProviders[] = $provider;
-	}
-
-	private function loadAuthMechanismProviders() {
-		foreach ($this->authMechanismProviders as $provider) {
-			$this->registerAuthMechanisms($provider->getAuthMechanisms());
-		}
-		$this->authMechanismProviders = [];
-	}
-
-	/**
-	 * Register a backend
-	 *
-	 * @deprecated 9.1.0 use registerBackendProvider()
-	 * @param Backend $backend
-	 */
-	public function registerBackend(Backend $backend) {
-		if (!$this->isAllowedUserBackend($backend)) {
-			$backend->removeVisibility(BackendService::VISIBILITY_PERSONAL);
-		}
-		foreach ($backend->getIdentifierAliases() as $alias) {
-			$this->backends[$alias] = $backend;
-		}
-	}
-
-	/**
-	 * @deprecated 9.1.0 use registerBackendProvider()
-	 * @param Backend[] $backends
-	 */
-	public function registerBackends(array $backends) {
-		foreach ($backends as $backend) {
-			$this->registerBackend($backend);
-		}
-	}
-	/**
-	 * Register an authentication mechanism
-	 *
-	 * @deprecated 9.1.0 use registerAuthMechanismProvider()
-	 * @param AuthMechanism $authMech
-	 */
-	public function registerAuthMechanism(AuthMechanism $authMech) {
-		if (!$this->isAllowedAuthMechanism($authMech)) {
-			$authMech->removeVisibility(BackendService::VISIBILITY_PERSONAL);
-		}
-		foreach ($authMech->getIdentifierAliases() as $alias) {
-			$this->authMechanisms[$alias] = $authMech;
-		}
-	}
-
-	/**
-	 * @deprecated 9.1.0 use registerAuthMechanismProvider()
-	 * @param AuthMechanism[] $mechanisms
-	 */
-	public function registerAuthMechanisms(array $mechanisms) {
-		foreach ($mechanisms as $mechanism) {
-			$this->registerAuthMechanism($mechanism);
-		}
-	}
-
-	/**
-	 * Get all backends
-	 *
-	 * @return Backend[]
-	 */
-	public function getBackends() {
-		$this->loadBackendProviders();
-		// only return real identifiers, no aliases
-		$backends = [];
-		foreach ($this->backends as $backend) {
-			$backends[$backend->getIdentifier()] = $backend;
-		}
-		return $backends;
-	}
-
-	/**
-	 * Get all available backends
-	 *
-	 * @return Backend[]
-	 */
-	public function getAvailableBackends() {
-		return array_filter($this->getBackends(), function($backend) {
-			return !($backend->checkDependencies());
-		});
-	}
-
-	/**
-	 * @param string $identifier
-	 * @return Backend|null
-	 */
-	public function getBackend($identifier) {
-		$this->loadBackendProviders();
-		if (isset($this->backends[$identifier])) {
-			return $this->backends[$identifier];
-		}
-		return null;
-	}
-
-	/**
-	 * Get all authentication mechanisms
-	 *
-	 * @return AuthMechanism[]
-	 */
-	public function getAuthMechanisms() {
-		$this->loadAuthMechanismProviders();
-		// only return real identifiers, no aliases
-		$mechanisms = [];
-		foreach ($this->authMechanisms as $mechanism) {
-			$mechanisms[$mechanism->getIdentifier()] = $mechanism;
-		}
-		return $mechanisms;
-	}
-
-	/**
-	 * Get all authentication mechanisms for schemes
-	 *
-	 * @param string[] $schemes
-	 * @return AuthMechanism[]
-	 */
-	public function getAuthMechanismsByScheme(array $schemes) {
-		return array_filter($this->getAuthMechanisms(), function($authMech) use ($schemes) {
-			return in_array($authMech->getScheme(), $schemes, true);
-		});
-	}
-
-	/**
-	 * @param string $identifier
-	 * @return AuthMechanism|null
-	 */
-	public function getAuthMechanism($identifier) {
-		$this->loadAuthMechanismProviders();
-		if (isset($this->authMechanisms[$identifier])) {
-			return $this->authMechanisms[$identifier];
-		}
-		return null;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isUserMountingAllowed() {
-		return $this->userMountingAllowed;
-	}
-
-	/**
-	 * Check a backend if a user is allowed to mount it
-	 *
-	 * @param Backend $backend
-	 * @return bool
-	 */
-	protected function isAllowedUserBackend(Backend $backend) {
-		if ($this->userMountingAllowed &&
-			array_intersect($backend->getIdentifierAliases(), $this->userMountingBackends)
-		) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Check an authentication mechanism if a user is allowed to use it
-	 *
-	 * @param AuthMechanism $authMechanism
-	 * @return bool
-	 */
-	protected function isAllowedAuthMechanism(AuthMechanism $authMechanism) {
-		return true; // not implemented
-	}
+    /** Visibility constants for VisibilityTrait */
+    const VISIBILITY_NONE = 0;
+    const VISIBILITY_PERSONAL = 1;
+    const VISIBILITY_ADMIN = 2;
+    //const VISIBILITY_ALIENS = 4;
+
+    const VISIBILITY_DEFAULT = 3; // PERSONAL | ADMIN
+
+    /** Priority constants for PriorityTrait */
+    const PRIORITY_DEFAULT = 100;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var bool */
+    private $userMountingAllowed = true;
+
+    /** @var string[] */
+    private $userMountingBackends = [];
+
+    /** @var Backend[] */
+    private $backends = [];
+
+    /** @var IBackendProvider[] */
+    private $backendProviders = [];
+
+    /** @var AuthMechanism[] */
+    private $authMechanisms = [];
+
+    /** @var IAuthMechanismProvider[] */
+    private $authMechanismProviders = [];
+
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(
+        IConfig $config
+    ) {
+        $this->config = $config;
+
+        // Load config values
+        if ($this->config->getAppValue('files_external', 'allow_user_mounting', 'yes') !== 'yes') {
+            $this->userMountingAllowed = false;
+        }
+        $this->userMountingBackends = explode(',',
+            $this->config->getAppValue('files_external', 'user_mounting_backends', '')
+        );
+
+        // if no backend is in the list an empty string is in the array and user mounting is disabled
+        if ($this->userMountingBackends === ['']) {
+            $this->userMountingAllowed = false;
+        }
+    }
+
+    /**
+     * Register a backend provider
+     *
+     * @since 9.1.0
+     * @param IBackendProvider $provider
+     */
+    public function registerBackendProvider(IBackendProvider $provider) {
+        $this->backendProviders[] = $provider;
+    }
+
+    private function loadBackendProviders() {
+        foreach ($this->backendProviders as $provider) {
+            $this->registerBackends($provider->getBackends());
+        }
+        $this->backendProviders = [];
+    }
+
+    /**
+     * Register an auth mechanism provider
+     *
+     * @since 9.1.0
+     * @param IAuthMechanismProvider $provider
+     */
+    public function registerAuthMechanismProvider(IAuthMechanismProvider $provider) {
+        $this->authMechanismProviders[] = $provider;
+    }
+
+    private function loadAuthMechanismProviders() {
+        foreach ($this->authMechanismProviders as $provider) {
+            $this->registerAuthMechanisms($provider->getAuthMechanisms());
+        }
+        $this->authMechanismProviders = [];
+    }
+
+    /**
+     * Register a backend
+     *
+     * @deprecated 9.1.0 use registerBackendProvider()
+     * @param Backend $backend
+     */
+    public function registerBackend(Backend $backend) {
+        if (!$this->isAllowedUserBackend($backend)) {
+            $backend->removeVisibility(BackendService::VISIBILITY_PERSONAL);
+        }
+        foreach ($backend->getIdentifierAliases() as $alias) {
+            $this->backends[$alias] = $backend;
+        }
+    }
+
+    /**
+     * @deprecated 9.1.0 use registerBackendProvider()
+     * @param Backend[] $backends
+     */
+    public function registerBackends(array $backends) {
+        foreach ($backends as $backend) {
+            $this->registerBackend($backend);
+        }
+    }
+    /**
+     * Register an authentication mechanism
+     *
+     * @deprecated 9.1.0 use registerAuthMechanismProvider()
+     * @param AuthMechanism $authMech
+     */
+    public function registerAuthMechanism(AuthMechanism $authMech) {
+        if (!$this->isAllowedAuthMechanism($authMech)) {
+            $authMech->removeVisibility(BackendService::VISIBILITY_PERSONAL);
+        }
+        foreach ($authMech->getIdentifierAliases() as $alias) {
+            $this->authMechanisms[$alias] = $authMech;
+        }
+    }
+
+    /**
+     * @deprecated 9.1.0 use registerAuthMechanismProvider()
+     * @param AuthMechanism[] $mechanisms
+     */
+    public function registerAuthMechanisms(array $mechanisms) {
+        foreach ($mechanisms as $mechanism) {
+            $this->registerAuthMechanism($mechanism);
+        }
+    }
+
+    /**
+     * Get all backends
+     *
+     * @return Backend[]
+     */
+    public function getBackends() {
+        $this->loadBackendProviders();
+        // only return real identifiers, no aliases
+        $backends = [];
+        foreach ($this->backends as $backend) {
+            $backends[$backend->getIdentifier()] = $backend;
+        }
+        return $backends;
+    }
+
+    /**
+     * Get all available backends
+     *
+     * @return Backend[]
+     */
+    public function getAvailableBackends() {
+        return array_filter($this->getBackends(), function($backend) {
+            return !($backend->checkDependencies());
+        });
+    }
+
+    /**
+     * @param string $identifier
+     * @return Backend|null
+     */
+    public function getBackend($identifier) {
+        $this->loadBackendProviders();
+        if (isset($this->backends[$identifier])) {
+            return $this->backends[$identifier];
+        }
+        return null;
+    }
+
+    /**
+     * Get all authentication mechanisms
+     *
+     * @return AuthMechanism[]
+     */
+    public function getAuthMechanisms() {
+        $this->loadAuthMechanismProviders();
+        // only return real identifiers, no aliases
+        $mechanisms = [];
+        foreach ($this->authMechanisms as $mechanism) {
+            $mechanisms[$mechanism->getIdentifier()] = $mechanism;
+        }
+        return $mechanisms;
+    }
+
+    /**
+     * Get all authentication mechanisms for schemes
+     *
+     * @param string[] $schemes
+     * @return AuthMechanism[]
+     */
+    public function getAuthMechanismsByScheme(array $schemes) {
+        return array_filter($this->getAuthMechanisms(), function($authMech) use ($schemes) {
+            return in_array($authMech->getScheme(), $schemes, true);
+        });
+    }
+
+    /**
+     * @param string $identifier
+     * @return AuthMechanism|null
+     */
+    public function getAuthMechanism($identifier) {
+        $this->loadAuthMechanismProviders();
+        if (isset($this->authMechanisms[$identifier])) {
+            return $this->authMechanisms[$identifier];
+        }
+        return null;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isUserMountingAllowed() {
+        return $this->userMountingAllowed;
+    }
+
+    /**
+     * Check a backend if a user is allowed to mount it
+     *
+     * @param Backend $backend
+     * @return bool
+     */
+    protected function isAllowedUserBackend(Backend $backend) {
+        if ($this->userMountingAllowed &&
+            array_intersect($backend->getIdentifierAliases(), $this->userMountingBackends)
+        ) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Check an authentication mechanism if a user is allowed to use it
+     *
+     * @param AuthMechanism $authMechanism
+     * @return bool
+     */
+    protected function isAllowedAuthMechanism(AuthMechanism $authMechanism) {
+        return true; // not implemented
+    }
 }