@@ -32,166 +32,166 @@ |
||
32 | 32 | use OCP\Files\Mount\IMountPoint; |
33 | 33 | |
34 | 34 | class Manager implements IMountManager { |
35 | - /** @var MountPoint[] */ |
|
36 | - private $mounts = []; |
|
37 | - |
|
38 | - /** @var CappedMemoryCache */ |
|
39 | - private $pathCache; |
|
40 | - |
|
41 | - /** @var CappedMemoryCache */ |
|
42 | - private $inPathCache; |
|
43 | - |
|
44 | - public function __construct() { |
|
45 | - $this->pathCache = new CappedMemoryCache(); |
|
46 | - $this->inPathCache = new CappedMemoryCache(); |
|
47 | - } |
|
48 | - |
|
49 | - /** |
|
50 | - * @param IMountPoint $mount |
|
51 | - */ |
|
52 | - public function addMount(IMountPoint $mount) { |
|
53 | - $this->mounts[$mount->getMountPoint()] = $mount; |
|
54 | - $this->pathCache->clear(); |
|
55 | - $this->inPathCache->clear(); |
|
56 | - } |
|
57 | - |
|
58 | - /** |
|
59 | - * @param string $mountPoint |
|
60 | - */ |
|
61 | - public function removeMount(string $mountPoint) { |
|
62 | - $mountPoint = Filesystem::normalizePath($mountPoint); |
|
63 | - if (\strlen($mountPoint) > 1) { |
|
64 | - $mountPoint .= '/'; |
|
65 | - } |
|
66 | - unset($this->mounts[$mountPoint]); |
|
67 | - $this->pathCache->clear(); |
|
68 | - $this->inPathCache->clear(); |
|
69 | - } |
|
70 | - |
|
71 | - /** |
|
72 | - * @param string $mountPoint |
|
73 | - * @param string $target |
|
74 | - */ |
|
75 | - public function moveMount(string $mountPoint, string $target) { |
|
76 | - $this->mounts[$target] = $this->mounts[$mountPoint]; |
|
77 | - unset($this->mounts[$mountPoint]); |
|
78 | - $this->pathCache->clear(); |
|
79 | - $this->inPathCache->clear(); |
|
80 | - } |
|
81 | - |
|
82 | - /** |
|
83 | - * Find the mount for $path |
|
84 | - * |
|
85 | - * @param string $path |
|
86 | - * @return MountPoint|null |
|
87 | - */ |
|
88 | - public function find(string $path) { |
|
89 | - \OC_Util::setupFS(); |
|
90 | - $path = Filesystem::normalizePath($path); |
|
91 | - |
|
92 | - if (isset($this->pathCache[$path])) { |
|
93 | - return $this->pathCache[$path]; |
|
94 | - } |
|
95 | - |
|
96 | - $current = $path; |
|
97 | - while (true) { |
|
98 | - $mountPoint = $current . '/'; |
|
99 | - if (isset($this->mounts[$mountPoint])) { |
|
100 | - $this->pathCache[$path] = $this->mounts[$mountPoint]; |
|
101 | - return $this->mounts[$mountPoint]; |
|
102 | - } |
|
103 | - |
|
104 | - if ($current === '') { |
|
105 | - return null; |
|
106 | - } |
|
107 | - |
|
108 | - $current = dirname($current); |
|
109 | - if ($current === '.' || $current === '/') { |
|
110 | - $current = ''; |
|
111 | - } |
|
112 | - } |
|
113 | - } |
|
114 | - |
|
115 | - /** |
|
116 | - * Find all mounts in $path |
|
117 | - * |
|
118 | - * @param string $path |
|
119 | - * @return MountPoint[] |
|
120 | - */ |
|
121 | - public function findIn(string $path): array { |
|
122 | - \OC_Util::setupFS(); |
|
123 | - $path = $this->formatPath($path); |
|
124 | - |
|
125 | - if (isset($this->inPathCache[$path])) { |
|
126 | - return $this->inPathCache[$path]; |
|
127 | - } |
|
128 | - |
|
129 | - $result = []; |
|
130 | - $pathLength = \strlen($path); |
|
131 | - $mountPoints = array_keys($this->mounts); |
|
132 | - foreach ($mountPoints as $mountPoint) { |
|
133 | - if (substr($mountPoint, 0, $pathLength) === $path && \strlen($mountPoint) > $pathLength) { |
|
134 | - $result[] = $this->mounts[$mountPoint]; |
|
135 | - } |
|
136 | - } |
|
137 | - |
|
138 | - $this->inPathCache[$path] = $result; |
|
139 | - return $result; |
|
140 | - } |
|
141 | - |
|
142 | - public function clear() { |
|
143 | - $this->mounts = []; |
|
144 | - $this->pathCache->clear(); |
|
145 | - $this->inPathCache->clear(); |
|
146 | - } |
|
147 | - |
|
148 | - /** |
|
149 | - * Find mounts by storage id |
|
150 | - * |
|
151 | - * @param string $id |
|
152 | - * @return MountPoint[] |
|
153 | - */ |
|
154 | - public function findByStorageId(string $id): array { |
|
155 | - \OC_Util::setupFS(); |
|
156 | - if (\strlen($id) > 64) { |
|
157 | - $id = md5($id); |
|
158 | - } |
|
159 | - $result = []; |
|
160 | - foreach ($this->mounts as $mount) { |
|
161 | - if ($mount->getStorageId() === $id) { |
|
162 | - $result[] = $mount; |
|
163 | - } |
|
164 | - } |
|
165 | - return $result; |
|
166 | - } |
|
167 | - |
|
168 | - /** |
|
169 | - * @return MountPoint[] |
|
170 | - */ |
|
171 | - public function getAll(): array { |
|
172 | - return $this->mounts; |
|
173 | - } |
|
174 | - |
|
175 | - /** |
|
176 | - * Find mounts by numeric storage id |
|
177 | - * |
|
178 | - * @param int $id |
|
179 | - * @return MountPoint[] |
|
180 | - */ |
|
181 | - public function findByNumericId(int $id): array { |
|
182 | - $storageId = \OC\Files\Cache\Storage::getStorageId($id); |
|
183 | - return $this->findByStorageId($storageId); |
|
184 | - } |
|
185 | - |
|
186 | - /** |
|
187 | - * @param string $path |
|
188 | - * @return string |
|
189 | - */ |
|
190 | - private function formatPath(string $path): string { |
|
191 | - $path = Filesystem::normalizePath($path); |
|
192 | - if (\strlen($path) > 1) { |
|
193 | - $path .= '/'; |
|
194 | - } |
|
195 | - return $path; |
|
196 | - } |
|
35 | + /** @var MountPoint[] */ |
|
36 | + private $mounts = []; |
|
37 | + |
|
38 | + /** @var CappedMemoryCache */ |
|
39 | + private $pathCache; |
|
40 | + |
|
41 | + /** @var CappedMemoryCache */ |
|
42 | + private $inPathCache; |
|
43 | + |
|
44 | + public function __construct() { |
|
45 | + $this->pathCache = new CappedMemoryCache(); |
|
46 | + $this->inPathCache = new CappedMemoryCache(); |
|
47 | + } |
|
48 | + |
|
49 | + /** |
|
50 | + * @param IMountPoint $mount |
|
51 | + */ |
|
52 | + public function addMount(IMountPoint $mount) { |
|
53 | + $this->mounts[$mount->getMountPoint()] = $mount; |
|
54 | + $this->pathCache->clear(); |
|
55 | + $this->inPathCache->clear(); |
|
56 | + } |
|
57 | + |
|
58 | + /** |
|
59 | + * @param string $mountPoint |
|
60 | + */ |
|
61 | + public function removeMount(string $mountPoint) { |
|
62 | + $mountPoint = Filesystem::normalizePath($mountPoint); |
|
63 | + if (\strlen($mountPoint) > 1) { |
|
64 | + $mountPoint .= '/'; |
|
65 | + } |
|
66 | + unset($this->mounts[$mountPoint]); |
|
67 | + $this->pathCache->clear(); |
|
68 | + $this->inPathCache->clear(); |
|
69 | + } |
|
70 | + |
|
71 | + /** |
|
72 | + * @param string $mountPoint |
|
73 | + * @param string $target |
|
74 | + */ |
|
75 | + public function moveMount(string $mountPoint, string $target) { |
|
76 | + $this->mounts[$target] = $this->mounts[$mountPoint]; |
|
77 | + unset($this->mounts[$mountPoint]); |
|
78 | + $this->pathCache->clear(); |
|
79 | + $this->inPathCache->clear(); |
|
80 | + } |
|
81 | + |
|
82 | + /** |
|
83 | + * Find the mount for $path |
|
84 | + * |
|
85 | + * @param string $path |
|
86 | + * @return MountPoint|null |
|
87 | + */ |
|
88 | + public function find(string $path) { |
|
89 | + \OC_Util::setupFS(); |
|
90 | + $path = Filesystem::normalizePath($path); |
|
91 | + |
|
92 | + if (isset($this->pathCache[$path])) { |
|
93 | + return $this->pathCache[$path]; |
|
94 | + } |
|
95 | + |
|
96 | + $current = $path; |
|
97 | + while (true) { |
|
98 | + $mountPoint = $current . '/'; |
|
99 | + if (isset($this->mounts[$mountPoint])) { |
|
100 | + $this->pathCache[$path] = $this->mounts[$mountPoint]; |
|
101 | + return $this->mounts[$mountPoint]; |
|
102 | + } |
|
103 | + |
|
104 | + if ($current === '') { |
|
105 | + return null; |
|
106 | + } |
|
107 | + |
|
108 | + $current = dirname($current); |
|
109 | + if ($current === '.' || $current === '/') { |
|
110 | + $current = ''; |
|
111 | + } |
|
112 | + } |
|
113 | + } |
|
114 | + |
|
115 | + /** |
|
116 | + * Find all mounts in $path |
|
117 | + * |
|
118 | + * @param string $path |
|
119 | + * @return MountPoint[] |
|
120 | + */ |
|
121 | + public function findIn(string $path): array { |
|
122 | + \OC_Util::setupFS(); |
|
123 | + $path = $this->formatPath($path); |
|
124 | + |
|
125 | + if (isset($this->inPathCache[$path])) { |
|
126 | + return $this->inPathCache[$path]; |
|
127 | + } |
|
128 | + |
|
129 | + $result = []; |
|
130 | + $pathLength = \strlen($path); |
|
131 | + $mountPoints = array_keys($this->mounts); |
|
132 | + foreach ($mountPoints as $mountPoint) { |
|
133 | + if (substr($mountPoint, 0, $pathLength) === $path && \strlen($mountPoint) > $pathLength) { |
|
134 | + $result[] = $this->mounts[$mountPoint]; |
|
135 | + } |
|
136 | + } |
|
137 | + |
|
138 | + $this->inPathCache[$path] = $result; |
|
139 | + return $result; |
|
140 | + } |
|
141 | + |
|
142 | + public function clear() { |
|
143 | + $this->mounts = []; |
|
144 | + $this->pathCache->clear(); |
|
145 | + $this->inPathCache->clear(); |
|
146 | + } |
|
147 | + |
|
148 | + /** |
|
149 | + * Find mounts by storage id |
|
150 | + * |
|
151 | + * @param string $id |
|
152 | + * @return MountPoint[] |
|
153 | + */ |
|
154 | + public function findByStorageId(string $id): array { |
|
155 | + \OC_Util::setupFS(); |
|
156 | + if (\strlen($id) > 64) { |
|
157 | + $id = md5($id); |
|
158 | + } |
|
159 | + $result = []; |
|
160 | + foreach ($this->mounts as $mount) { |
|
161 | + if ($mount->getStorageId() === $id) { |
|
162 | + $result[] = $mount; |
|
163 | + } |
|
164 | + } |
|
165 | + return $result; |
|
166 | + } |
|
167 | + |
|
168 | + /** |
|
169 | + * @return MountPoint[] |
|
170 | + */ |
|
171 | + public function getAll(): array { |
|
172 | + return $this->mounts; |
|
173 | + } |
|
174 | + |
|
175 | + /** |
|
176 | + * Find mounts by numeric storage id |
|
177 | + * |
|
178 | + * @param int $id |
|
179 | + * @return MountPoint[] |
|
180 | + */ |
|
181 | + public function findByNumericId(int $id): array { |
|
182 | + $storageId = \OC\Files\Cache\Storage::getStorageId($id); |
|
183 | + return $this->findByStorageId($storageId); |
|
184 | + } |
|
185 | + |
|
186 | + /** |
|
187 | + * @param string $path |
|
188 | + * @return string |
|
189 | + */ |
|
190 | + private function formatPath(string $path): string { |
|
191 | + $path = Filesystem::normalizePath($path); |
|
192 | + if (\strlen($path) > 1) { |
|
193 | + $path .= '/'; |
|
194 | + } |
|
195 | + return $path; |
|
196 | + } |
|
197 | 197 | } |
@@ -29,15 +29,15 @@ |
||
29 | 29 | */ |
30 | 30 | interface ICollectBreadcrumbs extends IReporter { |
31 | 31 | |
32 | - /** |
|
33 | - * Collect breadcrumbs for crash reports |
|
34 | - * |
|
35 | - * @param string $message |
|
36 | - * @param string $category |
|
37 | - * @param array $context |
|
38 | - * |
|
39 | - * @since 15.0.0 |
|
40 | - */ |
|
41 | - public function collect(string $message, string $category, array $context = []); |
|
32 | + /** |
|
33 | + * Collect breadcrumbs for crash reports |
|
34 | + * |
|
35 | + * @param string $message |
|
36 | + * @param string $category |
|
37 | + * @param array $context |
|
38 | + * |
|
39 | + * @since 15.0.0 |
|
40 | + */ |
|
41 | + public function collect(string $message, string $category, array $context = []); |
|
42 | 42 | |
43 | 43 | } |
@@ -34,22 +34,22 @@ |
||
34 | 34 | */ |
35 | 35 | interface IProvidesIcons extends IProvider { |
36 | 36 | |
37 | - /** |
|
38 | - * Get the path to the light (white) icon of this provider |
|
39 | - * |
|
40 | - * @return String |
|
41 | - * |
|
42 | - * @since 15.0.0 |
|
43 | - */ |
|
44 | - public function getLightIcon(): String; |
|
37 | + /** |
|
38 | + * Get the path to the light (white) icon of this provider |
|
39 | + * |
|
40 | + * @return String |
|
41 | + * |
|
42 | + * @since 15.0.0 |
|
43 | + */ |
|
44 | + public function getLightIcon(): String; |
|
45 | 45 | |
46 | - /** |
|
47 | - * Get the path to the dark (black) icon of this provider |
|
48 | - * |
|
49 | - * @return String |
|
50 | - * |
|
51 | - * @since 15.0.0 |
|
52 | - */ |
|
53 | - public function getDarkIcon(): String; |
|
46 | + /** |
|
47 | + * Get the path to the dark (black) icon of this provider |
|
48 | + * |
|
49 | + * @return String |
|
50 | + * |
|
51 | + * @since 15.0.0 |
|
52 | + */ |
|
53 | + public function getDarkIcon(): String; |
|
54 | 54 | |
55 | 55 | } |
@@ -30,19 +30,19 @@ |
||
30 | 30 | |
31 | 31 | class CheckBackupCodes implements IRepairStep { |
32 | 32 | |
33 | - /** @var IJobList */ |
|
34 | - private $jobList; |
|
33 | + /** @var IJobList */ |
|
34 | + private $jobList; |
|
35 | 35 | |
36 | - public function __construct(IJobList $jobList) { |
|
37 | - $this->jobList = $jobList; |
|
38 | - } |
|
36 | + public function __construct(IJobList $jobList) { |
|
37 | + $this->jobList = $jobList; |
|
38 | + } |
|
39 | 39 | |
40 | - public function getName(): string { |
|
41 | - return 'Add background job to check for backup codes'; |
|
42 | - } |
|
40 | + public function getName(): string { |
|
41 | + return 'Add background job to check for backup codes'; |
|
42 | + } |
|
43 | 43 | |
44 | - public function run(IOutput $output) { |
|
45 | - $this->jobList->add(\OCA\TwoFactorBackupCodes\BackgroundJob\CheckBackupCodes::class); |
|
46 | - } |
|
44 | + public function run(IOutput $output) { |
|
45 | + $this->jobList->add(\OCA\TwoFactorBackupCodes\BackgroundJob\CheckBackupCodes::class); |
|
46 | + } |
|
47 | 47 | |
48 | 48 | } |
@@ -33,11 +33,11 @@ |
||
33 | 33 | */ |
34 | 34 | interface IPersonalProviderSettings { |
35 | 35 | |
36 | - /** |
|
37 | - * @return Template |
|
38 | - * |
|
39 | - * @since 15.0.0 |
|
40 | - */ |
|
41 | - public function getBody(): Template; |
|
36 | + /** |
|
37 | + * @return Template |
|
38 | + * |
|
39 | + * @since 15.0.0 |
|
40 | + */ |
|
41 | + public function getBody(): Template; |
|
42 | 42 | |
43 | 43 | } |
@@ -35,13 +35,13 @@ |
||
35 | 35 | */ |
36 | 36 | interface IProvidesPersonalSettings extends IProvider { |
37 | 37 | |
38 | - /** |
|
39 | - * @param IUser $user |
|
40 | - * |
|
41 | - * @return IPersonalProviderSettings |
|
42 | - * |
|
43 | - * @since 15.0.0 |
|
44 | - */ |
|
45 | - public function getPersonalSettings(IUser $user): IPersonalProviderSettings; |
|
38 | + /** |
|
39 | + * @param IUser $user |
|
40 | + * |
|
41 | + * @return IPersonalProviderSettings |
|
42 | + * |
|
43 | + * @since 15.0.0 |
|
44 | + */ |
|
45 | + public function getPersonalSettings(IUser $user): IPersonalProviderSettings; |
|
46 | 46 | |
47 | 47 | } |
@@ -24,11 +24,11 @@ |
||
24 | 24 | <?php if (!is_null($_['backupProvider'])): ?> |
25 | 25 | <p> |
26 | 26 | <a class="two-factor-secondary" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge', |
27 | - [ |
|
28 | - 'challengeProviderId' => $_['backupProvider']->getId(), |
|
29 | - 'redirect_url' => $_['redirect_url'], |
|
30 | - ] |
|
31 | - )) ?>"> |
|
27 | + [ |
|
28 | + 'challengeProviderId' => $_['backupProvider']->getId(), |
|
29 | + 'redirect_url' => $_['redirect_url'], |
|
30 | + ] |
|
31 | + )) ?>"> |
|
32 | 32 | <?php p($l->t('Use backup code')) ?> |
33 | 33 | </a> |
34 | 34 | </p> |
@@ -31,41 +31,41 @@ |
||
31 | 31 | */ |
32 | 32 | interface IManager { |
33 | 33 | |
34 | - /** |
|
35 | - * Registers a resource backend |
|
36 | - * |
|
37 | - * @param string $backendClass |
|
38 | - * @return void |
|
39 | - * @since 14.0.0 |
|
40 | - */ |
|
41 | - public function registerBackend(string $backendClass); |
|
34 | + /** |
|
35 | + * Registers a resource backend |
|
36 | + * |
|
37 | + * @param string $backendClass |
|
38 | + * @return void |
|
39 | + * @since 14.0.0 |
|
40 | + */ |
|
41 | + public function registerBackend(string $backendClass); |
|
42 | 42 | |
43 | - /** |
|
44 | - * Unregisters a resource backend |
|
45 | - * |
|
46 | - * @param string $backendClass |
|
47 | - * @return void |
|
48 | - * @since 14.0.0 |
|
49 | - */ |
|
50 | - public function unregisterBackend(string $backendClass); |
|
43 | + /** |
|
44 | + * Unregisters a resource backend |
|
45 | + * |
|
46 | + * @param string $backendClass |
|
47 | + * @return void |
|
48 | + * @since 14.0.0 |
|
49 | + */ |
|
50 | + public function unregisterBackend(string $backendClass); |
|
51 | 51 | |
52 | - /** |
|
53 | - * @return IBackend[] |
|
54 | - * @since 14.0.0 |
|
55 | - */ |
|
56 | - public function getBackends():array; |
|
52 | + /** |
|
53 | + * @return IBackend[] |
|
54 | + * @since 14.0.0 |
|
55 | + */ |
|
56 | + public function getBackends():array; |
|
57 | 57 | |
58 | - /** |
|
59 | - * @param string $backendId |
|
60 | - * @return IBackend|null |
|
61 | - * @since 14.0.0 |
|
62 | - */ |
|
63 | - public function getBackend($backendId); |
|
58 | + /** |
|
59 | + * @param string $backendId |
|
60 | + * @return IBackend|null |
|
61 | + * @since 14.0.0 |
|
62 | + */ |
|
63 | + public function getBackend($backendId); |
|
64 | 64 | |
65 | - /** |
|
66 | - * removes all registered backend instances |
|
67 | - * @return void |
|
68 | - * @since 14.0.0 |
|
69 | - */ |
|
70 | - public function clear(); |
|
65 | + /** |
|
66 | + * removes all registered backend instances |
|
67 | + * @return void |
|
68 | + * @since 14.0.0 |
|
69 | + */ |
|
70 | + public function clear(); |
|
71 | 71 | } |
@@ -31,41 +31,41 @@ |
||
31 | 31 | */ |
32 | 32 | interface IManager { |
33 | 33 | |
34 | - /** |
|
35 | - * Registers a room backend |
|
36 | - * |
|
37 | - * @param string $backendClass |
|
38 | - * @return void |
|
39 | - * @since 14.0.0 |
|
40 | - */ |
|
41 | - public function registerBackend(string $backendClass); |
|
34 | + /** |
|
35 | + * Registers a room backend |
|
36 | + * |
|
37 | + * @param string $backendClass |
|
38 | + * @return void |
|
39 | + * @since 14.0.0 |
|
40 | + */ |
|
41 | + public function registerBackend(string $backendClass); |
|
42 | 42 | |
43 | - /** |
|
44 | - * Unregisters a room backend |
|
45 | - * |
|
46 | - * @param string $backendClass |
|
47 | - * @return void |
|
48 | - * @since 14.0.0 |
|
49 | - */ |
|
50 | - public function unregisterBackend(string $backendClass); |
|
43 | + /** |
|
44 | + * Unregisters a room backend |
|
45 | + * |
|
46 | + * @param string $backendClass |
|
47 | + * @return void |
|
48 | + * @since 14.0.0 |
|
49 | + */ |
|
50 | + public function unregisterBackend(string $backendClass); |
|
51 | 51 | |
52 | - /** |
|
53 | - * @return IBackend[] |
|
54 | - * @since 14.0.0 |
|
55 | - */ |
|
56 | - public function getBackends():array; |
|
52 | + /** |
|
53 | + * @return IBackend[] |
|
54 | + * @since 14.0.0 |
|
55 | + */ |
|
56 | + public function getBackends():array; |
|
57 | 57 | |
58 | - /** |
|
59 | - * @param string $backendId |
|
60 | - * @return IBackend|null |
|
61 | - * @since 14.0.0 |
|
62 | - */ |
|
63 | - public function getBackend($backendId); |
|
58 | + /** |
|
59 | + * @param string $backendId |
|
60 | + * @return IBackend|null |
|
61 | + * @since 14.0.0 |
|
62 | + */ |
|
63 | + public function getBackend($backendId); |
|
64 | 64 | |
65 | - /** |
|
66 | - * removes all registered backend instances |
|
67 | - * @return void |
|
68 | - * @since 14.0.0 |
|
69 | - */ |
|
70 | - public function clear(); |
|
65 | + /** |
|
66 | + * removes all registered backend instances |
|
67 | + * @return void |
|
68 | + * @since 14.0.0 |
|
69 | + */ |
|
70 | + public function clear(); |
|
71 | 71 | } |