Merge branch 'dev' into commperms

This commit is contained in:
Mike Macgirvin 2022-12-21 07:00:17 +11:00
commit 5a84ac7e96
27 changed files with 7 additions and 7 deletions

View file

@ -47,9 +47,9 @@ class Vote extends Controller
if ($obj['oneOf']) {
foreach ($obj['oneOf'] as $selection) {
// logger('selection: ' . $selection);
// logger('response: ' . $response);
if ($selection['name'] && $selection['name'] === $response) {
// logger('selection: ' . '"' . $selection['name'] . '"');
// logger('response: ' . '"' . $response . '"');
if ($selection['name'] && trim($selection['name']) === trim($response)) {
$valid = true;
}
}

View file

@ -2,7 +2,7 @@
## Disclaimer
- This script does work with Debian 10 or 11 only.
- This script does work with Debian 11 only.
- This script has to be used on a fresh debian install only (it does not take account for a possibly already installed and configured webserver or sql implementation). You may use it to install more than one website on the same computer as long as you use a single webserver.
## First step: setting up your system

View file

@ -25,7 +25,7 @@
# under Debian Linux. It will:
# - install
# * apache or nginx webserver,
# * php (adding sury repository to get php 8.* on Debian 11 or 10),
# * php (adding sury repository to get php 8.* on Debian 11),
# * composer
# * mariadb - the database your website,
# * adminer,
@ -91,9 +91,9 @@ function check_sanity {
then
die "Debian is supported only"
fi
if [ -z "$(grep 'Linux 10\|Linux 11' /etc/issue)" ]
if [ -z "$(grep 'Linux 11' /etc/issue)" ]
then
die "Debian 11 (bullseye) or Debian 10 (buster) are supported only"
die "Debian 11 (bullseye) is supported only"
fi
}