@@ -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 | } |
@@ -32,65 +32,65 @@ |
||
32 | 32 | |
33 | 33 | class Admin implements ISettings { |
34 | 34 | |
35 | - /** @var IManager */ |
|
36 | - private $encryptionManager; |
|
35 | + /** @var IManager */ |
|
36 | + private $encryptionManager; |
|
37 | 37 | |
38 | - /** @var GlobalStoragesService */ |
|
39 | - private $globalStoragesService; |
|
38 | + /** @var GlobalStoragesService */ |
|
39 | + private $globalStoragesService; |
|
40 | 40 | |
41 | - /** @var BackendService */ |
|
42 | - private $backendService; |
|
41 | + /** @var BackendService */ |
|
42 | + private $backendService; |
|
43 | 43 | |
44 | - /** @var GlobalAuth */ |
|
45 | - private $globalAuth; |
|
44 | + /** @var GlobalAuth */ |
|
45 | + private $globalAuth; |
|
46 | 46 | |
47 | - public function __construct( |
|
48 | - IManager $encryptionManager, |
|
49 | - GlobalStoragesService $globalStoragesService, |
|
50 | - BackendService $backendService, |
|
51 | - GlobalAuth $globalAuth |
|
52 | - ) { |
|
53 | - $this->encryptionManager = $encryptionManager; |
|
54 | - $this->globalStoragesService = $globalStoragesService; |
|
55 | - $this->backendService = $backendService; |
|
56 | - $this->globalAuth = $globalAuth; |
|
57 | - } |
|
47 | + public function __construct( |
|
48 | + IManager $encryptionManager, |
|
49 | + GlobalStoragesService $globalStoragesService, |
|
50 | + BackendService $backendService, |
|
51 | + GlobalAuth $globalAuth |
|
52 | + ) { |
|
53 | + $this->encryptionManager = $encryptionManager; |
|
54 | + $this->globalStoragesService = $globalStoragesService; |
|
55 | + $this->backendService = $backendService; |
|
56 | + $this->globalAuth = $globalAuth; |
|
57 | + } |
|
58 | 58 | |
59 | - /** |
|
60 | - * @return TemplateResponse |
|
61 | - */ |
|
62 | - public function getForm() { |
|
63 | - $parameters = [ |
|
64 | - 'encryptionEnabled' => $this->encryptionManager->isEnabled(), |
|
65 | - 'visibilityType' => BackendService::VISIBILITY_ADMIN, |
|
66 | - 'storages' => $this->globalStoragesService->getStorages(), |
|
67 | - 'backends' => $this->backendService->getAvailableBackends(), |
|
68 | - 'authMechanisms' => $this->backendService->getAuthMechanisms(), |
|
69 | - 'dependencies' => \OC_Mount_Config::dependencyMessage($this->backendService->getBackends()), |
|
70 | - 'allowUserMounting' => $this->backendService->isUserMountingAllowed(), |
|
71 | - 'globalCredentials' => $this->globalAuth->getAuth(''), |
|
72 | - 'globalCredentialsUid' => '', |
|
73 | - ]; |
|
59 | + /** |
|
60 | + * @return TemplateResponse |
|
61 | + */ |
|
62 | + public function getForm() { |
|
63 | + $parameters = [ |
|
64 | + 'encryptionEnabled' => $this->encryptionManager->isEnabled(), |
|
65 | + 'visibilityType' => BackendService::VISIBILITY_ADMIN, |
|
66 | + 'storages' => $this->globalStoragesService->getStorages(), |
|
67 | + 'backends' => $this->backendService->getAvailableBackends(), |
|
68 | + 'authMechanisms' => $this->backendService->getAuthMechanisms(), |
|
69 | + 'dependencies' => \OC_Mount_Config::dependencyMessage($this->backendService->getBackends()), |
|
70 | + 'allowUserMounting' => $this->backendService->isUserMountingAllowed(), |
|
71 | + 'globalCredentials' => $this->globalAuth->getAuth(''), |
|
72 | + 'globalCredentialsUid' => '', |
|
73 | + ]; |
|
74 | 74 | |
75 | - return new TemplateResponse('files_external', 'settings', $parameters, ''); |
|
76 | - } |
|
75 | + return new TemplateResponse('files_external', 'settings', $parameters, ''); |
|
76 | + } |
|
77 | 77 | |
78 | - /** |
|
79 | - * @return string the section ID, e.g. 'sharing' |
|
80 | - */ |
|
81 | - public function getSection() { |
|
82 | - return 'externalstorages'; |
|
83 | - } |
|
78 | + /** |
|
79 | + * @return string the section ID, e.g. 'sharing' |
|
80 | + */ |
|
81 | + public function getSection() { |
|
82 | + return 'externalstorages'; |
|
83 | + } |
|
84 | 84 | |
85 | - /** |
|
86 | - * @return int whether the form should be rather on the top or bottom of |
|
87 | - * the admin section. The forms are arranged in ascending order of the |
|
88 | - * priority values. It is required to return a value between 0 and 100. |
|
89 | - * |
|
90 | - * E.g.: 70 |
|
91 | - */ |
|
92 | - public function getPriority() { |
|
93 | - return 40; |
|
94 | - } |
|
85 | + /** |
|
86 | + * @return int whether the form should be rather on the top or bottom of |
|
87 | + * the admin section. The forms are arranged in ascending order of the |
|
88 | + * priority values. It is required to return a value between 0 and 100. |
|
89 | + * |
|
90 | + * E.g.: 70 |
|
91 | + */ |
|
92 | + public function getPriority() { |
|
93 | + return 40; |
|
94 | + } |
|
95 | 95 | |
96 | 96 | } |
@@ -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 | } |
@@ -30,10 +30,10 @@ |
||
30 | 30 | */ |
31 | 31 | interface IBackendProvider { |
32 | 32 | |
33 | - /** |
|
34 | - * @since 9.1.0 |
|
35 | - * @return Backend[] |
|
36 | - */ |
|
37 | - public function getBackends(); |
|
33 | + /** |
|
34 | + * @since 9.1.0 |
|
35 | + * @return Backend[] |
|
36 | + */ |
|
37 | + public function getBackends(); |
|
38 | 38 | |
39 | 39 | } |
@@ -30,10 +30,10 @@ |
||
30 | 30 | */ |
31 | 31 | interface IAuthMechanismProvider { |
32 | 32 | |
33 | - /** |
|
34 | - * @since 9.1.0 |
|
35 | - * @return AuthMechanism[] |
|
36 | - */ |
|
37 | - public function getAuthMechanisms(); |
|
33 | + /** |
|
34 | + * @since 9.1.0 |
|
35 | + * @return AuthMechanism[] |
|
36 | + */ |
|
37 | + public function getAuthMechanisms(); |
|
38 | 38 | |
39 | 39 | } |