@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | try { |
| 104 | 104 | $mount = $this->globalService->getStorage($mountId); |
| 105 | 105 | } catch (NotFoundException $e) { |
| 106 | - $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts</error>'); |
|
| 106 | + $output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts</error>'); |
|
| 107 | 107 | return 404; |
| 108 | 108 | } |
| 109 | 109 | |
@@ -123,13 +123,13 @@ discard block |
||
| 123 | 123 | if ((count($addUsers) + count($removeUsers) + count($addGroups) + count($removeGroups) > 0) || $input->getOption('remove-all')) { |
| 124 | 124 | foreach ($addUsers as $addUser) { |
| 125 | 125 | if (!$this->userManager->userExists($addUser)) { |
| 126 | - $output->writeln('<error>User "' . $addUser . '" not found</error>'); |
|
| 126 | + $output->writeln('<error>User "'.$addUser.'" not found</error>'); |
|
| 127 | 127 | return 404; |
| 128 | 128 | } |
| 129 | 129 | } |
| 130 | 130 | foreach ($addGroups as $addGroup) { |
| 131 | 131 | if (!$this->groupManager->groupExists($addGroup)) { |
| 132 | - $output->writeln('<error>Group "' . $addGroup . '" not found</error>'); |
|
| 132 | + $output->writeln('<error>Group "'.$addGroup.'" not found</error>'); |
|
| 133 | 133 | return 404; |
| 134 | 134 | } |
| 135 | 135 | } |
@@ -37,123 +37,123 @@ |
||
| 37 | 37 | use Symfony\Component\Console\Output\OutputInterface; |
| 38 | 38 | |
| 39 | 39 | class Applicable extends Base { |
| 40 | - /** |
|
| 41 | - * @var GlobalStoragesService |
|
| 42 | - */ |
|
| 43 | - protected $globalService; |
|
| 40 | + /** |
|
| 41 | + * @var GlobalStoragesService |
|
| 42 | + */ |
|
| 43 | + protected $globalService; |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * @var IUserManager |
|
| 47 | - */ |
|
| 48 | - private $userManager; |
|
| 45 | + /** |
|
| 46 | + * @var IUserManager |
|
| 47 | + */ |
|
| 48 | + private $userManager; |
|
| 49 | 49 | |
| 50 | - /** |
|
| 51 | - * @var IGroupManager |
|
| 52 | - */ |
|
| 53 | - private $groupManager; |
|
| 50 | + /** |
|
| 51 | + * @var IGroupManager |
|
| 52 | + */ |
|
| 53 | + private $groupManager; |
|
| 54 | 54 | |
| 55 | - public function __construct( |
|
| 56 | - GlobalStoragesService $globalService, |
|
| 57 | - IUserManager $userManager, |
|
| 58 | - IGroupManager $groupManager |
|
| 59 | - ) { |
|
| 60 | - parent::__construct(); |
|
| 61 | - $this->globalService = $globalService; |
|
| 62 | - $this->userManager = $userManager; |
|
| 63 | - $this->groupManager = $groupManager; |
|
| 64 | - } |
|
| 55 | + public function __construct( |
|
| 56 | + GlobalStoragesService $globalService, |
|
| 57 | + IUserManager $userManager, |
|
| 58 | + IGroupManager $groupManager |
|
| 59 | + ) { |
|
| 60 | + parent::__construct(); |
|
| 61 | + $this->globalService = $globalService; |
|
| 62 | + $this->userManager = $userManager; |
|
| 63 | + $this->groupManager = $groupManager; |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | - protected function configure() { |
|
| 67 | - $this |
|
| 68 | - ->setName('files_external:applicable') |
|
| 69 | - ->setDescription('Manage applicable users and groups for a mount') |
|
| 70 | - ->addArgument( |
|
| 71 | - 'mount_id', |
|
| 72 | - InputArgument::REQUIRED, |
|
| 73 | - 'The id of the mount to edit' |
|
| 74 | - )->addOption( |
|
| 75 | - 'add-user', |
|
| 76 | - '', |
|
| 77 | - InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, |
|
| 78 | - 'user to add as applicable' |
|
| 79 | - )->addOption( |
|
| 80 | - 'remove-user', |
|
| 81 | - '', |
|
| 82 | - InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, |
|
| 83 | - 'user to remove as applicable' |
|
| 84 | - )->addOption( |
|
| 85 | - 'add-group', |
|
| 86 | - '', |
|
| 87 | - InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, |
|
| 88 | - 'group to add as applicable' |
|
| 89 | - )->addOption( |
|
| 90 | - 'remove-group', |
|
| 91 | - '', |
|
| 92 | - InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, |
|
| 93 | - 'group to remove as applicable' |
|
| 94 | - )->addOption( |
|
| 95 | - 'remove-all', |
|
| 96 | - '', |
|
| 97 | - InputOption::VALUE_NONE, |
|
| 98 | - 'Set the mount to be globally applicable' |
|
| 99 | - ); |
|
| 100 | - parent::configure(); |
|
| 101 | - } |
|
| 66 | + protected function configure() { |
|
| 67 | + $this |
|
| 68 | + ->setName('files_external:applicable') |
|
| 69 | + ->setDescription('Manage applicable users and groups for a mount') |
|
| 70 | + ->addArgument( |
|
| 71 | + 'mount_id', |
|
| 72 | + InputArgument::REQUIRED, |
|
| 73 | + 'The id of the mount to edit' |
|
| 74 | + )->addOption( |
|
| 75 | + 'add-user', |
|
| 76 | + '', |
|
| 77 | + InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, |
|
| 78 | + 'user to add as applicable' |
|
| 79 | + )->addOption( |
|
| 80 | + 'remove-user', |
|
| 81 | + '', |
|
| 82 | + InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, |
|
| 83 | + 'user to remove as applicable' |
|
| 84 | + )->addOption( |
|
| 85 | + 'add-group', |
|
| 86 | + '', |
|
| 87 | + InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, |
|
| 88 | + 'group to add as applicable' |
|
| 89 | + )->addOption( |
|
| 90 | + 'remove-group', |
|
| 91 | + '', |
|
| 92 | + InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, |
|
| 93 | + 'group to remove as applicable' |
|
| 94 | + )->addOption( |
|
| 95 | + 'remove-all', |
|
| 96 | + '', |
|
| 97 | + InputOption::VALUE_NONE, |
|
| 98 | + 'Set the mount to be globally applicable' |
|
| 99 | + ); |
|
| 100 | + parent::configure(); |
|
| 101 | + } |
|
| 102 | 102 | |
| 103 | - protected function execute(InputInterface $input, OutputInterface $output): int { |
|
| 104 | - $mountId = $input->getArgument('mount_id'); |
|
| 105 | - try { |
|
| 106 | - $mount = $this->globalService->getStorage($mountId); |
|
| 107 | - } catch (NotFoundException $e) { |
|
| 108 | - $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts</error>'); |
|
| 109 | - return 404; |
|
| 110 | - } |
|
| 103 | + protected function execute(InputInterface $input, OutputInterface $output): int { |
|
| 104 | + $mountId = $input->getArgument('mount_id'); |
|
| 105 | + try { |
|
| 106 | + $mount = $this->globalService->getStorage($mountId); |
|
| 107 | + } catch (NotFoundException $e) { |
|
| 108 | + $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts</error>'); |
|
| 109 | + return 404; |
|
| 110 | + } |
|
| 111 | 111 | |
| 112 | - if ($mount->getType() === StorageConfig::MOUNT_TYPE_PERSONAl) { |
|
| 113 | - $output->writeln('<error>Can\'t change applicables on personal mounts</error>'); |
|
| 114 | - return 1; |
|
| 115 | - } |
|
| 112 | + if ($mount->getType() === StorageConfig::MOUNT_TYPE_PERSONAl) { |
|
| 113 | + $output->writeln('<error>Can\'t change applicables on personal mounts</error>'); |
|
| 114 | + return 1; |
|
| 115 | + } |
|
| 116 | 116 | |
| 117 | - $addUsers = $input->getOption('add-user'); |
|
| 118 | - $removeUsers = $input->getOption('remove-user'); |
|
| 119 | - $addGroups = $input->getOption('add-group'); |
|
| 120 | - $removeGroups = $input->getOption('remove-group'); |
|
| 117 | + $addUsers = $input->getOption('add-user'); |
|
| 118 | + $removeUsers = $input->getOption('remove-user'); |
|
| 119 | + $addGroups = $input->getOption('add-group'); |
|
| 120 | + $removeGroups = $input->getOption('remove-group'); |
|
| 121 | 121 | |
| 122 | - $applicableUsers = $mount->getApplicableUsers(); |
|
| 123 | - $applicableGroups = $mount->getApplicableGroups(); |
|
| 122 | + $applicableUsers = $mount->getApplicableUsers(); |
|
| 123 | + $applicableGroups = $mount->getApplicableGroups(); |
|
| 124 | 124 | |
| 125 | - if ((count($addUsers) + count($removeUsers) + count($addGroups) + count($removeGroups) > 0) || $input->getOption('remove-all')) { |
|
| 126 | - foreach ($addUsers as $addUser) { |
|
| 127 | - if (!$this->userManager->userExists($addUser)) { |
|
| 128 | - $output->writeln('<error>User "' . $addUser . '" not found</error>'); |
|
| 129 | - return 404; |
|
| 130 | - } |
|
| 131 | - } |
|
| 132 | - foreach ($addGroups as $addGroup) { |
|
| 133 | - if (!$this->groupManager->groupExists($addGroup)) { |
|
| 134 | - $output->writeln('<error>Group "' . $addGroup . '" not found</error>'); |
|
| 135 | - return 404; |
|
| 136 | - } |
|
| 137 | - } |
|
| 125 | + if ((count($addUsers) + count($removeUsers) + count($addGroups) + count($removeGroups) > 0) || $input->getOption('remove-all')) { |
|
| 126 | + foreach ($addUsers as $addUser) { |
|
| 127 | + if (!$this->userManager->userExists($addUser)) { |
|
| 128 | + $output->writeln('<error>User "' . $addUser . '" not found</error>'); |
|
| 129 | + return 404; |
|
| 130 | + } |
|
| 131 | + } |
|
| 132 | + foreach ($addGroups as $addGroup) { |
|
| 133 | + if (!$this->groupManager->groupExists($addGroup)) { |
|
| 134 | + $output->writeln('<error>Group "' . $addGroup . '" not found</error>'); |
|
| 135 | + return 404; |
|
| 136 | + } |
|
| 137 | + } |
|
| 138 | 138 | |
| 139 | - if ($input->getOption('remove-all')) { |
|
| 140 | - $applicableUsers = []; |
|
| 141 | - $applicableGroups = []; |
|
| 142 | - } else { |
|
| 143 | - $applicableUsers = array_unique(array_merge($applicableUsers, $addUsers)); |
|
| 144 | - $applicableUsers = array_values(array_diff($applicableUsers, $removeUsers)); |
|
| 145 | - $applicableGroups = array_unique(array_merge($applicableGroups, $addGroups)); |
|
| 146 | - $applicableGroups = array_values(array_diff($applicableGroups, $removeGroups)); |
|
| 147 | - } |
|
| 148 | - $mount->setApplicableUsers($applicableUsers); |
|
| 149 | - $mount->setApplicableGroups($applicableGroups); |
|
| 150 | - $this->globalService->updateStorage($mount); |
|
| 151 | - } |
|
| 139 | + if ($input->getOption('remove-all')) { |
|
| 140 | + $applicableUsers = []; |
|
| 141 | + $applicableGroups = []; |
|
| 142 | + } else { |
|
| 143 | + $applicableUsers = array_unique(array_merge($applicableUsers, $addUsers)); |
|
| 144 | + $applicableUsers = array_values(array_diff($applicableUsers, $removeUsers)); |
|
| 145 | + $applicableGroups = array_unique(array_merge($applicableGroups, $addGroups)); |
|
| 146 | + $applicableGroups = array_values(array_diff($applicableGroups, $removeGroups)); |
|
| 147 | + } |
|
| 148 | + $mount->setApplicableUsers($applicableUsers); |
|
| 149 | + $mount->setApplicableGroups($applicableGroups); |
|
| 150 | + $this->globalService->updateStorage($mount); |
|
| 151 | + } |
|
| 152 | 152 | |
| 153 | - $this->writeArrayInOutputFormat($input, $output, [ |
|
| 154 | - 'users' => $applicableUsers, |
|
| 155 | - 'groups' => $applicableGroups |
|
| 156 | - ]); |
|
| 157 | - return 0; |
|
| 158 | - } |
|
| 153 | + $this->writeArrayInOutputFormat($input, $output, [ |
|
| 154 | + 'users' => $applicableUsers, |
|
| 155 | + 'groups' => $applicableGroups |
|
| 156 | + ]); |
|
| 157 | + return 0; |
|
| 158 | + } |
|
| 159 | 159 | } |
@@ -68,7 +68,7 @@ |
||
| 68 | 68 | try { |
| 69 | 69 | $mount = $this->globalService->getStorage($mountId); |
| 70 | 70 | } catch (NotFoundException $e) { |
| 71 | - $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>'); |
|
| 71 | + $output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts"</error>'); |
|
| 72 | 72 | return 404; |
| 73 | 73 | } |
| 74 | 74 | |
@@ -34,88 +34,88 @@ |
||
| 34 | 34 | use Symfony\Component\Console\Output\OutputInterface; |
| 35 | 35 | |
| 36 | 36 | class Config extends Base { |
| 37 | - /** |
|
| 38 | - * @var GlobalStoragesService |
|
| 39 | - */ |
|
| 40 | - protected $globalService; |
|
| 37 | + /** |
|
| 38 | + * @var GlobalStoragesService |
|
| 39 | + */ |
|
| 40 | + protected $globalService; |
|
| 41 | 41 | |
| 42 | - public function __construct(GlobalStoragesService $globalService) { |
|
| 43 | - parent::__construct(); |
|
| 44 | - $this->globalService = $globalService; |
|
| 45 | - } |
|
| 42 | + public function __construct(GlobalStoragesService $globalService) { |
|
| 43 | + parent::__construct(); |
|
| 44 | + $this->globalService = $globalService; |
|
| 45 | + } |
|
| 46 | 46 | |
| 47 | - protected function configure() { |
|
| 48 | - $this |
|
| 49 | - ->setName('files_external:config') |
|
| 50 | - ->setDescription('Manage backend configuration for a mount') |
|
| 51 | - ->addArgument( |
|
| 52 | - 'mount_id', |
|
| 53 | - InputArgument::REQUIRED, |
|
| 54 | - 'The id of the mount to edit' |
|
| 55 | - )->addArgument( |
|
| 56 | - 'key', |
|
| 57 | - InputArgument::REQUIRED, |
|
| 58 | - 'key of the config option to set/get' |
|
| 59 | - )->addArgument( |
|
| 60 | - 'value', |
|
| 61 | - InputArgument::OPTIONAL, |
|
| 62 | - 'value to set the config option to, when no value is provided the existing value will be printed' |
|
| 63 | - ); |
|
| 64 | - parent::configure(); |
|
| 65 | - } |
|
| 47 | + protected function configure() { |
|
| 48 | + $this |
|
| 49 | + ->setName('files_external:config') |
|
| 50 | + ->setDescription('Manage backend configuration for a mount') |
|
| 51 | + ->addArgument( |
|
| 52 | + 'mount_id', |
|
| 53 | + InputArgument::REQUIRED, |
|
| 54 | + 'The id of the mount to edit' |
|
| 55 | + )->addArgument( |
|
| 56 | + 'key', |
|
| 57 | + InputArgument::REQUIRED, |
|
| 58 | + 'key of the config option to set/get' |
|
| 59 | + )->addArgument( |
|
| 60 | + 'value', |
|
| 61 | + InputArgument::OPTIONAL, |
|
| 62 | + 'value to set the config option to, when no value is provided the existing value will be printed' |
|
| 63 | + ); |
|
| 64 | + parent::configure(); |
|
| 65 | + } |
|
| 66 | 66 | |
| 67 | - protected function execute(InputInterface $input, OutputInterface $output): int { |
|
| 68 | - $mountId = $input->getArgument('mount_id'); |
|
| 69 | - $key = $input->getArgument('key'); |
|
| 70 | - try { |
|
| 71 | - $mount = $this->globalService->getStorage($mountId); |
|
| 72 | - } catch (NotFoundException $e) { |
|
| 73 | - $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>'); |
|
| 74 | - return 404; |
|
| 75 | - } |
|
| 67 | + protected function execute(InputInterface $input, OutputInterface $output): int { |
|
| 68 | + $mountId = $input->getArgument('mount_id'); |
|
| 69 | + $key = $input->getArgument('key'); |
|
| 70 | + try { |
|
| 71 | + $mount = $this->globalService->getStorage($mountId); |
|
| 72 | + } catch (NotFoundException $e) { |
|
| 73 | + $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>'); |
|
| 74 | + return 404; |
|
| 75 | + } |
|
| 76 | 76 | |
| 77 | - $value = $input->getArgument('value'); |
|
| 78 | - if ($value !== null) { |
|
| 79 | - $this->setOption($mount, $key, $value, $output); |
|
| 80 | - } else { |
|
| 81 | - $this->getOption($mount, $key, $output); |
|
| 82 | - } |
|
| 83 | - return 0; |
|
| 84 | - } |
|
| 77 | + $value = $input->getArgument('value'); |
|
| 78 | + if ($value !== null) { |
|
| 79 | + $this->setOption($mount, $key, $value, $output); |
|
| 80 | + } else { |
|
| 81 | + $this->getOption($mount, $key, $output); |
|
| 82 | + } |
|
| 83 | + return 0; |
|
| 84 | + } |
|
| 85 | 85 | |
| 86 | - /** |
|
| 87 | - * @param StorageConfig $mount |
|
| 88 | - * @param string $key |
|
| 89 | - * @param OutputInterface $output |
|
| 90 | - */ |
|
| 91 | - protected function getOption(StorageConfig $mount, $key, OutputInterface $output) { |
|
| 92 | - if ($key === 'mountpoint' || $key === 'mount_point') { |
|
| 93 | - $value = $mount->getMountPoint(); |
|
| 94 | - } else { |
|
| 95 | - $value = $mount->getBackendOption($key); |
|
| 96 | - } |
|
| 97 | - if (!is_string($value) && json_decode(json_encode($value)) === $value) { // show bools and objects correctly |
|
| 98 | - $value = json_encode($value); |
|
| 99 | - } |
|
| 100 | - $output->writeln($value); |
|
| 101 | - } |
|
| 86 | + /** |
|
| 87 | + * @param StorageConfig $mount |
|
| 88 | + * @param string $key |
|
| 89 | + * @param OutputInterface $output |
|
| 90 | + */ |
|
| 91 | + protected function getOption(StorageConfig $mount, $key, OutputInterface $output) { |
|
| 92 | + if ($key === 'mountpoint' || $key === 'mount_point') { |
|
| 93 | + $value = $mount->getMountPoint(); |
|
| 94 | + } else { |
|
| 95 | + $value = $mount->getBackendOption($key); |
|
| 96 | + } |
|
| 97 | + if (!is_string($value) && json_decode(json_encode($value)) === $value) { // show bools and objects correctly |
|
| 98 | + $value = json_encode($value); |
|
| 99 | + } |
|
| 100 | + $output->writeln($value); |
|
| 101 | + } |
|
| 102 | 102 | |
| 103 | - /** |
|
| 104 | - * @param StorageConfig $mount |
|
| 105 | - * @param string $key |
|
| 106 | - * @param string $value |
|
| 107 | - * @param OutputInterface $output |
|
| 108 | - */ |
|
| 109 | - protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) { |
|
| 110 | - $decoded = json_decode($value, true); |
|
| 111 | - if (!is_null($decoded) && json_encode($decoded) === $value) { |
|
| 112 | - $value = $decoded; |
|
| 113 | - } |
|
| 114 | - if ($key === 'mountpoint' || $key === 'mount_point') { |
|
| 115 | - $mount->setMountPoint($value); |
|
| 116 | - } else { |
|
| 117 | - $mount->setBackendOption($key, $value); |
|
| 118 | - } |
|
| 119 | - $this->globalService->updateStorage($mount); |
|
| 120 | - } |
|
| 103 | + /** |
|
| 104 | + * @param StorageConfig $mount |
|
| 105 | + * @param string $key |
|
| 106 | + * @param string $value |
|
| 107 | + * @param OutputInterface $output |
|
| 108 | + */ |
|
| 109 | + protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) { |
|
| 110 | + $decoded = json_decode($value, true); |
|
| 111 | + if (!is_null($decoded) && json_encode($decoded) === $value) { |
|
| 112 | + $value = $decoded; |
|
| 113 | + } |
|
| 114 | + if ($key === 'mountpoint' || $key === 'mount_point') { |
|
| 115 | + $mount->setMountPoint($value); |
|
| 116 | + } else { |
|
| 117 | + $mount->setBackendOption($key, $value); |
|
| 118 | + } |
|
| 119 | + $this->globalService->updateStorage($mount); |
|
| 120 | + } |
|
| 121 | 121 | } |
@@ -28,50 +28,50 @@ |
||
| 28 | 28 | use Symfony\Component\Console\Output\OutputInterface; |
| 29 | 29 | |
| 30 | 30 | class Option extends Config { |
| 31 | - protected function configure() { |
|
| 32 | - $this |
|
| 33 | - ->setName('files_external:option') |
|
| 34 | - ->setDescription('Manage mount options for a mount') |
|
| 35 | - ->addArgument( |
|
| 36 | - 'mount_id', |
|
| 37 | - InputArgument::REQUIRED, |
|
| 38 | - 'The id of the mount to edit' |
|
| 39 | - )->addArgument( |
|
| 40 | - 'key', |
|
| 41 | - InputArgument::REQUIRED, |
|
| 42 | - 'key of the mount option to set/get' |
|
| 43 | - )->addArgument( |
|
| 44 | - 'value', |
|
| 45 | - InputArgument::OPTIONAL, |
|
| 46 | - 'value to set the mount option to, when no value is provided the existing value will be printed' |
|
| 47 | - ); |
|
| 48 | - } |
|
| 31 | + protected function configure() { |
|
| 32 | + $this |
|
| 33 | + ->setName('files_external:option') |
|
| 34 | + ->setDescription('Manage mount options for a mount') |
|
| 35 | + ->addArgument( |
|
| 36 | + 'mount_id', |
|
| 37 | + InputArgument::REQUIRED, |
|
| 38 | + 'The id of the mount to edit' |
|
| 39 | + )->addArgument( |
|
| 40 | + 'key', |
|
| 41 | + InputArgument::REQUIRED, |
|
| 42 | + 'key of the mount option to set/get' |
|
| 43 | + )->addArgument( |
|
| 44 | + 'value', |
|
| 45 | + InputArgument::OPTIONAL, |
|
| 46 | + 'value to set the mount option to, when no value is provided the existing value will be printed' |
|
| 47 | + ); |
|
| 48 | + } |
|
| 49 | 49 | |
| 50 | - /** |
|
| 51 | - * @param StorageConfig $mount |
|
| 52 | - * @param string $key |
|
| 53 | - * @param OutputInterface $output |
|
| 54 | - */ |
|
| 55 | - protected function getOption(StorageConfig $mount, $key, OutputInterface $output) { |
|
| 56 | - $value = $mount->getMountOption($key); |
|
| 57 | - if (!is_string($value)) { // show bools and objects correctly |
|
| 58 | - $value = json_encode($value); |
|
| 59 | - } |
|
| 60 | - $output->writeln($value); |
|
| 61 | - } |
|
| 50 | + /** |
|
| 51 | + * @param StorageConfig $mount |
|
| 52 | + * @param string $key |
|
| 53 | + * @param OutputInterface $output |
|
| 54 | + */ |
|
| 55 | + protected function getOption(StorageConfig $mount, $key, OutputInterface $output) { |
|
| 56 | + $value = $mount->getMountOption($key); |
|
| 57 | + if (!is_string($value)) { // show bools and objects correctly |
|
| 58 | + $value = json_encode($value); |
|
| 59 | + } |
|
| 60 | + $output->writeln($value); |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - /** |
|
| 64 | - * @param StorageConfig $mount |
|
| 65 | - * @param string $key |
|
| 66 | - * @param string $value |
|
| 67 | - * @param OutputInterface $output |
|
| 68 | - */ |
|
| 69 | - protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) { |
|
| 70 | - $decoded = json_decode($value, true); |
|
| 71 | - if (!is_null($decoded)) { |
|
| 72 | - $value = $decoded; |
|
| 73 | - } |
|
| 74 | - $mount->setMountOption($key, $value); |
|
| 75 | - $this->globalService->updateStorage($mount); |
|
| 76 | - } |
|
| 63 | + /** |
|
| 64 | + * @param StorageConfig $mount |
|
| 65 | + * @param string $key |
|
| 66 | + * @param string $value |
|
| 67 | + * @param OutputInterface $output |
|
| 68 | + */ |
|
| 69 | + protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) { |
|
| 70 | + $decoded = json_decode($value, true); |
|
| 71 | + if (!is_null($decoded)) { |
|
| 72 | + $value = $decoded; |
|
| 73 | + } |
|
| 74 | + $mount->setMountOption($key, $value); |
|
| 75 | + $this->globalService->updateStorage($mount); |
|
| 76 | + } |
|
| 77 | 77 | } |
@@ -71,14 +71,14 @@ discard block |
||
| 71 | 71 | $backend = $input->getArgument('backend'); |
| 72 | 72 | if ($type) { |
| 73 | 73 | if (!isset($data[$type])) { |
| 74 | - $output->writeln('<error>Invalid type "' . $type . '". Possible values are "authentication" or "storage"</error>'); |
|
| 74 | + $output->writeln('<error>Invalid type "'.$type.'". Possible values are "authentication" or "storage"</error>'); |
|
| 75 | 75 | return 1; |
| 76 | 76 | } |
| 77 | 77 | $data = $data[$type]; |
| 78 | 78 | |
| 79 | 79 | if ($backend) { |
| 80 | 80 | if (!isset($data[$backend])) { |
| 81 | - $output->writeln('<error>Unknown backend "' . $backend . '" of type "' . $type . '"</error>'); |
|
| 81 | + $output->writeln('<error>Unknown backend "'.$backend.'" of type "'.$type.'"</error>'); |
|
| 82 | 82 | return 1; |
| 83 | 83 | } |
| 84 | 84 | $data = $data[$backend]; |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | $result['storage_class'] = $backend->getStorageClass(); |
| 100 | 100 | $authBackends = $this->backendService->getAuthMechanismsByScheme(array_keys($backend->getAuthSchemes())); |
| 101 | 101 | $result['supported_authentication_backends'] = array_keys($authBackends); |
| 102 | - $authConfig = array_map(function (AuthMechanism $auth) { |
|
| 102 | + $authConfig = array_map(function(AuthMechanism $auth) { |
|
| 103 | 103 | return $this->serializeAuthBackend($auth)['configuration']; |
| 104 | 104 | }, $authBackends); |
| 105 | 105 | $result['authentication_configuration'] = array_combine(array_keys($authBackends), $authConfig); |
@@ -112,10 +112,10 @@ discard block |
||
| 112 | 112 | * @return string[] |
| 113 | 113 | */ |
| 114 | 114 | private function formatConfiguration(array $parameters) { |
| 115 | - $configuration = array_filter($parameters, function (DefinitionParameter $parameter) { |
|
| 115 | + $configuration = array_filter($parameters, function(DefinitionParameter $parameter) { |
|
| 116 | 116 | return $parameter->getType() !== DefinitionParameter::VALUE_HIDDEN; |
| 117 | 117 | }); |
| 118 | - return array_map(function (DefinitionParameter $parameter) { |
|
| 118 | + return array_map(function(DefinitionParameter $parameter) { |
|
| 119 | 119 | return $parameter->getTypeName(); |
| 120 | 120 | }, $configuration); |
| 121 | 121 | } |
@@ -33,92 +33,92 @@ |
||
| 33 | 33 | use Symfony\Component\Console\Output\OutputInterface; |
| 34 | 34 | |
| 35 | 35 | class Backends extends Base { |
| 36 | - /** @var BackendService */ |
|
| 37 | - private $backendService; |
|
| 36 | + /** @var BackendService */ |
|
| 37 | + private $backendService; |
|
| 38 | 38 | |
| 39 | - public function __construct(BackendService $backendService |
|
| 40 | - ) { |
|
| 41 | - parent::__construct(); |
|
| 39 | + public function __construct(BackendService $backendService |
|
| 40 | + ) { |
|
| 41 | + parent::__construct(); |
|
| 42 | 42 | |
| 43 | - $this->backendService = $backendService; |
|
| 44 | - } |
|
| 43 | + $this->backendService = $backendService; |
|
| 44 | + } |
|
| 45 | 45 | |
| 46 | - protected function configure() { |
|
| 47 | - $this |
|
| 48 | - ->setName('files_external:backends') |
|
| 49 | - ->setDescription('Show available authentication and storage backends') |
|
| 50 | - ->addArgument( |
|
| 51 | - 'type', |
|
| 52 | - InputArgument::OPTIONAL, |
|
| 53 | - 'only show backends of a certain type. Possible values are "authentication" or "storage"' |
|
| 54 | - )->addArgument( |
|
| 55 | - 'backend', |
|
| 56 | - InputArgument::OPTIONAL, |
|
| 57 | - 'only show information of a specific backend' |
|
| 58 | - ); |
|
| 59 | - parent::configure(); |
|
| 60 | - } |
|
| 46 | + protected function configure() { |
|
| 47 | + $this |
|
| 48 | + ->setName('files_external:backends') |
|
| 49 | + ->setDescription('Show available authentication and storage backends') |
|
| 50 | + ->addArgument( |
|
| 51 | + 'type', |
|
| 52 | + InputArgument::OPTIONAL, |
|
| 53 | + 'only show backends of a certain type. Possible values are "authentication" or "storage"' |
|
| 54 | + )->addArgument( |
|
| 55 | + 'backend', |
|
| 56 | + InputArgument::OPTIONAL, |
|
| 57 | + 'only show information of a specific backend' |
|
| 58 | + ); |
|
| 59 | + parent::configure(); |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | - protected function execute(InputInterface $input, OutputInterface $output): int { |
|
| 63 | - $authBackends = $this->backendService->getAuthMechanisms(); |
|
| 64 | - $storageBackends = $this->backendService->getBackends(); |
|
| 62 | + protected function execute(InputInterface $input, OutputInterface $output): int { |
|
| 63 | + $authBackends = $this->backendService->getAuthMechanisms(); |
|
| 64 | + $storageBackends = $this->backendService->getBackends(); |
|
| 65 | 65 | |
| 66 | - $data = [ |
|
| 67 | - 'authentication' => array_map([$this, 'serializeAuthBackend'], $authBackends), |
|
| 68 | - 'storage' => array_map([$this, 'serializeAuthBackend'], $storageBackends) |
|
| 69 | - ]; |
|
| 66 | + $data = [ |
|
| 67 | + 'authentication' => array_map([$this, 'serializeAuthBackend'], $authBackends), |
|
| 68 | + 'storage' => array_map([$this, 'serializeAuthBackend'], $storageBackends) |
|
| 69 | + ]; |
|
| 70 | 70 | |
| 71 | - $type = $input->getArgument('type'); |
|
| 72 | - $backend = $input->getArgument('backend'); |
|
| 73 | - if ($type) { |
|
| 74 | - if (!isset($data[$type])) { |
|
| 75 | - $output->writeln('<error>Invalid type "' . $type . '". Possible values are "authentication" or "storage"</error>'); |
|
| 76 | - return 1; |
|
| 77 | - } |
|
| 78 | - $data = $data[$type]; |
|
| 71 | + $type = $input->getArgument('type'); |
|
| 72 | + $backend = $input->getArgument('backend'); |
|
| 73 | + if ($type) { |
|
| 74 | + if (!isset($data[$type])) { |
|
| 75 | + $output->writeln('<error>Invalid type "' . $type . '". Possible values are "authentication" or "storage"</error>'); |
|
| 76 | + return 1; |
|
| 77 | + } |
|
| 78 | + $data = $data[$type]; |
|
| 79 | 79 | |
| 80 | - if ($backend) { |
|
| 81 | - if (!isset($data[$backend])) { |
|
| 82 | - $output->writeln('<error>Unknown backend "' . $backend . '" of type "' . $type . '"</error>'); |
|
| 83 | - return 1; |
|
| 84 | - } |
|
| 85 | - $data = $data[$backend]; |
|
| 86 | - } |
|
| 87 | - } |
|
| 80 | + if ($backend) { |
|
| 81 | + if (!isset($data[$backend])) { |
|
| 82 | + $output->writeln('<error>Unknown backend "' . $backend . '" of type "' . $type . '"</error>'); |
|
| 83 | + return 1; |
|
| 84 | + } |
|
| 85 | + $data = $data[$backend]; |
|
| 86 | + } |
|
| 87 | + } |
|
| 88 | 88 | |
| 89 | - $this->writeArrayInOutputFormat($input, $output, $data); |
|
| 90 | - return 0; |
|
| 91 | - } |
|
| 89 | + $this->writeArrayInOutputFormat($input, $output, $data); |
|
| 90 | + return 0; |
|
| 91 | + } |
|
| 92 | 92 | |
| 93 | - private function serializeAuthBackend(\JsonSerializable $backend) { |
|
| 94 | - $data = $backend->jsonSerialize(); |
|
| 95 | - $result = [ |
|
| 96 | - 'name' => $data['name'], |
|
| 97 | - 'identifier' => $data['identifier'], |
|
| 98 | - 'configuration' => $this->formatConfiguration($data['configuration']) |
|
| 99 | - ]; |
|
| 100 | - if ($backend instanceof Backend) { |
|
| 101 | - $result['storage_class'] = $backend->getStorageClass(); |
|
| 102 | - $authBackends = $this->backendService->getAuthMechanismsByScheme(array_keys($backend->getAuthSchemes())); |
|
| 103 | - $result['supported_authentication_backends'] = array_keys($authBackends); |
|
| 104 | - $authConfig = array_map(function (AuthMechanism $auth) { |
|
| 105 | - return $this->serializeAuthBackend($auth)['configuration']; |
|
| 106 | - }, $authBackends); |
|
| 107 | - $result['authentication_configuration'] = array_combine(array_keys($authBackends), $authConfig); |
|
| 108 | - } |
|
| 109 | - return $result; |
|
| 110 | - } |
|
| 93 | + private function serializeAuthBackend(\JsonSerializable $backend) { |
|
| 94 | + $data = $backend->jsonSerialize(); |
|
| 95 | + $result = [ |
|
| 96 | + 'name' => $data['name'], |
|
| 97 | + 'identifier' => $data['identifier'], |
|
| 98 | + 'configuration' => $this->formatConfiguration($data['configuration']) |
|
| 99 | + ]; |
|
| 100 | + if ($backend instanceof Backend) { |
|
| 101 | + $result['storage_class'] = $backend->getStorageClass(); |
|
| 102 | + $authBackends = $this->backendService->getAuthMechanismsByScheme(array_keys($backend->getAuthSchemes())); |
|
| 103 | + $result['supported_authentication_backends'] = array_keys($authBackends); |
|
| 104 | + $authConfig = array_map(function (AuthMechanism $auth) { |
|
| 105 | + return $this->serializeAuthBackend($auth)['configuration']; |
|
| 106 | + }, $authBackends); |
|
| 107 | + $result['authentication_configuration'] = array_combine(array_keys($authBackends), $authConfig); |
|
| 108 | + } |
|
| 109 | + return $result; |
|
| 110 | + } |
|
| 111 | 111 | |
| 112 | - /** |
|
| 113 | - * @param DefinitionParameter[] $parameters |
|
| 114 | - * @return string[] |
|
| 115 | - */ |
|
| 116 | - private function formatConfiguration(array $parameters) { |
|
| 117 | - $configuration = array_filter($parameters, function (DefinitionParameter $parameter) { |
|
| 118 | - return $parameter->getType() !== DefinitionParameter::VALUE_HIDDEN; |
|
| 119 | - }); |
|
| 120 | - return array_map(function (DefinitionParameter $parameter) { |
|
| 121 | - return $parameter->getTypeName(); |
|
| 122 | - }, $configuration); |
|
| 123 | - } |
|
| 112 | + /** |
|
| 113 | + * @param DefinitionParameter[] $parameters |
|
| 114 | + * @return string[] |
|
| 115 | + */ |
|
| 116 | + private function formatConfiguration(array $parameters) { |
|
| 117 | + $configuration = array_filter($parameters, function (DefinitionParameter $parameter) { |
|
| 118 | + return $parameter->getType() !== DefinitionParameter::VALUE_HIDDEN; |
|
| 119 | + }); |
|
| 120 | + return array_map(function (DefinitionParameter $parameter) { |
|
| 121 | + return $parameter->getTypeName(); |
|
| 122 | + }, $configuration); |
|
| 123 | + } |
|
| 124 | 124 | } |
@@ -28,55 +28,55 @@ |
||
| 28 | 28 | use OCP\Settings\IIconSection; |
| 29 | 29 | |
| 30 | 30 | class Section implements IIconSection { |
| 31 | - /** @var IL10N */ |
|
| 32 | - private $l; |
|
| 33 | - /** @var IURLGenerator */ |
|
| 34 | - private $url; |
|
| 31 | + /** @var IL10N */ |
|
| 32 | + private $l; |
|
| 33 | + /** @var IURLGenerator */ |
|
| 34 | + private $url; |
|
| 35 | 35 | |
| 36 | - /** |
|
| 37 | - * @param IURLGenerator $url |
|
| 38 | - * @param IL10N $l |
|
| 39 | - */ |
|
| 40 | - public function __construct(IURLGenerator $url, IL10N $l) { |
|
| 41 | - $this->url = $url; |
|
| 42 | - $this->l = $l; |
|
| 43 | - } |
|
| 36 | + /** |
|
| 37 | + * @param IURLGenerator $url |
|
| 38 | + * @param IL10N $l |
|
| 39 | + */ |
|
| 40 | + public function __construct(IURLGenerator $url, IL10N $l) { |
|
| 41 | + $this->url = $url; |
|
| 42 | + $this->l = $l; |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * returns the ID of the section. It is supposed to be a lower case string, |
|
| 47 | - * e.g. 'ldap' |
|
| 48 | - * |
|
| 49 | - * @returns string |
|
| 50 | - */ |
|
| 51 | - public function getID() { |
|
| 52 | - return 'externalstorages'; |
|
| 53 | - } |
|
| 45 | + /** |
|
| 46 | + * returns the ID of the section. It is supposed to be a lower case string, |
|
| 47 | + * e.g. 'ldap' |
|
| 48 | + * |
|
| 49 | + * @returns string |
|
| 50 | + */ |
|
| 51 | + public function getID() { |
|
| 52 | + return 'externalstorages'; |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - /** |
|
| 56 | - * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
| 57 | - * integration'. Use the L10N service to translate it. |
|
| 58 | - * |
|
| 59 | - * @return string |
|
| 60 | - */ |
|
| 61 | - public function getName() { |
|
| 62 | - return $this->l->t('External storages'); |
|
| 63 | - } |
|
| 55 | + /** |
|
| 56 | + * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
| 57 | + * integration'. Use the L10N service to translate it. |
|
| 58 | + * |
|
| 59 | + * @return string |
|
| 60 | + */ |
|
| 61 | + public function getName() { |
|
| 62 | + return $this->l->t('External storages'); |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - /** |
|
| 66 | - * @return int whether the form should be rather on the top or bottom of |
|
| 67 | - * the settings navigation. The sections are arranged in ascending order of |
|
| 68 | - * the priority values. It is required to return a value between 0 and 99. |
|
| 69 | - * |
|
| 70 | - * E.g.: 70 |
|
| 71 | - */ |
|
| 72 | - public function getPriority() { |
|
| 73 | - return 10; |
|
| 74 | - } |
|
| 65 | + /** |
|
| 66 | + * @return int whether the form should be rather on the top or bottom of |
|
| 67 | + * the settings navigation. The sections are arranged in ascending order of |
|
| 68 | + * the priority values. It is required to return a value between 0 and 99. |
|
| 69 | + * |
|
| 70 | + * E.g.: 70 |
|
| 71 | + */ |
|
| 72 | + public function getPriority() { |
|
| 73 | + return 10; |
|
| 74 | + } |
|
| 75 | 75 | |
| 76 | - /** |
|
| 77 | - * {@inheritdoc} |
|
| 78 | - */ |
|
| 79 | - public function getIcon() { |
|
| 80 | - return $this->url->imagePath('files_external', 'app-dark.svg'); |
|
| 81 | - } |
|
| 76 | + /** |
|
| 77 | + * {@inheritdoc} |
|
| 78 | + */ |
|
| 79 | + public function getIcon() { |
|
| 80 | + return $this->url->imagePath('files_external', 'app-dark.svg'); |
|
| 81 | + } |
|
| 82 | 82 | } |
@@ -29,43 +29,43 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | trait LegacyDependencyCheckPolyfill { |
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * @return string |
|
| 34 | - */ |
|
| 35 | - abstract public function getStorageClass(); |
|
| 32 | + /** |
|
| 33 | + * @return string |
|
| 34 | + */ |
|
| 35 | + abstract public function getStorageClass(); |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * Check if object is valid for use |
|
| 39 | - * |
|
| 40 | - * @return MissingDependency[] Unsatisfied dependencies |
|
| 41 | - */ |
|
| 42 | - public function checkDependencies() { |
|
| 43 | - $ret = []; |
|
| 37 | + /** |
|
| 38 | + * Check if object is valid for use |
|
| 39 | + * |
|
| 40 | + * @return MissingDependency[] Unsatisfied dependencies |
|
| 41 | + */ |
|
| 42 | + public function checkDependencies() { |
|
| 43 | + $ret = []; |
|
| 44 | 44 | |
| 45 | - $result = call_user_func([$this->getStorageClass(), 'checkDependencies']); |
|
| 46 | - if ($result !== true) { |
|
| 47 | - if (!is_array($result)) { |
|
| 48 | - $result = [$result]; |
|
| 49 | - } |
|
| 50 | - foreach ($result as $key => $value) { |
|
| 51 | - if (!($value instanceof MissingDependency)) { |
|
| 52 | - $module = null; |
|
| 53 | - $message = null; |
|
| 54 | - if (is_numeric($key)) { |
|
| 55 | - $module = $value; |
|
| 56 | - } else { |
|
| 57 | - $module = $key; |
|
| 58 | - $message = $value; |
|
| 59 | - } |
|
| 60 | - $value = new MissingDependency($module, $this); |
|
| 61 | - $value->setMessage($message); |
|
| 62 | - } |
|
| 63 | - $ret[] = $value; |
|
| 64 | - } |
|
| 65 | - } |
|
| 45 | + $result = call_user_func([$this->getStorageClass(), 'checkDependencies']); |
|
| 46 | + if ($result !== true) { |
|
| 47 | + if (!is_array($result)) { |
|
| 48 | + $result = [$result]; |
|
| 49 | + } |
|
| 50 | + foreach ($result as $key => $value) { |
|
| 51 | + if (!($value instanceof MissingDependency)) { |
|
| 52 | + $module = null; |
|
| 53 | + $message = null; |
|
| 54 | + if (is_numeric($key)) { |
|
| 55 | + $module = $value; |
|
| 56 | + } else { |
|
| 57 | + $module = $key; |
|
| 58 | + $message = $value; |
|
| 59 | + } |
|
| 60 | + $value = new MissingDependency($module, $this); |
|
| 61 | + $value->setMessage($message); |
|
| 62 | + } |
|
| 63 | + $ret[] = $value; |
|
| 64 | + } |
|
| 65 | + } |
|
| 66 | 66 | |
| 67 | - return $ret; |
|
| 68 | - } |
|
| 67 | + return $ret; |
|
| 68 | + } |
|
| 69 | 69 | |
| 70 | 70 | } |
| 71 | 71 | |
@@ -140,7 +140,7 @@ |
||
| 140 | 140 | * @return bool |
| 141 | 141 | */ |
| 142 | 142 | public function isFlagSet($flag) { |
| 143 | - return (bool)($this->flags & $flag); |
|
| 143 | + return (bool) ($this->flags & $flag); |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | /** |
@@ -27,191 +27,191 @@ |
||
| 27 | 27 | * Parameter for an external storage definition |
| 28 | 28 | */ |
| 29 | 29 | class DefinitionParameter implements \JsonSerializable { |
| 30 | - // placeholder value for password fields, when the client updates a storage configuration |
|
| 31 | - // placeholder values are ignored and the field is left unmodified |
|
| 32 | - public const UNMODIFIED_PLACEHOLDER = '__unmodified__'; |
|
| 33 | - |
|
| 34 | - /** Value constants */ |
|
| 35 | - public const VALUE_TEXT = 0; |
|
| 36 | - public const VALUE_BOOLEAN = 1; |
|
| 37 | - public const VALUE_PASSWORD = 2; |
|
| 38 | - public const VALUE_HIDDEN = 3; |
|
| 39 | - |
|
| 40 | - /** Flag constants */ |
|
| 41 | - public const FLAG_NONE = 0; |
|
| 42 | - public const FLAG_OPTIONAL = 1; |
|
| 43 | - public const FLAG_USER_PROVIDED = 2; |
|
| 44 | - |
|
| 45 | - /** @var string name of parameter */ |
|
| 46 | - private $name; |
|
| 47 | - |
|
| 48 | - /** @var string human-readable parameter text */ |
|
| 49 | - private $text; |
|
| 50 | - |
|
| 51 | - /** @var string human-readable parameter tooltip */ |
|
| 52 | - private $tooltip = ''; |
|
| 53 | - |
|
| 54 | - /** @var int value type, see self::VALUE_* constants */ |
|
| 55 | - private $type = self::VALUE_TEXT; |
|
| 56 | - |
|
| 57 | - /** @var int flags, see self::FLAG_* constants */ |
|
| 58 | - private $flags = self::FLAG_NONE; |
|
| 59 | - |
|
| 60 | - /** |
|
| 61 | - * @param string $name |
|
| 62 | - * @param string $text |
|
| 63 | - */ |
|
| 64 | - public function __construct($name, $text) { |
|
| 65 | - $this->name = $name; |
|
| 66 | - $this->text = $text; |
|
| 67 | - } |
|
| 68 | - |
|
| 69 | - /** |
|
| 70 | - * @return string |
|
| 71 | - */ |
|
| 72 | - public function getName() { |
|
| 73 | - return $this->name; |
|
| 74 | - } |
|
| 75 | - |
|
| 76 | - /** |
|
| 77 | - * @return string |
|
| 78 | - */ |
|
| 79 | - public function getText() { |
|
| 80 | - return $this->text; |
|
| 81 | - } |
|
| 82 | - |
|
| 83 | - /** |
|
| 84 | - * Get value type |
|
| 85 | - * |
|
| 86 | - * @return int |
|
| 87 | - */ |
|
| 88 | - public function getType() { |
|
| 89 | - return $this->type; |
|
| 90 | - } |
|
| 91 | - |
|
| 92 | - /** |
|
| 93 | - * Set value type |
|
| 94 | - * |
|
| 95 | - * @param int $type |
|
| 96 | - * @return self |
|
| 97 | - */ |
|
| 98 | - public function setType($type) { |
|
| 99 | - $this->type = $type; |
|
| 100 | - return $this; |
|
| 101 | - } |
|
| 102 | - |
|
| 103 | - /** |
|
| 104 | - * @return string |
|
| 105 | - */ |
|
| 106 | - public function getTypeName() { |
|
| 107 | - switch ($this->type) { |
|
| 108 | - case self::VALUE_BOOLEAN: |
|
| 109 | - return 'boolean'; |
|
| 110 | - case self::VALUE_TEXT: |
|
| 111 | - return 'text'; |
|
| 112 | - case self::VALUE_PASSWORD: |
|
| 113 | - return 'password'; |
|
| 114 | - default: |
|
| 115 | - return 'unknown'; |
|
| 116 | - } |
|
| 117 | - } |
|
| 118 | - |
|
| 119 | - /** |
|
| 120 | - * @return int |
|
| 121 | - */ |
|
| 122 | - public function getFlags() { |
|
| 123 | - return $this->flags; |
|
| 124 | - } |
|
| 125 | - |
|
| 126 | - /** |
|
| 127 | - * @param int $flags |
|
| 128 | - * @return self |
|
| 129 | - */ |
|
| 130 | - public function setFlags($flags) { |
|
| 131 | - $this->flags = $flags; |
|
| 132 | - return $this; |
|
| 133 | - } |
|
| 134 | - |
|
| 135 | - /** |
|
| 136 | - * @param int $flag |
|
| 137 | - * @return self |
|
| 138 | - */ |
|
| 139 | - public function setFlag($flag) { |
|
| 140 | - $this->flags |= $flag; |
|
| 141 | - return $this; |
|
| 142 | - } |
|
| 143 | - |
|
| 144 | - /** |
|
| 145 | - * @param int $flag |
|
| 146 | - * @return bool |
|
| 147 | - */ |
|
| 148 | - public function isFlagSet($flag) { |
|
| 149 | - return (bool)($this->flags & $flag); |
|
| 150 | - } |
|
| 151 | - |
|
| 152 | - /** |
|
| 153 | - * @return string |
|
| 154 | - */ |
|
| 155 | - public function getTooltip(): string { |
|
| 156 | - return $this->tooltip; |
|
| 157 | - } |
|
| 158 | - |
|
| 159 | - /** |
|
| 160 | - * @param string $tooltip |
|
| 161 | - * @return self |
|
| 162 | - */ |
|
| 163 | - public function setTooltip(string $tooltip) { |
|
| 164 | - $this->tooltip = $tooltip; |
|
| 165 | - return $this; |
|
| 166 | - } |
|
| 167 | - |
|
| 168 | - /** |
|
| 169 | - * Serialize into JSON for client-side JS |
|
| 170 | - * |
|
| 171 | - * @return string |
|
| 172 | - */ |
|
| 173 | - public function jsonSerialize() { |
|
| 174 | - return [ |
|
| 175 | - 'value' => $this->getText(), |
|
| 176 | - 'flags' => $this->getFlags(), |
|
| 177 | - 'type' => $this->getType(), |
|
| 178 | - 'tooltip' => $this->getTooltip(), |
|
| 179 | - ]; |
|
| 180 | - } |
|
| 181 | - |
|
| 182 | - public function isOptional() { |
|
| 183 | - return $this->isFlagSet(self::FLAG_OPTIONAL) || $this->isFlagSet(self::FLAG_USER_PROVIDED); |
|
| 184 | - } |
|
| 185 | - |
|
| 186 | - /** |
|
| 187 | - * Validate a parameter value against this |
|
| 188 | - * Convert type as necessary |
|
| 189 | - * |
|
| 190 | - * @param mixed $value Value to check |
|
| 191 | - * @return bool success |
|
| 192 | - */ |
|
| 193 | - public function validateValue(&$value) { |
|
| 194 | - switch ($this->getType()) { |
|
| 195 | - case self::VALUE_BOOLEAN: |
|
| 196 | - if (!is_bool($value)) { |
|
| 197 | - switch ($value) { |
|
| 198 | - case 'true': |
|
| 199 | - $value = true; |
|
| 200 | - break; |
|
| 201 | - case 'false': |
|
| 202 | - $value = false; |
|
| 203 | - break; |
|
| 204 | - default: |
|
| 205 | - return false; |
|
| 206 | - } |
|
| 207 | - } |
|
| 208 | - break; |
|
| 209 | - default: |
|
| 210 | - if (!$value && !$this->isOptional()) { |
|
| 211 | - return false; |
|
| 212 | - } |
|
| 213 | - break; |
|
| 214 | - } |
|
| 215 | - return true; |
|
| 216 | - } |
|
| 30 | + // placeholder value for password fields, when the client updates a storage configuration |
|
| 31 | + // placeholder values are ignored and the field is left unmodified |
|
| 32 | + public const UNMODIFIED_PLACEHOLDER = '__unmodified__'; |
|
| 33 | + |
|
| 34 | + /** Value constants */ |
|
| 35 | + public const VALUE_TEXT = 0; |
|
| 36 | + public const VALUE_BOOLEAN = 1; |
|
| 37 | + public const VALUE_PASSWORD = 2; |
|
| 38 | + public const VALUE_HIDDEN = 3; |
|
| 39 | + |
|
| 40 | + /** Flag constants */ |
|
| 41 | + public const FLAG_NONE = 0; |
|
| 42 | + public const FLAG_OPTIONAL = 1; |
|
| 43 | + public const FLAG_USER_PROVIDED = 2; |
|
| 44 | + |
|
| 45 | + /** @var string name of parameter */ |
|
| 46 | + private $name; |
|
| 47 | + |
|
| 48 | + /** @var string human-readable parameter text */ |
|
| 49 | + private $text; |
|
| 50 | + |
|
| 51 | + /** @var string human-readable parameter tooltip */ |
|
| 52 | + private $tooltip = ''; |
|
| 53 | + |
|
| 54 | + /** @var int value type, see self::VALUE_* constants */ |
|
| 55 | + private $type = self::VALUE_TEXT; |
|
| 56 | + |
|
| 57 | + /** @var int flags, see self::FLAG_* constants */ |
|
| 58 | + private $flags = self::FLAG_NONE; |
|
| 59 | + |
|
| 60 | + /** |
|
| 61 | + * @param string $name |
|
| 62 | + * @param string $text |
|
| 63 | + */ |
|
| 64 | + public function __construct($name, $text) { |
|
| 65 | + $this->name = $name; |
|
| 66 | + $this->text = $text; |
|
| 67 | + } |
|
| 68 | + |
|
| 69 | + /** |
|
| 70 | + * @return string |
|
| 71 | + */ |
|
| 72 | + public function getName() { |
|
| 73 | + return $this->name; |
|
| 74 | + } |
|
| 75 | + |
|
| 76 | + /** |
|
| 77 | + * @return string |
|
| 78 | + */ |
|
| 79 | + public function getText() { |
|
| 80 | + return $this->text; |
|
| 81 | + } |
|
| 82 | + |
|
| 83 | + /** |
|
| 84 | + * Get value type |
|
| 85 | + * |
|
| 86 | + * @return int |
|
| 87 | + */ |
|
| 88 | + public function getType() { |
|
| 89 | + return $this->type; |
|
| 90 | + } |
|
| 91 | + |
|
| 92 | + /** |
|
| 93 | + * Set value type |
|
| 94 | + * |
|
| 95 | + * @param int $type |
|
| 96 | + * @return self |
|
| 97 | + */ |
|
| 98 | + public function setType($type) { |
|
| 99 | + $this->type = $type; |
|
| 100 | + return $this; |
|
| 101 | + } |
|
| 102 | + |
|
| 103 | + /** |
|
| 104 | + * @return string |
|
| 105 | + */ |
|
| 106 | + public function getTypeName() { |
|
| 107 | + switch ($this->type) { |
|
| 108 | + case self::VALUE_BOOLEAN: |
|
| 109 | + return 'boolean'; |
|
| 110 | + case self::VALUE_TEXT: |
|
| 111 | + return 'text'; |
|
| 112 | + case self::VALUE_PASSWORD: |
|
| 113 | + return 'password'; |
|
| 114 | + default: |
|
| 115 | + return 'unknown'; |
|
| 116 | + } |
|
| 117 | + } |
|
| 118 | + |
|
| 119 | + /** |
|
| 120 | + * @return int |
|
| 121 | + */ |
|
| 122 | + public function getFlags() { |
|
| 123 | + return $this->flags; |
|
| 124 | + } |
|
| 125 | + |
|
| 126 | + /** |
|
| 127 | + * @param int $flags |
|
| 128 | + * @return self |
|
| 129 | + */ |
|
| 130 | + public function setFlags($flags) { |
|
| 131 | + $this->flags = $flags; |
|
| 132 | + return $this; |
|
| 133 | + } |
|
| 134 | + |
|
| 135 | + /** |
|
| 136 | + * @param int $flag |
|
| 137 | + * @return self |
|
| 138 | + */ |
|
| 139 | + public function setFlag($flag) { |
|
| 140 | + $this->flags |= $flag; |
|
| 141 | + return $this; |
|
| 142 | + } |
|
| 143 | + |
|
| 144 | + /** |
|
| 145 | + * @param int $flag |
|
| 146 | + * @return bool |
|
| 147 | + */ |
|
| 148 | + public function isFlagSet($flag) { |
|
| 149 | + return (bool)($this->flags & $flag); |
|
| 150 | + } |
|
| 151 | + |
|
| 152 | + /** |
|
| 153 | + * @return string |
|
| 154 | + */ |
|
| 155 | + public function getTooltip(): string { |
|
| 156 | + return $this->tooltip; |
|
| 157 | + } |
|
| 158 | + |
|
| 159 | + /** |
|
| 160 | + * @param string $tooltip |
|
| 161 | + * @return self |
|
| 162 | + */ |
|
| 163 | + public function setTooltip(string $tooltip) { |
|
| 164 | + $this->tooltip = $tooltip; |
|
| 165 | + return $this; |
|
| 166 | + } |
|
| 167 | + |
|
| 168 | + /** |
|
| 169 | + * Serialize into JSON for client-side JS |
|
| 170 | + * |
|
| 171 | + * @return string |
|
| 172 | + */ |
|
| 173 | + public function jsonSerialize() { |
|
| 174 | + return [ |
|
| 175 | + 'value' => $this->getText(), |
|
| 176 | + 'flags' => $this->getFlags(), |
|
| 177 | + 'type' => $this->getType(), |
|
| 178 | + 'tooltip' => $this->getTooltip(), |
|
| 179 | + ]; |
|
| 180 | + } |
|
| 181 | + |
|
| 182 | + public function isOptional() { |
|
| 183 | + return $this->isFlagSet(self::FLAG_OPTIONAL) || $this->isFlagSet(self::FLAG_USER_PROVIDED); |
|
| 184 | + } |
|
| 185 | + |
|
| 186 | + /** |
|
| 187 | + * Validate a parameter value against this |
|
| 188 | + * Convert type as necessary |
|
| 189 | + * |
|
| 190 | + * @param mixed $value Value to check |
|
| 191 | + * @return bool success |
|
| 192 | + */ |
|
| 193 | + public function validateValue(&$value) { |
|
| 194 | + switch ($this->getType()) { |
|
| 195 | + case self::VALUE_BOOLEAN: |
|
| 196 | + if (!is_bool($value)) { |
|
| 197 | + switch ($value) { |
|
| 198 | + case 'true': |
|
| 199 | + $value = true; |
|
| 200 | + break; |
|
| 201 | + case 'false': |
|
| 202 | + $value = false; |
|
| 203 | + break; |
|
| 204 | + default: |
|
| 205 | + return false; |
|
| 206 | + } |
|
| 207 | + } |
|
| 208 | + break; |
|
| 209 | + default: |
|
| 210 | + if (!$value && !$this->isOptional()) { |
|
| 211 | + return false; |
|
| 212 | + } |
|
| 213 | + break; |
|
| 214 | + } |
|
| 215 | + return true; |
|
| 216 | + } |
|
| 217 | 217 | } |
@@ -39,31 +39,31 @@ |
||
| 39 | 39 | */ |
| 40 | 40 | class SessionCredentials extends AuthMechanism { |
| 41 | 41 | |
| 42 | - /** @var CredentialsStore */ |
|
| 43 | - private $credentialsStore; |
|
| 42 | + /** @var CredentialsStore */ |
|
| 43 | + private $credentialsStore; |
|
| 44 | 44 | |
| 45 | - public function __construct(IL10N $l, CredentialsStore $credentialsStore) { |
|
| 46 | - $this->credentialsStore = $credentialsStore; |
|
| 45 | + public function __construct(IL10N $l, CredentialsStore $credentialsStore) { |
|
| 46 | + $this->credentialsStore = $credentialsStore; |
|
| 47 | 47 | |
| 48 | - $this->setIdentifier('password::sessioncredentials') |
|
| 49 | - ->setScheme(self::SCHEME_PASSWORD) |
|
| 50 | - ->setText($l->t('Log-in credentials, save in session')) |
|
| 51 | - ->addParameters([]); |
|
| 52 | - } |
|
| 48 | + $this->setIdentifier('password::sessioncredentials') |
|
| 49 | + ->setScheme(self::SCHEME_PASSWORD) |
|
| 50 | + ->setText($l->t('Log-in credentials, save in session')) |
|
| 51 | + ->addParameters([]); |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
| 55 | - try { |
|
| 56 | - $credentials = $this->credentialsStore->getLoginCredentials(); |
|
| 57 | - } catch (CredentialsUnavailableException $e) { |
|
| 58 | - throw new InsufficientDataForMeaningfulAnswerException('No session credentials saved'); |
|
| 59 | - } |
|
| 54 | + public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
| 55 | + try { |
|
| 56 | + $credentials = $this->credentialsStore->getLoginCredentials(); |
|
| 57 | + } catch (CredentialsUnavailableException $e) { |
|
| 58 | + throw new InsufficientDataForMeaningfulAnswerException('No session credentials saved'); |
|
| 59 | + } |
|
| 60 | 60 | |
| 61 | - $storage->setBackendOption('user', $credentials->getLoginName()); |
|
| 62 | - $storage->setBackendOption('password', $credentials->getPassword()); |
|
| 63 | - } |
|
| 61 | + $storage->setBackendOption('user', $credentials->getLoginName()); |
|
| 62 | + $storage->setBackendOption('password', $credentials->getPassword()); |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - public function wrapStorage(Storage $storage) { |
|
| 66 | - return new SessionStorageWrapper(['storage' => $storage]); |
|
| 67 | - } |
|
| 65 | + public function wrapStorage(Storage $storage) { |
|
| 66 | + return new SessionStorageWrapper(['storage' => $storage]); |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | 69 | } |
@@ -28,10 +28,10 @@ |
||
| 28 | 28 | * For auth mechanisms where the user needs to provide credentials |
| 29 | 29 | */ |
| 30 | 30 | interface IUserProvided { |
| 31 | - /** |
|
| 32 | - * @param IUser $user the user for which to save the user provided options |
|
| 33 | - * @param int $mountId the mount id to save the options for |
|
| 34 | - * @param array $options the user provided options |
|
| 35 | - */ |
|
| 36 | - public function saveBackendOptions(IUser $user, $mountId, array $options); |
|
| 31 | + /** |
|
| 32 | + * @param IUser $user the user for which to save the user provided options |
|
| 33 | + * @param int $mountId the mount id to save the options for |
|
| 34 | + * @param array $options the user provided options |
|
| 35 | + */ |
|
| 36 | + public function saveBackendOptions(IUser $user, $mountId, array $options); |
|
| 37 | 37 | } |