nextcloud / server

apps/files_external/lib/Command/Import.php

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/encryption/lib/Command/RecoverUser.php

Indentation +73 added lines, -73 removed lines

@@ -36,77 +36,77 @@
 
 class RecoverUser extends Command {
 
-	/** @var Util */
-	protected $util;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var  QuestionHelper */
-	protected $questionHelper;
-
-	/**
-	 * @param Util $util
-	 * @param IConfig $config
-	 * @param IUserManager $userManager
-	 * @param QuestionHelper $questionHelper
-	 */
-	public function __construct(Util $util,
-								IConfig $config,
-								IUserManager $userManager,
-								QuestionHelper $questionHelper) {
-		$this->util = $util;
-		$this->questionHelper = $questionHelper;
-		$this->userManager = $userManager;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('encryption:recover-user')
-			->setDescription('Recover user data in case of password lost. This only works if the user enabled the recovery key.');
-
-		$this->addArgument(
-			'user',
-			InputArgument::REQUIRED,
-			'user which should be recovered'
-		);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$isMasterKeyEnabled = $this->util->isMasterKeyEnabled();
-
-		if ($isMasterKeyEnabled) {
-			$output->writeln('You use the master key, no individual user recovery needed.');
-			return 0;
-		}
-
-		$uid = $input->getArgument('user');
-		$userExists = $this->userManager->userExists($uid);
-		if ($userExists === false) {
-			$output->writeln('User "' . $uid . '" unknown.');
-			return 1;
-		}
-
-		$recoveryKeyEnabled = $this->util->isRecoveryEnabledForUser($uid);
-		if ($recoveryKeyEnabled === false) {
-			$output->writeln('Recovery key is not enabled for: ' . $uid);
-			return 1;
-		}
-
-		$question = new Question('Please enter the recovery key password: ');
-		$question->setHidden(true);
-		$question->setHiddenFallback(false);
-		$recoveryPassword = $this->questionHelper->ask($input, $output, $question);
-
-		$question = new Question('Please enter the new login password for the user: ');
-		$question->setHidden(true);
-		$question->setHiddenFallback(false);
-		$newLoginPassword = $this->questionHelper->ask($input, $output, $question);
-
-		$output->write('Start to recover users files... This can take some time...');
-		$this->userManager->get($uid)->setPassword($newLoginPassword, $recoveryPassword);
-		$output->writeln('Done.');
-		return 0;
-	}
+    /** @var Util */
+    protected $util;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var  QuestionHelper */
+    protected $questionHelper;
+
+    /**
+     * @param Util $util
+     * @param IConfig $config
+     * @param IUserManager $userManager
+     * @param QuestionHelper $questionHelper
+     */
+    public function __construct(Util $util,
+                                IConfig $config,
+                                IUserManager $userManager,
+                                QuestionHelper $questionHelper) {
+        $this->util = $util;
+        $this->questionHelper = $questionHelper;
+        $this->userManager = $userManager;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('encryption:recover-user')
+            ->setDescription('Recover user data in case of password lost. This only works if the user enabled the recovery key.');
+
+        $this->addArgument(
+            'user',
+            InputArgument::REQUIRED,
+            'user which should be recovered'
+        );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $isMasterKeyEnabled = $this->util->isMasterKeyEnabled();
+
+        if ($isMasterKeyEnabled) {
+            $output->writeln('You use the master key, no individual user recovery needed.');
+            return 0;
+        }
+
+        $uid = $input->getArgument('user');
+        $userExists = $this->userManager->userExists($uid);
+        if ($userExists === false) {
+            $output->writeln('User "' . $uid . '" unknown.');
+            return 1;
+        }
+
+        $recoveryKeyEnabled = $this->util->isRecoveryEnabledForUser($uid);
+        if ($recoveryKeyEnabled === false) {
+            $output->writeln('Recovery key is not enabled for: ' . $uid);
+            return 1;
+        }
+
+        $question = new Question('Please enter the recovery key password: ');
+        $question->setHidden(true);
+        $question->setHiddenFallback(false);
+        $recoveryPassword = $this->questionHelper->ask($input, $output, $question);
+
+        $question = new Question('Please enter the new login password for the user: ');
+        $question->setHidden(true);
+        $question->setHiddenFallback(false);
+        $newLoginPassword = $this->questionHelper->ask($input, $output, $question);
+
+        $output->write('Start to recover users files... This can take some time...');
+        $this->userManager->get($uid)->setPassword($newLoginPassword, $recoveryPassword);
+        $output->writeln('Done.');
+        return 0;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -84,13 +84,13 @@
 		$uid = $input->getArgument('user');
 		$userExists = $this->userManager->userExists($uid);
 		if ($userExists === false) {
-			$output->writeln('User "' . $uid . '" unknown.');
+			$output->writeln('User "'.$uid.'" unknown.');
 			return 1;
 		}
 
 		$recoveryKeyEnabled = $this->util->isRecoveryEnabledForUser($uid);
 		if ($recoveryKeyEnabled === false) {
-			$output->writeln('Recovery key is not enabled for: ' . $uid);
+			$output->writeln('Recovery key is not enabled for: '.$uid);
 			return 1;
 		}
 

apps/encryption/lib/Command/EnableMasterKey.php

Indentation +42 added lines, -42 removed lines

@@ -33,52 +33,52 @@
 
 class EnableMasterKey extends Command {
 
-	/** @var Util */
-	protected $util;
+    /** @var Util */
+    protected $util;
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/** @var  QuestionHelper */
-	protected $questionHelper;
+    /** @var  QuestionHelper */
+    protected $questionHelper;
 
-	/**
-	 * @param Util $util
-	 * @param IConfig $config
-	 * @param QuestionHelper $questionHelper
-	 */
-	public function __construct(Util $util,
-								IConfig $config,
-								QuestionHelper $questionHelper) {
-		$this->util = $util;
-		$this->config = $config;
-		$this->questionHelper = $questionHelper;
-		parent::__construct();
-	}
+    /**
+     * @param Util $util
+     * @param IConfig $config
+     * @param QuestionHelper $questionHelper
+     */
+    public function __construct(Util $util,
+                                IConfig $config,
+                                QuestionHelper $questionHelper) {
+        $this->util = $util;
+        $this->config = $config;
+        $this->questionHelper = $questionHelper;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('encryption:enable-master-key')
-			->setDescription('Enable the master key. Only available for fresh installations with no existing encrypted data! There is also no way to disable it again.');
-	}
+    protected function configure() {
+        $this
+            ->setName('encryption:enable-master-key')
+            ->setDescription('Enable the master key. Only available for fresh installations with no existing encrypted data! There is also no way to disable it again.');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$isAlreadyEnabled = $this->util->isMasterKeyEnabled();
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $isAlreadyEnabled = $this->util->isMasterKeyEnabled();
 
-		if ($isAlreadyEnabled) {
-			$output->writeln('Master key already enabled');
-		} else {
-			$question = new ConfirmationQuestion(
-				'Warning: Only available for fresh installations with no existing encrypted data! '
-			. 'There is also no way to disable it again. Do you want to continue? (y/n) ', false);
-			if ($this->questionHelper->ask($input, $output, $question)) {
-				$this->config->setAppValue('encryption', 'useMasterKey', '1');
-				$output->writeln('Master key successfully enabled.');
-			} else {
-				$output->writeln('aborted.');
-				return 1;
-			}
-		}
-		return 0;
-	}
+        if ($isAlreadyEnabled) {
+            $output->writeln('Master key already enabled');
+        } else {
+            $question = new ConfirmationQuestion(
+                'Warning: Only available for fresh installations with no existing encrypted data! '
+            . 'There is also no way to disable it again. Do you want to continue? (y/n) ', false);
+            if ($this->questionHelper->ask($input, $output, $question)) {
+                $this->config->setAppValue('encryption', 'useMasterKey', '1');
+                $output->writeln('Master key successfully enabled.');
+            } else {
+                $output->writeln('aborted.');
+                return 1;
+            }
+        }
+        return 0;
+    }
 }

apps/encryption/lib/Command/DisableMasterKey.php

Indentation +45 added lines, -45 removed lines

@@ -34,55 +34,55 @@
 
 class DisableMasterKey extends Command {
 
-	/** @var Util */
-	protected $util;
+    /** @var Util */
+    protected $util;
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/** @var  QuestionHelper */
-	protected $questionHelper;
+    /** @var  QuestionHelper */
+    protected $questionHelper;
 
-	/**
-	 * @param Util $util
-	 * @param IConfig $config
-	 * @param QuestionHelper $questionHelper
-	 */
-	public function __construct(Util $util,
-								IConfig $config,
-								QuestionHelper $questionHelper) {
-		$this->util = $util;
-		$this->config = $config;
-		$this->questionHelper = $questionHelper;
-		parent::__construct();
-	}
+    /**
+     * @param Util $util
+     * @param IConfig $config
+     * @param QuestionHelper $questionHelper
+     */
+    public function __construct(Util $util,
+                                IConfig $config,
+                                QuestionHelper $questionHelper) {
+        $this->util = $util;
+        $this->config = $config;
+        $this->questionHelper = $questionHelper;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('encryption:disable-master-key')
-			->setDescription('Disable the master key and use per-user keys instead. Only available for fresh installations with no existing encrypted data! There is no way to enable it again.');
-	}
+    protected function configure() {
+        $this
+            ->setName('encryption:disable-master-key')
+            ->setDescription('Disable the master key and use per-user keys instead. Only available for fresh installations with no existing encrypted data! There is no way to enable it again.');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$isMasterKeyEnabled = $this->util->isMasterKeyEnabled();
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $isMasterKeyEnabled = $this->util->isMasterKeyEnabled();
 
-		if (!$isMasterKeyEnabled) {
-			$output->writeln('Master key already disabled');
-		} else {
-			$question = new ConfirmationQuestion(
-				'Warning: Only perform this operation for a fresh installations with no existing encrypted data! '
-				. 'There is no way to enable the master key again. '
-				. 'We strongly recommend to keep the master key, it provides significant performance improvements '
-				. 'and is easier to handle for both, users and administrators. '
-				. 'Do you really want to switch to per-user keys? (y/n) ', false);
-			if ($this->questionHelper->ask($input, $output, $question)) {
-				$this->config->setAppValue('encryption', 'useMasterKey', '0');
-				$output->writeln('Master key successfully disabled.');
-			} else {
-				$output->writeln('aborted.');
-				return 1;
-			}
-		}
-		return 0;
-	}
+        if (!$isMasterKeyEnabled) {
+            $output->writeln('Master key already disabled');
+        } else {
+            $question = new ConfirmationQuestion(
+                'Warning: Only perform this operation for a fresh installations with no existing encrypted data! '
+                . 'There is no way to enable the master key again. '
+                . 'We strongly recommend to keep the master key, it provides significant performance improvements '
+                . 'and is easier to handle for both, users and administrators. '
+                . 'Do you really want to switch to per-user keys? (y/n) ', false);
+            if ($this->questionHelper->ask($input, $output, $question)) {
+                $this->config->setAppValue('encryption', 'useMasterKey', '0');
+                $output->writeln('Master key successfully disabled.');
+            } else {
+                $output->writeln('aborted.');
+                return 1;
+            }
+        }
+        return 0;
+    }
 }

