ownCloud: Fix bug in wizard scripts (SynoCommunity#5953)

* Fix shared folder regex * Fix export path regex * Fix wizard logic * Version bump
mreid-tt · Dec 9, 2023 · af94cfc · af94cfc
1 parent 0c4fe12
commit af94cfc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/spk/owncloud/Makefile b/spk/owncloud/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = owncloud
 SPK_VERS = 10.13.3
-SPK_REV = 14
+SPK_REV = 15
 SPK_ICON = src/owncloud.png
 
 DEPENDS = cross/owncloud

diff --git a/spk/owncloud/src/wizard_templates/install_uifile.sh b/spk/owncloud/src/wizard_templates/install_uifile.sh
@@ -5,7 +5,6 @@ if [ -z ${SYNOPKG_PKGDEST_VOL} ]; then
 	SYNOPKG_PKGDEST_VOL="/volume1"
 fi
 SHAREDIR="${SYNOPKG_PKGNAME}"
-DIR_VALID="/^[\\w _-]+$/"
 
 quote_json ()
 {
@@ -144,12 +143,11 @@ EOF
 check_php_profiles ()
 {
 	PHP_CFG_PATH="/usr/syno/etc/packages/WebStation/PHPSettings.json"
-	if [ "${SYNOPKG_DSM_VERSION_MAJOR}" -lt 7 ]; then
-		if jq -e 'to_entries | map(select((.key | startswith("com-synocommunity-packages-")) and .key != "com-synocommunity-packages-owncloud")) | length > 0' "${PHP_CFG_PATH}" >/dev/null; then
-			return 0  # true
-		else
-			return 1  # false
-		fi
+	if [ "${SYNOPKG_DSM_VERSION_MAJOR}" -lt 7 ] && \
+		jq -e 'to_entries | map(select((.key | startswith("com-synocommunity-packages-")) and .key != "com-synocommunity-packages-owncloud")) | length > 0' "${PHP_CFG_PATH}" >/dev/null; then
+		return 0  # true
+	else
+		return 1  # false
 	fi
 }
 
@@ -195,7 +193,7 @@ PAGE_ADMIN_CONFIG=$(/bin/cat<<EOF
 			"validator": {
 				"allowBlank": false,
 				"regex": {
-					"expr": "$(echo ${DIR_VALID} | quote_json)",
+					"expr": "/^[\\\w.][\\\w. -]{0,30}[\\\w.-][\\\\$]?$|^[\\\w][\\\\$]?$/",
 					"errorText": "{{{OWNCLOUD_DATA_DIRECTORY_VALIDATION_ERROR_TEXT}}}"
 				}
 			}

diff --git a/spk/owncloud/src/wizard_templates/uninstall_uifile.sh b/spk/owncloud/src/wizard_templates/uninstall_uifile.sh
@@ -33,7 +33,7 @@ getValidPath()
 	VALID_PATH=$(/bin/cat<<EOF
 {
 	var exportPath = arguments[0];
-	const pattern = /^\/volume[0-9]+\//;
+	const pattern = /^\/(volume|volumeUSB)[0-9]+\//;
 	if (exportPath === "") {
 		return true;
 	} else if (pattern.test(exportPath)) {