Skip to content

Commit

Permalink
Move watermark logic to separate service and fix access of user for g…
Browse files Browse the repository at this point in the history
…uests

Signed-off-by: Julius Härtl <[email protected]>

Refactor checkFileInfo response building

Signed-off-by: Julius Härtl <[email protected]>

Add Watermark tests

Signed-off-by: Julius Härtl <[email protected]>

Keep older php version supported

Signed-off-by: Julius Härtl <[email protected]>

Stick to the actual user id when available

Signed-off-by: Julius Härtl <[email protected]>

Make psalm happy again

Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
juliusknorr committed Dec 2, 2023
1 parent c5bb5a5 commit 1c01265
Show file tree
Hide file tree
Showing 10 changed files with 454 additions and 173 deletions.
1 change: 1 addition & 0 deletions composer/composer/autoload_classmap.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
'OCA\\Richdocuments\\Service\\InitialStateService' => $baseDir . '/../lib/Service/InitialStateService.php',
'OCA\\Richdocuments\\Service\\RemoteService' => $baseDir . '/../lib/Service/RemoteService.php',
'OCA\\Richdocuments\\Service\\UserScopeService' => $baseDir . '/../lib/Service/UserScopeService.php',
'OCA\\Richdocuments\\Service\\WatermarkService' => $baseDir . '/../lib/Service/WatermarkService.php',
'OCA\\Richdocuments\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
'OCA\\Richdocuments\\Settings\\Personal' => $baseDir . '/../lib/Settings/Personal.php',
'OCA\\Richdocuments\\Settings\\Section' => $baseDir . '/../lib/Settings/Section.php',
Expand Down
1 change: 1 addition & 0 deletions composer/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ class ComposerStaticInitRichdocuments
'OCA\\Richdocuments\\Service\\InitialStateService' => __DIR__ . '/..' . '/../lib/Service/InitialStateService.php',
'OCA\\Richdocuments\\Service\\RemoteService' => __DIR__ . '/..' . '/../lib/Service/RemoteService.php',
'OCA\\Richdocuments\\Service\\UserScopeService' => __DIR__ . '/..' . '/../lib/Service/UserScopeService.php',
'OCA\\Richdocuments\\Service\\WatermarkService' => __DIR__ . '/..' . '/../lib/Service/WatermarkService.php',
'OCA\\Richdocuments\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
'OCA\\Richdocuments\\Settings\\Personal' => __DIR__ . '/..' . '/../lib/Settings/Personal.php',
'OCA\\Richdocuments\\Settings\\Section' => __DIR__ . '/..' . '/../lib/Settings/Section.php',
Expand Down
2 changes: 1 addition & 1 deletion lib/AppConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public function getAppValue($key, $defaultValue = null) {
public function getAppValueArray($key) {
$value = $this->config->getAppValue($this->getAppNamespace($key), $key, []);
if (array_key_exists($key, self::APP_SETTING_TYPES) && self::APP_SETTING_TYPES[$key] === 'array') {
$value = $value !== '' ? explode(',', $value) : [];
$value = !empty($value) ? explode(',', $value) : [];
}
return $value;
}
Expand Down
Loading

0 comments on commit 1c01265

Please sign in to comment.