apps/dav/lib/Command/SyncSystemAddressBook.php

Indentation +29 added lines, -29 removed lines

@@ -32,37 +32,37 @@
 
 class SyncSystemAddressBook extends Command {
 
-	/** @var SyncService */
-	private $syncService;
+    /** @var SyncService */
+    private $syncService;
 
-	/**
-	 * @param SyncService $syncService
-	 */
-	public function __construct(SyncService $syncService) {
-		parent::__construct();
-		$this->syncService = $syncService;
-	}
+    /**
+     * @param SyncService $syncService
+     */
+    public function __construct(SyncService $syncService) {
+        parent::__construct();
+        $this->syncService = $syncService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('dav:sync-system-addressbook')
-			->setDescription('Synchronizes users to the system addressbook');
-	}
+    protected function configure() {
+        $this
+            ->setName('dav:sync-system-addressbook')
+            ->setDescription('Synchronizes users to the system addressbook');
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$output->writeln('Syncing users ...');
-		$progress = new ProgressBar($output);
-		$progress->start();
-		$this->syncService->syncInstance(function () use ($progress) {
-			$progress->advance();
-		});
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $output->writeln('Syncing users ...');
+        $progress = new ProgressBar($output);
+        $progress->start();
+        $this->syncService->syncInstance(function () use ($progress) {
+            $progress->advance();
+        });
 
-		$progress->finish();
-		$output->writeln('');
-		return 0;
-	}
+        $progress->finish();
+        $output->writeln('');
+        return 0;
+    }
 }

