upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-07 15:53:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix: move sanitize directly to sanitizeLayout

Browse source 
Signed-off-by: mykh-hailo <kristianderonta0205@gmail.com>
This commit is contained in:
mykh-hailo 2026-03-31 12:00:07 +02:00 committed by Ferdinand Thiessen
parent 5a8292fe43
commit 708fa13428
1 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
apps/dashboard/lib/Service/DashboardService.php
View file

@ -31,7 +31,7 @@ class DashboardService {
*/
public function getLayout(): array {
$systemDefault = $this->appConfig->getAppValueString('layout', 'recommendations,spreed,mail,calendar');
return $this->sanitizeStringList(
return $this->sanitizeLayout(
explode(',', $this->userConfig->getValueString($this->userId, 'dashboard', 'layout', $systemDefault)),
);
}
@ -41,7 +41,18 @@ class DashboardService {
* @return list<string>
*/
public function sanitizeLayout(array $layout): array {
return $this->sanitizeStringList($layout);
$seen = [];
$result = [];
foreach ($layout as $value) {
if ($value === '' || isset($seen[$value])) {
continue;
}
$seen[$value] = true;
$result[] = $value;
}
return $result;
}
/**
@ -80,25 +91,4 @@ class DashboardService {
return $birthdate->getValue();
}
/**
* Keep insertion order while removing empty and duplicate values.
*
* @param list<string> $values
* @return list<string>
*/
private function sanitizeStringList(array $values): array {
$seen = [];
$result = [];
foreach ($values as $value) {
if ($value === '' || isset($seen[$value])) {
continue;
}
$seen[$value] = true;
$result[] = $value;
}
return $result;
}
}