diff options
-rw-r--r-- | bin/ncp/CONFIG/nc-init.sh | 7 | ||||
-rw-r--r-- | changelog.md | 14 | ||||
-rw-r--r-- | ncp-web/ncp-launcher.php | 4 |
3 files changed, 15 insertions, 10 deletions
diff --git a/bin/ncp/CONFIG/nc-init.sh b/bin/ncp/CONFIG/nc-init.sh index 16a26bbf..eb08a241 100644 --- a/bin/ncp/CONFIG/nc-init.sh +++ b/bin/ncp/CONFIG/nc-init.sh @@ -105,10 +105,10 @@ EOF # 4 Byte UTF8 support ncc config:system:set mysql.utf8mb4 --type boolean --value="true" + ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[nextcloudpi]}" --value="nextcloudpi" ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[nextcloudpi-local]}" --value="nextcloudpi.local" - # trusted_domains 6 used by docker - ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[nextcloudpi]}" --value="nextcloudpi" - ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[nextcloudpi-lan]}" --value="nextcloudpi.lan" + ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[nextcloudpi-lan]}" --value="nextcloudpi.lan" + ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[nc_domain]}" --value="nextcloudpi.lan" # email ncc config:system:set mail_smtpmode --value="sendmail" @@ -184,7 +184,6 @@ EOF # other ncc config:system:set overwriteprotocol --value=https ncc config:system:set overwrite.cli.url --value="https://nextcloudpi/" - ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[nc_domain]}" --value="nextcloudpi" # bash completion for ncc apt_install bash-completion diff --git a/changelog.md b/changelog.md index 4b793bbb..f5971472 100644 --- a/changelog.md +++ b/changelog.md @@ -1,11 +1,17 @@ -[v1.43.2](https://github.com/nextcloud/nextcloudpi/commit/b555146) (2021-11-02) nc-datadir: support for nc-encrypted folders +[v1.43.5](https://github.com/nextcloud/nextcloudpi/commit/93fd384) (2021-11-04) ncp-web: tweak invalid character set -[v1.43.1 ](https://github.com/nextcloud/nextcloudpi/commit/50a003a) (2021-10-27) ncp-web: tweak password suggestions +[v1.43.4](https://github.com/nextcloud/nextcloudpi/commit/d4bca07) (2021-11-04) nc-restore: Adding ZFS to filesystem whitelist / updating error message -[v1.43.0](https://github.com/nextcloud/nextcloudpi/commit/7b73d1d) (2021-10-22) add nc-encrypt +[v1.43.3](https://github.com/nextcloud/nextcloudpi/commit/19ede8a) (2021-11-02) nc-datadir: support for nc-encrypted folders -[v1.42.5](https://github.com/nextcloud/nextcloudpi/commit/532a6a8) (2021-10-27) letsencrypt: sync ncp and nc cert paths +[v1.43.2 ](https://github.com/nextcloud/nextcloudpi/commit/ee01a70) (2021-10-27) ncp-web: tweak password suggestions + +[v1.43.1 ](https://github.com/nextcloud/nextcloudpi/commit/a828576) (2021-10-30) Clarify documentation of nc-previews-auto command (#1370) + +[v1.43.0 ](https://github.com/nextcloud/nextcloudpi/commit/7b73d1d) (2021-10-22) add nc-encrypt + +[v1.42.5 ](https://github.com/nextcloud/nextcloudpi/commit/532a6a8) (2021-10-27) letsencrypt: sync ncp and nc cert paths [v1.42.4 ](https://github.com/nextcloud/nextcloudpi/commit/41368fe) (2021-10-27) ncp-vm: add automatic testing and change default root password diff --git a/ncp-web/ncp-launcher.php b/ncp-web/ncp-launcher.php index 25fee4b1..eff9048c 100644 --- a/ncp-web/ncp-launcher.php +++ b/ncp-web/ncp-launcher.php @@ -66,8 +66,8 @@ if ( $_POST['action'] == "launch" && $_POST['config'] ) // sanitize $val = trim(escapeshellarg($new_params[$id]),"'"); - preg_match( '/[\'" ]/' , $val , $matches ) - and exit( '{ "output": "Invalid parameters" , "token": "' . getCSRFToken() . '" }' ); + preg_match( '/[\'" &]/' , $val , $matches ) + and exit( '{ "output": "Invalid characters in input" , "token": "' . getCSRFToken() . '" }' ); // save $cfg['params'][$index]['value'] = $val; |