apps/dav/lib/Command/RemoveInvalidShares.php

Indentation +39 added lines, -39 removed lines

@@ -38,50 +38,50 @@
  */
 class RemoveInvalidShares extends Command {
 
-	/** @var IDBConnection */
-	private $connection;
-	/** @var Principal */
-	private $principalBackend;
+    /** @var IDBConnection */
+    private $connection;
+    /** @var Principal */
+    private $principalBackend;
 
-	public function __construct(IDBConnection $connection,
-								Principal $principalBackend) {
-		parent::__construct();
+    public function __construct(IDBConnection $connection,
+                                Principal $principalBackend) {
+        parent::__construct();
 
-		$this->connection = $connection;
-		$this->principalBackend = $principalBackend;
-	}
+        $this->connection = $connection;
+        $this->principalBackend = $principalBackend;
+    }
 
-	protected function configure() {
-		$this
-			->setName('dav:remove-invalid-shares')
-			->setDescription('Remove invalid dav shares');
-	}
+    protected function configure() {
+        $this
+            ->setName('dav:remove-invalid-shares')
+            ->setDescription('Remove invalid dav shares');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$query = $this->connection->getQueryBuilder();
-		$result = $query->selectDistinct('principaluri')
-			->from('dav_shares')
-			->execute();
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $query = $this->connection->getQueryBuilder();
+        $result = $query->selectDistinct('principaluri')
+            ->from('dav_shares')
+            ->execute();
 
-		while ($row = $result->fetch()) {
-			$principaluri = $row['principaluri'];
-			$p = $this->principalBackend->getPrincipalByPath($principaluri);
-			if ($p === null) {
-				$this->deleteSharesForPrincipal($principaluri);
-			}
-		}
+        while ($row = $result->fetch()) {
+            $principaluri = $row['principaluri'];
+            $p = $this->principalBackend->getPrincipalByPath($principaluri);
+            if ($p === null) {
+                $this->deleteSharesForPrincipal($principaluri);
+            }
+        }
 
-		$result->closeCursor();
-		return 0;
-	}
+        $result->closeCursor();
+        return 0;
+    }
 
