Merge branch 'craigk5n:master' into lintall

.dockerignore

@@ -1,14 +1,15 @@
 .git
 .gitignore
+.github
 bump_version.sh
 docker
-
+composer.json
+composer.lock
 # ignore all docs/
 docs
 # except these 2
 !docs/newwin.gif
 !docs/WebCalendar-SysAdmin.html
-
 includes/settings.php
 java
 Makefile
@@ -18,3 +19,8 @@ tests
 TODO
 vendor
 ws
+wc-icons
+terraform
+.pytest_cache
+*.old
+.dockerignore

.github/workflows/php-syntax-check.yml

@@ -0,0 +1,21 @@
+name: PHP Syntax Checker
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - release
+
+jobs:
+  php-lint:
+    name: Check PHP syntax
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Check PHP syntax
+        run: |
+          find . -name '*.php' -not -path './vendor/*' -exec php -l {} \;

.npmrc

@@ -3,4 +3,4 @@ init-author-email = "[email protected]"
 init-author-name = "Craig Knudsen"
 init-author-url = "http://k5n.us/cknudsen"
 init-license = GPL-2.0-only
-init-version = 1.9.9
+init-version = 1.9.12

bump_version.sh

@@ -107,6 +107,11 @@ function update_upgrade_matrix() {
     echo "Updated $file_path to version $new_version"
 }
 
+update_npmrc_version() {
+    local new_version="$1"
+    sed -i -E "s/(init-version = )[^ ]+/\1$new_version/" .npmrc
+}
+
 # Function to print current version
 print_version() {
     local version
@@ -139,6 +144,7 @@ update_config_php "$new_version"
 update_upgrading_html "$new_version"
 update_composer_json "$new_version"
 update_upgrade_matrix "$new_version"
+update_npmrc_version "$new_version"
 
 echo ""
 echo "Files updated to version $new_version"

docker/Dockerfile-php8

@@ -8,38 +8,10 @@ LABEL vendor "k5n.us"
 
 RUN docker-php-ext-install mysqli
 
-# Copy only the files included in a release rather than all files.
-RUN mkdir -p /var/www/html/images `
-  /var/www/html/includes `
-  /var/www/html/install `
-  /var/www/html/pub `
-  /var/www/html/themes `
-  /var/www/html/tools `
-  /var/www/html/translations `
-# Don't we need these, too?
-  /var/www/html/docs `
-  /var/www/html/wc-icons
-
-COPY includes /var/www/html/includes/
-
-# In case there was a copy in the local dev setup,
-# remove any existing settings.php.
-RUN rm -f /var/www/html/includes/settings.php
-# WARNING: May be a security issue!
-# Better to use .dockerignore and never copy settings.php in at all.
+# Copy all files except those in .dockerignore
+COPY . /var/www/html/
 
+# Create an empty settings.php file with write permissions for anyone
+# to allow the web-based installer to update it.
 RUN touch /var/www/html/includes/settings.php
 RUN chmod 777 /var/www/html/includes/settings.php
-
-COPY [a-z]*php favicon.ico GPL.html /var/www/html/
-# Need AUTHORS, too, or about.php won't work.
-COPY AUTHORS /var/www/html/
-
-COPY docs /var/www/html/docs/
-COPY images /var/www/html/images/
-COPY install /var/www/html/install/
-COPY pub /var/www/html/pub/
-COPY themes /var/www/html/themes/
-COPY tools /var/www/html/tools/
-COPY translations /var/www/html/translations/
-COPY wc-icons /var/www/html/wc-icons/

release-files

@@ -226,7 +226,9 @@ month.php
 nulogin.php
 pref.php
 pub/bootstrap.bundle.min.js
+pub/bootstrap.bundle.min.js.sha
 pub/bootstrap.min.css
+pub/bootstrap.min.css.sha
 pub/ckeditor/bender-runner.config.json
 pub/ckeditor/CHANGES.md
 pub/ckeditor/ckeditor.js
@@ -341,6 +343,7 @@ pub/ckeditor/skins/moono-lisa/images/spinner.gif
 pub/ckeditor/skins/moono-lisa/readme.md
 pub/ckeditor/styles.js
 pub/jquery.min.js
+pub/jquery.min.js.sha
 publish.php
 purge.php
 README.md
@@ -358,29 +361,15 @@ security_audit.php
 SECURITY.md
 select_user.php
 set_entry_cat.php
-themes/autumn_pref.gif
-themes/autumn_pref.php
-themes/basic_admin.gif
-themes/basic_admin.php
-themes/default_admin.php
-themes/default_pref.gif
-themes/default_pref.php
-themes/spring_pref.gif
-themes/spring_pref.php
-themes/theme_inc.php
-themes/touch_of_grey_pref.gif
-themes/touch_of_grey_pref.php
 tools/check_translation.pl
 tools/convert_passwords.php
-tools/palm_datebook.pl
 tools/populate_sqlite3.php
 tools/reload_remotes.php
 tools/send_reminders.php
 tools/summary.txt
 tools/translation_summary.pl
 tools/update_all.pl
 tools/update_translation.pl
-tools/upgrade_to_0.9.7.pl
 translations/Afrikaans.txt
 translations/Albanian.txt
 translations/Arabic_utf8.txt