From 48fcc20de46403e6c3cd019ccb35ae1f41b577d2 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Wed, 13 Sep 2023 08:56:37 -0600 Subject: [PATCH] various corrections --- GPL.html | 6 +- README.md | 10 +- access.php | 2 +- category.php | 2 +- category_handler.php | 2 +- day.php | 2 +- docker/docker-compose-php7.yml | 2 +- docker/docker-compose-php8-dev.yml | 2 +- docker/docker-compose-php8.yml | 2 +- docs/README | 4 +- docs/WebCalendar-DeveloperGuide.html | 43 ++++++--- docs/WebCalendar-Styling.html | 10 +- docs/WebCalendar-SysAdmin.html | 92 +++++++++++-------- docs/WebCalendar-UserManual.html | 6 +- docs/php2html.pl | 2 +- docs/sql2html.pl | 4 +- edit_entry.php | 12 +-- edit_entry_handler.php | 5 +- edit_report.php | 6 +- freebusy.php | 2 +- help_bug.php | 2 +- help_docs.php | 2 +- icalclient.php | 2 +- images/bootstrap-icons/arrow-90deg-up.svg | 2 +- images/bootstrap-icons/arrow-down-short.svg | 2 +- images/bootstrap-icons/arrow-left-circle.svg | 2 +- images/bootstrap-icons/arrow-right-circle.svg | 2 +- images/bootstrap-icons/arrow-up-short.svg | 2 +- images/bootstrap-icons/check-circle.svg | 2 +- images/bootstrap-icons/circle-fill.svg | 2 +- images/bootstrap-icons/dash-circle.svg | 2 +- .../exclamation-triangle-fill.svg | 2 +- images/bootstrap-icons/info-circle-fill.svg | 4 +- images/bootstrap-icons/key-fill.svg | 2 +- images/bootstrap-icons/plus-circle.svg | 2 +- images/bootstrap-icons/printer.svg | 2 +- .../bootstrap-icons/question-circle-fill.svg | 2 +- images/bootstrap-icons/rss-fill.svg | 2 +- images/bootstrap-icons/search.svg | 2 +- images/bootstrap-icons/trash.svg | 2 +- import_outlookcsv.php | 4 +- import_palmdesktop.php | 2 +- includes/access.php | 4 +- includes/ajax.php | 4 +- includes/assert.php | 4 +- includes/classes/AttachmentList.php | 6 +- includes/classes/CommentList.php | 6 +- includes/classes/Doc.php | 6 +- includes/classes/DocList.php | 8 +- includes/classes/Event.php | 12 +-- includes/classes/RptEvent.php | 14 +-- includes/classes/WebCalMailer.php | 4 +- includes/classes/WebCalendar.php | 8 +- includes/classes/captcha/README.webcalendar | 2 +- includes/config.php | 10 +- includes/css/styles.css | 4 +- includes/css/styles.php | 6 +- includes/date_formats.php | 4 +- includes/dbi4php.php | 4 +- includes/formvars.php | 6 +- includes/functions.php | 61 ++++++------ includes/help_list.php | 2 +- includes/init.php | 8 +- includes/js/edit_entry.php | 2 +- includes/js/edit_remotes.php | 4 +- includes/js/popups.js | 4 +- includes/js/util.js | 4 +- includes/moon_phases.php | 7 +- includes/translate.php | 16 ++-- includes/user-app-joomla.php | 2 +- includes/user-imap.php | 4 +- includes/user.php | 6 +- includes/views.php | 4 +- includes/xcal.php | 26 +++--- install/index.php | 8 +- install/install_functions.php | 2 +- install/sql/tables-mysql.sql | 4 +- install/sql/upgrade.sql | 2 +- layers.php | 2 +- list_unapproved.php | 4 +- pref.php | 4 +- remotecal_mgmt.php | 2 +- report.php | 6 +- resourcecal_mgmt.php | 2 +- rss.php | 10 +- rss_activity_log.php | 2 +- rss_unapproved.php | 2 +- search_handler.php | 6 +- security_audit.php | 2 +- tests/functionsTest.php | 22 ++--- tests/phpunit.xml | 2 +- themes/autumn_pref.php | 4 +- themes/basic_admin.php | 4 +- themes/default_admin.php | 4 +- themes/default_pref.php | 4 +- themes/spring_pref.php | 4 +- themes/touch_of_grey_pref.php | 4 +- tools/reload_remotes.php | 2 +- tools/send_reminders.php | 2 +- translations/English-US.txt | 8 +- upcoming.php | 4 +- view_entry.php | 2 +- view_l.php | 2 +- view_m.php | 2 +- view_r.php | 4 +- view_t.php | 2 +- view_w.php | 2 +- week_details.php | 2 +- week_ssi.php | 2 +- ws/ws.php | 4 +- year.php | 2 +- 111 files changed, 349 insertions(+), 323 deletions(-) diff --git a/GPL.html b/GPL.html index cb583069a..faba4992b 100644 --- a/GPL.html +++ b/GPL.html @@ -2,8 +2,8 @@ GNU General Public License - GNU Project - Free Software Foundation (FSF) - - + +