-	/**
-	 * @param string $principaluri
-	 */
-	private function deleteSharesForPrincipal($principaluri) {
-		$delete = $this->connection->getQueryBuilder();
-		$delete->delete('dav_shares')
-			->where($delete->expr()->eq('principaluri', $delete->createNamedParameter($principaluri)));
-		$delete->execute();
-	}
+    /**
+     * @param string $principaluri
+     */
+    private function deleteSharesForPrincipal($principaluri) {
+        $delete = $this->connection->getQueryBuilder();
+        $delete->delete('dav_shares')
+            ->where($delete->expr()->eq('principaluri', $delete->createNamedParameter($principaluri)));
+        $delete->execute();
+    }
 }

apps/dav/lib/Command/SendEventReminders.php

Indentation +40 added lines, -40 removed lines

@@ -37,50 +37,50 @@
  */
 class SendEventReminders extends Command {
 
-	/** @var ReminderService */
-	protected $reminderService;
+    /** @var ReminderService */
+    protected $reminderService;
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * @param ReminderService $reminderService
-	 * @param IConfig $config
-	 */
-	public function __construct(ReminderService $reminderService,
-								IConfig $config) {
-		parent::__construct();
-		$this->reminderService = $reminderService;
-		$this->config = $config;
-	}
+    /**
+     * @param ReminderService $reminderService
+     * @param IConfig $config
+     */
+    public function __construct(ReminderService $reminderService,
+                                IConfig $config) {
+        parent::__construct();
+        $this->reminderService = $reminderService;
+        $this->config = $config;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	protected function configure():void {
-		$this
-			->setName('dav:send-event-reminders')
-			->setDescription('Sends event reminders');
-	}
+    /**
+     * @inheritDoc
+     */
+    protected function configure():void {
+        $this
+            ->setName('dav:send-event-reminders')
+            ->setDescription('Sends event reminders');
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		if ($this->config->getAppValue('dav', 'sendEventReminders', 'yes') !== 'yes') {
-			$output->writeln('<error>Sending event reminders disabled!</error>');
-			$output->writeln('<info>Please run "php occ config:app:set dav sendEventReminders --value yes"');
-			return 1;
-		}
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        if ($this->config->getAppValue('dav', 'sendEventReminders', 'yes') !== 'yes') {
+            $output->writeln('<error>Sending event reminders disabled!</error>');
+            $output->writeln('<info>Please run "php occ config:app:set dav sendEventReminders --value yes"');
+            return 1;
+        }
 
-		if ($this->config->getAppValue('dav', 'sendEventRemindersMode', 'backgroundjob') !== 'occ') {
-			$output->writeln('<error>Sending event reminders mode set to background-job!</error>');
-			$output->writeln('<info>Please run "php occ config:app:set dav sendEventRemindersMode --value occ"');
-			return 1;
-		}
+        if ($this->config->getAppValue('dav', 'sendEventRemindersMode', 'backgroundjob') !== 'occ') {
+            $output->writeln('<error>Sending event reminders mode set to background-job!</error>');
+            $output->writeln('<info>Please run "php occ config:app:set dav sendEventRemindersMode --value occ"');
+            return 1;
+        }
 
-		$this->reminderService->processReminders();
-		return 0;
-	}
+        $this->reminderService->processReminders();
+        return 0;
+    }
 }

