@@ -23,7 +23,7 @@ |
||
23 | 23 | */ |
24 | 24 | $state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'doSet'); |
25 | 25 | if($state === 'doSet') { |
26 | - OCP\Config::setSystemValue('ldapIgnoreNamingRules', false); |
|
26 | + OCP\Config::setSystemValue('ldapIgnoreNamingRules', false); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | $helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig()); |
@@ -22,7 +22,7 @@ |
||
22 | 22 | * |
23 | 23 | */ |
24 | 24 | $state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'doSet'); |
25 | -if($state === 'doSet') { |
|
25 | +if ($state === 'doSet') { |
|
26 | 26 | OCP\Config::setSystemValue('ldapIgnoreNamingRules', false); |
27 | 27 | } |
28 | 28 |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | <div id="emptycontent" class="hidden"> |
8 | 8 | <div class="icon-external"></div> |
9 | 9 | <h2><?php p($l->t('No external storage configured')); ?></h2> |
10 | - <p><a href="<?php p(link_to('', 'index.php/settings/personal#files_external' )); ?>"><?php p($l->t('You can add external storages in the personal settings')); ?></a></p> |
|
10 | + <p><a href="<?php p(link_to('', 'index.php/settings/personal#files_external')); ?>"><?php p($l->t('You can add external storages in the personal settings')); ?></a></p> |
|
11 | 11 | </div> |
12 | 12 | |
13 | 13 | <input type="hidden" name="dir" value="" id="dir"> |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | <tr> |
18 | 18 | <th id='headerName' class="hidden column-name"> |
19 | 19 | <div id="headerName-container"> |
20 | - <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a> |
|
20 | + <a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a> |
|
21 | 21 | </div> |
22 | 22 | </th> |
23 | 23 | <th id="headerBackend" class="hidden column-backend"> |
@@ -1,47 +1,47 @@ discard block |
||
1 | 1 | <?php |
2 | - use \OCA\Files_External\Lib\Backend\Backend; |
|
3 | - use \OCA\Files_External\Lib\Auth\AuthMechanism; |
|
4 | - use \OCA\Files_External\Lib\DefinitionParameter; |
|
5 | - use \OCA\Files_External\Service\BackendService; |
|
2 | + use \OCA\Files_External\Lib\Backend\Backend; |
|
3 | + use \OCA\Files_External\Lib\Auth\AuthMechanism; |
|
4 | + use \OCA\Files_External\Lib\DefinitionParameter; |
|
5 | + use \OCA\Files_External\Service\BackendService; |
|
6 | 6 | |
7 | - $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN || $_['allowUserMounting']; |
|
7 | + $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN || $_['allowUserMounting']; |
|
8 | 8 | |
9 | - $l->t("Enable encryption"); |
|
10 | - $l->t("Enable previews"); |
|
11 | - $l->t("Enable sharing"); |
|
12 | - $l->t("Check for changes"); |
|
13 | - $l->t("Never"); |
|
14 | - $l->t("Once every direct access"); |
|
9 | + $l->t("Enable encryption"); |
|
10 | + $l->t("Enable previews"); |
|
11 | + $l->t("Enable sharing"); |
|
12 | + $l->t("Check for changes"); |
|
13 | + $l->t("Never"); |
|
14 | + $l->t("Once every direct access"); |
|
15 | 15 | |
16 | - script('files_external', 'settings'); |
|
17 | - style('files_external', 'settings'); |
|
16 | + script('files_external', 'settings'); |
|
17 | + style('files_external', 'settings'); |
|
18 | 18 | |
19 | - // load custom JS |
|
20 | - foreach ($_['backends'] as $backend) { |
|
21 | - /** @var Backend $backend */ |
|
22 | - $scripts = $backend->getCustomJs(); |
|
23 | - foreach ($scripts as $script) { |
|
24 | - script('files_external', $script); |
|
25 | - } |
|
26 | - } |
|
27 | - foreach ($_['authMechanisms'] as $authMechanism) { |
|
28 | - /** @var AuthMechanism $authMechanism */ |
|
29 | - $scripts = $authMechanism->getCustomJs(); |
|
30 | - foreach ($scripts as $script) { |
|
31 | - script('files_external', $script); |
|
32 | - } |
|
33 | - } |
|
19 | + // load custom JS |
|
20 | + foreach ($_['backends'] as $backend) { |
|
21 | + /** @var Backend $backend */ |
|
22 | + $scripts = $backend->getCustomJs(); |
|
23 | + foreach ($scripts as $script) { |
|
24 | + script('files_external', $script); |
|
25 | + } |
|
26 | + } |
|
27 | + foreach ($_['authMechanisms'] as $authMechanism) { |
|
28 | + /** @var AuthMechanism $authMechanism */ |
|
29 | + $scripts = $authMechanism->getCustomJs(); |
|
30 | + foreach ($scripts as $script) { |
|
31 | + script('files_external', $script); |
|
32 | + } |
|
33 | + } |
|
34 | 34 | |
35 | - function writeParameterInput($parameter, $options, $classes = []) { |
|
36 | - $value = ''; |
|
37 | - if (isset($options[$parameter->getName()])) { |
|
38 | - $value = $options[$parameter->getName()]; |
|
39 | - } |
|
40 | - $placeholder = $parameter->getText(); |
|
41 | - $is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL); |
|
35 | + function writeParameterInput($parameter, $options, $classes = []) { |
|
36 | + $value = ''; |
|
37 | + if (isset($options[$parameter->getName()])) { |
|
38 | + $value = $options[$parameter->getName()]; |
|
39 | + } |
|
40 | + $placeholder = $parameter->getText(); |
|
41 | + $is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL); |
|
42 | 42 | |
43 | - switch ($parameter->getType()) { |
|
44 | - case DefinitionParameter::VALUE_PASSWORD: ?> |
|
43 | + switch ($parameter->getType()) { |
|
44 | + case DefinitionParameter::VALUE_PASSWORD: ?> |
|
45 | 45 | <?php if ($is_optional) { $classes[] = 'optional'; } ?> |
46 | 46 | <input type="password" |
47 | 47 | <?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
@@ -50,8 +50,8 @@ discard block |
||
50 | 50 | placeholder="<?php p($placeholder); ?>" |
51 | 51 | /> |
52 | 52 | <?php |
53 | - break; |
|
54 | - case DefinitionParameter::VALUE_BOOLEAN: ?> |
|
53 | + break; |
|
54 | + case DefinitionParameter::VALUE_BOOLEAN: ?> |
|
55 | 55 | <?php $checkboxId = uniqid("checkbox_"); ?> |
56 | 56 | <div> |
57 | 57 | <label> |
@@ -65,16 +65,16 @@ discard block |
||
65 | 65 | </label> |
66 | 66 | </div> |
67 | 67 | <?php |
68 | - break; |
|
69 | - case DefinitionParameter::VALUE_HIDDEN: ?> |
|
68 | + break; |
|
69 | + case DefinitionParameter::VALUE_HIDDEN: ?> |
|
70 | 70 | <input type="hidden" |
71 | 71 | <?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
72 | 72 | data-parameter="<?php p($parameter->getName()); ?>" |
73 | 73 | value="<?php p($value); ?>" |
74 | 74 | /> |
75 | 75 | <?php |
76 | - break; |
|
77 | - default: ?> |
|
76 | + break; |
|
77 | + default: ?> |
|
78 | 78 | <?php if ($is_optional) { $classes[] = 'optional'; } ?> |
79 | 79 | <input type="text" |
80 | 80 | <?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
@@ -83,8 +83,8 @@ discard block |
||
83 | 83 | placeholder="<?php p($placeholder); ?>" |
84 | 84 | /> |
85 | 85 | <?php |
86 | - } |
|
87 | - } |
|
86 | + } |
|
87 | + } |
|
88 | 88 | ?> |
89 | 89 | |
90 | 90 | <form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>"> |
@@ -122,13 +122,13 @@ discard block |
||
122 | 122 | <?php p($l->t('Add storage')); ?> |
123 | 123 | </option> |
124 | 124 | <?php |
125 | - $sortedBackends = array_filter($_['backends'], function($backend) use ($_) { |
|
126 | - return $backend->isVisibleFor($_['visibilityType']); |
|
127 | - }); |
|
128 | - uasort($sortedBackends, function($a, $b) { |
|
129 | - return strcasecmp($a->getText(), $b->getText()); |
|
130 | - }); |
|
131 | - ?> |
|
125 | + $sortedBackends = array_filter($_['backends'], function($backend) use ($_) { |
|
126 | + return $backend->isVisibleFor($_['visibilityType']); |
|
127 | + }); |
|
128 | + uasort($sortedBackends, function($a, $b) { |
|
129 | + return strcasecmp($a->getText(), $b->getText()); |
|
130 | + }); |
|
131 | + ?> |
|
132 | 132 | <?php foreach ($sortedBackends as $backend): ?> |
133 | 133 | <?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?> |
134 | 134 | <option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option> |
@@ -169,10 +169,10 @@ discard block |
||
169 | 169 | <p id="userMountingBackends"<?php if ($_['allowUserMounting'] != 'yes'): ?> class="hidden"<?php endif; ?>> |
170 | 170 | <?php p($l->t('Allow users to mount the following external storage')); ?><br /> |
171 | 171 | <?php |
172 | - $userBackends = array_filter($_['backends'], function($backend) { |
|
173 | - return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL); |
|
174 | - }); |
|
175 | - ?> |
|
172 | + $userBackends = array_filter($_['backends'], function($backend) { |
|
173 | + return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL); |
|
174 | + }); |
|
175 | + ?> |
|
176 | 176 | <?php $i = 0; foreach ($userBackends as $backend): ?> |
177 | 177 | <?php if ($deprecateTo = $backend->getDeprecateTo()): ?> |
178 | 178 | <input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" /> |
@@ -41,44 +41,44 @@ |
||
41 | 41 | $is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL); |
42 | 42 | |
43 | 43 | switch ($parameter->getType()) { |
44 | - case DefinitionParameter::VALUE_PASSWORD: ?> |
|
45 | - <?php if ($is_optional) { $classes[] = 'optional'; } ?> |
|
46 | - <input type="password" |
|
44 | + case DefinitionParameter::VALUE_PASSWORD: ?> |
|
45 | + <?php if ($is_optional) { $classes[] = 'optional'; } ?> |
|
46 | + <input type="password" |
|
47 | 47 | <?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
48 | - data-parameter="<?php p($parameter->getName()); ?>" |
|
48 | + data-parameter="<?php p($parameter->getName()); ?>" |
|
49 | 49 | value="<?php p($value); ?>" |
50 | 50 | placeholder="<?php p($placeholder); ?>" |
51 | 51 | /> |
52 | 52 | <?php |
53 | - break; |
|
54 | - case DefinitionParameter::VALUE_BOOLEAN: ?> |
|
55 | - <?php $checkboxId = uniqid("checkbox_"); ?> |
|
53 | + break; |
|
54 | + case DefinitionParameter::VALUE_BOOLEAN: ?> |
|
55 | + <?php $checkboxId = uniqid("checkbox_"); ?> |
|
56 | 56 | <div> |
57 | 57 | <label> |
58 | 58 | <input type="checkbox" |
59 | 59 | id="<?php p($checkboxId); ?>" |
60 | 60 | <?php if (!empty($classes)): ?> class="checkbox <?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
61 | - data-parameter="<?php p($parameter->getName()); ?>" |
|
61 | + data-parameter="<?php p($parameter->getName()); ?>" |
|
62 | 62 | <?php if ($value === true): ?> checked="checked"<?php endif; ?> |
63 | - /> |
|
63 | + /> |
|
64 | 64 | <?php p($placeholder); ?> |
65 | 65 | </label> |
66 | 66 | </div> |
67 | 67 | <?php |
68 | - break; |
|
69 | - case DefinitionParameter::VALUE_HIDDEN: ?> |
|
70 | - <input type="hidden" |
|
68 | + break; |
|
69 | + case DefinitionParameter::VALUE_HIDDEN: ?> |
|
70 | + <input type="hidden" |
|
71 | 71 | <?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
72 | - data-parameter="<?php p($parameter->getName()); ?>" |
|
72 | + data-parameter="<?php p($parameter->getName()); ?>" |
|
73 | 73 | value="<?php p($value); ?>" |
74 | 74 | /> |
75 | 75 | <?php |
76 | - break; |
|
77 | - default: ?> |
|
78 | - <?php if ($is_optional) { $classes[] = 'optional'; } ?> |
|
79 | - <input type="text" |
|
76 | + break; |
|
77 | + default: ?> |
|
78 | + <?php if ($is_optional) { $classes[] = 'optional'; } ?> |
|
79 | + <input type="text" |
|
80 | 80 | <?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
81 | - data-parameter="<?php p($parameter->getName()); ?>" |
|
81 | + data-parameter="<?php p($parameter->getName()); ?>" |
|
82 | 82 | value="<?php p($value); ?>" |
83 | 83 | placeholder="<?php p($placeholder); ?>" |
84 | 84 | /> |
@@ -87,9 +87,9 @@ |
||
87 | 87 | } |
88 | 88 | ?> |
89 | 89 | |
90 | -<form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>"> |
|
90 | +<form data-can-create="<?php echo $canCreateMounts ? 'true' : 'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled'] ? 'true' : 'false'; ?>"> |
|
91 | 91 | <h2 data-anchor-name="external-storage"><?php p($l->t('External storages')); ?></h2> |
92 | - <?php if (isset($_['dependencies']) and ($_['dependencies']<>'') and $canCreateMounts) print_unescaped(''.$_['dependencies'].''); ?> |
|
92 | + <?php if (isset($_['dependencies']) and ($_['dependencies'] <> '') and $canCreateMounts) print_unescaped(''.$_['dependencies'].''); ?> |
|
93 | 93 | <table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'> |
94 | 94 | <thead> |
95 | 95 | <tr> |
@@ -89,7 +89,10 @@ discard block |
||
89 | 89 | |
90 | 90 | <form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>"> |
91 | 91 | <h2 data-anchor-name="external-storage"><?php p($l->t('External storages')); ?></h2> |
92 | - <?php if (isset($_['dependencies']) and ($_['dependencies']<>'') and $canCreateMounts) print_unescaped(''.$_['dependencies'].''); ?> |
|
92 | + <?php if (isset($_['dependencies']) and ($_['dependencies']<>'') and $canCreateMounts) { |
|
93 | + print_unescaped(''.$_['dependencies'].''); |
|
94 | +} |
|
95 | +?> |
|
93 | 96 | <table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'> |
94 | 97 | <thead> |
95 | 98 | <tr> |
@@ -98,7 +101,10 @@ discard block |
||
98 | 101 | <th><?php p($l->t('External storage')); ?></th> |
99 | 102 | <th><?php p($l->t('Authentication')); ?></th> |
100 | 103 | <th><?php p($l->t('Configuration')); ?></th> |
101 | - <?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) print_unescaped('<th>'.$l->t('Available for').'</th>'); ?> |
|
104 | + <?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) { |
|
105 | + print_unescaped('<th>'.$l->t('Available for').'</th>'); |
|
106 | +} |
|
107 | +?> |
|
102 | 108 | <th> </th> |
103 | 109 | <th> </th> |
104 | 110 | </tr> |
@@ -130,7 +136,10 @@ discard block |
||
130 | 136 | }); |
131 | 137 | ?> |
132 | 138 | <?php foreach ($sortedBackends as $backend): ?> |
133 | - <?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?> |
|
139 | + <?php if ($backend->getDeprecateTo()) { |
|
140 | + continue; |
|
141 | +} |
|
142 | +// ignore deprecated backends ?> |
|
134 | 143 | <option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option> |
135 | 144 | <?php endforeach; ?> |
136 | 145 | </select> |
@@ -169,7 +178,10 @@ discard block |
||
169 | 178 | |
170 | 179 | <?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN): ?> |
171 | 180 | <input type="checkbox" name="allowUserMounting" id="allowUserMounting" class="checkbox" |
172 | - value="1" <?php if ($_['allowUserMounting'] == 'yes') print_unescaped(' checked="checked"'); ?> /> |
|
181 | + value="1" <?php if ($_['allowUserMounting'] == 'yes') { |
|
182 | + print_unescaped(' checked="checked"'); |
|
183 | +} |
|
184 | +?> /> |
|
173 | 185 | <label for="allowUserMounting"><?php p($l->t('Allow users to mount external storage')); ?></label> <span id="userMountingMsg" class="msg"></span> |
174 | 186 | |
175 | 187 | <p id="userMountingBackends"<?php if ($_['allowUserMounting'] != 'yes'): ?> class="hidden"<?php endif; ?>> |
@@ -182,8 +194,14 @@ discard block |
||
182 | 194 | <?php $i = 0; foreach ($userBackends as $backend): ?> |
183 | 195 | <?php if ($deprecateTo = $backend->getDeprecateTo()): ?> |
184 | 196 | <input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" /> |
185 | - <?php else: ?> |
|
186 | - <input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) print_unescaped(' checked="checked"'); ?> /> |
|
197 | + <?php else { |
|
198 | + : ?> |
|
199 | + <input type="checkbox" id="allowUserMountingBackends<?php p($i); |
|
200 | +} |
|
201 | +?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) { |
|
202 | + print_unescaped(' checked="checked"'); |
|
203 | +} |
|
204 | +?> /> |
|
187 | 205 | <label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br /> |
188 | 206 | <?php endif; ?> |
189 | 207 | <?php $i++; ?> |
@@ -33,42 +33,42 @@ |
||
33 | 33 | |
34 | 34 | // FIXME: currently hard-coded to Dropbox OAuth |
35 | 35 | if (isset($_POST['app_key']) && isset($_POST['app_secret'])) { |
36 | - $oauth = new Dropbox_OAuth_Curl((string)$_POST['app_key'], (string)$_POST['app_secret']); |
|
37 | - if (isset($_POST['step'])) { |
|
38 | - switch ($_POST['step']) { |
|
39 | - case 1: |
|
40 | - try { |
|
41 | - if (isset($_POST['callback'])) { |
|
42 | - $callback = (string)$_POST['callback']; |
|
43 | - } else { |
|
44 | - $callback = null; |
|
45 | - } |
|
46 | - $token = $oauth->getRequestToken(); |
|
47 | - OCP\JSON::success(array('data' => array('url' => $oauth->getAuthorizeUrl($callback), |
|
48 | - 'request_token' => $token['token'], |
|
49 | - 'request_token_secret' => $token['token_secret']))); |
|
50 | - } catch (Exception $exception) { |
|
51 | - OCP\JSON::error(array('data' => array('message' => |
|
52 | - $l->t('Fetching request tokens failed. Verify that your app key and secret are correct.')) |
|
53 | - )); |
|
54 | - } |
|
55 | - break; |
|
56 | - case 2: |
|
57 | - if (isset($_POST['request_token']) && isset($_POST['request_token_secret'])) { |
|
58 | - try { |
|
59 | - $oauth->setToken((string)$_POST['request_token'], (string)$_POST['request_token_secret']); |
|
60 | - $token = $oauth->getAccessToken(); |
|
61 | - OCP\JSON::success(array('access_token' => $token['token'], |
|
62 | - 'access_token_secret' => $token['token_secret'])); |
|
63 | - } catch (Exception $exception) { |
|
64 | - OCP\JSON::error(array('data' => array('message' => |
|
65 | - $l->t('Fetching access tokens failed. Verify that your app key and secret are correct.')) |
|
66 | - )); |
|
67 | - } |
|
68 | - } |
|
69 | - break; |
|
70 | - } |
|
71 | - } |
|
36 | + $oauth = new Dropbox_OAuth_Curl((string)$_POST['app_key'], (string)$_POST['app_secret']); |
|
37 | + if (isset($_POST['step'])) { |
|
38 | + switch ($_POST['step']) { |
|
39 | + case 1: |
|
40 | + try { |
|
41 | + if (isset($_POST['callback'])) { |
|
42 | + $callback = (string)$_POST['callback']; |
|
43 | + } else { |
|
44 | + $callback = null; |
|
45 | + } |
|
46 | + $token = $oauth->getRequestToken(); |
|
47 | + OCP\JSON::success(array('data' => array('url' => $oauth->getAuthorizeUrl($callback), |
|
48 | + 'request_token' => $token['token'], |
|
49 | + 'request_token_secret' => $token['token_secret']))); |
|
50 | + } catch (Exception $exception) { |
|
51 | + OCP\JSON::error(array('data' => array('message' => |
|
52 | + $l->t('Fetching request tokens failed. Verify that your app key and secret are correct.')) |
|
53 | + )); |
|
54 | + } |
|
55 | + break; |
|
56 | + case 2: |
|
57 | + if (isset($_POST['request_token']) && isset($_POST['request_token_secret'])) { |
|
58 | + try { |
|
59 | + $oauth->setToken((string)$_POST['request_token'], (string)$_POST['request_token_secret']); |
|
60 | + $token = $oauth->getAccessToken(); |
|
61 | + OCP\JSON::success(array('access_token' => $token['token'], |
|
62 | + 'access_token_secret' => $token['token_secret'])); |
|
63 | + } catch (Exception $exception) { |
|
64 | + OCP\JSON::error(array('data' => array('message' => |
|
65 | + $l->t('Fetching access tokens failed. Verify that your app key and secret are correct.')) |
|
66 | + )); |
|
67 | + } |
|
68 | + } |
|
69 | + break; |
|
70 | + } |
|
71 | + } |
|
72 | 72 | } else { |
73 | - OCP\JSON::error(array('data' => array('message' => $l->t('Please provide a valid app key and secret.')))); |
|
73 | + OCP\JSON::error(array('data' => array('message' => $l->t('Please provide a valid app key and secret.')))); |
|
74 | 74 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | * along with this program. If not, see <http://www.gnu.org/licenses/> |
25 | 25 | * |
26 | 26 | */ |
27 | -require_once __DIR__ . '/../3rdparty/Dropbox/autoload.php'; |
|
27 | +require_once __DIR__.'/../3rdparty/Dropbox/autoload.php'; |
|
28 | 28 | |
29 | 29 | OCP\JSON::checkAppEnabled('files_external'); |
30 | 30 | OCP\JSON::checkLoggedIn(); |
@@ -33,13 +33,13 @@ discard block |
||
33 | 33 | |
34 | 34 | // FIXME: currently hard-coded to Dropbox OAuth |
35 | 35 | if (isset($_POST['app_key']) && isset($_POST['app_secret'])) { |
36 | - $oauth = new Dropbox_OAuth_Curl((string)$_POST['app_key'], (string)$_POST['app_secret']); |
|
36 | + $oauth = new Dropbox_OAuth_Curl((string) $_POST['app_key'], (string) $_POST['app_secret']); |
|
37 | 37 | if (isset($_POST['step'])) { |
38 | 38 | switch ($_POST['step']) { |
39 | 39 | case 1: |
40 | 40 | try { |
41 | 41 | if (isset($_POST['callback'])) { |
42 | - $callback = (string)$_POST['callback']; |
|
42 | + $callback = (string) $_POST['callback']; |
|
43 | 43 | } else { |
44 | 44 | $callback = null; |
45 | 45 | } |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | case 2: |
57 | 57 | if (isset($_POST['request_token']) && isset($_POST['request_token_secret'])) { |
58 | 58 | try { |
59 | - $oauth->setToken((string)$_POST['request_token'], (string)$_POST['request_token_secret']); |
|
59 | + $oauth->setToken((string) $_POST['request_token'], (string) $_POST['request_token_secret']); |
|
60 | 60 | $token = $oauth->getAccessToken(); |
61 | 61 | OCP\JSON::success(array('access_token' => $token['token'], |
62 | 62 | 'access_token_secret' => $token['token_secret'])); |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | * |
29 | 29 | */ |
30 | 30 | set_include_path(get_include_path().PATH_SEPARATOR. |
31 | - \OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src'); |
|
31 | + \OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src'); |
|
32 | 32 | require_once 'Google/autoload.php'; |
33 | 33 | |
34 | 34 | OCP\JSON::checkAppEnabled('files_external'); |
@@ -38,37 +38,37 @@ discard block |
||
38 | 38 | |
39 | 39 | // FIXME: currently hard-coded to Google Drive |
40 | 40 | if (isset($_POST['client_id']) && isset($_POST['client_secret']) && isset($_POST['redirect'])) { |
41 | - $client = new Google_Client(); |
|
42 | - $client->setClientId((string)$_POST['client_id']); |
|
43 | - $client->setClientSecret((string)$_POST['client_secret']); |
|
44 | - $client->setRedirectUri((string)$_POST['redirect']); |
|
45 | - $client->setScopes(array('https://www.googleapis.com/auth/drive')); |
|
46 | - $client->setApprovalPrompt('force'); |
|
47 | - $client->setAccessType('offline'); |
|
48 | - if (isset($_POST['step'])) { |
|
49 | - $step = $_POST['step']; |
|
50 | - if ($step == 1) { |
|
51 | - try { |
|
52 | - $authUrl = $client->createAuthUrl(); |
|
53 | - OCP\JSON::success(array('data' => array( |
|
54 | - 'url' => $authUrl |
|
55 | - ))); |
|
56 | - } catch (Exception $exception) { |
|
57 | - OCP\JSON::error(array('data' => array( |
|
58 | - 'message' => $l->t('Step 1 failed. Exception: %s', array($exception->getMessage())) |
|
59 | - ))); |
|
60 | - } |
|
61 | - } else if ($step == 2 && isset($_POST['code'])) { |
|
62 | - try { |
|
63 | - $token = $client->authenticate((string)$_POST['code']); |
|
64 | - OCP\JSON::success(array('data' => array( |
|
65 | - 'token' => $token |
|
66 | - ))); |
|
67 | - } catch (Exception $exception) { |
|
68 | - OCP\JSON::error(array('data' => array( |
|
69 | - 'message' => $l->t('Step 2 failed. Exception: %s', array($exception->getMessage())) |
|
70 | - ))); |
|
71 | - } |
|
72 | - } |
|
73 | - } |
|
41 | + $client = new Google_Client(); |
|
42 | + $client->setClientId((string)$_POST['client_id']); |
|
43 | + $client->setClientSecret((string)$_POST['client_secret']); |
|
44 | + $client->setRedirectUri((string)$_POST['redirect']); |
|
45 | + $client->setScopes(array('https://www.googleapis.com/auth/drive')); |
|
46 | + $client->setApprovalPrompt('force'); |
|
47 | + $client->setAccessType('offline'); |
|
48 | + if (isset($_POST['step'])) { |
|
49 | + $step = $_POST['step']; |
|
50 | + if ($step == 1) { |
|
51 | + try { |
|
52 | + $authUrl = $client->createAuthUrl(); |
|
53 | + OCP\JSON::success(array('data' => array( |
|
54 | + 'url' => $authUrl |
|
55 | + ))); |
|
56 | + } catch (Exception $exception) { |
|
57 | + OCP\JSON::error(array('data' => array( |
|
58 | + 'message' => $l->t('Step 1 failed. Exception: %s', array($exception->getMessage())) |
|
59 | + ))); |
|
60 | + } |
|
61 | + } else if ($step == 2 && isset($_POST['code'])) { |
|
62 | + try { |
|
63 | + $token = $client->authenticate((string)$_POST['code']); |
|
64 | + OCP\JSON::success(array('data' => array( |
|
65 | + 'token' => $token |
|
66 | + ))); |
|
67 | + } catch (Exception $exception) { |
|
68 | + OCP\JSON::error(array('data' => array( |
|
69 | + 'message' => $l->t('Step 2 failed. Exception: %s', array($exception->getMessage())) |
|
70 | + ))); |
|
71 | + } |
|
72 | + } |
|
73 | + } |
|
74 | 74 | } |
@@ -39,9 +39,9 @@ discard block |
||
39 | 39 | // FIXME: currently hard-coded to Google Drive |
40 | 40 | if (isset($_POST['client_id']) && isset($_POST['client_secret']) && isset($_POST['redirect'])) { |
41 | 41 | $client = new Google_Client(); |
42 | - $client->setClientId((string)$_POST['client_id']); |
|
43 | - $client->setClientSecret((string)$_POST['client_secret']); |
|
44 | - $client->setRedirectUri((string)$_POST['redirect']); |
|
42 | + $client->setClientId((string) $_POST['client_id']); |
|
43 | + $client->setClientSecret((string) $_POST['client_secret']); |
|
44 | + $client->setRedirectUri((string) $_POST['redirect']); |
|
45 | 45 | $client->setScopes(array('https://www.googleapis.com/auth/drive')); |
46 | 46 | $client->setApprovalPrompt('force'); |
47 | 47 | $client->setAccessType('offline'); |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | } |
61 | 61 | } else if ($step == 2 && isset($_POST['code'])) { |
62 | 62 | try { |
63 | - $token = $client->authenticate((string)$_POST['code']); |
|
63 | + $token = $client->authenticate((string) $_POST['code']); |
|
64 | 64 | OCP\JSON::success(array('data' => array( |
65 | 65 | 'token' => $token |
66 | 66 | ))); |
@@ -30,23 +30,23 @@ |
||
30 | 30 | $limit = null; |
31 | 31 | $offset = null; |
32 | 32 | if (isset($_GET['pattern'])) { |
33 | - $pattern = (string)$_GET['pattern']; |
|
33 | + $pattern = (string)$_GET['pattern']; |
|
34 | 34 | } |
35 | 35 | if (isset($_GET['limit'])) { |
36 | - $limit = (int)$_GET['limit']; |
|
36 | + $limit = (int)$_GET['limit']; |
|
37 | 37 | } |
38 | 38 | if (isset($_GET['offset'])) { |
39 | - $offset = (int)$_GET['offset']; |
|
39 | + $offset = (int)$_GET['offset']; |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | $groups = []; |
43 | 43 | foreach (\OC::$server->getGroupManager()->search($pattern, $limit, $offset) as $group) { |
44 | - $groups[$group->getGID()] = $group->getGID(); |
|
44 | + $groups[$group->getGID()] = $group->getGID(); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | $users = []; |
48 | 48 | foreach (\OC::$server->getUserManager()->searchDisplayName($pattern, $limit, $offset) as $user) { |
49 | - $users[$user->getUID()] = $user->getDisplayName(); |
|
49 | + $users[$user->getUID()] = $user->getDisplayName(); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | $results = array('groups' => $groups, 'users' => $users); |
@@ -30,13 +30,13 @@ |
||
30 | 30 | $limit = null; |
31 | 31 | $offset = null; |
32 | 32 | if (isset($_GET['pattern'])) { |
33 | - $pattern = (string)$_GET['pattern']; |
|
33 | + $pattern = (string) $_GET['pattern']; |
|
34 | 34 | } |
35 | 35 | if (isset($_GET['limit'])) { |
36 | - $limit = (int)$_GET['limit']; |
|
36 | + $limit = (int) $_GET['limit']; |
|
37 | 37 | } |
38 | 38 | if (isset($_GET['offset'])) { |
39 | - $offset = (int)$_GET['offset']; |
|
39 | + $offset = (int) $_GET['offset']; |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | $groups = []; |
@@ -24,25 +24,25 @@ |
||
24 | 24 | namespace OCA\Files_External\Service; |
25 | 25 | |
26 | 26 | class ImportLegacyStoragesService extends LegacyStoragesService { |
27 | - private $data; |
|
27 | + private $data; |
|
28 | 28 | |
29 | - /** |
|
30 | - * @param BackendService $backendService |
|
31 | - */ |
|
32 | - public function __construct(BackendService $backendService) { |
|
33 | - $this->backendService = $backendService; |
|
34 | - } |
|
29 | + /** |
|
30 | + * @param BackendService $backendService |
|
31 | + */ |
|
32 | + public function __construct(BackendService $backendService) { |
|
33 | + $this->backendService = $backendService; |
|
34 | + } |
|
35 | 35 | |
36 | - public function setData($data) { |
|
37 | - $this->data = $data; |
|
38 | - } |
|
36 | + public function setData($data) { |
|
37 | + $this->data = $data; |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * Read legacy config data |
|
42 | - * |
|
43 | - * @return array list of mount configs |
|
44 | - */ |
|
45 | - protected function readLegacyConfig() { |
|
46 | - return $this->data; |
|
47 | - } |
|
40 | + /** |
|
41 | + * Read legacy config data |
|
42 | + * |
|
43 | + * @return array list of mount configs |
|
44 | + */ |
|
45 | + protected function readLegacyConfig() { |
|
46 | + return $this->data; |
|
47 | + } |
|
48 | 48 | } |
@@ -34,167 +34,167 @@ |
||
34 | 34 | */ |
35 | 35 | class UserGlobalStoragesService extends GlobalStoragesService { |
36 | 36 | |
37 | - use UserTrait; |
|
38 | - |
|
39 | - /** @var IGroupManager */ |
|
40 | - protected $groupManager; |
|
41 | - |
|
42 | - /** |
|
43 | - * @param BackendService $backendService |
|
44 | - * @param DBConfigService $dbConfig |
|
45 | - * @param IUserSession $userSession |
|
46 | - * @param IGroupManager $groupManager |
|
47 | - * @param IUserMountCache $userMountCache |
|
48 | - */ |
|
49 | - public function __construct( |
|
50 | - BackendService $backendService, |
|
51 | - DBConfigService $dbConfig, |
|
52 | - IUserSession $userSession, |
|
53 | - IGroupManager $groupManager, |
|
54 | - IUserMountCache $userMountCache |
|
55 | - ) { |
|
56 | - parent::__construct($backendService, $dbConfig, $userMountCache); |
|
57 | - $this->userSession = $userSession; |
|
58 | - $this->groupManager = $groupManager; |
|
59 | - } |
|
60 | - |
|
61 | - /** |
|
62 | - * Replace config hash ID with real IDs, for migrating legacy storages |
|
63 | - * |
|
64 | - * @param StorageConfig[] $storages Storages with real IDs |
|
65 | - * @param StorageConfig[] $storagesWithConfigHash Storages with config hash IDs |
|
66 | - */ |
|
67 | - protected function setRealStorageIds(array &$storages, array $storagesWithConfigHash) { |
|
68 | - // as a read-only view, storage IDs don't need to be real |
|
69 | - foreach ($storagesWithConfigHash as $storage) { |
|
70 | - $storages[$storage->getId()] = $storage; |
|
71 | - } |
|
72 | - } |
|
73 | - |
|
74 | - protected function readDBConfig() { |
|
75 | - $userMounts = $this->dbConfig->getAdminMountsFor(DBConfigService::APPLICABLE_TYPE_USER, $this->getUser()->getUID()); |
|
76 | - $globalMounts = $this->dbConfig->getAdminMountsFor(DBConfigService::APPLICABLE_TYPE_GLOBAL, null); |
|
77 | - $groups = $this->groupManager->getUserGroupIds($this->getUser()); |
|
78 | - if (is_array($groups) && count($groups) !== 0) { |
|
79 | - $groupMounts = $this->dbConfig->getAdminMountsForMultiple(DBConfigService::APPLICABLE_TYPE_GROUP, $groups); |
|
80 | - } else { |
|
81 | - $groupMounts = []; |
|
82 | - } |
|
83 | - return array_merge($userMounts, $groupMounts, $globalMounts); |
|
84 | - } |
|
85 | - |
|
86 | - public function addStorage(StorageConfig $newStorage) { |
|
87 | - throw new \DomainException('UserGlobalStoragesService writing disallowed'); |
|
88 | - } |
|
89 | - |
|
90 | - public function updateStorage(StorageConfig $updatedStorage) { |
|
91 | - throw new \DomainException('UserGlobalStoragesService writing disallowed'); |
|
92 | - } |
|
93 | - |
|
94 | - /** |
|
95 | - * @param integer $id |
|
96 | - */ |
|
97 | - public function removeStorage($id) { |
|
98 | - throw new \DomainException('UserGlobalStoragesService writing disallowed'); |
|
99 | - } |
|
100 | - |
|
101 | - /** |
|
102 | - * Get unique storages, in case two are defined with the same mountpoint |
|
103 | - * Higher priority storages take precedence |
|
104 | - * |
|
105 | - * @return StorageConfig[] |
|
106 | - */ |
|
107 | - public function getUniqueStorages() { |
|
108 | - $storages = $this->getStorages(); |
|
109 | - |
|
110 | - $storagesByMountpoint = []; |
|
111 | - foreach ($storages as $storage) { |
|
112 | - $storagesByMountpoint[$storage->getMountPoint()][] = $storage; |
|
113 | - } |
|
114 | - |
|
115 | - $result = []; |
|
116 | - foreach ($storagesByMountpoint as $storageList) { |
|
117 | - $storage = array_reduce($storageList, function ($carry, $item) { |
|
118 | - if (isset($carry)) { |
|
119 | - $carryPriorityType = $this->getPriorityType($carry); |
|
120 | - $itemPriorityType = $this->getPriorityType($item); |
|
121 | - if ($carryPriorityType > $itemPriorityType) { |
|
122 | - return $carry; |
|
123 | - } elseif ($carryPriorityType === $itemPriorityType) { |
|
124 | - if ($carry->getPriority() > $item->getPriority()) { |
|
125 | - return $carry; |
|
126 | - } |
|
127 | - } |
|
128 | - } |
|
129 | - return $item; |
|
130 | - }); |
|
131 | - $result[$storage->getID()] = $storage; |
|
132 | - } |
|
133 | - |
|
134 | - return $result; |
|
135 | - } |
|
136 | - |
|
137 | - /** |
|
138 | - * Get a priority 'type', where a bigger number means higher priority |
|
139 | - * user applicable > group applicable > 'all' |
|
140 | - * |
|
141 | - * @param StorageConfig $storage |
|
142 | - * @return int |
|
143 | - */ |
|
144 | - protected function getPriorityType(StorageConfig $storage) { |
|
145 | - $applicableUsers = $storage->getApplicableUsers(); |
|
146 | - $applicableGroups = $storage->getApplicableGroups(); |
|
147 | - |
|
148 | - if ($applicableUsers && $applicableUsers[0] !== 'all') { |
|
149 | - return 2; |
|
150 | - } |
|
151 | - if ($applicableGroups) { |
|
152 | - return 1; |
|
153 | - } |
|
154 | - return 0; |
|
155 | - } |
|
156 | - |
|
157 | - protected function isApplicable(StorageConfig $config) { |
|
158 | - $applicableUsers = $config->getApplicableUsers(); |
|
159 | - $applicableGroups = $config->getApplicableGroups(); |
|
160 | - |
|
161 | - if (count($applicableUsers) === 0 && count($applicableGroups) === 0) { |
|
162 | - return true; |
|
163 | - } |
|
164 | - if (in_array($this->getUser()->getUID(), $applicableUsers, true)) { |
|
165 | - return true; |
|
166 | - } |
|
167 | - $groupIds = $this->groupManager->getUserGroupIds($this->getUser()); |
|
168 | - foreach ($groupIds as $groupId) { |
|
169 | - if (in_array($groupId, $applicableGroups, true)) { |
|
170 | - return true; |
|
171 | - } |
|
172 | - } |
|
173 | - return false; |
|
174 | - } |
|
175 | - |
|
176 | - |
|
177 | - /** |
|
178 | - * Gets all storages for the user, admin, personal, global, etc |
|
179 | - * |
|
180 | - * @return StorageConfig[] array of storage configs |
|
181 | - */ |
|
182 | - public function getAllStoragesForUser() { |
|
183 | - if (is_null($this->getUser())) { |
|
184 | - return []; |
|
185 | - } |
|
186 | - $groupIds = $this->groupManager->getUserGroupIds($this->getUser()); |
|
187 | - $mounts = $this->dbConfig->getMountsForUser($this->getUser()->getUID(), $groupIds); |
|
188 | - $configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts); |
|
189 | - $configs = array_filter($configs, function ($config) { |
|
190 | - return $config instanceof StorageConfig; |
|
191 | - }); |
|
192 | - |
|
193 | - $keys = array_map(function (StorageConfig $config) { |
|
194 | - return $config->getId(); |
|
195 | - }, $configs); |
|
196 | - |
|
197 | - $storages = array_combine($keys, $configs); |
|
198 | - return array_filter($storages, [$this, 'validateStorage']); |
|
199 | - } |
|
37 | + use UserTrait; |
|
38 | + |
|
39 | + /** @var IGroupManager */ |
|
40 | + protected $groupManager; |
|
41 | + |
|
42 | + /** |
|
43 | + * @param BackendService $backendService |
|
44 | + * @param DBConfigService $dbConfig |
|
45 | + * @param IUserSession $userSession |
|
46 | + * @param IGroupManager $groupManager |
|
47 | + * @param IUserMountCache $userMountCache |
|
48 | + */ |
|
49 | + public function __construct( |
|
50 | + BackendService $backendService, |
|
51 | + DBConfigService $dbConfig, |
|
52 | + IUserSession $userSession, |
|
53 | + IGroupManager $groupManager, |
|
54 | + IUserMountCache $userMountCache |
|
55 | + ) { |
|
56 | + parent::__construct($backendService, $dbConfig, $userMountCache); |
|
57 | + $this->userSession = $userSession; |
|
58 | + $this->groupManager = $groupManager; |
|
59 | + } |
|
60 | + |
|
61 | + /** |
|
62 | + * Replace config hash ID with real IDs, for migrating legacy storages |
|
63 | + * |
|
64 | + * @param StorageConfig[] $storages Storages with real IDs |
|
65 | + * @param StorageConfig[] $storagesWithConfigHash Storages with config hash IDs |
|
66 | + */ |
|
67 | + protected function setRealStorageIds(array &$storages, array $storagesWithConfigHash) { |
|
68 | + // as a read-only view, storage IDs don't need to be real |
|
69 | + foreach ($storagesWithConfigHash as $storage) { |
|
70 | + $storages[$storage->getId()] = $storage; |
|
71 | + } |
|
72 | + } |
|
73 | + |
|
74 | + protected function readDBConfig() { |
|
75 | + $userMounts = $this->dbConfig->getAdminMountsFor(DBConfigService::APPLICABLE_TYPE_USER, $this->getUser()->getUID()); |
|
76 | + $globalMounts = $this->dbConfig->getAdminMountsFor(DBConfigService::APPLICABLE_TYPE_GLOBAL, null); |
|
77 | + $groups = $this->groupManager->getUserGroupIds($this->getUser()); |
|
78 | + if (is_array($groups) && count($groups) !== 0) { |
|
79 | + $groupMounts = $this->dbConfig->getAdminMountsForMultiple(DBConfigService::APPLICABLE_TYPE_GROUP, $groups); |
|
80 | + } else { |
|
81 | + $groupMounts = []; |
|
82 | + } |
|
83 | + return array_merge($userMounts, $groupMounts, $globalMounts); |
|
84 | + } |
|
85 | + |
|
86 | + public function addStorage(StorageConfig $newStorage) { |
|
87 | + throw new \DomainException('UserGlobalStoragesService writing disallowed'); |
|
88 | + } |
|
89 | + |
|
90 | + public function updateStorage(StorageConfig $updatedStorage) { |
|
91 | + throw new \DomainException('UserGlobalStoragesService writing disallowed'); |
|
92 | + } |
|
93 | + |
|
94 | + /** |
|
95 | + * @param integer $id |
|
96 | + */ |
|
97 | + public function removeStorage($id) { |
|
98 | + throw new \DomainException('UserGlobalStoragesService writing disallowed'); |
|
99 | + } |
|
100 | + |
|
101 | + /** |
|
102 | + * Get unique storages, in case two are defined with the same mountpoint |
|
103 | + * Higher priority storages take precedence |
|
104 | + * |
|
105 | + * @return StorageConfig[] |
|
106 | + */ |
|
107 | + public function getUniqueStorages() { |
|
108 | + $storages = $this->getStorages(); |
|
109 | + |
|
110 | + $storagesByMountpoint = []; |
|
111 | + foreach ($storages as $storage) { |
|
112 | + $storagesByMountpoint[$storage->getMountPoint()][] = $storage; |
|
113 | + } |
|
114 | + |
|
115 | + $result = []; |
|
116 | + foreach ($storagesByMountpoint as $storageList) { |
|
117 | + $storage = array_reduce($storageList, function ($carry, $item) { |
|
118 | + if (isset($carry)) { |
|
119 | + $carryPriorityType = $this->getPriorityType($carry); |
|
120 | + $itemPriorityType = $this->getPriorityType($item); |
|
121 | + if ($carryPriorityType > $itemPriorityType) { |
|
122 | + return $carry; |
|
123 | + } elseif ($carryPriorityType === $itemPriorityType) { |
|
124 | + if ($carry->getPriority() > $item->getPriority()) { |
|
125 | + return $carry; |
|
126 | + } |
|
127 | + } |
|
128 | + } |
|
129 | + return $item; |
|
130 | + }); |
|
131 | + $result[$storage->getID()] = $storage; |
|
132 | + } |
|
133 | + |
|
134 | + return $result; |
|
135 | + } |
|
136 | + |
|
137 | + /** |
|
138 | + * Get a priority 'type', where a bigger number means higher priority |
|
139 | + * user applicable > group applicable > 'all' |
|
140 | + * |
|
141 | + * @param StorageConfig $storage |
|
142 | + * @return int |
|
143 | + */ |
|
144 | + protected function getPriorityType(StorageConfig $storage) { |
|
145 | + $applicableUsers = $storage->getApplicableUsers(); |
|
146 | + $applicableGroups = $storage->getApplicableGroups(); |
|
147 | + |
|
148 | + if ($applicableUsers && $applicableUsers[0] !== 'all') { |
|
149 | + return 2; |
|
150 | + } |
|
151 | + if ($applicableGroups) { |
|
152 | + return 1; |
|
153 | + } |
|
154 | + return 0; |
|
155 | + } |
|
156 | + |
|
157 | + protected function isApplicable(StorageConfig $config) { |
|
158 | + $applicableUsers = $config->getApplicableUsers(); |
|
159 | + $applicableGroups = $config->getApplicableGroups(); |
|
160 | + |
|
161 | + if (count($applicableUsers) === 0 && count($applicableGroups) === 0) { |
|
162 | + return true; |
|
163 | + } |
|
164 | + if (in_array($this->getUser()->getUID(), $applicableUsers, true)) { |
|
165 | + return true; |
|
166 | + } |
|
167 | + $groupIds = $this->groupManager->getUserGroupIds($this->getUser()); |
|
168 | + foreach ($groupIds as $groupId) { |
|
169 | + if (in_array($groupId, $applicableGroups, true)) { |
|
170 | + return true; |
|
171 | + } |
|
172 | + } |
|
173 | + return false; |
|
174 | + } |
|
175 | + |
|
176 | + |
|
177 | + /** |
|
178 | + * Gets all storages for the user, admin, personal, global, etc |
|
179 | + * |
|
180 | + * @return StorageConfig[] array of storage configs |
|
181 | + */ |
|
182 | + public function getAllStoragesForUser() { |
|
183 | + if (is_null($this->getUser())) { |
|
184 | + return []; |
|
185 | + } |
|
186 | + $groupIds = $this->groupManager->getUserGroupIds($this->getUser()); |
|
187 | + $mounts = $this->dbConfig->getMountsForUser($this->getUser()->getUID(), $groupIds); |
|
188 | + $configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts); |
|
189 | + $configs = array_filter($configs, function ($config) { |
|
190 | + return $config instanceof StorageConfig; |
|
191 | + }); |
|
192 | + |
|
193 | + $keys = array_map(function (StorageConfig $config) { |
|
194 | + return $config->getId(); |
|
195 | + }, $configs); |
|
196 | + |
|
197 | + $storages = array_combine($keys, $configs); |
|
198 | + return array_filter($storages, [$this, 'validateStorage']); |
|
199 | + } |
|
200 | 200 | } |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | |
115 | 115 | $result = []; |
116 | 116 | foreach ($storagesByMountpoint as $storageList) { |
117 | - $storage = array_reduce($storageList, function ($carry, $item) { |
|
117 | + $storage = array_reduce($storageList, function($carry, $item) { |
|
118 | 118 | if (isset($carry)) { |
119 | 119 | $carryPriorityType = $this->getPriorityType($carry); |
120 | 120 | $itemPriorityType = $this->getPriorityType($item); |
@@ -186,11 +186,11 @@ discard block |
||
186 | 186 | $groupIds = $this->groupManager->getUserGroupIds($this->getUser()); |
187 | 187 | $mounts = $this->dbConfig->getMountsForUser($this->getUser()->getUID(), $groupIds); |
188 | 188 | $configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts); |
189 | - $configs = array_filter($configs, function ($config) { |
|
189 | + $configs = array_filter($configs, function($config) { |
|
190 | 190 | return $config instanceof StorageConfig; |
191 | 191 | }); |
192 | 192 | |
193 | - $keys = array_map(function (StorageConfig $config) { |
|
193 | + $keys = array_map(function(StorageConfig $config) { |
|
194 | 194 | return $config->getId(); |
195 | 195 | }, $configs); |
196 | 196 |
@@ -35,249 +35,249 @@ |
||
35 | 35 | */ |
36 | 36 | class BackendService { |
37 | 37 | |
38 | - /** Visibility constants for VisibilityTrait */ |
|
39 | - const VISIBILITY_NONE = 0; |
|
40 | - const VISIBILITY_PERSONAL = 1; |
|
41 | - const VISIBILITY_ADMIN = 2; |
|
42 | - //const VISIBILITY_ALIENS = 4; |
|
43 | - |
|
44 | - const VISIBILITY_DEFAULT = 3; // PERSONAL | ADMIN |
|
45 | - |
|
46 | - /** Priority constants for PriorityTrait */ |
|
47 | - const PRIORITY_DEFAULT = 100; |
|
48 | - |
|
49 | - /** @var IConfig */ |
|
50 | - protected $config; |
|
51 | - |
|
52 | - /** @var bool */ |
|
53 | - private $userMountingAllowed = true; |
|
54 | - |
|
55 | - /** @var string[] */ |
|
56 | - private $userMountingBackends = []; |
|
57 | - |
|
58 | - /** @var Backend[] */ |
|
59 | - private $backends = []; |
|
60 | - |
|
61 | - /** @var IBackendProvider[] */ |
|
62 | - private $backendProviders = []; |
|
63 | - |
|
64 | - /** @var AuthMechanism[] */ |
|
65 | - private $authMechanisms = []; |
|
66 | - |
|
67 | - /** @var IAuthMechanismProvider[] */ |
|
68 | - private $authMechanismProviders = []; |
|
69 | - |
|
70 | - /** |
|
71 | - * @param IConfig $config |
|
72 | - */ |
|
73 | - public function __construct( |
|
74 | - IConfig $config |
|
75 | - ) { |
|
76 | - $this->config = $config; |
|
77 | - |
|
78 | - // Load config values |
|
79 | - if ($this->config->getAppValue('files_external', 'allow_user_mounting', 'yes') !== 'yes') { |
|
80 | - $this->userMountingAllowed = false; |
|
81 | - } |
|
82 | - $this->userMountingBackends = explode(',', |
|
83 | - $this->config->getAppValue('files_external', 'user_mounting_backends', '') |
|
84 | - ); |
|
85 | - |
|
86 | - // if no backend is in the list an empty string is in the array and user mounting is disabled |
|
87 | - if ($this->userMountingBackends === ['']) { |
|
88 | - $this->userMountingAllowed = false; |
|
89 | - } |
|
90 | - } |
|
91 | - |
|
92 | - /** |
|
93 | - * Register a backend provider |
|
94 | - * |
|
95 | - * @since 9.1.0 |
|
96 | - * @param IBackendProvider $provider |
|
97 | - */ |
|
98 | - public function registerBackendProvider(IBackendProvider $provider) { |
|
99 | - $this->backendProviders[] = $provider; |
|
100 | - } |
|
101 | - |
|
102 | - private function loadBackendProviders() { |
|
103 | - foreach ($this->backendProviders as $provider) { |
|
104 | - $this->registerBackends($provider->getBackends()); |
|
105 | - } |
|
106 | - $this->backendProviders = []; |
|
107 | - } |
|
108 | - |
|
109 | - /** |
|
110 | - * Register an auth mechanism provider |
|
111 | - * |
|
112 | - * @since 9.1.0 |
|
113 | - * @param IAuthMechanismProvider $provider |
|
114 | - */ |
|
115 | - public function registerAuthMechanismProvider(IAuthMechanismProvider $provider) { |
|
116 | - $this->authMechanismProviders[] = $provider; |
|
117 | - } |
|
118 | - |
|
119 | - private function loadAuthMechanismProviders() { |
|
120 | - foreach ($this->authMechanismProviders as $provider) { |
|
121 | - $this->registerAuthMechanisms($provider->getAuthMechanisms()); |
|
122 | - } |
|
123 | - $this->authMechanismProviders = []; |
|
124 | - } |
|
125 | - |
|
126 | - /** |
|
127 | - * Register a backend |
|
128 | - * |
|
129 | - * @deprecated 9.1.0 use registerBackendProvider() |
|
130 | - * @param Backend $backend |
|
131 | - */ |
|
132 | - public function registerBackend(Backend $backend) { |
|
133 | - if (!$this->isAllowedUserBackend($backend)) { |
|
134 | - $backend->removeVisibility(BackendService::VISIBILITY_PERSONAL); |
|
135 | - } |
|
136 | - foreach ($backend->getIdentifierAliases() as $alias) { |
|
137 | - $this->backends[$alias] = $backend; |
|
138 | - } |
|
139 | - } |
|
140 | - |
|
141 | - /** |
|
142 | - * @deprecated 9.1.0 use registerBackendProvider() |
|
143 | - * @param Backend[] $backends |
|
144 | - */ |
|
145 | - public function registerBackends(array $backends) { |
|
146 | - foreach ($backends as $backend) { |
|
147 | - $this->registerBackend($backend); |
|
148 | - } |
|
149 | - } |
|
150 | - /** |
|
151 | - * Register an authentication mechanism |
|
152 | - * |
|
153 | - * @deprecated 9.1.0 use registerAuthMechanismProvider() |
|
154 | - * @param AuthMechanism $authMech |
|
155 | - */ |
|
156 | - public function registerAuthMechanism(AuthMechanism $authMech) { |
|
157 | - if (!$this->isAllowedAuthMechanism($authMech)) { |
|
158 | - $authMech->removeVisibility(BackendService::VISIBILITY_PERSONAL); |
|
159 | - } |
|
160 | - foreach ($authMech->getIdentifierAliases() as $alias) { |
|
161 | - $this->authMechanisms[$alias] = $authMech; |
|
162 | - } |
|
163 | - } |
|
164 | - |
|
165 | - /** |
|
166 | - * @deprecated 9.1.0 use registerAuthMechanismProvider() |
|
167 | - * @param AuthMechanism[] $mechanisms |
|
168 | - */ |
|
169 | - public function registerAuthMechanisms(array $mechanisms) { |
|
170 | - foreach ($mechanisms as $mechanism) { |
|
171 | - $this->registerAuthMechanism($mechanism); |
|
172 | - } |
|
173 | - } |
|
174 | - |
|
175 | - /** |
|
176 | - * Get all backends |
|
177 | - * |
|
178 | - * @return Backend[] |
|
179 | - */ |
|
180 | - public function getBackends() { |
|
181 | - $this->loadBackendProviders(); |
|
182 | - // only return real identifiers, no aliases |
|
183 | - $backends = []; |
|
184 | - foreach ($this->backends as $backend) { |
|
185 | - $backends[$backend->getIdentifier()] = $backend; |
|
186 | - } |
|
187 | - return $backends; |
|
188 | - } |
|
189 | - |
|
190 | - /** |
|
191 | - * Get all available backends |
|
192 | - * |
|
193 | - * @return Backend[] |
|
194 | - */ |
|
195 | - public function getAvailableBackends() { |
|
196 | - return array_filter($this->getBackends(), function($backend) { |
|
197 | - return !($backend->checkDependencies()); |
|
198 | - }); |
|
199 | - } |
|
200 | - |
|
201 | - /** |
|
202 | - * @param string $identifier |
|
203 | - * @return Backend|null |
|
204 | - */ |
|
205 | - public function getBackend($identifier) { |
|
206 | - $this->loadBackendProviders(); |
|
207 | - if (isset($this->backends[$identifier])) { |
|
208 | - return $this->backends[$identifier]; |
|
209 | - } |
|
210 | - return null; |
|
211 | - } |
|
212 | - |
|
213 | - /** |
|
214 | - * Get all authentication mechanisms |
|
215 | - * |
|
216 | - * @return AuthMechanism[] |
|
217 | - */ |
|
218 | - public function getAuthMechanisms() { |
|
219 | - $this->loadAuthMechanismProviders(); |
|
220 | - // only return real identifiers, no aliases |
|
221 | - $mechanisms = []; |
|
222 | - foreach ($this->authMechanisms as $mechanism) { |
|
223 | - $mechanisms[$mechanism->getIdentifier()] = $mechanism; |
|
224 | - } |
|
225 | - return $mechanisms; |
|
226 | - } |
|
227 | - |
|
228 | - /** |
|
229 | - * Get all authentication mechanisms for schemes |
|
230 | - * |
|
231 | - * @param string[] $schemes |
|
232 | - * @return AuthMechanism[] |
|
233 | - */ |
|
234 | - public function getAuthMechanismsByScheme(array $schemes) { |
|
235 | - return array_filter($this->getAuthMechanisms(), function($authMech) use ($schemes) { |
|
236 | - return in_array($authMech->getScheme(), $schemes, true); |
|
237 | - }); |
|
238 | - } |
|
239 | - |
|
240 | - /** |
|
241 | - * @param string $identifier |
|
242 | - * @return AuthMechanism|null |
|
243 | - */ |
|
244 | - public function getAuthMechanism($identifier) { |
|
245 | - $this->loadAuthMechanismProviders(); |
|
246 | - if (isset($this->authMechanisms[$identifier])) { |
|
247 | - return $this->authMechanisms[$identifier]; |
|
248 | - } |
|
249 | - return null; |
|
250 | - } |
|
251 | - |
|
252 | - /** |
|
253 | - * @return bool |
|
254 | - */ |
|
255 | - public function isUserMountingAllowed() { |
|
256 | - return $this->userMountingAllowed; |
|
257 | - } |
|
258 | - |
|
259 | - /** |
|
260 | - * Check a backend if a user is allowed to mount it |
|
261 | - * |
|
262 | - * @param Backend $backend |
|
263 | - * @return bool |
|
264 | - */ |
|
265 | - protected function isAllowedUserBackend(Backend $backend) { |
|
266 | - if ($this->userMountingAllowed && |
|
267 | - array_intersect($backend->getIdentifierAliases(), $this->userMountingBackends) |
|
268 | - ) { |
|
269 | - return true; |
|
270 | - } |
|
271 | - return false; |
|
272 | - } |
|
273 | - |
|
274 | - /** |
|
275 | - * Check an authentication mechanism if a user is allowed to use it |
|
276 | - * |
|
277 | - * @param AuthMechanism $authMechanism |
|
278 | - * @return bool |
|
279 | - */ |
|
280 | - protected function isAllowedAuthMechanism(AuthMechanism $authMechanism) { |
|
281 | - return true; // not implemented |
|
282 | - } |
|
38 | + /** Visibility constants for VisibilityTrait */ |
|
39 | + const VISIBILITY_NONE = 0; |
|
40 | + const VISIBILITY_PERSONAL = 1; |
|
41 | + const VISIBILITY_ADMIN = 2; |
|
42 | + //const VISIBILITY_ALIENS = 4; |
|
43 | + |
|
44 | + const VISIBILITY_DEFAULT = 3; // PERSONAL | ADMIN |
|
45 | + |
|
46 | + /** Priority constants for PriorityTrait */ |
|
47 | + const PRIORITY_DEFAULT = 100; |
|
48 | + |
|
49 | + /** @var IConfig */ |
|
50 | + protected $config; |
|
51 | + |
|
52 | + /** @var bool */ |
|
53 | + private $userMountingAllowed = true; |
|
54 | + |
|
55 | + /** @var string[] */ |
|
56 | + private $userMountingBackends = []; |
|
57 | + |
|
58 | + /** @var Backend[] */ |
|
59 | + private $backends = []; |
|
60 | + |
|
61 | + /** @var IBackendProvider[] */ |
|
62 | + private $backendProviders = []; |
|
63 | + |
|
64 | + /** @var AuthMechanism[] */ |
|
65 | + private $authMechanisms = []; |
|
66 | + |
|
67 | + /** @var IAuthMechanismProvider[] */ |
|
68 | + private $authMechanismProviders = []; |
|
69 | + |
|
70 | + /** |
|
71 | + * @param IConfig $config |
|
72 | + */ |
|
73 | + public function __construct( |
|
74 | + IConfig $config |
|
75 | + ) { |
|
76 | + $this->config = $config; |
|
77 | + |
|
78 | + // Load config values |
|
79 | + if ($this->config->getAppValue('files_external', 'allow_user_mounting', 'yes') !== 'yes') { |
|
80 | + $this->userMountingAllowed = false; |
|
81 | + } |
|
82 | + $this->userMountingBackends = explode(',', |
|
83 | + $this->config->getAppValue('files_external', 'user_mounting_backends', '') |
|
84 | + ); |
|
85 | + |
|
86 | + // if no backend is in the list an empty string is in the array and user mounting is disabled |
|
87 | + if ($this->userMountingBackends === ['']) { |
|
88 | + $this->userMountingAllowed = false; |
|
89 | + } |
|
90 | + } |
|
91 | + |
|
92 | + /** |
|
93 | + * Register a backend provider |
|
94 | + * |
|
95 | + * @since 9.1.0 |
|
96 | + * @param IBackendProvider $provider |
|
97 | + */ |
|
98 | + public function registerBackendProvider(IBackendProvider $provider) { |
|
99 | + $this->backendProviders[] = $provider; |
|
100 | + } |
|
101 | + |
|
102 | + private function loadBackendProviders() { |
|
103 | + foreach ($this->backendProviders as $provider) { |
|
104 | + $this->registerBackends($provider->getBackends()); |
|
105 | + } |
|
106 | + $this->backendProviders = []; |
|
107 | + } |
|
108 | + |
|
109 | + /** |
|
110 | + * Register an auth mechanism provider |
|
111 | + * |
|
112 | + * @since 9.1.0 |
|
113 | + * @param IAuthMechanismProvider $provider |
|
114 | + */ |
|
115 | + public function registerAuthMechanismProvider(IAuthMechanismProvider $provider) { |
|
116 | + $this->authMechanismProviders[] = $provider; |
|
117 | + } |
|
118 | + |
|
119 | + private function loadAuthMechanismProviders() { |
|
120 | + foreach ($this->authMechanismProviders as $provider) { |
|
121 | + $this->registerAuthMechanisms($provider->getAuthMechanisms()); |
|
122 | + } |
|
123 | + $this->authMechanismProviders = []; |
|
124 | + } |
|
125 | + |
|
126 | + /** |
|
127 | + * Register a backend |
|
128 | + * |
|
129 | + * @deprecated 9.1.0 use registerBackendProvider() |
|
130 | + * @param Backend $backend |
|
131 | + */ |
|
132 | + public function registerBackend(Backend $backend) { |
|
133 | + if (!$this->isAllowedUserBackend($backend)) { |
|
134 | + $backend->removeVisibility(BackendService::VISIBILITY_PERSONAL); |
|
135 | + } |
|
136 | + foreach ($backend->getIdentifierAliases() as $alias) { |
|
137 | + $this->backends[$alias] = $backend; |
|
138 | + } |
|
139 | + } |
|
140 | + |
|
141 | + /** |
|
142 | + * @deprecated 9.1.0 use registerBackendProvider() |
|
143 | + * @param Backend[] $backends |
|
144 | + */ |
|
145 | + public function registerBackends(array $backends) { |
|
146 | + foreach ($backends as $backend) { |
|
147 | + $this->registerBackend($backend); |
|
148 | + } |
|
149 | + } |
|
150 | + /** |
|
151 | + * Register an authentication mechanism |
|
152 | + * |
|
153 | + * @deprecated 9.1.0 use registerAuthMechanismProvider() |
|
154 | + * @param AuthMechanism $authMech |
|
155 | + */ |
|
156 | + public function registerAuthMechanism(AuthMechanism $authMech) { |
|
157 | + if (!$this->isAllowedAuthMechanism($authMech)) { |
|
158 | + $authMech->removeVisibility(BackendService::VISIBILITY_PERSONAL); |
|
159 | + } |
|
160 | + foreach ($authMech->getIdentifierAliases() as $alias) { |
|
161 | + $this->authMechanisms[$alias] = $authMech; |
|
162 | + } |
|
163 | + } |
|
164 | + |
|
165 | + /** |
|
166 | + * @deprecated 9.1.0 use registerAuthMechanismProvider() |
|
167 | + * @param AuthMechanism[] $mechanisms |
|
168 | + */ |
|
169 | + public function registerAuthMechanisms(array $mechanisms) { |
|
170 | + foreach ($mechanisms as $mechanism) { |
|
171 | + $this->registerAuthMechanism($mechanism); |
|
172 | + } |
|
173 | + } |
|
174 | + |
|
175 | + /** |
|
176 | + * Get all backends |
|
177 | + * |
|
178 | + * @return Backend[] |
|
179 | + */ |
|
180 | + public function getBackends() { |
|
181 | + $this->loadBackendProviders(); |
|
182 | + // only return real identifiers, no aliases |
|
183 | + $backends = []; |
|
184 | + foreach ($this->backends as $backend) { |
|
185 | + $backends[$backend->getIdentifier()] = $backend; |
|
186 | + } |
|
187 | + return $backends; |
|
188 | + } |
|
189 | + |
|
190 | + /** |
|
191 | + * Get all available backends |
|
192 | + * |
|
193 | + * @return Backend[] |
|
194 | + */ |
|
195 | + public function getAvailableBackends() { |
|
196 | + return array_filter($this->getBackends(), function($backend) { |
|
197 | + return !($backend->checkDependencies()); |
|
198 | + }); |
|
199 | + } |
|
200 | + |
|
201 | + /** |
|
202 | + * @param string $identifier |
|
203 | + * @return Backend|null |
|
204 | + */ |
|
205 | + public function getBackend($identifier) { |
|
206 | + $this->loadBackendProviders(); |
|
207 | + if (isset($this->backends[$identifier])) { |
|
208 | + return $this->backends[$identifier]; |
|
209 | + } |
|
210 | + return null; |
|
211 | + } |
|
212 | + |
|
213 | + /** |
|
214 | + * Get all authentication mechanisms |
|
215 | + * |
|
216 | + * @return AuthMechanism[] |
|
217 | + */ |
|
218 | + public function getAuthMechanisms() { |
|
219 | + $this->loadAuthMechanismProviders(); |
|
220 | + // only return real identifiers, no aliases |
|
221 | + $mechanisms = []; |
|
222 | + foreach ($this->authMechanisms as $mechanism) { |
|
223 | + $mechanisms[$mechanism->getIdentifier()] = $mechanism; |
|
224 | + } |
|
225 | + return $mechanisms; |
|
226 | + } |
|
227 | + |
|
228 | + /** |
|
229 | + * Get all authentication mechanisms for schemes |
|
230 | + * |
|
231 | + * @param string[] $schemes |
|
232 | + * @return AuthMechanism[] |
|
233 | + */ |
|
234 | + public function getAuthMechanismsByScheme(array $schemes) { |
|
235 | + return array_filter($this->getAuthMechanisms(), function($authMech) use ($schemes) { |
|
236 | + return in_array($authMech->getScheme(), $schemes, true); |
|
237 | + }); |
|
238 | + } |
|
239 | + |
|
240 | + /** |
|
241 | + * @param string $identifier |
|
242 | + * @return AuthMechanism|null |
|
243 | + */ |
|
244 | + public function getAuthMechanism($identifier) { |
|
245 | + $this->loadAuthMechanismProviders(); |
|
246 | + if (isset($this->authMechanisms[$identifier])) { |
|
247 | + return $this->authMechanisms[$identifier]; |
|
248 | + } |
|
249 | + return null; |
|
250 | + } |
|
251 | + |
|
252 | + /** |
|
253 | + * @return bool |
|
254 | + */ |
|
255 | + public function isUserMountingAllowed() { |
|
256 | + return $this->userMountingAllowed; |
|
257 | + } |
|
258 | + |
|
259 | + /** |
|
260 | + * Check a backend if a user is allowed to mount it |
|
261 | + * |
|
262 | + * @param Backend $backend |
|
263 | + * @return bool |
|
264 | + */ |
|
265 | + protected function isAllowedUserBackend(Backend $backend) { |
|
266 | + if ($this->userMountingAllowed && |
|
267 | + array_intersect($backend->getIdentifierAliases(), $this->userMountingBackends) |
|
268 | + ) { |
|
269 | + return true; |
|
270 | + } |
|
271 | + return false; |
|
272 | + } |
|
273 | + |
|
274 | + /** |
|
275 | + * Check an authentication mechanism if a user is allowed to use it |
|
276 | + * |
|
277 | + * @param AuthMechanism $authMechanism |
|
278 | + * @return bool |
|
279 | + */ |
|
280 | + protected function isAllowedAuthMechanism(AuthMechanism $authMechanism) { |
|
281 | + return true; // not implemented |
|
282 | + } |
|
283 | 283 | } |