GNU General Public License

@@ -528,7 +528,7 @@

How to Apply These Terms to Your New Pro Other ways to contact the FSF.

Comments on these web pages to -webmasters@www.gnu.org, +webmasters@gnu.org, send other questions to gnu@gnu.org.

diff --git a/README.md b/README.md index f01de9072..9cbde39ba 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ WebCalendar README ------------------ -Project Home Page: https://www.k5n.us/webcalendar/ -Project Owner: Craig Knudsen, craig@k5n.us +Project Home Page: https://k5n.us/webcalendar/ +Project Owner: Craig Knudsen, craig@k5n.us Documentation: - [System Administrator's Guide](http://htmlpreview.github.io/?https://github.com/craigk5n/webcalendar/blob/master/docs/WebCalendar-SysAdmin.html) (Installation instructions, FAQ) - [Upgrading Instructions](http://htmlpreview.github.io/?https://github.com/craigk5n/webcalendar/blob/master/UPGRADING.html) @@ -52,7 +52,7 @@ and MariaDb running that is setup with the `docker-compose` command. build the containers in step above). - Run the following db commands: ``` - GRANT ALL PRIVILEGES ON *.* TO webcalendar_php8@localhost IDENTIFIED BY 'Webcalendar.1' WITH GRANT OPTION; + GRANT ALL PRIVILEGES ON *.* TO webcalendar_php8@localhost IDENTIFIED BY 'Webcalendar.1' WITH GRANT OPTION; FLUSH PRIVILEGES; QUIT ``` @@ -84,7 +84,7 @@ files in the container. build the containers in step above). - Run the following db commands: ``` - GRANT ALL PRIVILEGES ON *.* TO webcalendar_php8@localhost IDENTIFIED BY 'Webcalendar.1' WITH GRANT OPTION; + GRANT ALL PRIVILEGES ON *.* TO webcalendar_php8@localhost IDENTIFIED BY 'Webcalendar.1' WITH GRANT OPTION; FLUSH PRIVILEGES; QUIT ``` @@ -111,7 +111,7 @@ steps. build the containers in step above). - Run the following db commands: ``` - GRANT ALL PRIVILEGES ON *.* TO webcalendar@localhost IDENTIFIED BY 'Webcalendar.1' WITH GRANT OPTION; + GRANT ALL PRIVILEGES ON *.* TO webcalendar@localhost IDENTIFIED BY 'Webcalendar.1' WITH GRANT OPTION; FLUSH PRIVILEGES; QUIT ``` diff --git a/access.php b/access.php index da1981fb0..75eb09dcf 100644 --- a/access.php +++ b/access.php @@ -6,7 +6,7 @@ * - list users to manage (no parameters) * - manage a single user's rights (just "user" parameter) * this will include which functions the user can access and - * (if $ALLOW_VIEW_OTHER is 'Y') which calendars thay can view/edit/approve + * (if $ALLOW_VIEW_OTHER is 'Y') which calendars they can view/edit/approve * - update the database (form handler) * * Input Parameters: diff --git a/category.php b/category.php index 8714b430b..040928992 100644 --- a/category.php +++ b/category.php @@ -156,7 +156,7 @@ } ?> - +