apps/dav/lib/Command/CreateCalendar.php

Indentation +50 added lines, -50 removed lines

@@ -40,60 +40,60 @@
 
 class CreateCalendar extends Command {
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/** @var IGroupManager $groupManager */
-	private $groupManager;
+    /** @var IGroupManager $groupManager */
+    private $groupManager;
 
-	/** @var \OCP\IDBConnection */
-	protected $dbConnection;
+    /** @var \OCP\IDBConnection */
+    protected $dbConnection;
 
-	/**
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param IDBConnection $dbConnection
-	 */
-	public function __construct(IUserManager $userManager, IGroupManager $groupManager, IDBConnection $dbConnection) {
-		parent::__construct();
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->dbConnection = $dbConnection;
-	}
+    /**
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param IDBConnection $dbConnection
+     */
+    public function __construct(IUserManager $userManager, IGroupManager $groupManager, IDBConnection $dbConnection) {
+        parent::__construct();
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->dbConnection = $dbConnection;
+    }
 
-	protected function configure() {
-		$this
-			->setName('dav:create-calendar')
-			->setDescription('Create a dav calendar')
-			->addArgument('user',
-				InputArgument::REQUIRED,
-				'User for whom the calendar will be created')
-			->addArgument('name',
-				InputArgument::REQUIRED,
-				'Name of the calendar');
-	}
+    protected function configure() {
+        $this
+            ->setName('dav:create-calendar')
+            ->setDescription('Create a dav calendar')
+            ->addArgument('user',
+                InputArgument::REQUIRED,
+                'User for whom the calendar will be created')
+            ->addArgument('name',
+                InputArgument::REQUIRED,
+                'Name of the calendar');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$user = $input->getArgument('user');
-		if (!$this->userManager->userExists($user)) {
-			throw new \InvalidArgumentException("User <$user> in unknown.");
-		}
-		$principalBackend = new Principal(
-			$this->userManager,
-			$this->groupManager,
-			\OC::$server->getShareManager(),
-			\OC::$server->getUserSession(),
-			\OC::$server->getAppManager(),
-			\OC::$server->query(ProxyMapper::class),
-			\OC::$server->getConfig()
-		);
-		$random = \OC::$server->getSecureRandom();
-		$logger = \OC::$server->getLogger();
-		$dispatcher = \OC::$server->getEventDispatcher();
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $user = $input->getArgument('user');
+        if (!$this->userManager->userExists($user)) {
+            throw new \InvalidArgumentException("User <$user> in unknown.");
+        }
+        $principalBackend = new Principal(
+            $this->userManager,
+            $this->groupManager,
+            \OC::$server->getShareManager(),
+            \OC::$server->getUserSession(),
+            \OC::$server->getAppManager(),
+            \OC::$server->query(ProxyMapper::class),
+            \OC::$server->getConfig()
+        );
+        $random = \OC::$server->getSecureRandom();
+        $logger = \OC::$server->getLogger();
+        $dispatcher = \OC::$server->getEventDispatcher();
 
-		$name = $input->getArgument('name');
-		$caldav = new CalDavBackend($this->dbConnection, $principalBackend, $this->userManager, $this->groupManager, $random, $logger, $dispatcher);
-		$caldav->createCalendar("principals/users/$user", $name, []);
-		return 0;
-	}
+        $name = $input->getArgument('name');
+        $caldav = new CalDavBackend($this->dbConnection, $principalBackend, $this->userManager, $this->groupManager, $random, $logger, $dispatcher);
+        $caldav->createCalendar("principals/users/$user", $name, []);
+        return 0;
+    }
 }

