@@ -28,27 +28,27 @@ |
||
28 | 28 | * @since 23.0.0 |
29 | 29 | */ |
30 | 30 | interface IDelegatedSettings extends ISettings { |
31 | - /** |
|
32 | - * Get the name of the settings to differentiate settings inside a section or |
|
33 | - * null if only the section name should be displayed. |
|
34 | - * @since 23.0.0 |
|
35 | - */ |
|
36 | - public function getName(): ?string; |
|
31 | + /** |
|
32 | + * Get the name of the settings to differentiate settings inside a section or |
|
33 | + * null if only the section name should be displayed. |
|
34 | + * @since 23.0.0 |
|
35 | + */ |
|
36 | + public function getName(): ?string; |
|
37 | 37 | |
38 | - /** |
|
39 | - * Get a list of authorized app config that this setting is allowed to modify. |
|
40 | - * The format of the array is the following: |
|
41 | - * ```php |
|
42 | - * <?php |
|
43 | - * [ |
|
44 | - * 'app_name' => [ |
|
45 | - * '/simple_key/', # value |
|
46 | - * '/s[a-z]*ldap/', # regex |
|
47 | - * ], |
|
48 | - * 'another_app_name => [ ... ], |
|
49 | - * ] |
|
50 | - * ``` |
|
51 | - * @since 23.0.0 |
|
52 | - */ |
|
53 | - public function getAuthorizedAppConfig(): array; |
|
38 | + /** |
|
39 | + * Get a list of authorized app config that this setting is allowed to modify. |
|
40 | + * The format of the array is the following: |
|
41 | + * ```php |
|
42 | + * <?php |
|
43 | + * [ |
|
44 | + * 'app_name' => [ |
|
45 | + * '/simple_key/', # value |
|
46 | + * '/s[a-z]*ldap/', # regex |
|
47 | + * ], |
|
48 | + * 'another_app_name => [ ... ], |
|
49 | + * ] |
|
50 | + * ``` |
|
51 | + * @since 23.0.0 |
|
52 | + */ |
|
53 | + public function getAuthorizedAppConfig(): array; |
|
54 | 54 | } |
@@ -28,23 +28,23 @@ |
||
28 | 28 | use OCP\DB\QueryBuilder\IQueryFunction; |
29 | 29 | |
30 | 30 | class PgSqlFunctionBuilder extends FunctionBuilder { |
31 | - public function concat($x, ...$expr): IQueryFunction { |
|
32 | - $args = func_get_args(); |
|
33 | - $list = []; |
|
34 | - foreach ($args as $item) { |
|
35 | - $list[] = $this->queryBuilder->expr()->castColumn($item, IQueryBuilder::PARAM_STR); |
|
36 | - } |
|
37 | - return new QueryFunction(sprintf('(%s)', implode(' || ', $list))); |
|
38 | - } |
|
31 | + public function concat($x, ...$expr): IQueryFunction { |
|
32 | + $args = func_get_args(); |
|
33 | + $list = []; |
|
34 | + foreach ($args as $item) { |
|
35 | + $list[] = $this->queryBuilder->expr()->castColumn($item, IQueryBuilder::PARAM_STR); |
|
36 | + } |
|
37 | + return new QueryFunction(sprintf('(%s)', implode(' || ', $list))); |
|
38 | + } |
|
39 | 39 | |
40 | - public function groupConcat($expr, ?string $separator = ','): IQueryFunction { |
|
41 | - $castedExpression = $this->queryBuilder->expr()->castColumn($expr, IQueryBuilder::PARAM_STR); |
|
40 | + public function groupConcat($expr, ?string $separator = ','): IQueryFunction { |
|
41 | + $castedExpression = $this->queryBuilder->expr()->castColumn($expr, IQueryBuilder::PARAM_STR); |
|
42 | 42 | |
43 | - if (is_null($separator)) { |
|
44 | - return new QueryFunction('string_agg(' . $castedExpression . ')'); |
|
45 | - } |
|
43 | + if (is_null($separator)) { |
|
44 | + return new QueryFunction('string_agg(' . $castedExpression . ')'); |
|
45 | + } |
|
46 | 46 | |
47 | - $separator = $this->connection->quote($separator); |
|
48 | - return new QueryFunction('string_agg(' . $castedExpression . ', ' . $separator . ')'); |
|
49 | - } |
|
47 | + $separator = $this->connection->quote($separator); |
|
48 | + return new QueryFunction('string_agg(' . $castedExpression . ', ' . $separator . ')'); |
|
49 | + } |
|
50 | 50 | } |
@@ -41,10 +41,10 @@ |
||
41 | 41 | $castedExpression = $this->queryBuilder->expr()->castColumn($expr, IQueryBuilder::PARAM_STR); |
42 | 42 | |
43 | 43 | if (is_null($separator)) { |
44 | - return new QueryFunction('string_agg(' . $castedExpression . ')'); |
|
44 | + return new QueryFunction('string_agg('.$castedExpression.')'); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | $separator = $this->connection->quote($separator); |
48 | - return new QueryFunction('string_agg(' . $castedExpression . ', ' . $separator . ')'); |
|
48 | + return new QueryFunction('string_agg('.$castedExpression.', '.$separator.')'); |
|
49 | 49 | } |
50 | 50 | } |
@@ -24,74 +24,74 @@ |
||
24 | 24 | namespace OC; |
25 | 25 | |
26 | 26 | class AppScriptDependency { |
27 | - /** @var string */ |
|
28 | - private $id; |
|
27 | + /** @var string */ |
|
28 | + private $id; |
|
29 | 29 | |
30 | - /** @var array */ |
|
31 | - private $deps; |
|
30 | + /** @var array */ |
|
31 | + private $deps; |
|
32 | 32 | |
33 | - /** @var bool */ |
|
34 | - private $visited; |
|
33 | + /** @var bool */ |
|
34 | + private $visited; |
|
35 | 35 | |
36 | - /** |
|
37 | - * @param string $id |
|
38 | - * @param array $deps |
|
39 | - * @param bool $visited |
|
40 | - */ |
|
41 | - public function __construct(string $id, array $deps = [], bool $visited = false) { |
|
42 | - $this->setId($id); |
|
43 | - $this->setDeps($deps); |
|
44 | - $this->setVisited($visited); |
|
45 | - } |
|
36 | + /** |
|
37 | + * @param string $id |
|
38 | + * @param array $deps |
|
39 | + * @param bool $visited |
|
40 | + */ |
|
41 | + public function __construct(string $id, array $deps = [], bool $visited = false) { |
|
42 | + $this->setId($id); |
|
43 | + $this->setDeps($deps); |
|
44 | + $this->setVisited($visited); |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * @return string |
|
49 | - */ |
|
50 | - public function getId(): string { |
|
51 | - return $this->id; |
|
52 | - } |
|
47 | + /** |
|
48 | + * @return string |
|
49 | + */ |
|
50 | + public function getId(): string { |
|
51 | + return $this->id; |
|
52 | + } |
|
53 | 53 | |
54 | - /** |
|
55 | - * @param string $id |
|
56 | - */ |
|
57 | - public function setId(string $id): void { |
|
58 | - $this->id = $id; |
|
59 | - } |
|
54 | + /** |
|
55 | + * @param string $id |
|
56 | + */ |
|
57 | + public function setId(string $id): void { |
|
58 | + $this->id = $id; |
|
59 | + } |
|
60 | 60 | |
61 | - /** |
|
62 | - * @return array |
|
63 | - */ |
|
64 | - public function getDeps(): array { |
|
65 | - return $this->deps; |
|
66 | - } |
|
61 | + /** |
|
62 | + * @return array |
|
63 | + */ |
|
64 | + public function getDeps(): array { |
|
65 | + return $this->deps; |
|
66 | + } |
|
67 | 67 | |
68 | - /** |
|
69 | - * @param array $deps |
|
70 | - */ |
|
71 | - public function setDeps(array $deps): void { |
|
72 | - $this->deps = $deps; |
|
73 | - } |
|
68 | + /** |
|
69 | + * @param array $deps |
|
70 | + */ |
|
71 | + public function setDeps(array $deps): void { |
|
72 | + $this->deps = $deps; |
|
73 | + } |
|
74 | 74 | |
75 | - /** |
|
76 | - * @param string $dep |
|
77 | - */ |
|
78 | - public function addDep(string $dep): void { |
|
79 | - if (!in_array($dep, $this->deps, true)) { |
|
80 | - $this->deps[] = $dep; |
|
81 | - } |
|
82 | - } |
|
75 | + /** |
|
76 | + * @param string $dep |
|
77 | + */ |
|
78 | + public function addDep(string $dep): void { |
|
79 | + if (!in_array($dep, $this->deps, true)) { |
|
80 | + $this->deps[] = $dep; |
|
81 | + } |
|
82 | + } |
|
83 | 83 | |
84 | - /** |
|
85 | - * @return bool |
|
86 | - */ |
|
87 | - public function isVisited(): bool { |
|
88 | - return $this->visited; |
|
89 | - } |
|
84 | + /** |
|
85 | + * @return bool |
|
86 | + */ |
|
87 | + public function isVisited(): bool { |
|
88 | + return $this->visited; |
|
89 | + } |
|
90 | 90 | |
91 | - /** |
|
92 | - * @param bool $visited |
|
93 | - */ |
|
94 | - public function setVisited(bool $visited): void { |
|
95 | - $this->visited = $visited; |
|
96 | - } |
|
91 | + /** |
|
92 | + * @param bool $visited |
|
93 | + */ |
|
94 | + public function setVisited(bool $visited): void { |
|
95 | + $this->visited = $visited; |
|
96 | + } |
|
97 | 97 | } |
@@ -29,16 +29,16 @@ |
||
29 | 29 | use OCP\Accounts\IAccountManager; |
30 | 30 | |
31 | 31 | trait TAccountsHelper { |
32 | - /** |
|
33 | - * returns whether the property is a collection |
|
34 | - */ |
|
35 | - protected function isCollection(string $propertyName): bool { |
|
36 | - return in_array( |
|
37 | - $propertyName, |
|
38 | - [ |
|
39 | - IAccountManager::COLLECTION_EMAIL, |
|
40 | - ], |
|
41 | - true |
|
42 | - ); |
|
43 | - } |
|
32 | + /** |
|
33 | + * returns whether the property is a collection |
|
34 | + */ |
|
35 | + protected function isCollection(string $propertyName): bool { |
|
36 | + return in_array( |
|
37 | + $propertyName, |
|
38 | + [ |
|
39 | + IAccountManager::COLLECTION_EMAIL, |
|
40 | + ], |
|
41 | + true |
|
42 | + ); |
|
43 | + } |
|
44 | 44 | } |
@@ -151,14 +151,14 @@ discard block |
||
151 | 151 | foreach ($releases as $release) { |
152 | 152 | $versions[] = $release['version']; |
153 | 153 | } |
154 | - usort($versions, function ($version1, $version2) { |
|
154 | + usort($versions, function($version1, $version2) { |
|
155 | 155 | return version_compare($version1, $version2); |
156 | 156 | }); |
157 | 157 | $versions = array_reverse($versions); |
158 | 158 | if (isset($versions[0])) { |
159 | 159 | $highestVersion = $versions[0]; |
160 | 160 | foreach ($releases as $release) { |
161 | - if ((string)$release['version'] === (string)$highestVersion) { |
|
161 | + if ((string) $release['version'] === (string) $highestVersion) { |
|
162 | 162 | $response['data'][$dataKey]['releases'] = [$release]; |
163 | 163 | break; |
164 | 164 | } |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | |
189 | 189 | // If the admin specified a allow list, filter apps from the appstore |
190 | 190 | if (is_array($allowList) && $this->registry->delegateHasValidSubscription()) { |
191 | - return array_filter($apps, function ($app) use ($allowList) { |
|
191 | + return array_filter($apps, function($app) use ($allowList) { |
|
192 | 192 | return in_array($app['id'], $allowList); |
193 | 193 | }); |
194 | 194 | } |
@@ -15,157 +15,157 @@ |
||
15 | 15 | use Psr\Log\LoggerInterface; |
16 | 16 | |
17 | 17 | class AppFetcher extends Fetcher { |
18 | - /** @var bool */ |
|
19 | - private $ignoreMaxVersion; |
|
20 | - |
|
21 | - public function __construct( |
|
22 | - Factory $appDataFactory, |
|
23 | - IClientService $clientService, |
|
24 | - ITimeFactory $timeFactory, |
|
25 | - IConfig $config, |
|
26 | - private CompareVersion $compareVersion, |
|
27 | - LoggerInterface $logger, |
|
28 | - protected IRegistry $registry, |
|
29 | - ) { |
|
30 | - parent::__construct( |
|
31 | - $appDataFactory, |
|
32 | - $clientService, |
|
33 | - $timeFactory, |
|
34 | - $config, |
|
35 | - $logger, |
|
36 | - $registry |
|
37 | - ); |
|
38 | - |
|
39 | - $this->fileName = 'apps.json'; |
|
40 | - $this->endpointName = 'apps.json'; |
|
41 | - $this->ignoreMaxVersion = true; |
|
42 | - } |
|
43 | - |
|
44 | - /** |
|
45 | - * Only returns the latest compatible app release in the releases array |
|
46 | - * |
|
47 | - * @param string $ETag |
|
48 | - * @param string $content |
|
49 | - * @param bool [$allowUnstable] Allow unstable releases |
|
50 | - * |
|
51 | - * @return array |
|
52 | - */ |
|
53 | - protected function fetch($ETag, $content, $allowUnstable = false) { |
|
54 | - /** @var mixed[] $response */ |
|
55 | - $response = parent::fetch($ETag, $content); |
|
56 | - |
|
57 | - if (!isset($response['data']) || $response['data'] === null) { |
|
58 | - $this->logger->warning('Response from appstore is invalid, apps could not be retrieved. Try again later.', ['app' => 'appstoreFetcher']); |
|
59 | - return []; |
|
60 | - } |
|
61 | - |
|
62 | - $allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git'; |
|
63 | - $allowNightly = $allowUnstable || $this->getChannel() === 'daily' || $this->getChannel() === 'git'; |
|
64 | - |
|
65 | - foreach ($response['data'] as $dataKey => $app) { |
|
66 | - $releases = []; |
|
67 | - |
|
68 | - // Filter all compatible releases |
|
69 | - foreach ($app['releases'] as $release) { |
|
70 | - // Exclude all nightly and pre-releases if required |
|
71 | - if (($allowNightly || $release['isNightly'] === false) |
|
72 | - && ($allowPreReleases || !str_contains($release['version'], '-'))) { |
|
73 | - // Exclude all versions not compatible with the current version |
|
74 | - try { |
|
75 | - $versionParser = new VersionParser(); |
|
76 | - $serverVersion = $versionParser->getVersion($release['rawPlatformVersionSpec']); |
|
77 | - $ncVersion = $this->getVersion(); |
|
78 | - $minServerVersion = $serverVersion->getMinimumVersion(); |
|
79 | - $maxServerVersion = $serverVersion->getMaximumVersion(); |
|
80 | - $minFulfilled = $this->compareVersion->isCompatible($ncVersion, $minServerVersion, '>='); |
|
81 | - $maxFulfilled = $maxServerVersion !== '' && |
|
82 | - $this->compareVersion->isCompatible($ncVersion, $maxServerVersion, '<='); |
|
83 | - $isPhpCompatible = true; |
|
84 | - if (($release['rawPhpVersionSpec'] ?? '*') !== '*') { |
|
85 | - $phpVersion = $versionParser->getVersion($release['rawPhpVersionSpec']); |
|
86 | - $minPhpVersion = $phpVersion->getMinimumVersion(); |
|
87 | - $maxPhpVersion = $phpVersion->getMaximumVersion(); |
|
88 | - $minPhpFulfilled = $minPhpVersion === '' || $this->compareVersion->isCompatible( |
|
89 | - PHP_VERSION, |
|
90 | - $minPhpVersion, |
|
91 | - '>=' |
|
92 | - ); |
|
93 | - $maxPhpFulfilled = $maxPhpVersion === '' || $this->compareVersion->isCompatible( |
|
94 | - PHP_VERSION, |
|
95 | - $maxPhpVersion, |
|
96 | - '<=' |
|
97 | - ); |
|
98 | - |
|
99 | - $isPhpCompatible = $minPhpFulfilled && $maxPhpFulfilled; |
|
100 | - } |
|
101 | - if ($minFulfilled && ($this->ignoreMaxVersion || $maxFulfilled) && $isPhpCompatible) { |
|
102 | - $releases[] = $release; |
|
103 | - } |
|
104 | - } catch (\InvalidArgumentException $e) { |
|
105 | - $this->logger->warning($e->getMessage(), [ |
|
106 | - 'exception' => $e, |
|
107 | - ]); |
|
108 | - } |
|
109 | - } |
|
110 | - } |
|
111 | - |
|
112 | - if (empty($releases)) { |
|
113 | - // Remove apps that don't have a matching release |
|
114 | - $response['data'][$dataKey] = []; |
|
115 | - continue; |
|
116 | - } |
|
117 | - |
|
118 | - // Get the highest version |
|
119 | - $versions = []; |
|
120 | - foreach ($releases as $release) { |
|
121 | - $versions[] = $release['version']; |
|
122 | - } |
|
123 | - usort($versions, function ($version1, $version2) { |
|
124 | - return version_compare($version1, $version2); |
|
125 | - }); |
|
126 | - $versions = array_reverse($versions); |
|
127 | - if (isset($versions[0])) { |
|
128 | - $highestVersion = $versions[0]; |
|
129 | - foreach ($releases as $release) { |
|
130 | - if ((string)$release['version'] === (string)$highestVersion) { |
|
131 | - $response['data'][$dataKey]['releases'] = [$release]; |
|
132 | - break; |
|
133 | - } |
|
134 | - } |
|
135 | - } |
|
136 | - } |
|
137 | - |
|
138 | - $response['data'] = array_values(array_filter($response['data'])); |
|
139 | - return $response; |
|
140 | - } |
|
141 | - |
|
142 | - /** |
|
143 | - * @param string $version |
|
144 | - * @param string $fileName |
|
145 | - * @param bool $ignoreMaxVersion |
|
146 | - */ |
|
147 | - public function setVersion(string $version, string $fileName = 'apps.json', bool $ignoreMaxVersion = true) { |
|
148 | - parent::setVersion($version); |
|
149 | - $this->fileName = $fileName; |
|
150 | - $this->ignoreMaxVersion = $ignoreMaxVersion; |
|
151 | - } |
|
152 | - |
|
153 | - public function get($allowUnstable = false): array { |
|
154 | - $allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git'; |
|
155 | - |
|
156 | - $apps = parent::get($allowPreReleases); |
|
157 | - if (empty($apps)) { |
|
158 | - return []; |
|
159 | - } |
|
160 | - $allowList = $this->config->getSystemValue('appsallowlist'); |
|
161 | - |
|
162 | - // If the admin specified a allow list, filter apps from the appstore |
|
163 | - if (is_array($allowList) && $this->registry->delegateHasValidSubscription()) { |
|
164 | - return array_filter($apps, function ($app) use ($allowList) { |
|
165 | - return in_array($app['id'], $allowList); |
|
166 | - }); |
|
167 | - } |
|
168 | - |
|
169 | - return $apps; |
|
170 | - } |
|
18 | + /** @var bool */ |
|
19 | + private $ignoreMaxVersion; |
|
20 | + |
|
21 | + public function __construct( |
|
22 | + Factory $appDataFactory, |
|
23 | + IClientService $clientService, |
|
24 | + ITimeFactory $timeFactory, |
|
25 | + IConfig $config, |
|
26 | + private CompareVersion $compareVersion, |
|
27 | + LoggerInterface $logger, |
|
28 | + protected IRegistry $registry, |
|
29 | + ) { |
|
30 | + parent::__construct( |
|
31 | + $appDataFactory, |
|
32 | + $clientService, |
|
33 | + $timeFactory, |
|
34 | + $config, |
|
35 | + $logger, |
|
36 | + $registry |
|
37 | + ); |
|
38 | + |
|
39 | + $this->fileName = 'apps.json'; |
|
40 | + $this->endpointName = 'apps.json'; |
|
41 | + $this->ignoreMaxVersion = true; |
|
42 | + } |
|
43 | + |
|
44 | + /** |
|
45 | + * Only returns the latest compatible app release in the releases array |
|
46 | + * |
|
47 | + * @param string $ETag |
|
48 | + * @param string $content |
|
49 | + * @param bool [$allowUnstable] Allow unstable releases |
|
50 | + * |
|
51 | + * @return array |
|
52 | + */ |
|
53 | + protected function fetch($ETag, $content, $allowUnstable = false) { |
|
54 | + /** @var mixed[] $response */ |
|
55 | + $response = parent::fetch($ETag, $content); |
|
56 | + |
|
57 | + if (!isset($response['data']) || $response['data'] === null) { |
|
58 | + $this->logger->warning('Response from appstore is invalid, apps could not be retrieved. Try again later.', ['app' => 'appstoreFetcher']); |
|
59 | + return []; |
|
60 | + } |
|
61 | + |
|
62 | + $allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git'; |
|
63 | + $allowNightly = $allowUnstable || $this->getChannel() === 'daily' || $this->getChannel() === 'git'; |
|
64 | + |
|
65 | + foreach ($response['data'] as $dataKey => $app) { |
|
66 | + $releases = []; |
|
67 | + |
|
68 | + // Filter all compatible releases |
|
69 | + foreach ($app['releases'] as $release) { |
|
70 | + // Exclude all nightly and pre-releases if required |
|
71 | + if (($allowNightly || $release['isNightly'] === false) |
|
72 | + && ($allowPreReleases || !str_contains($release['version'], '-'))) { |
|
73 | + // Exclude all versions not compatible with the current version |
|
74 | + try { |
|
75 | + $versionParser = new VersionParser(); |
|
76 | + $serverVersion = $versionParser->getVersion($release['rawPlatformVersionSpec']); |
|
77 | + $ncVersion = $this->getVersion(); |
|
78 | + $minServerVersion = $serverVersion->getMinimumVersion(); |
|
79 | + $maxServerVersion = $serverVersion->getMaximumVersion(); |
|
80 | + $minFulfilled = $this->compareVersion->isCompatible($ncVersion, $minServerVersion, '>='); |
|
81 | + $maxFulfilled = $maxServerVersion !== '' && |
|
82 | + $this->compareVersion->isCompatible($ncVersion, $maxServerVersion, '<='); |
|
83 | + $isPhpCompatible = true; |
|
84 | + if (($release['rawPhpVersionSpec'] ?? '*') !== '*') { |
|
85 | + $phpVersion = $versionParser->getVersion($release['rawPhpVersionSpec']); |
|
86 | + $minPhpVersion = $phpVersion->getMinimumVersion(); |
|
87 | + $maxPhpVersion = $phpVersion->getMaximumVersion(); |
|
88 | + $minPhpFulfilled = $minPhpVersion === '' || $this->compareVersion->isCompatible( |
|
89 | + PHP_VERSION, |
|
90 | + $minPhpVersion, |
|
91 | + '>=' |
|
92 | + ); |
|
93 | + $maxPhpFulfilled = $maxPhpVersion === '' || $this->compareVersion->isCompatible( |
|
94 | + PHP_VERSION, |
|
95 | + $maxPhpVersion, |
|
96 | + '<=' |
|
97 | + ); |
|
98 | + |
|
99 | + $isPhpCompatible = $minPhpFulfilled && $maxPhpFulfilled; |
|
100 | + } |
|
101 | + if ($minFulfilled && ($this->ignoreMaxVersion || $maxFulfilled) && $isPhpCompatible) { |
|
102 | + $releases[] = $release; |
|
103 | + } |
|
104 | + } catch (\InvalidArgumentException $e) { |
|
105 | + $this->logger->warning($e->getMessage(), [ |
|
106 | + 'exception' => $e, |
|
107 | + ]); |
|
108 | + } |
|
109 | + } |
|
110 | + } |
|
111 | + |
|
112 | + if (empty($releases)) { |
|
113 | + // Remove apps that don't have a matching release |
|
114 | + $response['data'][$dataKey] = []; |
|
115 | + continue; |
|
116 | + } |
|
117 | + |
|
118 | + // Get the highest version |
|
119 | + $versions = []; |
|
120 | + foreach ($releases as $release) { |
|
121 | + $versions[] = $release['version']; |
|
122 | + } |
|
123 | + usort($versions, function ($version1, $version2) { |
|
124 | + return version_compare($version1, $version2); |
|
125 | + }); |
|
126 | + $versions = array_reverse($versions); |
|
127 | + if (isset($versions[0])) { |
|
128 | + $highestVersion = $versions[0]; |
|
129 | + foreach ($releases as $release) { |
|
130 | + if ((string)$release['version'] === (string)$highestVersion) { |
|
131 | + $response['data'][$dataKey]['releases'] = [$release]; |
|
132 | + break; |
|
133 | + } |
|
134 | + } |
|
135 | + } |
|
136 | + } |
|
137 | + |
|
138 | + $response['data'] = array_values(array_filter($response['data'])); |
|
139 | + return $response; |
|
140 | + } |
|
141 | + |
|
142 | + /** |
|
143 | + * @param string $version |
|
144 | + * @param string $fileName |
|
145 | + * @param bool $ignoreMaxVersion |
|
146 | + */ |
|
147 | + public function setVersion(string $version, string $fileName = 'apps.json', bool $ignoreMaxVersion = true) { |
|
148 | + parent::setVersion($version); |
|
149 | + $this->fileName = $fileName; |
|
150 | + $this->ignoreMaxVersion = $ignoreMaxVersion; |
|
151 | + } |
|
152 | + |
|
153 | + public function get($allowUnstable = false): array { |
|
154 | + $allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git'; |
|
155 | + |
|
156 | + $apps = parent::get($allowPreReleases); |
|
157 | + if (empty($apps)) { |
|
158 | + return []; |
|
159 | + } |
|
160 | + $allowList = $this->config->getSystemValue('appsallowlist'); |
|
161 | + |
|
162 | + // If the admin specified a allow list, filter apps from the appstore |
|
163 | + if (is_array($allowList) && $this->registry->delegateHasValidSubscription()) { |
|
164 | + return array_filter($apps, function ($app) use ($allowList) { |
|
165 | + return in_array($app['id'], $allowList); |
|
166 | + }); |
|
167 | + } |
|
168 | + |
|
169 | + return $apps; |
|
170 | + } |
|
171 | 171 | } |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | } |
55 | 55 | |
56 | 56 | if ($this->cache !== null) { |
57 | - $fileCacheKey = $file . filemtime($file); |
|
57 | + $fileCacheKey = $file.filemtime($file); |
|
58 | 58 | if ($cachedValue = $this->cache->get($fileCacheKey)) { |
59 | 59 | return json_decode($cachedValue, true); |
60 | 60 | } |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | */ |
235 | 235 | public function xmlToArray($xml) { |
236 | 236 | if (!$xml->children()) { |
237 | - return (string)$xml; |
|
237 | + return (string) $xml; |
|
238 | 238 | } |
239 | 239 | |
240 | 240 | $array = []; |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | '@attributes' => [], |
252 | 252 | ]; |
253 | 253 | if (!count($node->children())) { |
254 | - $value = (string)$node; |
|
254 | + $value = (string) $node; |
|
255 | 255 | if (!empty($value)) { |
256 | 256 | $data['@value'] = $value; |
257 | 257 | } |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | $data = array_merge($data, $this->xmlToArray($node)); |
260 | 260 | } |
261 | 261 | foreach ($attributes as $attr => $value) { |
262 | - $data['@attributes'][$attr] = (string)$value; |
|
262 | + $data['@attributes'][$attr] = (string) $value; |
|
263 | 263 | } |
264 | 264 | |
265 | 265 | if ($totalElement > 1) { |
@@ -10,265 +10,265 @@ |
||
10 | 10 | use function simplexml_load_string; |
11 | 11 | |
12 | 12 | class InfoParser { |
13 | - /** |
|
14 | - * @param ICache|null $cache |
|
15 | - */ |
|
16 | - public function __construct( |
|
17 | - private ?ICache $cache = null, |
|
18 | - ) { |
|
19 | - } |
|
13 | + /** |
|
14 | + * @param ICache|null $cache |
|
15 | + */ |
|
16 | + public function __construct( |
|
17 | + private ?ICache $cache = null, |
|
18 | + ) { |
|
19 | + } |
|
20 | 20 | |
21 | - /** |
|
22 | - * @param string $file the xml file to be loaded |
|
23 | - * @return null|array where null is an indicator for an error |
|
24 | - */ |
|
25 | - public function parse($file) { |
|
26 | - if (!file_exists($file)) { |
|
27 | - return null; |
|
28 | - } |
|
21 | + /** |
|
22 | + * @param string $file the xml file to be loaded |
|
23 | + * @return null|array where null is an indicator for an error |
|
24 | + */ |
|
25 | + public function parse($file) { |
|
26 | + if (!file_exists($file)) { |
|
27 | + return null; |
|
28 | + } |
|
29 | 29 | |
30 | - if ($this->cache !== null) { |
|
31 | - $fileCacheKey = $file . filemtime($file); |
|
32 | - if ($cachedValue = $this->cache->get($fileCacheKey)) { |
|
33 | - return json_decode($cachedValue, true); |
|
34 | - } |
|
35 | - } |
|
30 | + if ($this->cache !== null) { |
|
31 | + $fileCacheKey = $file . filemtime($file); |
|
32 | + if ($cachedValue = $this->cache->get($fileCacheKey)) { |
|
33 | + return json_decode($cachedValue, true); |
|
34 | + } |
|
35 | + } |
|
36 | 36 | |
37 | - libxml_use_internal_errors(true); |
|
38 | - $xml = simplexml_load_string(file_get_contents($file)); |
|
37 | + libxml_use_internal_errors(true); |
|
38 | + $xml = simplexml_load_string(file_get_contents($file)); |
|
39 | 39 | |
40 | - if ($xml === false) { |
|
41 | - libxml_clear_errors(); |
|
42 | - return null; |
|
43 | - } |
|
44 | - $array = $this->xmlToArray($xml); |
|
40 | + if ($xml === false) { |
|
41 | + libxml_clear_errors(); |
|
42 | + return null; |
|
43 | + } |
|
44 | + $array = $this->xmlToArray($xml); |
|
45 | 45 | |
46 | - if (is_null($array)) { |
|
47 | - return null; |
|
48 | - } |
|
46 | + if (is_null($array)) { |
|
47 | + return null; |
|
48 | + } |
|
49 | 49 | |
50 | - if (!array_key_exists('info', $array)) { |
|
51 | - $array['info'] = []; |
|
52 | - } |
|
53 | - if (!array_key_exists('remote', $array)) { |
|
54 | - $array['remote'] = []; |
|
55 | - } |
|
56 | - if (!array_key_exists('public', $array)) { |
|
57 | - $array['public'] = []; |
|
58 | - } |
|
59 | - if (!array_key_exists('types', $array)) { |
|
60 | - $array['types'] = []; |
|
61 | - } |
|
62 | - if (!array_key_exists('repair-steps', $array)) { |
|
63 | - $array['repair-steps'] = []; |
|
64 | - } |
|
65 | - if (!array_key_exists('install', $array['repair-steps'])) { |
|
66 | - $array['repair-steps']['install'] = []; |
|
67 | - } |
|
68 | - if (!array_key_exists('pre-migration', $array['repair-steps'])) { |
|
69 | - $array['repair-steps']['pre-migration'] = []; |
|
70 | - } |
|
71 | - if (!array_key_exists('post-migration', $array['repair-steps'])) { |
|
72 | - $array['repair-steps']['post-migration'] = []; |
|
73 | - } |
|
74 | - if (!array_key_exists('live-migration', $array['repair-steps'])) { |
|
75 | - $array['repair-steps']['live-migration'] = []; |
|
76 | - } |
|
77 | - if (!array_key_exists('uninstall', $array['repair-steps'])) { |
|
78 | - $array['repair-steps']['uninstall'] = []; |
|
79 | - } |
|
80 | - if (!array_key_exists('background-jobs', $array)) { |
|
81 | - $array['background-jobs'] = []; |
|
82 | - } |
|
83 | - if (!array_key_exists('two-factor-providers', $array)) { |
|
84 | - $array['two-factor-providers'] = []; |
|
85 | - } |
|
86 | - if (!array_key_exists('commands', $array)) { |
|
87 | - $array['commands'] = []; |
|
88 | - } |
|
89 | - if (!array_key_exists('activity', $array)) { |
|
90 | - $array['activity'] = []; |
|
91 | - } |
|
92 | - if (!array_key_exists('filters', $array['activity'])) { |
|
93 | - $array['activity']['filters'] = []; |
|
94 | - } |
|
95 | - if (!array_key_exists('settings', $array['activity'])) { |
|
96 | - $array['activity']['settings'] = []; |
|
97 | - } |
|
98 | - if (!array_key_exists('providers', $array['activity'])) { |
|
99 | - $array['activity']['providers'] = []; |
|
100 | - } |
|
101 | - if (!array_key_exists('settings', $array)) { |
|
102 | - $array['settings'] = []; |
|
103 | - } |
|
104 | - if (!array_key_exists('admin', $array['settings'])) { |
|
105 | - $array['settings']['admin'] = []; |
|
106 | - } |
|
107 | - if (!array_key_exists('admin-section', $array['settings'])) { |
|
108 | - $array['settings']['admin-section'] = []; |
|
109 | - } |
|
110 | - if (!array_key_exists('personal', $array['settings'])) { |
|
111 | - $array['settings']['personal'] = []; |
|
112 | - } |
|
113 | - if (!array_key_exists('personal-section', $array['settings'])) { |
|
114 | - $array['settings']['personal-section'] = []; |
|
115 | - } |
|
116 | - if (!array_key_exists('dependencies', $array)) { |
|
117 | - $array['dependencies'] = []; |
|
118 | - } |
|
119 | - if (!array_key_exists('backend', $array['dependencies'])) { |
|
120 | - $array['dependencies']['backend'] = []; |
|
121 | - } |
|
50 | + if (!array_key_exists('info', $array)) { |
|
51 | + $array['info'] = []; |
|
52 | + } |
|
53 | + if (!array_key_exists('remote', $array)) { |
|
54 | + $array['remote'] = []; |
|
55 | + } |
|
56 | + if (!array_key_exists('public', $array)) { |
|
57 | + $array['public'] = []; |
|
58 | + } |
|
59 | + if (!array_key_exists('types', $array)) { |
|
60 | + $array['types'] = []; |
|
61 | + } |
|
62 | + if (!array_key_exists('repair-steps', $array)) { |
|
63 | + $array['repair-steps'] = []; |
|
64 | + } |
|
65 | + if (!array_key_exists('install', $array['repair-steps'])) { |
|
66 | + $array['repair-steps']['install'] = []; |
|
67 | + } |
|
68 | + if (!array_key_exists('pre-migration', $array['repair-steps'])) { |
|
69 | + $array['repair-steps']['pre-migration'] = []; |
|
70 | + } |
|
71 | + if (!array_key_exists('post-migration', $array['repair-steps'])) { |
|
72 | + $array['repair-steps']['post-migration'] = []; |
|
73 | + } |
|
74 | + if (!array_key_exists('live-migration', $array['repair-steps'])) { |
|
75 | + $array['repair-steps']['live-migration'] = []; |
|
76 | + } |
|
77 | + if (!array_key_exists('uninstall', $array['repair-steps'])) { |
|
78 | + $array['repair-steps']['uninstall'] = []; |
|
79 | + } |
|
80 | + if (!array_key_exists('background-jobs', $array)) { |
|
81 | + $array['background-jobs'] = []; |
|
82 | + } |
|
83 | + if (!array_key_exists('two-factor-providers', $array)) { |
|
84 | + $array['two-factor-providers'] = []; |
|
85 | + } |
|
86 | + if (!array_key_exists('commands', $array)) { |
|
87 | + $array['commands'] = []; |
|
88 | + } |
|
89 | + if (!array_key_exists('activity', $array)) { |
|
90 | + $array['activity'] = []; |
|
91 | + } |
|
92 | + if (!array_key_exists('filters', $array['activity'])) { |
|
93 | + $array['activity']['filters'] = []; |
|
94 | + } |
|
95 | + if (!array_key_exists('settings', $array['activity'])) { |
|
96 | + $array['activity']['settings'] = []; |
|
97 | + } |
|
98 | + if (!array_key_exists('providers', $array['activity'])) { |
|
99 | + $array['activity']['providers'] = []; |
|
100 | + } |
|
101 | + if (!array_key_exists('settings', $array)) { |
|
102 | + $array['settings'] = []; |
|
103 | + } |
|
104 | + if (!array_key_exists('admin', $array['settings'])) { |
|
105 | + $array['settings']['admin'] = []; |
|
106 | + } |
|
107 | + if (!array_key_exists('admin-section', $array['settings'])) { |
|
108 | + $array['settings']['admin-section'] = []; |
|
109 | + } |
|
110 | + if (!array_key_exists('personal', $array['settings'])) { |
|
111 | + $array['settings']['personal'] = []; |
|
112 | + } |
|
113 | + if (!array_key_exists('personal-section', $array['settings'])) { |
|
114 | + $array['settings']['personal-section'] = []; |
|
115 | + } |
|
116 | + if (!array_key_exists('dependencies', $array)) { |
|
117 | + $array['dependencies'] = []; |
|
118 | + } |
|
119 | + if (!array_key_exists('backend', $array['dependencies'])) { |
|
120 | + $array['dependencies']['backend'] = []; |
|
121 | + } |
|
122 | 122 | |
123 | - if (array_key_exists('types', $array)) { |
|
124 | - if (is_array($array['types'])) { |
|
125 | - foreach ($array['types'] as $type => $v) { |
|
126 | - unset($array['types'][$type]); |
|
127 | - if (is_string($type)) { |
|
128 | - $array['types'][] = $type; |
|
129 | - } |
|
130 | - } |
|
131 | - } else { |
|
132 | - $array['types'] = []; |
|
133 | - } |
|
134 | - } |
|
135 | - if (isset($array['repair-steps']['install']['step']) && is_array($array['repair-steps']['install']['step'])) { |
|
136 | - $array['repair-steps']['install'] = $array['repair-steps']['install']['step']; |
|
137 | - } |
|
138 | - if (isset($array['repair-steps']['pre-migration']['step']) && is_array($array['repair-steps']['pre-migration']['step'])) { |
|
139 | - $array['repair-steps']['pre-migration'] = $array['repair-steps']['pre-migration']['step']; |
|
140 | - } |
|
141 | - if (isset($array['repair-steps']['post-migration']['step']) && is_array($array['repair-steps']['post-migration']['step'])) { |
|
142 | - $array['repair-steps']['post-migration'] = $array['repair-steps']['post-migration']['step']; |
|
143 | - } |
|
144 | - if (isset($array['repair-steps']['live-migration']['step']) && is_array($array['repair-steps']['live-migration']['step'])) { |
|
145 | - $array['repair-steps']['live-migration'] = $array['repair-steps']['live-migration']['step']; |
|
146 | - } |
|
147 | - if (isset($array['repair-steps']['uninstall']['step']) && is_array($array['repair-steps']['uninstall']['step'])) { |
|
148 | - $array['repair-steps']['uninstall'] = $array['repair-steps']['uninstall']['step']; |
|
149 | - } |
|
150 | - if (isset($array['background-jobs']['job']) && is_array($array['background-jobs']['job'])) { |
|
151 | - $array['background-jobs'] = $array['background-jobs']['job']; |
|
152 | - } |
|
153 | - if (isset($array['commands']['command']) && is_array($array['commands']['command'])) { |
|
154 | - $array['commands'] = $array['commands']['command']; |
|
155 | - } |
|
156 | - if (isset($array['two-factor-providers']['provider']) && is_array($array['two-factor-providers']['provider'])) { |
|
157 | - $array['two-factor-providers'] = $array['two-factor-providers']['provider']; |
|
158 | - } |
|
159 | - if (isset($array['activity']['filters']['filter']) && is_array($array['activity']['filters']['filter'])) { |
|
160 | - $array['activity']['filters'] = $array['activity']['filters']['filter']; |
|
161 | - } |
|
162 | - if (isset($array['activity']['settings']['setting']) && is_array($array['activity']['settings']['setting'])) { |
|
163 | - $array['activity']['settings'] = $array['activity']['settings']['setting']; |
|
164 | - } |
|
165 | - if (isset($array['activity']['providers']['provider']) && is_array($array['activity']['providers']['provider'])) { |
|
166 | - $array['activity']['providers'] = $array['activity']['providers']['provider']; |
|
167 | - } |
|
168 | - if (isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin']) |
|
169 | - && is_array($array['collaboration']['collaborators']['searchPlugins']['searchPlugin']) |
|
170 | - && !isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin']['class']) |
|
171 | - ) { |
|
172 | - $array['collaboration']['collaborators']['searchPlugins'] = $array['collaboration']['collaborators']['searchPlugins']['searchPlugin']; |
|
173 | - } |
|
174 | - if (isset($array['settings']['admin']) && !is_array($array['settings']['admin'])) { |
|
175 | - $array['settings']['admin'] = [$array['settings']['admin']]; |
|
176 | - } |
|
177 | - if (isset($array['settings']['admin-section']) && !is_array($array['settings']['admin-section'])) { |
|
178 | - $array['settings']['admin-section'] = [$array['settings']['admin-section']]; |
|
179 | - } |
|
180 | - if (isset($array['settings']['personal']) && !is_array($array['settings']['personal'])) { |
|
181 | - $array['settings']['personal'] = [$array['settings']['personal']]; |
|
182 | - } |
|
183 | - if (isset($array['settings']['personal-section']) && !is_array($array['settings']['personal-section'])) { |
|
184 | - $array['settings']['personal-section'] = [$array['settings']['personal-section']]; |
|
185 | - } |
|
186 | - if (isset($array['navigations']['navigation']) && $this->isNavigationItem($array['navigations']['navigation'])) { |
|
187 | - $array['navigations']['navigation'] = [$array['navigations']['navigation']]; |
|
188 | - } |
|
189 | - if (isset($array['dependencies']['backend']) && !is_array($array['dependencies']['backend'])) { |
|
190 | - $array['dependencies']['backend'] = [$array['dependencies']['backend']]; |
|
191 | - } |
|
123 | + if (array_key_exists('types', $array)) { |
|
124 | + if (is_array($array['types'])) { |
|
125 | + foreach ($array['types'] as $type => $v) { |
|
126 | + unset($array['types'][$type]); |
|
127 | + if (is_string($type)) { |
|
128 | + $array['types'][] = $type; |
|
129 | + } |
|
130 | + } |
|
131 | + } else { |
|
132 | + $array['types'] = []; |
|
133 | + } |
|
134 | + } |
|
135 | + if (isset($array['repair-steps']['install']['step']) && is_array($array['repair-steps']['install']['step'])) { |
|
136 | + $array['repair-steps']['install'] = $array['repair-steps']['install']['step']; |
|
137 | + } |
|
138 | + if (isset($array['repair-steps']['pre-migration']['step']) && is_array($array['repair-steps']['pre-migration']['step'])) { |
|
139 | + $array['repair-steps']['pre-migration'] = $array['repair-steps']['pre-migration']['step']; |
|
140 | + } |
|
141 | + if (isset($array['repair-steps']['post-migration']['step']) && is_array($array['repair-steps']['post-migration']['step'])) { |
|
142 | + $array['repair-steps']['post-migration'] = $array['repair-steps']['post-migration']['step']; |
|
143 | + } |
|
144 | + if (isset($array['repair-steps']['live-migration']['step']) && is_array($array['repair-steps']['live-migration']['step'])) { |
|
145 | + $array['repair-steps']['live-migration'] = $array['repair-steps']['live-migration']['step']; |
|
146 | + } |
|
147 | + if (isset($array['repair-steps']['uninstall']['step']) && is_array($array['repair-steps']['uninstall']['step'])) { |
|
148 | + $array['repair-steps']['uninstall'] = $array['repair-steps']['uninstall']['step']; |
|
149 | + } |
|
150 | + if (isset($array['background-jobs']['job']) && is_array($array['background-jobs']['job'])) { |
|
151 | + $array['background-jobs'] = $array['background-jobs']['job']; |
|
152 | + } |
|
153 | + if (isset($array['commands']['command']) && is_array($array['commands']['command'])) { |
|
154 | + $array['commands'] = $array['commands']['command']; |
|
155 | + } |
|
156 | + if (isset($array['two-factor-providers']['provider']) && is_array($array['two-factor-providers']['provider'])) { |
|
157 | + $array['two-factor-providers'] = $array['two-factor-providers']['provider']; |
|
158 | + } |
|
159 | + if (isset($array['activity']['filters']['filter']) && is_array($array['activity']['filters']['filter'])) { |
|
160 | + $array['activity']['filters'] = $array['activity']['filters']['filter']; |
|
161 | + } |
|
162 | + if (isset($array['activity']['settings']['setting']) && is_array($array['activity']['settings']['setting'])) { |
|
163 | + $array['activity']['settings'] = $array['activity']['settings']['setting']; |
|
164 | + } |
|
165 | + if (isset($array['activity']['providers']['provider']) && is_array($array['activity']['providers']['provider'])) { |
|
166 | + $array['activity']['providers'] = $array['activity']['providers']['provider']; |
|
167 | + } |
|
168 | + if (isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin']) |
|
169 | + && is_array($array['collaboration']['collaborators']['searchPlugins']['searchPlugin']) |
|
170 | + && !isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin']['class']) |
|
171 | + ) { |
|
172 | + $array['collaboration']['collaborators']['searchPlugins'] = $array['collaboration']['collaborators']['searchPlugins']['searchPlugin']; |
|
173 | + } |
|
174 | + if (isset($array['settings']['admin']) && !is_array($array['settings']['admin'])) { |
|
175 | + $array['settings']['admin'] = [$array['settings']['admin']]; |
|
176 | + } |
|
177 | + if (isset($array['settings']['admin-section']) && !is_array($array['settings']['admin-section'])) { |
|
178 | + $array['settings']['admin-section'] = [$array['settings']['admin-section']]; |
|
179 | + } |
|
180 | + if (isset($array['settings']['personal']) && !is_array($array['settings']['personal'])) { |
|
181 | + $array['settings']['personal'] = [$array['settings']['personal']]; |
|
182 | + } |
|
183 | + if (isset($array['settings']['personal-section']) && !is_array($array['settings']['personal-section'])) { |
|
184 | + $array['settings']['personal-section'] = [$array['settings']['personal-section']]; |
|
185 | + } |
|
186 | + if (isset($array['navigations']['navigation']) && $this->isNavigationItem($array['navigations']['navigation'])) { |
|
187 | + $array['navigations']['navigation'] = [$array['navigations']['navigation']]; |
|
188 | + } |
|
189 | + if (isset($array['dependencies']['backend']) && !is_array($array['dependencies']['backend'])) { |
|
190 | + $array['dependencies']['backend'] = [$array['dependencies']['backend']]; |
|
191 | + } |
|
192 | 192 | |
193 | - // Ensure some fields are always arrays |
|
194 | - if (isset($array['screenshot']) && !is_array($array['screenshot'])) { |
|
195 | - $array['screenshot'] = [$array['screenshot']]; |
|
196 | - } |
|
197 | - if (isset($array['author']) && !is_array($array['author'])) { |
|
198 | - $array['author'] = [$array['author']]; |
|
199 | - } |
|
200 | - if (isset($array['category']) && !is_array($array['category'])) { |
|
201 | - $array['category'] = [$array['category']]; |
|
202 | - } |
|
193 | + // Ensure some fields are always arrays |
|
194 | + if (isset($array['screenshot']) && !is_array($array['screenshot'])) { |
|
195 | + $array['screenshot'] = [$array['screenshot']]; |
|
196 | + } |
|
197 | + if (isset($array['author']) && !is_array($array['author'])) { |
|
198 | + $array['author'] = [$array['author']]; |
|
199 | + } |
|
200 | + if (isset($array['category']) && !is_array($array['category'])) { |
|
201 | + $array['category'] = [$array['category']]; |
|
202 | + } |
|
203 | 203 | |
204 | - if ($this->cache !== null) { |
|
205 | - $this->cache->set($fileCacheKey, json_encode($array)); |
|
206 | - } |
|
207 | - return $array; |
|
208 | - } |
|
204 | + if ($this->cache !== null) { |
|
205 | + $this->cache->set($fileCacheKey, json_encode($array)); |
|
206 | + } |
|
207 | + return $array; |
|
208 | + } |
|
209 | 209 | |
210 | - /** |
|
211 | - * @param $data |
|
212 | - * @return bool |
|
213 | - */ |
|
214 | - private function isNavigationItem($data): bool { |
|
215 | - // Allow settings navigation items with no route entry |
|
216 | - $type = $data['type'] ?? 'link'; |
|
217 | - if ($type === 'settings') { |
|
218 | - return isset($data['name']); |
|
219 | - } |
|
220 | - return isset($data['name'], $data['route']); |
|
221 | - } |
|
210 | + /** |
|
211 | + * @param $data |
|
212 | + * @return bool |
|
213 | + */ |
|
214 | + private function isNavigationItem($data): bool { |
|
215 | + // Allow settings navigation items with no route entry |
|
216 | + $type = $data['type'] ?? 'link'; |
|
217 | + if ($type === 'settings') { |
|
218 | + return isset($data['name']); |
|
219 | + } |
|
220 | + return isset($data['name'], $data['route']); |
|
221 | + } |
|
222 | 222 | |
223 | - /** |
|
224 | - * @param \SimpleXMLElement $xml |
|
225 | - * @return array |
|
226 | - */ |
|
227 | - public function xmlToArray($xml) { |
|
228 | - if (!$xml->children()) { |
|
229 | - return (string)$xml; |
|
230 | - } |
|
223 | + /** |
|
224 | + * @param \SimpleXMLElement $xml |
|
225 | + * @return array |
|
226 | + */ |
|
227 | + public function xmlToArray($xml) { |
|
228 | + if (!$xml->children()) { |
|
229 | + return (string)$xml; |
|
230 | + } |
|
231 | 231 | |
232 | - $array = []; |
|
233 | - foreach ($xml->children() as $element => $node) { |
|
234 | - $totalElement = count($xml->{$element}); |
|
232 | + $array = []; |
|
233 | + foreach ($xml->children() as $element => $node) { |
|
234 | + $totalElement = count($xml->{$element}); |
|
235 | 235 | |
236 | - if (!isset($array[$element])) { |
|
237 | - $array[$element] = $totalElement > 1 ? [] : ''; |
|
238 | - } |
|
239 | - /** @var \SimpleXMLElement $node */ |
|
240 | - // Has attributes |
|
241 | - if ($attributes = $node->attributes()) { |
|
242 | - $data = [ |
|
243 | - '@attributes' => [], |
|
244 | - ]; |
|
245 | - if (!count($node->children())) { |
|
246 | - $value = (string)$node; |
|
247 | - if (!empty($value)) { |
|
248 | - $data['@value'] = $value; |
|
249 | - } |
|
250 | - } else { |
|
251 | - $data = array_merge($data, $this->xmlToArray($node)); |
|
252 | - } |
|
253 | - foreach ($attributes as $attr => $value) { |
|
254 | - $data['@attributes'][$attr] = (string)$value; |
|
255 | - } |
|
236 | + if (!isset($array[$element])) { |
|
237 | + $array[$element] = $totalElement > 1 ? [] : ''; |
|
238 | + } |
|
239 | + /** @var \SimpleXMLElement $node */ |
|
240 | + // Has attributes |
|
241 | + if ($attributes = $node->attributes()) { |
|
242 | + $data = [ |
|
243 | + '@attributes' => [], |
|
244 | + ]; |
|
245 | + if (!count($node->children())) { |
|
246 | + $value = (string)$node; |
|
247 | + if (!empty($value)) { |
|
248 | + $data['@value'] = $value; |
|
249 | + } |
|
250 | + } else { |
|
251 | + $data = array_merge($data, $this->xmlToArray($node)); |
|
252 | + } |
|
253 | + foreach ($attributes as $attr => $value) { |
|
254 | + $data['@attributes'][$attr] = (string)$value; |
|
255 | + } |
|
256 | 256 | |
257 | - if ($totalElement > 1) { |
|
258 | - $array[$element][] = $data; |
|
259 | - } else { |
|
260 | - $array[$element] = $data; |
|
261 | - } |
|
262 | - // Just a value |
|
263 | - } else { |
|
264 | - if ($totalElement > 1) { |
|
265 | - $array[$element][] = $this->xmlToArray($node); |
|
266 | - } else { |
|
267 | - $array[$element] = $this->xmlToArray($node); |
|
268 | - } |
|
269 | - } |
|
270 | - } |
|
257 | + if ($totalElement > 1) { |
|
258 | + $array[$element][] = $data; |
|
259 | + } else { |
|
260 | + $array[$element] = $data; |
|
261 | + } |
|
262 | + // Just a value |
|
263 | + } else { |
|
264 | + if ($totalElement > 1) { |
|
265 | + $array[$element][] = $this->xmlToArray($node); |
|
266 | + } else { |
|
267 | + $array[$element] = $this->xmlToArray($node); |
|
268 | + } |
|
269 | + } |
|
270 | + } |
|
271 | 271 | |
272 | - return $array; |
|
273 | - } |
|
272 | + return $array; |
|
273 | + } |
|
274 | 274 | } |
@@ -89,6 +89,6 @@ |
||
89 | 89 | if (empty($this->value)) { |
90 | 90 | return null; |
91 | 91 | } |
92 | - return 'tel:' . $this->value; |
|
92 | + return 'tel:'.$this->value; |
|
93 | 93 | } |
94 | 94 | } |
@@ -16,48 +16,48 @@ |
||
16 | 16 | use OCP\Profile\ILinkAction; |
17 | 17 | |
18 | 18 | class PhoneAction implements ILinkAction { |
19 | - private string $value = ''; |
|
20 | - |
|
21 | - public function __construct( |
|
22 | - private IAccountManager $accountManager, |
|
23 | - private IFactory $l10nFactory, |
|
24 | - private IURLGenerator $urlGenerator, |
|
25 | - ) { |
|
26 | - } |
|
27 | - |
|
28 | - public function preload(IUser $targetUser): void { |
|
29 | - $account = $this->accountManager->getAccount($targetUser); |
|
30 | - $this->value = $account->getProperty(IAccountManager::PROPERTY_PHONE)->getValue(); |
|
31 | - } |
|
32 | - |
|
33 | - public function getAppId(): string { |
|
34 | - return 'core'; |
|
35 | - } |
|
36 | - |
|
37 | - public function getId(): string { |
|
38 | - return IAccountManager::PROPERTY_PHONE; |
|
39 | - } |
|
40 | - |
|
41 | - public function getDisplayId(): string { |
|
42 | - return $this->l10nFactory->get('lib')->t('Phone'); |
|
43 | - } |
|
44 | - |
|
45 | - public function getTitle(): string { |
|
46 | - return $this->l10nFactory->get('lib')->t('Call %s', [$this->value]); |
|
47 | - } |
|
48 | - |
|
49 | - public function getPriority(): int { |
|
50 | - return 30; |
|
51 | - } |
|
52 | - |
|
53 | - public function getIcon(): string { |
|
54 | - return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/phone.svg')); |
|
55 | - } |
|
56 | - |
|
57 | - public function getTarget(): ?string { |
|
58 | - if (empty($this->value)) { |
|
59 | - return null; |
|
60 | - } |
|
61 | - return 'tel:' . $this->value; |
|
62 | - } |
|
19 | + private string $value = ''; |
|
20 | + |
|
21 | + public function __construct( |
|
22 | + private IAccountManager $accountManager, |
|
23 | + private IFactory $l10nFactory, |
|
24 | + private IURLGenerator $urlGenerator, |
|
25 | + ) { |
|
26 | + } |
|
27 | + |
|
28 | + public function preload(IUser $targetUser): void { |
|
29 | + $account = $this->accountManager->getAccount($targetUser); |
|
30 | + $this->value = $account->getProperty(IAccountManager::PROPERTY_PHONE)->getValue(); |
|
31 | + } |
|
32 | + |
|
33 | + public function getAppId(): string { |
|
34 | + return 'core'; |
|
35 | + } |
|
36 | + |
|
37 | + public function getId(): string { |
|
38 | + return IAccountManager::PROPERTY_PHONE; |
|
39 | + } |
|
40 | + |
|
41 | + public function getDisplayId(): string { |
|
42 | + return $this->l10nFactory->get('lib')->t('Phone'); |
|
43 | + } |
|
44 | + |
|
45 | + public function getTitle(): string { |
|
46 | + return $this->l10nFactory->get('lib')->t('Call %s', [$this->value]); |
|
47 | + } |
|
48 | + |
|
49 | + public function getPriority(): int { |
|
50 | + return 30; |
|
51 | + } |
|
52 | + |
|
53 | + public function getIcon(): string { |
|
54 | + return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/phone.svg')); |
|
55 | + } |
|
56 | + |
|
57 | + public function getTarget(): ?string { |
|
58 | + if (empty($this->value)) { |
|
59 | + return null; |
|
60 | + } |
|
61 | + return 'tel:' . $this->value; |
|
62 | + } |
|
63 | 63 | } |
@@ -89,6 +89,6 @@ |
||
89 | 89 | if (empty($this->value)) { |
90 | 90 | return null; |
91 | 91 | } |
92 | - return 'mailto:' . $this->value; |
|
92 | + return 'mailto:'.$this->value; |
|
93 | 93 | } |
94 | 94 | } |
@@ -16,48 +16,48 @@ |
||
16 | 16 | use OCP\Profile\ILinkAction; |
17 | 17 | |
18 | 18 | class EmailAction implements ILinkAction { |
19 | - private string $value = ''; |
|
20 | - |
|
21 | - public function __construct( |
|
22 | - private IAccountManager $accountManager, |
|
23 | - private IFactory $l10nFactory, |
|
24 | - private IURLGenerator $urlGenerator, |
|
25 | - ) { |
|
26 | - } |
|
27 | - |
|
28 | - public function preload(IUser $targetUser): void { |
|
29 | - $account = $this->accountManager->getAccount($targetUser); |
|
30 | - $this->value = $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue(); |
|
31 | - } |
|
32 | - |
|
33 | - public function getAppId(): string { |
|
34 | - return 'core'; |
|
35 | - } |
|
36 | - |
|
37 | - public function getId(): string { |
|
38 | - return IAccountManager::PROPERTY_EMAIL; |
|
39 | - } |
|
40 | - |
|
41 | - public function getDisplayId(): string { |
|
42 | - return $this->l10nFactory->get('lib')->t('Email'); |
|
43 | - } |
|
44 | - |
|
45 | - public function getTitle(): string { |
|
46 | - return $this->l10nFactory->get('lib')->t('Mail %s', [$this->value]); |
|
47 | - } |
|
48 | - |
|
49 | - public function getPriority(): int { |
|
50 | - return 20; |
|
51 | - } |
|
52 | - |
|
53 | - public function getIcon(): string { |
|
54 | - return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/mail.svg')); |
|
55 | - } |
|
56 | - |
|
57 | - public function getTarget(): ?string { |
|
58 | - if (empty($this->value)) { |
|
59 | - return null; |
|
60 | - } |
|
61 | - return 'mailto:' . $this->value; |
|
62 | - } |
|
19 | + private string $value = ''; |
|
20 | + |
|
21 | + public function __construct( |
|
22 | + private IAccountManager $accountManager, |
|
23 | + private IFactory $l10nFactory, |
|
24 | + private IURLGenerator $urlGenerator, |
|
25 | + ) { |
|
26 | + } |
|
27 | + |
|
28 | + public function preload(IUser $targetUser): void { |
|
29 | + $account = $this->accountManager->getAccount($targetUser); |
|
30 | + $this->value = $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue(); |
|
31 | + } |
|
32 | + |
|
33 | + public function getAppId(): string { |
|
34 | + return 'core'; |
|
35 | + } |
|
36 | + |
|
37 | + public function getId(): string { |
|
38 | + return IAccountManager::PROPERTY_EMAIL; |
|
39 | + } |
|
40 | + |
|
41 | + public function getDisplayId(): string { |
|
42 | + return $this->l10nFactory->get('lib')->t('Email'); |
|
43 | + } |
|
44 | + |
|
45 | + public function getTitle(): string { |
|
46 | + return $this->l10nFactory->get('lib')->t('Mail %s', [$this->value]); |
|
47 | + } |
|
48 | + |
|
49 | + public function getPriority(): int { |
|
50 | + return 20; |
|
51 | + } |
|
52 | + |
|
53 | + public function getIcon(): string { |
|
54 | + return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/mail.svg')); |
|
55 | + } |
|
56 | + |
|
57 | + public function getTarget(): ?string { |
|
58 | + if (empty($this->value)) { |
|
59 | + return null; |
|
60 | + } |
|
61 | + return 'mailto:' . $this->value; |
|
62 | + } |
|
63 | 63 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | } |
76 | 76 | |
77 | 77 | public function getTitle(): string { |
78 | - $displayUsername = $this->value[0] === '@' ? $this->value : '@' . $this->value; |
|
78 | + $displayUsername = $this->value[0] === '@' ? $this->value : '@'.$this->value; |
|
79 | 79 | return $this->l10nFactory->get('lib')->t('View %s on Twitter', [$displayUsername]); |
80 | 80 | } |
81 | 81 | |
@@ -92,6 +92,6 @@ discard block |
||
92 | 92 | return null; |
93 | 93 | } |
94 | 94 | $username = $this->value[0] === '@' ? substr($this->value, 1) : $this->value; |
95 | - return 'https://twitter.com/' . $username; |
|
95 | + return 'https://twitter.com/'.$username; |
|
96 | 96 | } |
97 | 97 | } |
@@ -17,50 +17,50 @@ |
||
17 | 17 | use function substr; |
18 | 18 | |
19 | 19 | class TwitterAction implements ILinkAction { |
20 | - private string $value = ''; |
|
20 | + private string $value = ''; |
|
21 | 21 | |
22 | - public function __construct( |
|
23 | - private IAccountManager $accountManager, |
|
24 | - private IFactory $l10nFactory, |
|
25 | - private IURLGenerator $urlGenerator, |
|
26 | - ) { |
|
27 | - } |
|
22 | + public function __construct( |
|
23 | + private IAccountManager $accountManager, |
|
24 | + private IFactory $l10nFactory, |
|
25 | + private IURLGenerator $urlGenerator, |
|
26 | + ) { |
|
27 | + } |
|
28 | 28 | |
29 | - public function preload(IUser $targetUser): void { |
|
30 | - $account = $this->accountManager->getAccount($targetUser); |
|
31 | - $this->value = $account->getProperty(IAccountManager::PROPERTY_TWITTER)->getValue(); |
|
32 | - } |
|
29 | + public function preload(IUser $targetUser): void { |
|
30 | + $account = $this->accountManager->getAccount($targetUser); |
|
31 | + $this->value = $account->getProperty(IAccountManager::PROPERTY_TWITTER)->getValue(); |
|
32 | + } |
|
33 | 33 | |
34 | - public function getAppId(): string { |
|
35 | - return 'core'; |
|
36 | - } |
|
34 | + public function getAppId(): string { |
|
35 | + return 'core'; |
|
36 | + } |
|
37 | 37 | |
38 | - public function getId(): string { |
|
39 | - return IAccountManager::PROPERTY_TWITTER; |
|
40 | - } |
|
38 | + public function getId(): string { |
|
39 | + return IAccountManager::PROPERTY_TWITTER; |
|
40 | + } |
|
41 | 41 | |
42 | - public function getDisplayId(): string { |
|
43 | - return $this->l10nFactory->get('lib')->t('Twitter'); |
|
44 | - } |
|
42 | + public function getDisplayId(): string { |
|
43 | + return $this->l10nFactory->get('lib')->t('Twitter'); |
|
44 | + } |
|
45 | 45 | |
46 | - public function getTitle(): string { |
|
47 | - $displayUsername = $this->value[0] === '@' ? $this->value : '@' . $this->value; |
|
48 | - return $this->l10nFactory->get('lib')->t('View %s on Twitter', [$displayUsername]); |
|
49 | - } |
|
46 | + public function getTitle(): string { |
|
47 | + $displayUsername = $this->value[0] === '@' ? $this->value : '@' . $this->value; |
|
48 | + return $this->l10nFactory->get('lib')->t('View %s on Twitter', [$displayUsername]); |
|
49 | + } |
|
50 | 50 | |
51 | - public function getPriority(): int { |
|
52 | - return 50; |
|
53 | - } |
|
51 | + public function getPriority(): int { |
|
52 | + return 50; |
|
53 | + } |
|
54 | 54 | |
55 | - public function getIcon(): string { |
|
56 | - return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/twitter.svg')); |
|
57 | - } |
|
55 | + public function getIcon(): string { |
|
56 | + return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/twitter.svg')); |
|
57 | + } |
|
58 | 58 | |
59 | - public function getTarget(): ?string { |
|
60 | - if (empty($this->value)) { |
|
61 | - return null; |
|
62 | - } |
|
63 | - $username = $this->value[0] === '@' ? substr($this->value, 1) : $this->value; |
|
64 | - return 'https://twitter.com/' . $username; |
|
65 | - } |
|
59 | + public function getTarget(): ?string { |
|
60 | + if (empty($this->value)) { |
|
61 | + return null; |
|
62 | + } |
|
63 | + $username = $this->value[0] === '@' ? substr($this->value, 1) : $this->value; |
|
64 | + return 'https://twitter.com/' . $username; |
|
65 | + } |
|
66 | 66 | } |