Move watermark logic to separate service and fix access of user for g…

…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]>
nextcloud · Dec 28, 2023 · f527b51 · f527b51
1 parent 74091fe
commit f527b51
Show file tree

Hide file tree

Showing 13 changed files with 534 additions and 225 deletions.
diff --git a/composer/composer/autoload_classmap.php b/composer/composer/autoload_classmap.php
@@ -73,6 +73,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',

diff --git a/composer/composer/autoload_static.php b/composer/composer/autoload_static.php
@@ -88,6 +88,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',

diff --git a/lib/AppConfig.php b/lib/AppConfig.php
@@ -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;
 	}