apps/dav/lib/Command/ListCalendars.php

Indentation +56 added lines, -56 removed lines

@@ -37,70 +37,70 @@
 
 class ListCalendars extends Command {
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/** @var CalDavBackend */
-	private $caldav;
+    /** @var CalDavBackend */
+    private $caldav;
 
-	/**
-	 * @param IUserManager $userManager
-	 * @param CalDavBackend $caldav
-	 */
-	public function __construct(IUserManager $userManager, CalDavBackend $caldav) {
-		parent::__construct();
-		$this->userManager = $userManager;
-		$this->caldav = $caldav;
-	}
+    /**
+     * @param IUserManager $userManager
+     * @param CalDavBackend $caldav
+     */
+    public function __construct(IUserManager $userManager, CalDavBackend $caldav) {
+        parent::__construct();
+        $this->userManager = $userManager;
+        $this->caldav = $caldav;
+    }
 
-	protected function configure() {
-		$this
-			->setName('dav:list-calendars')
-			->setDescription('List all calendars of a user')
-			->addArgument('uid',
-				InputArgument::REQUIRED,
-				'User for whom all calendars will be listed');
-	}
+    protected function configure() {
+        $this
+            ->setName('dav:list-calendars')
+            ->setDescription('List all calendars of a user')
+            ->addArgument('uid',
+                InputArgument::REQUIRED,
+                'User for whom all calendars will be listed');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$user = $input->getArgument('uid');
-		if (!$this->userManager->userExists($user)) {
-			throw new \InvalidArgumentException("User <$user> is unknown.");
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $user = $input->getArgument('uid');
+        if (!$this->userManager->userExists($user)) {
+            throw new \InvalidArgumentException("User <$user> is unknown.");
+        }
 
-		$calendars = $this->caldav->getCalendarsForUser("principals/users/$user");
+        $calendars = $this->caldav->getCalendarsForUser("principals/users/$user");
 
-		$calendarTableData = [];
-		foreach ($calendars as $calendar) {
-			// skip birthday calendar
-			if ($calendar['uri'] === BirthdayService::BIRTHDAY_CALENDAR_URI) {
-				continue;
-			}
+        $calendarTableData = [];
+        foreach ($calendars as $calendar) {
+            // skip birthday calendar
+            if ($calendar['uri'] === BirthdayService::BIRTHDAY_CALENDAR_URI) {
+                continue;
+            }
 
-			$readOnly = false;
-			$readOnlyIndex = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
-			if (isset($calendar[$readOnlyIndex])) {
-				$readOnly = $calendar[$readOnlyIndex];
-			}
+            $readOnly = false;
+            $readOnlyIndex = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
+            if (isset($calendar[$readOnlyIndex])) {
+                $readOnly = $calendar[$readOnlyIndex];
+            }
 
-			$calendarTableData[] = [
-				$calendar['uri'],
-				$calendar['{DAV:}displayname'],
-				$calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'],
-				$calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname'],
-				$readOnly ? ' x ' : ' ✓ ',
-			];
-		}
+            $calendarTableData[] = [
+                $calendar['uri'],
+                $calendar['{DAV:}displayname'],
+                $calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'],
+                $calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname'],
+                $readOnly ? ' x ' : ' ✓ ',
+            ];
+        }
 
-		if (count($calendarTableData) > 0) {
-			$table = new Table($output);
-			$table->setHeaders(['uri', 'displayname', 'owner\'s userid', 'owner\'s displayname', 'writable'])
-				->setRows($calendarTableData);
+        if (count($calendarTableData) > 0) {
+            $table = new Table($output);
+            $table->setHeaders(['uri', 'displayname', 'owner\'s userid', 'owner\'s displayname', 'writable'])
+                ->setRows($calendarTableData);
 
-			$table->render();
-		} else {
-			$output->writeln("<info>User <$user> has no calendars</info>");
-		}
-		return 0;
-	}
+            $table->render();
+        } else {
+            $output->writeln("<info>User <$user> has no calendars</info>");
+        }
+        return 0;
+    }
 }