nextcloud / server

lib/private/Diagnostics/Query.php

Indentation +49 added lines, -49 removed lines

@@ -26,65 +26,65 @@
 use OCP\Diagnostics\IQuery;
 
 class Query implements IQuery {
-	private $sql;
+    private $sql;
 
-	private $params;
+    private $params;
 
-	private $start;
+    private $start;
 
-	private $end;
+    private $end;
 
-	private $stack;
+    private $stack;
 
-	/**
-	 * @param string $sql
-	 * @param array $params
-	 * @param int $start
-	 */
-	public function __construct($sql, $params, $start, array $stack) {
-		$this->sql = $sql;
-		$this->params = $params;
-		$this->start = $start;
-		$this->stack = $stack;
-	}
+    /**
+     * @param string $sql
+     * @param array $params
+     * @param int $start
+     */
+    public function __construct($sql, $params, $start, array $stack) {
+        $this->sql = $sql;
+        $this->params = $params;
+        $this->start = $start;
+        $this->stack = $stack;
+    }
 
-	public function end($time) {
-		$this->end = $time;
-	}
+    public function end($time) {
+        $this->end = $time;
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getParams() {
-		return $this->params;
-	}
+    /**
+     * @return array
+     */
+    public function getParams() {
+        return $this->params;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getSql() {
-		return $this->sql;
-	}
+    /**
+     * @return string
+     */
+    public function getSql() {
+        return $this->sql;
+    }
 
-	/**
-	 * @return float
-	 */
-	public function getStart() {
-		return $this->start;
-	}
+    /**
+     * @return float
+     */
+    public function getStart() {
+        return $this->start;
+    }
 	
-	/**
-	 * @return float
-	 */
-	public function getDuration() {
-		return $this->end - $this->start;
-	}
+    /**
+     * @return float
+     */
+    public function getDuration() {
+        return $this->end - $this->start;
+    }
 
-	public function getStartTime() {
-		return $this->start;
-	}
+    public function getStartTime() {
+        return $this->start;
+    }
 
-	public function getStacktrace() {
-		return $this->stack;
-	}
+    public function getStacktrace() {
+        return $this->stack;
+    }
 }

apps/files_external/lib/Config/ExternalMountPoint.php

Indentation +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@
 use OC\Files\Mount\MountPoint;
 
 class ExternalMountPoint extends MountPoint {
-	public function getMountType() {
-		return 'external';
-	}
+    public function getMountType() {
+        return 'external';
+    }
 }

lib/private/App/AppStore/Bundles/SocialSharingBundle.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	 * {@inheritDoc}
 	 */
 	public function getName() {
-		return (string)$this->l10n->t('Social sharing bundle');
+		return (string) $this->l10n->t('Social sharing bundle');
 	}
 
 	/**

Indentation +17 added lines, -17 removed lines

@@ -25,23 +25,23 @@
 
 class SocialSharingBundle extends Bundle {
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName() {
-		return (string)$this->l10n->t('Social sharing bundle');
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getName() {
+        return (string)$this->l10n->t('Social sharing bundle');
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getAppIdentifiers() {
-		return [
-			'socialsharing_twitter',
-			'socialsharing_facebook',
-			'socialsharing_email',
-			'socialsharing_diaspora',
-		];
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getAppIdentifiers() {
+        return [
+            'socialsharing_twitter',
+            'socialsharing_facebook',
+            'socialsharing_email',
+            'socialsharing_diaspora',
+        ];
+    }
 
 }

lib/public/Files/Mount/IMountPoint.php

Indentation +88 added lines, -88 removed lines

@@ -29,103 +29,103 @@
  */
 interface IMountPoint {
 
-	/**
-	 * get complete path to the mount point
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getMountPoint();
+    /**
+     * get complete path to the mount point
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getMountPoint();
 
-	/**
-	 * Set the mountpoint
-	 *
-	 * @param string $mountPoint new mount point
-	 * @since 8.0.0
-	 */
-	public function setMountPoint($mountPoint);
+    /**
+     * Set the mountpoint
+     *
+     * @param string $mountPoint new mount point
+     * @since 8.0.0
+     */
+    public function setMountPoint($mountPoint);
 
-	/**
-	 * Get the storage that is mounted
-	 *
-	 * @return \OC\Files\Storage\Storage
-	 * @since 8.0.0
-	 */
-	public function getStorage();
+    /**
+     * Get the storage that is mounted
+     *
+     * @return \OC\Files\Storage\Storage
+     * @since 8.0.0
+     */
+    public function getStorage();
 
-	/**
-	 * Get the id of the storages
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getStorageId();
+    /**
+     * Get the id of the storages
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getStorageId();
 
-	/**
-	 * Get the id of the storages
-	 *
-	 * @return int
-	 * @since 9.1.0
-	 */
-	public function getNumericStorageId();
+    /**
+     * Get the id of the storages
+     *
+     * @return int
+     * @since 9.1.0
+     */
+    public function getNumericStorageId();
 
-	/**
-	 * Get the path relative to the mountpoint
-	 *
-	 * @param string $path absolute path to a file or folder
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getInternalPath($path);
+    /**
+     * Get the path relative to the mountpoint
+     *
+     * @param string $path absolute path to a file or folder
+     * @return string
+     * @since 8.0.0
+     */
+    public function getInternalPath($path);
 
-	/**
-	 * Apply a storage wrapper to the mounted storage
-	 *
-	 * @param callable $wrapper
-	 * @since 8.0.0
-	 */
-	public function wrapStorage($wrapper);
+    /**
+     * Apply a storage wrapper to the mounted storage
+     *
+     * @param callable $wrapper
+     * @since 8.0.0
+     */
+    public function wrapStorage($wrapper);
 
-	/**
-	 * Get a mount option
-	 *
-	 * @param string $name Name of the mount option to get
-	 * @param mixed $default Default value for the mount option
-	 * @return mixed
-	 * @since 8.0.0
-	 */
-	public function getOption($name, $default);
+    /**
+     * Get a mount option
+     *
+     * @param string $name Name of the mount option to get
+     * @param mixed $default Default value for the mount option
+     * @return mixed
+     * @since 8.0.0
+     */
+    public function getOption($name, $default);
 
-	/**
-	 * Get all options for the mount
-	 *
-	 * @return array
-	 * @since 8.1.0
-	 */
-	public function getOptions();
+    /**
+     * Get all options for the mount
+     *
+     * @return array
+     * @since 8.1.0
+     */
+    public function getOptions();
 
-	/**
-	 * Get the file id of the root of the storage
-	 *
-	 * @return int
-	 * @since 9.1.0
-	 */
-	public function getStorageRootId();
+    /**
+     * Get the file id of the root of the storage
+     *
+     * @return int
+     * @since 9.1.0
+     */
+    public function getStorageRootId();
 
-	/**
-	 * Get the id of the configured mount
-	 *
-	 * @return int|null mount id or null if not applicable
-	 * @since 9.1.0
-	 */
-	public function getMountId();
+    /**
+     * Get the id of the configured mount
+     *
+     * @return int|null mount id or null if not applicable
+     * @since 9.1.0
+     */
+    public function getMountId();
 
-	/**
-	 * Get the type of mount point, used to distinguish things like shares and external storages
-	 * in the web interface
-	 *
-	 * @return string
-	 * @since 12.0.0
-	 */
-	public function getMountType();
+    /**
+     * Get the type of mount point, used to distinguish things like shares and external storages
+     * in the web interface
+     *
+     * @return string
+     * @since 12.0.0
+     */
+    public function getMountType();
 }

lib/private/Contacts/ContactsMenu/Providers/EMailProvider.php

Indentation +26 added lines, -26 removed lines

@@ -31,34 +31,34 @@
 
 class EMailProvider implements IProvider {
 
-	/** @var IActionFactory */
-	private $actionFactory;
+    /** @var IActionFactory */
+    private $actionFactory;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/**
-	 * @param IActionFactory $actionFactory
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function __construct(IActionFactory $actionFactory, IURLGenerator $urlGenerator) {
-		$this->actionFactory = $actionFactory;
-		$this->urlGenerator = $urlGenerator;
-	}
+    /**
+     * @param IActionFactory $actionFactory
+     * @param IURLGenerator $urlGenerator
+     */
+    public function __construct(IActionFactory $actionFactory, IURLGenerator $urlGenerator) {
+        $this->actionFactory = $actionFactory;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	/**
-	 * @param IEntry $entry
-	 */
-	public function process(IEntry $entry) {
-		$iconUrl = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/mail.svg'));
-		foreach ($entry->getEMailAddresses() as $address) {
-			if (empty($address)) {
-				// Skip
-				continue;
-			}
-			$action = $this->actionFactory->newEMailAction($iconUrl, $address, $address);
-			$entry->addAction($action);
-		}
-	}
+    /**
+     * @param IEntry $entry
+     */
+    public function process(IEntry $entry) {
+        $iconUrl = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/mail.svg'));
+        foreach ($entry->getEMailAddresses() as $address) {
+            if (empty($address)) {
+                // Skip
+                continue;
+            }
+            $action = $this->actionFactory->newEMailAction($iconUrl, $address, $address);
+            $entry->addAction($action);
+        }
+    }
 
 }

lib/private/App/CodeChecker/LanguageParseChecker.php

Indentation +32 added lines, -32 removed lines

@@ -25,36 +25,36 @@
 
 class LanguageParseChecker {
 
-	/**
-	 * @param string $appId
-	 * @return array
-	 */
-	public function analyse($appId) {
-		$appPath = \OC_App::getAppPath($appId);
-		if ($appPath === false) {
-			throw new \RuntimeException("No app with given id <$appId> known.");
-		}
-
-		if (!is_dir($appPath . '/l10n/')) {
-			return [];
-		}
-
-		$errors = [];
-		$directory = new \DirectoryIterator($appPath . '/l10n/');
-
-		foreach ($directory as $file) {
-			if ($file->getExtension() !== 'json') {
-				continue;
-			}
-
-			$content = file_get_contents($file->getPathname());
-			json_decode($content, true);
-
-			if (json_last_error() !== JSON_ERROR_NONE) {
-				$errors[] = 'Invalid language file found: l10n/' . $file->getFilename() . ': ' . json_last_error_msg();
-			}
-		}
-
-		return $errors;
-	}
+    /**
+     * @param string $appId
+     * @return array
+     */
+    public function analyse($appId) {
+        $appPath = \OC_App::getAppPath($appId);
+        if ($appPath === false) {
+            throw new \RuntimeException("No app with given id <$appId> known.");
+        }
+
+        if (!is_dir($appPath . '/l10n/')) {
+            return [];
+        }
+
+        $errors = [];
+        $directory = new \DirectoryIterator($appPath . '/l10n/');
+
+        foreach ($directory as $file) {
+            if ($file->getExtension() !== 'json') {
+                continue;
+            }
+
+            $content = file_get_contents($file->getPathname());
+            json_decode($content, true);
+
+            if (json_last_error() !== JSON_ERROR_NONE) {
+                $errors[] = 'Invalid language file found: l10n/' . $file->getFilename() . ': ' . json_last_error_msg();
+            }
+        }
+
+        return $errors;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -35,12 +35,12 @@ 
 			throw new \RuntimeException("No app with given id <$appId> known.");
 		}
 
-		if (!is_dir($appPath . '/l10n/')) {
+		if (!is_dir($appPath.'/l10n/')) {
 			return [];
 		}
 
 		$errors = [];
-		$directory = new \DirectoryIterator($appPath . '/l10n/');
+		$directory = new \DirectoryIterator($appPath.'/l10n/');
 
 		foreach ($directory as $file) {
 			if ($file->getExtension() !== 'json') {
@@ -51,7 +51,7 @@ 
 			json_decode($content, true);
 
 			if (json_last_error() !== JSON_ERROR_NONE) {
-				$errors[] = 'Invalid language file found: l10n/' . $file->getFilename() . ': ' . json_last_error_msg();
+				$errors[] = 'Invalid language file found: l10n/'.$file->getFilename().': '.json_last_error_msg();
 			}
 		}
 

apps/files_external/lib/Command/Import.php

Spacing +2 added lines, -2 removed lines

@@ -112,7 +112,7 @@ 
 			$json = file_get_contents('php://stdin');
 		} else {
 			if (!file_exists($path)) {
-				$output->writeln('<error>File not found: ' . $path . '</error>');
+				$output->writeln('<error>File not found: '.$path.'</error>');
 				return 1;
 			}
 			$json = file_get_contents($path);
@@ -164,7 +164,7 @@ 
 					$existingMount->getApplicableUsers() === $mount->getApplicableUsers() &&
 					$existingMount->getBackendOptions() === $mount->getBackendOptions()
 				) {
-					$output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>");
+					$output->writeln("<error>Duplicate mount (".$mount->getMountPoint().")</error>");
 					return 1;
 				}
 			}

Indentation +183 added lines, -183 removed lines

@@ -41,187 +41,187 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Import extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	private $globalService;
-
-	/**
-	 * @var UserStoragesService
-	 */
-	private $userService;
-
-	/**
-	 * @var IUserSession
-	 */
-	private $userSession;
-
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
-
-	/** @var ImportLegacyStoragesService */
-	private $importLegacyStorageService;
-
-	/** @var BackendService */
-	private $backendService;
-
-	public function __construct(GlobalStoragesService $globalService,
-						 UserStoragesService $userService,
-						 IUserSession $userSession,
-						 IUserManager $userManager,
-						 ImportLegacyStoragesService $importLegacyStorageService,
-						 BackendService $backendService
-	) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->userService = $userService;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-		$this->importLegacyStorageService = $importLegacyStorageService;
-		$this->backendService = $backendService;
-	}
-
-	protected function configure() {
-		$this
-			->setName('files_external:import')
-			->setDescription('Import mount configurations')
-			->addOption(
-				'user',
-				'',
-				InputOption::VALUE_OPTIONAL,
-				'user to add the mount configurations for, if not set the mount will be added as system mount'
-			)
-			->addArgument(
-				'path',
-				InputArgument::REQUIRED,
-				'path to a json file containing the mounts to import, use "-" to read from stdin'
-			)
-			->addOption(
-				'dry',
-				'',
-				InputOption::VALUE_NONE,
-				'Don\'t save the imported mounts, only list the new mounts'
-			);
-		parent::configure();
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$user = $input->getOption('user');
-		$path = $input->getArgument('path');
-		if ($path === '-') {
-			$json = file_get_contents('php://stdin');
-		} else {
-			if (!file_exists($path)) {
-				$output->writeln('<error>File not found: ' . $path . '</error>');
-				return 1;
-			}
-			$json = file_get_contents($path);
-		}
-		if (!is_string($json) || strlen($json) < 2) {
-			$output->writeln('<error>Error while reading json</error>');
-			return 1;
-		}
-		$data = json_decode($json, true);
-		if (!is_array($data)) {
-			$output->writeln('<error>Error while parsing json</error>');
-			return 1;
-		}
-
-		$isLegacy = isset($data['user']) || isset($data['group']);
-		if ($isLegacy) {
-			$this->importLegacyStorageService->setData($data);
-			$mounts = $this->importLegacyStorageService->getAllStorages();
-			foreach ($mounts as $mount) {
-				if ($mount->getBackendOption('password') === false) {
-					$output->writeln('<error>Failed to decrypt password</error>');
-					return 1;
-				}
-			}
-		} else {
-			if (!isset($data[0])) { //normalize to an array of mounts
-				$data = [$data];
-			}
-			$mounts = array_map([$this, 'parseData'], $data);
-		}
-
-		if ($user) {
-			// ensure applicables are correct for personal mounts
-			foreach ($mounts as $mount) {
-				$mount->setApplicableGroups([]);
-				$mount->setApplicableUsers([$user]);
-			}
-		}
-
-		$storageService = $this->getStorageService($user);
-
-		$existingMounts = $storageService->getAllStorages();
-
-		foreach ($mounts as $mount) {
-			foreach ($existingMounts as $existingMount) {
-				if (
-					$existingMount->getMountPoint() === $mount->getMountPoint() &&
-					$existingMount->getApplicableGroups() === $mount->getApplicableGroups() &&
-					$existingMount->getApplicableUsers() === $mount->getApplicableUsers() &&
-					$existingMount->getBackendOptions() === $mount->getBackendOptions()
-				) {
-					$output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>");
-					return 1;
-				}
-			}
-		}
-
-		if ($input->getOption('dry')) {
-			if (count($mounts) === 0) {
-				$output->writeln('<error>No mounts to be imported</error>');
-				return 1;
-			}
-			$listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
-			$listInput = new ArrayInput([], $listCommand->getDefinition());
-			$listInput->setOption('output', $input->getOption('output'));
-			$listInput->setOption('show-password', true);
-			$listCommand->listMounts($user, $mounts, $listInput, $output);
-		} else {
-			foreach ($mounts as $mount) {
-				$storageService->addStorage($mount);
-			}
-		}
-		return 0;
-	}
-
-	private function parseData(array $data) {
-		$mount = new StorageConfig($data['mount_id']);
-		$mount->setMountPoint($data['mount_point']);
-		$mount->setBackend($this->getBackendByClass($data['storage']));
-		$authBackend = $this->backendService->getAuthMechanism($data['authentication_type']);
-		$mount->setAuthMechanism($authBackend);
-		$mount->setBackendOptions($data['configuration']);
-		$mount->setMountOptions($data['options']);
-		$mount->setApplicableUsers(isset($data['applicable_users']) ? $data['applicable_users'] : []);
-		$mount->setApplicableGroups(isset($data['applicable_groups']) ? $data['applicable_groups'] : []);
-		return $mount;
-	}
-
-	private function getBackendByClass($className) {
-		$backends = $this->backendService->getBackends();
-		foreach ($backends as $backend) {
-			if ($backend->getStorageClass() === $className) {
-				return $backend;
-			}
-		}
-	}
-
-	protected function getStorageService($userId) {
-		if (!empty($userId)) {
-			$user = $this->userManager->get($userId);
-			if (is_null($user)) {
-				throw new NoUserException("user $userId not found");
-			}
-			$this->userSession->setUser($user);
-			return $this->userService;
-		} else {
-			return $this->globalService;
-		}
-	}
+    /**
+     * @var GlobalStoragesService
+     */
+    private $globalService;
+
+    /**
+     * @var UserStoragesService
+     */
+    private $userService;
+
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
+
+    /** @var ImportLegacyStoragesService */
+    private $importLegacyStorageService;
+
+    /** @var BackendService */
+    private $backendService;
+
+    public function __construct(GlobalStoragesService $globalService,
+                            UserStoragesService $userService,
+                            IUserSession $userSession,
+                            IUserManager $userManager,
+                            ImportLegacyStoragesService $importLegacyStorageService,
+                            BackendService $backendService
+    ) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->userService = $userService;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+        $this->importLegacyStorageService = $importLegacyStorageService;
+        $this->backendService = $backendService;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('files_external:import')
+            ->setDescription('Import mount configurations')
+            ->addOption(
+                'user',
+                '',
+                InputOption::VALUE_OPTIONAL,
+                'user to add the mount configurations for, if not set the mount will be added as system mount'
+            )
+            ->addArgument(
+                'path',
+                InputArgument::REQUIRED,
+                'path to a json file containing the mounts to import, use "-" to read from stdin'
+            )
+            ->addOption(
+                'dry',
+                '',
+                InputOption::VALUE_NONE,
+                'Don\'t save the imported mounts, only list the new mounts'
+            );
+        parent::configure();
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $user = $input->getOption('user');
+        $path = $input->getArgument('path');
+        if ($path === '-') {
+            $json = file_get_contents('php://stdin');
+        } else {
+            if (!file_exists($path)) {
+                $output->writeln('<error>File not found: ' . $path . '</error>');
+                return 1;
+            }
+            $json = file_get_contents($path);
+        }
+        if (!is_string($json) || strlen($json) < 2) {
+            $output->writeln('<error>Error while reading json</error>');
+            return 1;
+        }
+        $data = json_decode($json, true);
+        if (!is_array($data)) {
+            $output->writeln('<error>Error while parsing json</error>');
+            return 1;
+        }
+
+        $isLegacy = isset($data['user']) || isset($data['group']);
+        if ($isLegacy) {
+            $this->importLegacyStorageService->setData($data);
+            $mounts = $this->importLegacyStorageService->getAllStorages();
+            foreach ($mounts as $mount) {
+                if ($mount->getBackendOption('password') === false) {
+                    $output->writeln('<error>Failed to decrypt password</error>');
+                    return 1;
+                }
+            }
+        } else {
+            if (!isset($data[0])) { //normalize to an array of mounts
+                $data = [$data];
+            }
+            $mounts = array_map([$this, 'parseData'], $data);
+        }
+
+        if ($user) {
+            // ensure applicables are correct for personal mounts
+            foreach ($mounts as $mount) {
+                $mount->setApplicableGroups([]);
+                $mount->setApplicableUsers([$user]);
+            }
+        }
+
+        $storageService = $this->getStorageService($user);
+
+        $existingMounts = $storageService->getAllStorages();
+
+        foreach ($mounts as $mount) {
+            foreach ($existingMounts as $existingMount) {
+                if (
+                    $existingMount->getMountPoint() === $mount->getMountPoint() &&
+                    $existingMount->getApplicableGroups() === $mount->getApplicableGroups() &&
+                    $existingMount->getApplicableUsers() === $mount->getApplicableUsers() &&
+                    $existingMount->getBackendOptions() === $mount->getBackendOptions()
+                ) {
+                    $output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>");
+                    return 1;
+                }
+            }
+        }
+
+        if ($input->getOption('dry')) {
+            if (count($mounts) === 0) {
+                $output->writeln('<error>No mounts to be imported</error>');
+                return 1;
+            }
+            $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
+            $listInput = new ArrayInput([], $listCommand->getDefinition());
+            $listInput->setOption('output', $input->getOption('output'));
+            $listInput->setOption('show-password', true);
+            $listCommand->listMounts($user, $mounts, $listInput, $output);
+        } else {
+            foreach ($mounts as $mount) {
+                $storageService->addStorage($mount);
+            }
+        }
+        return 0;
+    }
+
+    private function parseData(array $data) {
+        $mount = new StorageConfig($data['mount_id']);
+        $mount->setMountPoint($data['mount_point']);
+        $mount->setBackend($this->getBackendByClass($data['storage']));
+        $authBackend = $this->backendService->getAuthMechanism($data['authentication_type']);
+        $mount->setAuthMechanism($authBackend);
+        $mount->setBackendOptions($data['configuration']);
+        $mount->setMountOptions($data['options']);
+        $mount->setApplicableUsers(isset($data['applicable_users']) ? $data['applicable_users'] : []);
+        $mount->setApplicableGroups(isset($data['applicable_groups']) ? $data['applicable_groups'] : []);
+        return $mount;
+    }
+
+    private function getBackendByClass($className) {
+        $backends = $this->backendService->getBackends();
+        foreach ($backends as $backend) {
+            if ($backend->getStorageClass() === $className) {
+                return $backend;
+            }
+        }
+    }
+
+    protected function getStorageService($userId) {
+        if (!empty($userId)) {
+            $user = $this->userManager->get($userId);
+            if (is_null($user)) {
+                throw new NoUserException("user $userId not found");
+            }
+            $this->userSession->setUser($user);
+            return $this->userService;
+        } else {
+            return $this->globalService;
+        }
+    }
 }

apps/oauth2/lib/Db/Client.php

Indentation +15 added lines, -15 removed lines

@@ -34,20 +34,20 @@
  * @method void setName(string $name)
  */
 class Client extends Entity {
-	/** @var string */
-	protected $name;
-	/** @var string */
-	protected $redirectUri;
-	/** @var string */
-	protected $clientIdentifier;
-	/** @var string */
-	protected $secret;
+    /** @var string */
+    protected $name;
+    /** @var string */
+    protected $redirectUri;
+    /** @var string */
+    protected $clientIdentifier;
+    /** @var string */
+    protected $secret;
 
-	public function __construct() {
-		$this->addType('id', 'int');
-		$this->addType('name', 'string');
-		$this->addType('redirect_uri', 'string');
-		$this->addType('client_identifier', 'string');
-		$this->addType('secret', 'string');
-	}
+    public function __construct() {
+        $this->addType('id', 'int');
+        $this->addType('name', 'string');
+        $this->addType('redirect_uri', 'string');
+        $this->addType('client_identifier', 'string');
+        $this->addType('secret', 'string');
+    }
 }

lib/public/Authentication/LoginCredentials/ICredentials.php

Indentation +25 added lines, -25 removed lines

@@ -31,31 +31,31 @@
  */
 interface ICredentials {
 
-	/**
-	 * Get the user UID
-	 *
-	 * @since 12
-	 *
-	 * @return string
-	 */
-	public function getUID();
+    /**
+     * Get the user UID
+     *
+     * @since 12
+     *
+     * @return string
+     */
+    public function getUID();
 
-	/**
-	 * Get the login name the users used to login
-	 *
-	 * @since 12
-	 *
-	 * @return string
-	 */
-	public function getLoginName();
+    /**
+     * Get the login name the users used to login
+     *
+     * @since 12
+     *
+     * @return string
+     */
+    public function getLoginName();
 
-	/**
-	 * Get the password
-	 *
-	 * @since 12
-	 *
-	 * @return string
-	 * @throws PasswordUnavailableException
-	 */
-	public function getPassword();
+    /**
+     * Get the password
+     *
+     * @since 12
+     *
+     * @return string
+     * @throws PasswordUnavailableException
+     */
+    public function getPassword();
 }