commit 540f9cb0e (HEAD -> main) Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Nov 6 09:07:33 2024 +0000 Updated version number for release of 1.11.6 web/version_num.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 473debdec (origin/main) Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 3 10:19:02 2024 +0000 Add comment web/js/refresh.js.php | 3 +++ 1 file changed, 3 insertions(+) commit d6bb7efc2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 2 16:11:31 2024 +0000 Preserve scroll position after making a booking web/edit_entry.php | 14 ++++++++++++++ web/edit_entry_handler.php | 14 ++++++++++++++ web/js/refresh.js.php | 27 +++++++++++++++++++++++++-- web/js/resizable.js.php | 25 ++++++++++++++++++++++--- 4 files changed, 75 insertions(+), 5 deletions(-) commit b2cc074ce Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Nov 1 14:40:55 2024 +0000 Upgrade to latest version of PHPIMAP from the fork https://github.com/campbell-m/php-imap, fixing deprecation notices running under PHP 8.4 (https://github.com/Webklex/php-imap seems not to be maintained). web/lib/Webklex/PHPIMAP/Client.php | 6 +++--- web/lib/Webklex/PHPIMAP/ClientManager.php | 2 +- .../Connection/Protocols/ImapProtocol.php | 12 ++++++------ .../Connection/Protocols/LegacyProtocol.php | 12 ++++++------ web/lib/Webklex/PHPIMAP/EncodingAliases.php | 2 +- web/lib/Webklex/PHPIMAP/Folder.php | 4 ++-- web/lib/Webklex/PHPIMAP/Message.php | 18 +++++++++--------- web/lib/Webklex/PHPIMAP/Part.php | 2 +- web/lib/Webklex/PHPIMAP/Query/WhereQuery.php | 4 ++-- 9 files changed, 31 insertions(+), 31 deletions(-) commit 16538ca58 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Nov 1 14:15:22 2024 +0000 Upgrade to latest version of phpCAS from the fork https://github.com/campbell-m/phpCAS, fixing deprecation notices running under PHP 8.4 (https://github.com/apereo/phpCAS is no longer maintained). web/lib/CAS.php | 20 ++++++++++---------- web/lib/CAS/Client.php | 19 +++++++++++++------ web/lib/CAS/PGTStorage/Db.php | 2 +- web/lib/CAS/PGTStorage/File.php | 6 ++++++ web/lib/CAS/README.md | 7 +++++++ 5 files changed, 37 insertions(+), 17 deletions(-) commit da9c625da Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 31 16:56:38 2024 +0000 Fix bug introduced in recent commit when operating in multisite mode. web/index.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) commit b4388c8cf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 31 14:50:07 2024 +0000 Minor tweak to comment web/edit_entry_handler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit dd6f9e78d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 31 14:47:41 2024 +0000 Rename variable web/edit_entry_handler.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit c0c000e0d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 31 14:39:12 2024 +0000 Fix bug when an admin user makes a booking and bookings are forced to be private. See GitHub Issue #3770. web/edit_entry_handler.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) commit cd0a9161f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 28 18:45:07 2024 +0000 Add type declarations web/lib/MRBS/Form/ElementInputDatalist.php | 2 +- web/lib/MRBS/Form/FieldInputDatalist.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit d4c844324 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 28 18:19:26 2024 +0000 Add type declaration web/lib/MRBS/Form/ElementFieldset.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 22c69e265 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 28 09:17:19 2024 +0000 Remove redundant initialisation. web/lib/MRBS/Form/Element.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 763d4dfed Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 27 18:33:39 2024 +0000 Delete condition that is always true at this point web/lib/MRBS/Form/Element.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3cdb1c95a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 27 18:26:16 2024 +0000 Don't bother adding a class if it's already set web/lib/MRBS/Form/Element.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit b2f6591b5 Merge: f5b64b52d 7bc7f873e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 27 17:59:07 2024 +0000 Merge pull request #3767 from meeting-room-booking-system/3765-next-and-previous-week-buttons-in-day-view 3765 next and previous week buttons in day view commit 7bc7f873e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 27 17:11:57 2024 +0000 Don't display the << and >> buttons on narrow screens web/css/mrbs.css.php | 11 +++++++++-- web/index.php | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) commit 44149c4d6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 27 16:51:45 2024 +0000 Fix problem resulting in many outstanding requests web/js/index.js.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit 293730278 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 27 12:18:38 2024 +0000 Prefetch the << and >> buttons web/index.php | 8 ++++---- web/js/index.js.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) commit 39cf8dece Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 27 12:10:05 2024 +0000 Add buttons in the day view to go back/forward by a week web/css/mrbs.css.php | 19 ++++++++++++++++--- web/index.php | 35 +++++++++++++++++++++++++++-------- 2 files changed, 43 insertions(+), 11 deletions(-) commit f88128fa6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 26 13:58:51 2024 +0100 Restructure web/index.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) commit f5b64b52d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 24 17:57:05 2024 +0100 Fix bug when scrolling past a booked cell web/js/resizable.js.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) commit 8757998de Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 24 17:41:41 2024 +0100 Tweak scroll gap web/js/resizable.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit c6122458b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 24 17:38:07 2024 +0100 Add comments and limit scroll gap to half the height/width of the visible tbody. web/js/resizable.js.php | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) commit 07cb9b1d7 Merge: fc87d9fa1 4d7c3c696 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 24 17:12:34 2024 +0100 Merge branch 'main' into fix_drag_when_scrolling commit 4d7c3c696 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 24 17:11:24 2024 +0100 Remove redundant global declarations. web/edit_entry.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit fc87d9fa1 Merge: da5b6b22a e9130dec1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 24 16:49:45 2024 +0100 Merge branch 'main' into fix_drag_when_scrolling commit e9130dec1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 24 16:47:59 2024 +0100 Add type declaration web/functions.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit b497f5427 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 24 16:44:05 2024 +0100 Fix bug causing placeholders not to be displayed for custom fields that are textareas. See GitHub Issue #3763. web/edit_entry.php | 15 ++------------- web/functions.inc | 22 +++++++++++++++------- 2 files changed, 17 insertions(+), 20 deletions(-) commit da5b6b22a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 23 18:31:56 2024 +0100 Add right scrolling web/js/resizable.js.php | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) commit f37742b84 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 23 17:59:05 2024 +0100 Add left scrolling web/js/resizable.js.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) commit 3e72f7c38 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 23 17:45:50 2024 +0100 Restructure web/js/resizable.js.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) commit c254b0f78 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 23 16:44:53 2024 +0100 Rename variable web/js/resizable.js.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit cdaa7a99b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 23 16:28:45 2024 +0100 Restructure web/js/resizable.js.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) commit 365b76b71 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 23 16:03:34 2024 +0100 Restructure web/js/resizable.js.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit 9783a56cd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 22 17:52:35 2024 +0100 Fix bug when there's no tfoot web/js/resizable.js.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit f3af871f7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 22 17:31:23 2024 +0100 Rename variable web/js/resizable.js.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) commit cb302d153 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 22 17:23:05 2024 +0100 Remove unnecessary code web/js/resizable.js.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) commit a080a1b0a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 22 17:14:49 2024 +0100 Fix bug when dragging down web/js/resizable.js.php | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) commit d4204fa4f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 21 17:31:36 2024 +0100 Prevent scrolling past the bottom web/js/resizable.js.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) commit ef87d8037 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 17 17:13:38 2024 +0100 Add TODOs web/js/resizable.js.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 30d380fe6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 17 17:10:48 2024 +0100 Fix bug web/js/resizable.js.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 593d3df6d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 17 16:52:33 2024 +0100 Hide box when outside table web/js/resizable.js.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 6ca467895 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 17 15:35:31 2024 +0100 Add scrolling down web/js/resizable.js.php | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) commit b7b2e8398 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 16 17:25:46 2024 +0100 Added auto-scrolling approaching the top web/js/resizable.js.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) commit 1dab4dc64 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 16 16:46:51 2024 +0100 Update comments web/lib/MRBS/MailQueue.php | 2 ++ 1 file changed, 2 insertions(+) commit 08b18539a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 16 16:08:02 2024 +0100 Update comments web/lib/MRBS/MailQueue.php | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) commit 82e82aae2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 16 15:55:09 2024 +0100 Add type declaration web/lib/MRBS/DBFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 59cca014c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 14 19:15:03 2024 +0100 Simplify code web/lib/MRBS/DBFactory.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit aca770aa3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 14 18:31:59 2024 +0100 Add check for pdo_pgsql extension web/lib/MRBS/DBFactory.php | 42 +++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 8 deletions(-) commit b331ff27f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 14 17:43:02 2024 +0100 Make the code a little more robust by not relying on the text of an error message. web/lib/MRBS/DBFactory.php | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) commit 1ed4058d0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 13 18:12:39 2024 +0100 Fix comment web/js/resizable.js.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit a17fb826e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 13 18:09:45 2024 +0100 Rename variables web/js/resizable.js.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit da59e87cf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 13 17:35:21 2024 +0100 Remove redundant code web/js/resizable.js.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) commit 7ae2816ba Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 13 17:30:43 2024 +0100 Fix bug when booking is constrained to a single row or column web/js/resizable.js.php | 2 -- 1 file changed, 2 deletions(-) commit ab170e533 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 13 17:12:50 2024 +0100 Add comments web/js/resizable.js.php | 9 +++++++++ 1 file changed, 9 insertions(+) commit 84f02d472 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 13 17:05:37 2024 +0100 Restructure web/js/resizable.js.php | 66 +++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 33 deletions(-) commit 494ec0eb4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 13 17:00:53 2024 +0100 Fix bug causing drag-select not to select the original cell when dragging up or left. web/js/resizable.js.php | 42 ++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 14 deletions(-) commit d61bde5d0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 9 17:48:53 2024 +0100 Upgrade to PHPMailer Version 6.9.2 web/lib/PHPMailer/README.md | 12 ++--- web/lib/PHPMailer/SECURITY.md | 4 +- web/lib/PHPMailer/VERSION | 2 +- web/lib/PHPMailer/composer.json | 3 +- web/lib/PHPMailer/get_oauth_token.php | 6 +-- .../PHPMailer/language/phpmailer.lang-es.php | 13 +++-- .../PHPMailer/language/phpmailer.lang-fr.php | 3 +- .../PHPMailer/language/phpmailer.lang-ja.php | 14 +++-- .../language/phpmailer.lang-ku.php (new) | 27 ++++++++++ .../PHPMailer/language/phpmailer.lang-ru.php | 22 +++++--- .../PHPMailer/language/phpmailer.lang-tr.php | 9 +++- .../language/phpmailer.lang-ur.php (new) | 30 +++++++++++ web/lib/PHPMailer/src/DSNConfigurator.php | 2 +- web/lib/PHPMailer/src/Exception.php | 2 +- web/lib/PHPMailer/src/OAuth.php | 4 +- web/lib/PHPMailer/src/OAuthTokenProvider.php | 2 +- web/lib/PHPMailer/src/PHPMailer.php | 48 ++++++++---------- web/lib/PHPMailer/src/POP3.php | 8 +-- web/lib/PHPMailer/src/SMTP.php | 44 ++++++++++------ 19 files changed, 175 insertions(+), 80 deletions(-) commit 8fdfb4114 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 5 11:19:23 2024 +0100 Simplify code web/view_entry.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit e9ab305f0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 5 11:05:56 2024 +0100 Simplify code web/js/datatables.js.php | 18 ++++++++--------- web/js/edit_entry.js.php | 40 +++++++++++++++++++------------------- web/js/edit_users.js.php | 2 +- web/js/general.js.php | 4 ++-- web/js/index.js.php | 10 +++++----- web/js/report.js.php | 12 ++++++------ web/js/resizable.js.php | 4 ++-- web/js/search.js.php | 2 +- web/js/view_entry.js.php | 2 +- web/language.inc | 7 +++++++ 10 files changed, 54 insertions(+), 47 deletions(-) commit 8b2ac95c5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 5 09:29:18 2024 +0100 Simplify code web/language.inc | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) commit 2003da3c8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 5 09:17:22 2024 +0100 Simplify code web/language.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) commit 52afe01bf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 4 17:06:29 2024 +0100 Set STRICT_TRANS_TABLES so that we can detect invalid values being inserted in the database web/lib/MRBS/DB_mysql.php | 2 ++ 1 file changed, 2 insertions(+) commit 005fe5f4a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 4 16:14:59 2024 +0100 Fix TypeError web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f3bb37c0d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 4 11:04:15 2024 +0100 Add missing escaping of text strings web/js/resizable.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9362cb7de Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 4 11:00:16 2024 +0100 Add missing escaping of text strings web/js/edit_entry.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit af0a966d1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 4 10:55:38 2024 +0100 Add missing escaping of text strings web/js/datatables.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 377dce0c4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 4 10:52:50 2024 +0100 Add missing escaping of text strings web/js/edit_entry.js.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 3800e651f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 4 10:33:49 2024 +0100 Fix bug causing datepicker not to change dates when using Catalan translation. See GitHub Issue #3752. web/js/index.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0d9ad8c4a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 3 18:07:40 2024 +0100 Remove redundant global declaration web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 120f221aa Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 3 18:00:52 2024 +0100 Fix bug that causes a booking to be deleted completely when editing a series and changing its repeat type to "none" web/mrbs_sql.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit f87b67293 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 1 09:08:03 2024 +0100 Simplify code web/functions.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit fb6b254bf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Sep 30 18:28:56 2024 +0100 Better fix for operand types web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 4014b7008 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Sep 30 18:24:55 2024 +0100 Fix types in comparison. web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7d7152f37 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Sep 30 17:39:10 2024 +0100 Remove unnecessary semicolon. web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 369664313 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Sep 30 17:28:12 2024 +0100 Fix potential bug resulting in incorrect period durations in reports when a booking spans a DST transition and areas have different numbers of periods. web/functions.inc | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) commit af1d03aa0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 29 18:30:09 2024 +0100 Fix TypeError web/report.php | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) commit dc1e94263 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 29 17:37:44 2024 +0100 Fix bug resulting in incorrect period durations in reports when areas have different numbers of periods. web/functions.inc | 13 ++++++------- web/report.php | 8 +++++--- 2 files changed, 11 insertions(+), 10 deletions(-) commit ff0da3d9d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Sep 24 17:23:57 2024 +0100 Update to latest code from master branch web/lib/Webklex/PHPIMAP/Attachment.php | 75 ++++- web/lib/Webklex/PHPIMAP/Client.php | 93 +++--- web/lib/Webklex/PHPIMAP/ClientManager.php | 200 ++----------- web/lib/Webklex/PHPIMAP/Config.php (new) | 266 +++++++++++++++++ .../Connection/Protocols/ImapProtocol.php | 110 ++++++- .../Connection/Protocols/LegacyProtocol.php | 24 +- .../Connection/Protocols/Protocol.php | 21 +- .../Protocols/ProtocolInterface.php | 11 + web/lib/Webklex/PHPIMAP/Folder.php | 81 +++-- web/lib/Webklex/PHPIMAP/Header.php | 74 +++-- web/lib/Webklex/PHPIMAP/Message.php | 112 ++++--- web/lib/Webklex/PHPIMAP/Part.php | 24 +- web/lib/Webklex/PHPIMAP/Query/Query.php | 112 +++---- web/lib/Webklex/PHPIMAP/Query/WhereQuery.php | 140 ++++----- web/lib/Webklex/PHPIMAP/Structure.php | 21 +- .../PHPIMAP/Support/Masks/AttachmentMask.php | 1 + .../PHPIMAP/Support/Masks/MessageMask.php | 1 + 17 files changed, 890 insertions(+), 476 deletions(-) commit fae3787d6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Sep 24 17:08:53 2024 +0100 Update comment web/lib/MRBS/Auth/AuthImapPhp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit e0b0ba69d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Sep 24 17:04:54 2024 +0100 Remove unused local variable web/lib/MRBS/Auth/AuthImapPhp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4641ca2f2 (origin/php8.4_imap) Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Sep 24 17:00:45 2024 +0100 Initial implementation of AuthImapPhp using library code instead of the PHP imap extension which has been removed from PHP 8.4. LICENSE | 26 + web/lib/MRBS/Auth/AuthImapPhp.php | 81 + web/lib/Webklex/PHPIMAP/Address.php (new) | 90 + web/lib/Webklex/PHPIMAP/Attachment.php (new) | 408 ++++ web/lib/Webklex/PHPIMAP/Attribute.php (new) | 325 +++ web/lib/Webklex/PHPIMAP/Client.php (new) | 950 +++++++++ .../Webklex/PHPIMAP/ClientManager.php (new) | 293 +++ .../Protocols/ImapProtocol.php (new) | 1300 ++++++++++++ .../Protocols/LegacyProtocol.php (new) | 814 ++++++++ .../Connection/Protocols/Protocol.php (new) | 366 ++++ .../Protocols/ProtocolInterface.php (new) | 447 ++++ .../Connection/Protocols/Response.php (new) | 417 ++++ .../PHPIMAP/EncodingAliases.php (new) | 591 ++++++ .../Webklex/PHPIMAP/Events/Event.php (new) | 28 + .../Events/FlagDeletedEvent.php (new) | 22 + .../PHPIMAP/Events/FlagNewEvent.php (new) | 40 + .../Events/FolderDeletedEvent.php (new) | 22 + .../Events/FolderMovedEvent.php (new) | 40 + .../PHPIMAP/Events/FolderNewEvent.php (new) | 36 + .../Events/MessageCopiedEvent.php (new) | 22 + .../Events/MessageDeletedEvent.php (new) | 22 + .../Events/MessageMovedEvent.php (new) | 40 + .../PHPIMAP/Events/MessageNewEvent.php (new) | 36 + .../Events/MessageRestoredEvent.php (new) | 22 + .../Exceptions/AuthFailedException.php (new) | 24 + .../ConnectionFailedException.php (new) | 24 + .../EventNotFoundException.php (new) | 24 + .../FolderFetchingException.php (new) | 24 + .../GetMessagesFailedException.php (new) | 24 + .../ImapBadRequestException.php (new) | 24 + .../ImapServerErrorException.php (new) | 24 + .../InvalidMessageDateException.php (new) | 24 + ...alidWhereQueryCriteriaException.php (new) | 24 + .../MaskNotFoundException.php (new) | 24 + ...MessageContentFetchingException.php (new) | 24 + .../MessageFlagException.php (new) | 24 + .../MessageHeaderFetchingException.php (new) | 24 + .../MessageNotFoundException.php (new) | 24 + ...essageSearchValidationException.php (new) | 24 + .../MessageSizeFetchingException.php (new) | 24 + .../MethodNotFoundException.php (new) | 24 + .../MethodNotSupportedException.php (new) | 24 + ...NotSupportedCapabilityException.php (new) | 24 + .../ProtocolNotSupportedException.php (new) | 24 + .../Exceptions/ResponseException.php (new) | 91 + .../Exceptions/RuntimeException.php (new) | 24 + web/lib/Webklex/PHPIMAP/Folder.php (new) | 572 ++++++ web/lib/Webklex/PHPIMAP/Header.php (new) | 808 ++++++++ web/lib/Webklex/PHPIMAP/IMAP.php (new) | 375 ++++ web/lib/Webklex/PHPIMAP/Message.php (new) | 1703 ++++++++++++++++ web/lib/Webklex/PHPIMAP/Part.php (new) | 308 +++ .../Webklex/PHPIMAP/Query/Query.php (new) | 1092 ++++++++++ .../PHPIMAP/Query/WhereQuery.php (new) | 555 +++++ web/lib/Webklex/PHPIMAP/Structure.php (new) | 164 ++ .../Support/AttachmentCollection.php (new) | 26 + .../PHPIMAP/Support/FlagCollection.php (new) | 25 + .../Support/FolderCollection.php (new) | 26 + .../Support/Masks/AttachmentMask.php (new) | 44 + .../PHPIMAP/Support/Masks/Mask.php (new) | 137 ++ .../Support/Masks/MessageMask.php (new) | 86 + .../Support/MessageCollection.php (new) | 26 + .../Support/PaginatedCollection.php (new) | 82 + .../PHPIMAP/Traits/HasEvents.php (new) | 77 + .../Webklex/PHPIMAP/config/imap.php (new) | 226 ++ 64 files changed, 13365 insertions(+) commit a1035b637 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 22 17:18:23 2024 +0100 Reduce get_bookings_in_series() to a single SQL query. web/mrbs_sql.inc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) commit b2910f9a2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 22 16:46:54 2024 +0100 Fix TypeError web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c9bbd4590 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Sep 21 14:38:47 2024 +0100 Add Catalan site_faq. See GitHub Issue #3748. web/site_faq/site_faq_ca.html (new) | 179 ++++++++++++++++++++++++++ 1 file changed, 179 insertions(+) commit f497b2fb9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Sep 21 14:37:52 2024 +0100 Update Catalan translation. See GitHub Issue #3748. web/lang/lang.ca | 84 +++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 42 deletions(-) commit da327a913 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 18 18:54:53 2024 +0100 Update Catalan translation. See GitHub Issue #3747. web/lang/lang.ca | 899 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 694 insertions(+), 205 deletions(-) commit 688b59dcb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 5 18:23:34 2024 +0100 Fix bug resulting in an empty end slot selector in certain circumstances. See GitHub Issue #3741. web/js/edit_entry.js.php | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) commit 5f3a83bf9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 22 21:49:11 2024 +0100 Fix TypeError. See GitHib Issue #3732. web/edit_area.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3c6a3e68b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Aug 20 14:31:23 2024 +0100 Fix issue with the first row in the all rooms view being very high in Firefox. See GitHub Issue #3726. (Not quite sure what problem that CSS rule was trying to solve in the first place and why it's no longer necessary.) web/css/mrbs.css.php | 4 ---- 1 file changed, 4 deletions(-) commit d1f118062 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 18 20:35:18 2024 +0100 Fix TypeError. See GitHib Issue #3728. web/edit_room.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5e5df0444 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 18 20:32:07 2024 +0100 Fix TypeError web/edit_room.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d91073829 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 16 18:49:53 2024 +0100 Highlight the column cell header in the all rooms view. See GitHub Issue #3720. web/css/mrbs.css.php | 18 ++++++++++-------- web/js/refresh.js.php | 12 ++++++++++++ 2 files changed, 22 insertions(+), 8 deletions(-) commit 5ad7ed21b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 15 21:31:11 2024 +0100 Fix TypeError. See GitHub Issue #3723. web/report.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4b4164072 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 15 18:51:49 2024 +0100 Remove use of deprecated in PHP 8.4 ini_set setting of session.sid_bits_per_character. See https://wiki.php.net/rfc/deprecations_php_8_4#sessionsid_length_and_sessionsid_bits_per_character. web/lib/MRBS/Session/Session.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) commit a2e26a9eb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 14 18:28:22 2024 +0100 Fix TypeError web/mrbs_sql.inc | 1 + 1 file changed, 1 insertion(+) commit 8378f6740 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 14 16:48:51 2024 +0100 Add the ability to allow specified HTML tags in the calendar message. See GitHub Issue #3718. web/admin.php | 2 +- web/index.php | 2 +- web/lib/MRBS/Message.php | 32 ++++++++++++++++++++++++++++++++ web/systemdefaults.inc.php | 5 ++++- 4 files changed, 38 insertions(+), 3 deletions(-) commit 294d6e385 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 12 16:50:59 2024 +0100 Fix TypeError web/mrbs_sql.inc | 1 + 1 file changed, 1 insertion(+) commit ef5c2a6d1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 12 14:48:24 2024 +0100 Fix TypeError web/edit_entry.php | 1 + 1 file changed, 1 insertion(+) commit f41da0525 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 12 11:06:17 2024 +0100 Add a workaround for a bug in Safari that prevents the value of an email input being shown when the multiple attribute is set. See GitHub Issue #3716. web/js/general.js.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) commit ef50d937d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 12 10:18:23 2024 +0100 Remove multiple attribute from email field. A user can only have one email address. See also GitHub Issue #3716. web/edit_users.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 3c52b2170 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 9 17:26:05 2024 +0100 Declare strict types web/lib/IntlDateFormatter.php | 1 + 1 file changed, 1 insertion(+) commit 0d4a4d761 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 9 17:22:48 2024 +0100 Declare strict types web/lib/MRBS/Intl/IntlDateFormatter.php | 1 + web/lib/MRBS/Intl/IntlDatePatternGenerator.php | 1 + 2 files changed, 2 insertions(+) commit 8a64009cf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 9 17:19:59 2024 +0100 Declare strict types web/lib/MRBS/Intl/Locale.php | 1 + 1 file changed, 1 insertion(+) commit e5a1efa3b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 9 16:58:07 2024 +0100 Declare strict types web/ajax/usernames.php | 1 + 1 file changed, 1 insertion(+) commit 2afdabcec Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 9 16:56:36 2024 +0100 Declare strict types web/ajax/update_page.php | 1 + 1 file changed, 1 insertion(+) commit c9663f250 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 9 16:55:16 2024 +0100 Declare strict types web/ajax/record_activity.php | 1 + 1 file changed, 1 insertion(+) commit e359c05d0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 9 16:54:34 2024 +0100 Declare strict types web/ajax/del_entries.php | 1 + 1 file changed, 1 insertion(+) commit 1ecdac7eb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 9 16:48:43 2024 +0100 Declare strict types web/ajax/check_slot.php | 1 + 1 file changed, 1 insertion(+) commit 550130b70 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 5 18:46:49 2024 +0100 Add type declarations web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit aa2c50fd8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 5 18:42:30 2024 +0100 Add type declarations web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 939c282a4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 5 18:39:01 2024 +0100 Add type declarations web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 509eda85c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 5 18:33:47 2024 +0100 Add type declarations web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5f6d6168b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 5 18:29:48 2024 +0100 Add type declarations web/mrbs_sql.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 557534ec8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 5 18:23:38 2024 +0100 Fix potential TypeErrors web/mrbs_sql.inc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) commit 9055301f4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 5 18:17:53 2024 +0100 Add type declarations web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit de5e4e4dc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 5 18:12:47 2024 +0100 Declare strict types web/mrbs_sql.inc | 2 ++ 1 file changed, 2 insertions(+) commit d472e5ebe Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 5 15:40:35 2024 +0100 Fix potential bug web/lib/MRBS/Auth/AuthLdap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit deb74c7ab Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 5 15:12:24 2024 +0100 Add type declarations web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c7a6180aa Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 5 15:07:20 2024 +0100 Add type declarations web/mrbs_sql.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 7a11fb619 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 4 17:13:48 2024 +0100 Fix TypeError web/mrbs_sql.inc | 1 + 1 file changed, 1 insertion(+) commit 94078e36d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 4 16:28:04 2024 +0100 Fix comment (the MRBS DB_pgsql class now returns an int) web/mrbs_sql.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 3d17f8b57 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 4 16:24:09 2024 +0100 Fix TypeError web/functions_ical.inc | 3 +++ 1 file changed, 3 insertions(+) commit f95afbcb5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 31 18:15:01 2024 +0100 Add type declarations web/mrbs_auth.inc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) commit fbc66a0e0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 31 18:08:11 2024 +0100 Declare strict types web/language.inc | 1 + web/mrbs_auth.inc | 1 + 2 files changed, 2 insertions(+) commit b81cd7d08 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 30 19:05:47 2024 +0100 Add assertion to remind developers to update the code when the min PHP version changes. web/lib/MRBS/Session/Session.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2c0bd1c17 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 30 18:50:42 2024 +0100 Fix TypeError if PHP < 8.1.0 web/functions_global.inc | 1 + web/lib/MRBS/Session/Session.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) commit 772baa0bc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 30 18:17:50 2024 +0100 Correct typo in comment web/lib/MRBS/Form/Field.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 491acc099 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 30 18:17:14 2024 +0100 Add type declarations web/lib/MRBS/Form/Field.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) commit 99a4c0921 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 29 18:49:17 2024 +0100 Remove unused local variable web/lib/MRBS/Form/ElementInput.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 306ccb805 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 29 18:47:57 2024 +0100 Add type declarations web/lib/MRBS/Form/ElementInputCheckbox.php | 2 +- web/lib/MRBS/Form/ElementInputDatalist.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit cb448712c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 29 18:27:56 2024 +0100 Replace qualifier with import web/lib/MRBS/Form/Element.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit b70779ad7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 29 18:22:03 2024 +0100 Add type declarations web/lib/MRBS/Form/Element.php | 8 ++++---- web/lib/MRBS/Form/FieldInputCheckboxGroup.php | 2 +- web/lib/MRBS/Form/FieldInputRadioGroup.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) commit 505660e3d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 29 18:17:43 2024 +0100 Add type declarations web/lib/MRBS/Form/Element.php | 16 ++++++++-------- web/lib/MRBS/Form/FieldSelect.php | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) commit 96fca8886 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 29 18:00:43 2024 +0100 Add type declarations web/lib/MRBS/Form/Element.php | 8 ++++---- web/lib/MRBS/Form/FieldInputCheckboxGroup.php | 2 +- web/lib/MRBS/Form/FieldInputRadioGroup.php | 2 +- web/lib/MRBS/Form/FieldSelect.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) commit 7d040b96b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 25 16:01:15 2024 +0100 Add type declarations web/lib/MRBS/Form/Element.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0586dd6da Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 25 15:57:52 2024 +0100 Add type declarations web/lib/MRBS/Form/Element.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit ee9f8960d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 25 15:49:05 2024 +0100 Add type declarations web/lib/MRBS/Form/Element.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 3d64c6b79 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 25 15:41:07 2024 +0100 Add type declarations web/lib/MRBS/Form/Element.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit daddbfd8c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 25 15:32:45 2024 +0100 Add type declarations web/lib/MRBS/Form/Element.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 526096dff Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 23 16:52:59 2024 +0100 Declare strict types web/lib/MRBS/Session/Session.php | 1 + web/lib/MRBS/Session/SessionCas.php | 1 + web/lib/MRBS/Session/SessionCookie.php | 1 + web/lib/MRBS/Session/SessionFactory.php | 1 + web/lib/MRBS/Session/SessionHost.php | 1 + web/lib/MRBS/Session/SessionHttp.php | 1 + web/lib/MRBS/Session/SessionIp.php | 1 + web/lib/MRBS/Session/SessionJoomla.php | 1 + web/lib/MRBS/Session/SessionNt.php | 1 + web/lib/MRBS/Session/SessionOmni.php | 1 + web/lib/MRBS/Session/SessionPhp.php | 1 + web/lib/MRBS/Session/SessionRemoteUser.php | 1 + web/lib/MRBS/Session/SessionSaml.php | 1 + web/lib/MRBS/Session/SessionWithLogin.php | 1 + web/lib/MRBS/Session/SessionWordpress.php | 1 + 15 files changed, 15 insertions(+) commit c4f451231 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 23 16:43:49 2024 +0100 Declare strict types web/Themes/classic126/styling.inc | 1 + web/Themes/default/footer.inc | 2 +- web/Themes/default/styling.inc | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) commit b842e8a16 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 21 16:31:41 2024 +0100 Convert DATE types into a locale friendly form web/functions_view.inc | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) commit 4779b7800 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 21 10:01:37 2024 +0100 Add support for custom date fields in the entry table. See GitHub Issue #3701. INSTALL | 8 ++++---- web/edit_entry.php | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) commit 8f7306f96 Merge: 96732647d 8a89a8218 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 20 16:11:51 2024 +0100 Merge pull request #3700 from meeting-room-booking-system/3692-batch-exporting-bookings-as-ics-format 3692 batch exporting bookings as ics format commit 8a89a8218 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 20 16:09:00 2024 +0100 Make file name a config setting web/search.php | 2 +- web/systemdefaults.inc.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) commit 8675c8fa6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 20 15:58:54 2024 +0100 Take content type from server web/js/search.js.php | 64 +++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 29 deletions(-) commit 84ef22ebf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 20 15:15:29 2024 +0100 First working version web/js/search.js.php | 41 ++++++++++++++++++++++++++++++++++++++++- web/search.php | 6 ++++++ 2 files changed, 46 insertions(+), 1 deletion(-) commit fcdc9aa32 Merge: 69bfab2a7 96732647d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 20 12:59:40 2024 +0100 Merge branch 'main' into 3692-batch-exporting-bookings-as-ics-format commit 96732647d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 20 12:21:49 2024 +0100 Fix TypeError web/lib/MRBS/DB_pgsql.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 69bfab2a7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 20 11:10:47 2024 +0100 Interim commit web/search.php | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) commit 998742a4d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 20 10:22:57 2024 +0100 Add comments web/js/search.js.php | 2 ++ 1 file changed, 2 insertions(+) commit 5b7db5873 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 20 10:12:26 2024 +0100 Add an ics parameter to post request web/js/search.js.php | 1 + 1 file changed, 1 insertion(+) commit 686867a91 Merge: 05790822e 22c084287 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 20 10:00:22 2024 +0100 Merge branch 'main' into 3692-batch-exporting-bookings-as-ics-format commit 22c084287 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 20 09:46:59 2024 +0100 Remove redundant hidden inputs (datatable is already in the POST data). web/js/general.js.php | 10 +--------- web/js/search.js.php | 10 ---------- 2 files changed, 1 insertion(+), 19 deletions(-) commit 05790822e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 20 06:34:28 2024 +0100 Add button - doesn't do anything yet web/js/search.js.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 9900603d3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 19 16:25:42 2024 +0100 Add button - doesn't do anything yet web/js/search.js.php | 16 ++++++++++++++++ web/lang/lang.en | 1 + 2 files changed, 17 insertions(+) commit 5564fad49 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 18 16:58:43 2024 +0100 Add a fix for a TypeError when $_SESSION['user'] somehow contains a zero. web/lib/MRBS/Session/SessionPhp.php | 10 ++++++++++ 1 file changed, 10 insertions(+) commit 63a8e53b0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 17 15:02:16 2024 +0100 Add requirement for mbstring extension to be loaded for QR code to work web/Themes/default/header.inc | 6 ++++-- web/systemdefaults.inc.php | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) commit c8523f31e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 17 14:27:40 2024 +0100 Update to latest source from settings container v2.x-php7.4 branch to fix PHP 8.4 deprecation notices .../Settings/SettingsContainerAbstract.php | 28 +++++++++++++++--- .../Settings/SettingsContainerInterface.php | 19 ++++++++++-- 2 files changed, 41 insertions(+), 6 deletions(-) commit 105e9b87c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 17 14:25:59 2024 +0100 Update to latest source from qrcode v5.0.x to fix PHP 8.4 deprecation notices .../QRCode/Common/BitBuffer.php (new) | 182 ++++ .../QRCode/Common/ECICharset.php (new) | 125 +++ .../QRCode/Common/EccLevel.php (new) | 223 +++++ .../Common/GDLuminanceSource.php (new) | 108 +++ .../chillerlan/QRCode/Common/GF256.php (new) | 153 +++ .../QRCode/Common/GenericGFPoly.php (new) | 266 ++++++ .../Common/IMagickLuminanceSource.php (new) | 78 ++ .../Common/LuminanceSourceAbstract.php (new) | 109 +++ .../LuminanceSourceInterface.php (new) | 61 ++ .../QRCode/Common/MaskPattern.php (new) | 333 +++++++ .../chillerlan/QRCode/Common/Mode.php (new) | 96 ++ .../QRCode/Common/Version.php (new) | 287 ++++++ web/lib/chillerlan/QRCode/Data/AlphaNum.php | 120 ++- web/lib/chillerlan/QRCode/Data/Byte.php | 65 +- web/lib/chillerlan/QRCode/Data/ECI.php (new) | 158 ++++ .../chillerlan/QRCode/Data/Hanzi.php (new) | 215 +++++ web/lib/chillerlan/QRCode/Data/Kanji.php | 174 +++- .../QRCode/Data/MaskPatternTester.php (gone) | 206 ----- web/lib/chillerlan/QRCode/Data/Number.php | 162 +++- .../QRCode/Data/QRCodeDataException.php | 9 +- .../chillerlan/QRCode/Data/QRData.php (new) | 264 ++++++ .../QRCode/Data/QRDataAbstract.php (gone) | 318 ------- .../QRCode/Data/QRDataInterface.php (gone) | 200 ---- .../QRCode/Data/QRDataModeAbstract.php (new) | 61 ++ .../Data/QRDataModeInterface.php (new) | 63 ++ web/lib/chillerlan/QRCode/Data/QRMatrix.php | 818 +++++++++-------- .../QRCode/Data/ReedSolomonEncoder.php (new) | 130 +++ .../QRCode/Decoder/Binarizer.php (new) | 364 ++++++++ .../QRCode/Decoder/BitMatrix.php (new) | 433 +++++++++ .../QRCode/Decoder/Decoder.php (new) | 174 ++++ .../QRCode/Decoder/DecoderResult.php (new) | 99 ++ .../Decoder/QRCodeDecoderException.php (new) | 20 + .../Decoder/ReedSolomonDecoder.php (new) | 315 +++++++ .../Detector/AlignmentPattern.php (new) | 34 + .../AlignmentPatternFinder.php (new) | 284 ++++++ .../QRCode/Detector/Detector.php (new) | 355 +++++++ .../QRCode/Detector/FinderPattern.php (new) | 92 ++ .../Detector/FinderPatternFinder.php (new) | 773 ++++++++++++++++ .../QRCode/Detector/GridSampler.php (new) | 184 ++++ .../Detector/PerspectiveTransform.php (new) | 182 ++++ .../QRCodeDetectorException.php (new) | 20 + .../QRCode/Detector/ResultPoint.php (new) | 73 ++ .../QRCode/Helpers/BitBuffer.php (gone) | 90 -- .../QRCode/Helpers/Polynomial.php (gone) | 179 ---- .../QRCode/Output/QRCodeOutputException.php | 9 +- .../chillerlan/QRCode/Output/QREps.php (new) | 182 ++++ web/lib/chillerlan/QRCode/Output/QRFpdf.php | 152 ++- .../QRCode/Output/QRGdImage.php (new) | 428 +++++++++ .../QRCode/Output/QRGdImageBMP.php (new) | 33 + .../QRCode/Output/QRGdImageGIF.php (new) | 33 + .../QRCode/Output/QRGdImageJPEG.php (new) | 42 + .../QRCode/Output/QRGdImagePNG.php (new) | 35 + .../QRCode/Output/QRGdImageWEBP.php (new) | 35 + web/lib/chillerlan/QRCode/Output/QRImage.php | 226 +---- .../chillerlan/QRCode/Output/QRImagick.php | 207 ++++- .../chillerlan/QRCode/Output/QRMarkup.php | 173 ++-- .../QRCode/Output/QRMarkupHTML.php (new) | 52 ++ .../QRCode/Output/QRMarkupSVG.php (new) | 205 +++++ .../QRCode/Output/QROutputAbstract.php | 232 ++++- .../QRCode/Output/QROutputInterface.php | 222 ++++- .../chillerlan/QRCode/Output/QRString.php | 91 +- .../QRCode/Output/QRStringJSON.php (new) | 67 ++ .../QRCode/Output/QRStringText.php (new) | 81 ++ web/lib/chillerlan/QRCode/QRCode.php | 570 ++++++++---- .../chillerlan/QRCode/QRCodeException.php | 6 +- web/lib/chillerlan/QRCode/QROptions.php | 34 - web/lib/chillerlan/QRCode/QROptionsTrait.php | 652 ++++++++++--- 67 files changed, 10078 insertions(+), 2344 deletions(-) commit 26cb33bac Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 14 20:40:07 2024 +0100 Fix duplicate declarations. web/js/functions.js.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit 0f4ca8d5d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 14 20:30:43 2024 +0100 Remove redundant variable web/internalconfig.inc.php | 8 -------- 1 file changed, 8 deletions(-) commit 9803bb333 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 14 20:23:36 2024 +0100 Make 'use_strict' compulsory and fix strict problems web/js/kiosk.js.php | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) commit ee6bcdd21 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 14 20:05:07 2024 +0100 Make 'use_strict' compulsory web/js/admin.js.php | 7 ++----- web/js/datatables.js.php | 9 ++++----- web/js/datepicker.js.php | 7 +++---- web/js/edit_area.js.php | 7 +++---- web/js/edit_entry.js.php | 7 ++----- web/js/edit_users.js.php | 7 +------ web/js/functions.js.php | 8 ++------ web/js/general.js.php | 7 +++---- web/js/import.js.php | 7 ++----- web/js/index.js.php | 7 +++---- web/js/init.js.php | 3 +++ web/js/pending.js.php | 6 +----- web/js/refresh.js.php | 7 ++----- web/js/report.js.php | 8 ++------ web/js/resizable.js.php | 10 +++------- web/js/search.js.php | 7 +------ web/js/view_entry.js.php | 7 ++----- 17 files changed, 39 insertions(+), 82 deletions(-) commit 5af8da18d Merge: 171870aae 7ed3dab71 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 12 16:28:03 2024 +0100 Merge pull request #3696 from meeting-room-booking-system/3693-session-token-in-url 3693 session token in url commit 7ed3dab71 Merge: 6d071d5e7 171870aae Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 10 14:12:01 2024 +0100 Merge branch 'main' into 3693-session-token-in-url commit 171870aae Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 10 14:06:39 2024 +0100 Fix TypeError web/view_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6d071d5e7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 10 12:13:51 2024 +0100 Set/unset the CSRF token and MAX_FILE_SIZE hidden attributes if the form method attribute is changed after it has been created. web/lib/MRBS/Form/Element.php | 2 +- web/lib/MRBS/Form/Form.php | 95 ++++++++++++++++++++++++++++++--- 2 files changed, 89 insertions(+), 8 deletions(-) commit 31684cb31 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 9 18:30:43 2024 +0100 First stab at fixing GitHub Issue #3693 web/Themes/default/header.inc | 14 +++---- web/admin.php | 25 +++++------- web/del.php | 10 ++--- web/edit_area.php | 5 +-- web/edit_entry.php | 5 +-- web/edit_entry_handler.php | 7 +--- web/edit_message.php | 5 +-- web/edit_room.php | 5 +-- web/edit_users.php | 11 ++---- web/import.php | 3 +- web/index.php | 2 - web/kiosk.php | 10 ++--- web/lib/MRBS/Form/Form.php | 41 ++++++++++++++------ web/lib/MRBS/Session/SessionCas.php | 2 +- web/lib/MRBS/Session/SessionRemoteUser.php | 5 ++- web/lib/MRBS/Session/SessionSaml.php | 5 ++- web/lib/MRBS/Session/SessionWithLogin.php | 7 ++-- web/pending.php | 22 +++++------ web/report.php | 5 +-- web/reset_password.php | 6 +-- web/search.php | 14 +++---- web/upgrade.inc | 3 +- web/view_entry.php | 20 ++++------ 23 files changed, 106 insertions(+), 126 deletions(-) commit 9f4364925 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 8 18:28:01 2024 +0100 Fix occasional TypeError web/lib/MRBS/Form/Form.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) commit 92cae6e6c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 8 09:22:27 2024 +0100 Restructure web/lib/MRBS/DB.php | 14 ++++---------- web/lib/MRBS/DB_pgsql.php | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 10 deletions(-) commit 861df4ee6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 7 18:47:56 2024 +0100 Optimise returnsNativeTypes() web/lib/MRBS/DB.php | 3 +++ web/lib/MRBS/DB_mysql.php | 31 ++++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) commit cf5a70e93 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 7 17:21:29 2024 +0100 Tweak comment web/mrbs_sql.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit facb03d7b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 7 17:20:19 2024 +0100 Restructure web/lib/MRBS/DB.php | 5 +++++ web/lib/MRBS/DB_mysql.php | 5 +++++ web/mrbs_sql.inc | 6 ++---- 3 files changed, 12 insertions(+), 4 deletions(-) commit a70607214 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 7 12:50:29 2024 +0100 Fix TypeErrors web/report.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit 39353811c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 7 12:39:50 2024 +0100 Fix TypeErrors web/report.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 34b48ba79 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 7 11:50:35 2024 +0100 Declare strict types web/report.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) commit 57826a758 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 7 11:28:15 2024 +0100 Simplify using ?? web/reset_password.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 77b3af6a6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 7 11:26:54 2024 +0100 Add type declarations web/reset_password.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit d6d355a6a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 7 11:18:26 2024 +0100 Declare strict types web/reset_password.php | 1 + 1 file changed, 1 insertion(+) commit f329b3495 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 6 22:01:41 2024 +0100 Declare strict types web/search.php | 2 ++ 1 file changed, 2 insertions(+) commit 377da47df Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 6 16:44:34 2024 +0100 Declare strict types web/site_config.inc | 1 + 1 file changed, 1 insertion(+) commit 294c3f7e2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 6 16:41:53 2024 +0100 Declare strict types web/systemdefaults.inc.php | 1 + 1 file changed, 1 insertion(+) commit 4766dd307 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 6 16:26:50 2024 +0100 Declare strict types web/upgrade.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 8b24856a8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 6 16:23:10 2024 +0100 Fix spelling in comment web/upgrade.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit ea9a8a6e2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 6 16:21:59 2024 +0100 Declare strict types web/version.inc | 1 + 1 file changed, 1 insertion(+) commit adeb23d07 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 6 16:19:49 2024 +0100 Declare strict types web/version_num.inc | 1 + 1 file changed, 1 insertion(+) commit 7491f6ec4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 6 16:10:57 2024 +0100 Restructure (to keep IDE happy) web/view_entry.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) commit c78d69411 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 6 16:01:14 2024 +0100 Fix TypeError web/mrbs_sql.inc | 10 ++++++++++ 1 file changed, 10 insertions(+) commit 95a7661cf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 6 15:43:28 2024 +0100 Fix potential TypeError web/view_entry.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit f70d11efb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 6 15:35:21 2024 +0100 Add type declarations web/view_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 983a0c5c3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 6 14:59:45 2024 +0100 Fix TypeErrors web/mrbs_sql.inc | 10 +++++++++- web/view_entry.php | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) commit 5b4972d1c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 6 14:38:52 2024 +0100 Fix TypeErrors web/view_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 97aea8e53 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 6 14:30:48 2024 +0100 Fix TypeErrors web/view_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0ed0071ce Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 6 14:25:19 2024 +0100 Add type declarations web/view_entry.php | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) commit 6b8b265e9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 6 14:08:37 2024 +0100 Declare strict types web/view_entry.php | 1 + 1 file changed, 1 insertion(+) commit e383d6151 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 6 14:07:32 2024 +0100 Add type declarations web/view_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit e4787cccb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 5 19:02:38 2024 +0100 Add type declarations web/view_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit ec89e24d2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 5 18:55:54 2024 +0100 Add type declarations web/view_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e978bea17 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 5 18:04:48 2024 +0100 Fix deprecated implicit marking of parameters as nullable web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bdb21072e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 5 18:01:21 2024 +0100 Fix deprecated implicit marking of parameters as nullable web/language.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit df7e57cde Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 5 17:53:57 2024 +0100 Fix deprecated implicit marking of parameters as nullable web/lib/MRBS/RepeatRule.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit de77f453a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 5 17:51:59 2024 +0100 Fix deprecated implicit marking of parameters as nullable web/lib/MRBS/ICalendar/Series.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 42c109b94 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 5 17:48:53 2024 +0100 Fix deprecated implicit marking of parameters as nullable web/lib/MRBS/DBException.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ef20139d3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 5 17:45:07 2024 +0100 Fix deprecated implicit marking of parameter as nullable web/grab_globals.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ef0b54ce0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 5 17:40:08 2024 +0100 Fix deprecated implicit marking of parameters as nullable web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 964b3aa54 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 5 17:35:03 2024 +0100 Fix deprecated implicit marking of parameters as nullable web/functions_table.inc | 2 +- web/lib/MRBS/Form/Element.php | 6 +++--- web/style.inc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) commit 53cbb86f2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 5 17:28:18 2024 +0100 Fix deprecated implicit marking of parameter as nullable web/lib/MRBS/DB.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f7b6b34e1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 3 18:04:12 2024 +0100 Add type declarations web/lib/MRBS/DBException.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f4dcd1b5e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 3 17:57:41 2024 +0100 Replace qualifier with import web/lib/MRBS/DBException.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit cfa0f7b01 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 3 17:48:37 2024 +0100 Declare strict types web/lib/MRBS/DB.php | 2 +- web/lib/MRBS/DBException.php | 1 + web/lib/MRBS/DBFactory.php | 2 +- web/lib/MRBS/DBStatement.php | 2 +- web/lib/MRBS/DB_mysql.php | 2 +- web/lib/MRBS/DB_pgsql.php | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) commit ae092d5f7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 2 18:36:56 2024 +0100 Add type declarations web/lib/MRBS/DBStatement.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit e20eb54a1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 2 18:12:58 2024 +0100 Declare strict types web/edit_room_handler.php | 1 + 1 file changed, 1 insertion(+) commit 3a42d2601 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 2 18:07:26 2024 +0100 Eliminate duplicate code. web/edit_entry.php | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) commit 310569891 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 1 10:37:15 2024 +0100 Fix TypeError web/edit_entry.php | 1 + 1 file changed, 1 insertion(+) commit 32ad5a14e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 29 18:25:02 2024 +0100 Add type declarations web/edit_room.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 790a36582 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 29 18:21:53 2024 +0100 Add type declarations web/edit_room.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5fa90c289 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 29 18:17:00 2024 +0100 Declare strict types web/edit_room.php | 1 + 1 file changed, 1 insertion(+) commit 69e80293e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jun 28 14:33:53 2024 +0100 Fix TypeError web/report.php | 1 + 1 file changed, 1 insertion(+) commit f0cc6e8ae Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 27 18:18:33 2024 +0100 Add type declarations and fix TypeError web/edit_entry.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 1ffcca383 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 27 18:02:38 2024 +0100 Declare strict types web/edit_entry.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit fa004394f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 27 17:56:31 2024 +0100 Declare strict types web/config.inc.php-sample | 1 + 1 file changed, 1 insertion(+) commit 1c1873a82 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 27 17:52:11 2024 +0100 Declare strict types web/areadefaults.inc.php | 1 + 1 file changed, 1 insertion(+) commit 9c21f6c48 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 27 17:48:22 2024 +0100 Declare strict types web/approve_entry_handler.php | 1 + 1 file changed, 1 insertion(+) commit 77ccdb35d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jun 23 14:33:46 2024 +0100 Fix bug in last commit web/mrbs_sql.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit c3ca74844 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jun 23 14:27:00 2024 +0100 Add the ability to specify a set of days that cannot be used for making bookings of a certain type. web/lang/lang.en | 1 + web/lib/MRBS/EntryInterval.php | 25 +++++++++++++++++++++++++ web/mrbs_sql.inc | 12 ++++++++++-- web/systemdefaults.inc.php | 7 ++++++- 4 files changed, 42 insertions(+), 3 deletions(-) commit e71d51871 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 18 18:12:26 2024 +0100 Restructure web/functions_table.inc | 49 ++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 24 deletions(-) commit 9a1c97f63 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 18 17:19:50 2024 +0100 Add type declaration web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0993eb868 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 18 17:10:22 2024 +0100 Fix TypeErrors web/functions_ical.inc | 1 + web/lib/MRBS/ICalendar/Series.php | 6 +++--- web/mrbs_sql.inc | 9 ++++++++- 3 files changed, 12 insertions(+), 4 deletions(-) commit c163db83b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 15 17:22:53 2024 +0100 Introduce a new config variable ($cookie_samesite_lax) allowing the session cookie SameSite attribute to be relaxed from "Strict" to "Lax". web/lib/MRBS/Session/Session.php | 14 ++++++++++---- web/lib/MRBS/Session/SessionCas.php | 3 +-- web/lib/MRBS/Session/SessionSaml.php | 3 +-- web/systemdefaults.inc.php | 7 +++++++ 4 files changed, 19 insertions(+), 8 deletions(-) commit 5860a79fe Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jun 14 18:10:18 2024 +0100 Declare strict types web/functions_ical.inc | 1 + 1 file changed, 1 insertion(+) commit 633edfd12 Merge: 547b72fa2 8cd36cb4f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 11 10:17:25 2024 +0100 Merge pull request #3683 from meeting-room-booking-system/fix_overflow Fix overflow commit 8cd36cb4f Merge: a6c862814 547b72fa2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 11 10:12:26 2024 +0100 Merge branch 'main' into fix_overflow commit 547b72fa2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 11 09:56:58 2024 +0100 Check that we have a valid Joomla user. See GitHub Issue #3682. web/lib/MRBS/Auth/AuthJoomla.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) commit a6c862814 Merge: cea744dc9 1a3299ec1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 10 17:17:21 2024 +0100 Merge branch 'main' into fix_overflow commit 1a3299ec1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 10 17:15:22 2024 +0100 Simplify code web/js/refresh.js.php | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) commit 75ba34ef8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 10 17:09:50 2024 +0100 Fix bug causing automatic scrolling to the current slot to happen after an automatic refresh even when the user has deliberately scrolled back to the top. See also GitHub Issue #3216. web/js/refresh.js.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) commit cea744dc9 Merge: e2fae2371 bf744a808 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jun 9 16:37:49 2024 +0100 Merge branch 'main' into fix_overflow commit bf744a808 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jun 9 15:35:41 2024 +0100 Tweak padding at bottom of page web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e2fae2371 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 6 17:25:54 2024 +0100 Tweak size of window at which old behaviour is triggered. web/css/mrbs.css.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 46bb4d440 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jun 5 16:24:02 2024 +0100 Fix uncaught exception when editing a message and using PostgreSQL. See GitHub Issue #3680. web/lib/MRBS/Message.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e9e6a6575 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 4 16:21:53 2024 +0100 Fix for $display_mincals_above web/css/mrbs.css.php | 3 --- 1 file changed, 3 deletions(-) commit d79320e95 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 4 15:47:38 2024 +0100 Fix for short screens web/css/mrbs.css.php | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) commit a26163eb5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 3 17:43:37 2024 +0100 First stab web/css/mrbs.css.php | 11 +++++++++++ 1 file changed, 11 insertions(+) commit 30dc76a15 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jun 2 07:08:36 2024 +0100 Add type declarations web/lib/MRBS/Form/Element.php | 2 +- web/lib/MRBS/Form/Field.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 9555d28a8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jun 2 06:55:08 2024 +0100 Add type declarations web/lib/MRBS/Form/Element.php | 4 ++-- web/lib/MRBS/Form/Field.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit be9c3da28 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jun 2 06:41:12 2024 +0100 Fix potential type errors web/lib/MRBS/Form/Element.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 529d07202 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 1 17:34:14 2024 +0100 Declare strict types web/lib/MRBS/Form/Element.php | 21 ++++++++++++-- web/lib/MRBS/Form/ElementA.php | 8 +++--- web/lib/MRBS/Form/ElementButton.php | 8 +++--- web/lib/MRBS/Form/ElementDatalist.php | 6 ++-- web/lib/MRBS/Form/ElementDiv.php | 6 ++-- web/lib/MRBS/Form/ElementFieldset.php | 16 +++++------ web/lib/MRBS/Form/ElementImg.php | 8 +++--- web/lib/MRBS/Form/ElementInput.php | 8 +++--- web/lib/MRBS/Form/ElementInputCheckbox.php | 12 ++++---- web/lib/MRBS/Form/ElementInputDatalist.php | 26 +++++++++--------- web/lib/MRBS/Form/ElementInputDate.php | 6 ++-- web/lib/MRBS/Form/ElementInputEmail.php | 6 ++-- web/lib/MRBS/Form/ElementInputFile.php | 6 ++-- web/lib/MRBS/Form/ElementInputHidden.php | 2 +- web/lib/MRBS/Form/ElementInputImage.php | 6 ++-- web/lib/MRBS/Form/ElementInputNumber.php | 6 ++-- web/lib/MRBS/Form/ElementInputPassword.php | 6 ++-- web/lib/MRBS/Form/ElementInputRadio.php | 4 +-- web/lib/MRBS/Form/ElementInputSearch.php | 6 ++-- web/lib/MRBS/Form/ElementInputSubmit.php | 6 ++-- web/lib/MRBS/Form/ElementInputText.php | 6 ++-- web/lib/MRBS/Form/ElementInputTime.php | 6 ++-- web/lib/MRBS/Form/ElementInputUrl.php | 6 ++-- web/lib/MRBS/Form/ElementLabel.php | 6 ++-- web/lib/MRBS/Form/ElementLegend.php | 6 ++-- web/lib/MRBS/Form/ElementOptgroup.php | 8 +++--- web/lib/MRBS/Form/ElementOption.php | 8 +++--- web/lib/MRBS/Form/ElementP.php | 8 +++--- web/lib/MRBS/Form/ElementSelect.php | 6 ++-- web/lib/MRBS/Form/ElementSpan.php | 8 +++--- web/lib/MRBS/Form/ElementTextarea.php | 6 ++-- web/lib/MRBS/Form/Field.php | 2 +- web/lib/MRBS/Form/FieldButton.php | 8 +++--- web/lib/MRBS/Form/FieldDiv.php | 8 +++--- web/lib/MRBS/Form/FieldInputCheckbox.php | 8 +++--- .../MRBS/Form/FieldInputCheckboxGroup.php | 12 ++++---- web/lib/MRBS/Form/FieldInputDatalist.php | 12 ++++---- web/lib/MRBS/Form/FieldInputDate.php | 8 +++--- web/lib/MRBS/Form/FieldInputEmail.php | 8 +++--- web/lib/MRBS/Form/FieldInputFile.php | 8 +++--- web/lib/MRBS/Form/FieldInputNumber.php | 8 +++--- web/lib/MRBS/Form/FieldInputPassword.php | 8 +++--- web/lib/MRBS/Form/FieldInputRadioGroup.php | 12 ++++---- web/lib/MRBS/Form/FieldInputSearch.php | 8 +++--- web/lib/MRBS/Form/FieldInputSubmit.php | 8 +++--- web/lib/MRBS/Form/FieldInputText.php | 8 +++--- web/lib/MRBS/Form/FieldInputTime.php | 8 +++--- web/lib/MRBS/Form/FieldInputUrl.php | 8 +++--- web/lib/MRBS/Form/FieldSelect.php | 12 ++++---- web/lib/MRBS/Form/FieldSpan.php | 8 +++--- web/lib/MRBS/Form/FieldTextarea.php | 8 +++--- web/lib/MRBS/Form/FieldTimeWithUnits.php | 2 +- web/lib/MRBS/Form/Form.php | 2 +- 53 files changed, 218 insertions(+), 203 deletions(-) commit 01063a70e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 1 17:06:52 2024 +0100 Declare strict types web/css/mrbs-mail.css.php | 1 + web/css/mrbs-print.css.php | 1 + web/css/mrbs-rtl.css.php | 3 ++- web/css/mrbs.css.php | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) commit 03da7a5b9 Merge: 61a79827a eeb500345 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri May 31 17:42:27 2024 +0100 Merge branch 'main' into scroll_to_current_slot commit eeb500345 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri May 31 17:40:40 2024 +0100 Declare strict types web/js/admin.js.php | 1 + web/js/datatables.js.php | 1 + web/js/datepicker.js.php | 1 + web/js/edit_area.js.php | 1 + web/js/edit_entry.js.php | 1 + web/js/edit_users.js.php | 1 + web/js/functions.js.php | 1 + web/js/general.js.php | 1 + web/js/import.js.php | 1 + web/js/index.js.php | 1 + web/js/init.js.php | 5 +++-- web/js/kiosk.js.php | 1 + web/js/pending.js.php | 27 ++++++++++++++------------- web/js/refresh.js.php | 1 + web/js/report.js.php | 1 + web/js/resizable.js.php | 1 + web/js/search.js.php | 15 ++++++++------- web/js/view_entry.js.php | 1 + 18 files changed, 40 insertions(+), 22 deletions(-) commit 61a79827a Merge: fc4c44c1b 30ce77b2d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri May 31 17:23:36 2024 +0100 Merge branch 'main' into scroll_to_current_slot commit 30ce77b2d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri May 31 17:15:08 2024 +0100 Add comment web/js/functions.js.php | 7 +++++++ 1 file changed, 7 insertions(+) commit b9850506e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri May 31 16:19:41 2024 +0100 Simplify code web/js/edit_entry.js.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) commit 63a7391bd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri May 31 16:14:02 2024 +0100 Eliminate duplicated jQuery selector web/js/edit_entry.js.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 6095f9b5f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri May 31 16:09:08 2024 +0100 Minor tweak to comment web/js/edit_entry.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a3a5f67fd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri May 31 16:08:13 2024 +0100 Eliminate duplicated jQuery selector web/js/edit_entry.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2c9e9713b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri May 31 16:05:45 2024 +0100 Eliminate duplicated jQuery selector web/js/edit_entry.js.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit c5f576ab3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri May 31 15:52:55 2024 +0100 Eliminate duplicated jQuery selector web/js/edit_entry.js.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 498c83ce6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri May 31 15:39:17 2024 +0100 Eliminate duplicated jQuery selector web/js/edit_area.js.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 19db95aac Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri May 31 15:28:11 2024 +0100 Fix comment web/js/edit_area.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit fc4c44c1b Merge: bd04f67e6 01d770e62 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 29 17:06:43 2024 +0100 Merge branch 'main' into scroll_to_current_slot commit 01d770e62 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 29 17:01:09 2024 +0100 Fix incorrect use of parseInt() web/js/refresh.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bd04f67e6 Merge: 7c27cac46 d279019b7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 29 16:46:57 2024 +0100 Merge branch 'main' into scroll_to_current_slot commit d279019b7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 29 16:45:52 2024 +0100 Eliminate duplicated jQuery selector (not really duplicated, but it keeps the IDE happy). web/js/refresh.js.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 7c27cac46 Merge: 3c47d27d9 150944444 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 29 16:39:09 2024 +0100 Merge branch 'main' into scroll_to_current_slot commit 150944444 Merge: c285a1f5a 178223d7a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 29 16:38:16 2024 +0100 Merge remote-tracking branch 'origin/main' commit c285a1f5a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 29 16:37:17 2024 +0100 Eliminate duplicated jQuery selector web/js/refresh.js.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 3c47d27d9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 29 16:30:23 2024 +0100 Restructure web/js/refresh.js.php | 93 ++++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 44 deletions(-) commit 47e0c5263 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 29 16:11:26 2024 +0100 Simplify code web/js/refresh.js.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) commit 5f969767f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 29 14:26:11 2024 +0100 First stab at scrolling to the current timeslot. See GitHub Issue #3216. web/js/functions.js.php | 7 ++++++ web/js/refresh.js.php | 46 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) commit 178223d7a Author: Wenqian Ma <55787529+ma-wenqian@users.noreply.github.com> Date: Sat May 25 16:55:28 2024 +0800 Adding all locales to Docker (#3673) * Fixed 'Server failed to set locale to' error by adding all locales * Update Dockerfile * Update Dockerfile Dockerfile | 6 +----- docker_app/php/Dockerfile | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) commit cf5134798 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 22 21:20:56 2024 +0100 Add type declaration web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d6e626213 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 22 21:15:50 2024 +0100 Add type declaration web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 382088789 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 22 21:08:22 2024 +0100 Add type declaration web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 93b417a4c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 22 20:44:31 2024 +0100 Fix TypeError. See GitHub Issue #3675. web/edit_entry.php | 5 ++++- web/mrbs_sql.inc | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) commit ac23c5419 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 1 17:54:45 2024 +0100 Fix bug causing the period to be reported incorrectly under certain circumstances web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 92578013e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 1 17:08:11 2024 +0100 Fix bug introduced in commit 15b1302e preventing "Copy email addresses" button working on the Report page. web/js/datatables.js.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit ace51c0c8 Merge: 57f750069 c78e121af Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Apr 28 09:09:56 2024 +0100 Merge pull request #3664 from V1ttola/patch-1 Updated spanish translation commit c78e121af Author: V1ttola <168313797+V1ttola@users.noreply.github.com> Date: Sat Apr 27 22:38:21 2024 -0500 Update lang.es web/lang/lang.es | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7c10071ec Author: V1ttola <168313797+V1ttola@users.noreply.github.com> Date: Sat Apr 27 22:34:56 2024 -0500 Update lang.es web/lang/lang.es | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 57f750069 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 27 18:00:10 2024 +0100 Correct typo in comment web/lib/MRBS/Auth/AuthDb.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 047ae5db0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 27 17:54:17 2024 +0100 Declare strict types web/lib/MRBS/Auth/AuthDb.php | 1 + 1 file changed, 1 insertion(+) commit 36f9e6cfb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 27 17:50:51 2024 +0100 Declare strict types web/lib/MRBS/Auth/Auth.php | 1 + 1 file changed, 1 insertion(+) commit 5a9171340 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 27 17:48:19 2024 +0100 Declare strict types web/lib/MRBS/Auth/AuthDbExt.php | 1 + 1 file changed, 1 insertion(+) commit 943e8044f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 27 17:42:44 2024 +0100 Simplify code web/lib/MRBS/Auth/AuthDbExt.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) commit adaa57182 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 27 17:32:13 2024 +0100 Simplify code web/lib/MRBS/Auth/AuthDbExt.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) commit e2cf121b6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 27 17:18:20 2024 +0100 Simplify code web/lib/MRBS/Auth/AuthDbExt.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 0cf71d694 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 27 17:16:34 2024 +0100 Remove redundant global declaration web/lib/MRBS/Auth/AuthDbExt.php | 2 -- 1 file changed, 2 deletions(-) commit a312a0304 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 27 14:48:26 2024 +0100 Replace qualifier with import web/lib/MRBS/Auth/AuthDbExt.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit f9e90e876 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 27 14:47:49 2024 +0100 Update comment web/lib/MRBS/Auth/AuthDbExt.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit d620ef24d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 27 14:43:25 2024 +0100 Add check for a valid hashing algorithm web/lib/MRBS/Auth/AuthDbExt.php | 6 ++++++ 1 file changed, 6 insertions(+) commit a6392e865 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 27 14:30:09 2024 +0100 Allow any password hashing algorithm that is supported by hash() web/lib/MRBS/Auth/AuthDbExt.php | 11 ++++------- web/systemdefaults.inc.php | 3 ++- 2 files changed, 6 insertions(+), 8 deletions(-) commit e74dcc154 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 27 14:15:39 2024 +0100 Use timing attack safe string comparison web/lib/MRBS/Auth/AuthDbExt.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit d077bb96a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 27 14:10:22 2024 +0100 Simplify code web/lib/MRBS/Auth/AuthDbExt.php | 2 -- 1 file changed, 2 deletions(-) commit f91b68ad1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 27 14:09:03 2024 +0100 Simplify code web/lib/MRBS/Auth/AuthDbExt.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) commit 28daf2112 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 27 14:03:04 2024 +0100 Move password checking into a separate method in order to simplify extending the class. See GitHub Issue #3662. web/lib/MRBS/Auth/AuthDbExt.php | 80 ++++++++++++------------------- 1 file changed, 31 insertions(+), 49 deletions(-) commit 53ad0fd36 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Apr 24 18:14:52 2024 +0100 Fix potential type error web/lib/MRBS/Session/SessionWithLogin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit d84ec3ece Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Apr 24 16:18:59 2024 +0100 Correct mangled characters. web/lang/lang.fr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 880b10c46 Merge: 7123d20f4 35aee35f3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Apr 24 16:17:38 2024 +0100 Merge pull request #3657 from landrok/patch-1 Update french translations commit 35aee35f3 Author: Landrok <landrok@users.noreply.github.com> Date: Tue Apr 23 20:13:18 2024 +0200 Update french translations web/lang/lang.fr | 51 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 5 deletions(-) commit 7123d20f4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 23 18:35:37 2024 +0100 Correct mangled characters. web/lang/lang.fr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit be63b775f (tag: v1.11.5) Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Apr 22 17:38:00 2024 +0100 Updated NEWS and ChangeLog for release of 1.11.5 ChangeLog | 3452 ++++++++++++++++++++++++++++++++++++++++++++++++++- NEWS | 132 ++ 2 files changed, 3582 insertions(+), 2 deletions(-) commit 55fb35ab5 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Apr 22 12:18:19 2024 +0100 Updated version number for release of 1.11.5 web/version_num.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e657cf163 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Apr 15 17:34:32 2024 +0100 Fix typo in comment web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit fd781c5c9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 13 16:44:02 2024 +0100 Force authentication rather than giving an Access Denied message. See GitHub Issue #3645. web/lib/MRBS/Session/SessionCas.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit dfb21559a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Apr 10 15:33:25 2024 +0100 Add type declarations web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 26e278f20 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Apr 4 17:48:54 2024 +0100 Expand error message web/language.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit e21332092 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Mar 28 12:28:50 2024 +0000 Fix uncaught exception when the room or area admin email is null web/functions_mail.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit d48372704 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 24 17:36:49 2024 +0000 Add comment web/js/datepicker.js.php | 3 +++ 1 file changed, 3 insertions(+) commit 89d3573a0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 24 17:26:54 2024 +0000 Add comment web/systemdefaults.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 40a1b1c40 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 24 17:24:43 2024 +0000 Add comment web/lib/MRBS/Intl/Formatter.php | 1 + 1 file changed, 1 insertion(+) commit bf00cf199 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 24 15:36:58 2024 +0000 All working web/lib/MRBS/Intl/FormatterFlatpickr.php | 65 ++++++++++------------ 1 file changed, 28 insertions(+), 37 deletions(-) commit 708046f79 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 24 14:52:33 2024 +0000 Fix bug when a token immediately follows another one just before the end of the string, eg 'aay' web/lib/MRBS/Intl/Formatter.php | 4 +-- web/lib/MRBS/Intl/FormatterFlatpickr.php | 6 ++-- web/lib/MRBS/Intl/FormatterStrftime.php | 7 ++--- .../MRBS/Intl/IntlDatePatternConverter.php | 29 ++++++++---------- 4 files changed, 22 insertions(+), 24 deletions(-) commit 229422775 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 24 12:31:19 2024 +0000 Started on Flatpickr formatter web/js/datepicker.js.php | 30 ++- .../MRBS/Intl/FormatterFlatpickr.php (new) | 183 +++++++++++++++++ 2 files changed, 211 insertions(+), 2 deletions(-) commit 5e4b79104 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Mar 23 12:09:41 2024 +0000 Fix type declarations web/lib/MRBS/Intl/Formatter.php | 4 +++- web/lib/MRBS/Intl/FormatterStrftime.php | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) commit a16f47781 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Mar 23 12:03:18 2024 +0000 First working version of restructured code web/lib/MRBS/Intl/FormatterStrftime.php | 186 +++++++++++++++- web/lib/MRBS/Intl/IntlDateFormatter.php | 195 +---------------- .../MRBS/Intl/IntlDatePatternConverter.php | 64 ++++-- 3 files changed, 227 insertions(+), 218 deletions(-) commit 2bb30e1ee Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Mar 23 11:30:04 2024 +0000 Interim commit web/js/datepicker.js.php | 8 +- web/lib/MRBS/Intl/Formatter.php (new) | 10 ++ .../MRBS/Intl/FormatterStrftime.php (new) | 17 ++++ web/lib/MRBS/Intl/IntlDateFormatter.php | 85 ++-------------- .../Intl/IntlDatePatternConverter.php (new) | 94 ++++++++++++++++++ web/systemdefaults.inc.php | 6 ++ 6 files changed, 140 insertions(+), 80 deletions(-) commit 0331359b2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Mar 16 15:14:18 2024 +0000 Allow the session name to be set to the default. (Problems have been otherwise observed when running with some WordPress plugins, eg Participants Database Version 2.5.7, which also use PHP sessions.) web/lib/MRBS/Session/Session.php | 6 +++++- web/systemdefaults.inc.php | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) commit 96389f33b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Mar 15 18:30:06 2024 +0000 Fix deprecation notice when running on PHP >= 8.2 web/lib/MRBS/Auth/AuthWordpress.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 72a58241e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Mar 15 18:17:19 2024 +0000 Fix fatal error when the auth type is WordPress and the mbstring extension is not enabled. web/language.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit f89540f4a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Mar 14 16:29:22 2024 +0000 Fix warning when view_entry.php can be accessed by unlogged-in users. See GitHub Issue #3634. web/css/mrbs.css.php | 1 + web/view_entry.php | 50 +++++++++++++++++++++++------------------- 2 files changed, 29 insertions(+), 22 deletions(-) commit 06fb7f72f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Mar 14 12:16:20 2024 +0000 Add comment concerning configuring SAML admins in the config file. See GitHub Issue #3431. web/systemdefaults.inc.php | 4 ++++ 1 file changed, 4 insertions(+) commit 933c16de5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Mar 12 18:47:45 2024 +0000 Use config file for admins if $auth['saml']['admin'] is not set. See GitHub Issue #3431. web/lib/MRBS/Auth/AuthSaml.php | 5 +++++ 1 file changed, 5 insertions(+) commit 59a7da42f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Mar 12 10:33:36 2024 +0000 Fix problem when drag selecting rooms and some rooms aren't writable. See GitHub Issue #3632. web/edit_entry.php | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) commit 6eb686adc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 10 17:26:58 2024 +0000 Further fix for GitHub Issue #3628. web/lib/MRBS/DateTime.php | 6 ++++++ web/mrbs_sql.inc | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) commit 9cbacbf01 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 10 13:54:19 2024 +0000 Remove redundant comment now that MRBS requires PHP >= 7.2.0 web/functions.inc | 3 --- 1 file changed, 3 deletions(-) commit 61a66314d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Mar 7 18:32:58 2024 +0000 Simplify code web/functions.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 8d4b101f1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Mar 7 18:19:01 2024 +0000 Simplify code web/functions.inc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) commit 635a1da21 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Mar 7 18:00:18 2024 +0000 Simplify code web/functions.inc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) commit 256226558 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Mar 7 17:44:53 2024 +0000 Restructure web/functions.inc | 8 ++++++-- web/functions_view.inc | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) commit 78c2579c8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Mar 7 17:26:44 2024 +0000 Rename variables web/edit_entry_handler.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 9e2976641 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Mar 7 16:31:04 2024 +0000 Fix bug when making a booking that crosses a DST boundary in an area with a single period. See GitHub Issue #3628. web/edit_entry_handler.php | 1 + 1 file changed, 1 insertion(+) commit 3442d54b0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Mar 7 12:18:38 2024 +0000 Fix problem with last commit. See GitHub Issue #3629. web/functions_table.inc | 28 ++++++++++++++++++++-------- web/systemdefaults.inc.php | 11 +++++------ 2 files changed, 25 insertions(+), 14 deletions(-) commit 29c429b92 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Mar 7 10:40:48 2024 +0000 Add a configuration setting to allow bookings direct from the week and month views for all rooms without first going via the day view. See GitHub Issue #3629. web/functions_table.inc | 19 +++++++++++++++++-- web/systemdefaults.inc.php | 7 +++++++ 2 files changed, 24 insertions(+), 2 deletions(-) commit c37d0fe78 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Mar 5 18:36:44 2024 +0000 Fix problem with periods not being substituted properly when the am/pm info is the same for the start and end, and therefore only given once by Ranger. web/lib/MRBS/EntryInterval.php | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) commit 38805d1ac Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Mar 5 17:20:15 2024 +0000 Restructure web/lib/MRBS/EntryInterval.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit ca97d12f0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Mar 5 16:35:12 2024 +0000 Upgrade to latest version of Ranger, fixing problem with virtual separator appearing web/lib/OpenPsa/Ranger/Ranger.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit d9c71a04e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Mar 5 16:25:24 2024 +0000 Fix directory structure web/lib/OpenPsa/{ => Ranger}/Provider/DeProvider.php | 0 web/lib/OpenPsa/{ => Ranger}/Provider/DefaultProvider.php | 0 web/lib/OpenPsa/{ => Ranger}/Provider/Provider.php | 0 web/lib/OpenPsa/{ => Ranger}/Ranger.php | 0 4 files changed, 0 insertions(+), 0 deletions(-) commit db4615f70 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Mar 5 14:45:29 2024 +0000 Upgrade to Release 0.5.8 web/lib/OpenPsa/Ranger.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e0a1ec2e4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Mar 4 21:35:15 2024 +0000 Add support for 'b' and 'B' symbols web/lib/MRBS/Intl/IntlDateFormatter.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit 2fb53503f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Mar 4 21:26:00 2024 +0000 Add Ranger (not sure why - isn't it already there?) .../OpenPsa/Provider/DeProvider.php (new) | 31 ++ .../Provider/DefaultProvider.php (new) | 25 + web/lib/OpenPsa/Provider/Provider.php (new) | 20 + web/lib/OpenPsa/Ranger.php (new) | 446 +++++++++++++++++ 4 files changed, 522 insertions(+) commit 19c455714 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Mar 4 17:31:18 2024 +0000 Updated to latest version of Ranger, fixing https://github.com/flack/ranger/issues/14 .../Ranger/Provider/DeProvider.php (gone) | 31 -- .../Provider/DefaultProvider.php (gone) | 25 - .../Ranger/Provider/Provider.php (gone) | 20 - web/lib/OpenPsa/Ranger/Ranger.php (gone) | 440 ----------------- 4 files changed, 516 deletions(-) commit adb0be6fa Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 3 21:47:56 2024 +0000 Fix bug in check for simultaneous booking config settings web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit de106c16a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 3 18:32:26 2024 +0000 Simplify code web/mrbs_sql.inc | 58 +--------------------------------------------- 1 file changed, 1 insertion(+), 57 deletions(-) commit 28b98a5fa Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 3 18:22:07 2024 +0000 Fix GitHub Issue #3626 web/del.php | 2 +- web/lib/MRBS/EntryInterval.php | 30 ++++++++++++++++++++++++++++-- web/mrbs_sql.inc | 4 ++-- 3 files changed, 31 insertions(+), 5 deletions(-) commit c3be0c97b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 3 18:17:06 2024 +0000 Fix bug in previous commit web/functions.inc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) commit a842b7ead Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 3 17:07:02 2024 +0000 Restructure web/lib/MRBS/EntryInterval.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) commit 23618c3bf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 3 16:14:14 2024 +0000 Fix casting of booleans in the area table tables.my.sql | 1 + tables.pg.sql | 1 + web/functions.inc | 9 ++++++++- 3 files changed, 10 insertions(+), 1 deletion(-) commit cfd9f10d1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 3 12:45:55 2024 +0000 Internationalise separator web/index.php | 1 + 1 file changed, 1 insertion(+) commit 0fae4e8f5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 3 12:33:32 2024 +0000 Internationalise separators web/lang/lang.en | 4 ++++ web/lib/MRBS/EntryInterval.php | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) commit 435145e49 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 3 12:24:35 2024 +0000 Restructure web/lib/MRBS/EntryInterval.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 1f1a6f2f9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 3 12:16:33 2024 +0000 Add defaults web/index.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit a9144cadb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 3 12:08:00 2024 +0000 Add defaults web/lib/MRBS/EntryInterval.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) commit 75487b3e6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 3 12:07:42 2024 +0000 Add comments web/systemdefaults.inc.php | 4 ++++ 1 file changed, 4 insertions(+) commit 4bbab26fd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Mar 2 18:39:20 2024 +0000 Improve localisation of date-time ranges web/lib/MRBS/EntryInterval.php | 19 +++++++++---------- web/systemdefaults.inc.php | 6 ++++++ 2 files changed, 15 insertions(+), 10 deletions(-) commit b4ccc1cba Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Mar 2 17:53:20 2024 +0000 Restructure web/del.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit 5a944be7d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Mar 2 17:00:56 2024 +0000 Change number from integer to string to allow words instead of numbers in the future, eg "two" instead of 2 web/lang/lang.en | 2 +- web/lang/lang.pt-br | 2 +- web/mrbs_sql.inc | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) commit c28cfcfa1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Mar 2 09:51:01 2024 +0000 Fix bug introduced in recent commit web/del.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit d8c13554e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Mar 1 19:17:48 2024 +0000 Restructure web/del.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 1d2c561aa Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Mar 1 19:15:10 2024 +0000 Minor optimisation web/del.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 9c1654715 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Mar 1 18:54:30 2024 +0000 Avoid double query if there are no entries in the room web/del.php | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) commit fa38f400c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Mar 1 18:26:52 2024 +0000 Restructure web/del.php | 6 +----- web/mrbs_sql.inc | 11 +++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) commit 248531750 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Mar 1 18:16:04 2024 +0000 Update comment web/mrbs_sql.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 085d92259 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Mar 1 18:10:00 2024 +0000 Restructure web/del.php | 34 ++++++++++------------------------ web/mrbs_sql.inc | 39 ++++++++++++++++++++++++++++++++------- 2 files changed, 42 insertions(+), 31 deletions(-) commit 54b2462e3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Mar 1 16:43:24 2024 +0000 Modify upgrade instructions to state that the new release should be uploaded to a new directory, rather than overwriting the existing directory. See GitHub Issue #3623. UPGRADE | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) commit fd7652886 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Feb 29 18:45:49 2024 +0000 Fix TypeError. web/mrbs_sql.inc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) commit 0078bb2bb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Feb 29 18:09:49 2024 +0000 Fix TypeError. See GitHub Issue #3625. web/del.php | 1 + 1 file changed, 1 insertion(+) commit 46dfbbd7f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Feb 29 17:14:29 2024 +0000 Improve error message. web/lib/MRBS/DB.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2ceeacda9 Merge: 73861ebc5 0b2d4e0dc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 28 18:31:40 2024 +0000 Merge pull request #3621 from ouafnico/ouafnico/lang_fr_update Update french translation commit 73861ebc5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 28 18:18:20 2024 +0000 Add validation of integers in query1() web/lib/MRBS/DB.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) commit 3342eff92 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 28 17:39:45 2024 +0000 Add type declaration web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5d8ee3c14 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 28 16:54:32 2024 +0000 Fix incorrect use of query1() web/lib/MRBS/DB_pgsql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6a62751d1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 28 16:51:30 2024 +0000 Fix incorrect use of query1() web/lib/MRBS/DB_pgsql.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) commit fafec0269 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 28 16:32:22 2024 +0000 Fix incorrect use of query1() web/lib/MRBS/DB_pgsql.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit 0b2d4e0dc Author: Nicolas Repentin <nicolas.repentin@i-run.fr> Date: Wed Feb 28 17:29:56 2024 +0100 Update french translation web/lang/lang.fr | 7 +++++++ 1 file changed, 7 insertions(+) commit 285472f96 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 28 16:14:20 2024 +0000 Add type declarations web/functions_mail.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 9af094964 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 28 16:09:30 2024 +0000 Fix incorrect use of query1() web/functions_mail.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 036c2e732 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 28 15:57:04 2024 +0000 Rename method web/lib/MRBS/DB.php | 10 +++++----- web/lib/MRBS/SessionHandlerDb.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) commit ded8b1fb6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 27 17:29:21 2024 +0000 Change == to === now that the result of query1() is an int web/del.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9ecf46f02 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 27 17:18:59 2024 +0000 Fix incorrect use of query1() web/lib/MRBS/DB.php | 4 ++-- web/lib/MRBS/DB_mysql.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit 24ac0e83b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 27 16:40:53 2024 +0000 Remove redundant casts web/dbsys.inc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) commit f11b4ba65 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 27 16:33:16 2024 +0000 Simplify code and add type declaration web/lib/MRBS/DB.php | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) commit 07d2dc94a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 27 15:47:55 2024 +0000 Declare strict_types web/lib/MRBS/SessionHandlerDb.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 263121d4f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 27 15:42:48 2024 +0000 Fix incorrect use of query1() web/lib/MRBS/DB.php | 17 +++++++++++++++++ web/lib/MRBS/SessionHandlerDb.php | 6 +++--- 2 files changed, 20 insertions(+), 3 deletions(-) commit 8eda21c1b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 27 15:25:53 2024 +0000 Better fix for GitHub Issue #3619. web/lib/MRBS/Map.php | 1 + web/mrbs_sql.inc | 2 ++ 2 files changed, 3 insertions(+) commit 59065bd5f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 27 10:48:55 2024 +0000 Revert strict_types. See GitHub Issue #3619. web/lib/MRBS/Map.php | 1 - 1 file changed, 1 deletion(-) commit bcaa98100 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Feb 26 18:24:54 2024 +0000 Declare strict_types web/reset_password_handler.php | 1 + 1 file changed, 1 insertion(+) commit 5acfff639 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Feb 26 18:09:40 2024 +0000 Rename function web/report.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit e6c0c0794 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Feb 25 21:41:17 2024 +0000 Fix type declaration and declare strict types web/lib/MRBS/System.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 6e606a330 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Feb 25 19:02:56 2024 +0000 Improve error handling and add type declarations web/lib/MRBS/System.php | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) commit 7af6c79db Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Feb 25 18:23:57 2024 +0000 Improve error handling and add type declarations web/report.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) commit 3ef67377b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 24 13:39:16 2024 +0000 Make use of new functions web/report.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit be12075f2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 24 13:35:13 2024 +0000 Make variable names clearer web/functions.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit 40c831704 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 24 12:53:25 2024 +0000 Add sanity check of config settings web/functions.inc | 39 ++++++++++++++++++++++++++++++++++++--- web/mrbs_sql.inc | 17 +++++++++++++++++ 2 files changed, 53 insertions(+), 3 deletions(-) commit 1b43feb1e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 24 10:04:26 2024 +0000 Update translation of 'no_simultaneous_bookings' following recent changes. web/lang/lang.pt-br | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 734d46e55 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 23 18:40:38 2024 +0000 Fix comment web/systemdefaults.inc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 4e0717cc8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 23 18:33:02 2024 +0000 Fix comment web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 32505e45b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 23 18:31:10 2024 +0000 Add comment web/systemdefaults.inc.php | 1 + 1 file changed, 1 insertion(+) commit 9131912ae Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 23 18:16:56 2024 +0000 Add type declaration web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1d7d8bb30 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 23 18:13:27 2024 +0000 Add type declaration web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bc79183d8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 23 18:10:29 2024 +0000 Fix comment web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bcf6c1974 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 23 18:04:22 2024 +0000 Fix bug causing disabled areas to be included when counting simultaneous bookings web/mrbs_sql.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit a4c2bab0a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 23 17:55:37 2024 +0000 Set default private timezone property (though it's not used at the moment) web/lib/MRBS/Intl/IntlDateFormatter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 25d6ec014 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 23 12:33:53 2024 +0000 Add a config setting to allow the number of simultaneous bookings to be evaluated globally or just in the area. See GitHib Issue #3617. web/mrbs_sql.inc | 21 +++++++++++++++++++-- web/systemdefaults.inc.php | 3 +++ 2 files changed, 22 insertions(+), 2 deletions(-) commit 1c1459fab Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Feb 22 18:27:36 2024 +0000 Extend the prevention of simultaneous bookings to include a config setting ($max_simultaneous_bookings) specifying the maximum number of simultaneous bookings allowed. See GitHib Issue #3617. web/lang/lang.en | 2 +- web/mrbs_sql.inc | 86 ++++++++++++++++++++---------------- web/systemdefaults.inc.php | 5 ++- 3 files changed, 52 insertions(+), 41 deletions(-) commit 57188d8bb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 20 21:08:04 2024 +0000 Simplify code web/mrbs_sql.inc | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) commit a273e8a60 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 20 21:01:54 2024 +0000 Simplify code web/registration_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8228b24fd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 20 19:08:21 2024 +0000 Restructure web/registration_handler.php | 58 ++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 28 deletions(-) commit 20550ef98 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 20 18:50:42 2024 +0000 Declare strict_types web/registration_handler.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit eed5d48d6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 20 18:44:38 2024 +0000 Add type declarations web/registration_handler.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) commit 8a0ae661c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 20 18:29:52 2024 +0000 Add type declarations web/mrbs_sql.inc | 7 +------ web/registration_handler.php | 11 +++++++++-- 2 files changed, 10 insertions(+), 8 deletions(-) commit 7494a4368 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 20 17:43:16 2024 +0000 Rename functions web/language.inc | 2 +- web/registration_handler.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) commit 7724c2991 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Feb 19 17:27:15 2024 +0000 Declare strict types and associated fixes web/import.php | 3 ++- web/lib/MRBS/DB.php | 2 +- web/lib/MRBS/DB_mysql.php | 4 ++-- web/lib/MRBS/DB_pgsql.php | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) commit 4629290d0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Feb 19 17:08:01 2024 +0000 Add type declarations web/import.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit a58106393 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Feb 19 17:01:52 2024 +0000 Add type declaration web/import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4ac4528b9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Feb 18 21:46:52 2024 +0000 Declare strict_types web/functions.inc | 1 + 1 file changed, 1 insertion(+) commit b4f6e56fe Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Feb 18 21:43:48 2024 +0000 Fix potential TypeErrors web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 69c98a62c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Feb 18 21:35:37 2024 +0000 Fix potential TypeErrors web/functions.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 8e41982b5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Feb 18 21:24:39 2024 +0000 Fix potential TypeError web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ca5766fbd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Feb 18 21:19:58 2024 +0000 Fix potential TypeError web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6d797e4ff Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Feb 18 18:58:36 2024 +0000 Add type declaration web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 45eb9f26e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Feb 18 18:45:53 2024 +0000 Add type declaration web/functions.inc | 2 +- web/functions_table.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit ac0ec483e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Feb 18 18:33:07 2024 +0000 Add type declaration web/functions.inc | 2 +- web/lib/MRBS/DateTime.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 9ad0e204a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Feb 18 18:23:16 2024 +0000 Add type declaration web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e68541909 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Feb 18 18:09:57 2024 +0000 Simplify code web/functions.inc | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) commit b91d08674 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Feb 18 18:06:12 2024 +0000 Add type declaration web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9b97723c5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Feb 18 18:03:20 2024 +0000 Add type declaration web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b8ed5ec73 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Feb 18 17:51:38 2024 +0000 Declare strict_types web/lib/MRBS/Map.php | 1 + 1 file changed, 1 insertion(+) commit 63adaeaab Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 17 18:25:48 2024 +0000 Rename function web/js.inc | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) commit d6502e373 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 17 18:19:55 2024 +0000 Rename function to avoid clash with PHP standard function web/style.inc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) commit 47ccb9c0f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 17 17:46:24 2024 +0000 Remove redundant global declarations web/js.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7a3e40d39 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 17 17:42:31 2024 +0000 Restructure web/js.inc | 51 +++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 24 deletions(-) commit c79e09c87 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 17 17:23:27 2024 +0000 Add comment web/style.inc | 1 + 1 file changed, 1 insertion(+) commit b859aec2e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 17 17:20:46 2024 +0000 Declare strict_types web/style.inc | 1 + 1 file changed, 1 insertion(+) commit 9fae1088c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 17 17:18:43 2024 +0000 Restructure web/style.inc | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) commit faef537cd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 17 17:11:57 2024 +0000 Add type declarations web/style.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cf90a0aa3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 17 16:57:58 2024 +0000 Remove redundant argument web/functions_error.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b78c4afed Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 17 16:54:49 2024 +0000 Remove redundant condition web/functions_error.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit 1ab5c5851 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 17 16:42:09 2024 +0000 Fix bug when running in debug mode on systems with PHP versions before 8.1.0 web/functions_error.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 795ae23a8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Feb 15 18:25:06 2024 +0000 Declare strict_types web/functions_error.inc | 1 + 1 file changed, 1 insertion(+) commit d697dbfdb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Feb 15 18:23:22 2024 +0000 Add type declarations web/functions_error.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 90b75e5f1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Feb 15 18:20:48 2024 +0000 Add type declarations web/functions_error.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit abdb909ce Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Feb 15 18:18:16 2024 +0000 Add type declarations web/functions_error.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 395452d8a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Feb 15 18:09:42 2024 +0000 Add type declarations web/functions_error.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit eb332b994 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Feb 15 18:05:24 2024 +0000 Add type declarations web/functions_error.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 39e887200 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 14 18:38:03 2024 +0000 Add type declarations web/functions_error.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 911125e95 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 14 18:28:58 2024 +0000 Add type declarations and improve error handling web/functions_error.inc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) commit d0f85e0e8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 14 18:04:31 2024 +0000 Add type declarations web/functions_error.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c34bbdacf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 14 18:02:41 2024 +0000 Add type declarations web/functions_error.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit ace65b929 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 9 19:09:53 2024 +0000 Add comment web/js/datatables.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e3c53029c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 9 18:57:36 2024 +0000 Fix bug introduced in recent commit that caused only the currently visible page to be exported. web/js/datatables.js.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) commit 5422ebdb6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 6 20:18:33 2024 +0000 Fix bug introduced in recent commit that destroyed the last insert id and therefore caused repeating bookings (amongst other things) not to work. web/dbsys.inc | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) commit 633b312bc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Feb 5 16:54:12 2024 +0000 Fix errors that are generated when the MySQL wait_timeout variable is less than the time needed for some operations, eg large reports retrieving user data from an external server, resulting in the MySQL connection being dropped before the operation finishes. Typical error messages are "SQLSTATE[HY000]: General error: 2006 MySQL server has gone away" and "Packets out of order. Expected 1 received 0. Packet size=145". web/dbsys.inc | 25 ++++++++++++++++++++++--- web/functions_error.inc | 7 +++++++ web/lib/MRBS/DB.php | 7 ++++++- 3 files changed, 35 insertions(+), 4 deletions(-) commit 776e1aaa3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Feb 4 11:17:27 2024 +0000 Fix TypeError web/functions_ical.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 2c422d3f2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 29 10:04:00 2024 +0000 Fix bug and update comment web/lib/MRBS/Intl/IntlDateFormatterFactory.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit bf381d5e3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 28 14:58:35 2024 +0000 Restructure web/language.inc | 2 +- .../MRBS/Intl/IntlDatePatternGenerator.php | 64 +++++++++++------- 2 files changed, 41 insertions(+), 25 deletions(-) commit 778b905f7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 28 14:46:51 2024 +0000 Restructure web/lib/{ => MRBS/Intl}/IntlDatePatternGenerator.php | 1 + 1 file changed, 1 insertion(+) commit d670c7c64 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 28 14:44:14 2024 +0000 Delete redundant class web/lib/Locale.php (gone) | 7 ------- 1 file changed, 7 deletions(-) commit 1293839b9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 28 14:40:31 2024 +0000 Fix comment. web/lib/Locale.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 572838be9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 28 14:39:33 2024 +0000 Provide config variable for forcing the use of the IntlDateFormatter emulation. See GitHub Issue #3559. web/language.inc | 5 +-- web/lib/Locale.php | 2 +- web/lib/MRBS/Intl/IntlDateFormatter.php | 7 +--- .../Intl/IntlDateFormatterFactory.php (new) | 32 ++++++++++++++++++ web/systemdefaults.inc.php | 5 +++ 5 files changed, 42 insertions(+), 9 deletions(-) commit 023bf7353 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 28 10:03:25 2024 +0000 Fix bug and comment web/lib/IntlDateFormatter.php (new) | 10 ++++++++++ 1 file changed, 10 insertions(+) commit d31d3451e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 28 09:52:42 2024 +0000 Restructure web/lib/{ => MRBS/Intl}/IntlDateFormatter.php | 1 + 1 file changed, 1 insertion(+) commit f63f595c1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jan 27 18:52:57 2024 +0000 Add a getCalendar() method web/lib/IntlDateFormatter.php | 7 +++++++ 1 file changed, 7 insertions(+) commit eefb5bdee Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jan 27 18:47:13 2024 +0000 Fix comment web/lib/IntlDateFormatter.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 09d614b40 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jan 27 18:44:25 2024 +0000 Eliminate redundant code and provide config option for week date format. web/index.php | 27 ++------------------------- web/systemdefaults.inc.php | 18 ++---------------- 2 files changed, 4 insertions(+), 41 deletions(-) commit aa1b22693 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jan 27 17:55:56 2024 +0000 Fix bug web/index.php | 2 +- web/language.inc | 4 +- web/lib/IntlDatePatternGenerator.php (new) | 40 ++++++++++++ .../Intl/IntlDatePatternGenerator.php (gone) | 57 ------------------ web/systemdefaults.inc.php | 2 +- 5 files changed, 44 insertions(+), 61 deletions(-) commit b5a42dd8d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jan 27 17:43:54 2024 +0000 Provide global emulation of Locale class and flesh out emulations sufficiently for Ranger web/lib/IntlDateFormatter.php | 33 +++++++++++++++++++++++++++++++++ web/lib/Locale.php (new) | 7 +++++++ web/lib/MRBS/Intl/Locale.php | 2 ++ 3 files changed, 42 insertions(+) commit 83d0bbe2b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jan 27 16:10:52 2024 +0000 Move IntlDateFormatter class so that it can be picked up by Ranger web/lib/IntlDateFormatter.php (new) | 599 ++++++++++++++++ .../MRBS/Intl/IntlDateFormatter.php (gone) | 607 ----------------- 2 files changed, 599 insertions(+), 607 deletions(-) commit 8efd0a583 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jan 27 15:30:57 2024 +0000 Convert to using Ranger to construct date ranges web/index.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) commit 2bd8b1e7b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jan 27 15:05:01 2024 +0000 Add Ranger version 0.5.7 .../Ranger/Provider/DeProvider.php (new) | 31 ++ .../Provider/DefaultProvider.php (new) | 25 + .../Ranger/Provider/Provider.php (new) | 20 + web/lib/OpenPsa/Ranger/Ranger.php (new) | 440 +++++++++++++++++ 4 files changed, 516 insertions(+) commit 9e35d0254 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jan 20 13:57:22 2024 +0000 Fix TypeError web/Themes/default/header.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1ac213c06 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jan 19 16:52:24 2024 +0000 Fix bug causing some fields to be duplicated on DataTables export (eg to Excel). web/js/datatables.js.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) commit 1f81a38f1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jan 9 17:19:17 2024 +0000 Fix type error in week and month views. See GitHub Issue #3591. web/standard_vars.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b6f9a24aa Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jan 9 15:24:04 2024 +0000 Fix type errors. See GitHub Issue #3591. web/mrbs_sql.inc | 2 ++ 1 file changed, 2 insertions(+) commit 046647844 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jan 9 15:16:19 2024 +0000 Fix potential type error problem web/dbsys.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 5fb13f241 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jan 9 14:15:18 2024 +0000 Update comment web/lib/MRBS/Intl/Locale.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 09d3d1e95 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jan 9 14:13:31 2024 +0000 Fix bug when MRBS has been upgraded by overwriting the web folder leaving old files in place. web/lib/MRBS/Intl/IntlDateFormatter.php | 8 ++++++-- web/lib/MRBS/Intl/IntlDatePatternGenerator.php | 7 ++++++- 2 files changed, 12 insertions(+), 3 deletions(-) commit 67204bf6c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jan 9 10:05:30 2024 +0000 Fix bug in last commit causing patterns for the 'zh-CN' and 'zh-TW' locales to be omitted. generate_pattern_files.php | 8 ++++---- web/intl/skeletons/MMMMy.ini | 2 ++ web/intl/skeletons/d.ini | 2 ++ web/intl/skeletons/dEMMM.ini | 2 ++ web/intl/skeletons/dMMM.ini | 2 ++ web/intl/skeletons/dMMMM.ini | 2 ++ web/intl/types/full_full.ini | 2 ++ web/intl/types/full_long.ini | 2 ++ web/intl/types/full_medium.ini | 2 ++ web/intl/types/full_none.ini | 2 ++ web/intl/types/full_short.ini | 2 ++ web/intl/types/long_full.ini | 2 ++ web/intl/types/long_long.ini | 2 ++ web/intl/types/long_medium.ini | 2 ++ web/intl/types/long_none.ini | 2 ++ web/intl/types/long_short.ini | 2 ++ web/intl/types/medium_full.ini | 2 ++ web/intl/types/medium_long.ini | 2 ++ web/intl/types/medium_medium.ini | 2 ++ web/intl/types/medium_none.ini | 2 ++ web/intl/types/medium_short.ini | 2 ++ web/intl/types/none_full.ini | 2 ++ web/intl/types/none_long.ini | 2 ++ web/intl/types/none_medium.ini | 2 ++ web/intl/types/none_short.ini | 2 ++ web/intl/types/short_full.ini | 2 ++ web/intl/types/short_long.ini | 2 ++ web/intl/types/short_medium.ini | 2 ++ web/intl/types/short_none.ini | 2 ++ web/intl/types/short_short.ini | 2 ++ 30 files changed, 62 insertions(+), 4 deletions(-) commit e3ee6a67a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 8 21:41:29 2024 +0000 Better fix for locales that are also ini file keywords generate_pattern_files.php | 36 +- web/intl/skeletons/MMMMy.ini | 1609 ++++++++++++++-------------- web/intl/skeletons/d.ini | 1609 ++++++++++++++-------------- web/intl/skeletons/dEMMM.ini | 1609 ++++++++++++++-------------- web/intl/skeletons/dMMM.ini | 1609 ++++++++++++++-------------- web/intl/skeletons/dMMMM.ini | 1609 ++++++++++++++-------------- web/intl/types/full_full.ini | 1609 ++++++++++++++-------------- web/intl/types/full_long.ini | 1609 ++++++++++++++-------------- web/intl/types/full_medium.ini | 1609 ++++++++++++++-------------- web/intl/types/full_none.ini | 1609 ++++++++++++++-------------- web/intl/types/full_short.ini | 1609 ++++++++++++++-------------- web/intl/types/long_full.ini | 1609 ++++++++++++++-------------- web/intl/types/long_long.ini | 1609 ++++++++++++++-------------- web/intl/types/long_medium.ini | 1609 ++++++++++++++-------------- web/intl/types/long_none.ini | 1609 ++++++++++++++-------------- web/intl/types/long_short.ini | 1609 ++++++++++++++-------------- web/intl/types/medium_full.ini | 1609 ++++++++++++++-------------- web/intl/types/medium_long.ini | 1609 ++++++++++++++-------------- web/intl/types/medium_medium.ini | 1609 ++++++++++++++-------------- web/intl/types/medium_none.ini | 1609 ++++++++++++++-------------- web/intl/types/medium_short.ini | 1609 ++++++++++++++-------------- web/intl/types/none_full.ini | 1609 ++++++++++++++-------------- web/intl/types/none_long.ini | 1609 ++++++++++++++-------------- web/intl/types/none_medium.ini | 1609 ++++++++++++++-------------- web/intl/types/none_short.ini | 1609 ++++++++++++++-------------- web/intl/types/short_full.ini | 1609 ++++++++++++++-------------- web/intl/types/short_long.ini | 1609 ++++++++++++++-------------- web/intl/types/short_medium.ini | 1609 ++++++++++++++-------------- web/intl/types/short_none.ini | 1609 ++++++++++++++-------------- web/intl/types/short_short.ini | 1609 ++++++++++++++-------------- 30 files changed, 23371 insertions(+), 23326 deletions(-) commit 3be9fdde7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 8 19:09:47 2024 +0000 Fix bug introduced in recent commit caused by the addition of patterns for "no" which causes a "syntax error, unexpected BOOL_FALSE" warning when parsed. Fuller fix to follow. web/intl/skeletons/MMMMy.ini | 1612 ++++++++++++++-------------- web/intl/skeletons/d.ini | 1612 ++++++++++++++-------------- web/intl/skeletons/dEMMM.ini | 1612 ++++++++++++++-------------- web/intl/skeletons/dMMM.ini | 1612 ++++++++++++++-------------- web/intl/skeletons/dMMMM.ini | 1612 ++++++++++++++-------------- web/intl/types/full_full.ini | 1612 ++++++++++++++-------------- web/intl/types/full_long.ini | 1612 ++++++++++++++-------------- web/intl/types/full_medium.ini | 1612 ++++++++++++++-------------- web/intl/types/full_none.ini | 1612 ++++++++++++++-------------- web/intl/types/full_short.ini | 1612 ++++++++++++++-------------- web/intl/types/long_full.ini | 1612 ++++++++++++++-------------- web/intl/types/long_long.ini | 1612 ++++++++++++++-------------- web/intl/types/long_medium.ini | 1612 ++++++++++++++-------------- web/intl/types/long_none.ini | 1612 ++++++++++++++-------------- web/intl/types/long_short.ini | 1612 ++++++++++++++-------------- web/intl/types/medium_full.ini | 1612 ++++++++++++++-------------- web/intl/types/medium_long.ini | 1612 ++++++++++++++-------------- web/intl/types/medium_medium.ini | 1612 ++++++++++++++-------------- web/intl/types/medium_none.ini | 1612 ++++++++++++++-------------- web/intl/types/medium_short.ini | 1612 ++++++++++++++-------------- web/intl/types/none_full.ini | 1612 ++++++++++++++-------------- web/intl/types/none_long.ini | 1612 ++++++++++++++-------------- web/intl/types/none_medium.ini | 1612 ++++++++++++++-------------- web/intl/types/none_short.ini | 1612 ++++++++++++++-------------- web/intl/types/short_full.ini | 1612 ++++++++++++++-------------- web/intl/types/short_long.ini | 1612 ++++++++++++++-------------- web/intl/types/short_medium.ini | 1612 ++++++++++++++-------------- web/intl/types/short_none.ini | 1612 ++++++++++++++-------------- web/intl/types/short_short.ini | 1612 ++++++++++++++-------------- 29 files changed, 23345 insertions(+), 23403 deletions(-) commit 1b8212db8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 8 16:35:48 2024 +0000 Update intl types and skeletons with latest patterns web/intl/skeletons/MMMMy.ini | 159 ++++-- web/intl/skeletons/d.ini | 91 +++- web/intl/skeletons/dEMMM.ini | 137 ++++-- web/intl/skeletons/dMMM.ini | 121 ++++- web/intl/skeletons/dMMMM.ini | 145 ++++-- web/intl/types/full_full.ini | 701 ++++++++++++++------------ web/intl/types/full_long.ini | 709 +++++++++++++++------------ web/intl/types/full_medium.ini | 713 +++++++++++++++------------ web/intl/types/full_none.ini | 221 ++++++--- web/intl/types/full_short.ini | 713 +++++++++++++++------------ web/intl/types/long_full.ini | 697 ++++++++++++++------------ web/intl/types/long_long.ini | 705 ++++++++++++++------------ web/intl/types/long_medium.ini | 705 ++++++++++++++------------ web/intl/types/long_none.ini | 205 +++++--- web/intl/types/long_short.ini | 705 ++++++++++++++------------ web/intl/types/medium_full.ini | 761 ++++++++++++++++------------- web/intl/types/medium_long.ini | 739 +++++++++++++++------------- web/intl/types/medium_medium.ini | 743 +++++++++++++++------------- web/intl/types/medium_none.ini | 187 ++++--- web/intl/types/medium_short.ini | 743 +++++++++++++++------------- web/intl/types/none_full.ini | 373 ++++++++------ web/intl/types/none_long.ini | 357 ++++++++------ web/intl/types/none_medium.ini | 361 ++++++++------ web/intl/types/none_short.ini | 361 ++++++++------ web/intl/types/short_full.ini | 623 ++++++++++++----------- web/intl/types/short_long.ini | 603 +++++++++++++---------- web/intl/types/short_medium.ini | 603 +++++++++++++---------- web/intl/types/short_none.ini | 139 ++++-- web/intl/types/short_short.ini | 603 +++++++++++++---------- 29 files changed, 8020 insertions(+), 5903 deletions(-) commit e56895e42 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 7 17:09:49 2024 +0000 Fix bug converting a pattern into a strftime format when the pattern contains two consecutive tokens. See GitHub Issue #3589. web/lib/MRBS/Intl/IntlDateFormatter.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit a046e4c02 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 31 23:53:25 2023 +0000 Eliminate error suppression operator web/theme.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit 7393ca1a1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 31 23:05:47 2023 +0000 Declare strict_types web/theme.inc | 1 + 1 file changed, 1 insertion(+) commit d90500d0c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 31 22:59:21 2023 +0000 Declare strict_types web/internalconfig.inc.php | 1 + 1 file changed, 1 insertion(+) commit b8ca5ff30 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 31 22:57:49 2023 +0000 Simplify code web/internalconfig.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit cc1b4beaf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 31 22:55:06 2023 +0000 Simplify code web/internalconfig.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 0628dc01f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 31 22:51:39 2023 +0000 Declare strict_types web/init.inc | 1 + 1 file changed, 1 insertion(+) commit b4bfc4e29 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 31 22:44:55 2023 +0000 Declare strict_types web/index.php | 1 + 1 file changed, 1 insertion(+) commit 2bfa1f9f1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 31 22:40:51 2023 +0000 Declare strict_types web/help.php | 1 + 1 file changed, 1 insertion(+) commit f3804b230 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 31 22:38:37 2023 +0000 Declare strict_types web/grab_globals.inc.php | 1 + 1 file changed, 1 insertion(+) commit 9cba27f15 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 31 22:34:22 2023 +0000 Fix typo in comment web/grab_globals.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5bfaff94a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 31 22:33:16 2023 +0000 Fix type declaration in last commit web/grab_globals.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4db1d9e8f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 31 22:30:05 2023 +0000 Add type declaration web/grab_globals.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6351c44f6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 24 16:48:56 2023 +0000 Declare strict_types web/js.inc | 1 + 1 file changed, 1 insertion(+) commit 90baefb9a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 24 16:47:47 2023 +0000 Add type declaration web/js.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d861296eb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 24 15:52:35 2023 +0000 Remove redundant code web/edit_entry.php | 10 ---------- 1 file changed, 10 deletions(-) commit abfee0206 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 24 15:23:06 2023 +0000 Declare strict_types web/edit_area_handler.php | 1 + 1 file changed, 1 insertion(+) commit eade6878e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 24 15:13:06 2023 +0000 Remove unnecessary curly braces web/edit_area_handler.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 1a790465b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 24 15:02:19 2023 +0000 Replace with ?? operator web/edit_area.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 73dc9f2ea Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 24 14:58:18 2023 +0000 Remove unnecessary curly braces web/edit_area.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 2ce4ca999 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 24 14:55:50 2023 +0000 Remove unnecessary local variable web/edit_area.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9c4cb79f9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 24 14:53:33 2023 +0000 Declare strict_types web/edit_area.php | 1 + 1 file changed, 1 insertion(+) commit 93aaf4411 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 24 14:21:38 2023 +0000 Add type declarations web/edit_area.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) commit caa5896bc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 24 14:14:16 2023 +0000 Add type declarations web/edit_area.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit b0a6f2780 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 24 14:07:57 2023 +0000 Declare strict_types web/del_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d811ecc61 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 24 14:07:42 2023 +0000 Fix TypeError uncaught exception web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8fee659d5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 24 13:42:55 2023 +0000 Replace with ?? operator web/del.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a4c6891f4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 24 13:40:47 2023 +0000 Declare strict_types web/del.php | 1 + 1 file changed, 1 insertion(+) commit 67b8ae6e3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 24 13:37:50 2023 +0000 Add type declarations web/del.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit e234e36ba Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 24 13:35:16 2023 +0000 Declare strict_types web/defaultincludes.inc | 1 + 1 file changed, 1 insertion(+) commit ba76880c5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 24 13:32:24 2023 +0000 Declare strict_types web/dbsys.inc | 1 + 1 file changed, 1 insertion(+) commit 2e324d4da Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 24 13:29:56 2023 +0000 Add type declarations web/dbsys.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d994c8282 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Dec 22 18:27:51 2023 +0000 Simplify code web/admin.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit f2b4101de Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Dec 22 17:52:30 2023 +0000 Declare strict_types web/admin.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit e5c260595 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Dec 22 17:37:09 2023 +0000 Add type declarations web/admin.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 410cab189 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Dec 22 17:31:39 2023 +0000 Add type declarations web/add.php | 1 + web/admin.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) commit fe6107e84 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Dec 22 17:26:03 2023 +0000 Declare strict_types web/standard_vars.inc.php | 1 + 1 file changed, 1 insertion(+) commit ace9b8587 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Dec 22 17:23:15 2023 +0000 Change type of parameter passed to version_compare from float to string web/Themes/default/header.inc | 2 +- web/functions.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit a7d270e85 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Dec 22 17:10:43 2023 +0000 Declare strict_types web/Themes/default/header.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) commit 116e90ad0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Dec 22 16:57:57 2023 +0000 Add type declarations web/Themes/default/header.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 0c1b68cc8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Dec 22 16:50:28 2023 +0000 Add type declarations web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bb9d786c5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Dec 22 16:49:05 2023 +0000 Add type declarations and handle case when query sting is empty web/Themes/default/header.inc | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) commit 84d9fc7c3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 21 17:57:03 2023 +0000 Correct typo in comment web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8b5fda345 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 21 17:55:43 2023 +0000 Add type declarations web/Themes/default/header.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 823c43f4f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 21 17:51:32 2023 +0000 Remove unused variable web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d14e9d2ad Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 21 17:50:44 2023 +0000 Add type declarations web/Themes/default/header.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit aa1ef94d3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 21 17:48:32 2023 +0000 Add type declarations web/Themes/default/header.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 9432767c9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 21 17:40:18 2023 +0000 Simplify code web/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 0b1607d02 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 21 17:38:42 2023 +0000 Simplify code web/site_config.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 5a42283f8 Merge: 7bbc2c354 11b00872a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 17 16:20:34 2023 +0000 Merge branch 'main' into message commit 7bbc2c354 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 17 12:24:00 2023 +0000 Add a message start date web/admin.php | 12 ++++- web/edit_message.php | 10 ++++ web/edit_message_handler.php | 3 +- web/lang/lang.en | 3 ++ web/lib/MRBS/Message.php | 97 +++++++++++++++++++++++++++++++--- 5 files changed, 116 insertions(+), 9 deletions(-) commit 212fa4aec Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Dec 16 18:30:25 2023 +0000 Allow booking admins to edit the message web/admin.php | 2 +- web/edit_message.php | 7 +++++++ web/edit_message_handler.php | 7 +++++++ web/mrbs_auth.inc | 4 ++-- 4 files changed, 17 insertions(+), 3 deletions(-) commit 11b00872a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Dec 15 15:55:42 2023 +0000 Fix a problem on systems, eg altervista.org, where php_uname() has been disabled for security reasons. See GitHub Issue #3579. web/help.php | 2 +- web/lib/MRBS/System.php | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) commit aae094254 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Dec 15 15:33:01 2023 +0000 Add support for the altervista.org database type. See GitHub Issue #3579. web/lib/MRBS/DB_mysql.php | 5 +++++ 1 file changed, 5 insertions(+) commit 7e257bdaa Merge: 6775cb2b7 36795a0e1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 14 14:51:08 2023 +0000 Merge branch 'main' into message commit 6775cb2b7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 14 14:50:59 2023 +0000 Improve layout web/css/mrbs.css.php | 4 ++++ 1 file changed, 4 insertions(+) commit 9956c27fb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 14 14:29:29 2023 +0000 Link edit_message into the navigation web/add.php | 1 - web/admin.php | 33 ++++++++++++++++++++++++++++++++ web/css/mrbs.css.php | 7 +++++++ web/edit_message.php | 4 ++++ web/edit_message_handler.php | 11 +++++++++-- web/index.php | 17 ++++------------- web/lang/lang.en | 3 +++ web/lib/MRBS/Message.php | 35 ++++++++++++++++++++++++++++++++++ 8 files changed, 95 insertions(+), 16 deletions(-) commit d90b80d51 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 13 15:42:47 2023 +0000 Fix typo web/lib/MRBS/Message.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6d852fc12 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 13 15:36:59 2023 +0000 Add comment web/lib/MRBS/Message.php | 2 ++ 1 file changed, 2 insertions(+) commit ffc7ee7b0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 13 15:35:27 2023 +0000 Complete the restructuring web/index.php | 24 +++++++++--------------- web/lib/MRBS/Message.php | 23 +++++++++++++++++++++++ web/mrbs_sql.inc | 13 ------------- 3 files changed, 32 insertions(+), 28 deletions(-) commit 36795a0e1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 13 14:32:37 2023 +0000 Correct typo in comment web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b9634bfae Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 13 14:27:33 2023 +0000 Correct typo in comment web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7417cd1d0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 13 14:25:50 2023 +0000 Restructure - partially web/edit_message.php | 24 ++---- web/edit_message_handler.php | 28 +------ web/lib/MRBS/Message.php (new) | 128 +++++++++++++++++++++++++++++++ web/mrbs_sql.inc | 14 ---- 4 files changed, 136 insertions(+), 58 deletions(-) commit a30b328c9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 12 17:37:18 2023 +0000 Add ability to edit an existing message web/edit_message.php | 49 +++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 10 deletions(-) commit 52f2d6544 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 12 16:57:16 2023 +0000 Change format of saved date to include a time web/edit_message_handler.php | 20 ++++++++++++++++++++ web/index.php | 9 +++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) commit 7bb1eb413 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 10 17:46:54 2023 +0000 Add comment web/lib/MRBS/SessionHandlerDb.php | 5 +++++ 1 file changed, 5 insertions(+) commit 312f4dc71 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 10 13:56:02 2023 +0000 Fix typo in comment web/lib/MRBS/DB_mysql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 21d02078e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 7 18:47:59 2023 +0000 Add expiry date web/edit_message.php | 20 ++++++++++++-------- web/edit_message_handler.php | 4 +++- web/index.php | 11 +++++++++++ web/lang/lang.en | 1 + 4 files changed, 27 insertions(+), 9 deletions(-) commit 68f4b1797 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 5 18:02:59 2023 +0000 Display the message web/css/mrbs.css.php | 4 ++++ web/index.php | 14 ++++++++++++++ 2 files changed, 18 insertions(+) commit 5f84fccf2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 5 17:42:18 2023 +0000 Save message to database web/edit_message.php | 2 +- web/edit_message_handler.php (new) | 21 +++++++++++++++++++++ web/mrbs_sql.inc | 27 +++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) commit 97441f18a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 5 14:56:35 2023 +0000 Add submit buttons web/edit_message.php | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) commit 17586ac90 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 5 14:45:12 2023 +0000 Add message field web/edit_message.php | 7 +++++++ web/lang/lang.en | 1 + 2 files changed, 8 insertions(+) commit f4159ce98 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 5 14:30:41 2023 +0000 Set up form stub web/edit_message.php (new) | 41 ++++++++++++++++++++++++++++++++++++ web/lang/lang.en | 3 +++ web/mrbs_auth.inc | 2 ++ 3 files changed, 46 insertions(+) commit c7b4edac0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 3 17:27:05 2023 +0000 Correct typo in comment web/lib/MRBS/MailQueue.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 257641556 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 3 17:25:15 2023 +0000 Move content ID generation into sending web/functions_mail.inc | 12 ++++-------- web/lib/MRBS/Auth/AuthDb.php | 2 +- web/lib/MRBS/MailQueue.php | 12 ++++++------ 3 files changed, 11 insertions(+), 15 deletions(-) commit f3165fc65 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 3 17:05:39 2023 +0000 Move content ID generation into sending web/functions_mail.inc | 6 ++---- web/lib/MRBS/Auth/AuthDb.php | 4 +--- web/lib/MRBS/MailQueue.php | 14 ++++++-------- 3 files changed, 9 insertions(+), 15 deletions(-) commit 18eb022cd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Dec 2 18:59:48 2023 +0000 Add comment web/lib/MRBS/MailQueue.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 980c351a5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Dec 2 16:47:27 2023 +0000 Add languages which should have been added in the upgrade to PHPMailer 6.9.1 .../language/phpmailer.lang-as.php (new) | 35 ++++++++++++++++++ .../language/phpmailer.lang-bn.php (new) | 35 ++++++++++++++++++ 2 files changed, 70 insertions(+) commit 552831091 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Dec 2 16:45:23 2023 +0000 Upgrade to latest version of pear/File_Passwd web/File/Passwd.php | 33 ++++----- web/File/Passwd/Authbasic.php | 56 ++++++-------- web/File/Passwd/Authdigest.php | 41 ++++------- web/File/Passwd/Common.php | 57 ++++++--------- web/File/Passwd/Custom.php | 47 ++++++------ web/File/Passwd/Cvs.php | 23 +++--- web/File/Passwd/Exception.php (new) | 2 + web/File/Passwd/Smb.php | 67 +++++++---------- web/File/Passwd/Unix.php | 101 ++++++++++++-------------- 9 files changed, 182 insertions(+), 245 deletions(-) commit 1099f499c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Dec 2 16:31:08 2023 +0000 Upgrade to latest version of PEAR.php web/PEAR.php | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) commit 03a9be0cb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Dec 2 16:19:46 2023 +0000 Upgrade to latest version of Mail_Mime package web/Mail/mime.php | 332 +++++++++++++++++++--------------------- web/Mail/mimePart.php | 96 +++++++----- 2 files changed, 216 insertions(+), 212 deletions(-) commit 5949ef8c6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Dec 2 14:45:48 2023 +0000 Upgrade to PHPMailer Version 6.9.1 web/lib/PHPMailer/README.md | 5 +- web/lib/PHPMailer/VERSION | 2 +- web/lib/PHPMailer/composer.json | 1 + .../PHPMailer/language/phpmailer.lang-da.php | 1 + .../PHPMailer/language/phpmailer.lang-pl.php | 9 +- web/lib/PHPMailer/src/PHPMailer.php | 130 ++++++++++++++++- web/lib/PHPMailer/src/POP3.php | 2 +- web/lib/PHPMailer/src/SMTP.php | 33 ++++- 8 files changed, 175 insertions(+), 8 deletions(-) commit fe8a4929d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 30 18:19:57 2023 +0000 Remove unused local variables web/admin.php | 2 +- web/edit_entry.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 379c8648d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 30 18:15:49 2023 +0000 Add type declaration web/lib/MRBS/Form/Form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 305959b53 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 23 17:33:36 2023 +0000 Fix problem introduced in recent commit web/lib/MRBS/Session/Session.php | 7 ++++++- web/lib/MRBS/Session/SessionCas.php | 2 ++ web/lib/MRBS/Session/SessionSaml.php | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) commit 6071b6d28 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 23 14:27:15 2023 +0000 Fix problem resulting in element just consisting of <input type="hidden"> web/lib/MRBS/Form/ElementInputHidden.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) commit 3e0bd34e9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 23 13:55:33 2023 +0000 Fix fatal error when saving a form with a protected date field that is null. web/edit_users.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) commit ce808b1af Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 18 18:45:20 2023 +0000 Increase the strength of the session id web/lib/MRBS/Session/Session.php | 7 +++++++ 1 file changed, 7 insertions(+) commit 133b664c5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 18 17:51:13 2023 +0000 Set secure session cookie properties. See GitHub Issue #3568. web/lib/MRBS/Session/Session.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) commit 4391d6f15 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Nov 17 17:20:26 2023 +0000 Add a class of 'today' to cell if it's the current day. See GitHub Issue #3564. web/functions_table.inc | 4 ++++ web/lib/MRBS/DateTime.php | 7 +++++++ 2 files changed, 11 insertions(+) commit 54215911a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 16 17:48:05 2023 +0000 Remove empty class attribute web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a0719066c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 13 17:56:19 2023 +0000 Tweak to example in comment. web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 77844a154 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 13 17:53:39 2023 +0000 Fix problem with recent PR granting level 1 access to all users, whether or not $auth['saml']['user'] is set. See GitHub PR #3560. web/lib/MRBS/Auth/AuthSaml.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) commit 914feaa8d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 12 17:14:21 2023 +0000 Fix syntax error web/lib/MRBS/Auth/AuthSaml.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit aef943b57 Merge: c631aaa12 59b150205 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 12 18:12:07 2023 +0100 Merge pull request #3560 from jagapen/main SAML Access Control Filter commit c631aaa12 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Nov 10 15:43:33 2023 +0000 Made it easier to force MRBS to use strftime() instead of the intl extension. See GitHub Issue #3559. web/language.inc | 7 +- web/lib/IntlDateFormatter.php (gone) | 609 ----------------- web/lib/IntlDatePatternGenerator.php (gone) | 45 -- web/lib/MRBS/Auth/AuthCas.php | 4 +- .../MRBS/Intl/IntlDateFormatter.php (new) | 596 ++++++++++++++++ .../Intl/IntlDatePatternGenerator.php (new) | 52 ++ web/lib/MRBS/{ => Intl}/Locale.php | 32 +- web/lib/MRBS/System.php | 1 + web/systemdefaults.inc.php | 2 +- 9 files changed, 681 insertions(+), 667 deletions(-) commit 59b150205 Author: Jonathan Gapen <jagapen@wisc.edu> Date: Thu Nov 9 11:40:02 2023 -0600 Add an optional access control filter that requires users to be a member of a configurable group in order to access the calendar. AUTHENTICATION | 13 ++++++++----- web/lib/MRBS/Auth/AuthSaml.php | 21 +++++++++++++++++++++ web/systemdefaults.inc.php | 2 ++ 3 files changed, 31 insertions(+), 5 deletions(-) commit 119880e15 Merge: 5d852997c 8c8783a52 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Nov 9 08:18:03 2023 +0000 Merge pull request #3557 from raff4el/main fix missing table in grant.pg.sql commit 5d852997c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Nov 8 18:15:15 2023 +0000 Add the ability to override ICU values for week numbering - useful when the ICU library can't be updated. web/language.inc | 29 ++++++++++++++++++++++++++++- web/lib/MRBS/DateTime.php | 31 +++++++++++++++++++++++++++---- web/systemdefaults.inc.php | 20 ++++++++++++++++++++ 3 files changed, 75 insertions(+), 5 deletions(-) commit 8c8783a52 Author: raff4el <74510259+raff4el@users.noreply.github.com> Date: Wed Nov 8 15:33:24 2023 +0000 fix missing table in grant grant.pg.sql | 1 + 1 file changed, 1 insertion(+) commit 38bf057a0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 2 18:44:30 2023 +0000 Restructure web/functions_mail.inc | 16 ++++++++-------- web/language.inc | 22 ++++++++++++++++++---- web/lib/MRBS/RepeatRule.php | 2 +- 3 files changed, 27 insertions(+), 13 deletions(-) commit 56925f7a0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 2 17:36:44 2023 +0000 Fix bug causing times in emails to be in am/pm format not 24-hour. See GitHub Issue #3550. web/language.inc | 7 +++++-- web/systemdefaults.inc.php | 7 ++++++- 2 files changed, 11 insertions(+), 3 deletions(-) commit 905b0e215 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 2 16:44:50 2023 +0000 Add comment on the 'w' pattern web/lib/IntlDateFormatter.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 1af44b858 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Nov 1 17:48:12 2023 +0000 Use the IntlCalendar extension if possible to find the first day of the week in the user's locale. The week numbers in MRBS are based on the week number in the locale, which won't necessarily be the ISO week number. web/functions_table.inc | 5 +++-- web/index.php | 8 ++++---- web/js/datepicker.js.php | 4 ++-- web/lib/MRBS/DateTime.php | 34 ++++++++++++++++++++++++++++++++++ web/systemdefaults.inc.php | 18 ++++++++++-------- 5 files changed, 53 insertions(+), 16 deletions(-) commit d944be8ea Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 31 17:05:49 2023 +0000 Restructure web/lib/MRBS/Auth/AuthJoomla.php | 4 ++-- web/lib/MRBS/{ => Joomla}/JFactory.php | 4 ++-- web/lib/MRBS/{ => Joomla}/JUser.php | 2 +- web/lib/MRBS/Session/SessionJoomla.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) commit 95275e691 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 31 10:16:38 2023 +0000 Fix bug when approving series. See GitHub Issue #3549. web/functions_ical.inc | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) commit c632983c9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 31 09:34:33 2023 +0000 Correct typo in comment web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bd356f361 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 30 18:13:49 2023 +0000 Further fix for authentication against Joomla Version 5. See GitHub Issue #3547. web/lib/MRBS/Auth/AuthJoomla.php | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) commit 6937eb16f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 30 17:50:39 2023 +0000 Fix authentication against Joomla Version 5. See GitHub Issue #3547. web/lib/MRBS/Auth/AuthJoomla.php | 29 +++++++++++++++++++++--- web/lib/MRBS/JFactory.php | 17 +++++++------- web/lib/MRBS/JUser.php | 5 ++-- web/lib/MRBS/Session/SessionJoomla.php | 9 +++++++- 4 files changed, 46 insertions(+), 14 deletions(-) commit 16492e1af Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 26 17:37:30 2023 +0100 Simplify code web/edit_entry_handler.php | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) commit 6fdff11a2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 26 16:26:01 2023 +0100 Revert "Remove redundant code" This reverts commit 1919deac6bcebc86cbfa022961998e9f199de595. web/edit_entry_handler.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) commit 1919deac6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 26 16:17:22 2023 +0100 Remove redundant code web/edit_entry_handler.php | 17 ----------------- 1 file changed, 17 deletions(-) commit e731c8a80 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 26 16:07:58 2023 +0100 Fix bug causing the repeat end date to be a day too early if the current time is earlier than the time of the booking. web/edit_entry_handler.php | 1 + 1 file changed, 1 insertion(+) commit 3308cfd4b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 26 15:41:22 2023 +0100 Simplify code web/report.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit 2d547983d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 25 16:32:11 2023 +0100 Fix bug causing the search to start from the current time on the search start date rather than 00:00. See GitHub Issue #3544. web/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit feb6b764d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 21 14:03:13 2023 +0100 Add client-side validation of the file upload size web/js/general.js.php | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) commit 0bf50edfe Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 21 09:39:53 2023 +0100 Improve internationalisation of error message web/import.php | 2 +- web/lang/lang.cs | 2 +- web/lang/lang.de | 2 +- web/lang/lang.en | 2 +- web/lang/lang.es | 2 +- web/lang/lang.fi | 2 +- web/lang/lang.fr | 2 +- web/lang/lang.id | 2 +- web/lang/lang.it | 2 +- web/lang/lang.ja | 2 +- web/lang/lang.ms | 2 +- web/lang/lang.nb | 2 +- web/lang/lang.nl | 2 +- web/lang/lang.nn | 2 +- web/lang/lang.no | 2 +- web/lang/lang.pt-br | 2 +- web/lang/lang.ro | 2 +- web/lang/lang.sk | 2 +- web/lang/lang.sr-latn-rs | 2 +- web/lang/lang.sv | 2 +- web/lang/lang.zh-cn | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) commit d672d6c05 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 21 08:39:24 2023 +0100 Add a MAX_FILE_SIZE hidden input to forms web/lib/MRBS/Form/Form.php | 44 ++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) commit e74cb65bf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 21 08:38:17 2023 +0100 Improve code web/import.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit ae1d4454e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 20 18:17:43 2023 +0100 Improve error handing of file uploading web/import.php | 55 ++++++++++++--------- web/lib/MRBS/UploadException.php (new) | 62 ++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 23 deletions(-) commit a909d216b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 19 14:00:51 2023 +0100 Change 'file' nature to 'binary' web/lib/MRBS/DB_mysql.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit ab1ee35fd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 18 17:53:03 2023 +0100 Add 'file' nature for blob types web/lib/MRBS/DB_mysql.php | 4 ++++ 1 file changed, 4 insertions(+) commit 80f4640b0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 16 15:38:49 2023 +0100 Fix Joomla >= 4.3.0 authentication properly web/auth/cms/joomla.inc | 12 ------------ web/lib/MRBS/Auth/AuthJoomla.php | 17 +---------------- web/lib/MRBS/Session/SessionJoomla.php | 15 +++++++++++++-- 3 files changed, 14 insertions(+), 30 deletions(-) commit 8b8f737ef Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 14 14:55:35 2023 +0100 Add strict_types web/lib/MRBS/ICalendar/Series.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 906109ed7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 14 14:33:33 2023 +0100 Restructure web/lib/MRBS/ICalendar/Series.php | 17 ++--------------- web/mrbs_sql.inc | 12 ++++++++++++ 2 files changed, 14 insertions(+), 15 deletions(-) commit d8d709376 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 14 14:26:46 2023 +0100 Add type declarations web/lib/MRBS/ICalendar/Series.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bc48529b1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 14 14:22:53 2023 +0100 Restructure web/lib/MRBS/ICalendar/Series.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) commit 133eea5bf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 14 14:18:11 2023 +0100 Fix bug when exporting series that have been changed. web/functions_ical.inc | 18 ++---- web/lib/MRBS/ICalendar/Series.php | 91 ++++++++++++++++++++--------- web/report.php | 4 +- web/view_entry.php | 2 +- 4 files changed, 72 insertions(+), 43 deletions(-) commit 57b39d90f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 11 17:47:59 2023 +0100 Fix bug introduced in recent commit preventing bulk deletion from working web/js/report.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 59e1d7364 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 11 15:47:23 2023 +0100 Restructure web/functions_ical.inc | 12 ++++++------ web/internalconfig.inc.php | 7 ------- web/lib/MRBS/ICalendar/RFC5545.php | 5 +++-- web/lib/MRBS/RepeatRule.php | 2 +- web/mrbs_sql.inc | 4 +++- 5 files changed, 13 insertions(+), 17 deletions(-) commit 5a6a32762 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 11 15:34:30 2023 +0100 Restructure web/functions_ical.inc | 377 ++------------------------- web/import.php | 11 +- web/internalconfig.inc.php | 2 +- web/lib/MRBS/ICalendar/RFC5545.php | 343 +++++++++++++++++++++++- 4 files changed, 371 insertions(+), 362 deletions(-) commit 7e08f5b4a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 11 13:51:59 2023 +0100 Allow the target_url to be a GET or POST value to help password managers (the target_url can be stored as a query string parameter in the password manager). web/lib/MRBS/Session/SessionWithLogin.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit 468738534 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 10 18:29:07 2023 +0100 Add comment web/functions_ical.inc | 1 + 1 file changed, 1 insertion(+) commit e1991b4f8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 10 17:38:34 2023 +0100 Restructure web/mrbs_sql.inc | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) commit 630aa80b9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 10 17:35:27 2023 +0100 Improve performance web/mrbs_sql.inc | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) commit cf83de052 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 10 17:13:44 2023 +0100 Restructure web/functions_ical.inc | 14 ++++++++------ web/lib/MRBS/ICalendar/Series.php | 26 ++++++++++++++++++++++---- 2 files changed, 30 insertions(+), 10 deletions(-) commit 5dd77eab2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 10 16:26:44 2023 +0100 Add new function entry_has_registrants() web/mrbs_sql.inc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) commit 0f5044144 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 10 16:07:27 2023 +0100 Restructure web/import.php | 9 +-------- web/mrbs_sql.inc | 12 ++++++++++++ 2 files changed, 13 insertions(+), 8 deletions(-) commit 41a2878ee Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 10 15:55:32 2023 +0100 Restructure web/import.php | 4 +--- web/mrbs_sql.inc | 10 ++++++---- web/registration_handler.php | 6 +++++- 3 files changed, 12 insertions(+), 8 deletions(-) commit e169a49e4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 10 14:03:20 2023 +0100 Add import of registrants (single entry only at the moment) web/import.php | 82 ++++++++++++++++++++++------------ web/mrbs_sql.inc | 16 +++++++ web/registration_handler.php | 12 +---- 3 files changed, 71 insertions(+), 39 deletions(-) commit 5f5e0225a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 9 18:15:04 2023 +0100 Add export of registrants (single entry only at the moment) web/functions_ical.inc | 8 ++++++++ 1 file changed, 8 insertions(+) commit 0cde30bf2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 9 17:35:08 2023 +0100 Correct typo in comment web/registration_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 88450c370 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 8 17:19:35 2023 +0100 Replace qualifier with import web/lib/MRBS/ICalendar/Series.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit a08afa9ee Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 7 17:34:26 2023 +0100 Add comment. web/lib/MRBS/Auth/AuthJoomla.php | 3 +++ 1 file changed, 3 insertions(+) commit 8a7a8fac1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 6 17:55:19 2023 +0100 Fix problem with Joomla authentication when the Joomla LDAP authentication plugin is enabled. See GitHub Issues #3521. web/auth/cms/joomla.inc | 3 +++ 1 file changed, 3 insertions(+) commit 3c1ab84a0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 28 18:47:25 2023 +0100 Fix bug preventing Auth::sortUsers() from working properly when using the Norwegian locale (and no doubt others) on Windows servers. web/lib/MRBS/System.php | 1 + 1 file changed, 1 insertion(+) commit 6e82f6d12 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 28 15:33:25 2023 +0100 Make Report table full created by column respect locale when sorting. See GitHub Issues #3518. web/report.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) commit 15b1302e3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 28 15:14:48 2023 +0100 Add comment. web/report.php | 1 + 1 file changed, 1 insertion(+) commit 940251ba8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 28 15:00:46 2023 +0100 Make Report table full description column respect locale when sorting. See GitHub Issues #3518. web/report.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3273e2512 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 28 14:55:58 2023 +0100 Make Report table brief area name and room name columns respect locale when sorting. See GitHub Issues #3518. web/report.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) commit ff1c40d33 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 28 14:38:16 2023 +0100 Make Report table brief description column respect locale when sorting. See GitHub Issues #3518. web/report.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) commit de338366c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 27 17:31:39 2023 +0100 Make Search table columns respect locale when sorting. See GitHub Issues #3518. web/search.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit a0a818e06 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 27 16:55:55 2023 +0100 Localise sorting of string custom fields. See GitHub Issues #3518. web/edit_users.php | 4 ++++ 1 file changed, 4 insertions(+) commit 31de78c04 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 27 16:25:17 2023 +0100 Fix comment web/admin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit e6366b335 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 27 15:35:17 2023 +0100 Fix visibility of name header cell (bug introduced in recent commit) web/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1c22ecf74 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 27 15:30:31 2023 +0100 Fix comment web/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cd0df1ea9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 27 15:23:56 2023 +0100 Localise sorting of string custom fields. See GitHub Issues #3518. web/admin.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) commit 3cebc556e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 27 15:06:49 2023 +0100 Localise sorting of invalid_types column. See GitHub Issues #3518. web/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 357cd926f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 27 14:46:21 2023 +0100 Localise sorting of room_admin_email column and fix bug in previous commit. See GitHub Issues #3518. web/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 8937ee26a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 27 14:17:53 2023 +0100 Localised sorting of description column. See GitHub Issues #3518. web/admin.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 2b2324b50 Merge: f13cbe26b fbb7368a6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 27 12:41:49 2023 +0100 Merge pull request #3522 from meeting-room-booking-system/localised_sorting Localised sorting commit fbb7368a6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 27 12:26:36 2023 +0100 Respect locale when sorting rooms web/admin.php | 7 +++---- web/js/admin.js.php | 10 +++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) commit 4cc2381c3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 27 11:57:55 2023 +0100 Add comment web/edit_users.php | 1 + 1 file changed, 1 insertion(+) commit 6b06fc065 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 27 11:50:27 2023 +0100 Add localised sorting for first two columns in user table web/edit_users.php | 10 +++++----- web/jquery/datatables/plugins.js | 21 +++++++++++++++++---- web/js/datatables.js.php | 4 ++++ 3 files changed, 26 insertions(+), 9 deletions(-) commit f13cbe26b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Sep 26 18:41:09 2023 +0100 Fix undefined variable warning when sending mail. web/functions_mail.inc | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) commit 38a790634 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Sep 25 08:32:08 2023 +0100 Fix bug causing user searches from the user name in the header not to start from the current date, as they did in MRBS 1.11.0. See GitHub Issues #3514. web/Themes/default/header.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit a39f4278c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 24 19:04:17 2023 +0100 Further fix of incorrect translation for Norwegian Bokmål in datepickers. See GitHub Issues #3517. web/js/flatpickr/l10n/nb.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 645976f1c Merge: f55d8c6b8 c297098fc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 24 19:01:01 2023 +0100 Merge remote-tracking branch 'origin/main' commit f55d8c6b8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 24 18:59:17 2023 +0100 Fix incorrect translation for Norwegian Bokmål in datepickers. See GitHub Issues #3517. web/js/flatpickr/l10n/nb.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit c297098fc (tag: v1.11.4) Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Sep 24 16:42:38 2023 +0100 Updated ChangeLog and NEWS for release of 1.11.4 ChangeLog | 18713 ++++++++++++++++++++++++++++---------------------- NEWS | 131 +- 2 files changed, 10684 insertions(+), 8160 deletions(-) commit b3f0c2ed8 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Sep 24 16:23:33 2023 +0100 Updated version number for release of 1.11.4 web/version_num.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 03bddb58c Merge: d9c276e7e 9f3ffa761 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 24 10:24:24 2023 +0100 Merge remote-tracking branch 'origin/main' commit d9c276e7e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 24 10:23:04 2023 +0100 Only display week numbers in the mini-calendars if the week starts on a Monday, the start of the ISO week. web/js/datepicker.js.php | 3 ++- web/systemdefaults.inc.php | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) commit 9f3ffa761 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Sep 23 14:14:28 2023 +0100 Revert last commit COPYING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8154870a4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Sep 23 14:12:49 2023 +0100 test COPYING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2b3f03874 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 22 12:24:48 2023 +0100 Fix bugs in use of $mincals_week_numbers and $view_week_number. See GitHub Issues #3515. web/index.php | 4 ++-- web/js/datepicker.js.php | 2 +- web/systemdefaults.inc.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) commit a9da72730 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 22 11:33:55 2023 +0100 Remove repeated colons in Norwegian translations web/lang/lang.nb | 4 ++-- web/lang/lang.nn | 4 ++-- web/lang/lang.no | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) commit 2e0f65bad Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 22 10:55:46 2023 +0100 Add comment web/js/datatables.js.php | 4 ++++ 1 file changed, 4 insertions(+) commit 02f6edf09 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 21 09:09:21 2023 +0100 Fix problem with PDF landscape orientation not being respected on some clients. See GitHub Issues #3512. web/js/datatables.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9c46f6b09 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Sep 19 16:01:13 2023 +0100 Fix typo in comment web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 70ba751b3 Merge: 36ef4e6e1 62c459241 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Sep 19 15:22:25 2023 +0100 Merge pull request #3513 from meeting-room-booking-system/user_deletion Add a configuration option to prevent the deletion of users that appear in bookings commit 62c459241 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Sep 19 15:18:31 2023 +0100 Add server-side checking of whether users can be deleted. web/edit_users.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit 36ef4e6e1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Sep 19 13:16:19 2023 +0100 Update pdfmake.min.js.map web/jquery/datatables/pdfmake.min.js.map | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit fbe83069b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 17 11:13:39 2023 +0100 Add basic language version of nb. See https://github.com/DataTables/Plugins/issues/576. web/jquery/datatables/language/nb.json (new) | 216 +++++++++++++++++ 1 file changed, 216 insertions(+) commit 730f7bc52 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 17 11:11:26 2023 +0100 Corrected naming of Norwegian language file. See https://github.com/DataTables/Plugins/issues/580. .../datatables/language/nb-NO.json (new) | 216 +++++++++++++++++ 1 file changed, 216 insertions(+) commit 8d7d7c2dc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 17 10:55:37 2023 +0100 Fix bug allowing private entry information to be displayed in the week (single room) view. See GitHub Issues #3510. web/functions_table.inc | 1 + 1 file changed, 1 insertion(+) commit 7f0988390 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 13 17:26:05 2023 +0100 Initial shot at preventing users with bookings in the system from being deleted. web/edit_users.php | 33 +++++++++++++++++++++++++++++---- web/lang/lang.en | 3 +++ web/lib/MRBS/Auth/AuthDb.php | 18 ++++++++++++++++-- web/lib/MRBS/User.php | 28 ++++++++++++++++++++++++++++ web/systemdefaults.inc.php | 5 +++++ 5 files changed, 81 insertions(+), 6 deletions(-) commit ff88980a8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 13 09:47:59 2023 +0100 Add HTML escaping for good measure web/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 27eb9b87b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 13 09:39:01 2023 +0100 Fix potential PHP deprecation notice web/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 56b28caeb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Sep 11 21:36:46 2023 +0100 Add some basic language versions of the DataTables language files which are copies of the main country specific version (eg fr.json is a copy of fr-FR.json). See GitHub Issue #3502. web/jquery/datatables/language/az.json (new) | 181 ++++++++++++ web/jquery/datatables/language/bs.json (new) | 74 +++++ web/jquery/datatables/language/de.json (new) | 243 ++++++++++++++++ web/jquery/datatables/language/es.json (new) | 242 ++++++++++++++++ web/jquery/datatables/language/fr.json (new) | 245 ++++++++++++++++ web/jquery/datatables/language/it.json (new) | 244 ++++++++++++++++ web/jquery/datatables/language/nl.json (new) | 246 +++++++++++++++++ web/jquery/datatables/language/pt.json (new) | 244 ++++++++++++++++ web/jquery/datatables/language/sv.json (new) | 199 +++++++++++++ 9 files changed, 1918 insertions(+) commit 3f88f786c Merge: cd7c53e64 349ee9c91 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Sep 11 17:31:03 2023 +0100 Merge pull request #3498 from meeting-room-booking-system/Issue_3496 Issue 3496 commit cd7c53e64 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Sep 11 05:46:47 2023 -1000 Add comment. web/js/edit_entry.js.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 349ee9c91 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Sep 11 05:23:02 2023 -1000 Fix properly. web/js/datepicker.js.php | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) commit 5dbbbb84c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 10 16:24:25 2023 +0100 Revert last commit web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b4ce80a11 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 10 16:15:27 2023 +0100 Remove diagnostic code web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8ef537a56 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 10 15:19:22 2023 +0100 Remove diagnostic code web/js/report.js.php | 1 - 1 file changed, 1 deletion(-) commit e2c6522dd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 10 15:13:02 2023 +0100 Increase default batch size web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 89e0d5208 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 10 15:10:24 2023 +0100 Move site back to being a POST parameter now that the max_input_vars problem is avoided web/js/report.js.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) commit 440889ddf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 10 15:00:49 2023 +0100 JSON encode the ids in order to avoid hitting the max_input_vars limit web/ajax/del_entries.php | 6 ++++-- web/js/report.js.php | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) commit aba9daa0f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 10 12:17:57 2023 +0100 Fix bug causing repeated deletion of entries after a cancellation. web/js/report.js.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 133cfbef2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Sep 9 18:48:32 2023 +0100 Improve performance of bulk deletion web/internalconfig.inc.php | 9 --- web/js/report.js.php | 137 +++++++++++++++++++++-------------- web/systemdefaults.inc.php | 15 ++++ 3 files changed, 98 insertions(+), 63 deletions(-) commit 7406f40ff Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 8 19:13:19 2023 +0100 Throttle the Ajax requests to del_entries.php web/internalconfig.inc.php | 2 ++ web/js/report.js.php | 24 ++++++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) commit 2936b1bb1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 8 10:37:18 2023 +0100 Internationalise bad timezone message web/import.php | 3 +-- web/lang/lang.en | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) commit 33fae7768 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 8 10:25:31 2023 +0100 Handle invalid timezones on import web/import.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) commit 261dcaea5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 7 18:12:12 2023 +0100 Replace qualifier with import web/functions_ical.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 0b587b003 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 7 18:05:23 2023 +0100 Add return type declaration web/import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 07932cd31 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 7 18:03:32 2023 +0100 Replace qualifier with import web/import.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 6313e3d25 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 7 17:36:05 2023 +0100 Add export and import of registration details (but not registrants at this stage) web/functions_ical.inc | 20 ++++++++++++++- web/import.php | 53 +++++++++++++++++++++++++++++----------- 2 files changed, 58 insertions(+), 15 deletions(-) commit b2373cf52 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 6 06:58:23 2023 +0100 Fix bug when exporting and importing a series with a changed entry web/functions_ical.inc | 13 +++---------- web/lib/MRBS/ICalendar/Series.php | 7 +++++-- 2 files changed, 8 insertions(+), 12 deletions(-) commit 8f3d772c5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Sep 5 16:16:32 2023 +0100 Fix bug in recent commit web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7e9b2a8e2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Sep 5 16:06:32 2023 +0100 Add comment web/mrbs_sql.inc | 1 + 1 file changed, 1 insertion(+) commit 6d3278cc4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Sep 5 16:00:07 2023 +0100 Fix bug when importing a series with a changed entry web/mrbs_sql.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit b9e818e32 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Sep 5 15:59:14 2023 +0100 Fix bug producing incorrect .ics files when exporting a series with a changed entry web/functions_ical.inc | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) commit 9f67e8ac4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Sep 4 20:46:04 2023 +0100 Fix bug causing the EXDATE property to be ignored when importing events web/import.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) commit 3ac44bac5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Sep 4 08:13:16 2023 +0100 Fix bug introduced in recent commits web/functions_ical.inc | 2 ++ 1 file changed, 2 insertions(+) commit 46e99356e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 3 13:45:17 2023 +0100 Restructure web/lib/MRBS/Auth/AuthPop3.php | 83 +++++++++++++++----------------- 1 file changed, 39 insertions(+), 44 deletions(-) commit 2786a23fb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 3 10:44:40 2023 +0100 Simplify code web/lib/MRBS/Auth/AuthPop3.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit b397e3786 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 3 10:21:01 2023 +0100 Simplify code web/lib/MRBS/Auth/AuthPop3.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) commit 0a5309cde Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 3 10:11:19 2023 +0100 Simplify code web/lib/MRBS/Auth/AuthPop3.php | 3 --- 1 file changed, 3 deletions(-) commit a4f553897 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 3 09:53:13 2023 +0100 Reduce stream timeout. See GitHub Issues #3497 web/lib/MRBS/Auth/AuthPop3.php | 69 ++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 31 deletions(-) commit 7275c1b77 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Sep 2 06:23:24 2023 +0100 Simplify code web/js/datepicker.js.php | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) commit 2cf3eb760 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 1 08:06:26 2023 +0100 Add comments web/js/datepicker.js.php | 3 +++ 1 file changed, 3 insertions(+) commit fd7127b13 Merge: 6435c751b 7bffbd173 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 1 08:01:44 2023 +0100 Merge branch 'main' into Issue_3496 commit 7bffbd173 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 1 08:01:11 2023 +0100 Fix problem with the wrong minicalendars being shown in the month view when you're at the end of the month (eg Aug 31) and the next month has fewer days than the current one. web/js/datepicker.js.php | 6 ++++++ 1 file changed, 6 insertions(+) commit 6435c751b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 1 07:32:27 2023 +0100 Fix problem with getting ISO Date strings in timezones other than UTC. web/js/datepicker.js.php | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) commit 5f8ed15ec Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Aug 29 18:58:56 2023 +0100 Upgraded to PHPMailer 6.8.1 web/lib/PHPMailer/README.md | 4 +- web/lib/PHPMailer/VERSION | 2 +- web/lib/PHPMailer/composer.json | 4 +- .../PHPMailer/language/phpmailer.lang-fi.php | 1 - .../PHPMailer/language/phpmailer.lang-fr.php | 1 - .../PHPMailer/language/phpmailer.lang-nb.php | 45 ++++++++++-------- .../language/phpmailer.lang-si.php (new) | 34 +++++++++++++ .../language/phpmailer.lang-zh_cn.php | 11 ++++- web/lib/PHPMailer/src/DSNConfigurator.php | 4 +- web/lib/PHPMailer/src/PHPMailer.php | 4 +- web/lib/PHPMailer/src/POP3.php | 2 +- web/lib/PHPMailer/src/SMTP.php | 6 +-- 12 files changed, 81 insertions(+), 37 deletions(-) commit c6ed8a158 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 20 19:12:00 2023 +0100 Simplify code web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 93ad0c6d8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 20 19:08:07 2023 +0100 Change 'no_mail' to a boolean web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8b0409fc1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 20 19:02:31 2023 +0100 Change 'skip' to a boolean web/edit_entry_handler.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) commit 3b6860761 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 20 18:53:58 2023 +0100 Simplify code web/edit_entry.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit 0cd2166c5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 20 18:50:36 2023 +0100 Simplify code web/edit_entry.php | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) commit 1cabc3f06 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 20 18:43:29 2023 +0100 Change 'copy' to a boolean web/edit_entry.php | 12 ++++++------ web/view_entry.php | 17 ++++++++++------- 2 files changed, 16 insertions(+), 13 deletions(-) commit 95c2ab39a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 20 17:52:32 2023 +0100 Format code web/view_entry.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) commit 42409e4c6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 20 17:50:39 2023 +0100 Format code web/view_entry.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) commit 67bb4fef4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 20 17:48:44 2023 +0100 Replace $edit_type (string) with $edit_series (bool) web/edit_entry.php | 16 ++++++++-------- web/edit_entry_handler.php | 6 +++--- web/mrbs_sql.inc | 6 +++--- web/view_entry.php | 16 ++++++++-------- 4 files changed, 22 insertions(+), 22 deletions(-) commit 1411f8a6f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 20 17:23:12 2023 +0100 Simplify the use of edit_type, limiting it to signify whether a series is being edited. web/edit_entry.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) commit 427cb477b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Aug 19 19:00:32 2023 +0100 Make variable names clearer web/mrbs_sql.inc | 66 +++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 33 deletions(-) commit 6e1d073e9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Aug 19 18:37:32 2023 +0100 Add type declaration web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 557f1b365 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Aug 19 18:07:14 2023 +0100 Add type declaration web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 95a177aa0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Aug 19 18:01:40 2023 +0100 Correct typo in comment web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ba0fb78af Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 18 19:05:35 2023 +0100 Fix problem with the end date still being visible when multi-day bookings are not allowed. web/css/mrbs.css.php | 4 ++++ web/edit_entry.php | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) commit a9a6f7835 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 18 18:51:22 2023 +0100 Make the end_date required web/edit_entry.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 86e604fb9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 18 13:36:23 2023 +0100 Make the rep_end_date required for repeats web/js/edit_entry.js.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) commit 43d0bcf03 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 18 12:35:30 2023 +0100 Add comments web/js/datepicker.js.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit c6c089d7c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 18 10:42:02 2023 +0100 Fix bug introduced in last commit web/js/datepicker.js.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) commit c5abe0e33 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 18 10:24:16 2023 +0100 Restrict forcing datepickers to contain a date to those with the required attribute web/js/datepicker.js.php | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) commit fa1efac70 Merge: 860165944 35bff94ee Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 17 10:15:32 2023 +0100 Merge remote-tracking branch 'origin/main' commit 860165944 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 17 10:12:18 2023 +0100 Fix problem with datepickers returning empty strings when Backspace or Delete is pressed web/js/datepicker.js.php | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) commit ed108a4bd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 16 17:37:23 2023 +0100 Fix typo in comment web/js.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 16cd3ea54 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Aug 15 20:11:59 2023 +0100 Fix typo in comment web/lib/MRBS/Locale.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0505d8828 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Aug 15 20:07:23 2023 +0100 Add type declaration web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d7540d223 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Aug 15 19:59:42 2023 +0100 Add type declaration web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d467a3aed Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Aug 15 19:26:59 2023 +0100 Remove redundant global declaration web/functions_view.inc | 1 - 1 file changed, 1 deletion(-) commit de85306c8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Aug 15 19:20:41 2023 +0100 Remove redundant code web/view_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 22f8e6157 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Aug 15 19:03:03 2023 +0100 Fix typo in comment web/view_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 35bff94ee Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Aug 15 10:54:13 2023 +0100 MRBS Docker container now builds the PHP 'intl' extension from source Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit b79430d70 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Aug 15 10:31:40 2023 +0100 MRBS Docker container updated to PHP 8.2 and updated PHP intl package name Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit fa2e16a67 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Aug 15 10:28:46 2023 +0100 MRBS Docker container will now install the PHP intl extension. Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 86396d7e4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 14 10:23:01 2023 +0100 Fix bug introduced in recent commit web/view_entry.php | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) commit 0da4701af Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 13 12:06:50 2023 +0100 Fix bug introduced in recent commit web/mrbs_auth.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d84929fd0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Aug 12 12:21:08 2023 +0100 Replace var with const web/js/datatables.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d24d0532f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Aug 12 12:16:58 2023 +0100 Add "Copy email addresses" button to registrants table web/js/datatables.js.php | 52 ++++++++++++++++++++++++++++++++++++++ web/js/report.js.php | 37 +-------------------------- web/js/view_entry.js.php | 28 ++++++++++++++++++-- web/view_entry.php | 4 +-- 4 files changed, 81 insertions(+), 40 deletions(-) commit 2cd0ca206 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 11 18:38:44 2023 +0100 Add mailto: links to registrants table web/view_entry.php | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) commit c58b282f2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 11 18:22:39 2023 +0100 Eliminate duplicate code web/view_entry.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) commit c25aa5606 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 11 17:45:10 2023 +0100 Disallow viewing of email addresses if the email field in the users table is private web/mrbs_auth.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit b1562c8b9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 11 17:38:06 2023 +0100 Fix typo in comment web/mrbs_auth.inc | 10 ++++++++-- web/systemdefaults.inc.php | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) commit 2b8df81be Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 11 17:31:26 2023 +0100 Add type declaration web/mrbs_auth.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f236a7216 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 11 17:29:15 2023 +0100 Restructure web/functions_view.inc | 6 ++---- web/mrbs_auth.inc | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) commit ac47ac7bd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 11 17:10:53 2023 +0100 Add type declaration web/mrbs_auth.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 10166df26 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 11 16:56:45 2023 +0100 Restrict ability to see email addresses in reports to admins, for privacy reasons web/js/report.js.php | 101 +++++++++++++++++++++-------------------- web/report.php | 11 +++-- 2 files changed, 59 insertions(+), 53 deletions(-) commit f27b75079 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 11 11:13:11 2023 +0100 Provide a default for rep_interval to prevent uncaught exceptions on post requests web/edit_entry_handler.php | 7 +++++++ 1 file changed, 7 insertions(+) commit 25f9d0197 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 10 19:19:17 2023 +0100 Restructure web/js/edit_entry.js.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) commit 4ee74d9d9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 10 19:00:29 2023 +0100 Add a 'required' attribute to the rep_interval field web/js/edit_entry.js.php | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) commit 3fd52a6e8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 10 07:08:31 2023 +0100 Fix type declaration web/lib/MRBS/DateTime.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit be7464982 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 10 07:00:52 2023 +0100 Add type declaration web/lib/MRBS/DateTime.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5f5fd4d68 Merge: 5a1e58548 170bab449 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 9 19:43:45 2023 +0200 Merge pull request #3487 from edmundseow/update-saml-syntax Updated SimpleSAML namespace separator to backslash commit 5a1e58548 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 9 17:24:28 2023 +0100 Fix recently introduced bug causing a fatal error when booking repeats when using PHP 7. See GitHub Issues #3488. web/lib/MRBS/DateTime.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) commit 0cadda465 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 9 13:28:44 2023 +0100 Fix further bug when exporting series (bug introduced in recent merge) web/lib/MRBS/ICalendar/Series.php | 64 ++++++++++++++++++----------- 1 file changed, 40 insertions(+), 24 deletions(-) commit c340d3380 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 9 10:24:46 2023 +0100 Fix bug when exporting series (bug introduced in recent merge) web/lib/MRBS/ICalendar/Series.php | 46 +++++++++++++++-------------- 1 file changed, 24 insertions(+), 22 deletions(-) commit ec86eb924 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 9 10:18:06 2023 +0100 Fix bug in last commit web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6a72e7760 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 9 09:53:20 2023 +0100 Restructure web/functions_ical.inc | 64 +---------------------------------- web/lib/MRBS/RepeatRule.php | 61 +++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 63 deletions(-) commit 170bab449 Author: edmundseow <edmund.seow@ubc.ca> Date: Tue Aug 8 14:21:11 2023 -0700 Updated SimpleSAML namespace separator to backslash web/lib/MRBS/Session/SessionSaml.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit b322634e4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Aug 8 19:50:04 2023 +0100 Fix incorrect RRULE in .ics attachments (bug introduced in recent merge) web/functions_ical.inc | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) commit 06f127d30 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Aug 8 19:16:09 2023 +0100 Fix fatal error when exporting a monthly relative repeat (bug introduced in recent merge) web/lib/MRBS/ICalendar/Series.php | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) commit 2322a03c3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Aug 8 18:50:43 2023 +0100 Fix bug introduced in recent merge causing problems with monthly relative repeats web/edit_entry_handler.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) commit 3c911b841 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 7 19:18:28 2023 +0100 Fix bug in Copy Email Addresses button when there is no anchor web/js/report.js.php | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) commit 6359fe8f1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 7 16:08:57 2023 +0100 Remove obsolete comment web/js/datatables.js.php | 5 ----- 1 file changed, 5 deletions(-) commit 62023c05e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 7 16:00:23 2023 +0100 Fix fatal error when there are conflicts (introduced in a recent merge). web/edit_entry_handler.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit f9f0897a8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 7 13:05:18 2023 +0100 Upgrade to latest version of DataTables web/css/mrbs.css.php | 11 +- .../css/buttons.bootstrap.css (gone) | 189 - .../css/buttons.bootstrap.min.css (gone) | 1 - .../css/buttons.bootstrap4.css (gone) | 195 - .../css/buttons.bootstrap4.min.css (gone) | 1 - .../css/buttons.bootstrap5.css (gone) | 195 - .../css/buttons.bootstrap5.min.css (gone) | 1 - .../css/buttons.bulma.css (gone) | 195 - .../css/buttons.bulma.min.css (gone) | 1 - .../css/buttons.dataTables.css (gone) | 383 - .../css/buttons.dataTables.min.css (gone) | 1 - .../css/buttons.foundation.css (gone) | 214 - .../css/buttons.foundation.min.css (gone) | 1 - .../css/buttons.jqueryui.css (gone) | 240 - .../css/buttons.jqueryui.min.css (gone) | 1 - .../css/buttons.semanticui.css (gone) | 192 - .../css/buttons.semanticui.min.css (gone) | 1 - .../Buttons-1.7.1/css/common.scss (gone) | 37 - .../js/buttons.bootstrap.js (gone) | 70 - .../js/buttons.bootstrap.min.js (gone) | 6 - .../js/buttons.bootstrap4.js (gone) | 68 - .../js/buttons.bootstrap4.min.js (gone) | 6 - .../js/buttons.bootstrap5.js (gone) | 68 - .../js/buttons.bootstrap5.min.js (gone) | 6 - .../Buttons-1.7.1/js/buttons.bulma.js (gone) | 79 - .../js/buttons.bulma.min.js (gone) | 6 - .../js/buttons.colVis.js (gone) | 212 - .../js/buttons.colVis.min.js (gone) | 10 - .../js/buttons.dataTables.js (gone) | 38 - .../js/buttons.dataTables.min.js (gone) | 5 - .../js/buttons.foundation.js (gone) | 99 - .../js/buttons.foundation.min.js (gone) | 7 - .../Buttons-1.7.1/js/buttons.html5.js (gone) | 1463 - .../js/buttons.html5.min.js (gone) | 36 - .../js/buttons.jqueryui.js (gone) | 62 - .../js/buttons.jqueryui.min.js (gone) | 6 - .../Buttons-1.7.1/js/buttons.print.js (gone) | 221 - .../js/buttons.print.min.js (gone) | 9 - .../js/buttons.semanticui.js (gone) | 69 - .../js/buttons.semanticui.min.js (gone) | 6 - .../js/dataTables.buttons.js (gone) | 2127 - .../js/dataTables.buttons.min.js (gone) | 43 - .../css/buttons.bootstrap.css (new) | 275 + .../css/buttons.bootstrap.min.css (new) | 1 + .../css/buttons.bootstrap4.css (new) | 258 + .../css/buttons.bootstrap4.min.css (new) | 1 + .../css/buttons.bootstrap5.css (new) | 258 + .../css/buttons.bootstrap5.min.css (new) | 1 + .../css/buttons.bulma.css (new) | 453 + .../css/buttons.bulma.min.css (new) | 1 + .../css/buttons.dataTables.css (new) | 564 + .../css/buttons.dataTables.min.css (new) | 1 + .../css/buttons.foundation.css (new) | 337 + .../css/buttons.foundation.min.css (new) | 1 + .../css/buttons.jqueryui.css (new) | 405 + .../css/buttons.jqueryui.min.css (new) | 1 + .../css/buttons.semanticui.css (new) | 467 + .../css/buttons.semanticui.min.css (new) | 1 + .../Buttons-2.4.1/css/common.scss (new) | 159 + .../css/mixins.scss | 122 +- .../js/buttons.bootstrap.js (new) | 118 + .../js/buttons.bootstrap.min.js (new) | 4 + .../js/buttons.bootstrap4.js (new) | 117 + .../js/buttons.bootstrap4.min.js (new) | 4 + .../js/buttons.bootstrap5.js (new) | 117 + .../js/buttons.bootstrap5.min.js (new) | 4 + .../Buttons-2.4.1/js/buttons.bulma.js (new) | 131 + .../js/buttons.bulma.min.js (new) | 4 + .../Buttons-2.4.1/js/buttons.colVis.js (new) | 260 + .../js/buttons.colVis.min.js (new) | 5 + .../js/buttons.dataTables.js (new) | 58 + .../js/buttons.dataTables.min.js (new) | 4 + .../js/buttons.foundation.js (new) | 122 + .../js/buttons.foundation.min.js (new) | 4 + .../Buttons-2.4.1/js/buttons.html5.js (new) | 1541 + .../js/buttons.html5.min.js (new) | 8 + .../js/buttons.jqueryui.js (new) | 98 + .../js/buttons.jqueryui.min.js (new) | 4 + .../Buttons-2.4.1/js/buttons.print.js (new) | 242 + .../js/buttons.print.min.js (new) | 5 + .../js/buttons.semanticui.js (new) | 135 + .../js/buttons.semanticui.min.js (new) | 4 + .../js/dataTables.buttons.js (new) | 2575 + .../js/dataTables.buttons.min.js (new) | 4 + .../css/colReorder.bootstrap.min.css (gone) | 1 - .../css/colReorder.bootstrap4.min.css (gone) | 1 - .../css/colReorder.bootstrap5.min.css (gone) | 1 - .../css/colReorder.bulma.min.css (gone) | 1 - .../css/colReorder.dataTables.min.css (gone) | 1 - .../css/colReorder.foundation.min.css (gone) | 1 - .../css/colReorder.jqueryui.min.css (gone) | 1 - .../css/colReorder.semanticui.min.css (gone) | 1 - .../js/colReorder.bootstrap.js (gone) | 38 - .../js/colReorder.bootstrap.min.js (gone) | 5 - .../js/colReorder.bootstrap4.js (gone) | 38 - .../js/colReorder.bootstrap4.min.js (gone) | 5 - .../js/colReorder.bootstrap5.js (gone) | 38 - .../js/colReorder.bootstrap5.min.js (gone) | 5 - .../js/colReorder.bulma.js (gone) | 38 - .../js/colReorder.bulma.min.js (gone) | 5 - .../js/colReorder.dataTables.js (gone) | 38 - .../js/colReorder.dataTables.min.js (gone) | 5 - .../js/colReorder.foundation.js (gone) | 38 - .../js/colReorder.foundation.min.js (gone) | 5 - .../js/colReorder.jqueryui.js (gone) | 38 - .../js/colReorder.jqueryui.min.js (gone) | 5 - .../js/colReorder.semanticui.js (gone) | 38 - .../js/colReorder.semanticui.min.js (gone) | 5 - .../js/dataTables.colReorder.min.js (gone) | 40 - .../css/colReorder.bootstrap.css | 8 + .../css/colReorder.bootstrap.min.css (new) | 1 + .../css/colReorder.bootstrap4.css | 8 + .../css/colReorder.bootstrap4.min.css (new) | 1 + .../css/colReorder.bootstrap5.css | 8 + .../css/colReorder.bootstrap5.min.css (new) | 1 + .../css/colReorder.bulma.css | 8 + .../css/colReorder.bulma.min.css (new) | 1 + .../css/colReorder.dataTables.css | 8 + .../css/colReorder.dataTables.min.css (new) | 1 + .../css/colReorder.foundation.css | 8 + .../css/colReorder.foundation.min.css (new) | 1 + .../css/colReorder.jqueryui.css | 8 + .../css/colReorder.jqueryui.min.css (new) | 1 + .../css/colReorder.semanticui.css | 8 + .../css/colReorder.semanticui.min.css (new) | 1 + .../js/colReorder.bootstrap.js (new) | 58 + .../js/colReorder.bootstrap.min.js (new) | 4 + .../js/colReorder.bootstrap4.js (new) | 58 + .../js/colReorder.bootstrap4.min.js (new) | 4 + .../js/colReorder.bootstrap5.js (new) | 58 + .../js/colReorder.bootstrap5.min.js (new) | 4 + .../js/colReorder.bulma.js (new) | 58 + .../js/colReorder.bulma.min.js (new) | 4 + .../js/colReorder.dataTables.js (new) | 58 + .../js/colReorder.dataTables.min.js (new) | 4 + .../js/colReorder.foundation.js (new) | 58 + .../js/colReorder.foundation.min.js (new) | 4 + .../js/colReorder.jqueryui.js (new) | 58 + .../js/colReorder.jqueryui.min.js (new) | 4 + .../js/colReorder.semanticui.js (new) | 58 + .../js/colReorder.semanticui.min.js (new) | 4 + .../js/dataTables.colReorder.js | 105 +- .../js/dataTables.colReorder.min.js (new) | 4 + .../css/dataTables.bootstrap.css (gone) | 193 - .../css/dataTables.bootstrap.min.css (gone) | 1 - .../css/dataTables.bootstrap4.css (gone) | 210 - .../css/dataTables.bootstrap4.min.css (gone) | 1 - .../css/dataTables.bootstrap5.css (gone) | 224 - .../css/dataTables.bootstrap5.min.css (gone) | 5 - .../css/dataTables.bulma.css (gone) | 155 - .../css/dataTables.bulma.min.css (gone) | 3 - .../css/dataTables.dataTables.css (gone) | 470 - .../css/dataTables.dataTables.min.css (gone) | 1 - .../css/dataTables.foundation.css (gone) | 118 - .../css/dataTables.foundation.min.css (gone) | 1 - .../css/dataTables.jqueryui.css (gone) | 492 - .../css/dataTables.jqueryui.min.css (gone) | 1 - .../css/dataTables.semanticui.css (gone) | 103 - .../css/dataTables.semanticui.min.css (gone) | 1 - .../css/jquery.dataTables.css (gone) | 459 - .../css/jquery.dataTables.min.css (gone) | 1 - .../js/dataTables.bootstrap.min.js (gone) | 14 - .../js/dataTables.bootstrap4.min.js (gone) | 14 - .../js/dataTables.bootstrap5.min.js (gone) | 14 - .../js/dataTables.bulma.min.js (gone) | 15 - .../js/dataTables.dataTables.js (gone) | 37 - .../js/dataTables.dataTables.min.js (gone) | 5 - .../js/dataTables.foundation.min.js (gone) | 9 - .../js/dataTables.jqueryui.js (gone) | 166 - .../js/dataTables.jqueryui.min.js (gone) | 15 - .../js/dataTables.semanticui.min.js (gone) | 15 - .../js/jquery.dataTables.min.js (gone) | 184 - .../css/dataTables.bootstrap.css (new) | 417 + .../css/dataTables.bootstrap.min.css (new) | 1 + .../css/dataTables.bootstrap4.css (new) | 424 + .../css/dataTables.bootstrap4.min.css (new) | 1 + .../css/dataTables.bootstrap5.css (new) | 437 + .../css/dataTables.bootstrap5.min.css (new) | 5 + .../css/dataTables.bulma.css (new) | 380 + .../css/dataTables.bulma.min.css (new) | 3 + .../css/dataTables.dataTables.css (new) | 0 .../css/dataTables.dataTables.min.css (new) | 0 .../css/dataTables.foundation.css (new) | 358 + .../css/dataTables.foundation.min.css (new) | 1 + .../css/dataTables.jqueryui.css (new) | 741 + .../css/dataTables.jqueryui.min.css (new) | 1 + .../css/dataTables.semanticui.css (new) | 349 + .../css/dataTables.semanticui.min.css (new) | 1 + .../css/jquery.dataTables.css (new) | 658 + .../css/jquery.dataTables.min.css (new) | 1 + .../images/sort_asc.png | Bin .../images/sort_asc_disabled.png} | Bin .../images/sort_both.png | Bin .../images/sort_desc.png | Bin .../images/sort_desc_disabled.png} | Bin .../js/dataTables.bootstrap.js | 68 +- .../js/dataTables.bootstrap.min.js (new) | 4 + .../js/dataTables.bootstrap4.js | 68 +- .../js/dataTables.bootstrap4.min.js (new) | 4 + .../js/dataTables.bootstrap5.js | 86 +- .../js/dataTables.bootstrap5.min.js (new) | 4 + .../js/dataTables.bulma.js | 61 +- .../js/dataTables.bulma.min.js (new) | 4 + .../js/dataTables.dataTables.js (new) | 55 + .../js/dataTables.dataTables.min.js (new) | 4 + .../js/dataTables.foundation.js | 66 +- .../js/dataTables.foundation.min.js (new) | 4 + .../js/dataTables.jqueryui.js (new) | 95 + .../js/dataTables.jqueryui.min.js (new) | 4 + .../js/dataTables.semanticui.js | 72 +- .../js/dataTables.semanticui.min.js (new) | 4 + .../js/jquery.dataTables.js | 1628 +- .../js/jquery.dataTables.min.js (new) | 4 + .../css/fixedColumns.bootstrap.css (gone) | 60 - .../fixedColumns.bootstrap.min.css (gone) | 1 - .../css/fixedColumns.bootstrap4.css (gone) | 64 - .../fixedColumns.bootstrap4.min.css (gone) | 1 - .../css/fixedColumns.bootstrap5.css (gone) | 73 - .../fixedColumns.bootstrap5.min.css (gone) | 1 - .../css/fixedColumns.bulma.css (gone) | 32 - .../css/fixedColumns.bulma.min.css (gone) | 1 - .../css/fixedColumns.dataTables.css (gone) | 22 - .../fixedColumns.dataTables.min.css (gone) | 1 - .../css/fixedColumns.foundation.css (gone) | 32 - .../fixedColumns.foundation.min.css (gone) | 1 - .../css/fixedColumns.jqueryui.css (gone) | 12 - .../css/fixedColumns.jqueryui.min.css (gone) | 1 - .../css/fixedColumns.semanticui.css (gone) | 40 - .../fixedColumns.semanticui.min.css (gone) | 1 - .../js/dataTables.fixedColumns.js (gone) | 1688 - .../js/dataTables.fixedColumns.min.js (gone) | 46 - .../js/fixedColumns.bootstrap.js (gone) | 38 - .../js/fixedColumns.bootstrap.min.js (gone) | 5 - .../js/fixedColumns.bootstrap4.js (gone) | 38 - .../js/fixedColumns.bootstrap4.min.js (gone) | 5 - .../js/fixedColumns.bootstrap5.js (gone) | 38 - .../js/fixedColumns.bootstrap5.min.js (gone) | 5 - .../js/fixedColumns.bulma.js (gone) | 38 - .../js/fixedColumns.bulma.min.js (gone) | 5 - .../js/fixedColumns.dataTables.js (gone) | 38 - .../js/fixedColumns.dataTables.min.js (gone) | 5 - .../js/fixedColumns.foundation.js (gone) | 38 - .../js/fixedColumns.foundation.min.js (gone) | 5 - .../js/fixedColumns.jqueryui.js (gone) | 38 - .../js/fixedColumns.jqueryui.min.js (gone) | 5 - .../js/fixedColumns.semanticui.js (gone) | 38 - .../js/fixedColumns.semanticui.min.js (gone) | 5 - .../css/fixedColumns.bootstrap.css (new) | 57 + .../css/fixedColumns.bootstrap.min.css (new) | 1 + .../css/fixedColumns.bootstrap4.css (new) | 57 + .../fixedColumns.bootstrap4.min.css (new) | 1 + .../css/fixedColumns.bootstrap5.css (new) | 79 + .../fixedColumns.bootstrap5.min.css (new) | 1 + .../css/fixedColumns.bulma.css (new) | 50 + .../css/fixedColumns.bulma.min.css (new) | 1 + .../css/fixedColumns.dataTables.css (new) | 34 + .../fixedColumns.dataTables.min.css (new) | 1 + .../css/fixedColumns.foundation.css (new) | 38 + .../fixedColumns.foundation.min.css (new) | 1 + .../css/fixedColumns.jqueryui.css (new) | 52 + .../css/fixedColumns.jqueryui.min.css (new) | 1 + .../css/fixedColumns.semanticui.css (new) | 61 + .../fixedColumns.semanticui.min.css (new) | 1 + .../js/dataTables.fixedColumns.js (new) | 618 + .../js/dataTables.fixedColumns.min.js (new) | 4 + .../js/fixedColumns.bootstrap.js (new) | 58 + .../js/fixedColumns.bootstrap.min.js (new) | 4 + .../js/fixedColumns.bootstrap4.js (new) | 58 + .../js/fixedColumns.bootstrap4.min.js (new) | 4 + .../js/fixedColumns.bootstrap5.js (new) | 58 + .../js/fixedColumns.bootstrap5.min.js (new) | 4 + .../js/fixedColumns.bulma.js (new) | 58 + .../js/fixedColumns.bulma.min.js (new) | 4 + .../js/fixedColumns.dataTables.js (new) | 58 + .../js/fixedColumns.dataTables.min.js (new) | 4 + .../js/fixedColumns.foundation.js (new) | 58 + .../js/fixedColumns.foundation.min.js (new) | 4 + .../js/fixedColumns.jqueryui.js (new) | 58 + .../js/fixedColumns.jqueryui.min.js (new) | 4 + .../js/fixedColumns.semanticui.js (new) | 58 + .../js/fixedColumns.semanticui.min.js (new) | 4 + .../JSZip-2.5.0/jszip.min.js (gone) | 14 - .../{JSZip-2.5.0 => JSZip-3.10.1}/jszip.js | 6082 +- .../JSZip-3.10.1/jszip.min.js (new) | 13 + web/jquery/datatables/datatables.css | 1258 +- web/jquery/datatables/datatables.js | 151913 ++++++++------ web/jquery/datatables/datatables.min.css | 12 +- web/jquery/datatables/datatables.min.js | 453 +- .../language/Afrikaans.lang (gone) | 30 - .../datatables/language/Albanian.lang (gone) | 30 - .../datatables/language/Amharic.lang (gone) | 30 - .../datatables/language/Arabic.lang (gone) | 51 - .../datatables/language/Armenian.lang (gone) | 30 - .../language/Azerbaijan.lang (gone) | 30 - .../datatables/language/Bangla.lang (gone) | 23 - .../datatables/language/Basque.lang (gone) | 30 - .../language/Belarusian.lang (gone) | 26 - .../language/Bulgarian.lang (gone) | 23 - .../datatables/language/Catalan.lang (gone) | 51 - .../language/Chinese-traditional.lang (gone) | 29 - .../datatables/language/Chinese.lang (gone) | 30 - .../datatables/language/Croatian.lang (gone) | 30 - .../datatables/language/Czech.lang (gone) | 30 - .../datatables/language/Danish.lang (gone) | 23 - .../datatables/language/Dutch.lang (gone) | 30 - .../datatables/language/English.lang (gone) | 145 - .../language/Esperanto.lang (gone) | 30 - .../datatables/language/Estonian.lang (gone) | 23 - .../datatables/language/Filipino.lang (gone) | 23 - .../datatables/language/Finnish.lang (gone) | 48 - .../datatables/language/French.lang (gone) | 37 - .../datatables/language/Galician.lang (gone) | 31 - .../datatables/language/Ganda.json (new) | 12 + .../datatables/language/Georgian.lang (gone) | 30 - .../datatables/language/German.lang (gone) | 53 - .../datatables/language/Greek.lang (gone) | 34 - .../datatables/language/Gujarati.lang (gone) | 31 - .../datatables/language/Hebrew.lang (gone) | 24 - .../datatables/language/Hindi.lang (gone) | 23 - .../language/Hungarian.lang (gone) | 46 - .../language/Icelandic.lang (gone) | 30 - .../Indonesian-Alternative.lang (gone) | 23 - .../language/Indonesian.lang (gone) | 91 - .../datatables/language/Irish.lang (gone) | 23 - .../datatables/language/Italian.lang (gone) | 30 - .../datatables/language/Japanese.lang (gone) | 30 - .../datatables/language/Kannada.lang (gone) | 30 - .../datatables/language/Kazakh.lang (gone) | 28 - .../datatables/language/Khmer.lang (gone) | 30 - .../datatables/language/Korean.lang (gone) | 30 - .../datatables/language/Kurdish.lang (gone) | 29 - .../datatables/language/Kyrgyz.lang (gone) | 29 - .../datatables/language/Lao.lang (gone) | 29 - .../datatables/language/Latvian.lang (gone) | 28 - .../language/Lithuanian.lang (gone) | 29 - .../language/Macedonian.lang (gone) | 25 - .../datatables/language/Malay.lang (gone) | 30 - .../language/Mongolian.lang (gone) | 30 - .../datatables/language/Nepali.lang (gone) | 30 - .../language/Norwegian-Bokmal.lang (gone) | 32 - .../language/Norwegian-Nynorsk.lang (gone) | 32 - .../datatables/language/Pashto.lang (gone) | 30 - .../datatables/language/Persian.lang (gone) | 31 - .../datatables/language/Polish.lang (gone) | 30 - .../language/Portuguese-Brasil.lang (gone) | 45 - .../language/Portuguese.lang (gone) | 29 - .../datatables/language/Punjabi.lang (gone) | 30 - .../datatables/language/Romanian.lang (gone) | 23 - .../language/Rumantsch.lang (gone) | 53 - .../datatables/language/Russian.lang (gone) | 37 - .../datatables/language/Serbian.lang (gone) | 30 - .../language/Serbian_latin.lang (gone) | 30 - .../datatables/language/Sinhala.lang (gone) | 30 - .../datatables/language/Slovak.lang (gone) | 30 - .../language/Slovenian.lang (gone) | 30 - .../datatables/language/Spanish.lang (gone) | 34 - .../datatables/language/Swahili.lang (gone) | 30 - .../datatables/language/Swedish.lang (gone) | 30 - .../datatables/language/Tajik.lang (gone) | 36 - .../datatables/language/Tamil.lang (gone) | 30 - .../datatables/language/Thai.lang (gone) | 30 - .../datatables/language/Turkish.lang (gone) | 37 - .../language/Ukrainian.lang (gone) | 27 - .../datatables/language/Urdu.lang (gone) | 23 - .../datatables/language/Uzbek.lang (gone) | 29 - .../language/Vietnamese.lang (gone) | 23 - .../datatables/language/Welsh.lang (gone) | 30 - web/jquery/datatables/language/af.json (new) | 64 + web/jquery/datatables/language/am.json (new) | 22 + web/jquery/datatables/language/ar.json (new) | 247 + .../datatables/language/az-AZ.json (new) | 181 + web/jquery/datatables/language/be.json (new) | 19 + web/jquery/datatables/language/bg.json (new) | 176 + web/jquery/datatables/language/bn.json (new) | 236 + .../datatables/language/bs-BA.json (new) | 74 + web/jquery/datatables/language/ca.json (new) | 244 + web/jquery/datatables/language/co.json (new) | 28 + web/jquery/datatables/language/cs.json (new) | 247 + web/jquery/datatables/language/cy.json (new) | 22 + web/jquery/datatables/language/da.json (new) | 211 + .../datatables/language/de-DE.json (new) | 243 + web/jquery/datatables/language/el.json (new) | 201 + .../datatables/language/en-GB.json (new) | 243 + web/jquery/datatables/language/eo.json (new) | 22 + .../datatables/language/es-AR.json (new) | 162 + .../datatables/language/es-CL.json (new) | 202 + .../datatables/language/es-CO.json (new) | 248 + .../datatables/language/es-ES.json (new) | 242 + .../datatables/language/es-MX.json (new) | 244 + web/jquery/datatables/language/et.json (new) | 159 + web/jquery/datatables/language/eu.json (new) | 211 + web/jquery/datatables/language/fa.json (new) | 245 + web/jquery/datatables/language/fi.json (new) | 94 + .../datatables/language/fil.json (new) | 15 + .../datatables/language/fr-FR.json (new) | 245 + web/jquery/datatables/language/ga.json (new) | 15 + web/jquery/datatables/language/gl.json (new) | 41 + web/jquery/datatables/language/gu.json (new) | 22 + web/jquery/datatables/language/he.json (new) | 248 + web/jquery/datatables/language/hi.json (new) | 71 + web/jquery/datatables/language/hr.json (new) | 179 + web/jquery/datatables/language/hu.json (new) | 230 + web/jquery/datatables/language/hy.json (new) | 22 + .../datatables/language/id-ALT.json (new) | 120 + web/jquery/datatables/language/id.json (new) | 227 + web/jquery/datatables/language/is.json (new) | 82 + .../datatables/language/it-IT.json (new) | 244 + web/jquery/datatables/language/ja.json (new) | 78 + web/jquery/datatables/language/jv.json (new) | 57 + web/jquery/datatables/language/ka.json (new) | 187 + web/jquery/datatables/language/kk.json (new) | 32 + web/jquery/datatables/language/km.json (new) | 248 + web/jquery/datatables/language/kn.json (new) | 22 + web/jquery/datatables/language/ko.json (new) | 66 + web/jquery/datatables/language/ku.json (new) | 78 + web/jquery/datatables/language/ky.json (new) | 22 + web/jquery/datatables/language/lo.json (new) | 22 + web/jquery/datatables/language/lt.json (new) | 245 + web/jquery/datatables/language/lv.json (new) | 117 + web/jquery/datatables/language/mk.json (new) | 36 + web/jquery/datatables/language/mn.json (new) | 22 + web/jquery/datatables/language/mr.json (new) | 13 + web/jquery/datatables/language/ms.json (new) | 52 + web/jquery/datatables/language/ne.json (new) | 22 + .../datatables/language/nl-NL.json (new) | 246 + .../datatables/language/no-NB.json (new) | 216 + .../datatables/language/no-NO.json (new) | 22 + web/jquery/datatables/language/pa.json (new) | 39 + web/jquery/datatables/language/pl.json (new) | 240 + web/jquery/datatables/language/ps.json (new) | 22 + .../datatables/language/pt-BR.json (new) | 245 + .../datatables/language/pt-PT.json (new) | 244 + web/jquery/datatables/language/rm.json (new) | 43 + web/jquery/datatables/language/ro.json (new) | 146 + web/jquery/datatables/language/ru.json (new) | 247 + web/jquery/datatables/language/si.json (new) | 22 + web/jquery/datatables/language/sk.json (new) | 202 + web/jquery/datatables/language/sl.json (new) | 180 + .../datatables/language/snd.json (new) | 30 + web/jquery/datatables/language/sq.json (new) | 239 + .../datatables/language/sr-SP.json (new) | 238 + web/jquery/datatables/language/sr.json (new) | 115 + .../datatables/language/sv-SE.json (new) | 199 + web/jquery/datatables/language/sw.json (new) | 119 + web/jquery/datatables/language/ta.json (new) | 63 + web/jquery/datatables/language/te.json (new) | 28 + .../datatables/language/telugu.lang (gone) | 29 - web/jquery/datatables/language/tg.json (new) | 27 + web/jquery/datatables/language/th.json (new) | 130 + web/jquery/datatables/language/tk.json (new) | 42 + web/jquery/datatables/language/tr.json (new) | 244 + web/jquery/datatables/language/ug.json (new) | 12 + web/jquery/datatables/language/uk.json (new) | 186 + web/jquery/datatables/language/ur.json (new) | 49 + .../datatables/language/uz-CR.json (new) | 155 + web/jquery/datatables/language/uz.json (new) | 21 + web/jquery/datatables/language/vi.json (new) | 240 + .../datatables/language/zh-HANT.json (new) | 239 + web/jquery/datatables/language/zh.json (new) | 244 + .../pdfmake-0.1.36/pdfmake.js (gone) | 50468 ----- .../pdfmake-0.1.36/pdfmake.min.js (gone) | 3 - .../pdfmake-0.1.36/vfs_fonts.js (gone) | 6 - .../pdfmake-0.2.7/pdfmake.js (new) | 73862 +++++++ .../pdfmake-0.2.7/pdfmake.min.js (new) | 3 + .../pdfmake-0.2.7/vfs_fonts.js (new) | 6 + web/js/datatables.js.php | 32 +- web/language.inc | 90 +- 467 files changed, 196253 insertions(+), 132132 deletions(-) commit 5a443eb5e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 6 17:14:30 2023 +0100 Remove surplus whitespace web/lib/MRBS/ICalendar/RFC5545Exception.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e51b5671e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 6 17:13:46 2023 +0100 Improve error message web/functions_ical.inc | 6 ++---- web/lang/lang.en | 1 + web/lib/MRBS/ICalendar/RFC5545.php | 7 ++++++- web/lib/MRBS/ICalendar/RFC5545Exception.php (new) | 8 ++++++++ 4 files changed, 17 insertions(+), 5 deletions(-) commit 09df5b986 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 6 16:26:20 2023 +0100 Add error handling web/functions_ical.inc | 114 +++++++++++++++++++++------------------ 1 file changed, 62 insertions(+), 52 deletions(-) commit 3992d9f01 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 6 15:16:51 2023 +0100 Fix bug when importing MONTHLY events and an integer modifier for BYDAY is not present web/functions_ical.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit ac5a6b4ea Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 6 14:50:57 2023 +0100 Restructure web/functions_ical.inc | 6 ++---- web/lib/MRBS/RepeatRule.php | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) commit 5518689ca Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 6 10:32:49 2023 +0100 Fix problem with importing weekly repeats when BYDAY is not specified. See also GitHub Issues #3485. web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b9d72ddc7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Aug 6 10:12:46 2023 +0100 Fix problem with importing weekly repeats. See GitHub Issues #3485. web/functions_ical.inc | 1 + 1 file changed, 1 insertion(+) commit 4a97d513a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Aug 5 14:13:02 2023 +0100 Upgrade to jQuery Version 3.7.0 web/jquery/jquery-3.6.3.min.js (gone) | 2 - .../{jquery-3.6.3.js => jquery-3.7.0.js} | 1915 +++++++--------- web/jquery/jquery-3.7.0.min.js (new) | 2 + web/js.inc | 2 +- 4 files changed, 816 insertions(+), 1105 deletions(-) commit 7cc0d94d1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 4 15:45:11 2023 +0100 Make the instructions for multisite clearer. See GitHub Issues #3483. INSTALL | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 6183888a0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 4 11:36:04 2023 +0100 Simplify code web/js/report.js.php | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) commit afd394a2e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 4 11:12:55 2023 +0100 Add success and failure messages web/js/report.js.php | 18 ++++++++++++++++-- web/lang/lang.en | 2 ++ 2 files changed, 18 insertions(+), 2 deletions(-) commit 860050323 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 4 10:38:31 2023 +0100 Add button to copy email addresses to the clipboard. Useful for sending messages to those booked on a certain day or in a certain room. web/js/report.js.php | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) commit 59030a234 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 3 17:06:36 2023 +0100 Add an id to report column headers for use by JavaScript web/report.php | 51 +++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 24 deletions(-) commit 4e0b94253 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 3 14:48:52 2023 +0100 Add mailto: link to booking creator web/report.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) commit ff1a7da6d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 2 17:47:42 2023 +0100 Fix bug introduced in recent merge web/edit_entry.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit d6e2f70fb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 2 17:30:48 2023 +0100 Fix incorrect minimum version for MariaDB. See GitHub Issues #3481. web/lib/MRBS/DB_mysql.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit a687bd032 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Aug 1 15:20:51 2023 +0100 Remove redundant code web/functions_ical.inc | 14 -------------- 1 file changed, 14 deletions(-) commit f68e4eeea Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Aug 1 15:14:12 2023 +0100 Remove redundant code web/edit_entry_handler.php | 7 ------- 1 file changed, 7 deletions(-) commit 194a8c924 Merge: 3e202fe51 b3623473a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Aug 1 16:04:19 2023 +0200 Merge pull request #3479 from meeting-room-booking-system/repeat_class Repeat class commit b3623473a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 31 18:29:39 2023 +0100 Remove redundant constants web/internalconfig.inc.php | 14 -------------- 1 file changed, 14 deletions(-) commit 1c67775e2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 31 18:26:05 2023 +0100 Convert to RepeatRule constants web/functions_ical.inc | 15 ++++++++------- web/import.php | 13 ++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) commit f01646c85 Merge: 19e9543d2 444bed272 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 31 18:02:07 2023 +0100 Merge branch 'main' into repeat_class commit 444bed272 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 31 18:01:38 2023 +0100 Fix bug in error message web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 19e9543d2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 31 17:53:42 2023 +0100 Interim commit web/functions_ical.inc | 34 +++++++++++++++++++--------------- web/import.php | 4 ++-- 2 files changed, 21 insertions(+), 17 deletions(-) commit e03d99a41 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 31 17:20:06 2023 +0100 Convert to RepeatRule constants web/functions_ical.inc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) commit f147155ec Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 31 17:12:51 2023 +0100 Convert to RepeatRule constants web/js/resizable.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ffbb1dd3d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 31 17:01:55 2023 +0100 Remove redundant require statements web/upgrade/32/post.inc | 1 - web/upgrade/34/post.inc | 1 - 2 files changed, 2 deletions(-) commit c0fa8bf52 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 18:55:03 2023 +0100 Fix bug causing repeat days not to appear in mail language web/functions.inc | 4 ++-- web/functions_mail.inc | 4 ++-- web/lib/MRBS/RepeatRule.php | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) commit 6d6c3c5d0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 18:38:24 2023 +0100 Fix bug web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit dbc5b16e6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 18:35:07 2023 +0100 Restructure web/functions.inc | 23 ----------------------- web/functions_mail.inc | 2 +- web/functions_view.inc | 2 +- 3 files changed, 2 insertions(+), 25 deletions(-) commit 64d20687d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 18:28:20 2023 +0100 Convert to RepeatRule constants web/functions_view.inc | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) commit 605677756 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 18:22:39 2023 +0100 Convert to RepeatRule constants web/upgrade/32/post.inc | 9 +++++---- web/upgrade/34/post.inc | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) commit 1bb336f04 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 18:16:02 2023 +0100 Convert to RepeatRule constants web/js/edit_entry.js.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) commit ee5f60870 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 18:09:56 2023 +0100 Convert to RepeatRule constants web/edit_entry_handler.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 1ae17fe49 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 18:06:55 2023 +0100 Convert to RepeatRule constants web/del_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit dc3a6f696 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 17:55:04 2023 +0100 Fix bug web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 39e1514f1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 17:29:29 2023 +0100 Convert to RepeatRule constants web/edit_entry.php | 2 +- web/functions.inc | 46 -------------------------------- web/functions_mail.inc | 6 ++--- web/functions_view.inc | 2 +- web/lib/MRBS/RepeatRule.php | 50 +++++++++++++++++++++++++++++++++++ 5 files changed, 54 insertions(+), 52 deletions(-) commit 93bae704f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 16:56:03 2023 +0100 Convert to RepeatRule constants web/edit_entry.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) commit 90006b100 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 16:28:48 2023 +0100 Restructure web/edit_entry.php | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) commit 4180c8a6b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 16:25:13 2023 +0100 Fix bug web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5b807e243 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 16:14:03 2023 +0100 Restructure web/edit_entry.php | 87 +++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 42 deletions(-) commit c42c37eac Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 15:00:20 2023 +0100 Remove redundant code web/mrbs_sql.inc | 137 --------------------------------------------- 1 file changed, 137 deletions(-) commit 8d30351e9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 14:48:52 2023 +0100 Remove debug code web/lib/MRBS/ICalendar/Series.php | 44 ++++++++++++++--------------- 1 file changed, 22 insertions(+), 22 deletions(-) commit 378999cb2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 14:26:40 2023 +0100 Restructure web/edit_entry.php | 2 +- web/functions.inc | 18 ++---------------- 2 files changed, 3 insertions(+), 17 deletions(-) commit ea8ca06ce Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 14:10:45 2023 +0100 Fix bug web/lib/MRBS/DateTime.php | 2 +- web/lib/MRBS/ICalendar/RFC5545.php | 15 +++++++ web/mrbs_sql.inc | 60 +++++++++++++++------------- 3 files changed, 48 insertions(+), 29 deletions(-) commit e6db8f67e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 12:20:21 2023 +0100 Interim commit web/functions_mail.inc | 15 ++++++++------- web/lib/MRBS/RepeatRule.php | 22 ++++++++++++++++++++++ web/mrbs_sql.inc | 5 +++-- 3 files changed, 33 insertions(+), 9 deletions(-) commit 920eb91de Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 11:44:04 2023 +0100 Fix bugs web/functions_mail.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 41958c64a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 11:16:13 2023 +0100 Remove temporary code web/functions_mail.inc | 2 -- 1 file changed, 2 deletions(-) commit 7eda439c5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 11:12:07 2023 +0100 Remove temporary code web/functions_mail.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit fa5b4edae Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 11:03:21 2023 +0100 Fix bug web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e1ad43fcc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 10:24:33 2023 +0100 Fix bug web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d318ea2e7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 30 10:06:53 2023 +0100 Fix bug web/functions_mail.inc | 7 +++++-- web/lib/MRBS/RepeatRule.php | 18 ++++++++++++++++++ web/mrbs_sql.inc | 32 ++++++++++++++++++++++++++------ 3 files changed, 49 insertions(+), 8 deletions(-) commit 6dc66ecd7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 29 17:44:06 2023 +0100 Got emails working web/functions.inc | 14 +++++++++++++ web/functions_ical.inc | 3 +++ web/functions_mail.inc | 39 +++++++++++++++-------------------- web/lib/MRBS/RepeatRule.php | 21 +++++++++++++++++++ 4 files changed, 55 insertions(+), 22 deletions(-) commit 816932d40 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 29 15:14:22 2023 +0100 Interim commit web/edit_entry_handler.php | 17 +----- web/lib/MRBS/RepeatRule.php | 19 +++++- web/mrbs_sql.inc | 112 ++++++++++++++++------------------ 3 files changed, 70 insertions(+), 78 deletions(-) commit 627a103bb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 29 09:35:48 2023 +0100 Remove redundant code web/edit_entry_handler.php | 16 ---------------- 1 file changed, 16 deletions(-) commit af64c0a54 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 29 09:31:30 2023 +0100 Switch to using new method web/edit_entry_handler.php | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) commit 1ce17fc86 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 29 09:22:28 2023 +0100 Fix bug web/lib/MRBS/RepeatRule.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f51d8cb9c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 29 07:46:46 2023 +0100 Simplify code web/lib/MRBS/RepeatRule.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 513212adc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 29 07:41:38 2023 +0100 Add comment web/lib/MRBS/DateTime.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7dfc56e81 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 29 07:40:38 2023 +0100 Fix bug web/lib/MRBS/DateTime.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 118d012e0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 29 07:36:37 2023 +0100 Fix bug web/edit_entry_handler.php | 13 +++++++++++++ web/lib/MRBS/RepeatRule.php | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) commit c0f0969be Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 28 19:16:58 2023 +0100 Fixed some bugs web/edit_entry_handler.php | 20 +++++++++++++++++++- web/lib/MRBS/RepeatRule.php | 13 ++++--------- 2 files changed, 23 insertions(+), 10 deletions(-) commit 5a1513a10 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 28 18:05:48 2023 +0100 Method complete web/lib/MRBS/DateTime.php | 11 +++- web/lib/MRBS/RepeatRule.php | 107 +++++++++++++++------------------- 2 files changed, 58 insertions(+), 60 deletions(-) commit ec38faf07 Merge: 4295e2587 3e202fe51 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 28 16:29:25 2023 +0100 Merge branch 'main' into repeat_class commit 3e202fe51 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 27 21:40:28 2023 +0100 Updated Brazilian Portuguese translation. Thanks to Bruno Calado. See GitHub Issues #3476. web/lang/lang.pt-br | 337 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 333 insertions(+), 4 deletions(-) commit 4295e2587 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 27 18:57:34 2023 +0100 Interim commit web/lib/MRBS/RepeatRule.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) commit 7b81f8222 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 27 18:26:08 2023 +0100 Interim commit web/lib/MRBS/RepeatRule.php | 87 +++++++++++++---------------------- 1 file changed, 33 insertions(+), 54 deletions(-) commit e10e5db7d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 27 17:56:03 2023 +0100 Interim commit web/lib/MRBS/DateTime.php | 7 ++++++- web/lib/MRBS/RepeatRule.php | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) commit 25c1bf61d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 27 17:46:00 2023 +0100 Interim commit web/lib/MRBS/DateTime.php | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) commit 73db876f4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 27 06:29:01 2023 +0100 Interim commit web/lib/MRBS/DateTime.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) commit b529adf80 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 26 15:48:11 2023 +0100 Fix bug causing resizable bookings not to work in the week view. web/functions_table.inc | 3 +++ 1 file changed, 3 insertions(+) commit 2277f0637 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 26 14:31:51 2023 +0100 Interim commit web/lib/MRBS/DateTime.php | 1 + 1 file changed, 1 insertion(+) commit 88dfcdfaf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 25 17:14:48 2023 +0100 Format code web/lib/MRBS/ICalendar/RFC5545.php | 2 ++ 1 file changed, 2 insertions(+) commit 942f76e04 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 25 17:13:22 2023 +0100 Created RFC5545 class web/edit_entry.php | 5 +++-- web/functions.inc | 20 ++++---------------- web/functions_ical.inc | 13 ++++--------- web/internalconfig.inc.php | 5 ----- web/lib/MRBS/DateTime.php | 7 +++++++ web/lib/MRBS/ICalendar/RFC5545.php (new) | 22 ++++++++++++++++++++++ 6 files changed, 40 insertions(+), 32 deletions(-) commit 080ce5e6b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 25 16:16:48 2023 +0100 Interim commit web/lib/MRBS/DateTime.php | 8 ++++++++ web/lib/MRBS/RepeatRule.php | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) commit f39f5beaf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 23 07:20:48 2023 +0100 Remove use of assert_options() which is deprecated in PHP 8.3 web/functions_error.inc | 5 ----- 1 file changed, 5 deletions(-) commit 98e87b327 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 23 07:00:41 2023 +0100 Fix bug causing the time slots not to be shown correctly on DST transition days in some circumstances. web/edit_entry.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) commit 85180011d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 22 15:43:05 2023 +0100 Fix bug resulting in bookings not being displayed in some circumstances on DST transition days when the start of the booking day occurs before the DST transition. web/functions.inc | 48 ++++++++++++++++++++++++++++++------- web/lib/MRBS/DateTime.php | 20 ++++++++++++++++ 2 files changed, 59 insertions(+), 9 deletions(-) commit d49deef8f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 20 15:54:36 2023 +0100 Interim commit web/lib/MRBS/DateTime.php | 15 ++++++++++++++ web/lib/MRBS/RepeatRule.php | 39 ++++++++++++++++++++++++++--------- 2 files changed, 44 insertions(+), 10 deletions(-) commit bfc58f5f3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 20 09:56:24 2023 +0100 Make it clear that policy limits apply per user web/lang/lang.en | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 4410a4499 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 20 09:53:06 2023 +0100 Interim commit web/lib/MRBS/RepeatRule.php | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) commit 1422e7b62 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 19 10:44:06 2023 +0100 Fix GitHub Issues #3468. Fatal error when no locales installed. web/language.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 33cf41e54 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 19 10:37:48 2023 +0100 Interim commit web/edit_entry_handler.php | 22 ++- web/lib/MRBS/RepeatRule.php (new) | 240 ++++++++++++++++++++++++++++ 2 files changed, 255 insertions(+), 7 deletions(-) commit 26ab68127 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 16 11:18:31 2023 +0100 Fix problem with not being able to authenticate against Wix. (Wix has changed the names of the member properties.) wix/web/http-functions.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 001a4bf4d Merge: b0d6021e8 75d765248 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 14 14:34:14 2023 +0100 Merge remote-tracking branch 'origin/main' commit b0d6021e8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 14 13:39:08 2023 +0100 Fix problem with not being able to press the Import button on the Import form. See GitHub Issues #3466. web/js/import.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 75d765248 (tag: v1.11.3) Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jul 12 13:31:16 2023 +0100 Updated version number for release of 1.11.3 ChangeLog | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++-- NEWS | 8 +++++++ 2 files changed, 74 insertions(+), 2 deletions(-) commit 3cfcae949 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jul 12 13:29:21 2023 +0100 Updated version number for release of 1.11.3 web/version_num.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2dee72818 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 12 12:36:31 2023 +0100 Remove strict types declaration causing uncaught exceptions on some systems. web/lib/MRBS/Map.php | 1 - 1 file changed, 1 deletion(-) commit d30f22b77 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 12 12:17:19 2023 +0100 Rename function web/edit_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 8463c3b0d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 12 12:13:35 2023 +0100 Simplify code web/edit_entry.php | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) commit 3b6c776ad Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 12 11:23:15 2023 +0100 Simplify code web/edit_entry.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) commit 34ff17021 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 12 11:10:38 2023 +0100 Simplify code web/edit_entry.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) commit e765b6f4a (tag: v1.11.2) Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jul 11 13:36:32 2023 +0100 Updated ChangeLog/NEWS for release of 1.11.2 ChangeLog | 443 +++++++++++++++++++++++++++++++++++++++++++++++++++- NEWS | 14 ++ 2 files changed, 454 insertions(+), 3 deletions(-) commit c9525e2f9 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jul 11 13:19:51 2023 +0100 Updated version number for release of 1.11.2 web/version_num.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bc1f24fb6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 11 10:37:30 2023 +0100 Fix XSS problem. This is a temporary fix - it needs to be looked at more closely. See SF Bugs #547. web/mrbs_sql.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 83b93c259 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 10 19:26:03 2023 +0100 Use constant instead of literal web/lib/MRBS/DateTime.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7dba7d7d9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 10 19:17:44 2023 +0100 Avoid hidden days when navigating between months web/lib/MRBS/DateTime.php | 72 ++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) commit c22976822 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 9 21:21:49 2023 +0100 Simplify code web/standard_vars.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 262220b12 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 9 21:15:28 2023 +0100 Simplify code web/index.php | 30 ++++++++++++++---------------- web/lib/MRBS/DateTime.php | 27 +++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 16 deletions(-) commit 0c4c9f079 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 9 18:35:26 2023 +0100 Simplify code web/index.php | 5 +++-- web/lib/MRBS/DateTime.php | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) commit 1bd8e806d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 9 18:02:41 2023 +0100 Add type declaration web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a606cc6c3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 9 15:36:28 2023 +0100 Fix potential bug web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 70ef2092e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 7 18:42:02 2023 +0100 Add type declarations web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ddd5e49ef Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 7 18:34:50 2023 +0100 Add type declarations web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 994dd1e43 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 7 18:29:29 2023 +0100 Add type declarations web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cbb30c405 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 7 18:27:00 2023 +0100 Add type declarations web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 94e8e4165 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 7 18:24:43 2023 +0100 Add type declarations web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9696af8ab Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 7 18:07:49 2023 +0100 Add type declaration web/functions_table.inc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) commit f3681cb5e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 7 17:59:11 2023 +0100 Add type declaration web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9ce9f36a8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 7 17:50:57 2023 +0100 Add type declaration web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f54c0b365 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 7 15:27:05 2023 +0100 Add type declarations web/functions_table.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 07b7a5954 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 7 14:30:47 2023 +0100 Fix comments web/lib/MRBS/Map.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) commit ebfc76dc7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 7 14:27:39 2023 +0100 Remove redundant code web/functions_table.inc | 148 -------------------------------------- 1 file changed, 148 deletions(-) commit fbfb6cbe5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 7 14:10:41 2023 +0100 Restructured web/functions_table.inc | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) commit a39b64c5f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 7 13:58:42 2023 +0100 Restructured web/functions_table.inc | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) commit e985592e1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 7 12:54:01 2023 +0100 Simplify code web/lib/MRBS/Map.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) commit 2c1adf7bd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 7 10:22:32 2023 +0100 Remove unnecessary semicolon. web/lib/MRBS/Map.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 20638396c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 6 17:47:00 2023 +0100 Make coalesce() happen automatically web/functions_table.inc | 1 - web/lib/MRBS/Map.php | 46 +++++++++++++++++++++++++++------------ 2 files changed, 32 insertions(+), 15 deletions(-) commit 5c5a83717 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 6 17:34:40 2023 +0100 Restructured web/functions_table.inc | 40 ++------- web/lib/MRBS/Map.php (new) | 152 +++++++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+), 33 deletions(-) commit 7de59662a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 5 18:18:56 2023 +0100 Add type declarations web/functions_table.inc | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) commit 3810dbd2a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 5 17:21:06 2023 +0100 Add type declarations web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4e7cecfd4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 5 16:57:20 2023 +0100 Add type declarations web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit af7aa4354 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 5 16:53:28 2023 +0100 Add type declarations web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3a7e8bc0a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 5 16:44:31 2023 +0100 Add type declarations web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 94e27c9f9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 4 18:57:30 2023 +0100 Add type declarations web/edit_entry.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit b01e8151a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 4 18:52:11 2023 +0100 Add type declarations web/edit_entry.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 7b3596ee7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 4 18:46:15 2023 +0100 Add type declarations web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2e52876b4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 4 18:39:55 2023 +0100 Add type declarations web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 296f14526 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 4 18:35:30 2023 +0100 Add type declarations web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cb88fcff6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 4 18:27:28 2023 +0100 Add type declarations web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5abc78229 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 4 18:23:41 2023 +0100 Add type declarations web/edit_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit b179bf38d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 4 18:18:06 2023 +0100 Add type declarations web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f4a20ab53 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 4 18:15:39 2023 +0100 Add type declarations web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7de7e6c9d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 4 18:08:33 2023 +0100 Add type declarations web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2e4fcb849 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 4 17:41:06 2023 +0100 Fix SF Bugs #546. web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f59787f46 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 3 19:23:23 2023 +0100 Fix typos in comments web/areadefaults.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit aef2f7bfa Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 3 19:09:42 2023 +0100 Fix typo in comment web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a33fea43b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 3 19:08:51 2023 +0100 Fix typo in comment web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit df39452f7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 3 19:07:01 2023 +0100 Fix typo in comment web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 45cdd6bb3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 3 19:05:46 2023 +0100 Fix typo in comment web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9501c639f (tag: v1.11.1) Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jul 3 15:10:37 2023 +0100 Updated ChangeLog and NEWS for release of 1.11.1 ChangeLog | 2959 ++++++++++++++++++++++++++++++++++++++++++++++++++- NEWS | 132 +++ 2 files changed, 3060 insertions(+), 31 deletions(-) commit ea3a7f948 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jul 3 14:41:55 2023 +0100 Updated version number for release web/version_num.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ea828ec5f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 2 14:14:34 2023 +0100 Add a config option $always_offer_view_all to allow sites to give users the option of the view_all view even if there's only one room. web/index.php | 4 ++-- web/standard_vars.inc.php | 2 +- web/systemdefaults.inc.php | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) commit 612edcf13 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 1 11:15:30 2023 +0100 Fix problem with occasional "Trying to destroy uninitialized session" warnings web/lib/MRBS/Session/SessionPhp.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) commit 2cae4cdac Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 26 19:15:16 2023 +0100 Simplify code web/edit_entry_handler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit dae1dfbb6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 26 17:42:01 2023 +0100 Fixed bug when authenticating against Joomla 4.3.0 or above. See SF Feature Requests #455. web/auth/cms/joomla.inc | 10 +++++++++- web/lib/MRBS/Auth/AuthJoomla.php | 15 +++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) commit 96b1070b7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 19 16:44:26 2023 +0100 Fixed bug in recent PR web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b54185915 Merge: 8035319dd cb2a02d9e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 19 16:42:17 2023 +0100 Merge pull request #85 from dorianim-forks/main Feat: get display name from SAML commit cb2a02d9e Author: Dorian Zedler <dorian@itsblue.de> Date: Sun Jun 18 22:53:32 2023 +0200 Chore: add default values web/systemdefaults.inc.php | 2 ++ 1 file changed, 2 insertions(+) commit 3b73c0e78 Author: Dorian Zedler <dorian@itsblue.de> Date: Sun Jun 18 22:51:36 2023 +0200 Fix: typo web/lib/MRBS/Auth/AuthSaml.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1ba7e2c3c Author: Dorian Zedler <dorian@itsblue.de> Date: Sun Jun 18 20:53:15 2023 +0200 Chore: update docs web/lib/MRBS/Session/SessionSaml.php | 2 ++ 1 file changed, 2 insertions(+) commit ceed98ea2 Author: Dorian Zedler <dorian@itsblue.de> Date: Sun Jun 18 20:51:21 2023 +0200 Feat: make it possible to get display name from saml web/lib/MRBS/Auth/AuthSaml.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) commit 8035319dd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 8 08:03:37 2023 +0100 Fix ArgumentCountError. See SF Bugs #545. web/lib/MRBS/Session/SessionSaml.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6bf8f1540 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 8 07:57:43 2023 +0100 Fix "Unknown database type '(Ubuntu)'" problem on some Ubuntu systems. See SF Bugs #545. web/lib/MRBS/DB_mysql.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit 4799ec2dd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 6 16:31:58 2023 +0100 Swap the priority of $cli_language and $override_locale when determining which locale to use. It was always intended that $override_locale should override everything else. web/language.inc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) commit eb0ace6e2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 5 10:12:41 2023 +0100 Set default admin level to $max_level instead of 2. See SF Support Requests #2763. web/lib/MRBS/Auth/Auth.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1ba415693 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 5 09:55:54 2023 +0100 Set LDAP admin level to $max_level instead of 2. See SF Support Requests #2763. web/lib/MRBS/Auth/AuthLdap.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 14cda1f0f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 3 18:39:10 2023 +0100 Add type declarations web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bed408505 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 3 18:32:32 2023 +0100 Add type declaration web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2cce6cb57 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 3 18:22:03 2023 +0100 Add type declaration web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7015c6483 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 3 18:18:30 2023 +0100 Remove duplicate word in comment web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 338bcb41a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 3 18:05:11 2023 +0100 Add type declarations web/lib/MRBS/DB.php | 6 +++--- web/lib/MRBS/DB_mysql.php | 2 +- web/lib/MRBS/DB_pgsql.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) commit 632367f18 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 3 16:26:38 2023 +0100 Add type declaration and clarify code web/mrbs_sql.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 742aa15e3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 3 16:17:45 2023 +0100 Remove redundant local variables web/edit_room.php | 2 +- web/import.php | 2 +- web/report.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit bd934af1a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 3 16:13:43 2023 +0100 Add type declaration web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 611c89b11 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 3 16:08:56 2023 +0100 Correct typo in comment web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 98034356e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 3 16:08:15 2023 +0100 Add type declaration web/mrbs_sql.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 893409302 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 3 16:04:43 2023 +0100 Add type declarations web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 55f4ee283 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 3 16:00:03 2023 +0100 Simplify code web/mrbs_sql.inc | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) commit 5e7788336 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 3 15:49:44 2023 +0100 Correct typo in comment web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c10fb3e82 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 3 15:46:57 2023 +0100 Add type declaration and remove redundant code web/functions.inc | 14 +++----------- web/internalconfig.inc.php | 5 ----- 2 files changed, 3 insertions(+), 16 deletions(-) commit 5e9a75e98 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 3 15:33:31 2023 +0100 Add type declaration web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 72a2a2d1e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jun 2 10:12:10 2023 +0100 Fix display of unnecessary colon when approval is enabled and an entry owned by someone else is being viewed by an ordinary user. See SF Support Requests #2766. web/view_entry.php | 5 ----- 1 file changed, 5 deletions(-) commit 44b013b53 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 1 09:12:47 2023 +0100 Fix potential bug web/view_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d6c76b4c4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 31 20:22:07 2023 +0100 Fix uncaught exception error when following a link to a booking from an email when not logged in. web/view_entry.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 018a2010a Merge: 9428523c1 a13d99bc0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue May 30 11:36:40 2023 +0100 Merge pull request #83 from yorkshire-pudding/issue-82-jquery-lang-files Issue #82: Fix lang file include commit a13d99bc0 Author: Martin Price <github@systemhorizons.co.uk> Date: Tue May 30 10:33:07 2023 +0100 Issue #82: Fix lang file include web/js/datatables.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9428523c1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 24 11:10:45 2023 +0100 Add the ability to have separate datetime formats in reports. web/report.php | 5 +++-- web/systemdefaults.inc.php | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) commit 4f79eb878 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue May 23 18:32:19 2023 +0100 Remove duplicate global declaration web/mrbs_sql.inc | 1 - 1 file changed, 1 deletion(-) commit 6823ff731 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon May 22 18:49:59 2023 +0100 Add type declarations web/lib/MRBS/Columns.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f9d29e0e0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon May 22 18:45:09 2023 +0100 Add type declarations web/lib/MRBS/Column.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit be88dc440 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon May 22 17:23:33 2023 +0100 Remove an unnecesary call to mutex_lock(). Any problems will be caught by the transaction. See SF Bugs #543. web/edit_entry_handler.php | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) commit c2d5cb821 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun May 21 19:09:36 2023 +0100 Add the datepicker language as a query string parameter to prevent problems with browser caching web/js.inc | 20 ++++++++++++++------ web/js/datepicker.js.php | 3 +++ 2 files changed, 17 insertions(+), 6 deletions(-) commit 9e9f0c5bd Merge: d6b11c454 d31149fa8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun May 21 15:49:43 2023 +0100 Merge pull request #81 from meeting-room-booking-system/intl_date Support for date formatting with Intl commit d31149fa8 (origin/intl_date, intl_date) Merge: 3b0e7909c d6b11c454 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat May 20 18:19:39 2023 +0100 Merge branch 'main' into intl_date commit d6b11c454 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat May 20 18:14:02 2023 +0100 Eliminate a call to mutex_lock(). See SF Bugs #543. web/lib/MRBS/DB.php | 16 +++++------ web/lib/MRBS/SessionHandlerDb.php | 41 ++++++----------------------- 2 files changed, 16 insertions(+), 41 deletions(-) commit 882004c83 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat May 20 17:07:12 2023 +0100 Add syntax_upsert() method web/lib/MRBS/DB.php | 316 +++++++++++++++++++++++------------- web/lib/MRBS/DB_mysql.php | 22 +++ web/lib/MRBS/DB_pgsql.php | 55 ++++++- 3 files changed, 280 insertions(+), 113 deletions(-) commit 3b0e7909c Merge: 1800732b1 f0410e7e1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri May 19 18:36:33 2023 +0100 Merge branch 'main' into intl_date commit f0410e7e1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri May 19 16:23:07 2023 +0100 Eliminate a call to mutex_lock(). See SF Bugs #543. web/edit_room_handler.php | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) commit 1800732b1 Merge: ca3f46590 1671fc8eb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu May 18 20:38:23 2023 +0100 Merge branch 'main' into intl_date commit 1671fc8eb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu May 18 20:35:52 2023 +0100 Add type declarations web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 634bc19c3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu May 18 20:26:33 2023 +0100 Add type declarations web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 76478c482 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu May 18 20:22:37 2023 +0100 Add type declarations web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 41d833674 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu May 18 20:20:34 2023 +0100 Add type declarations web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ca3f46590 Merge: ad7c7d659 f0310a6e9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu May 18 20:07:02 2023 +0100 Merge branch 'main' into intl_date commit f0310a6e9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu May 18 20:03:33 2023 +0100 Fix error introduced in recent commit web/mrbs_sql.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit ad7c7d659 Merge: 923df98fc cd950a2d2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu May 18 18:02:27 2023 +0100 Merge branch 'main' into intl_date commit cd950a2d2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu May 18 18:01:30 2023 +0100 Add comment. See SF Bugs #543. web/lib/MRBS/DB_mysql.php | 8 ++++++++ 1 file changed, 8 insertions(+) commit 4b1ff63b6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu May 18 17:33:41 2023 +0100 Eliminate a call to mutex_lock(). See SF Bugs #543. web/mrbs_sql.inc | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) commit 923df98fc Merge: 43518289f 8dda820e1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu May 18 16:35:42 2023 +0100 Merge branch 'main' into intl_date commit 8dda820e1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu May 18 15:38:39 2023 +0100 Eliminate a call to mutex_lock(). See SF Bugs #543. web/lib/MRBS/DBException.php | 15 +++-- web/mrbs_sql.inc | 101 ++++++++++++++++----------------- 2 files changed, 57 insertions(+), 59 deletions(-) commit 43518289f Merge: 679882c80 91af94d8e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 17 17:20:47 2023 +0100 Merge branch 'main' into intl_date commit 679882c80 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 17 16:52:19 2023 +0100 Improve localisation of week number web/index.php | 2 +- web/systemdefaults.inc.php | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) commit 246a76045 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 17 16:27:54 2023 +0100 Add support for more patterns web/lib/IntlDateFormatter.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) commit 91af94d8e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 17 12:46:16 2023 +0100 Add setting UTF-8 variants of 'C' as a fallback locale. See GitHub Issues #80. web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c35b4b928 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue May 16 18:42:54 2023 +0100 Added support for more patterns web/lib/IntlDateFormatter.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) commit ec5d19a45 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue May 16 18:09:07 2023 +0100 Fix comment web/lib/IntlDateFormatter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit e69569378 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon May 15 20:17:32 2023 +0100 Improve localisation of timezone web/index.php | 2 +- web/systemdefaults.inc.php | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) commit e11d4121a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon May 15 08:06:00 2023 +0100 Add notice about use of the obsolete config setting $strftime_format web/internalconfig.inc.php | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) commit 36a0b1df7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon May 15 07:52:26 2023 +0100 Remove redundant comment web/lib/IntlDateFormatter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1c2adae66 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon May 15 07:38:00 2023 +0100 Fix bug when the time format has been overridden. web/language.inc | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) commit f9310fb90 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun May 14 19:09:40 2023 +0100 Remove use of $twentyfourhour_format web/internalconfig.inc.php | 9 +++++++++ web/systemdefaults.inc.php | 17 +++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) commit 9e03efe8c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun May 14 18:32:31 2023 +0100 Remove use of $twentyfourhour_format web/js/edit_area.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ea22528e8 Merge: 6c3286bd6 f2d652c9a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 10 11:22:12 2023 +0100 Merge branch 'main' of https://github.com/meeting-room-booking-system/mrbs-code commit 6c3286bd6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 10 11:19:50 2023 +0100 Strengthened warning message. web/lang/lang.en | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit 31a31fe92 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed May 3 14:44:56 2023 +0100 Adds function web/language.inc | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) commit dea484a18 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue May 2 11:02:19 2023 +0100 Removes redundant config settings web/systemdefaults.inc.php | 255 +++++++++++++++++------------------ 1 file changed, 120 insertions(+), 135 deletions(-) commit 03ec568dd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon May 1 16:03:13 2023 +0100 Removes redundant code web/language.inc | 300 --------------------------------------------- 1 file changed, 300 deletions(-) commit 7954a6de1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon May 1 15:20:38 2023 +0100 Removes calls to strftime() web/edit_entry.php | 3 --- 1 file changed, 3 deletions(-) commit d54fad0f5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon May 1 15:12:06 2023 +0100 Removes calls to strftime() web/lib/MRBS/EntryInterval.php | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) commit ee6bc9533 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon May 1 14:58:54 2023 +0100 Removes calls to strftime() web/mrbs_sql.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit e72b6b90c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon May 1 14:43:53 2023 +0100 Removes redundant global declaration web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c59a32523 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Apr 30 18:49:19 2023 +0100 Removes calls to strftime() web/functions_table.inc | 75 +++++++++++++-------------------------- 1 file changed, 24 insertions(+), 51 deletions(-) commit 736c1917a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Apr 30 16:32:33 2023 +0100 Restructures web/functions_table.inc | 113 ++++++++++++++++++++++---------------- 1 file changed, 66 insertions(+), 47 deletions(-) commit 0c5869ba8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Apr 27 18:04:48 2023 +0100 Removes calls to strftime() web/mrbs_sql.inc | 5 +++-- web/systemdefaults.inc.php | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) commit 96cd93b6d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Apr 27 17:46:28 2023 +0100 Removes calls to strftime() generate_pattern_files.php | 1 + web/functions_table.inc | 5 +- web/intl/skeletons/dEMMM.ini (new) | 734 +++++++++++++++++++++++++++ web/intl/skeletons/dMMM.ini (new) | 734 +++++++++++++++++++++++++++ web/systemdefaults.inc.php | 6 + 5 files changed, 1478 insertions(+), 2 deletions(-) commit ce386e5ae Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Apr 27 17:16:00 2023 +0100 Removes calls to strftime() generate_pattern_files.php | 1 + web/functions_table.inc | 4 ++-- web/systemdefaults.inc.php | 8 +++++++- 3 files changed, 10 insertions(+), 3 deletions(-) commit 9bd2bc276 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Apr 27 16:52:06 2023 +0100 Removes calls to strftime() generate_pattern_files.php | 2 + web/index.php | 12 +- web/intl/skeletons/d.ini (new) | 734 +++++++++++++++++++++++++++ web/intl/skeletons/dMMMM.ini (new) | 734 +++++++++++++++++++++++++++ web/systemdefaults.inc.php | 16 +- 5 files changed, 1491 insertions(+), 7 deletions(-) commit f2d652c9a Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Apr 26 22:27:46 2023 +0100 Dockerfile fixes for locale generation Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) commit 8248bb06f Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Apr 26 21:32:20 2023 +0100 Corrected Docker image build .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 14298b957 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Apr 26 21:30:40 2023 +0100 Added new Dockerfile, which uses environment variables for basic configuration .github/workflows/docker-image.yml | 2 +- Dockerfile (new) | 10 ++++ docker-config.inc.php (new) | 78 ++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletion(-) commit 59c3c7599 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Apr 26 20:37:23 2023 +0100 Create docker-image.yml .github/workflows/docker-image.yml (new) | 53 ++++++++++++++++++++++ 1 file changed, 53 insertions(+) commit 0ccf1fd8c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Apr 26 18:35:52 2023 +0100 Removes calls to strftime() web/index.php | 4 ++-- web/systemdefaults.inc.php | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) commit b18fd21e6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 25 07:51:30 2023 +0100 Moves directory web/{lib => }/intl/skeletons/MMMMy.ini | 0 web/{lib => }/intl/types/full_full.ini | 0 web/{lib => }/intl/types/full_long.ini | 0 web/{lib => }/intl/types/full_medium.ini | 0 web/{lib => }/intl/types/full_none.ini | 0 web/{lib => }/intl/types/full_short.ini | 0 web/{lib => }/intl/types/long_full.ini | 0 web/{lib => }/intl/types/long_long.ini | 0 web/{lib => }/intl/types/long_medium.ini | 0 web/{lib => }/intl/types/long_none.ini | 0 web/{lib => }/intl/types/long_short.ini | 0 web/{lib => }/intl/types/medium_full.ini | 0 web/{lib => }/intl/types/medium_long.ini | 0 web/{lib => }/intl/types/medium_medium.ini | 0 web/{lib => }/intl/types/medium_none.ini | 0 web/{lib => }/intl/types/medium_short.ini | 0 web/{lib => }/intl/types/none_full.ini | 0 web/{lib => }/intl/types/none_long.ini | 0 web/{lib => }/intl/types/none_medium.ini | 0 web/{lib => }/intl/types/none_short.ini | 0 web/{lib => }/intl/types/short_full.ini | 0 web/{lib => }/intl/types/short_long.ini | 0 web/{lib => }/intl/types/short_medium.ini | 0 web/{lib => }/intl/types/short_none.ini | 0 web/{lib => }/intl/types/short_short.ini | 0 web/lib/IntlDateFormatter.php | 2 +- web/lib/IntlDatePatternGenerator.php | 2 +- 27 files changed, 2 insertions(+), 2 deletions(-) commit f7d70ba9a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 25 07:48:12 2023 +0100 Renames directory web/lib/IntlDateFormatter.php | 2 +- web/lib/IntlDatePatternGenerator.php | 2 +- .../{IntlDatePatternGenerator => intl}/skeletons/MMMMy.ini | 0 .../{IntlDatePatternGenerator => intl}/types/full_full.ini | 0 .../{IntlDatePatternGenerator => intl}/types/full_long.ini | 0 .../{IntlDatePatternGenerator => intl}/types/full_medium.ini | 0 .../{IntlDatePatternGenerator => intl}/types/full_none.ini | 0 .../{IntlDatePatternGenerator => intl}/types/full_short.ini | 0 .../{IntlDatePatternGenerator => intl}/types/long_full.ini | 0 .../{IntlDatePatternGenerator => intl}/types/long_long.ini | 0 .../{IntlDatePatternGenerator => intl}/types/long_medium.ini | 0 .../{IntlDatePatternGenerator => intl}/types/long_none.ini | 0 .../{IntlDatePatternGenerator => intl}/types/long_short.ini | 0 .../{IntlDatePatternGenerator => intl}/types/medium_full.ini | 0 .../{IntlDatePatternGenerator => intl}/types/medium_long.ini | 0 .../types/medium_medium.ini | 0 .../{IntlDatePatternGenerator => intl}/types/medium_none.ini | 0 .../{IntlDatePatternGenerator => intl}/types/medium_short.ini | 0 .../{IntlDatePatternGenerator => intl}/types/none_full.ini | 0 .../{IntlDatePatternGenerator => intl}/types/none_long.ini | 0 .../{IntlDatePatternGenerator => intl}/types/none_medium.ini | 0 .../{IntlDatePatternGenerator => intl}/types/none_short.ini | 0 .../{IntlDatePatternGenerator => intl}/types/short_full.ini | 0 .../{IntlDatePatternGenerator => intl}/types/short_long.ini | 0 .../{IntlDatePatternGenerator => intl}/types/short_medium.ini | 0 .../{IntlDatePatternGenerator => intl}/types/short_none.ini | 0 .../{IntlDatePatternGenerator => intl}/types/short_short.ini | 0 27 files changed, 2 insertions(+), 2 deletions(-) commit 314eeb4e8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Apr 24 19:12:38 2023 +0100 Removes calls to strftime() web/help.php | 2 +- web/lib/IntlDateFormatter.php | 25 +++++++++++++++++++++++++ web/systemdefaults.inc.php | 6 ++++++ 3 files changed, 32 insertions(+), 1 deletion(-) commit f7cafb426 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Apr 24 18:39:12 2023 +0100 Removes calls to strftime() web/functions_mail.inc | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) commit 596df2559 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Apr 24 18:19:17 2023 +0100 Fixes bug web/lib/IntlDateFormatter.php | 3 ++- web/lib/IntlDatePatternGenerator.php | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) commit 293a137a4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Apr 24 18:04:03 2023 +0100 Removes calls to strftime() web/functions_mail.inc | 4 ++-- web/language.inc | 13 +++++++++---- web/lib/IntlDateFormatter.php | 6 +++--- 3 files changed, 14 insertions(+), 9 deletions(-) commit a7daff8aa Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Apr 24 16:34:21 2023 +0100 Removes calls to strftime() web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit b0f0459e7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Apr 24 16:27:14 2023 +0100 Removes calls to strftime() web/js/edit_area.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit ef89a7cc9 Merge: 5ff7053b8 b244394ca Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Apr 24 13:53:32 2023 +0100 Merge branch 'main' into intl_date commit b244394ca Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Apr 24 13:52:33 2023 +0100 Fixes bug when trying to create a daily series by dragging in the week view. See SF Support Requests#2748. web/edit_entry.php | 5 +++++ 1 file changed, 5 insertions(+) commit 5ff7053b8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Apr 23 18:54:12 2023 +0100 More conversions web/edit_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 2348059e0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Apr 23 18:21:03 2023 +0100 More conversions web/mrbs_sql.inc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) commit c9e68b0b4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Apr 23 18:09:24 2023 +0100 Converts repeat end date in view_entry web/functions_view.inc | 11 ++++++----- web/systemdefaults.inc.php | 7 +++++++ 2 files changed, 13 insertions(+), 5 deletions(-) commit ab519a3f3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Apr 23 17:47:26 2023 +0100 Fixes bug web/lib/IntlDateFormatter.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 176314d1f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Apr 23 17:39:52 2023 +0100 Converts time_date_string() web/functions.inc | 11 ++--------- web/lib/IntlDateFormatter.php | 10 ++++++++++ web/systemdefaults.inc.php | 6 ++++++ 3 files changed, 18 insertions(+), 9 deletions(-) commit 541df7427 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Apr 23 17:12:49 2023 +0100 Converts hour_min_format() web/edit_entry.php | 2 +- web/functions.inc | 8 +++--- web/functions_table.inc | 4 +-- web/lib/IntlDateFormatter.php | 47 ++++++++++++++++++++++++++++++--- web/systemdefaults.inc.php | 6 +++++ 5 files changed, 57 insertions(+), 10 deletions(-) commit 64ed86bf1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Apr 23 15:44:38 2023 +0100 Restructures web/lib/IntlDateFormatter.php | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) commit 85ea1f79a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Apr 23 15:35:56 2023 +0100 Restructures web/lib/IntlDateFormatter.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 541c7b06e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Apr 23 15:30:36 2023 +0100 Fixes bug introduced in recent commit web/lib/IntlDateFormatter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 5f77b6137 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Apr 23 15:21:59 2023 +0100 Suppresses multiple strftime() deprecation messages web/init.inc | 11 +++++++++++ web/lib/IntlDateFormatter.php | 6 ++++++ 2 files changed, 17 insertions(+) commit c46cf1e58 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Apr 23 14:47:24 2023 +0100 Restructures web/lib/IntlDateFormatter.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) commit 45e566238 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Apr 23 14:39:09 2023 +0100 Improves performance web/lib/IntlDateFormatter.php | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) commit 8bf512e22 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 22 18:48:24 2023 +0100 Removes calls to strftime() web/edit_entry.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 9e1eaa64d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 22 18:18:50 2023 +0100 Removes calls to strftime() web/functions_table.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit eeaa41a1e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 22 15:59:09 2023 +0100 Adds casts to int web/del_entry.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 698e0195e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 22 15:56:48 2023 +0100 Fixes 'd' pattern on Windows web/lib/IntlDateFormatter.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) commit 5304cbeec Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 22 15:22:04 2023 +0100 Removes leading space from 'd' pattern web/lib/IntlDateFormatter.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) commit 7a20b86be Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 22 15:02:43 2023 +0100 Removes calls to strftime() web/del_entry.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 49093512c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 22 14:37:36 2023 +0100 Restructures web/lib/IntlDateFormatter.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) commit ef98bbad1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 22 14:35:19 2023 +0100 Adds support for 'M' pattern web/lib/IntlDateFormatter.php | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) commit 6292be8d4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 22 14:00:30 2023 +0100 Reverts last commit web/lib/IntlDateFormatter.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 4aedadbd5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 22 13:52:47 2023 +0100 Restructures web/lib/IntlDateFormatter.php | 62 +++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 2 deletions(-) commit 1f8f9ae1f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 22 13:23:09 2023 +0100 Restructures web/lib/IntlDateFormatter.php | 81 ++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 2 deletions(-) commit 89841fd8b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 22 12:38:21 2023 +0100 Converts search.php to use datetime_format() web/lib/IntlDateFormatter.php | 12 +++++++++++- web/search.php | 2 +- web/systemdefaults.inc.php | 20 ++++++++++++++++---- 3 files changed, 28 insertions(+), 6 deletions(-) commit 7929b232b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 22 12:12:30 2023 +0100 Converts day_name() to use datetime_format() web/edit_entry.php | 4 ++-- web/functions.inc | 11 ++++++----- web/systemdefaults.inc.php | 8 ++++++++ 3 files changed, 16 insertions(+), 7 deletions(-) commit 42003f20e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 21 17:45:59 2023 +0100 Removes TODO web/lib/IntlDateFormatter.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) commit fef4276b6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 21 17:37:18 2023 +0100 Eliminates duplicate code web/lib/IntlDateFormatter.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) commit 1f805077e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 21 17:33:24 2023 +0100 Implements 'view_day' web/lib/IntlDateFormatter.php | 40 +++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) commit 9e064d786 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 21 17:11:12 2023 +0100 Fixes bugs web/config.inc.php-sample | 4 ++++ web/language.inc | 4 ++-- web/lib/IntlDatePatternGenerator.php | 4 +++- web/systemdefaults.inc.php | 2 ++ 4 files changed, 11 insertions(+), 3 deletions(-) commit 23d474fed Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 21 16:58:27 2023 +0100 Adds pattern files and the tool for generating them generate_pattern_files.php (new) | 83 ++ web/index.php | 2 +- web/language.inc | 6 +- .../skeletons/MMMMy.ini | 449 +++++++++- .../types/full_full.ini (new) | 734 +++++++++++++++++ .../types/full_long.ini (new) | 734 +++++++++++++++++ .../types/full_medium.ini (new) | 734 +++++++++++++++++ .../types/full_none.ini (new) | 734 +++++++++++++++++ .../types/full_short.ini (new) | 734 +++++++++++++++++ .../types/long_full.ini (new) | 734 +++++++++++++++++ .../types/long_long.ini (new) | 734 +++++++++++++++++ .../types/long_medium.ini (new) | 734 +++++++++++++++++ .../types/long_none.ini (new) | 734 +++++++++++++++++ .../types/long_short.ini (new) | 734 +++++++++++++++++ .../types/medium_full.ini (new) | 734 +++++++++++++++++ .../types/medium_long.ini (new) | 734 +++++++++++++++++ .../types/medium_medium.ini (new) | 734 +++++++++++++++++ .../types/medium_none.ini (new) | 734 +++++++++++++++++ .../types/medium_short.ini (new) | 734 +++++++++++++++++ .../types/none_full.ini (new) | 734 +++++++++++++++++ .../types/none_long.ini (new) | 734 +++++++++++++++++ .../types/none_medium.ini (new) | 734 +++++++++++++++++ .../types/none_short.ini (new) | 734 +++++++++++++++++ .../types/short_full.ini (new) | 734 +++++++++++++++++ .../types/short_long.ini (new) | 734 +++++++++++++++++ .../types/short_medium.ini (new) | 734 +++++++++++++++++ .../types/short_none.ini (new) | 734 +++++++++++++++++ .../types/short_short.ini (new) | 734 +++++++++++++++++ web/systemdefaults.inc.php | 7 + 29 files changed, 18154 insertions(+), 9 deletions(-) commit 727c98e7b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Apr 20 15:48:42 2023 +0100 Prevents use of empty patterns generated by a skeleton web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b11470f49 Merge: af0a54ad0 b0dfff677 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Apr 20 11:36:13 2023 +0100 Merge branch 'main' into intl_date commit b0dfff677 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Apr 20 11:20:26 2023 +0100 Adds support for Percona version checking. See SF Support Requests #2744. web/lib/MRBS/DB_mysql.php | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) commit af0a54ad0 Merge: 212ad689d f8b061941 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Apr 20 08:07:25 2023 +0100 Merge branch 'main' into intl_date commit f8b061941 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Apr 20 07:25:24 2023 +0100 Fixed bug when disabled functions are just separated by a comma. web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 212ad689d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Apr 19 18:57:35 2023 +0100 Tweaks comment web/lib/IntlDatePatternGenerator/skeletons/MMMMy.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit d7b3a5a55 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Apr 19 18:51:51 2023 +0100 Reformats code web/lib/IntlDatePatternGenerator.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit c1694da86 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Apr 19 18:45:05 2023 +0100 Adds support for zh-CN and zh-TW web/lib/IntlDatePatternGenerator/skeletons/MMMMy.ini | 2 ++ 1 file changed, 2 insertions(+) commit 9771fa3dc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Apr 19 18:38:33 2023 +0100 Added locale specific patterns for skeletons web/lib/IntlDateFormatter.php | 2 +- web/lib/IntlDatePatternGenerator.php (new) | 39 +++ .../skeletons/MMMMy.ini (new) | 292 +++++++++++++++++ 3 files changed, 332 insertions(+), 1 deletion(-) commit a54739ddb Merge: a4ee42618 83ff02fe1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Apr 19 17:38:27 2023 +0100 Merge branch 'main' into intl_date commit 83ff02fe1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Apr 19 17:02:13 2023 +0100 Fixes bug when curl_exec has been disabled. See SF Support Requests #2744. web/functions.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit a4ee42618 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 18 18:34:02 2023 +0100 Adds IntlDatePatternGenerator web/language.inc | 7 +++++-- web/systemdefaults.inc.php | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) commit b3e51acf1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 18 17:36:14 2023 +0100 Restructures web/functions_table.inc | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) commit 68a0a0ba2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 18 17:29:20 2023 +0100 Restructures web/functions.inc | 23 ----------------------- web/language.inc | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 23 deletions(-) commit 8241820a8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 18 17:22:30 2023 +0100 Restructures web/functions.inc | 23 +++++++++++++++++++++++ web/index.php | 11 ++--------- web/systemdefaults.inc.php | 4 +++- 3 files changed, 28 insertions(+), 10 deletions(-) commit 3057fbc6a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 18 16:55:54 2023 +0100 Removes test strings web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f1c725417 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 18 16:53:18 2023 +0100 Adds escaping for strftime web/lib/IntlDateFormatter.php | 27 +++++++++++++++++++++++---- web/systemdefaults.inc.php | 2 +- 2 files changed, 24 insertions(+), 5 deletions(-) commit 3c7c96ad5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 18 12:10:24 2023 +0100 Adds getPattern() and setPattern() web/lib/IntlDateFormatter.php | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) commit 46274b32f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 18 11:54:20 2023 +0100 Adds comment web/lib/IntlDateFormatter.php | 9 +++++++++ 1 file changed, 9 insertions(+) commit 5146b9b91 Merge: 24c2829e7 ce8787946 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 18 11:39:45 2023 +0100 Merge branch 'main' into intl_date commit ce8787946 Merge: 66dfc7aa0 48fe16009 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 18 11:33:40 2023 +0100 Merge pull request #79 from fare4z/patch-1 Update lang.ms commit 48fe16009 Author: Fareez Borhanudin <fare4z@gmail.com> Date: Tue Apr 18 11:07:30 2023 +0800 Update lang.ms Translate some word from english to malay. web/lang/lang.ms | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 24c2829e7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Apr 17 19:36:35 2023 +0100 Adds TODO web/lib/IntlDateFormatter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4e37b6e21 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Apr 17 19:35:31 2023 +0100 Adds comment web/lib/IntlDateFormatter.php | 7 +++++++ 1 file changed, 7 insertions(+) commit ae7f99f52 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Apr 17 19:28:28 2023 +0100 Adds comment web/lib/IntlDateFormatter.php | 1 + 1 file changed, 1 insertion(+) commit a3a0b0281 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Apr 17 18:58:52 2023 +0100 Simplifies code web/lib/IntlDateFormatter.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) commit 3dbb63846 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Apr 17 18:52:08 2023 +0100 Handles single quotes in patterns web/lib/IntlDateFormatter.php | 43 ++++++++++++++++++++++++++++++--- web/systemdefaults.inc.php | 2 +- 2 files changed, 41 insertions(+), 4 deletions(-) commit 6682c816a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Apr 16 18:34:57 2023 +0100 Replaces qualifier with import web/lib/IntlDateFormatter.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit ff8529692 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 15 19:55:52 2023 +0100 Fixes bug web/lib/IntlDateFormatter.php | 7 +++---- web/systemdefaults.inc.php | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) commit f8ea050e2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 15 19:45:33 2023 +0100 Month view working web/functions_table.inc | 42 +++++----- web/index.php | 11 ++- web/lib/IntlDateFormatter.php | 133 ++++++++++++++++++++++++++++++++ web/systemdefaults.inc.php | 2 + 4 files changed, 163 insertions(+), 25 deletions(-) commit 66dfc7aa0 Author: John Beranek <john@redux.org.uk> Date: Sat Apr 15 12:17:29 2023 +0100 Added .vs directory to .gitignore. .gitignore | 1 + 1 file changed, 1 insertion(+) commit 46b49f9bf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 15 10:26:08 2023 +0100 Started branch to get rid of usages of the deprecated strftime() function. Started a basic emulation of IntlDateFormatter. web/lib/IntlDateFormatter.php (new) | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) commit 2582796de Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 18:35:53 2023 +0100 Adds type declaration web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit eccd68464 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 18:34:09 2023 +0100 Adds type declaration web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d5cab0e3c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 18:31:57 2023 +0100 Adds type declarations web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3bf9f2d67 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 18:27:24 2023 +0100 Removes redundant global declaration web/language.inc | 2 -- 1 file changed, 2 deletions(-) commit bc20552b2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 18:23:09 2023 +0100 Adds type declarations web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0521b05dc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 18:09:10 2023 +0100 Simplifies code web/language.inc | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) commit aeac30b4a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 18:01:36 2023 +0100 Removes line that's no longer necessary web/language.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit fba034bc7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 17:56:13 2023 +0100 Adds type declaration web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8a14fdaa8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 17:46:15 2023 +0100 Adds fallback mail language web/functions_mail.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) commit ee9b8c973 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 17:28:20 2023 +0100 Adds type declarations web/language.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit 346f30efd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 17:20:55 2023 +0100 Eliminates duplicate code web/language.inc | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) commit 215474dd1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 17:11:20 2023 +0100 Fixes bug introduced in recent commit web/language.inc | 1 + 1 file changed, 1 insertion(+) commit c3a9c1edc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 16:39:22 2023 +0100 Adds handling of trivial case web/functions_ical.inc | 6 ++++++ 1 file changed, 6 insertions(+) commit 37d6639f6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 16:32:44 2023 +0100 Removes line that's no longer necessary web/language.inc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) commit 3dfb60b9d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 16:21:13 2023 +0100 Adds type declarations web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit fec11dd25 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 16:11:39 2023 +0100 Adds type declarations web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ebdbf509f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 16:06:08 2023 +0100 Improves readability web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 884a1de73 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 16:00:10 2023 +0100 Removes line that's no longer necessary web/language.inc | 1 - 1 file changed, 1 deletion(-) commit c55b2bcac Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 15:45:58 2023 +0100 Improves readability web/language.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit ab72500a4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 15:39:44 2023 +0100 Adds type declaration web/language.inc | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) commit e2ee3d00f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 15:09:59 2023 +0100 Adds comment web/language.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 86af7c819 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 14:37:12 2023 +0100 Adds type declarations web/language.inc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) commit f7d4bb46b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 14:14:48 2023 +0100 Uses null coalescing operator web/admin.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 8ab64d735 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 14:06:45 2023 +0100 Adds type declarations web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b37fc4d1b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 14:05:29 2023 +0100 Adds type declarations web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9ff149b22 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 14:03:07 2023 +0100 Adds type declarations web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 453beff13 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Apr 14 13:44:05 2023 +0100 Tweaks comment web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7f5c5a894 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Apr 13 19:08:19 2023 +0100 Adds type declarations web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit be4814b02 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Apr 13 18:56:54 2023 +0100 Adds type declarations web/language.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 3925d25b7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Apr 13 18:52:17 2023 +0100 Adds type declarations web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit dcb5514cc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Apr 13 18:48:27 2023 +0100 Adds type declarations web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 8324193c9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Apr 13 18:44:17 2023 +0100 Adds type declarations web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 44760fc28 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Apr 13 18:37:18 2023 +0100 Adds type declarations web/edit_entry.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) commit 02fcb8cc4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Apr 13 18:26:14 2023 +0100 Adds type declarations web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d249f7a1e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 11 18:37:27 2023 +0100 Tweaks comments web/functions_ical.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) commit e66c0d0cf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 11 18:34:05 2023 +0100 Adds type declarations web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8cfbb237f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 11 18:27:35 2023 +0100 Adds comma in comment web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8d766d81d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 11 18:16:23 2023 +0100 Adds type declarations web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit efef83d70 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 11 18:08:51 2023 +0100 Adds type declaration web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1fdf46e46 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 11 18:04:38 2023 +0100 Corrects typo in comment web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 492f59e6b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Apr 5 17:09:15 2023 +0100 Fixed bug when the timezone definition in the database has expired and MRBS is unable to get a new one from the URL web/functions_ical.inc | 42 ++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 23 deletions(-) commit 6ac15516b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Mar 29 18:56:16 2023 +0100 Fixed bug causing spurious validation message when $is_mandatory_field[entry.xxx] is set to false. See SF Support Requests #2733. web/js/edit_entry.js.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) commit 992ca1f08 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Mar 28 08:15:54 2023 +0100 Fixes error in Korean language string. See SF Support Requests #2729. web/lang/lang.ko | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 1c04913e2 (upstream/main) Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Mar 22 10:47:02 2023 +0000 Restructured web/mrbs_sql.inc | 116 +++++++++++++++++++++++++++++---------------- 1 file changed, 74 insertions(+), 42 deletions(-) commit 5d99953c3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Mar 22 09:15:15 2023 +0000 Provided an IntlDateFormatter equivalent for strftime '%l' web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6c28bc193 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Mar 20 17:12:38 2023 +0000 Added comment web/lib/MRBS/Session/Session.php | 3 +++ 1 file changed, 3 insertions(+) commit e5e7e23db Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Mar 20 10:59:47 2023 +0000 Allowed anonymous booking. See SF Support Requests #2725. web/Themes/default/header.inc | 5 +++-- web/lib/MRBS/Session/Session.php | 14 ++++++++++++- web/lib/MRBS/Session/SessionCas.php | 4 ++-- web/lib/MRBS/Session/SessionCookie.php | 2 +- web/lib/MRBS/Session/SessionHost.php | 2 +- web/lib/MRBS/Session/SessionHttp.php | 6 +++--- web/lib/MRBS/Session/SessionIp.php | 2 +- web/lib/MRBS/Session/SessionJoomla.php | 2 +- web/lib/MRBS/Session/SessionNt.php | 2 +- web/lib/MRBS/Session/SessionOmni.php | 2 +- web/lib/MRBS/Session/SessionPhp.php | 2 +- web/lib/MRBS/Session/SessionRemoteUser.php | 2 +- web/lib/MRBS/Session/SessionSaml.php | 4 ++-- web/lib/MRBS/Session/SessionWithLogin.php | 4 ---- web/lib/MRBS/Session/SessionWordpress.php | 2 +- web/mrbs_auth.inc | 22 +++++++++++++------- web/systemdefaults.inc.php | 3 +++ 17 files changed, 50 insertions(+), 30 deletions(-) commit 5f8bb27a7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Mar 10 18:04:45 2023 +0000 Added missing file from recent PHPMailer upgrade .../PHPMailer/src/DSNConfigurator.php (new) | 247 +++++++++++++++++ 1 file changed, 247 insertions(+) commit 63053b32a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Mar 10 16:13:55 2023 +0000 Fixed uncaught exception. See SF Bugs #540. web/view_entry.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) commit 154fc1cb6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Mar 7 12:26:44 2023 +0000 Upgraded to PHPMailer 6.8.0 web/lib/PHPMailer/README.md | 2 +- web/lib/PHPMailer/VERSION | 2 +- web/lib/PHPMailer/language/phpmailer.lang-hi.php | 12 ++++++++++-- web/lib/PHPMailer/src/PHPMailer.php | 4 ++-- web/lib/PHPMailer/src/POP3.php | 2 +- web/lib/PHPMailer/src/SMTP.php | 10 +++++++++- 6 files changed, 24 insertions(+), 8 deletions(-) commit 2c5a7bfab Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Mar 6 18:03:45 2023 +0000 Simplifies code web/functions_ical.inc | 59 ++++++++++++---------------------------- 1 file changed, 18 insertions(+), 41 deletions(-) commit 40cc1e969 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Mar 1 16:43:00 2023 +0000 Fixes bug that results in missing series when producing .ics reports using PostgreSQL web/report.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 5a5822df4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Mar 1 14:40:32 2023 +0000 Fixed bug introduced in a recent commit causing invalid VTIMEZONE components to be used. web/functions_ical.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit 5f3a2b7c3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Feb 27 09:39:34 2023 +0000 Fixes syntax error exposed by PostgreSQL 15. See SF Patches #123. web/lib/MRBS/DB_pgsql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c075fe18d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 22 17:56:46 2023 +0000 Simplified code web/functions_ical.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 89e12df13 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 22 15:12:53 2023 +0000 Fixed bugs introduced in recent commit web/functions_ical.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit d0e2c230c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 22 13:35:00 2023 +0000 Added parameter to force Select2 to be used on mobile devices web/js/functions.js.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 1ce3c9b78 Merge: 98323e890 f534ae037 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 21 16:47:18 2023 +0000 Merge pull request #75 from meeting-room-booking-system/issue_74 Fixes GitHub Issue #74 commit f534ae037 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 21 16:46:14 2023 +0000 Fixes GitHub Issue #74 web/functions_mail.inc | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) commit 98323e890 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 21 14:54:33 2023 +0000 Fixed bug introduced in recent commit web/functions_ical.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 2476ba039 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Feb 20 14:26:47 2023 +0000 Fixed bug - added formnovalidate to the Back button web/edit_room.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit f317cee51 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 17 10:11:39 2023 +0000 Clarified code web/functions_ical.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 7978dc363 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 17 09:44:31 2023 +0000 Added type declarations web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 072c95d40 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 17 09:37:26 2023 +0000 Tweaked formatting web/functions_ical.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 8b30fee1a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 17 09:16:23 2023 +0000 Fixed bug when the database VTIMEZONE component doesn't contain a TZURL property. See SF Bugs #537. web/functions_ical.inc | 322 +++++++++++++++++++++++++-------------- 1 file changed, 211 insertions(+), 111 deletions(-) commit 9010d67f3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Feb 16 17:48:36 2023 +0000 Corrected typos in comments web/functions_ical.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 569e819ef Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Feb 13 18:35:26 2023 +0000 Improved error message when the PDO MySQL driver is not enabled. See SF Support Requests #2691. web/lib/MRBS/DBFactory.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) commit 353010156 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 11 14:59:03 2023 +0000 Improved detection of database type. See GitHub Issues #72. web/lib/MRBS/DB_mysql.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 83cc2878b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 10 18:04:36 2023 +0000 Upgraded to jQuery version 3.6.3. web/jquery/jquery-3.6.1.min.js (gone) | 2 - .../{jquery-3.6.1.js => jquery-3.6.3.js} | 108 +++++++++++++++-- web/jquery/jquery-3.6.3.min.js (new) | 2 + web/js.inc | 2 +- 4 files changed, 99 insertions(+), 15 deletions(-) commit 9260ed353 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 4 15:31:43 2023 +0000 Fixed potential bug when the display_name is not set. web/lib/MRBS/Auth/Auth.php | 4 ++++ 1 file changed, 4 insertions(+) commit 36b16a7f7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jan 31 17:47:21 2023 +0000 Simplified code. web/functions_mail.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 54efd8e54 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jan 31 17:32:36 2023 +0000 Fixed bug in mail notifications when a custom field is nullable. See SF Support Requests #2682. web/functions_mail.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 34a711f0f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 29 16:18:37 2023 +0000 Added an additional MIME type for importing zip files web/import.php | 1 + 1 file changed, 1 insertion(+) commit a58195223 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jan 25 17:53:33 2023 +0000 Changed jQuery UI theme to Cupertino ...diagonals-thick_90_eeeeee_40x40.png (new) | Bin 0 -> 432 bytes .../ui-bg_glass_100_e4f1fb_1x400.png (new) | Bin 0 -> 460 bytes .../ui-bg_glass_50_3baae3_1x400.png (new) | Bin 0 -> 446 bytes .../ui-bg_glass_80_d7ebf9_1x400.png (new) | Bin 0 -> 456 bytes ...highlight-hard_100_f2f5f7_1x100.png (new) | Bin 0 -> 442 bytes ..._highlight-hard_70_000000_1x100.png (new) | Bin 0 -> 362 bytes ...highlight-soft_100_deedf7_1x100.png (new) | Bin 0 -> 497 bytes ..._highlight-soft_25_ffef8f_1x100.png (new) | Bin 0 -> 419 bytes .../images/ui-icons_2694e8_256x240.png (new) | Bin 0 -> 4670 bytes .../images/ui-icons_2e83ff_256x240.png (new) | Bin 0 -> 4670 bytes .../images/ui-icons_3d80b3_256x240.png (new) | Bin 0 -> 4670 bytes .../images/ui-icons_72a7cf_256x240.png (new) | Bin 0 -> 4670 bytes .../images/ui-icons_ffffff_256x240.png (new) | Bin 0 -> 6539 bytes .../css/cupertino/jquery-ui.theme.css (new) | 446 +++++++++++++++++ .../cupertino/jquery-ui.theme.min.css (new) | 5 + .../ui/css/jquery-ui.structure.min.css | 2 +- web/jquery/ui/jquery-ui.js | 2 +- web/jquery/ui/jquery-ui.min.js | 2 +- web/js.inc | 2 +- web/style.inc | 2 +- 20 files changed, 456 insertions(+), 5 deletions(-) commit e6f47377b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jan 25 17:08:24 2023 +0000 Added a timeout to exit kiosk mode dialog box web/css/mrbs.css.php | 4 +++ web/js/index.js.php | 62 +++++++++++++++++++++++++++++------- web/js/resizable.js.php | 6 ++++ web/lang/lang.en | 3 ++ web/systemdefaults.inc.php | 3 ++ 5 files changed, 67 insertions(+), 11 deletions(-) commit aadf15f7e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 23 17:41:17 2023 +0000 Code formatting change web/js/kiosk.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 639876e46 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 23 17:39:20 2023 +0000 Added a timeout on the Exit Kiosk mode page - see SF Support Requests #2425. web/js/kiosk.js.php | 22 ++++++++++++++++++++-- web/systemdefaults.inc.php | 3 +++ 2 files changed, 23 insertions(+), 2 deletions(-) commit 2ff61d07b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 16 04:48:10 2023 +0000 Fixes bug in Serbian Cyrillic version of flatpickr web/js/flatpickr/l10n/sr-cyr.js | 2 +- web/language.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 7b1cc9688 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 16 04:41:02 2023 +0000 Fixes bug in Algerian version of flatpickr web/js/flatpickr/l10n/ar-dz.js | 2 +- web/language.inc | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) commit 5ca42131f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 16 04:40:35 2023 +0000 Improves robustness of code web/js/datepicker.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3461304d1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 16 03:26:49 2023 +0000 Fixes bug in Irish version of flatpickr web/js/flatpickr/l10n/ga.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4453853e5 Merge: 3a4bbaa8e 9ddf3028c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jan 13 21:13:33 2023 +0000 Merge pull request #71 from meeting-room-booking-system/issue_70 Upgrades flatpickr to 4.6.13 fixing GitHub Issue #70 commit 9ddf3028c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jan 13 21:11:07 2023 +0000 Upgrades flatpickr to 4.6.13 fixing GitHub Issue #70 web/js/flatpickr/css/flatpickr.min.css | 8 +-- web/js/flatpickr/flatpickr.min.js | 4 +- web/js/flatpickr/l10n/ar-dz.js (new) | 61 ++++++++++++++++++ web/js/flatpickr/l10n/ar.js | 24 ++++--- web/js/flatpickr/l10n/at.js | 15 ++--- web/js/flatpickr/l10n/az.js | 16 ++--- web/js/flatpickr/l10n/be.js | 14 ++--- web/js/flatpickr/l10n/bg.js | 14 ++--- web/js/flatpickr/l10n/bn.js | 14 ++--- web/js/flatpickr/l10n/bs.js | 14 ++--- web/js/flatpickr/l10n/cat.js | 17 ++--- web/js/flatpickr/l10n/ckb.js (new) | 76 ++++++++++++++++++++++ web/js/flatpickr/l10n/cs.js | 14 ++--- web/js/flatpickr/l10n/cy.js | 14 ++--- web/js/flatpickr/l10n/da.js | 14 ++--- web/js/flatpickr/l10n/de.js | 14 ++--- web/js/flatpickr/l10n/en.js | 13 ++-- web/js/flatpickr/l10n/eo.js | 14 ++--- web/js/flatpickr/l10n/es.js | 14 ++--- web/js/flatpickr/l10n/et.js | 14 ++--- web/js/flatpickr/l10n/fa.js | 14 ++--- web/js/flatpickr/l10n/fi.js | 78 +++++++++++------------ web/js/flatpickr/l10n/fo.js | 14 ++--- web/js/flatpickr/l10n/fr.js | 14 ++--- web/js/flatpickr/l10n/ga.js (new) | 66 +++++++++++++++++++ web/js/flatpickr/l10n/gr.js | 22 ++++--- web/js/flatpickr/l10n/he.js | 14 ++--- web/js/flatpickr/l10n/hi.js | 14 ++--- web/js/flatpickr/l10n/hr.js | 14 ++--- web/js/flatpickr/l10n/hu.js | 14 ++--- web/js/flatpickr/l10n/hy.js (new) | 78 +++++++++++++++++++++++ web/js/flatpickr/l10n/id.js | 14 ++--- web/js/flatpickr/l10n/is.js | 14 ++--- web/js/flatpickr/l10n/it.js | 14 ++--- web/js/flatpickr/l10n/ja.js | 18 +++--- web/js/flatpickr/l10n/ka.js | 14 ++--- web/js/flatpickr/l10n/km.js | 14 ++--- web/js/flatpickr/l10n/ko.js | 15 ++--- web/js/flatpickr/l10n/kz.js | 14 ++--- web/js/flatpickr/l10n/lt.js | 15 ++--- web/js/flatpickr/l10n/lv.js | 14 ++--- web/js/flatpickr/l10n/mk.js | 14 ++--- web/js/flatpickr/l10n/mn.js | 14 ++--- web/js/flatpickr/l10n/ms.js | 25 +++----- web/js/flatpickr/l10n/my.js | 14 ++--- web/js/flatpickr/l10n/nb.js | 80 +++++++++++++++++------- web/js/flatpickr/l10n/nl.js | 16 ++--- web/js/flatpickr/l10n/nn.js | 80 +++++++++++++++++------- web/js/flatpickr/l10n/no.js | 14 ++--- web/js/flatpickr/l10n/pa.js | 14 ++--- web/js/flatpickr/l10n/pl.js | 14 ++--- web/js/flatpickr/l10n/pt.js | 14 ++--- web/js/flatpickr/l10n/ro.js | 14 ++--- web/js/flatpickr/l10n/ru.js | 14 ++--- web/js/flatpickr/l10n/si.js | 14 ++--- web/js/flatpickr/l10n/sk.js | 14 ++--- web/js/flatpickr/l10n/sl.js | 14 ++--- web/js/flatpickr/l10n/sq.js | 21 ++++--- web/js/flatpickr/l10n/sr-cyr.js | 14 ++--- web/js/flatpickr/l10n/sr.js | 14 ++--- web/js/flatpickr/l10n/sv.js | 79 +++++++++++------------ web/js/flatpickr/l10n/th.js | 14 ++--- web/js/flatpickr/l10n/tr.js | 14 ++--- web/js/flatpickr/l10n/uk.js | 14 ++--- web/js/flatpickr/l10n/uz.js (new) | 75 ++++++++++++++++++++++ web/js/flatpickr/l10n/uz_latn.js (new) | 75 ++++++++++++++++++++++ web/js/flatpickr/l10n/vn.js | 18 +++--- web/js/flatpickr/l10n/zh-tw.js | 14 ++--- web/js/flatpickr/l10n/zh.js | 14 ++--- web/language.inc | 14 +++-- 70 files changed, 1076 insertions(+), 549 deletions(-) commit 3a4bbaa8e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jan 11 23:39:03 2023 +0000 Fixes return type declaration web/import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1fc090bb2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jan 11 22:08:24 2023 +0000 Fixed fatal infinite loop when using $auth["session_php"]["inactivity_expire_time"]. web/lib/MRBS/Session/SessionPhp.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 0dcae02a0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jan 11 05:48:56 2023 +0000 Fixes bugs when the description is null (which it can be when an event without a description is imported). web/functions_view.inc | 2 +- web/report.php | 6 +++--- web/search.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) commit 77b069681 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jan 11 05:36:51 2023 +0000 Better fix for when the description is null (which it can be when an event without a description is imported). web/functions_view.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 4df7f24cb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jan 10 22:23:48 2023 +0000 Fixes bugs when the description is null (which it can be when an event without a description is imported). web/functions_table.inc | 2 +- web/functions_view.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 85f36a782 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 9 21:40:37 2023 +0000 Fixes a fatal error if the strftime format can't be mapped to a suitable IntlDateFormatter one. web/language.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) commit 53538b537 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 9 06:03:57 2023 +0000 Adds comment. tables.my.sql | 2 +- tables.pg.sql | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) commit 335bbbcdb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 9 05:04:11 2023 +0000 Improves message. web/lang/lang.en | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 30777ca02 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 9 05:03:00 2023 +0000 Removes incomplete translations. web/lang/lang.it | 1 - web/lang/lang.th | 19 +++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) commit 334311350 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 9 04:57:02 2023 +0000 Improves internationalisation of language string. web/js/report.js.php | 84 ++++++++++++++++++-------------------- web/lang/lang.cs | 2 +- web/lang/lang.de | 2 +- web/lang/lang.en | 2 +- web/lang/lang.es | 2 +- web/lang/lang.fi | 2 +- web/lang/lang.fr | 2 +- web/lang/lang.hu | 2 +- web/lang/lang.id | 2 +- web/lang/lang.ja | 2 +- web/lang/lang.ms | 2 +- web/lang/lang.nb | 2 +- web/lang/lang.nl | 2 +- web/lang/lang.nn | 2 +- web/lang/lang.no | 2 +- web/lang/lang.pl | 2 +- web/lang/lang.ro | 2 +- web/lang/lang.sk | 2 +- web/lang/lang.sr-latn-rs | 2 +- web/lang/lang.sv | 2 +- web/lang/lang.zh-cn | 2 +- 21 files changed, 60 insertions(+), 64 deletions(-) commit ca5e61688 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 9 04:09:27 2023 +0000 Removes redundant variable web/js/report.js.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) commit 9c4c4d12b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 8 21:13:52 2023 +0000 Adds a progress bar and Cancel button while entries are being deleted from the Report page. See SF Support Requests #2672. web/css/mrbs.css.php | 20 +++ web/js/report.js.php | 288 +++++++++++++++++++++++++---------------- web/lang/lang.en | 2 + 3 files changed, 199 insertions(+), 111 deletions(-) commit 974c3e393 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jan 7 01:41:46 2023 +0000 Restores default behaviour of Search box in the header. See GitHub Issues #66. web/Themes/default/header.inc | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) commit e65b889b3 Merge: 792f6bb1f d1392d259 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jan 6 23:16:37 2023 +0000 Merge pull request #69 from Klap-in/patch-2 Update lang.nl commit 792f6bb1f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jan 6 23:11:17 2023 +0000 Remove redundant escape character in regex pattern. checklang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ceeff212c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jan 6 23:08:53 2023 +0000 Simplifies code checklang.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) commit d1392d259 Author: Gerrit Uitslag <klapinklapin@gmail.com> Date: Sat Jan 7 00:08:00 2023 +0100 Update lang.nl 'area' and 'room' are now consequently translated with 'gebouw' and 'ruimte'. web/lang/lang.nl | 544 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 420 insertions(+), 124 deletions(-) commit 11a5081be Merge: 61b7f4bb4 76a9dbada Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jan 6 22:52:11 2023 +0000 Merge pull request #68 from meeting-room-booking-system/issue_65 Fixes problem with multi-line vocab strings. See GitHub Issues #65. commit 76a9dbada Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jan 6 22:50:50 2023 +0000 Fixes problem with multi-line vocab strings. See GitHub Issues #65. checklang.php | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) commit 61b7f4bb4 Merge: 341c620a7 658041cd4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jan 6 20:29:02 2023 +0000 Merge pull request #67 from meeting-room-booking-system/issue_66 Fixes Issue 66 commit 658041cd4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jan 6 20:25:07 2023 +0000 Allows no from date to be used, resulting in all search results to be returned. See GitHub Issues #66. web/lang/lang.en | 1 + web/lang/lang.ms | 1 + web/search.php | 105 ++++++++++++++++++++++++--------------------- 3 files changed, 58 insertions(+), 49 deletions(-) commit 6408072a7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jan 6 19:03:07 2023 +0000 Fixes uncaught exception when an invalid date is given. Now today's date is used. See GitHub Issues #66. web/search.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit 341c620a7 Merge: 2cf332f6c 21703e6ee Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jan 6 00:14:11 2023 +0000 Merge pull request #64 from Klap-in/patch-1 checklang.php must not be called from the lang folder commit 2cf332f6c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jan 6 00:05:22 2023 +0000 Fixed duplicate language key web/js/index.js.php | 2 +- web/lang/lang.en | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 21703e6ee Author: Gerrit Uitslag <klapinklapin@gmail.com> Date: Fri Jan 6 01:04:37 2023 +0100 restore path LANGUAGE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit cb4959f9d Author: Gerrit Uitslag <klapinklapin@gmail.com> Date: Thu Jan 5 22:28:40 2023 +0100 checklang.php must not be called from the lang folder LANGUAGE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit efabbc4e1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Dec 30 21:29:17 2022 +0000 Simplifies code web/lib/MRBS/Session/SessionJoomla.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 44a4766f3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Dec 30 21:19:17 2022 +0000 Restructured web/lib/MRBS/Session/SessionJoomla.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) commit d3eea671f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Dec 30 20:52:14 2022 +0000 Simplifies code web/lib/MRBS/Session/SessionJoomla.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b4f4ca5a7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 29 19:38:30 2022 +0000 Fixes bug in email notifications when switching a series to a monthly repeat from another type. See SF Bugs #533. web/functions_mail.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 354758f6c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 29 18:16:35 2022 +0000 Fixes kiosk mode when using Joomla. See SF Support Requests #2671. web/functions.inc | 2 +- web/functions_error.inc | 3 + web/init.inc | 3 +- web/kiosk.php | 18 +++--- web/lib/MRBS/Form/Form.php | 76 +----------------------- web/lib/MRBS/Session/Session.php | 53 ++++++++--------- web/lib/MRBS/Session/SessionJoomla.php | 29 +++++++++ 7 files changed, 73 insertions(+), 111 deletions(-) commit 7bc5e9e1b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 29 16:15:43 2022 +0000 Fixes problem with previous fix web/standard_vars.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 7e5fcb6cf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 29 12:40:02 2022 +0000 Fixes another bug when running kiosk mode with periods. See SF Support Requests #2671. web/standard_vars.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit fe33a966d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 29 12:09:04 2022 +0000 Fixes bug when running kiosk mode with periods. See SF Support Requests #2671. web/functions_table.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit b7f0367d3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 27 18:05:39 2022 +0000 Added type declarations web/functions_mail.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit aef131b72 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 27 18:03:27 2022 +0000 Added type declarations web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 98a97c8ec Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 27 17:57:46 2022 +0000 Added type declarations web/del_entry.php | 2 +- web/mrbs_sql.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 293ec8ac2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 27 17:39:36 2022 +0000 Added type declarations web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 853072de8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 27 17:34:46 2022 +0000 Added type declarations web/functions_mail.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 58db3cd2d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 27 17:28:03 2022 +0000 Added type declarations web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f900a4fc4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 27 17:23:37 2022 +0000 Simplified code web/functions_mail.inc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) commit a65147d98 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 27 17:13:09 2022 +0000 Tweaked comment web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3dc84a506 (tag: mrbs-1_11_0) Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Dec 27 15:04:05 2022 +0000 Updated NEWS and ChangeLog for release of 1.11.0 ChangeLog | 7374 ++++++++++++++++++++++++++++++++++++++++++++++++++- NEWS | 196 ++ 2 files changed, 7533 insertions(+), 37 deletions(-) commit 66ed778a9 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Dec 27 14:24:16 2022 +0000 Updated version number for release of 1.11.0 web/version_num.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3995d9b52 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 21 10:24:00 2022 +0000 Made use of Control-Click terminology consistent web/lang/lang.en | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1e44e4876 Merge: 9e8fa1912 2c6bcc81e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 21 10:11:34 2022 +0000 Merge pull request #62 from meeting-room-booking-system/issue_61 Added a tooltip explaining how to deselect an option. See GitHub Iss… commit 2c6bcc81e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 21 10:05:34 2022 +0000 Added a tooltip explaining how to deselect an option. See GitHub Issues #61. web/edit_room.php | 23 ++++++++++++----------- web/lang/lang.en | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) commit 9e8fa1912 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 20 19:02:38 2022 +0000 Fixed more bugs when there's a comma in the display name. web/functions_mail.inc | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) commit d1e26f943 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Dec 19 19:07:04 2022 +0000 Fixed another bug when there's a comma in the display name. web/lib/MRBS/MailQueue.php | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) commit a9b2cd19c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Dec 19 12:22:59 2022 +0000 Fixed bug when there's a comma in the display name. See SF Support Requests #2655. web/functions_ical.inc | 3 +-- web/functions_mail.inc | 49 +++++++++++++++++++++------------------- 2 files changed, 27 insertions(+), 25 deletions(-) commit 44325d43c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 14 15:09:39 2022 +0000 Disabled everything except the form on the kiosk exit page web/js/kiosk.js.php | 27 ++++++++++++++++++++------- web/kiosk.php | 4 ++-- 2 files changed, 22 insertions(+), 9 deletions(-) commit 6e92cf4af Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 14 12:40:12 2022 +0000 Avoided an unnecessary redirection of Ajax refresh calls in kiosk mode web/js/refresh.js.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) commit 9a31158c5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 13 17:30:33 2022 +0000 Added a title attribute to the QR code web/Themes/default/header.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit a0f6bd7aa Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 13 17:11:11 2022 +0000 Disabled area and room selects when in kiosk mode web/index.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 6333fbdc4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 13 16:47:16 2022 +0000 Fixed bug in kiosk mode allowing users to get out of kiosk mode web/init.inc | 9 +++++---- web/kiosk.php | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) commit 40b52f598 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 13 12:40:55 2022 +0000 Fixed bug causing multiple confirm dialogs in kiosk mode web/js/index.js.php | 24 ++++++++++++++++++++++++ web/js/resizable.js.php | 24 ------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) commit 7304ed22a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 13 08:10:58 2022 +0000 Fixed bug in QR code when running in multisite mode web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ca24d49a1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Dec 12 22:59:19 2022 +0000 Updated licence info LICENSE | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) commit 2740f1867 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Dec 12 22:50:38 2022 +0000 Increased QR code size web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c5117bcc7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Dec 12 22:38:34 2022 +0000 Fixed bug when using kiosk mode on systems where the database doesn't support multiple locks web/lib/MRBS/Session/Session.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) commit 65150eda2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Dec 12 20:42:35 2022 +0000 Added a QR code in kiosk mode web/Themes/default/header.inc | 23 +- web/css/mrbs.css.php | 18 +- .../QRCode/Data/AlphaNum.php (new) | 60 ++ .../chillerlan/QRCode/Data/Byte.php (new) | 43 + .../chillerlan/QRCode/Data/Kanji.php (new) | 71 ++ .../QRCode/Data/MaskPatternTester.php (new) | 206 +++++ .../chillerlan/QRCode/Data/Number.php (new) | 79 ++ .../Data/QRCodeDataException.php (new) | 17 + .../QRCode/Data/QRDataAbstract.php (new) | 318 +++++++ .../QRCode/Data/QRDataInterface.php (new) | 200 +++++ .../QRCode/Data/QRMatrix.php (new) | 748 +++++++++++++++++ .../QRCode/Helpers/BitBuffer.php (new) | 90 ++ .../QRCode/Helpers/Polynomial.php (new) | 179 ++++ .../Output/QRCodeOutputException.php (new) | 17 + .../QRCode/Output/QRFpdf.php (new) | 115 +++ .../QRCode/Output/QRImage.php (new) | 233 +++++ .../QRCode/Output/QRImagick.php (new) | 121 +++ .../QRCode/Output/QRMarkup.php (new) | 162 ++++ .../QRCode/Output/QROutputAbstract.php (new) | 134 +++ .../Output/QROutputInterface.php (new) | 54 ++ .../QRCode/Output/QRString.php (new) | 77 ++ web/lib/chillerlan/QRCode/QRCode.php (new) | 321 +++++++ .../QRCode/QRCodeException.php (new) | 20 + .../chillerlan/QRCode/QROptions.php (new) | 54 ++ .../QRCode/QROptionsTrait.php (new) | 348 ++++++++ .../SettingsContainerAbstract.php (new) | 166 ++++ .../SettingsContainerInterface.php (new) | 74 ++ web/systemdefaults.inc.php | 4 + 28 files changed, 3950 insertions(+), 2 deletions(-) commit efcdf136b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 11 18:54:28 2022 +0000 Added type declarations web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 06bc6c7cf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 8 13:44:57 2022 +0000 Upgraded to PHPMailer 6.7.1 web/lib/PHPMailer/README.md | 4 ++-- web/lib/PHPMailer/VERSION | 2 +- web/lib/PHPMailer/composer.json | 7 ++++--- web/lib/PHPMailer/src/PHPMailer.php | 2 +- web/lib/PHPMailer/src/POP3.php | 2 +- web/lib/PHPMailer/src/SMTP.php | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) commit a035348d0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 7 21:28:37 2022 +0000 Made the DataTables stateSave and stateDuration options configurable and changed the default for stateDuration from 7200 seconds to 0 (ie indefinite). web/js/datatables.js.php | 3 ++- web/systemdefaults.inc.php | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) commit 45b3358f4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 6 17:13:22 2022 +0000 Added comment web/lib/MRBS/Session/Session.php | 3 +++ 1 file changed, 3 insertions(+) commit d7d239782 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 6 15:53:09 2022 +0000 Fixed bug causing incorrect link to previous page on view_entry.php web/init.inc | 5 ----- web/lib/MRBS/Session/Session.php | 18 ++++++++++++++++++ web/lib/MRBS/Session/SessionWithLogin.php | 6 ++++-- 3 files changed, 22 insertions(+), 7 deletions(-) commit dff6ab83d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Dec 5 17:55:02 2022 +0000 Upgraded to PHPMailer Version 6.7 web/lib/PHPMailer/README.md | 18 ++--- web/lib/PHPMailer/VERSION | 2 +- web/lib/PHPMailer/composer.json | 3 +- web/lib/PHPMailer/get_oauth_token.php | 25 ++++++- .../PHPMailer/language/phpmailer.lang-es.php | 4 ++ web/lib/PHPMailer/src/PHPMailer.php | 62 ++++++++++++++---- web/lib/PHPMailer/src/POP3.php | 9 ++- web/lib/PHPMailer/src/SMTP.php | 2 +- 8 files changed, 97 insertions(+), 28 deletions(-) commit be29f5c7a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 4 20:25:32 2022 +0000 Replaced expression with ?? version web/import.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 8235cc1f4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 4 20:23:03 2022 +0000 Added type declaration web/import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 979d449ae Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 4 20:20:08 2022 +0000 Replaced qualifier with an import web/import.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 3af69d2c2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Dec 4 20:17:23 2022 +0000 Added type declaration web/import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 264039fae Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Dec 2 12:55:52 2022 +0000 Fixed E_USER_NOTICE error (Invalid email address "Display Name <>") when the booker doesn't have an email address. web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e358e6cdd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Nov 30 21:42:30 2022 +0000 Added type declarations web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9ef174455 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Nov 30 18:25:41 2022 +0000 Added type declarations web/functions_ical.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 70b8c7293 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Nov 30 17:56:27 2022 +0000 Fixed typo in comment web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b30aa1439 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 29 21:53:49 2022 +0000 Tightened type declarations web/functions_ical.inc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) commit 702ef3c3a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 29 21:40:15 2022 +0000 Added type declarations web/functions_ical.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit a453f2e98 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 29 21:34:11 2022 +0000 Added type declarations web/functions_ical.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 6c29f718e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 29 21:31:07 2022 +0000 Removed unnecessary local variable web/functions_ical.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 927e00e66 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 29 21:30:18 2022 +0000 Added type declarations web/functions_ical.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 0e7d4a149 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 29 21:28:31 2022 +0000 Added type declarations web/functions_ical.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit ef9fcb9aa Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 29 21:25:11 2022 +0000 Added type declarations web/functions_ical.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 1415f1bec Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 29 18:27:48 2022 +0000 Simplified code web/functions_ical.inc | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) commit e235517ca Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 29 16:26:12 2022 +0000 Fixed bug when importing a series with INTERVAL > 1. See SF Support Requests #2656. web/functions_ical.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 8247e4580 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 28 08:29:31 2022 +0000 Fixed bug when get_mrbs_version() is called more than once. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b8b9cd5ce Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 27 19:13:25 2022 +0000 Removed unnecessary space in PRODID web/functions_ical.inc | 2 +- web/version.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 5f33073f0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 27 18:53:42 2022 +0000 Fixed bug causing the MRBS version number not to appear in the iCalendar PRODID web/version.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit 2c436e346 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 26 18:47:48 2022 +0000 Added type declarations web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e1eaf3585 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 26 18:38:27 2022 +0000 Fixed when importing events with a relative monthly repeat (eg "every third Tuesday"). web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 448d821bd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 26 18:07:33 2022 +0000 Removed unnecessary leading '\' web/import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1833c3928 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 26 18:03:53 2022 +0000 Removed unnecessary leading '\' web/lib/MRBS/Auth/AuthWordpress.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1d3086cbd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 26 18:02:12 2022 +0000 Removed unnecessary qualifiers web/reset_password.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 0ff80c4bc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Nov 25 18:38:44 2022 +0000 Fixed bug when using $git_command web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a845dbb1e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Nov 25 18:34:51 2022 +0000 Made method declarations consistent with parent web/lib/MRBS/Session/SessionCas.php | 2 +- web/lib/MRBS/Session/SessionCookie.php | 2 +- web/lib/MRBS/Session/SessionJoomla.php | 2 +- web/lib/MRBS/Session/SessionSaml.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) commit 96b386474 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Nov 25 18:34:05 2022 +0000 Added return type declaration web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f9c6a4902 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 24 21:15:15 2022 +0000 Allowed refreshing over a metered connection when in kiosk mode, because refreshing is the whole point of kiosk mode. web/js/refresh.js.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit 068e73e49 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 24 21:14:02 2022 +0000 Fixed bug preventing refresh working in kiosk mode web/js/resizable.js.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit dec9020f1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Nov 23 18:14:00 2022 +0000 Added the ability to define paper size and page orientation for Excel output. web/js/datatables.js.php | 41 ++++++++++++++++++++++++++++++++++-- web/systemdefaults.inc.php | 11 ++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) commit 46f471701 Merge: 32d117c0d fb9019d59 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 22 14:54:24 2022 +0000 Merge pull request #60 from Stachelritter/update-translation Update translation commit fb9019d59 Author: Fabian Ascheberg <88002233+Stachelritter@users.noreply.github.com> Date: Tue Nov 22 15:24:52 2022 +0100 Removed whitespace web/lang/lang.de | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0b635a748 Author: Fabian Ascheberg <88002233+Stachelritter@users.noreply.github.com> Date: Tue Nov 22 14:57:13 2022 +0100 Updated german translations web/lang/lang.de | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) commit 32d117c0d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 22 12:23:21 2022 +0000 Fixed bug when there are more than 60 periods web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 36ed17bb7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 22 12:16:28 2022 +0000 Restructured web/lib/MRBS/EntryInterval.php | 35 +++++++++++++++++++++++++++++--- web/mrbs_sql.inc | 15 +------------- 2 files changed, 33 insertions(+), 17 deletions(-) commit 9a832e19c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 22 11:56:19 2022 +0000 Provided a vocab tag for unknown periods web/functions.inc | 7 +++++++ web/lang/lang.en | 1 + web/mrbs_sql.inc | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) commit f5f90404a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 22 11:26:12 2022 +0000 Fixed bug when there are more than 60 periods web/functions.inc | 11 +++++++++++ web/mrbs_sql.inc | 5 +---- 2 files changed, 12 insertions(+), 4 deletions(-) commit edc155068 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 22 11:13:28 2022 +0000 Changed function names web/functions.inc | 6 +++--- web/functions_table.inc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) commit cacceb615 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 22 10:40:17 2022 +0000 Improved error message in the event of a clash with an invisible booking web/mrbs_sql.inc | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) commit 10ad2fe85 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 22 10:07:54 2022 +0000 Reversed decision in last commit to allow a booking to clash with an invisible period, because it will create problems if the number of periods is subsequently increased. web/mrbs_sql.inc | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) commit 5901e38c9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 21 19:01:15 2022 +0000 Fixed bug in checking for clashes when using periods and the new booking would "clash" with an existing booking that takes place in periods that no longer exist (because the number of periods has been reduced since the booking was created). It seems reasonable not to treat this as a clash because we have no idea when periods take place. web/lib/MRBS/EntryInterval.php | 8 ++++ web/mrbs_sql.inc | 63 +++++++++++++++++++++++--------- 2 files changed, 54 insertions(+), 17 deletions(-) commit 8f79999ff Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 20 18:04:12 2022 +0000 Removed redundant use statement web/kiosk.php | 1 - 1 file changed, 1 deletion(-) commit c480dc884 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 20 17:19:46 2022 +0000 Enabled kiosk refresh web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8ecadcfa1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 20 17:06:25 2022 +0000 Added some form instructions. web/kiosk.php | 3 +++ web/lang/lang.en | 2 ++ 2 files changed, 5 insertions(+) commit 18f778f5e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 20 16:51:56 2022 +0000 Added toggling of room and area selects depending on mode web/js/kiosk.js.php (new) | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) commit 362d81715 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 20 16:26:00 2022 +0000 Ensured index.php can always be accessed when in kiosk mode web/mrbs_auth.inc | 6 ++++++ 1 file changed, 6 insertions(+) commit bb0c71ac5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 20 16:02:03 2022 +0000 Fixed bug in last commit web/init.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit a41c276e9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 20 15:40:15 2022 +0000 Prevented users trying to reach anywhere other than index.php when in kiosk mode. web/init.inc | 8 ++++++++ 1 file changed, 8 insertions(+) commit 92674d2fc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 20 15:11:44 2022 +0000 Disabled inactivity timeout when in kiosk mode web/functions.inc | 8 ++++++++ web/lib/MRBS/Session/SessionPhp.php | 11 +++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) commit 63cc549f3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 20 14:58:06 2022 +0000 Set session cookie lifetime to 0 (on browser close) when in kiosk mode web/init.inc | 5 ++++- web/kiosk.php | 2 +- web/lib/MRBS/Session/Session.php | 15 ++++----------- 3 files changed, 9 insertions(+), 13 deletions(-) commit 2fe2458b8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 20 14:43:47 2022 +0000 Added kiosk.php to get_page_level() web/mrbs_auth.inc | 1 + 1 file changed, 1 insertion(+) commit 17ad1fa34 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 19 18:33:44 2022 +0000 Added a way to get out of kiosk mode LICENSE | 11 +++ web/functions.inc | 23 ++++- web/js/functions.js.php | 187 +++++++++++++++++++++++++++++++++++ web/js/resizable.js.php | 12 +++ web/kiosk.php | 203 ++++++++++++++++++++++++++++---------- web/lang/lang.en | 5 +- 6 files changed, 387 insertions(+), 54 deletions(-) commit aac8366d2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 19 10:53:37 2022 +0000 Tweaked comment web/mrbs_auth.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f41f9da32 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 17 18:48:38 2022 +0000 More on kiosk mode. Provided a way to enter kiosk mode. Still need an exit. web/Themes/default/header.inc | 12 ++- web/kiosk.php (new) | 159 ++++++++++++++++++++++++++++++++ web/lang/lang.en | 5 + web/systemdefaults.inc.php | 6 ++ 4 files changed, 179 insertions(+), 3 deletions(-) commit 737724e66 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 17 18:16:11 2022 +0000 Fixed layout problem introduced in recent commit web/css/mrbs.css.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit d8eb07768 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 15 18:59:52 2022 +0000 Fixed problem with kiosk mode web/js/resizable.js.php | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) commit 11ac281af Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 14 19:08:09 2022 +0000 Added type declarations web/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6e7e407bf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 14 19:01:51 2022 +0000 Simplified code web/search.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) commit 2704bb19d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 14 18:57:28 2022 +0000 Added type declarations web/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 74fd870c2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 14 18:48:55 2022 +0000 Replaced qualifiers with imports web/report.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit d4bf8d182 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 14 18:39:25 2022 +0000 Added type declarations web/report.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 550d4e36c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 14 18:34:55 2022 +0000 Added type declarations web/report.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 625eb60b8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 14 18:29:56 2022 +0000 Added type declarations web/report.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit e8e8e6956 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 14 15:44:56 2022 +0000 Added type declarations web/report.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2ac159273 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 14 15:39:01 2022 +0000 Replaced expression with ?? web/report.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5cac5e1ab Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 14 15:37:55 2022 +0000 Added type declarations web/report.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit 30e5d48b3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 14 15:05:19 2022 +0000 Added aria-labels web/report.php | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) commit d468cf8ac Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 14 14:58:48 2022 +0000 Added aria-labels web/report.php | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) commit e2727d773 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 14 14:41:36 2022 +0000 Added aria-labels web/edit_entry.php | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) commit 0ccc832e5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 13 17:53:18 2022 +0000 Added aria-label web/Themes/default/header.inc | 1 + web/js/datepicker.js.php | 6 ++++++ 2 files changed, 7 insertions(+) commit 5db4d9b0f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Nov 11 12:28:12 2022 +0000 Improved menu layout, especially on narrow screens web/css/mrbs.css.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) commit 16adf2a1b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Nov 11 11:41:39 2022 +0000 Fixed problem with menu on narrow screens web/css/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit b79eacced Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Nov 11 11:16:48 2022 +0000 Fixed problem with menu on narrow screens web/css/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit fb2766460 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 6 08:20:27 2022 +0000 Fixed recently introduced bug web/functions.inc | 16 ++++++++++++++++ web/lib/MRBS/Session/SessionPhp.php | 8 +++++--- 2 files changed, 21 insertions(+), 3 deletions(-) commit e6b6cf95c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:34:04 2022 +0000 Removed unnecessary leading '\' web/lib/MRBS/Auth/AuthJoomla.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit d9569b578 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:32:16 2022 +0000 Simplified code web/lib/MRBS/Auth/AuthImap.php | 1 - 1 file changed, 1 deletion(-) commit 6da230291 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:30:04 2022 +0000 Removed unnecessary leading '\' web/lib/MRBS/Auth/AuthIdcheck.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 25a1a1150 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:28:26 2022 +0000 Replaced qualifier with import web/lib/MRBS/Auth/AuthConfig.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 04b74477c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:27:24 2022 +0000 Simplified code web/lib/MRBS/Auth/Auth.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 680c908d4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:26:40 2022 +0000 Replaced qualifier with import web/lib/MRBS/Auth/Auth.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 9aaaf4aad Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:25:13 2022 +0000 Removed unnecessary leading '\' web/lib/MRBS/Auth/Auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d9430d0d4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:24:25 2022 +0000 Removed unnecessary local variable web/lib/MRBS/Session/SessionWordpress.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 65de6afd3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:23:25 2022 +0000 Replaced qualifier with import web/lib/MRBS/Session/SessionWordpress.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 77569042b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:18:16 2022 +0000 Removed unnecessary leading '\' web/lib/MRBS/Session/SessionSaml.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2c2800307 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:17:46 2022 +0000 Replaced qualifiers with imports web/lib/MRBS/Session/SessionSaml.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit c25543b3f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:16:45 2022 +0000 Replaced 'if' with ?? web/lib/MRBS/Session/SessionSaml.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) commit f7198abc7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:15:21 2022 +0000 Replaced qualifier with import web/lib/MRBS/Session/SessionRemoteUser.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 91942d3ea Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:14:30 2022 +0000 Replaced qualifier with import web/lib/MRBS/Session/SessionOmni.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit b5d947312 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:14:04 2022 +0000 Replaced qualifier with import web/lib/MRBS/Session/SessionNt.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit a71c805fa Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:13:40 2022 +0000 Replaced qualifier with import web/lib/MRBS/Session/SessionJoomla.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 789902a40 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:12:33 2022 +0000 Removed unnecessary leading '\' web/lib/MRBS/Session/SessionJoomla.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8ba8fd164 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:11:46 2022 +0000 Replaced qualifier with import web/lib/MRBS/Session/SessionIp.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit d03143be6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:11:06 2022 +0000 Replaced qualifier with import web/lib/MRBS/Session/SessionHttp.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit c82a86fe6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:10:14 2022 +0000 Replaced qualifier with import web/lib/MRBS/Session/SessionHost.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 357397ea8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 18:09:25 2022 +0000 Added type declaration web/lib/MRBS/Session/SessionCookie.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1c3ae9d98 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 17:08:14 2022 +0000 Added support for Galego and Portuguese phpCAS languages web/lib/MRBS/Auth/AuthCas.php | 3 +++ 1 file changed, 3 insertions(+) commit 9c24b1e52 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 16:41:17 2022 +0000 Replaced qualifiers with imports web/lib/MRBS/Session/SessionCas.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 49e6b53c4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 16:39:34 2022 +0000 Replaced qualifiers with imports web/lib/MRBS/Session/SessionCas.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 3ed0dac33 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 16:38:00 2022 +0000 Replaced qualifier with import web/lib/MRBS/Auth/AuthCas.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 820074139 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 16:35:52 2022 +0000 Removed unnecessary leading '\' web/lib/MRBS/Auth/AuthCas.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1f20b4f41 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 16:31:52 2022 +0000 Upgraded to phpCAS 1.6.0. See SF Bugs #532. web/lib/CAS.php | 183 +- web/lib/CAS/AuthenticationException.php | 20 +- web/lib/CAS/Autoload.php | 31 +- web/lib/CAS/Client.php | 1423 ++++++++++------ web/lib/CAS/CookieJar.php | 6 +- web/lib/CAS/Exception.php | 4 +- .../CAS/GracefullTerminationException.php | 8 +- web/lib/CAS/InvalidArgumentException.php | 4 +- web/lib/CAS/Languages/Catalan.php | 2 +- web/lib/CAS/Languages/ChineseSimplified.php | 4 +- web/lib/CAS/Languages/English.php | 4 +- web/lib/CAS/Languages/French.php | 4 +- web/lib/CAS/Languages/Galego.php (new) | 117 ++ web/lib/CAS/Languages/German.php | 2 +- web/lib/CAS/Languages/Greek.php | 2 +- web/lib/CAS/Languages/Japanese.php | 2 +- web/lib/CAS/Languages/LanguageInterface.php | 4 +- web/lib/CAS/Languages/Portuguese.php (new) | 114 ++ web/lib/CAS/Languages/Spanish.php | 2 +- ...enceBeforeAuthenticationCallException.php | 2 +- .../OutOfSequenceBeforeClientException.php | 2 +- .../OutOfSequenceBeforeProxyException.php | 2 +- web/lib/CAS/OutOfSequenceException.php | 2 +- web/lib/CAS/PGTStorage/AbstractStorage.php | 12 +- web/lib/CAS/PGTStorage/Db.php | 24 +- web/lib/CAS/PGTStorage/File.php | 12 +- web/lib/CAS/ProxiedService.php | 2 +- web/lib/CAS/ProxiedService/Abstract.php | 2 +- web/lib/CAS/ProxiedService/Exception.php | 2 +- web/lib/CAS/ProxiedService/Http.php | 2 +- web/lib/CAS/ProxiedService/Http/Abstract.php | 6 +- web/lib/CAS/ProxiedService/Http/Get.php | 2 +- web/lib/CAS/ProxiedService/Http/Post.php | 2 +- web/lib/CAS/ProxiedService/Imap.php | 3 +- web/lib/CAS/ProxiedService/Testable.php | 2 +- web/lib/CAS/ProxyChain.php | 2 +- web/lib/CAS/ProxyChain/AllowedList.php | 4 +- web/lib/CAS/ProxyChain/Any.php | 2 +- web/lib/CAS/ProxyChain/Interface.php | 4 +- web/lib/CAS/ProxyChain/Trusted.php | 2 +- web/lib/CAS/ProxyTicketException.php | 2 +- web/lib/CAS/README.md (new) | 35 + web/lib/CAS/Request/AbstractRequest.php | 3 +- web/lib/CAS/Request/CurlMultiRequest.php | 5 +- web/lib/CAS/Request/CurlRequest.php | 26 +- web/lib/CAS/Request/Exception.php | 2 +- .../CAS/Request/MultiRequestInterface.php | 4 +- web/lib/CAS/Request/RequestInterface.php | 2 +- .../AllowedListDiscovery.php (new) | 152 ++ web/lib/CAS/ServiceBaseUrl/Base.php (new) | 98 ++ .../CAS/ServiceBaseUrl/Interface.php (new) | 61 + web/lib/CAS/ServiceBaseUrl/Static.php (new) | 69 + web/lib/CAS/Session/PhpSession.php (new) | 45 + web/lib/CAS/TypeMismatchException.php | 2 +- web/lib/MRBS/Auth/AuthCas.php | 29 +- web/lib/MRBS/Session/SessionCas.php | 6 + web/systemdefaults.inc.php | 3 + 57 files changed, 1887 insertions(+), 686 deletions(-) commit bcac31070 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Nov 5 08:59:47 2022 +0000 Reinstated code to set the session scheme if it hasn't been already (it was removed in a recent commit, but existing sites may rely on it). web/init.inc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) commit 9b2f2836e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Nov 4 18:32:20 2022 +0000 Fixed bug when using CAS authentication web/defaultincludes.inc | 2 +- web/init.inc | 28 +++++--------------- web/lib/MRBS/Session/SessionCas.php | 5 ++-- web/mrbs_auth.inc | 38 ++++++++++++--------------- 4 files changed, 28 insertions(+), 45 deletions(-) commit bf9ad5825 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Nov 4 17:11:42 2022 +0000 Added a fix to get rid of cookies with the wrong path (due to a previous problem with get_cookie_path() ). web/lib/MRBS/Session/SessionPhp.php | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) commit 3c8877f06 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Nov 4 13:49:21 2022 +0000 Added missing magic methods web/lib/MRBS/User.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit f6431cb6d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 3 17:15:21 2022 +0000 Fixed bug causing an unnecessary triggering of an "undefined class constant" error when PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT does not exist. web/lib/MRBS/DB_mysql.php | 80 ++++++++++++++++++++++++++++-------- web/systemdefaults.inc.php | 3 +- 2 files changed, 65 insertions(+), 18 deletions(-) commit 98149e060 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Nov 2 17:55:31 2022 +0000 Fixed bug when a connection could not be established web/lib/MRBS/DB.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) commit 256f5ecec Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 1 14:47:20 2022 +0000 Added expiry if the session cookie on logoff web/lib/MRBS/Session/SessionPhp.php | 7 +++++++ 1 file changed, 7 insertions(+) commit 90ceeb8a0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 1 14:46:08 2022 +0000 Further fix to get_cookie_path() web/functions.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit cb7432004 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 1 13:52:16 2022 +0000 Fixed occasional incorrect determination of cookie path web/functions.inc | 5 +++++ 1 file changed, 5 insertions(+) commit 9e6520182 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 29 15:45:51 2022 +0100 Fixed problem with PostgreSQL locking introduced in a recent commit. web/lib/MRBS/DB_pgsql.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) commit 163fda6b8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 29 14:55:12 2022 +0100 Added support for database driver options. See SF Support Requests #2634. web/dbsys.inc | 4 ++-- web/lib/MRBS/DB.php | 29 ++++++++++++++++++++++++++++- web/lib/MRBS/DBFactory.php | 7 ++++--- web/lib/MRBS/DB_mysql.php | 23 +++++++++++++++++++++-- web/lib/MRBS/DB_pgsql.php | 20 +++++++++++++++++--- web/systemdefaults.inc.php | 32 ++++++++++++++++++++++++++++++++ web/upgrade.inc | 2 +- 7 files changed, 105 insertions(+), 12 deletions(-) commit 6d09136fc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 28 18:06:17 2022 +0100 Updated comments web/systemdefaults.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit e06cc4ba2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 26 17:13:47 2022 +0100 Updated comment web/lib/MRBS/Form/Form.php | 2 ++ 1 file changed, 2 insertions(+) commit 1398e1359 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 23 17:59:31 2022 +0100 Added French translations. Thanks to Philippe. web/lang/lang.fr | 2 ++ 1 file changed, 2 insertions(+) commit 692383085 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 23 17:51:34 2022 +0100 Added missing variable web/Themes/classic126/styling.inc | 1 + 1 file changed, 1 insertion(+) commit d915b3ab2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 23 16:36:26 2022 +0100 Tweaked error message web/lib/MRBS/DateTime.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) commit de57a3353 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 23 16:20:28 2022 +0100 Restructured web/lib/MRBS/DateTime.php | 64 ++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 32 deletions(-) commit 06415017d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 23 15:56:13 2022 +0100 Improved validation of $holidays web/lib/MRBS/DateTime.php | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) commit 7f6c10701 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 22 18:51:14 2022 +0100 Minor change to code to keep PHPStorm happy web/functions_table.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit f823ec17c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 22 17:03:40 2022 +0100 Prevented ordinary users from clicking on holiday and weekend links when they are not allowed to (month view) web/functions_table.inc | 43 +++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 15 deletions(-) commit 25c508fb2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 22 16:46:22 2022 +0100 Prevented ordinary users from clicking on holiday and weekend links when they are not allowed to. web/css/mrbs.css.php | 7 +++++++ web/functions_table.inc | 15 ++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) commit 169e040cf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 22 14:48:14 2022 +0100 Added styling for weekend holidays web/Themes/classic126/styling.inc | 10 +++++---- web/Themes/default/styling.inc | 9 +++++--- web/css/mrbs.css.php | 35 +++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 7 deletions(-) commit 4fbe28751 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 22 13:43:57 2022 +0100 Added styling for weekends web/Themes/classic126/styling.inc | 3 +++ web/Themes/default/header.inc | 7 +++++- web/Themes/default/styling.inc | 3 +++ web/css/mrbs.css.php | 35 +++++++++++++++++++++++++++++ web/systemdefaults.inc.php | 3 +++ 5 files changed, 50 insertions(+), 1 deletion(-) commit 2b89b5c82 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 22 12:22:39 2022 +0100 Added the ability to prevent bookings at weekends web/lang/lang.en | 1 + web/lib/MRBS/EntryInterval.php | 31 +++++++++++++++++++++++++++++-- web/mrbs_sql.inc | 12 ++++++++++-- web/systemdefaults.inc.php | 4 ++++ 4 files changed, 44 insertions(+), 4 deletions(-) commit 5d4a68150 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 22 11:35:25 2022 +0100 Restructured web/lib/MRBS/EntryInterval.php (new) | 44 ++++++++++++++++++++++++++ web/mrbs_sql.inc | 18 ++--------- 2 files changed, 47 insertions(+), 15 deletions(-) commit fb57ec363 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 21 18:51:07 2022 +0100 Corrected typo in comment web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 806776754 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 21 18:47:45 2022 +0100 Corrected typo in comment web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2934f9c46 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 21 18:41:08 2022 +0100 Added policy to stop booking on holidays web/lang/lang.en | 1 + web/language.inc | 2 +- web/mrbs_sql.inc | 26 ++++++++++++++++++++++++-- web/systemdefaults.inc.php | 5 +++++ 4 files changed, 31 insertions(+), 3 deletions(-) commit e3d74a0b1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 21 17:41:54 2022 +0100 Improved performance of holiday calculation web/lib/MRBS/DateTime.php | 93 +++++++++++++++++++++++-------------- 1 file changed, 59 insertions(+), 34 deletions(-) commit 18097f356 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 21 10:27:30 2022 +0100 Added validation of holiday dates web/lib/MRBS/DateTime.php | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) commit f3ae7237f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 21 10:05:32 2022 +0100 Allowed date ranges in holidays web/lib/MRBS/DateTime.php | 24 ++++++++++++++++++++++-- web/systemdefaults.inc.php | 2 ++ 2 files changed, 24 insertions(+), 2 deletions(-) commit 2b98dc5fd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 21 09:34:58 2022 +0100 Indexed $holidays by year web/lib/MRBS/DateTime.php | 22 ++++++++++++++++++---- web/systemdefaults.inc.php | 4 ++-- 2 files changed, 20 insertions(+), 6 deletions(-) commit 2fae70d3f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 21 09:21:12 2022 +0100 Fixed bug introduced in recent commit web/css/mrbs.css.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 9a8dfad45 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 21 09:08:39 2022 +0100 Added styling for holidays in the header cells web/css/mrbs.css.php | 5 +++++ 1 file changed, 5 insertions(+) commit 08aa384b2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 20 18:33:41 2022 +0100 Added styling for holidays web/Themes/classic126/styling.inc | 7 +++++-- web/Themes/default/styling.inc | 9 +++++--- web/css/mrbs.css.php | 32 ++++++++++++++++++++++++++++- 3 files changed, 42 insertions(+), 6 deletions(-) commit 34c807310 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 20 17:51:06 2022 +0100 Added in support for holidays web/functions_table.inc | 60 +++++++++++++++++++++++------------- web/lib/MRBS/DateTime.php | 25 ++++++++++++++- web/systemdefaults.inc.php | 4 +++ 3 files changed, 66 insertions(+), 23 deletions(-) commit 697ad551c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 20 16:34:57 2022 +0100 Added class for weekend days to the all room view web/functions_table.inc | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) commit d23645b72 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 20 16:21:38 2022 +0100 Added class for weekend days to the month view main body web/functions_table.inc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) commit 42671d24a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 20 16:09:26 2022 +0100 Added class for weekend days to the day and week views main body web/functions.inc | 3 ++- web/functions_table.inc | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) commit 8706e29fc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 19 18:10:26 2022 +0100 Updated tzurl files .../zoneinfo-outlook/Africa/Abidjan.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Accra.ics | 10 +- .../zoneinfo-outlook/Africa/Addis_Ababa.ics | 4 +- .../zoneinfo-outlook/Africa/Algiers.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Asmara.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Bamako.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Bangui.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Banjul.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Bissau.ics | 4 +- .../zoneinfo-outlook/Africa/Blantyre.ics | 4 +- .../zoneinfo-outlook/Africa/Brazzaville.ics | 4 +- .../zoneinfo-outlook/Africa/Bujumbura.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Cairo.ics | 4 +- .../zoneinfo-outlook/Africa/Casablanca.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Ceuta.ics | 4 +- .../zoneinfo-outlook/Africa/Conakry.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Dakar.ics | 4 +- .../Africa/Dar_es_Salaam.ics | 4 +- .../zoneinfo-outlook/Africa/Djibouti.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Douala.ics | 4 +- .../zoneinfo-outlook/Africa/El_Aaiun.ics | 4 +- .../zoneinfo-outlook/Africa/Freetown.ics | 4 +- .../zoneinfo-outlook/Africa/Gaborone.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Harare.ics | 4 +- .../zoneinfo-outlook/Africa/Johannesburg.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Juba.ics | 10 +- .../zoneinfo-outlook/Africa/Kampala.ics | 4 +- .../zoneinfo-outlook/Africa/Khartoum.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Kigali.ics | 4 +- .../zoneinfo-outlook/Africa/Kinshasa.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Lagos.ics | 4 +- .../zoneinfo-outlook/Africa/Libreville.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Lome.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Luanda.ics | 4 +- .../zoneinfo-outlook/Africa/Lubumbashi.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Lusaka.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Malabo.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Maputo.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Maseru.ics | 4 +- .../zoneinfo-outlook/Africa/Mbabane.ics | 4 +- .../zoneinfo-outlook/Africa/Mogadishu.ics | 4 +- .../zoneinfo-outlook/Africa/Monrovia.ics | 4 +- .../zoneinfo-outlook/Africa/Nairobi.ics | 4 +- .../zoneinfo-outlook/Africa/Ndjamena.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Niamey.ics | 4 +- .../zoneinfo-outlook/Africa/Nouakchott.ics | 4 +- .../zoneinfo-outlook/Africa/Ouagadougou.ics | 4 +- .../zoneinfo-outlook/Africa/Porto-Novo.ics | 4 +- .../zoneinfo-outlook/Africa/Sao_Tome.ics | 4 +- .../zoneinfo-outlook/Africa/Tripoli.ics | 4 +- web/tzurl/zoneinfo-outlook/Africa/Tunis.ics | 4 +- .../zoneinfo-outlook/Africa/Windhoek.ics | 4 +- web/tzurl/zoneinfo-outlook/America/Adak.ics | 4 +- .../zoneinfo-outlook/America/Anchorage.ics | 4 +- .../zoneinfo-outlook/America/Anguilla.ics | 10 +- .../zoneinfo-outlook/America/Antigua.ics | 10 +- .../zoneinfo-outlook/America/Araguaina.ics | 4 +- .../America/Argentina/Buenos_Aires.ics | 4 +- .../America/Argentina/Catamarca.ics | 4 +- .../America/Argentina/Cordoba.ics | 4 +- .../America/Argentina/Jujuy.ics | 4 +- .../America/Argentina/La_Rioja.ics | 4 +- .../America/Argentina/Mendoza.ics | 4 +- .../America/Argentina/Rio_Gallegos.ics | 4 +- .../America/Argentina/Salta.ics | 4 +- .../America/Argentina/San_Juan.ics | 4 +- .../America/Argentina/San_Luis.ics | 4 +- .../America/Argentina/Tucuman.ics | 4 +- .../America/Argentina/Ushuaia.ics | 4 +- web/tzurl/zoneinfo-outlook/America/Aruba.ics | 10 +- .../zoneinfo-outlook/America/Asuncion.ics | 4 +- .../zoneinfo-outlook/America/Atikokan.ics | 10 +- web/tzurl/zoneinfo-outlook/America/Bahia.ics | 4 +- .../America/Bahia_Banderas.ics | 4 +- .../zoneinfo-outlook/America/Barbados.ics | 4 +- web/tzurl/zoneinfo-outlook/America/Belem.ics | 4 +- .../zoneinfo-outlook/America/Belize.ics | 4 +- .../America/Blanc-Sablon.ics | 10 +- .../zoneinfo-outlook/America/Boa_Vista.ics | 4 +- .../zoneinfo-outlook/America/Bogota.ics | 4 +- web/tzurl/zoneinfo-outlook/America/Boise.ics | 4 +- .../America/Cambridge_Bay.ics | 4 +- .../America/Campo_Grande.ics | 4 +- .../zoneinfo-outlook/America/Cancun.ics | 4 +- .../zoneinfo-outlook/America/Caracas.ics | 4 +- .../zoneinfo-outlook/America/Cayenne.ics | 4 +- .../zoneinfo-outlook/America/Cayman.ics | 4 +- .../zoneinfo-outlook/America/Chicago.ics | 4 +- .../zoneinfo-outlook/America/Chihuahua.ics | 4 +- .../zoneinfo-outlook/America/Costa_Rica.ics | 4 +- .../zoneinfo-outlook/America/Creston.ics | 10 +- .../zoneinfo-outlook/America/Cuiaba.ics | 4 +- .../zoneinfo-outlook/America/Curacao.ics | 10 +- .../America/Danmarkshavn.ics | 4 +- .../zoneinfo-outlook/America/Dawson.ics | 4 +- .../America/Dawson_Creek.ics | 4 +- .../zoneinfo-outlook/America/Denver.ics | 4 +- .../zoneinfo-outlook/America/Detroit.ics | 4 +- .../zoneinfo-outlook/America/Dominica.ics | 10 +- .../zoneinfo-outlook/America/Edmonton.ics | 4 +- .../zoneinfo-outlook/America/Eirunepe.ics | 4 +- .../zoneinfo-outlook/America/El_Salvador.ics | 5 +- .../zoneinfo-outlook/America/Fort_Nelson.ics | 4 +- .../zoneinfo-outlook/America/Fortaleza.ics | 4 +- .../zoneinfo-outlook/America/Glace_Bay.ics | 4 +- .../zoneinfo-outlook/America/Godthab.ics | 4 +- .../zoneinfo-outlook/America/Goose_Bay.ics | 4 +- .../zoneinfo-outlook/America/Grand_Turk.ics | 4 +- .../zoneinfo-outlook/America/Grenada.ics | 10 +- .../zoneinfo-outlook/America/Guadeloupe.ics | 10 +- .../zoneinfo-outlook/America/Guatemala.ics | 4 +- .../zoneinfo-outlook/America/Guayaquil.ics | 4 +- .../zoneinfo-outlook/America/Guyana.ics | 4 +- .../zoneinfo-outlook/America/Halifax.ics | 4 +- .../zoneinfo-outlook/America/Havana.ics | 4 +- .../zoneinfo-outlook/America/Hermosillo.ics | 4 +- .../America/Indiana/Indianapolis.ics | 4 +- .../America/Indiana/Knox.ics | 4 +- .../America/Indiana/Marengo.ics | 4 +- .../America/Indiana/Petersburg.ics | 4 +- .../America/Indiana/Tell_City.ics | 4 +- .../America/Indiana/Vevay.ics | 4 +- .../America/Indiana/Vincennes.ics | 4 +- .../America/Indiana/Winamac.ics | 4 +- .../zoneinfo-outlook/America/Inuvik.ics | 4 +- .../zoneinfo-outlook/America/Iqaluit.ics | 4 +- .../zoneinfo-outlook/America/Jamaica.ics | 4 +- .../zoneinfo-outlook/America/Juneau.ics | 4 +- .../America/Kentucky/Louisville.ics | 4 +- .../America/Kentucky/Monticello.ics | 4 +- .../zoneinfo-outlook/America/Kralendijk.ics | 10 +- .../zoneinfo-outlook/America/La_Paz.ics | 4 +- web/tzurl/zoneinfo-outlook/America/Lima.ics | 4 +- .../zoneinfo-outlook/America/Los_Angeles.ics | 4 +- .../America/Lower_Princes.ics | 10 +- .../zoneinfo-outlook/America/Maceio.ics | 4 +- .../zoneinfo-outlook/America/Managua.ics | 4 +- .../zoneinfo-outlook/America/Manaus.ics | 4 +- .../zoneinfo-outlook/America/Marigot.ics | 10 +- .../zoneinfo-outlook/America/Martinique.ics | 4 +- .../zoneinfo-outlook/America/Matamoros.ics | 4 +- .../zoneinfo-outlook/America/Mazatlan.ics | 4 +- .../zoneinfo-outlook/America/Menominee.ics | 4 +- .../zoneinfo-outlook/America/Merida.ics | 4 +- .../zoneinfo-outlook/America/Metlakatla.ics | 4 +- .../zoneinfo-outlook/America/Mexico_City.ics | 4 +- .../zoneinfo-outlook/America/Miquelon.ics | 4 +- .../zoneinfo-outlook/America/Moncton.ics | 4 +- .../zoneinfo-outlook/America/Monterrey.ics | 4 +- .../zoneinfo-outlook/America/Montevideo.ics | 4 +- .../zoneinfo-outlook/America/Montserrat.ics | 10 +- .../zoneinfo-outlook/America/Nassau.ics | 10 +- .../zoneinfo-outlook/America/New_York.ics | 4 +- .../zoneinfo-outlook/America/Nipigon.ics | 4 +- web/tzurl/zoneinfo-outlook/America/Nome.ics | 4 +- .../zoneinfo-outlook/America/Noronha.ics | 4 +- .../America/North_Dakota/Beulah.ics | 4 +- .../America/North_Dakota/Center.ics | 4 +- .../America/North_Dakota/New_Salem.ics | 4 +- .../zoneinfo-outlook/America/Ojinaga.ics | 4 +- .../zoneinfo-outlook/America/Panama.ics | 4 +- .../zoneinfo-outlook/America/Pangnirtung.ics | 4 +- .../zoneinfo-outlook/America/Paramaribo.ics | 4 +- .../zoneinfo-outlook/America/Phoenix.ics | 4 +- .../America/Port-au-Prince.ics | 4 +- .../America/Port_of_Spain.ics | 10 +- .../zoneinfo-outlook/America/Porto_Velho.ics | 4 +- .../zoneinfo-outlook/America/Puerto_Rico.ics | 4 +- .../America/Punta_Arenas.ics | 4 +- .../zoneinfo-outlook/America/Rainy_River.ics | 4 +- .../America/Rankin_Inlet.ics | 4 +- .../zoneinfo-outlook/America/Recife.ics | 4 +- .../zoneinfo-outlook/America/Regina.ics | 4 +- .../zoneinfo-outlook/America/Resolute.ics | 4 +- .../zoneinfo-outlook/America/Rio_Branco.ics | 4 +- .../zoneinfo-outlook/America/Santarem.ics | 4 +- .../zoneinfo-outlook/America/Santiago.ics | 4 +- .../America/Santo_Domingo.ics | 4 +- .../zoneinfo-outlook/America/Sao_Paulo.ics | 4 +- .../America/Scoresbysund.ics | 4 +- web/tzurl/zoneinfo-outlook/America/Sitka.ics | 4 +- .../America/St_Barthelemy.ics | 10 +- .../zoneinfo-outlook/America/St_Johns.ics | 4 +- .../zoneinfo-outlook/America/St_Kitts.ics | 10 +- .../zoneinfo-outlook/America/St_Lucia.ics | 10 +- .../zoneinfo-outlook/America/St_Thomas.ics | 10 +- .../zoneinfo-outlook/America/St_Vincent.ics | 10 +- .../America/Swift_Current.ics | 4 +- .../zoneinfo-outlook/America/Tegucigalpa.ics | 4 +- web/tzurl/zoneinfo-outlook/America/Thule.ics | 4 +- .../zoneinfo-outlook/America/Thunder_Bay.ics | 4 +- .../zoneinfo-outlook/America/Tijuana.ics | 4 +- .../zoneinfo-outlook/America/Toronto.ics | 4 +- .../zoneinfo-outlook/America/Tortola.ics | 10 +- .../zoneinfo-outlook/America/Vancouver.ics | 4 +- .../zoneinfo-outlook/America/Whitehorse.ics | 4 +- .../zoneinfo-outlook/America/Winnipeg.ics | 4 +- .../zoneinfo-outlook/America/Yakutat.ics | 4 +- .../zoneinfo-outlook/America/Yellowknife.ics | 4 +- .../zoneinfo-outlook/Antarctica/Casey.ics | 4 +- .../zoneinfo-outlook/Antarctica/Davis.ics | 4 +- .../Antarctica/DumontDUrville.ics | 10 +- .../Antarctica/Macquarie.ics | 4 +- .../zoneinfo-outlook/Antarctica/Mawson.ics | 4 +- .../zoneinfo-outlook/Antarctica/McMurdo.ics | 4 +- .../zoneinfo-outlook/Antarctica/Palmer.ics | 4 +- .../zoneinfo-outlook/Antarctica/Rothera.ics | 4 +- .../zoneinfo-outlook/Antarctica/Syowa.ics | 10 +- .../zoneinfo-outlook/Antarctica/Troll.ics | 4 +- .../zoneinfo-outlook/Antarctica/Vostok.ics | 10 +- .../zoneinfo-outlook/Arctic/Longyearbyen.ics | 10 +- web/tzurl/zoneinfo-outlook/Asia/Aden.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Almaty.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Amman.ics | 18 +- web/tzurl/zoneinfo-outlook/Asia/Anadyr.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Aqtau.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Aqtobe.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Ashgabat.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Atyrau.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Baghdad.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Bahrain.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Baku.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Bangkok.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Barnaul.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Beirut.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Bishkek.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Brunei.ics | 10 +- web/tzurl/zoneinfo-outlook/Asia/Chita.ics | 4 +- .../zoneinfo-outlook/Asia/Choibalsan.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Colombo.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Damascus.ics | 18 +- web/tzurl/zoneinfo-outlook/Asia/Dhaka.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Dili.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Dubai.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Dushanbe.ics | 4 +- .../zoneinfo-outlook/Asia/Famagusta.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Gaza.ics | 10 +- web/tzurl/zoneinfo-outlook/Asia/Hebron.ics | 10 +- .../zoneinfo-outlook/Asia/Ho_Chi_Minh.ics | 4 +- .../zoneinfo-outlook/Asia/Hong_Kong.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Hovd.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Irkutsk.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Istanbul.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Jakarta.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Jayapura.ics | 4 +- .../zoneinfo-outlook/Asia/Jerusalem.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Kabul.ics | 4 +- .../zoneinfo-outlook/Asia/Kamchatka.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Karachi.ics | 4 +- .../zoneinfo-outlook/Asia/Kathmandu.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Khandyga.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Kolkata.ics | 4 +- .../zoneinfo-outlook/Asia/Krasnoyarsk.ics | 4 +- .../zoneinfo-outlook/Asia/Kuala_Lumpur.ics | 10 +- web/tzurl/zoneinfo-outlook/Asia/Kuching.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Kuwait.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Macau.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Magadan.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Makassar.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Manila.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Muscat.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Nicosia.ics | 4 +- .../zoneinfo-outlook/Asia/Novokuznetsk.ics | 4 +- .../zoneinfo-outlook/Asia/Novosibirsk.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Omsk.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Oral.ics | 4 +- .../zoneinfo-outlook/Asia/Phnom_Penh.ics | 4 +- .../zoneinfo-outlook/Asia/Pontianak.ics | 4 +- .../zoneinfo-outlook/Asia/Pyongyang.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Qatar.ics | 4 +- .../zoneinfo-outlook/Asia/Qyzylorda.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Riyadh.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Sakhalin.ics | 4 +- .../zoneinfo-outlook/Asia/Samarkand.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Seoul.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Shanghai.ics | 4 +- .../zoneinfo-outlook/Asia/Singapore.ics | 4 +- .../zoneinfo-outlook/Asia/Srednekolymsk.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Taipei.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Tashkent.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Tbilisi.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Tehran.ics | 16 +- web/tzurl/zoneinfo-outlook/Asia/Thimphu.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Tokyo.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Tomsk.ics | 4 +- .../zoneinfo-outlook/Asia/Ulaanbaatar.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Urumqi.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Ust-Nera.ics | 4 +- .../zoneinfo-outlook/Asia/Vientiane.ics | 4 +- .../zoneinfo-outlook/Asia/Vladivostok.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Yakutsk.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Yangon.ics | 4 +- .../zoneinfo-outlook/Asia/Yekaterinburg.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Yerevan.ics | 4 +- .../zoneinfo-outlook/Atlantic/Azores.ics | 4 +- .../zoneinfo-outlook/Atlantic/Bermuda.ics | 4 +- .../zoneinfo-outlook/Atlantic/Canary.ics | 4 +- .../zoneinfo-outlook/Atlantic/Cape_Verde.ics | 4 +- .../zoneinfo-outlook/Atlantic/Faroe.ics | 4 +- .../zoneinfo-outlook/Atlantic/Madeira.ics | 4 +- .../zoneinfo-outlook/Atlantic/Reykjavik.ics | 10 +- .../Atlantic/South_Georgia.ics | 4 +- .../zoneinfo-outlook/Atlantic/St_Helena.ics | 4 +- .../zoneinfo-outlook/Atlantic/Stanley.ics | 4 +- .../zoneinfo-outlook/Australia/Adelaide.ics | 4 +- .../zoneinfo-outlook/Australia/Brisbane.ics | 4 +- .../Australia/Broken_Hill.ics | 4 +- .../zoneinfo-outlook/Australia/Currie.ics | 10 +- .../zoneinfo-outlook/Australia/Darwin.ics | 4 +- .../zoneinfo-outlook/Australia/Eucla.ics | 4 +- .../zoneinfo-outlook/Australia/Hobart.ics | 4 +- .../zoneinfo-outlook/Australia/Lindeman.ics | 4 +- .../zoneinfo-outlook/Australia/Lord_Howe.ics | 4 +- .../zoneinfo-outlook/Australia/Melbourne.ics | 4 +- .../zoneinfo-outlook/Australia/Perth.ics | 4 +- .../zoneinfo-outlook/Australia/Sydney.ics | 4 +- .../zoneinfo-outlook/Europe/Amsterdam.ics | 10 +- .../zoneinfo-outlook/Europe/Andorra.ics | 4 +- .../zoneinfo-outlook/Europe/Astrakhan.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Athens.ics | 4 +- .../zoneinfo-outlook/Europe/Belgrade.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Berlin.ics | 4 +- .../zoneinfo-outlook/Europe/Bratislava.ics | 4 +- .../zoneinfo-outlook/Europe/Brussels.ics | 4 +- .../zoneinfo-outlook/Europe/Bucharest.ics | 4 +- .../zoneinfo-outlook/Europe/Budapest.ics | 4 +- .../zoneinfo-outlook/Europe/Busingen.ics | 4 +- .../zoneinfo-outlook/Europe/Chisinau.ics | 4 +- .../zoneinfo-outlook/Europe/Copenhagen.ics | 10 +- web/tzurl/zoneinfo-outlook/Europe/Dublin.ics | 4 +- .../zoneinfo-outlook/Europe/Gibraltar.ics | 4 +- .../zoneinfo-outlook/Europe/Guernsey.ics | 4 +- .../zoneinfo-outlook/Europe/Helsinki.ics | 4 +- .../zoneinfo-outlook/Europe/Isle_of_Man.ics | 4 +- .../zoneinfo-outlook/Europe/Istanbul.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Jersey.ics | 4 +- .../zoneinfo-outlook/Europe/Kaliningrad.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Kiev.ics | 24 +- web/tzurl/zoneinfo-outlook/Europe/Kirov.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Lisbon.ics | 4 +- .../zoneinfo-outlook/Europe/Ljubljana.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/London.ics | 4 +- .../zoneinfo-outlook/Europe/Luxembourg.ics | 10 +- web/tzurl/zoneinfo-outlook/Europe/Madrid.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Malta.ics | 4 +- .../zoneinfo-outlook/Europe/Mariehamn.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Minsk.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Monaco.ics | 10 +- web/tzurl/zoneinfo-outlook/Europe/Moscow.ics | 4 +- .../zoneinfo-outlook/Europe/Nicosia.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Oslo.ics | 10 +- web/tzurl/zoneinfo-outlook/Europe/Paris.ics | 4 +- .../zoneinfo-outlook/Europe/Podgorica.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Prague.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Riga.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Rome.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Samara.ics | 4 +- .../zoneinfo-outlook/Europe/San_Marino.ics | 4 +- .../zoneinfo-outlook/Europe/Sarajevo.ics | 4 +- .../zoneinfo-outlook/Europe/Saratov.ics | 4 +- .../zoneinfo-outlook/Europe/Simferopol.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Skopje.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Sofia.ics | 4 +- .../zoneinfo-outlook/Europe/Stockholm.ics | 10 +- .../zoneinfo-outlook/Europe/Tallinn.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Tirane.ics | 4 +- .../zoneinfo-outlook/Europe/Ulyanovsk.ics | 4 +- .../zoneinfo-outlook/Europe/Uzhgorod.ics | 24 +- web/tzurl/zoneinfo-outlook/Europe/Vaduz.ics | 4 +- .../zoneinfo-outlook/Europe/Vatican.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Vienna.ics | 4 +- .../zoneinfo-outlook/Europe/Vilnius.ics | 4 +- .../zoneinfo-outlook/Europe/Volgograd.ics | 10 +- web/tzurl/zoneinfo-outlook/Europe/Warsaw.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Zagreb.ics | 4 +- .../zoneinfo-outlook/Europe/Zaporozhye.ics | 24 +- web/tzurl/zoneinfo-outlook/Europe/Zurich.ics | 4 +- .../zoneinfo-outlook/Indian/Antananarivo.ics | 4 +- web/tzurl/zoneinfo-outlook/Indian/Chagos.ics | 4 +- .../zoneinfo-outlook/Indian/Christmas.ics | 10 +- web/tzurl/zoneinfo-outlook/Indian/Cocos.ics | 10 +- web/tzurl/zoneinfo-outlook/Indian/Comoro.ics | 4 +- .../zoneinfo-outlook/Indian/Kerguelen.ics | 10 +- web/tzurl/zoneinfo-outlook/Indian/Mahe.ics | 10 +- .../zoneinfo-outlook/Indian/Maldives.ics | 4 +- .../zoneinfo-outlook/Indian/Mauritius.ics | 4 +- .../zoneinfo-outlook/Indian/Mayotte.ics | 4 +- .../zoneinfo-outlook/Indian/Reunion.ics | 10 +- web/tzurl/zoneinfo-outlook/Pacific/Apia.ics | 16 +- .../zoneinfo-outlook/Pacific/Auckland.ics | 4 +- .../Pacific/Bougainville.ics | 4 +- .../zoneinfo-outlook/Pacific/Chatham.ics | 4 +- web/tzurl/zoneinfo-outlook/Pacific/Chuuk.ics | 10 +- .../zoneinfo-outlook/Pacific/Easter.ics | 4 +- web/tzurl/zoneinfo-outlook/Pacific/Efate.ics | 4 +- .../zoneinfo-outlook/Pacific/Enderbury.ics | 10 +- .../zoneinfo-outlook/Pacific/Fakaofo.ics | 4 +- web/tzurl/zoneinfo-outlook/Pacific/Fiji.ics | 18 +- .../zoneinfo-outlook/Pacific/Funafuti.ics | 10 +- .../zoneinfo-outlook/Pacific/Galapagos.ics | 4 +- .../zoneinfo-outlook/Pacific/Gambier.ics | 4 +- .../zoneinfo-outlook/Pacific/Guadalcanal.ics | 4 +- web/tzurl/zoneinfo-outlook/Pacific/Guam.ics | 4 +- .../zoneinfo-outlook/Pacific/Honolulu.ics | 4 +- .../zoneinfo-outlook/Pacific/Kiritimati.ics | 4 +- .../zoneinfo-outlook/Pacific/Kosrae.ics | 4 +- .../zoneinfo-outlook/Pacific/Kwajalein.ics | 4 +- .../zoneinfo-outlook/Pacific/Majuro.ics | 10 +- .../zoneinfo-outlook/Pacific/Marquesas.ics | 4 +- .../zoneinfo-outlook/Pacific/Midway.ics | 4 +- web/tzurl/zoneinfo-outlook/Pacific/Nauru.ics | 4 +- web/tzurl/zoneinfo-outlook/Pacific/Niue.ics | 4 +- .../zoneinfo-outlook/Pacific/Norfolk.ics | 4 +- .../zoneinfo-outlook/Pacific/Noumea.ics | 4 +- .../zoneinfo-outlook/Pacific/Pago_Pago.ics | 4 +- web/tzurl/zoneinfo-outlook/Pacific/Palau.ics | 4 +- .../zoneinfo-outlook/Pacific/Pitcairn.ics | 4 +- .../zoneinfo-outlook/Pacific/Pohnpei.ics | 10 +- .../Pacific/Port_Moresby.ics | 4 +- .../zoneinfo-outlook/Pacific/Rarotonga.ics | 4 +- .../zoneinfo-outlook/Pacific/Saipan.ics | 4 +- .../zoneinfo-outlook/Pacific/Tahiti.ics | 4 +- .../zoneinfo-outlook/Pacific/Tarawa.ics | 4 +- .../zoneinfo-outlook/Pacific/Tongatapu.ics | 4 +- web/tzurl/zoneinfo-outlook/Pacific/Wake.ics | 10 +- .../zoneinfo-outlook/Pacific/Wallis.ics | 10 +- web/tzurl/zoneinfo/Africa/Abidjan.ics | 4 +- web/tzurl/zoneinfo/Africa/Algiers.ics | 4 +- web/tzurl/zoneinfo/Africa/Bissau.ics | 4 +- web/tzurl/zoneinfo/Africa/Cairo.ics | 4 +- web/tzurl/zoneinfo/Africa/Casablanca.ics | 4 +- web/tzurl/zoneinfo/Africa/Ceuta.ics | 4 +- web/tzurl/zoneinfo/Africa/El_Aaiun.ics | 4 +- web/tzurl/zoneinfo/Africa/Johannesburg.ics | 4 +- web/tzurl/zoneinfo/Africa/Juba.ics | 10 +- web/tzurl/zoneinfo/Africa/Khartoum.ics | 4 +- web/tzurl/zoneinfo/Africa/Lagos.ics | 24 +- web/tzurl/zoneinfo/Africa/Maputo.ics | 4 +- web/tzurl/zoneinfo/Africa/Monrovia.ics | 4 +- web/tzurl/zoneinfo/Africa/Nairobi.ics | 18 +- web/tzurl/zoneinfo/Africa/Ndjamena.ics | 4 +- web/tzurl/zoneinfo/Africa/Sao_Tome.ics | 4 +- web/tzurl/zoneinfo/Africa/Tripoli.ics | 4 +- web/tzurl/zoneinfo/Africa/Tunis.ics | 4 +- web/tzurl/zoneinfo/Africa/Windhoek.ics | 4 +- web/tzurl/zoneinfo/America/Adak.ics | 4 +- web/tzurl/zoneinfo/America/Anchorage.ics | 4 +- web/tzurl/zoneinfo/America/Araguaina.ics | 4 +- .../America/Argentina/Buenos_Aires.ics | 4 +- .../zoneinfo/America/Argentina/Catamarca.ics | 4 +- .../zoneinfo/America/Argentina/Cordoba.ics | 4 +- .../zoneinfo/America/Argentina/Jujuy.ics | 4 +- .../zoneinfo/America/Argentina/La_Rioja.ics | 4 +- .../zoneinfo/America/Argentina/Mendoza.ics | 4 +- .../America/Argentina/Rio_Gallegos.ics | 4 +- .../zoneinfo/America/Argentina/Salta.ics | 4 +- .../zoneinfo/America/Argentina/San_Juan.ics | 4 +- .../zoneinfo/America/Argentina/San_Luis.ics | 4 +- .../zoneinfo/America/Argentina/Tucuman.ics | 4 +- .../zoneinfo/America/Argentina/Ushuaia.ics | 4 +- web/tzurl/zoneinfo/America/Asuncion.ics | 4 +- web/tzurl/zoneinfo/America/Bahia.ics | 4 +- .../zoneinfo/America/Bahia_Banderas.ics | 18 +- web/tzurl/zoneinfo/America/Barbados.ics | 51 +- web/tzurl/zoneinfo/America/Belem.ics | 4 +- web/tzurl/zoneinfo/America/Belize.ics | 43 +- web/tzurl/zoneinfo/America/Boa_Vista.ics | 4 +- web/tzurl/zoneinfo/America/Bogota.ics | 4 +- web/tzurl/zoneinfo/America/Boise.ics | 4 +- web/tzurl/zoneinfo/America/Cambridge_Bay.ics | 4 +- web/tzurl/zoneinfo/America/Campo_Grande.ics | 4 +- web/tzurl/zoneinfo/America/Cancun.ics | 4 +- web/tzurl/zoneinfo/America/Caracas.ics | 4 +- web/tzurl/zoneinfo/America/Cayenne.ics | 4 +- web/tzurl/zoneinfo/America/Chicago.ics | 4 +- web/tzurl/zoneinfo/America/Chihuahua.ics | 18 +- web/tzurl/zoneinfo/America/Costa_Rica.ics | 4 +- web/tzurl/zoneinfo/America/Cuiaba.ics | 4 +- web/tzurl/zoneinfo/America/Danmarkshavn.ics | 4 +- web/tzurl/zoneinfo/America/Dawson.ics | 4 +- web/tzurl/zoneinfo/America/Dawson_Creek.ics | 4 +- web/tzurl/zoneinfo/America/Denver.ics | 4 +- web/tzurl/zoneinfo/America/Detroit.ics | 4 +- web/tzurl/zoneinfo/America/Edmonton.ics | 4 +- web/tzurl/zoneinfo/America/Eirunepe.ics | 4 +- web/tzurl/zoneinfo/America/El_Salvador.ics | 4 +- web/tzurl/zoneinfo/America/Fort_Nelson.ics | 4 +- web/tzurl/zoneinfo/America/Fortaleza.ics | 4 +- web/tzurl/zoneinfo/America/Glace_Bay.ics | 4 +- web/tzurl/zoneinfo/America/Goose_Bay.ics | 4 +- web/tzurl/zoneinfo/America/Grand_Turk.ics | 10 +- web/tzurl/zoneinfo/America/Guatemala.ics | 4 +- web/tzurl/zoneinfo/America/Guayaquil.ics | 4 +- web/tzurl/zoneinfo/America/Guyana.ics | 16 +- web/tzurl/zoneinfo/America/Halifax.ics | 4 +- web/tzurl/zoneinfo/America/Havana.ics | 4 +- web/tzurl/zoneinfo/America/Hermosillo.ics | 11 +- .../America/Indiana/Indianapolis.ics | 4 +- web/tzurl/zoneinfo/America/Indiana/Knox.ics | 4 +- .../zoneinfo/America/Indiana/Marengo.ics | 4 +- .../zoneinfo/America/Indiana/Petersburg.ics | 4 +- .../zoneinfo/America/Indiana/Tell_City.ics | 4 +- web/tzurl/zoneinfo/America/Indiana/Vevay.ics | 4 +- .../zoneinfo/America/Indiana/Vincennes.ics | 4 +- .../zoneinfo/America/Indiana/Winamac.ics | 4 +- web/tzurl/zoneinfo/America/Inuvik.ics | 4 +- web/tzurl/zoneinfo/America/Iqaluit.ics | 4 +- web/tzurl/zoneinfo/America/Jamaica.ics | 4 +- web/tzurl/zoneinfo/America/Juneau.ics | 4 +- .../zoneinfo/America/Kentucky/Louisville.ics | 4 +- .../zoneinfo/America/Kentucky/Monticello.ics | 4 +- web/tzurl/zoneinfo/America/La_Paz.ics | 4 +- web/tzurl/zoneinfo/America/Lima.ics | 4 +- web/tzurl/zoneinfo/America/Los_Angeles.ics | 4 +- web/tzurl/zoneinfo/America/Maceio.ics | 4 +- web/tzurl/zoneinfo/America/Managua.ics | 4 +- web/tzurl/zoneinfo/America/Manaus.ics | 4 +- web/tzurl/zoneinfo/America/Martinique.ics | 4 +- web/tzurl/zoneinfo/America/Matamoros.ics | 14 +- web/tzurl/zoneinfo/America/Mazatlan.ics | 18 +- web/tzurl/zoneinfo/America/Menominee.ics | 4 +- web/tzurl/zoneinfo/America/Merida.ics | 4 +- web/tzurl/zoneinfo/America/Metlakatla.ics | 4 +- web/tzurl/zoneinfo/America/Mexico_City.ics | 11 +- web/tzurl/zoneinfo/America/Miquelon.ics | 4 +- web/tzurl/zoneinfo/America/Moncton.ics | 4 +- web/tzurl/zoneinfo/America/Monterrey.ics | 10 +- web/tzurl/zoneinfo/America/Montevideo.ics | 4 +- web/tzurl/zoneinfo/America/New_York.ics | 4 +- web/tzurl/zoneinfo/America/Nipigon.ics | 4 +- web/tzurl/zoneinfo/America/Nome.ics | 4 +- web/tzurl/zoneinfo/America/Noronha.ics | 4 +- .../zoneinfo/America/North_Dakota/Beulah.ics | 4 +- .../zoneinfo/America/North_Dakota/Center.ics | 4 +- .../America/North_Dakota/New_Salem.ics | 4 +- web/tzurl/zoneinfo/America/Nuuk.ics (new) | 44 ++ web/tzurl/zoneinfo/America/Ojinaga.ics | 18 +- web/tzurl/zoneinfo/America/Panama.ics | 4 +- web/tzurl/zoneinfo/America/Pangnirtung.ics | 4 +- web/tzurl/zoneinfo/America/Paramaribo.ics | 4 +- web/tzurl/zoneinfo/America/Phoenix.ics | 4 +- .../zoneinfo/America/Port-au-Prince.ics | 4 +- web/tzurl/zoneinfo/America/Porto_Velho.ics | 4 +- web/tzurl/zoneinfo/America/Puerto_Rico.ics | 4 +- web/tzurl/zoneinfo/America/Punta_Arenas.ics | 22 +- web/tzurl/zoneinfo/America/Rainy_River.ics | 4 +- web/tzurl/zoneinfo/America/Rankin_Inlet.ics | 4 +- web/tzurl/zoneinfo/America/Recife.ics | 4 +- web/tzurl/zoneinfo/America/Regina.ics | 4 +- web/tzurl/zoneinfo/America/Resolute.ics | 4 +- web/tzurl/zoneinfo/America/Rio_Branco.ics | 4 +- web/tzurl/zoneinfo/America/Santarem.ics | 4 +- web/tzurl/zoneinfo/America/Santiago.ics | 35 +- web/tzurl/zoneinfo/America/Santo_Domingo.ics | 4 +- web/tzurl/zoneinfo/America/Sao_Paulo.ics | 4 +- web/tzurl/zoneinfo/America/Scoresbysund.ics | 4 +- web/tzurl/zoneinfo/America/Sitka.ics | 4 +- web/tzurl/zoneinfo/America/St_Johns.ics | 4 +- web/tzurl/zoneinfo/America/Swift_Current.ics | 4 +- web/tzurl/zoneinfo/America/Tegucigalpa.ics | 4 +- web/tzurl/zoneinfo/America/Thule.ics | 4 +- web/tzurl/zoneinfo/America/Thunder_Bay.ics | 4 +- web/tzurl/zoneinfo/America/Tijuana.ics | 6 +- web/tzurl/zoneinfo/America/Toronto.ics | 4 +- web/tzurl/zoneinfo/America/Vancouver.ics | 4 +- web/tzurl/zoneinfo/America/Whitehorse.ics | 4 +- web/tzurl/zoneinfo/America/Winnipeg.ics | 4 +- web/tzurl/zoneinfo/America/Yakutat.ics | 4 +- web/tzurl/zoneinfo/America/Yellowknife.ics | 4 +- web/tzurl/zoneinfo/Antarctica/Casey.ics | 4 +- web/tzurl/zoneinfo/Antarctica/Davis.ics | 4 +- web/tzurl/zoneinfo/Antarctica/Macquarie.ics | 6 +- web/tzurl/zoneinfo/Antarctica/Mawson.ics | 4 +- web/tzurl/zoneinfo/Antarctica/Palmer.ics | 4 +- web/tzurl/zoneinfo/Antarctica/Rothera.ics | 4 +- web/tzurl/zoneinfo/Antarctica/Troll.ics | 4 +- web/tzurl/zoneinfo/Asia/Almaty.ics | 4 +- web/tzurl/zoneinfo/Asia/Amman.ics | 15 +- web/tzurl/zoneinfo/Asia/Anadyr.ics | 4 +- web/tzurl/zoneinfo/Asia/Aqtau.ics | 4 +- web/tzurl/zoneinfo/Asia/Aqtobe.ics | 4 +- web/tzurl/zoneinfo/Asia/Ashgabat.ics | 4 +- web/tzurl/zoneinfo/Asia/Atyrau.ics | 4 +- web/tzurl/zoneinfo/Asia/Baghdad.ics | 4 +- web/tzurl/zoneinfo/Asia/Baku.ics | 4 +- web/tzurl/zoneinfo/Asia/Bangkok.ics | 4 +- web/tzurl/zoneinfo/Asia/Barnaul.ics | 4 +- web/tzurl/zoneinfo/Asia/Beirut.ics | 4 +- web/tzurl/zoneinfo/Asia/Bishkek.ics | 4 +- web/tzurl/zoneinfo/Asia/Chita.ics | 4 +- web/tzurl/zoneinfo/Asia/Choibalsan.ics | 4 +- web/tzurl/zoneinfo/Asia/Colombo.ics | 4 +- web/tzurl/zoneinfo/Asia/Damascus.ics | 14 +- web/tzurl/zoneinfo/Asia/Dhaka.ics | 4 +- web/tzurl/zoneinfo/Asia/Dili.ics | 4 +- web/tzurl/zoneinfo/Asia/Dubai.ics | 4 +- web/tzurl/zoneinfo/Asia/Dushanbe.ics | 4 +- web/tzurl/zoneinfo/Asia/Famagusta.ics | 4 +- web/tzurl/zoneinfo/Asia/Gaza.ics | 97 ++-- web/tzurl/zoneinfo/Asia/Hebron.ics | 97 ++-- web/tzurl/zoneinfo/Asia/Ho_Chi_Minh.ics | 6 +- web/tzurl/zoneinfo/Asia/Hong_Kong.ics | 4 +- web/tzurl/zoneinfo/Asia/Hovd.ics | 4 +- web/tzurl/zoneinfo/Asia/Irkutsk.ics | 4 +- web/tzurl/zoneinfo/Asia/Jakarta.ics | 4 +- web/tzurl/zoneinfo/Asia/Jayapura.ics | 4 +- web/tzurl/zoneinfo/Asia/Jerusalem.ics | 80 ++-- web/tzurl/zoneinfo/Asia/Kabul.ics | 4 +- web/tzurl/zoneinfo/Asia/Kamchatka.ics | 4 +- web/tzurl/zoneinfo/Asia/Karachi.ics | 4 +- web/tzurl/zoneinfo/Asia/Kathmandu.ics | 4 +- web/tzurl/zoneinfo/Asia/Khandyga.ics | 4 +- web/tzurl/zoneinfo/Asia/Kolkata.ics | 4 +- web/tzurl/zoneinfo/Asia/Krasnoyarsk.ics | 4 +- web/tzurl/zoneinfo/Asia/Kuching.ics | 4 +- web/tzurl/zoneinfo/Asia/Macau.ics | 4 +- web/tzurl/zoneinfo/Asia/Magadan.ics | 4 +- web/tzurl/zoneinfo/Asia/Makassar.ics | 4 +- web/tzurl/zoneinfo/Asia/Manila.ics | 4 +- web/tzurl/zoneinfo/Asia/Nicosia.ics | 4 +- web/tzurl/zoneinfo/Asia/Novokuznetsk.ics | 4 +- web/tzurl/zoneinfo/Asia/Novosibirsk.ics | 4 +- web/tzurl/zoneinfo/Asia/Omsk.ics | 4 +- web/tzurl/zoneinfo/Asia/Oral.ics | 4 +- web/tzurl/zoneinfo/Asia/Pontianak.ics | 4 +- web/tzurl/zoneinfo/Asia/Pyongyang.ics | 4 +- web/tzurl/zoneinfo/Asia/Qatar.ics | 4 +- web/tzurl/zoneinfo/Asia/Qostanay.ics (new) | 104 ++++ web/tzurl/zoneinfo/Asia/Qyzylorda.ics | 4 +- web/tzurl/zoneinfo/Asia/Riyadh.ics | 4 +- web/tzurl/zoneinfo/Asia/Sakhalin.ics | 4 +- web/tzurl/zoneinfo/Asia/Samarkand.ics | 4 +- web/tzurl/zoneinfo/Asia/Seoul.ics | 4 +- web/tzurl/zoneinfo/Asia/Shanghai.ics | 4 +- web/tzurl/zoneinfo/Asia/Singapore.ics | 4 +- web/tzurl/zoneinfo/Asia/Srednekolymsk.ics | 4 +- web/tzurl/zoneinfo/Asia/Taipei.ics | 4 +- web/tzurl/zoneinfo/Asia/Tashkent.ics | 4 +- web/tzurl/zoneinfo/Asia/Tbilisi.ics | 4 +- web/tzurl/zoneinfo/Asia/Tehran.ics | 422 +---------------- web/tzurl/zoneinfo/Asia/Thimphu.ics | 4 +- web/tzurl/zoneinfo/Asia/Tokyo.ics | 4 +- web/tzurl/zoneinfo/Asia/Tomsk.ics | 4 +- web/tzurl/zoneinfo/Asia/Ulaanbaatar.ics | 4 +- web/tzurl/zoneinfo/Asia/Urumqi.ics | 4 +- web/tzurl/zoneinfo/Asia/Ust-Nera.ics | 4 +- web/tzurl/zoneinfo/Asia/Vladivostok.ics | 4 +- web/tzurl/zoneinfo/Asia/Yakutsk.ics | 4 +- web/tzurl/zoneinfo/Asia/Yangon.ics | 4 +- web/tzurl/zoneinfo/Asia/Yekaterinburg.ics | 4 +- web/tzurl/zoneinfo/Asia/Yerevan.ics | 4 +- web/tzurl/zoneinfo/Atlantic/Azores.ics | 20 +- web/tzurl/zoneinfo/Atlantic/Bermuda.ics | 67 ++- web/tzurl/zoneinfo/Atlantic/Canary.ics | 4 +- web/tzurl/zoneinfo/Atlantic/Cape_Verde.ics | 4 +- web/tzurl/zoneinfo/Atlantic/Faroe.ics | 4 +- web/tzurl/zoneinfo/Atlantic/Madeira.ics | 20 +- .../zoneinfo/Atlantic/South_Georgia.ics | 4 +- web/tzurl/zoneinfo/Atlantic/Stanley.ics | 4 +- web/tzurl/zoneinfo/Australia/Adelaide.ics | 19 +- web/tzurl/zoneinfo/Australia/Brisbane.ics | 19 +- web/tzurl/zoneinfo/Australia/Broken_Hill.ics | 19 +- web/tzurl/zoneinfo/Australia/Darwin.ics | 13 +- web/tzurl/zoneinfo/Australia/Eucla.ics | 23 +- web/tzurl/zoneinfo/Australia/Hobart.ics | 32 +- web/tzurl/zoneinfo/Australia/Lindeman.ics | 26 +- web/tzurl/zoneinfo/Australia/Lord_Howe.ics | 4 +- web/tzurl/zoneinfo/Australia/Melbourne.ics | 19 +- web/tzurl/zoneinfo/Australia/Perth.ics | 23 +- web/tzurl/zoneinfo/Australia/Sydney.ics | 19 +- web/tzurl/zoneinfo/Europe/Andorra.ics | 4 +- web/tzurl/zoneinfo/Europe/Astrakhan.ics | 4 +- web/tzurl/zoneinfo/Europe/Athens.ics | 4 +- web/tzurl/zoneinfo/Europe/Belgrade.ics | 4 +- web/tzurl/zoneinfo/Europe/Berlin.ics | 4 +- web/tzurl/zoneinfo/Europe/Brussels.ics | 4 +- web/tzurl/zoneinfo/Europe/Bucharest.ics | 4 +- web/tzurl/zoneinfo/Europe/Budapest.ics | 4 +- web/tzurl/zoneinfo/Europe/Chisinau.ics | 4 +- web/tzurl/zoneinfo/Europe/Dublin.ics | 6 +- web/tzurl/zoneinfo/Europe/Gibraltar.ics | 4 +- web/tzurl/zoneinfo/Europe/Helsinki.ics | 4 +- web/tzurl/zoneinfo/Europe/Istanbul.ics | 4 +- web/tzurl/zoneinfo/Europe/Kaliningrad.ics | 4 +- web/tzurl/zoneinfo/Europe/Kirov.ics | 4 +- .../zoneinfo/Europe/{Kiev.ics => Kyiv.ics} | 35 +- web/tzurl/zoneinfo/Europe/Lisbon.ics | 20 +- web/tzurl/zoneinfo/Europe/London.ics | 4 +- web/tzurl/zoneinfo/Europe/Madrid.ics | 4 +- web/tzurl/zoneinfo/Europe/Malta.ics | 4 +- web/tzurl/zoneinfo/Europe/Minsk.ics | 4 +- web/tzurl/zoneinfo/Europe/Moscow.ics | 4 +- web/tzurl/zoneinfo/Europe/Paris.ics | 4 +- web/tzurl/zoneinfo/Europe/Prague.ics | 4 +- web/tzurl/zoneinfo/Europe/Riga.ics | 4 +- web/tzurl/zoneinfo/Europe/Rome.ics | 4 +- web/tzurl/zoneinfo/Europe/Samara.ics | 4 +- web/tzurl/zoneinfo/Europe/Saratov.ics | 4 +- web/tzurl/zoneinfo/Europe/Simferopol.ics | 19 +- web/tzurl/zoneinfo/Europe/Sofia.ics | 4 +- web/tzurl/zoneinfo/Europe/Tallinn.ics | 4 +- web/tzurl/zoneinfo/Europe/Tirane.ics | 4 +- web/tzurl/zoneinfo/Europe/Ulyanovsk.ics | 4 +- web/tzurl/zoneinfo/Europe/Vienna.ics | 4 +- web/tzurl/zoneinfo/Europe/Vilnius.ics | 4 +- web/tzurl/zoneinfo/Europe/Volgograd.ics | 5 +- web/tzurl/zoneinfo/Europe/Warsaw.ics | 4 +- web/tzurl/zoneinfo/Europe/Zurich.ics | 4 +- web/tzurl/zoneinfo/Indian/Chagos.ics | 4 +- web/tzurl/zoneinfo/Indian/Maldives.ics | 4 +- web/tzurl/zoneinfo/Indian/Mauritius.ics | 4 +- web/tzurl/zoneinfo/Pacific/Apia.ics | 8 +- web/tzurl/zoneinfo/Pacific/Auckland.ics | 4 +- web/tzurl/zoneinfo/Pacific/Bougainville.ics | 4 +- web/tzurl/zoneinfo/Pacific/Chatham.ics | 4 +- web/tzurl/zoneinfo/Pacific/Easter.ics | 12 +- web/tzurl/zoneinfo/Pacific/Efate.ics | 19 +- web/tzurl/zoneinfo/Pacific/Fakaofo.ics | 4 +- web/tzurl/zoneinfo/Pacific/Fiji.ics | 17 +- web/tzurl/zoneinfo/Pacific/Galapagos.ics | 4 +- web/tzurl/zoneinfo/Pacific/Gambier.ics | 4 +- web/tzurl/zoneinfo/Pacific/Guadalcanal.ics | 4 +- web/tzurl/zoneinfo/Pacific/Guam.ics | 4 +- web/tzurl/zoneinfo/Pacific/Honolulu.ics | 4 +- web/tzurl/zoneinfo/Pacific/Kanton.ics (new) | 29 ++ web/tzurl/zoneinfo/Pacific/Kiritimati.ics | 4 +- web/tzurl/zoneinfo/Pacific/Kosrae.ics | 4 +- web/tzurl/zoneinfo/Pacific/Kwajalein.ics | 4 +- web/tzurl/zoneinfo/Pacific/Marquesas.ics | 4 +- web/tzurl/zoneinfo/Pacific/Nauru.ics | 4 +- web/tzurl/zoneinfo/Pacific/Niue.ics | 16 +- web/tzurl/zoneinfo/Pacific/Norfolk.ics | 4 +- web/tzurl/zoneinfo/Pacific/Noumea.ics | 4 +- web/tzurl/zoneinfo/Pacific/Pago_Pago.ics | 4 +- web/tzurl/zoneinfo/Pacific/Palau.ics | 4 +- web/tzurl/zoneinfo/Pacific/Pitcairn.ics | 4 +- web/tzurl/zoneinfo/Pacific/Port_Moresby.ics | 4 +- web/tzurl/zoneinfo/Pacific/Rarotonga.ics | 12 +- web/tzurl/zoneinfo/Pacific/Tahiti.ics | 4 +- web/tzurl/zoneinfo/Pacific/Tarawa.ics | 4 +- web/tzurl/zoneinfo/Pacific/Tongatapu.ics | 10 +- 741 files changed, 2517 insertions(+), 2441 deletions(-) commit 1a4cb4a63 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 19 17:10:37 2022 +0100 Removed debugging code accidentally left in. web/js/edit_entry.js.php | 2 -- 1 file changed, 2 deletions(-) commit dcea7396c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 19 17:08:27 2022 +0100 Removed redundant code web/js/edit_entry.js.php | 1 - 1 file changed, 1 deletion(-) commit 4094b1043 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 19 17:03:05 2022 +0100 Removed use of deprecated substr() web/js/edit_entry.js.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) commit bf6e3576e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 18 21:47:18 2022 +0100 Fixed bug introduced in recent commit web/js/edit_entry.js.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 9c5f492f6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 18 17:01:05 2022 +0100 Removed test code accidentally committed previously. web/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 277325fab Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 18 16:41:06 2022 +0100 Fixed typos in comments web/js/datepicker.js.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit df703ccc4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 18 14:42:12 2022 +0100 Added comment web/index.php | 2 +- web/js/datepicker.js.php | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) commit 606b31ece Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 18 14:32:30 2022 +0100 Fixed bug resulting in "Invalid page_date yyyy-mm-dd to yyyy-nn-ee" message when a user clicks on multiple dates in the mini-calendars in succession on a slow server. web/js/datepicker.js.php | 2 ++ web/js/index.js.php | 35 ++++++++++++++++++++++++----------- web/js/refresh.js.php | 17 ++++++++++------- 3 files changed, 36 insertions(+), 18 deletions(-) commit e277e5f87 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 17 15:43:52 2022 +0100 Fixed typo in comment web/js/datepicker.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 37e0ec8f7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 17 15:38:08 2022 +0100 Improved error handling for Ajax pre-fetching of pages web/js/index.js.php | 29 +++++++++++++++++------------ web/standard_vars.inc.php | 6 ++++++ 2 files changed, 23 insertions(+), 12 deletions(-) commit 96f856c7b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 16 18:38:29 2022 +0100 Minor change to comment web/js/datepicker.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4f9b23d82 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 16 18:36:57 2022 +0100 Removed unnecessary semicolon web/js/datepicker.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bb1e94cc3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 16 18:32:38 2022 +0100 Fixed deprecated use of .submit() web/js/datepicker.js.php | 2 +- web/js/edit_entry.js.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit ef2a4664e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 16 18:22:41 2022 +0100 Upgraded to jQuery 3.6.1 web/jquery/jquery-3.6.0.min.js (gone) | 2 - .../{jquery-3.6.0.js => jquery-3.6.1.js} | 214 ++++---- web/jquery/jquery-3.6.1.min.js (new) | 2 + .../jquery-migrate-3.3.2.min.js (gone) | 2 - ...rate-3.3.2.js => jquery-migrate-3.4.0.js} | 439 +++++++++++------ web/jquery/jquery-migrate-3.4.0.min.js (new) | 2 + web/js.inc | 4 +- 7 files changed, 408 insertions(+), 257 deletions(-) commit f1ae3eb39 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 16 18:01:41 2022 +0100 Replaced qualifiers with imports web/lib/MRBS/Session/SessionCookie.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) commit aa72aed95 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 16 17:59:06 2022 +0100 Replaced expression with ?? version web/lib/MRBS/Session/SessionCookie.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2114e739c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 16 17:54:29 2022 +0100 Eliminated duplicate declaration web/js/edit_entry.js.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit fb96613cc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 16 17:49:34 2022 +0100 Fixed typos in comments web/js/refresh.js.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 864d0b185 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 16 17:38:06 2022 +0100 Removed duplicated jQuery selector web/js/edit_entry.js.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit cf37b3953 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 16 17:34:22 2022 +0100 Removed duplicated jQuery selector web/js/edit_entry.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 26cf40b48 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 16 17:30:55 2022 +0100 Removed duplicated jQuery selector web/js/edit_entry.js.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) commit aeade428d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 16 17:27:35 2022 +0100 Removed duplicated jQuery selector web/js/edit_entry.js.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit c3b12f985 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 16 16:52:35 2022 +0100 Formatted comments web/edit_entry_handler.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 8dc856bdc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 15 18:36:35 2022 +0100 Improved error handling when checking for conflicts and policy violations. web/edit_entry_handler.php | 19 +++++++++++++++++-- web/js/edit_entry.js.php | 20 ++++++++++++++------ 2 files changed, 31 insertions(+), 8 deletions(-) commit 1c7dc4d99 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 14 16:34:09 2022 +0100 Replaced static property with constant. web/lib/MRBS/Form/Form.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) commit 93b12e827 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 14 16:03:24 2022 +0100 Improved comment web/functions_mail.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit 19497841f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 14 16:01:52 2022 +0100 Removed redundant function web/functions_mail.inc | 46 ---------------------------------------- 1 file changed, 46 deletions(-) commit be52793f3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 14 15:57:16 2022 +0100 Fixed bug causing multibyte characters in iCal notifications not to appear correctly web/functions_ical.inc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) commit bc7c5cafb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 14 15:24:30 2022 +0100 Fixed bug causing multibyte characters in email display names not to appear correctly web/functions_mail.inc | 4 ++-- web/lib/MRBS/MailQueue.php | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) commit 65f585b06 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 13 18:12:46 2022 +0100 Fixed bug introduced in a recent commit that caused problems when working with multiple databases (eg when using the 'db_ext' auth type). web/lib/MRBS/DB.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 7a5dfccd9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 13 17:51:22 2022 +0100 Fixed bug introduced in a recent commit that caused problems when working with multiple databases (eg when using the 'db_ext' auth type). web/lib/MRBS/DB_mysql.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) commit 55a50a445 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 13 17:40:14 2022 +0100 Changed caught exception class - no functional impact web/lib/MRBS/DB_mysql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 58007964f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 13 13:25:21 2022 +0100 Fixed bug introduced in recent commit causing password reset to fail. web/lib/MRBS/MailQueue.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 2818ace0b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 12 16:02:46 2022 +0100 Replaced expressions with ?? versions web/lib/MRBS/MailQueue.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit a64f07483 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 12 15:58:52 2022 +0100 Replaced qualifier with an import web/lib/MRBS/MailQueue.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit e41ce77e7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 12 15:58:00 2022 +0100 Added type declaration web/lib/MRBS/MailQueue.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 90861ed3f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 12 15:35:15 2022 +0100 Added type declarations web/lib/MRBS/MailQueue.php | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) commit 81a5b0364 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 12 15:05:10 2022 +0100 Removed redundant use statement web/mrbs_auth.inc | 1 - 1 file changed, 1 deletion(-) commit b0aa4fa76 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 12 11:03:38 2022 +0100 Added the user's email address as a Reply-To address by default. This can be disabled by a config setting to bring the behaviour back to how it used to be. See SF Support Requests #2621. web/functions_mail.inc | 31 ++++++++++++++++++++----------- web/lib/MRBS/MailQueue.php | 9 +++++++++ web/systemdefaults.inc.php | 4 ++++ 3 files changed, 33 insertions(+), 11 deletions(-) commit fce5aac2a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 11 19:01:49 2022 +0100 Handled Sensitive Parameter Value in stack trace. web/functions_error.inc | 5 +++++ 1 file changed, 5 insertions(+) commit 639ce208c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 11 18:21:40 2022 +0100 Fixed incorrect use of Sensitive Parameter attribute web/lib/MRBS/Auth/Auth.php | 6 +++--- web/lib/MRBS/Auth/AuthAuthBasic.php | 4 ++-- web/lib/MRBS/Auth/AuthCas.php | 4 ++-- web/lib/MRBS/Auth/AuthConfig.php | 4 ++-- web/lib/MRBS/Auth/AuthCrypt.php | 4 ++-- web/lib/MRBS/Auth/AuthDb.php | 12 ++++++------ web/lib/MRBS/Auth/AuthDbExt.php | 4 ++-- web/lib/MRBS/Auth/AuthExt.php | 4 ++-- web/lib/MRBS/Auth/AuthIdcheck.php | 4 ++-- web/lib/MRBS/Auth/AuthImap.php | 4 ++-- web/lib/MRBS/Auth/AuthImapPhp.php | 4 ++-- web/lib/MRBS/Auth/AuthJoomla.php | 4 ++-- web/lib/MRBS/Auth/AuthLdap.php | 4 ++-- web/lib/MRBS/Auth/AuthNone.php | 4 ++-- web/lib/MRBS/Auth/AuthNw.php | 4 ++-- web/lib/MRBS/Auth/AuthPop3.php | 4 ++-- web/lib/MRBS/Auth/AuthSaml.php | 4 ++-- web/lib/MRBS/Auth/AuthWix.php | 4 ++-- web/lib/MRBS/Auth/AuthWordpress.php | 4 ++-- web/lib/MRBS/DB.php | 12 ++++++------ web/lib/MRBS/DBFactory.php | 6 +++--- web/lib/MRBS/DB_mysql.php | 6 +++--- web/lib/MRBS/DB_pgsql.php | 6 +++--- web/lib/MRBS/Session/SessionWithLogin.php | 4 ++-- web/lib/MRBS/Session/SessionWordpress.php | 4 ++-- 25 files changed, 62 insertions(+), 62 deletions(-) commit 4dda02988 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 11 16:55:47 2022 +0100 Added type declarations web/view_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 84b8ec34b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 11 16:48:19 2022 +0100 Fixed typo in comment web/view_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 02380cf3d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 11 16:47:46 2022 +0100 Replaced expressions with ?? versions web/view_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 680ef731e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 9 18:33:09 2022 +0100 Restructured web/functions_error.inc | 54 +++++++++++++++++++++++++++++++++++++++ web/init.inc | 53 -------------------------------------- 2 files changed, 54 insertions(+), 53 deletions(-) commit 66e81f5ca Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 9 13:55:26 2022 +0100 Corrected typo in comment web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f007c28a9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 9 13:51:00 2022 +0100 Improved comment. web/systemdefaults.inc.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) commit 6fdff7d6c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 8 20:35:54 2022 +0100 Changed the way that the session.gc_maxlifetime variable is set so that it now respects an existing setting if that is greater than $auth["session_php"]["session_expire_time"]. web/lib/MRBS/Session/Session.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 24675d754 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 8 19:42:57 2022 +0100 Restructured web/lib/MRBS/Session/SessionJoomla.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) commit f1ef372cf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 8 19:35:57 2022 +0100 Removed redundant use statements web/init.inc | 2 -- 1 file changed, 2 deletions(-) commit 5b6c3f715 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 8 19:27:42 2022 +0100 Restructured: moved session initialisation code into the Session classes. web/init.inc | 168 +++-------------------- web/lib/MRBS/Session/Session.php | 93 ++++++++++++- web/lib/MRBS/Session/SessionCookie.php | 6 + web/lib/MRBS/Session/SessionJoomla.php | 40 ++++++ web/lib/MRBS/Session/SessionSaml.php | 14 ++ web/mrbs_auth.inc | 16 --- 6 files changed, 170 insertions(+), 167 deletions(-) commit 5ecaae10e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 8 18:47:19 2022 +0100 Started fixing Joomla4 authentication web/init.inc | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) commit 7c7a8653e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 8 17:52:31 2022 +0100 Corrected typo in comment web/lib/MRBS/Session/SessionWordpress.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6bdc1aca0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 8 17:41:09 2022 +0100 Fixed bug when authenticating against Joomla! Version 3. web/lib/MRBS/Auth/AuthJoomla.php | 8 ++++++++ web/lib/MRBS/Session/SessionJoomla.php | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) commit 2f22678af Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 7 18:34:04 2022 +0100 Upgraded to PHPMailer 6.6.5 web/lib/PHPMailer/VERSION | 2 +- web/lib/PHPMailer/composer.json | 2 +- web/lib/PHPMailer/language/phpmailer.lang-da.php | 10 ++++++++-- web/lib/PHPMailer/language/phpmailer.lang-pl.php | 13 ++++++------- web/lib/PHPMailer/src/PHPMailer.php | 9 ++++++--- web/lib/PHPMailer/src/POP3.php | 2 +- web/lib/PHPMailer/src/SMTP.php | 3 +-- 7 files changed, 24 insertions(+), 17 deletions(-) commit 6775815e9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 7 17:54:15 2022 +0100 Changed error messages (no need for translations) web/lib/MRBS/SessionHandlerDb.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 325f2459e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 7 17:39:34 2022 +0100 Fixed bug in recent commit when running in multisite mode web/js/index.js.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) commit 6e96f2fed Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 7 17:29:41 2022 +0100 Improved error handling on failure to acquire a mutex lock in the session handler web/lib/MRBS/SessionHandlerDb.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) commit 8c988fbe0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 7 17:23:45 2022 +0100 Added a lock to validateId() web/lib/MRBS/SessionHandlerDb.php | 6 ++++++ 1 file changed, 6 insertions(+) commit 55a99a31e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 6 16:52:30 2022 +0100 Added better check for result of write() web/lib/MRBS/SessionHandlerDb.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 79559cfe3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 6 16:43:08 2022 +0100 Simplified code web/lib/MRBS/SessionHandlerDb.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit c8853eea7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 6 16:41:34 2022 +0100 Added better check for result of updateTimestamp() web/lib/MRBS/SessionHandlerDb.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 3b2702474 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 6 16:35:33 2022 +0100 Made MIN_VERSION const private web/lib/MRBS/DB_pgsql.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 42fbd10b6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 6 16:30:03 2022 +0100 Restructured web/lib/MRBS/DB_pgsql.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) commit 2692c3637 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 6 16:26:14 2022 +0100 Restructured web/lib/MRBS/DB_mysql.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) commit a01749bf9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 6 16:21:16 2022 +0100 Changed the way MySQL is configured to bring it into line with PostgreSQL so that db()->command() returns the number of found (matched) rows, not the number of changed rows. web/lib/MRBS/DB.php | 43 ++++++++++++++++++++++++------------- web/lib/MRBS/DB_mysql.php | 14 +++++++++++- web/lib/MRBS/DB_pgsql.php | 9 +++++++- 3 files changed, 49 insertions(+), 17 deletions(-) commit d42f33675 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 5 18:18:01 2022 +0100 Fixed locking in DB session handler web/lib/MRBS/SessionHandlerDb.php | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) commit eb66414a5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 5 18:11:51 2022 +0100 Fixed bug (MySQL will return 0 rows updated if the values are identical unless the PDO::MYSQL_ATTR_FOUND_ROWS is set). web/lib/MRBS/SessionHandlerDb.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1c76f5cec Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 5 16:36:29 2022 +0100 Checked the number of rows affected in updateTimestamp() web/lib/MRBS/SessionHandlerDb.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit 03820fecc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 5 14:43:42 2022 +0100 Fixed bug causing the "Return to previous page" link in view_entry.php not to be correct if the page has been reached through the navigation arrows which fetch the page using Ajax calls. This bug was introduced while fixing GitHub Issue #57. INSTALL | 20 ++++++++++++------ web/ajax/update_page.php (new) | 19 +++++++++++++++++ web/init.inc | 13 +++++------- web/js/index.js.php | 7 ++++++ web/lib/MRBS/Session/Session.php | 7 ++++++ web/lib/MRBS/Session/SessionPhp.php | 13 +++++++----- web/lib/MRBS/SessionHandlerDb.php | 18 +++++++++++++++- .../MRBS/SessionHandlerDbException.php (new) | 9 ++++++++ 8 files changed, 86 insertions(+), 20 deletions(-) commit 1664562cb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 5 10:05:27 2022 +0100 Added locking of sessions web/lib/MRBS/SessionHandlerDb.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit 42d21b2b0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 5 09:48:22 2022 +0100 Added comment web/lib/MRBS/DB_mysql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c92f7dae8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 5 09:46:29 2022 +0100 Allowed use of multiple locks if they are supported web/lib/MRBS/DB_mysql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1b6944f3e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 5 09:44:18 2022 +0100 Made use of SELECT RELEASE_ALL_LOCKS() when possible web/lib/MRBS/DB_mysql.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) commit 664dfdd17 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 5 09:39:29 2022 +0100 Truncated lock names in MySQL as since MYSQL 5.7.5 they are restricted to 64 characters. web/lib/MRBS/DB_mysql.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) commit e34981ca9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 5 09:28:01 2022 +0100 Added caching web/lib/MRBS/DB_mysql.php | 40 +++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 17 deletions(-) commit 2415fb9e8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 5 09:18:43 2022 +0100 Added method supportsMultipleLocks() web/lib/MRBS/DB.php | 6 ++++++ web/lib/MRBS/DB_mysql.php | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) commit 3b6ab685b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 5 08:43:52 2022 +0100 Added comment web/lib/MRBS/DB_pgsql.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit d86843462 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 4 18:50:14 2022 +0100 Replaced qualifier with import web/lib/MRBS/SessionHandlerDb.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit f9c566f1d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 4 18:48:48 2022 +0100 Fixed bug preventing sessions from working when using certain versions of PHP. See https://github.com/php/php-src/issues/9668. web/lib/MRBS/SessionHandlerDb.php | 43 ++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) commit 63462bdfe Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 3 19:28:43 2022 +0100 Added comment web/lib/MRBS/SessionHandlerDb.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 37a8d1356 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 3 17:00:30 2022 +0100 Simplified code web/lib/MRBS/DB_pgsql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c7f328b4e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 3 16:59:09 2022 +0100 Simplified code web/lib/MRBS/DB_mysql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 535dea3d7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 3 16:54:37 2022 +0100 Added type declarations web/lib/MRBS/DB.php | 2 +- web/lib/MRBS/DB_mysql.php | 2 +- web/lib/MRBS/DB_pgsql.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit e7194e8f1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 3 16:51:42 2022 +0100 Added abstract method web/lib/MRBS/DB.php | 3 +++ 1 file changed, 3 insertions(+) commit 0b8efb0bc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 3 16:49:58 2022 +0100 Added type declarations web/lib/MRBS/DB.php | 2 +- web/lib/MRBS/DB_mysql.php | 2 +- web/lib/MRBS/DB_pgsql.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit b321b5a29 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 3 16:45:13 2022 +0100 Added abstract method web/lib/MRBS/DB.php | 6 ++++++ 1 file changed, 6 insertions(+) commit 6b75ccf16 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 3 16:31:23 2022 +0100 Added type declarations web/lib/MRBS/DB.php | 2 +- web/lib/MRBS/DB_mysql.php | 2 +- web/lib/MRBS/DB_pgsql.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 78d4171a0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 3 16:29:42 2022 +0100 Added abstract method web/lib/MRBS/DB.php | 3 +++ 1 file changed, 3 insertions(+) commit 2b4e842d6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 3 16:27:09 2022 +0100 Added type declarations web/lib/MRBS/DB.php | 4 ++-- web/lib/MRBS/DB_mysql.php | 2 +- web/lib/MRBS/DB_pgsql.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) commit a6651e962 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 3 16:25:13 2022 +0100 Added abstract method web/lib/MRBS/DB.php | 4 ++++ 1 file changed, 4 insertions(+) commit 4a471b212 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 2 18:50:38 2022 +0100 Added missing method web/lib/MRBS/DB_pgsql.php | 9 +++++++++ 1 file changed, 9 insertions(+) commit b79e98a25 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 2 18:47:02 2022 +0100 Added type declarations web/lib/MRBS/DB.php | 4 ++-- web/lib/MRBS/DB_mysql.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 39fc56306 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 2 18:44:43 2022 +0100 Added abstract method web/lib/MRBS/DB.php | 4 ++++ 1 file changed, 4 insertions(+) commit 48241e340 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 2 18:42:00 2022 +0100 Tweaked comment web/lib/MRBS/DB_pgsql.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 76d93f067 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 2 18:40:30 2022 +0100 Added type declarations web/lib/MRBS/DB.php | 6 +++--- web/lib/MRBS/DB_mysql.php | 6 +++--- web/lib/MRBS/DB_pgsql.php | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) commit 5d145a8c2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 2 18:35:38 2022 +0100 Added abstract method web/lib/MRBS/DB.php | 7 +++++++ 1 file changed, 7 insertions(+) commit 5a6d03c30 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 2 18:33:39 2022 +0100 Added type declarations web/lib/MRBS/DB.php | 4 ++-- web/lib/MRBS/DB_mysql.php | 2 +- web/lib/MRBS/DB_pgsql.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) commit 2bfb741f8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 2 18:30:17 2022 +0100 Added abstract method web/lib/MRBS/DB.php | 8 ++++++++ 1 file changed, 8 insertions(+) commit 4efa00696 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 2 18:28:24 2022 +0100 Added type declarations web/lib/MRBS/DB.php | 2 +- web/lib/MRBS/DB_mysql.php | 6 +++--- web/lib/MRBS/DB_pgsql.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) commit 5af417d01 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 2 18:23:51 2022 +0100 Added abstract method web/lib/MRBS/DB.php | 3 +++ 1 file changed, 3 insertions(+) commit d29c05d04 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 2 18:22:15 2022 +0100 Added type declarations web/lib/MRBS/DB.php | 2 +- web/lib/MRBS/DB_mysql.php | 2 +- web/lib/MRBS/DB_pgsql.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 7da55c117 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 2 18:10:56 2022 +0100 Added abstract method web/lib/MRBS/DB.php | 3 +++ 1 file changed, 3 insertions(+) commit 717a45706 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 2 18:07:06 2022 +0100 Added type declarations web/lib/MRBS/DB.php | 4 ++-- web/lib/MRBS/DB_mysql.php | 2 +- web/lib/MRBS/DB_pgsql.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) commit a003ec501 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 2 18:05:02 2022 +0100 Added abstract method web/lib/MRBS/DB.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) commit c6bb1df82 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 2 18:00:22 2022 +0100 Removed redundant cast web/lib/MRBS/DB.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1e7b72e54 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 2 17:59:08 2022 +0100 Added type declarations web/lib/MRBS/DB.php | 20 ++++++++++---------- web/lib/MRBS/DB_mysql.php | 2 +- web/lib/MRBS/DB_pgsql.php | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) commit 080e8d13d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 2 17:44:43 2022 +0100 Made method explicitly public web/lib/MRBS/DB.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e0c170c3e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 2 10:48:21 2022 +0100 Restructured web/lib/MRBS/DB_mysql.php | 74 ++++++++++++++++++++++++++++--------- 1 file changed, 56 insertions(+), 18 deletions(-) commit 498a1205e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 2 09:40:11 2022 +0100 Added mutex_unlock_all() web/lib/MRBS/DB.php | 8 ++++---- web/lib/MRBS/DB_mysql.php | 11 +++++++++++ web/lib/MRBS/DB_pgsql.php | 7 +++++++ 3 files changed, 22 insertions(+), 4 deletions(-) commit 52c876d4d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 1 18:34:19 2022 +0100 Added abstract method web/lib/MRBS/DB.php | 3 +++ 1 file changed, 3 insertions(+) commit 92efc5734 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 1 18:28:29 2022 +0100 Added type declarations and simplified code web/lib/MRBS/DB_mysql.php | 4 ++-- web/lib/MRBS/DB_pgsql.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit bc193a899 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 1 10:31:16 2022 +0100 Added comments and type declarations web/lib/MRBS/DB.php | 7 ++++--- web/lib/MRBS/DB_mysql.php | 4 +++- web/lib/MRBS/DB_pgsql.php | 6 ++++-- 3 files changed, 11 insertions(+), 6 deletions(-) commit cfceea0e6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 1 10:15:55 2022 +0100 Added caching for performance web/lib/MRBS/DB.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) commit 268e5a019 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 1 10:04:48 2022 +0100 Restructured web/lib/MRBS/DB_mysql.php | 1 - web/lib/MRBS/DB_pgsql.php | 18 +++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) commit ace6de59c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 1 09:55:06 2022 +0100 Added check for minimum versions of MySQL/MariaDB web/language.inc | 13 +++++++++- web/lib/MRBS/DB.php | 11 +++++++++ web/lib/MRBS/DB_mysql.php | 47 ++++++++++++++++++++++++++++++++++++- 3 files changed, 69 insertions(+), 2 deletions(-) commit 96f229d2d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 30 18:25:22 2022 +0100 Added getAttribute() method web/lib/MRBS/DB.php | 6 ++++++ 1 file changed, 6 insertions(+) commit 976582325 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 30 18:03:31 2022 +0100 Renamed method web/lib/MRBS/DB_pgsql.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 6467ced34 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 30 17:59:36 2022 +0100 Added comment web/lib/MRBS/DB.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 2ad3b4004 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 30 17:56:46 2022 +0100 Fixed bug introduced in last commit web/lib/MRBS/DB_pgsql.php | 6 ++++++ 1 file changed, 6 insertions(+) commit 423a7e1ec Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 30 17:43:58 2022 +0100 Restructured web/lib/MRBS/DB.php | 12 +++++++++--- web/lib/MRBS/DB_mysql.php | 10 ---------- 2 files changed, 9 insertions(+), 13 deletions(-) commit 479736e9a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 30 17:37:29 2022 +0100 Improved identification of version for MySQL databases web/lib/MRBS/DB_mysql.php | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) commit dc6701ef3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 30 16:36:52 2022 +0100 Added type declarations web/lib/MRBS/DB_pgsql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bcffd765a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 30 16:35:53 2022 +0100 Fixed typo in comment web/lib/MRBS/DB_pgsql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1866be8af Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 30 16:33:35 2022 +0100 Back-ported from the roles branch the min version check for PostgreSQL web/lib/MRBS/DB_pgsql.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) commit 0322d4b1a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 29 19:08:40 2022 +0100 Upgraded to jQuery UI version 1.13.2 web/jquery/ui/css/jquery-ui.structure.css | 2 +- .../ui/css/jquery-ui.structure.min.css | 2 +- ...i-bg_diagonals-medium_20_d34d17_40x40.png | Bin 440 -> 440 bytes .../ui-bg_gloss-wave_45_817865_500x100.png | Bin 5948 -> 5948 bytes .../ui-bg_gloss-wave_60_fece2f_500x100.png | Bin 5908 -> 5908 bytes .../ui-bg_gloss-wave_70_ffdd57_500x100.png | Bin 5601 -> 5601 bytes .../ui-bg_gloss-wave_90_fff9e5_500x100.png | Bin 5447 -> 5447 bytes ...ui-bg_highlight-soft_100_feeebd_1x100.png | Bin 401 -> 401 bytes .../ui-bg_inset-soft_30_ffffff_1x100.png | Bin 261 -> 261 bytes .../sunny/images/ui-icons_3d3d3d_256x240.png | Bin 7074 -> 7074 bytes .../sunny/images/ui-icons_bd7b00_256x240.png | Bin 4618 -> 4618 bytes .../sunny/images/ui-icons_d19405_256x240.png | Bin 4618 -> 4618 bytes .../sunny/images/ui-icons_eb990f_256x240.png | Bin 4618 -> 4618 bytes .../sunny/images/ui-icons_ed9f26_256x240.png | Bin 4618 -> 4618 bytes .../sunny/images/ui-icons_fadc7a_256x240.png | Bin 4618 -> 4618 bytes .../sunny/images/ui-icons_ffe180_256x240.png | Bin 4618 -> 4618 bytes web/jquery/ui/css/sunny/jquery-ui.theme.css | 2 +- .../ui/css/sunny/jquery-ui.theme.min.css | 2 +- web/jquery/ui/jquery-ui.js | 85 +++++++++-------- web/jquery/ui/jquery-ui.min.js | 4 +- 20 files changed, 51 insertions(+), 46 deletions(-) commit 82eaa8b46 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 28 16:29:55 2022 +0100 Added type declarations web/lib/MRBS/DB.php | 2 +- web/lib/MRBS/DB_mysql.php | 2 +- web/lib/MRBS/DB_pgsql.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 3b2394888 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 28 15:59:08 2022 +0100 Simplified code web/lib/MRBS/DB.php | 17 ++++++++++++++--- web/lib/MRBS/DB_mysql.php | 14 -------------- web/lib/MRBS/DB_pgsql.php | 14 -------------- 3 files changed, 14 insertions(+), 31 deletions(-) commit e3361266d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 28 15:52:20 2022 +0100 Restructured to allow multiple locks in the future web/lib/MRBS/DB.php | 2 +- web/lib/MRBS/DB_mysql.php | 28 +++++++++++----------------- web/lib/MRBS/DB_pgsql.php | 13 +++++++------ 3 files changed, 19 insertions(+), 24 deletions(-) commit bec1a0979 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 28 15:36:13 2022 +0100 Back-ported some method declarations from the roles branch web/lib/MRBS/DB.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) commit 55904eb02 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 28 15:27:47 2022 +0100 Updated comments web/lib/MRBS/DB_pgsql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a64e4cd21 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 28 15:26:12 2022 +0100 Updated comments web/lib/MRBS/DB_mysql.php | 6 ++++-- web/lib/MRBS/DB_pgsql.php | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) commit cb51e7447 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 28 15:23:53 2022 +0100 Updated comments web/lib/MRBS/DB_mysql.php | 18 ++---------------- web/lib/MRBS/DB_pgsql.php | 2 +- 2 files changed, 3 insertions(+), 17 deletions(-) commit ab8fddd9f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 28 09:20:48 2022 +0100 Added type declarations web/lib/MRBS/DB_mysql.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 6cec87724 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 28 09:04:26 2022 +0100 Improved error handling web/lib/MRBS/DB_pgsql.php | 46 +++++++++++++------------------------ 1 file changed, 16 insertions(+), 30 deletions(-) commit 741a0be7e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Sep 27 19:00:24 2022 +0100 Changed the implementation of mutex_lock() in DB_pgsql.php to use PostgreSQL advisory locks, avoiding the more heavy-handed table locks that were used previously and more closely matching the DB_mysql.php implementation. web/lib/MRBS/DB_pgsql.php | 74 +++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 32 deletions(-) commit 737b7ec56 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 11 14:19:42 2022 +0100 Fixed bug introduced in recent commit web/lib/MRBS/Auth/AuthDb.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 2fa08658c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 11 14:17:55 2022 +0100 Added SensitiveParameter attribute for user credentials web/lib/MRBS/Session/SessionWithLogin.php | 6 +++++- web/lib/MRBS/Session/SessionWordpress.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) commit 2c6e61ef9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 11 14:11:23 2022 +0100 Added SensitiveParameter attribute for user credentials web/lib/MRBS/Auth/Auth.php | 4 +++- web/lib/MRBS/Auth/AuthDb.php | 19 ++++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) commit 86f9fd9d5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 11 14:02:48 2022 +0100 Added SensitiveParameter attribute for user credentials web/lib/MRBS/Auth/Auth.php | 6 +++++- web/lib/MRBS/Auth/AuthAuthBasic.php | 6 +++++- web/lib/MRBS/Auth/AuthCas.php | 6 +++++- web/lib/MRBS/Auth/AuthConfig.php | 6 +++++- web/lib/MRBS/Auth/AuthCrypt.php | 6 +++++- web/lib/MRBS/Auth/AuthDb.php | 6 +++++- web/lib/MRBS/Auth/AuthDbExt.php | 6 +++++- web/lib/MRBS/Auth/AuthExt.php | 6 +++++- web/lib/MRBS/Auth/AuthIdcheck.php | 6 +++++- web/lib/MRBS/Auth/AuthImap.php | 6 +++++- web/lib/MRBS/Auth/AuthImapPhp.php | 6 +++++- web/lib/MRBS/Auth/AuthJoomla.php | 6 +++++- web/lib/MRBS/Auth/AuthLdap.php | 6 +++++- web/lib/MRBS/Auth/AuthNone.php | 6 +++++- web/lib/MRBS/Auth/AuthNw.php | 6 +++++- web/lib/MRBS/Auth/AuthPop3.php | 6 +++++- web/lib/MRBS/Auth/AuthSaml.php | 6 +++++- web/lib/MRBS/Auth/AuthWix.php | 6 +++++- web/lib/MRBS/Auth/AuthWordpress.php | 6 +++++- 19 files changed, 95 insertions(+), 19 deletions(-) commit da16ad4ed Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 4 18:50:14 2022 +0100 Added type declarations web/lib/MRBS/DB.php | 24 ++++++++++++------------ web/lib/MRBS/DBFactory.php | 14 +++++++------- web/lib/MRBS/DB_mysql.php | 12 ++++++------ web/lib/MRBS/DB_pgsql.php | 12 ++++++------ 4 files changed, 31 insertions(+), 31 deletions(-) commit c16cb60b2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 4 18:42:27 2022 +0100 Added SensitiveParameter attribute for database credentials web/lib/MRBS/DB.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) commit b4e085b3e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Sep 4 18:39:36 2022 +0100 Converted variable to boolean web/config.inc.php-sample | 4 ++-- web/lib/MRBS/Auth/AuthDbExt.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit c4db8d015 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Sep 3 18:13:10 2022 +0100 Added SensitiveParameter attribute for database credentials web/lib/MRBS/DBFactory.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) commit c8ccd7182 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Sep 3 18:03:59 2022 +0100 Added SensitiveParameter attribute for database credentials web/lib/MRBS/DB.php | 14 ++++++++++++-- web/lib/MRBS/DB_mysql.php | 13 ++++++++++++- web/lib/MRBS/DB_pgsql.php | 13 ++++++++++++- 3 files changed, 36 insertions(+), 4 deletions(-) commit d646753a8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 26 20:33:25 2022 +0100 Added type declarations web/language.inc | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) commit 013602297 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 25 15:43:32 2022 +0100 Replaced qualifier with an import web/lib/MRBS/System.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 93a176515 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 25 15:40:42 2022 +0100 Added type declarations web/lib/MRBS/System.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) commit 927dba46d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 22 18:56:16 2022 +0100 Added type declarations web/functions_mail.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 8ce702766 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 22 18:53:12 2022 +0100 Corrected typo in comment web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6e11cf064 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 22 18:50:55 2022 +0100 Added type declarations web/functions_mail.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit dd958b76e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 22 17:32:17 2022 +0100 Upgraded to PHPMailer 6.6.4 web/lib/PHPMailer/README.md | 3 + web/lib/PHPMailer/VERSION | 2 +- web/lib/PHPMailer/composer.json | 6 +- web/lib/PHPMailer/get_oauth_token.php | 44 +++++++---- .../PHPMailer/language/phpmailer.lang-el.php | 41 ++++++---- .../language/phpmailer.lang-mn.php (new) | 27 +++++++ web/lib/PHPMailer/src/PHPMailer.php | 74 +++++++++++------- web/lib/PHPMailer/src/POP3.php | 2 +- web/lib/PHPMailer/src/SMTP.php | 7 +- 9 files changed, 138 insertions(+), 68 deletions(-) commit 9bc6e399d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Aug 20 18:47:59 2022 +0100 Added type declarations web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 813ceb4e5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Aug 20 18:40:02 2022 +0100 Added type declarations web/functions_mail.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit d96a3efdc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Aug 20 18:19:21 2022 +0100 Added type declarations web/functions_mail.inc | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) commit a2df33a21 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Aug 20 17:56:42 2022 +0100 Added type declarations web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ee5487627 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Aug 20 17:38:05 2022 +0100 Fixed TypeError bug web/functions_mail.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit b1efecd5b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Aug 20 17:28:44 2022 +0100 Added type declarations web/approve_entry_handler.php | 2 +- web/mrbs_sql.inc | 2 +- web/view_entry.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 5025363cb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Aug 20 17:12:31 2022 +0100 Added support for bool globals web/grab_globals.inc.php | 75 ++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 39 deletions(-) commit 2b8282f7e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 19 18:59:57 2022 +0100 Cast result to string web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6761f45ff Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 19 18:55:56 2022 +0100 Replaced error with exception. web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ee4f78c43 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 19 18:52:43 2022 +0100 Eliminated duplicated code web/functions.inc | 26 ++++++++++++++++++++++++++ web/functions_mail.inc | 39 ++------------------------------------- web/functions_view.inc | 19 +------------------ 3 files changed, 29 insertions(+), 55 deletions(-) commit ba67c9a29 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 19 17:52:46 2022 +0100 Enabled strict_types web/edit_entry_handler.php | 1 + 1 file changed, 1 insertion(+) commit 6528e353f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 19 17:52:25 2022 +0100 Fixed potential TypeError web/mrbs_sql.inc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) commit f0c14b166 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 19 16:46:38 2022 +0100 Restructured web/functions.inc | 22 ++++------------------ web/mrbs_sql.inc | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 18 deletions(-) commit 13f1fea83 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 19 16:07:27 2022 +0100 Simplified code web/mrbs_sql.inc | 59 +++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 29 deletions(-) commit fee7cce84 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 17 18:34:32 2022 +0100 Disabled strict_types for the moment - it breaks too much of MRBS web/edit_entry_handler.php | 1 - 1 file changed, 1 deletion(-) commit 304cd3fed Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 17 17:44:36 2022 +0100 Back-ported some more from the roles branch that should have been back-ported in the last commit web/lib/MRBS/DB_mysql.php | 73 +++++++++++++++++++++---------------- web/lib/MRBS/DB_pgsql.php | 57 +++++++++++++++++------------ 2 files changed, 74 insertions(+), 56 deletions(-) commit c64cb3a95 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 17 17:32:19 2022 +0100 Improved performance, back-porting from the roles branch web/functions.inc | 2 +- web/functions_mail.inc | 2 +- web/lib/MRBS/Column.php | 68 +++++++++++++++++++++++++++++++------- web/lib/MRBS/Columns.php | 29 ++++++++++++++-- 4 files changed, 85 insertions(+), 16 deletions(-) commit f888c126d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 17 17:21:02 2022 +0100 Added support for casting reals web/functions.inc | 4 ++++ 1 file changed, 4 insertions(+) commit 677c4087b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 17 17:06:05 2022 +0100 Fixed TypeError bug web/functions.inc | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) commit 425fd0ede Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 17 12:29:44 2022 +0100 Simplified code web/lib/MRBS/Form/ElementInputHidden.php | 18 +++++++++++++++--- web/lib/MRBS/Form/Field.php | 11 ++--------- web/lib/MRBS/Form/Form.php | 11 ++--------- 3 files changed, 19 insertions(+), 21 deletions(-) commit c10b8f416 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 17 12:13:42 2022 +0100 Fixed bug causing the "Skip and Book" button not to work. web/lib/MRBS/Form/Field.php | 87 ++++++++++++++++++----------------- web/lib/MRBS/Form/Form.php | 5 ++ 2 files changed, 51 insertions(+), 41 deletions(-) commit a9279f0f3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 17 11:19:22 2022 +0100 Fixed duplicate colon problem. web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9efdfa9e9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 12 16:18:17 2022 +0100 Enabled strict_types web/edit_entry_handler.php | 1 + 1 file changed, 1 insertion(+) commit ab8dac4f5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 12 15:11:59 2022 +0100 Added some error checking web/edit_entry_handler.php | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) commit 445f88a6d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 11 19:44:27 2022 +0100 Fixed potential TypeError web/edit_entry_handler.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) commit 09ab7ebcc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 11 19:30:23 2022 +0100 Fixed potential TypeError web/functions.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit c70d67e27 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 11 19:13:42 2022 +0100 Fixed potential TypeError web/edit_entry_handler.php | 3 +++ 1 file changed, 3 insertions(+) commit 2d78e2a95 Merge: 0e2fb0da1 b1f14bfca Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Aug 9 18:38:14 2022 +0100 Merge pull request #58 from meeting-room-booking-system/issue_57 Issue 57 commit b1f14bfca Merge: 9d5896c8b 0e2fb0da1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 8 18:28:02 2022 +0100 Merge branch 'main' into issue_57 commit 0e2fb0da1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 8 18:27:44 2022 +0100 Simplified code web/lib/MRBS/Session/SessionPhp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9d5896c8b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 8 18:25:19 2022 +0100 Stored the last page as a session variable so that it can be used instead of $_SERVER['HTTP_REFERER'] when the Referrer-Policy is set to strict-origin. See GitHub Issue #57. web/edit_entry.php | 5 ++- web/lib/MRBS/Session/Session.php (new) | 22 ++++++++++ web/lib/MRBS/Session/SessionHost.php | 2 +- .../MRBS/Session/SessionInterface.php (gone) | 12 ------ web/lib/MRBS/Session/SessionIp.php | 2 +- web/lib/MRBS/Session/SessionNt.php | 2 +- web/lib/MRBS/Session/SessionOmni.php | 2 +- web/lib/MRBS/Session/SessionPhp.php | 40 +++++++++++++++--- web/lib/MRBS/Session/SessionWithLogin.php | 2 +- .../Session/SessionWithoutLogin.php (gone) | 14 ------ web/mrbs_auth.inc | 5 ++- web/view_entry.php | 14 +++--- 12 files changed, 74 insertions(+), 48 deletions(-) commit 588527d09 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 4 07:05:06 2022 +0100 Added checking to see that $create_by has been set web/edit_entry_handler.php | 5 +++++ web/mrbs_auth.inc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) commit 1517b6732 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Aug 2 04:11:36 2022 +0100 Removed any extra whitespace that may accidentally have been inserted in the display name. web/edit_users.php | 6 ++++++ 1 file changed, 6 insertions(+) commit 0c83222fa Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 14 08:51:19 2022 +0100 Tweaked formatting web/js/datepicker.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit e947666f1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 14 08:48:01 2022 +0100 Added comment web/js/datepicker.js.php | 3 +++ 1 file changed, 3 insertions(+) commit e1c7b0d1c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 13 18:27:57 2022 +0100 Fixed duplicate declarations web/js/index.js.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 631126ac6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 13 14:09:28 2022 +0100 Tweaked formatting web/js/datepicker.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 645cfb455 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 13 14:07:40 2022 +0100 Tweaked formatting web/js/datepicker.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0da0bf6e9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 13 14:02:04 2022 +0100 Showed current view dates in minicalendars when there are hidden days. See GitHub PR #56. web/js/datepicker.js.php | 68 ++++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 21 deletions(-) commit 827383606 Merge: 260852afb 71d041500 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 12 15:23:01 2022 +0100 Merge pull request #55 from meeting-room-booking-system/minicalendar_range Minicalendar range commit 71d041500 Merge: 638e11a21 260852afb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 12 15:07:36 2022 +0100 Merge branch 'main' into minicalendar_range commit 260852afb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 12 15:07:19 2022 +0100 Fix for the issue identified in GitHub Pull Request #54. web/js/index.js.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) commit 638e11a21 Merge: e7458e270 cc247816d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 9 17:12:16 2022 +0100 Merge branch 'main' into minicalendar_range commit cc247816d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 9 17:11:56 2022 +0100 Simplified code web/js/datepicker.js.php | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) commit e7458e270 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 9 16:37:06 2022 +0100 Added comment web/js/datepicker.js.php | 1 + 1 file changed, 1 insertion(+) commit e6e722d13 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 8 16:14:43 2022 +0100 Fixed bug in weekStart calculation web/js/datepicker.js.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit 68455ed06 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 8 16:09:44 2022 +0100 Added comment web/js/datepicker.js.php | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) commit 691d4ac3c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 8 15:52:02 2022 +0100 Disabled ranges when there are hidden days. web/js/datepicker.js.php | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) commit d0227b7a8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 8 15:06:44 2022 +0100 Started new branch to display date range. See GitHub Pull Requests #53. web/js/datepicker.js.php | 43 +++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) commit 4f5a7136c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 8 09:54:51 2022 +0100 Improved error handling web/standard_vars.inc.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit 394903f15 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 7 14:56:17 2022 +0100 Added comment web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ece1a03f8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 7 14:54:36 2022 +0100 Fixed bug introduced in recent change web/mrbs_sql.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit 75209a722 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 7 14:41:06 2022 +0100 Fixed bug introduced in recent change web/mrbs_sql.inc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) commit 7cd75b0ba Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 5 20:44:18 2022 +0100 Added type declarations web/functions_mail.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 0caf8b5fa Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 5 18:39:40 2022 +0100 Simplified code web/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5388ef554 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 5 18:27:40 2022 +0100 Simplified code web/edit_entry_handler.php | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) commit d1ba57f07 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 5 17:51:58 2022 +0100 Improved error handling in the case of invalid dates web/edit_entry_handler.php | 19 ++++++++++++++++--- web/functions.inc | 25 ++++++++++--------------- web/report.php | 25 ++++++++++++++----------- web/search.php | 6 +++++- web/standard_vars.inc.php | 6 +++++- 5 files changed, 50 insertions(+), 31 deletions(-) commit 8f800c71c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jul 4 14:26:21 2022 +0100 Fixed bug causing the "Today" button not to go to the current day if the page had been loaded on a different day. web/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 0af8d20a5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 3 08:21:35 2022 +0100 Added type declarations web/lib/MRBS/DB.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit d6fb1f8ec Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 17:15:51 2022 +0100 Replaced qualifiers with imports web/lib/MRBS/Session/SessionPhp.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit 92cb0c4b9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 17:01:11 2022 +0100 Replaced qualifiers with imports web/lib/MRBS/Session/SessionWithLogin.php | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) commit 595e5cba8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 16:53:45 2022 +0100 Removed redundant argument web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d94fbdcfd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 16:49:19 2022 +0100 Added type declarations web/functions_view.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 80ca9a433 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 16:41:58 2022 +0100 Added type declarations web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3ba765546 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 16:35:06 2022 +0100 Removed redundant test web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0a6cf56fb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 16:29:37 2022 +0100 Removed unnecessary curly braces web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 151b41aef Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 16:26:22 2022 +0100 Replaced qualifier with import web/functions.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit b89513af5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 16:20:44 2022 +0100 Added type declarations web/functions_table.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit f46ddefd4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 16:11:01 2022 +0100 Added type declarations web/functions_table.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 0f34e95c2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 16:06:28 2022 +0100 Added type declarations web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6843a8ae9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 14:16:15 2022 +0100 Added type declarations web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9d105c2a6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 14:02:06 2022 +0100 Added type declarations web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a018c8b75 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 13:58:09 2022 +0100 Removed unnecessary leading \ web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bdce7a274 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 13:57:09 2022 +0100 Fixed typos in comments web/functions_table.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 7223a04dc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 13:54:30 2022 +0100 Added type declarations web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 85ec71bc7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 13:46:19 2022 +0100 Simplified code web/functions_table.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) commit dd31b5263 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 13:36:14 2022 +0100 Made kiosk mode respect private bookings web/functions_table.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit cc2ed0848 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 09:54:11 2022 +0100 Extended clickable area to whole window web/js/resizable.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d72edb6fd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 09:47:46 2022 +0100 Added exit kiosk mode confirm dialog web/js/resizable.js.php | 15 ++++++++++++--- web/lang/lang.en | 1 + 2 files changed, 13 insertions(+), 3 deletions(-) commit 693b725f1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 09:21:15 2022 +0100 Added comment web/js/resizable.js.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) commit 857055d9b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 09:18:35 2022 +0100 Disabled all links and events in kiosk mode web/js/resizable.js.php | 8 ++++++++ 1 file changed, 8 insertions(+) commit e58546ba2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jul 2 06:56:13 2022 +0100 Removed banner navigation when in kiosk mode web/css/mrbs.css.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 7060971ba Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 1 08:42:19 2022 +0100 Added type declarations web/index.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 5d2b4c746 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 1 08:33:13 2022 +0100 Added type declarations web/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 46f655041 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 1 08:29:24 2022 +0100 Added type declarations web/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c9b273aba Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 1 08:26:59 2022 +0100 Ensured that the day switches over when running in kiosk mode web/index.php | 9 +++++++-- web/js/refresh.js.php | 9 +++++---- 2 files changed, 12 insertions(+), 6 deletions(-) commit 36e966c62 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 17:16:59 2022 +0100 Added type declarations web/functions.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 99f559d33 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 16:26:08 2022 +0100 Added type declarations and error handling web/functions.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit 28a8a19ba Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 16:18:21 2022 +0100 Added type declarations web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c7c18dd78 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 16:14:52 2022 +0100 Added type declarations web/functions.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 7da739b9d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 16:10:36 2022 +0100 Added type declarations web/functions.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 204d5883e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 16:01:03 2022 +0100 Removed redundant code now that the minimum PHP version is 7.2.0. web/functions.inc | 59 +++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 34 deletions(-) commit 67de4ca33 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 15:53:49 2022 +0100 Removed redundant code now that the minimum PHP version is 7.2.0. web/functions.inc | 5 ----- 1 file changed, 5 deletions(-) commit 934b8a81a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 15:49:51 2022 +0100 Added type declarations web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit efe8aa174 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 15:44:54 2022 +0100 Added type declarations web/functions.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 95aa1efa4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 15:38:25 2022 +0100 Added type declarations web/functions.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit be59e293c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 15:34:58 2022 +0100 Added type declarations web/functions.inc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) commit 336b51dcc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 14:59:04 2022 +0100 Added type declarations web/functions.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 88ec3c9c5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 14:46:14 2022 +0100 Added type declarations web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit c3616c0c5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 14:39:52 2022 +0100 Added type declarations web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit ddc84757a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 14:29:53 2022 +0100 Simplified code web/functions.inc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) commit 736a48d15 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 14:27:20 2022 +0100 Added type declaration web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 116572050 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 14:23:31 2022 +0100 Replaced global variable with constant web/defaultincludes.inc | 7 ++++--- web/functions.inc | 4 ++-- web/lib/MRBS/SessionHandlerDb.php | 6 ++---- 3 files changed, 8 insertions(+), 9 deletions(-) commit 8783e99fa Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 14:08:50 2022 +0100 Added type declarations web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b565b708a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 14:03:34 2022 +0100 Added type declarations web/functions.inc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) commit 2eaa78c59 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 14:00:23 2022 +0100 Added type declarations web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f96f49354 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 13:57:21 2022 +0100 Added type declarations web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit da409fe22 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 13:52:37 2022 +0100 Added type declarations web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 89b814c07 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 13:48:10 2022 +0100 Added type declarations web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ecaf52a9c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 13:44:31 2022 +0100 Added type declarations web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 98d0fccd9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 12:45:13 2022 +0100 Removed debugging code that was accidentally committed web/js/general.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e0bd0f5d9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 12:43:06 2022 +0100 Added an option for ordinary users to be able to create registration bookings web/edit_entry.php | 4 ++-- web/js/general.js.php | 2 +- web/systemdefaults.inc.php | 4 ++++ web/view_entry.php | 9 +++++---- 4 files changed, 12 insertions(+), 7 deletions(-) commit 885c9ac2d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 30 08:12:42 2022 +0100 Corrected typo in comment web/js/datepicker.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 07d7548dc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jun 29 15:12:56 2022 +0100 Added type declarations web/functions.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit d9edc54de Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jun 29 14:57:11 2022 +0100 Added type declarations web/functions.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit ea5f1e5a0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 23:00:52 2022 +0100 Fixed type declaration web/functions.inc | 12 ++++++------ web/lib/MRBS/DB.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) commit 6a8112e5b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 22:53:15 2022 +0100 Fixed type declaration web/lib/MRBS/DB.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e880916ec Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 22:45:18 2022 +0100 Fixed type declarations web/functions.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 47096fdb1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 22:39:01 2022 +0100 Fixed bug web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ad0a495a9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 22:37:15 2022 +0100 Added type declarations web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9ca6b838d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 22:31:00 2022 +0100 Added type declarations web/edit_entry.php | 2 +- web/functions.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit cec788ed0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 22:26:30 2022 +0100 Added type declarations web/functions.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 73699dca2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 22:21:33 2022 +0100 Added type declarations web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit a82d205cd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 22:13:21 2022 +0100 Added type declarations web/lib/MRBS/Locale.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit a7a00aa80 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 22:06:53 2022 +0100 Added type declarations web/lib/MRBS/Locale.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cd308dc11 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 21:28:17 2022 +0100 Replaced qualifiers with imports web/lib/MRBS/Session/SessionWithLogin.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) commit f8e258669 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 21:27:09 2022 +0100 Fixed recently introduced bug web/lib/MRBS/Session/SessionWithLogin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4a8e09875 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 21:16:14 2022 +0100 Added type declarations web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d77bf59e8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 21:12:08 2022 +0100 Added type declarations web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4d5dfda6e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 21:08:22 2022 +0100 Added type declarations web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1a2aea625 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 21:04:12 2022 +0100 Added type declarations web/functions.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit b25e9c423 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 20:59:12 2022 +0100 Added type declarations web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 54c9a93f4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 20:55:51 2022 +0100 Added type declarations web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9bf1127c2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 20:45:55 2022 +0100 Added type declarations web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d666933d3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 20:39:15 2022 +0100 Added type declaration web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 17914baa6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 20:37:15 2022 +0100 Restored file web/functions.inc (new) | 2660 +++++++++++++++++++++++++++++++++++++ 1 file changed, 2660 insertions(+) commit 37136489a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 20:30:01 2022 +0100 Added type declarations web/functions.inc (gone) | 2660 ------------------------------------ 1 file changed, 2660 deletions(-) commit 792de5c69 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 20:23:54 2022 +0100 Added type declarations web/functions.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit e29542b05 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 20:20:57 2022 +0100 Added type declarations web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit db4ee0dce Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 20:16:12 2022 +0100 Added type declarations web/functions.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit 0e8394666 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 20:01:41 2022 +0100 Added type declarations web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 14fe0a885 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 19:47:22 2022 +0100 Added type declarations web/functions.inc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) commit 04f40096b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 19:37:12 2022 +0100 Added type declarations web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8032caa0d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 19:24:26 2022 +0100 Added type declaration web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 12e43c942 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 19:15:15 2022 +0100 Removed unnecessary leading '\' web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1d065f236 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 28 10:35:11 2022 +0100 Changed error severity web/lib/MRBS/Auth/AuthLdap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2731cab3f Merge: d804ac02a 5a2332fbb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 27 18:25:28 2022 +0100 Merge pull request #51 from meeting-room-booking-system/issue_50 Improved error handling. See GitHub Issues #50. commit 5a2332fbb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 27 18:24:05 2022 +0100 Improved error handling. See GitHub Issues #50. web/lib/MRBS/Auth/Auth.php | 13 ++++++++----- web/lib/MRBS/Auth/AuthLdap.php | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) commit d804ac02a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 25 14:19:48 2022 +0100 Simplified code web/edit_entry.php | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) commit 6dae482ec Merge: 90686d193 f523928e7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jun 24 15:45:56 2022 +0100 Merge pull request #49 from meeting-room-booking-system/issue_46 Fixed problem when comparing certain strings in some locales. See Gi… commit f523928e7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jun 24 15:43:32 2022 +0100 Fixed problem when comparing certain strings in some locales. See GitHub Issues #46. web/functions.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit 90686d193 Merge: 93adffe83 bf86e9060 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jun 24 15:17:33 2022 +0100 Merge pull request #48 from meeting-room-booking-system/issue_47 Fixed potential bug. See GitHub Issues #47. commit bf86e9060 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jun 24 15:14:43 2022 +0100 Fixed potential bug. See GitHub Issues #47. web/functions_table.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 93adffe83 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jun 24 15:09:45 2022 +0100 Fixed fatal error on systems where PHP_INT_MAX is greater than the maximum value allowed by the database column type. web/mrbs_sql.inc | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) commit 9b13c7af5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 21 08:56:47 2022 +0100 Improved last fix web/lib/MRBS/SessionHandlerDb.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1141adaed Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 21 08:46:50 2022 +0100 Prevented possible bug web/lib/MRBS/SessionHandlerDb.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1cf890795 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 20 21:51:59 2022 +0100 Removed unnecessary local variables. web/functions.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit 91fc11f27 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 20 21:46:58 2022 +0100 Simplified code web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 28bae69c3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 20 21:41:31 2022 +0100 Fixed bug web/lib/MRBS/DB.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 98ac84222 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 20 21:31:05 2022 +0100 Added error checking web/functions.inc | 6 ++++++ 1 file changed, 6 insertions(+) commit 6107f1e87 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 20 21:18:17 2022 +0100 Added type declarations web/functions.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit cd77a6c19 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 20 19:01:33 2022 +0100 Added type declarations web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 930249989 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 20 18:55:31 2022 +0100 Removed redundant code now that the minimum PHP version is 7.2.0 web/functions.inc | 5 ----- 1 file changed, 5 deletions(-) commit 2fe367bb3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 20 18:51:37 2022 +0100 Added type declarations and optional third parameter. web/functions.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 997a3b024 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 20 18:41:31 2022 +0100 Added type declaration web/mrbs_sql.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 263abec45 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 20 18:34:18 2022 +0100 Added type declarations web/mrbs_sql.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 88f1c4f28 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 20 18:26:43 2022 +0100 Added type declarations web/functions.inc | 4 ++-- web/mrbs_sql.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 9bc750b9c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 20 18:15:12 2022 +0100 Added type declarations and error checking web/functions.inc | 44 +++++++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 13 deletions(-) commit 25f50d269 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 20 17:57:39 2022 +0100 Added type declaration web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit fcce5a7cc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 20 17:53:47 2022 +0100 Added type declarations web/mrbs_sql.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 56a700291 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 20 17:45:50 2022 +0100 Added type declarations web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7c63d6859 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jun 20 17:29:48 2022 +0100 Restructured and added type declaration web/mrbs_sql.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 3090624d8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 18 18:43:42 2022 +0100 Fixed bug introduced in a recent attempt at a fix. web/mrbs_sql.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 240820b03 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 18 18:05:32 2022 +0100 Fixed use of dynamic properties, deprecated in PHP 8.2. web/lib/MRBS/Columns.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9274a2159 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 18 17:20:01 2022 +0100 Temporary fix for writing session data to PostgreSQL. web/lib/MRBS/SessionHandlerDb.php | 35 ++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) commit 0eb34e9cf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jun 18 17:19:03 2022 +0100 Fixed use of dynamic properties, deprecated in PHP 8.2. web/lib/MRBS/User.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) commit 8bc0dae03 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jun 17 14:21:04 2022 +0100 Updated the instructions for creating the config file. See SF Support Requests #2568. INSTALL | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 7fd6797f8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jun 17 14:06:51 2022 +0100 Converted to using locale aware version of strcasecmp(). web/view_entry.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit a6ff3f5d9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jun 17 14:04:51 2022 +0100 Converted to using locale aware version of strcasecmp(). web/pending.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 87b9fa547 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jun 17 14:02:17 2022 +0100 Converted to using locale aware version of strcasecmp(). web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3f812091b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jun 17 13:58:28 2022 +0100 Converted to using locale aware version of strcasecmp(). web/mrbs_auth.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ca0832d1c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jun 17 13:55:29 2022 +0100 Converted to using locale aware version of strcasecmp(). web/edit_users.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 647305a40 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jun 17 10:31:27 2022 +0100 Fixed bug introduced in recent commit. web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f17e3c439 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jun 17 09:02:04 2022 +0100 Fixed problem with case insensitive admin name checking when using non-ANSI characters, eg "Ändra" and "ändra". See also GitHub Issues #44. web/lib/MRBS/Auth/Auth.php | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) commit 5e3bc5a0a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 16 18:01:55 2022 +0100 Simplified code web/mrbs_sql.inc | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) commit f9e87dcdb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jun 15 21:15:43 2022 +0100 Added return type declaration web/mrbs_sql.inc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) commit aa5b0a3d9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 14 18:25:40 2022 +0100 Added the ability to configure placeholders for text fields in the edit_entry form. See GitHub Issue #41. web/functions.inc | 7 +++++++ web/systemdefaults.inc.php | 5 +++++ 2 files changed, 12 insertions(+) commit 12e9183b5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jun 14 17:50:02 2022 +0100 Fixed error in comment web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5ae6c65d7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 9 21:42:12 2022 +0100 Fixed some usages of ${var}, deprecated in PHP 8.2 web/lib/MRBS/Session/SessionCookie.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b90147a78 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 9 21:35:51 2022 +0100 Fixed some usages of ${var}, deprecated in PHP 8.2 web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c653241bb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 9 21:30:42 2022 +0100 Fixed some usages of ${var}, deprecated in PHP 8.2 web/edit_area_handler.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) commit 1d923eaa7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 9 21:23:35 2022 +0100 Fixed some usages of ${var}, deprecated in PHP 8.2 web/edit_area.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit 7b0b97c62 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 9 21:15:29 2022 +0100 Fixed use of "self" in callables, deprecated in PHP 8.2 web/lib/MRBS/System.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 64bbfd424 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 9 21:05:40 2022 +0100 Fixed some usages of ${var}, deprecated in PHP 8.2 web/functions_mail.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit f39503873 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 9 21:03:40 2022 +0100 Fixed some usages of ${var}, deprecated in PHP 8.2 web/functions_mail.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit a438b54a2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 9 18:56:34 2022 +0100 Fixed some usages of ${var}, deprecated in PHP 8.2 web/lib/MRBS/DB.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8fcfa6081 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 9 18:49:59 2022 +0100 Fixed some usages of ${var}, deprecated in PHP 8.2 web/functions.inc | 12 ++++++------ web/index.php | 2 +- web/mrbs_sql.inc | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) commit a9330d442 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jun 2 12:21:25 2022 +0100 Added the option to include registrants' usernames in reports web/functions.inc | 18 ++++++------ web/lang/lang.en | 2 ++ web/lib/MRBS/Auth/Auth.php | 26 +++++++++++++---- web/lib/MRBS/Auth/AuthDb.php | 52 ++++++++++++++++++++++++++-------- web/report.php | 4 +-- web/systemdefaults.inc.php | 3 ++ 6 files changed, 77 insertions(+), 28 deletions(-) commit 6e4f0698c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue May 31 16:55:11 2022 +0100 Fixed IE11 incompatibility. See SF Bugs #525. web/js/edit_entry.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 30ff1767f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue May 24 17:17:37 2022 +0100 Added type declarations web/edit_entry_handler.php | 2 +- web/functions_mail.inc | 2 +- web/mrbs_sql.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit c8e332b36 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue May 24 17:10:08 2022 +0100 Added type declaration web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2ac4e40bf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue May 24 16:57:06 2022 +0100 Added type declarations web/edit_entry_handler.php | 5 ++++- web/mrbs_sql.inc | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) commit 86c803b58 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue May 24 16:42:56 2022 +0100 Added type declarations web/edit_entry_handler.php | 2 +- web/mrbs_sql.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 5bab731d3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue May 24 16:19:49 2022 +0100 Added type declarations web/mrbs_sql.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit a079f3796 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon May 23 10:56:32 2022 +0100 Fixed bug resulting in an uncaught exception (database integrity constraint violation) if you try and rename a room to a room that already exists but is in a different case. That was because the test to check if the name is in use was case sensitive, whereas the database collation was case insensitive. web/edit_room_handler.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) commit 2ef207992 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun May 22 11:01:52 2022 +0100 Improved error message, distinguishing between caught and uncaught exceptions. web/edit_entry_handler.php | 2 +- web/functions_error.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit 8a8310c19 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun May 22 10:12:41 2022 +0100 Reordered use statement web/functions_error.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 03033cc43 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun May 22 10:11:29 2022 +0100 Replaced qualifiers with an import web/functions_error.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 4dabf200e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun May 22 09:58:36 2022 +0100 Fixed bug introduced during the last commit which resulted in the page refresh not working after an error. web/js/resizable.js.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit 846fd6c96 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun May 22 09:36:43 2022 +0100 Added error handling to Ajax post requests on resizing a booking. See SF Bugs #524. web/edit_entry_handler.php | 102 ++++++++++++++++++++--------------- web/functions_error.inc | 16 ++++-- web/js/resizable.js.php | 21 +++++++- web/lang/lang.en | 4 +- 4 files changed, 93 insertions(+), 50 deletions(-) commit e58b48cae Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri May 20 13:17:09 2022 +0100 Removed redundant code (duplicated in mrbs_sql.inc) web/edit_entry_handler.php | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) commit 579035dea Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri May 20 13:11:33 2022 +0100 Redid previous fix web/edit_entry_handler.php | 9 +++++++++ 1 file changed, 9 insertions(+) commit cf2cc07d0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri May 20 12:34:22 2022 +0100 Fixed bug causing registration settings to be lost on resizing. web/edit_entry_handler.php | 5 ----- 1 file changed, 5 deletions(-) commit 8b0a5ba79 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon May 16 15:04:40 2022 +0100 Replaced expressions with ?? operator. web/edit_entry_handler.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit cdd6c7da7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon May 16 15:02:25 2022 +0100 Fixed bug causing MRBS to return to the wrong view after making a booking. See SF Support Requests #2552. web/edit_entry_handler.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) commit a8b765ed3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat May 14 15:47:49 2022 +0100 Update to Version 1.13.1 of jQuery UI. (Pull REquest #38 didn't seem to contain any changes?) web/jquery/ui/css/jquery-ui.structure.css | 4 +- .../ui/css/jquery-ui.structure.min.css | 4 +- ...i-bg_diagonals-medium_20_d34d17_40x40.png | Bin 382 -> 440 bytes .../ui-bg_gloss-wave_45_817865_500x100.png | Bin 5891 -> 5948 bytes .../ui-bg_gloss-wave_60_fece2f_500x100.png | Bin 5849 -> 5908 bytes .../ui-bg_gloss-wave_70_ffdd57_500x100.png | Bin 5543 -> 5601 bytes .../ui-bg_gloss-wave_90_fff9e5_500x100.png | Bin 5389 -> 5447 bytes ...ui-bg_highlight-soft_100_feeebd_1x100.png | Bin 343 -> 401 bytes .../ui-bg_inset-soft_30_ffffff_1x100.png | Bin 203 -> 261 bytes .../sunny/images/ui-icons_3d3d3d_256x240.png | Bin 6992 -> 7074 bytes .../sunny/images/ui-icons_bd7b00_256x240.png | Bin 4549 -> 4618 bytes .../sunny/images/ui-icons_d19405_256x240.png | Bin 4549 -> 4618 bytes .../sunny/images/ui-icons_eb990f_256x240.png | Bin 4549 -> 4618 bytes .../sunny/images/ui-icons_ed9f26_256x240.png | Bin 4549 -> 4618 bytes .../sunny/images/ui-icons_fadc7a_256x240.png | Bin 4549 -> 4618 bytes .../sunny/images/ui-icons_ffe180_256x240.png | Bin 4549 -> 4618 bytes web/jquery/ui/css/sunny/jquery-ui.theme.css | 15 +- .../ui/css/sunny/jquery-ui.theme.min.css | 4 +- web/jquery/ui/jquery-ui.js | 647 ++++++++++------- web/jquery/ui/jquery-ui.min.js | 7 +- web/js.inc | 2 +- 21 files changed, 407 insertions(+), 276 deletions(-) commit 733b3db9b Merge: 37a2faf3e 536c15441 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat May 14 15:27:16 2022 +0100 Merge pull request #38 from treborin/main Update jQuery UI to v 1.13.1 commit 536c15441 Author: Roberto del Pino <31905622+treborin@users.noreply.github.com> Date: Thu May 12 23:53:27 2022 +0200 Update jQuery UI to v 1.13.1 commit a8f2ee44c Author: Roberto del Pino <31905622+treborin@users.noreply.github.com> Date: Thu May 12 23:52:34 2022 +0200 Update jQuery UI to v 1.13.1 commit 354200eb1 Author: Roberto del Pino <31905622+treborin@users.noreply.github.com> Date: Thu May 12 23:52:02 2022 +0200 Update jQuery UI to v 1.13.1 commit 37a2faf3e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Apr 25 19:11:02 2022 +0100 Fixed PHP 8.1 deprecation error when a user's email address is NULL web/edit_users.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) commit 7e05e6756 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Apr 25 18:56:29 2022 +0100 Added email links (when sensible) for Created By and Modified By on the view_entry page. See SF Support Requests #2545. web/functions_view.inc | 52 ++++++++++++++++++++++++++++++------ web/systemdefaults.inc.php | 4 ++- 2 files changed, 47 insertions(+), 9 deletions(-) commit 44869978d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Apr 25 17:27:24 2022 +0100 Added type declarations web/functions_view.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2ffb49d88 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Apr 24 18:14:14 2022 +0100 Added email obfuscation web/help.php | 4 +++- web/js/functions.js.php | 22 ++++++++++++++++++++++ web/js/general.js.php | 7 +++++++ 3 files changed, 32 insertions(+), 1 deletion(-) commit 9a82b5363 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 23 18:14:07 2022 +0100 Improved internationalisation. web/help.php | 5 ++--- web/lang/lang.ca | 3 +-- web/lang/lang.cs | 3 +-- web/lang/lang.da | 3 +-- web/lang/lang.de | 7 +++---- web/lang/lang.el | 3 +-- web/lang/lang.en | 3 +-- web/lang/lang.es | 3 +-- web/lang/lang.eu | 3 +-- web/lang/lang.fi | 3 +-- web/lang/lang.fr | 3 +-- web/lang/lang.he | 3 +-- web/lang/lang.hu | 3 +-- web/lang/lang.id | 3 +-- web/lang/lang.it | 3 +-- web/lang/lang.ja | 3 +-- web/lang/lang.ko | 3 +-- web/lang/lang.ms | 3 +-- web/lang/lang.nb | 7 +++---- web/lang/lang.nl | 3 +-- web/lang/lang.nn | 7 +++---- web/lang/lang.no | 7 +++---- web/lang/lang.pl | 3 +-- web/lang/lang.pt | 3 +-- web/lang/lang.pt-br | 3 +-- web/lang/lang.ro | 3 +-- web/lang/lang.ru | 3 +-- web/lang/lang.sk | 3 +-- web/lang/lang.sl | 3 +-- web/lang/lang.sr-latn-rs | 3 +-- web/lang/lang.sv | 3 +-- web/lang/lang.th | 3 +-- web/lang/lang.tr | 3 +-- web/lang/lang.zh-cn | 3 +-- web/lang/lang.zh-tw | 3 +-- 35 files changed, 44 insertions(+), 79 deletions(-) commit 904e2cfd6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 9 18:26:51 2022 +0100 Added an optional $user_agent parameter to url_get_contents(). web/functions.inc | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) commit 20830ac5b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Apr 7 11:42:58 2022 +0100 Fixed bug resulting in users sometimes not being able to register even though registration was open. web/view_entry.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) commit 35cf3b5aa Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 5 13:35:21 2022 +0100 Improved performance of curl requests by using compression if possible. web/lib/MRBS/Auth/AuthWix.php | 5 +++++ 1 file changed, 5 insertions(+) commit c27f2e5bc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Apr 5 12:07:08 2022 +0100 Improved performance of curl requests by using compression if possible. web/functions.inc | 5 +++++ 1 file changed, 5 insertions(+) commit d38921cef Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Apr 2 14:52:20 2022 +0100 Fixed bug when using a custom field of type DECIMAL and no form value is input web/edit_users.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 40c6ed526 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Mar 28 14:36:44 2022 +0100 Updated Spanish translation. Thanks to Andres Sierra. web/lang/lang.es | 247 +++++++++++++++++++++++++++++---------------- 1 file changed, 162 insertions(+), 85 deletions(-) commit abcbcec8c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 27 16:36:09 2022 +0100 Improved the behaviour of date selection so that if the start date is changed to be after the end date, the end date is automatically changed to be the same as the start date, and vice versa. In other words the "start date after end date" error message is avoided. web/js/edit_entry.js.php | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) commit 907d4e08c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Mar 23 14:58:43 2022 +0000 Added some more error information web/lib/MRBS/Auth/AuthWix.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) commit b073995bc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Mar 18 16:58:19 2022 +0000 Improved error handling web/lib/MRBS/Auth/AuthWix.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 2bfdb8dc1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Mar 10 14:32:22 2022 +0000 Fixed problem with username. See SF Bugs #518. web/lib/MRBS/Auth/AuthLdap.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 1f9368d67 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Mar 6 17:23:14 2022 +0000 Upgraded to PHPMailer Version 6.6.0 web/lib/PHPMailer/VERSION | 2 +- web/lib/PHPMailer/composer.json | 9 ++- .../PHPMailer/language/phpmailer.lang-fr.php | 2 +- web/lib/PHPMailer/src/OAuth.php | 2 +- .../src/OAuthTokenProvider.php (new) | 44 ++++++++++++ web/lib/PHPMailer/src/PHPMailer.php | 65 +++++++++++++----- web/lib/PHPMailer/src/POP3.php | 2 +- web/lib/PHPMailer/src/SMTP.php | 5 +- 8 files changed, 106 insertions(+), 25 deletions(-) commit f6f2ebf69 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Mar 4 14:44:51 2022 +0000 Fixed bug in import.php when $booking_types is unset. See SF Bugs #519. web/import.php | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) commit fde2da1fe Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Mar 1 15:47:10 2022 +0000 Added type declarations web/dbsys.inc | 16 ++++++++-------- web/upgrade.inc | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) commit 1686136ed Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Feb 20 22:55:19 2022 +0000 Added class of 'mrbs-weekend' to flatpickr weekend days. See SF Support Requests 2507. web/js/datepicker.js.php | 6 ++++++ 1 file changed, 6 insertions(+) commit f90f326eb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 18 18:19:48 2022 +0000 Temporarily disabled kiosk refresh as it seems to be causing occasional problems with navigation buttons web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 506a510a4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 18 17:14:39 2022 +0000 Fixed bug causing checkmarks not to show up in Excel exports from the users table. web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2898265df Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 16 17:41:09 2022 +0000 Added a config option for showing a timeline in kiosk mode web/js/refresh.js.php | 14 +++++++++----- web/systemdefaults.inc.php | 5 +++-- 2 files changed, 12 insertions(+), 7 deletions(-) commit bfc56f794 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 16 17:03:55 2022 +0000 When in kiosk mode don't show slots in the past. web/functions_table.inc | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) commit 256597158 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 16 15:51:28 2022 +0000 Advance to tomorrow if we're in kiosk mode and we're past the end of the last slot for the day web/standard_vars.inc.php | 43 ++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 24 deletions(-) commit f695bcd1f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 15 17:56:24 2022 +0000 Added a class ("weekend") to weekend header cells so that a style can be applied. See SF Support Requests #2504. web/functions_table.inc | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) commit 057cbea03 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Feb 15 16:26:28 2022 +0000 Made the value of the PARTSTAT property in iCal notifications a config setting. See SF Support Requests #2503. web/functions_ical.inc | 7 ++++--- web/systemdefaults.inc.php | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) commit 766f500e5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Feb 13 13:52:01 2022 +0000 Added config settings for the default values of the Sort by and Sum by fields on the Report page. web/internalconfig.inc.php | 4 ++++ web/report.php | 22 +++++++++++++++------- web/systemdefaults.inc.php | 8 ++++++++ 3 files changed, 27 insertions(+), 7 deletions(-) commit 20c5fe0e4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 12 09:40:26 2022 +0000 Added some type declarations web/report.php | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) commit ba5dd0f0a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 12 09:19:37 2022 +0000 Removed redundant import. web/report.php | 1 - 1 file changed, 1 deletion(-) commit db1e7dce6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 12 09:17:43 2022 +0000 Removed redundant line of code. web/report.php | 1 - 1 file changed, 1 deletion(-) commit d5a86a92c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Feb 12 09:11:45 2022 +0000 Improved previous commits so that the JavaScript sorting now exactly matches all three columns of the SQL ORDER BY clause. web/report.php | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) commit d5def0513 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 11 21:27:35 2022 +0000 Added HTML escaping. web/report.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 28c9180cf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 11 18:26:10 2022 +0000 Added comment. web/report.php | 1 + 1 file changed, 1 insertion(+) commit 9e02c50c3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 11 18:23:10 2022 +0000 Made DataTables sort by area then room web/js/report.js.php | 11 +++++++---- web/report.php | 41 ++++++++++++++++++++++++++++------------- 2 files changed, 35 insertions(+), 17 deletions(-) commit 9023d300b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 11 17:43:07 2022 +0000 Made DataTables respect the area and room sort keys. web/report.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) commit 7915f7995 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 11 17:22:37 2022 +0000 Made DataTables respect the sort order defined on the report form. See SF Support Requests #2498 web/js/report.js.php | 50 ++++++++++++++++++++++++++---------------- web/report.php | 39 ++++++++++++++++++++++++++++++-- 2 files changed, 68 insertions(+), 21 deletions(-) commit 44a6ebef3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Feb 10 14:44:45 2022 +0000 Fixed bug causing incorrect registration opening and closing times to be used when generating a series with conflicts and the "Skip past conflicts" box is not checked. web/edit_entry_handler.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) commit 505c77d43 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 9 20:03:12 2022 +0000 Fixed bug introduced in last merge web/standard_vars.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6650f5b30 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 9 17:48:26 2022 +0000 Improved performance of view_entry.php when using registration and a remote authentication type. web/view_entry.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) commit 92c30e3eb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 9 17:17:26 2022 +0000 Improved performance of calendar views when using registration and a remote authentication type. web/lib/MRBS/Auth/Auth.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) commit 3b3c2117d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 4 17:48:20 2022 +0000 Showed just one room when kiosk=room web/functions_table.inc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) commit 5b1a033dc Merge: 4ce51fcb7 6116be84b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 4 17:00:25 2022 +0000 Merge pull request #35 from meeting-room-booking-system/kiosk Kiosk commit 6116be84b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 4 16:48:10 2022 +0000 Added kiosk parameter to day_table_innerhtml() web/functions_table.inc | 2 +- web/index.php | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) commit 0b79da8f3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 4 15:53:40 2022 +0000 Added kiosk to context web/index.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 0ececc08f Merge: 3ed98a394 4ce51fcb7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 4 15:31:52 2022 +0000 Merge branch 'main' into kiosk commit 4ce51fcb7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Feb 4 14:59:14 2022 +0000 Expanded message for password reset to cater for those without email addresses. web/lang/lang.en | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 3ed98a394 Merge: 5dbca3f2d bda3899f0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 2 18:30:03 2022 +0000 Merge branch 'main' into kiosk commit bda3899f0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 2 18:27:20 2022 +0000 Switched to using a config variable for determining whether to get display names all at once. web/lib/MRBS/Auth/Auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 147287412 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Feb 2 18:26:33 2022 +0000 Switched to using a config variable for determining whether to get display names all at once. web/lib/MRBS/Auth/Auth.php | 8 ++++---- web/lib/MRBS/Auth/AuthLdap.php | 5 ----- web/systemdefaults.inc.php | 10 ++++++++++ 3 files changed, 14 insertions(+), 9 deletions(-) commit 5dbca3f2d Merge: 5c10e7da1 845442558 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 31 17:40:34 2022 +0000 Merge branch 'main' into kiosk commit 845442558 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 31 17:39:21 2022 +0000 Improved performance of Search and Report when working with external authentication types web/functions.inc | 9 +----- web/functions_mail.inc | 4 +-- web/functions_view.inc | 2 +- web/lib/MRBS/Auth/Auth.php | 54 ++++++++++++++++++++++++++++++-- web/lib/MRBS/Auth/AuthLdap.php | 5 +++ web/pending.php | 4 +-- 6 files changed, 63 insertions(+), 15 deletions(-) commit 8c990cc6d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jan 29 18:39:04 2022 +0000 Removed redundant import wix/web/http-functions.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 5c10e7da1 Merge: 6c9d580ec b235e14cd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jan 29 17:58:04 2022 +0000 Merge branch 'main' into kiosk # Conflicts: # web/index.php commit b235e14cd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jan 29 17:53:13 2022 +0000 Simplified code web/standard_vars.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e2320a132 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jan 29 17:52:23 2022 +0000 Improved resilience of code web/index.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) commit 6f73ea66e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jan 29 17:45:55 2022 +0000 Simplified code web/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 6c9d580ec Merge: 66a6b718f 9978b32fb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jan 29 08:11:57 2022 +0000 Merge branch 'main' into kiosk commit 9978b32fb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jan 29 08:10:36 2022 +0000 Improved resilience of code when http-functions.js at the Wix end isn't up to date. web/lib/MRBS/Auth/AuthWix.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 66a6b718f Merge: 43547b008 456d47cb2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jan 27 18:00:22 2022 +0000 Merge branch 'main' into kiosk commit 456d47cb2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jan 27 17:59:44 2022 +0000 Wix authentication: switched to using badges instead of custom fields to determine MRBS admins as custom fields can be edited by members themselves in their profile. web/lib/MRBS/Auth/AuthWix.php | 2 +- web/systemdefaults.inc.php | 9 ++++----- wix/README | 28 ++++++++++++++++---------- wix/web/http-functions.js | 35 +++++++++++++++++++++++++++++---- 4 files changed, 54 insertions(+), 20 deletions(-) commit 43547b008 Merge: e74faa874 0324d6224 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jan 25 17:05:24 2022 +0000 Merge branch 'main' into kiosk commit 0324d6224 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jan 25 17:03:35 2022 +0000 Simplified code web/help.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 45fb8f4b9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jan 25 17:01:24 2022 +0000 Improved resilience of $faqfilelang setting. web/help.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 337dd6c71 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jan 25 16:50:51 2022 +0000 Made the $faqfilelang config setting more intuitive, whilst maintaining backwards compatability. See SF Bugs #517. web/help.php | 12 +++++++++++- web/systemdefaults.inc.php | 9 +++++---- 2 files changed, 16 insertions(+), 5 deletions(-) commit e74faa874 Merge: f7b4061d6 c226532a7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 23 11:13:57 2022 +0000 Merge branch 'main' into kiosk commit c226532a7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 23 11:06:46 2022 +0000 Allowed for a more appropriate login placeholder for those authentication types that only validate by email address. web/lib/MRBS/Auth/Auth.php | 7 +++++ web/lib/MRBS/Auth/AuthImap.php | 7 +++++ web/lib/MRBS/Auth/AuthImapPhp.php | 7 +++++ web/lib/MRBS/Auth/AuthWix.php | 14 +++++++++ web/lib/MRBS/Session/SessionWithLogin.php | 34 +++++++++++++++------ 5 files changed, 59 insertions(+), 10 deletions(-) commit f7b4061d6 Merge: eb7fe8a30 d85636d52 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jan 21 11:06:19 2022 +0000 Merge branch 'main' into kiosk commit d85636d52 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jan 21 11:04:22 2022 +0000 Fixed bug when Wix can't find a username. web/lib/MRBS/Auth/AuthWix.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit eb7fe8a30 Merge: 07c89ccc5 08637c1b2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 16 18:26:14 2022 +0000 Merge branch 'main' into kiosk commit 08637c1b2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 16 18:24:34 2022 +0000 Fixed problem with positioning of the eye icon on the password reset page. web/css/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit 07c89ccc5 Merge: 486f5b09d 138b35391 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 10 17:33:12 2022 +0000 Merge branch 'main' into kiosk commit 138b35391 Merge: ba0dcf9b0 57de67edd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 10 17:25:59 2022 +0000 Merge pull request #34 from meeting-room-booking-system/fix_issue_33 Fix issue 33 commit 57de67edd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 10 17:22:42 2022 +0000 Fixed bug causing a textarea to appear instead of a select or datalist element when the column length exceeds $text_input_max. web/edit_room.php | 2 ++ 1 file changed, 2 insertions(+) commit 5466c02bc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 10 17:21:11 2022 +0000 Fixed bug causing a textarea to appear instead of a select or datalist element when the column length exceeds $text_input_max. web/edit_entry.php | 2 ++ web/edit_users.php | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) commit 83f453802 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Jan 10 17:05:58 2022 +0000 Fixed bug causing a textarea to appear instead of a select or datalist element when the column length exceeds $text_input_max. web/edit_entry.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit 486f5b09d Merge: 970aa8025 ba0dcf9b0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jan 8 17:04:22 2022 +0000 Merge branch 'main' into kiosk commit ba0dcf9b0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Jan 8 17:04:00 2022 +0000 Made the Wix display name property a configuration variable web/lib/MRBS/Auth/AuthWix.php | 14 ++++++++++++-- web/systemdefaults.inc.php | 4 ++++ wix/web/http-functions.js | 10 ++++++++-- 3 files changed, 24 insertions(+), 4 deletions(-) commit 970aa8025 Merge: f20f612df a205f639a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jan 7 15:30:49 2022 +0000 Merge branch 'main' into kiosk commit a205f639a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jan 7 15:09:36 2022 +0000 Fixed bug when the Wix name is undefined wix/web/http-functions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f20f612df Merge: d909ffc10 f0be7ddf2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jan 7 12:15:39 2022 +0000 Merge branch 'main' into kiosk commit f0be7ddf2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jan 7 12:14:17 2022 +0000 Fixed bug introduced in recent commit web/lib/MRBS/Auth/AuthWix.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d909ffc10 Merge: 829fe9d6c cc68d1c91 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jan 6 18:10:32 2022 +0000 Merge branch 'main' into kiosk commit cc68d1c91 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jan 6 18:10:16 2022 +0000 Restructured code web/lib/MRBS/Auth/Auth.php | 14 ++++++++++++++ web/lib/MRBS/Auth/AuthLdap.php | 7 +------ web/lib/MRBS/Auth/AuthWix.php | 11 +++-------- 3 files changed, 18 insertions(+), 14 deletions(-) commit 3841c5562 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jan 6 17:42:38 2022 +0000 Added debug option web/lib/MRBS/Auth/AuthWix.php | 21 ++++++++++++++++++++- web/systemdefaults.inc.php | 3 +++ 2 files changed, 23 insertions(+), 1 deletion(-) commit 829fe9d6c Merge: 0382fcb9c 7026b3c6b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 2 15:17:25 2022 +0000 Merge branch 'main' into kiosk commit 7026b3c6b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 2 14:36:32 2022 +0000 Fixed again web/lib/MRBS/Auth/AuthWix.php | 2 +- wix/web/http-functions.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) commit 0382fcb9c Merge: c81363673 e5d278d01 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 2 13:57:01 2022 +0000 Merge branch 'main' into kiosk commit e5d278d01 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 2 13:56:38 2022 +0000 Fixed bug web/lib/MRBS/Auth/AuthWix.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c81363673 Merge: 90d388e0d ecdd281e7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 2 13:21:28 2022 +0000 Merge branch 'main' into kiosk commit ecdd281e7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 2 13:20:46 2022 +0000 Made the Wix backend limit a configuration setting web/lib/MRBS/Auth/AuthWix.php | 8 +++++++- web/systemdefaults.inc.php | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) commit 90d388e0d Merge: 68309c441 2a256cda4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 2 10:15:10 2022 +0000 Merge branch 'main' into kiosk commit 2a256cda4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jan 2 10:14:06 2022 +0000 Moved polyfill functions into a separate file in the global namespace so that they can be used from classes. AUTHENTICATION | 17 ++- web/lib/MRBS/Auth/AuthWix.php (new) | 170 +++++++++++++++++++++ web/systemdefaults.inc.php | 19 ++- wix/README (new) | 51 +++++++ wix/web/http-functions.js (new) | 204 ++++++++++++++++++++++++++ 5 files changed, 459 insertions(+), 2 deletions(-) commit 68309c441 Merge: 7cea8ce43 8049f802e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 29 18:21:35 2021 +0000 Merge branch 'main' into kiosk commit 8049f802e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 29 17:49:24 2021 +0000 Moved polyfill functions into a separate file in the global namespace so that they can be used from classes. web/defaultincludes.inc | 1 + web/functions.inc | 61 ------------------------------ web/functions_global.inc (new) | 65 ++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 61 deletions(-) commit 7cea8ce43 Merge: 741d39c63 19d27595b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 28 10:54:29 2021 +0000 Merge branch 'main' into kiosk commit 19d27595b Merge: 7c6ecbfd8 c2be6f2bf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Dec 27 20:50:51 2021 +0000 Merge pull request #31 from meeting-room-booking-system/fix_issue_30 Fix issue 30 commit c2be6f2bf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Dec 27 20:48:39 2021 +0000 Fixed bug causing end_date not to be restored on the booking form after a conflict on a multi-day booking - for existing bookings web/js/edit_entry.js.php | 11 +++++++++++ 1 file changed, 11 insertions(+) commit 154963905 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Dec 27 18:32:55 2021 +0000 Fixed bug causing end_date not to be restored on the booking form after a conflict on a multi-day booking web/edit_entry.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) commit 741d39c63 Merge: ce63963f7 7c6ecbfd8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 21 18:42:56 2021 +0000 Merge branch 'main' into kiosk commit 7c6ecbfd8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 21 18:41:48 2021 +0000 Simplified code and added type declarations web/mrbs_sql.inc | 47 +++++++++++++++++----------------------------- 1 file changed, 17 insertions(+), 30 deletions(-) commit 8cba3d8d8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 21 18:23:04 2021 +0000 Fixed bug causing registration opening and closing times not to account for DST transitions properly. web/mrbs_sql.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) commit ce63963f7 Merge: 44a46059e 415ad4830 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 21 08:04:56 2021 +0000 Merge branch 'main' into kiosk commit 415ad4830 Merge: 66bb77f9d 4135ee24a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 21 08:01:40 2021 +0000 Merge pull request #28 from being-peace/patch-2 Update import.php commit 4135ee24a Author: Polzin <58709258+being-peace@users.noreply.github.com> Date: Tue Dec 21 02:10:21 2021 +0100 Update import.php minor tweak, variable is called import_default_room and not default_room. web/import.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 44a46059e Merge: aeaffc9ed 66bb77f9d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 16 18:50:53 2021 +0000 Merge branch 'main' into kiosk commit 66bb77f9d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 16 18:49:26 2021 +0000 Added return type declarations web/index.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) commit aeaffc9ed Merge: 9f8711c16 564a0dbed Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 14 18:36:08 2021 +0000 Merge branch 'main' into kiosk commit 564a0dbed Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 14 18:35:09 2021 +0000 Fixed infinite recursion bug under some session schemes that was introduced in recent commits web/lib/MRBS/Auth/Auth.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) commit 9f8711c16 Merge: b4ff2e61f 557f1b152 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 14 15:36:53 2021 +0000 Merge branch 'main' into kiosk commit 557f1b152 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 14 15:36:14 2021 +0000 Improved performance of db_ext authentication type web/lib/MRBS/Auth/AuthDbExt.php | 82 ++++++++++++++++++------------- 1 file changed, 49 insertions(+), 33 deletions(-) commit ccd0feff3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Dec 14 06:53:13 2021 +0000 Optimised getUser() for authentication types other than LDAP. web/lib/MRBS/Auth/Auth.php | 21 +++++++++++++++----- web/lib/MRBS/Auth/AuthLdap.php | 33 +++++++++++--------------------- 2 files changed, 27 insertions(+), 27 deletions(-) commit 8db1376c6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 9 19:03:07 2021 +0000 Added support for custom integer fields in the users table web/edit_users.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) commit b4ff2e61f Merge: e882b583d dd8e2e39e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 9 07:33:44 2021 +0000 Merge branch 'main' into kiosk commit dd8e2e39e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 9 07:32:55 2021 +0000 Added a configuration variable to determine whether or not to include in reports the name of the person making the registration. web/report.php | 3 ++- web/systemdefaults.inc.php | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) commit 5a9203646 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 8 07:56:03 2021 +0000 Fixed bug when display name is null web/lib/MRBS/Auth/AuthDb.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit cf72da24c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 8 07:38:39 2021 +0000 Fixed bug when display name is null web/lib/MRBS/Auth/Auth.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit 4e4f450a4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 8 07:23:11 2021 +0000 Used the username instead of display_name in list of registrants if the display_name is empty web/lib/MRBS/Auth/AuthDb.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) commit a769eb3eb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 8 06:57:59 2021 +0000 Added the name, if different, of the person who registered someone in the list of registrants in reports. web/lang/lang.en | 1 + web/lib/MRBS/Auth/Auth.php | 15 ++++- web/lib/MRBS/Auth/AuthDb.php | 106 ++++++++++++++++++++++++++++++++- web/report.php | 2 +- 4 files changed, 119 insertions(+), 5 deletions(-) commit e882b583d Merge: 4ef836204 6f31a4c0a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Dec 6 16:57:38 2021 +0000 Merge branch 'main' into kiosk commit 6f31a4c0a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Dec 6 16:54:51 2021 +0000 Replaced qualifiers with imports web/lib/MRBS/Auth/AuthLdap.php | 33 ++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) commit 4ef836204 Merge: 651700e18 fec2bfd8d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 2 17:52:03 2021 +0000 Merge branch 'main' into kiosk commit fec2bfd8d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 2 17:50:56 2021 +0000 Fixed bug in display of report table when there are no bookings that have registration enabled. web/report.php | 2 ++ 1 file changed, 2 insertions(+) commit 12814ca08 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Dec 2 17:02:21 2021 +0000 Fixed bug in caching of users web/lib/MRBS/Auth/Auth.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 651700e18 Merge: 50e40747c b42fd0c06 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 1 18:47:24 2021 +0000 Merge branch 'main' into kiosk commit b42fd0c06 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 1 18:45:31 2021 +0000 Fixed bug in last commit web/lib/MRBS/Auth/AuthLdap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c1b6fe656 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 1 18:18:47 2021 +0000 Cached the results of getUser() for all auth types to improve performance web/lib/MRBS/Auth/Auth.php | 17 ++- web/lib/MRBS/Auth/AuthCas.php | 2 +- web/lib/MRBS/Auth/AuthDb.php | 2 +- web/lib/MRBS/Auth/AuthDbExt.php | 153 ++++++++++++-------------- web/lib/MRBS/Auth/AuthIdcheck.php | 2 +- web/lib/MRBS/Auth/AuthJoomla.php | 2 +- web/lib/MRBS/Auth/AuthLdap.php | 53 ++++----- web/lib/MRBS/Auth/AuthSaml.php | 2 +- web/lib/MRBS/Auth/AuthWordpress.php | 2 +- 9 files changed, 116 insertions(+), 119 deletions(-) commit 50e40747c Merge: 07f58bbf5 8c32be8d8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 1 07:12:46 2021 +0000 Merge branch 'main' into kiosk commit 8c32be8d8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 1 07:11:29 2021 +0000 Simplified code web/lib/MRBS/Auth/AuthDbExt.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1eba8aedb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 1 07:00:16 2021 +0000 Removed creation of dynamic property (will be deprecated in PHP 8.2) web/lib/MRBS/Auth/AuthDbExt.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 07f58bbf5 Merge: b7163bf52 690f94835 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 1 06:41:24 2021 +0000 Merge branch 'main' into kiosk commit 690f94835 Merge: 71bd6099a 22be5202e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 1 06:40:09 2021 +0000 Merge branch 'main' of https://github.com/meeting-room-booking-system/mrbs-code into main commit b7163bf52 Merge: 7d5854c9a 71bd6099a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 1 06:38:58 2021 +0000 Merge branch 'main' into kiosk commit 71bd6099a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Dec 1 06:34:34 2021 +0000 Fixed bug when $auth['db_ext']['column_name_level'] is not set. See SF Support Requests #2470. web/lib/MRBS/Auth/AuthDbExt.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) commit 22be5202e (tag: mrbs-1_10_0) Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Nov 29 20:37:59 2021 +0000 Updated NEWS and ChangeLog for release. ChangeLog | 10129 +++++++++++++++++++++++++++++++++++++++++++++++++- NEWS | 139 + 2 files changed, 10222 insertions(+), 46 deletions(-) commit abb8cd454 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Nov 29 20:05:46 2021 +0000 Updated version number for release. web/version_num.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7d5854c9a Merge: 6b6bf48a1 9d6cd15aa Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 25 18:20:16 2021 +0000 Merge branch 'main' into kiosk commit 9d6cd15aa Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 25 18:18:54 2021 +0000 Upgraded to PHPMailer Version 6.5.3 web/lib/PHPMailer/VERSION | 2 +- .../PHPMailer/language/phpmailer.lang-fr.php | 28 +++++++++++------- .../language/phpmailer.lang-pt_br.php | 10 ++++++- .../PHPMailer/language/phpmailer.lang-ro.php | 10 +++++-- .../PHPMailer/language/phpmailer.lang-sl.php | 7 ++++- web/lib/PHPMailer/src/PHPMailer.php | 21 +++++++++---- web/lib/PHPMailer/src/POP3.php | 16 +++++++++- web/lib/PHPMailer/src/SMTP.php | 11 ++++--- 8 files changed, 77 insertions(+), 28 deletions(-) commit 6b6bf48a1 Merge: abeb2e457 085c56153 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 25 07:00:49 2021 +0000 Merge branch 'main' into kiosk commit 085c56153 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 25 06:59:23 2021 +0000 Fixed bug in previous commit web/import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit abeb2e457 Merge: 3f6e1312a 79cf90932 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Nov 24 18:25:42 2021 +0000 Merge branch 'main' into kiosk commit 79cf90932 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Nov 24 18:21:44 2021 +0000 Made the default SUMMARY configurable when importing events. web/import.php | 9 ++++++++- web/lang/lang.en | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) commit 0fe69b4d8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Nov 24 18:09:13 2021 +0000 Added the ability to include the LOCATION on the brief description when importing events. web/import.php | 61 +++++++++++++++++++++++++++++++--------------- web/lang/lang.en | 4 ++- 2 files changed, 45 insertions(+), 20 deletions(-) commit 3f6e1312a Merge: 9d667d373 8c83c9968 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 22 18:14:29 2021 +0000 Merge branch 'main' into kiosk commit 8c83c9968 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 22 17:53:22 2021 +0000 Made INT default literals integers not strings tables.pg.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 14e70ac13 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 22 17:51:44 2021 +0000 Made INT default literals integers not strings tables.my.sql | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) commit 95e0ecad0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 22 17:17:52 2021 +0000 Fixed bug affecting import when using PostgreSQL tables.my.sql | 2 +- tables.pg.sql | 16 ++++++++-------- web/lib/MRBS/DB.php | 2 +- web/upgrade/82/mysql.sql (new) | 1 + web/upgrade/82/pgsql.sql (new) | 12 ++++++++++++ 5 files changed, 23 insertions(+), 10 deletions(-) commit 9d667d373 Merge: 6013ed419 6e7d95db6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 21 18:25:56 2021 +0000 Merge branch 'main' into kiosk commit 6e7d95db6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 21 18:25:25 2021 +0000 Corrected typo in comment web/lib/MRBS/Auth/AuthDbExt.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6013ed419 Merge: 632ea9de1 2ad2b76c2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 21 18:17:57 2021 +0000 Merge branch 'main' into kiosk commit 2ad2b76c2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Nov 21 17:58:19 2021 +0000 Only retrieved those columns that we need in AuthDbExt->getUser() to avoid sending unencrypted data over the internet unnecessarily. web/lib/MRBS/Auth/AuthDbExt.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) commit 087e0c113 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 18 19:13:51 2021 +0000 Added an option for adding the location to the description web/import.php | 60 ++++++++++++++++++++++++++++++++++-------- web/js/import.js.php | 6 +++-- web/lang/lang.en | 3 +++ 3 files changed, 56 insertions(+), 13 deletions(-) commit 94696e29f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 18 18:27:49 2021 +0000 Made styling of false, true and null consistent web/import.php | 58 ++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 29 deletions(-) commit 632ea9de1 Merge: 3904f2f5f 47eca4333 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 18 18:06:40 2021 +0000 Merge branch 'main' into kiosk commit 47eca4333 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 18 18:04:53 2021 +0000 Added an ignore_location option for importing events web/import.php | 86 ++++++++++++++++++++++++++++-------------- web/js/import.js.php | 12 ++++++ web/lang/lang.en | 1 + 3 files changed, 71 insertions(+), 28 deletions(-) commit 3904f2f5f Merge: 359baeff8 12e06c580 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 18 17:15:12 2021 +0000 Merge branch 'main' into kiosk commit 12e06c580 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 18 17:14:50 2021 +0000 Added comment web/lib/MRBS/Auth/AuthDb.php | 3 +++ 1 file changed, 3 insertions(+) commit 03ceb391e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 18 17:12:11 2021 +0000 Added sorting of users for the WordPress authentication type web/lib/MRBS/Auth/AuthWordpress.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) commit 7cc399a18 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 18 16:47:14 2021 +0000 Added sorting of users for the db_ext authentication type web/lib/MRBS/Auth/AuthDbExt.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 93af2f6ee Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 18 16:26:13 2021 +0000 Fixed comment web/lib/MRBS/Auth/AuthDbExt.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 55fa4d7c1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 18 16:25:03 2021 +0000 Fixed comment web/lib/MRBS/Auth/AuthDbExt.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit d2eccc5e7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 18 16:19:10 2021 +0000 Simplified code web/lib/MRBS/Auth/AuthDbExt.php | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) commit 359baeff8 Merge: a22bc4d31 ca7353a23 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Nov 17 18:17:41 2021 +0000 Merge branch 'main' into kiosk commit ca7353a23 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Nov 17 18:16:15 2021 +0000 Added caching of results in getUser() to improve performance as the query will normally be of a remote database. web/lib/MRBS/Auth/AuthDbExt.php | 131 ++++++++++++++++-------------- 1 file changed, 70 insertions(+), 61 deletions(-) commit a22bc4d31 Merge: 9c14cb466 2ebba8abc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 16 19:01:29 2021 +0000 Merge branch 'main' into kiosk commit 2ebba8abc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 16 19:00:24 2021 +0000 Fixed bug affecting import_past and skip checkboxes web/import.php | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) commit 075119ba6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 16 17:55:41 2021 +0000 Added option not to import past bookings web/import.php | 19 ++++++++++++++++--- web/lang/lang.de | 1 + web/lang/lang.en | 1 + web/systemdefaults.inc.php | 3 +++ 4 files changed, 21 insertions(+), 3 deletions(-) commit 9c14cb466 Merge: 08552cecf 6895338b7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 16 17:08:56 2021 +0000 Merge branch 'main' into kiosk commit 6895338b7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 16 16:59:50 2021 +0000 Added return types web/import.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 8213a4d51 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 16 16:53:01 2021 +0000 Added return types web/import.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 8c10e4b37 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 16 16:32:22 2021 +0000 Added a config setting for default source type web/import.php | 2 +- web/systemdefaults.inc.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) commit 4b67eb46c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 16 16:21:51 2021 +0000 Improved error message web/import.php | 2 +- web/lang/lang.en | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit d7c9d73d5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Nov 16 15:52:05 2021 +0000 Added the ability to import an iCalendar from a URL web/css/mrbs.css.php | 1 + web/import.php | 193 +++++++++++++++++++++++------------ web/js/import.js.php (new) | 32 ++++++ web/lang/lang.de | 1 + web/lang/lang.en | 8 +- 5 files changed, 169 insertions(+), 66 deletions(-) commit e7aae756e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 15 14:57:16 2021 +0000 Added new Form class web/lib/MRBS/Form/FieldInputUrl.php (new) | 15 +++++++++++++++ 1 file changed, 15 insertions(+) commit dbbfad20f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 15 14:53:08 2021 +0000 Added new Form class web/lib/MRBS/Form/ElementInputUrl.php (new) | 14 ++++++++++++++ 1 file changed, 14 insertions(+) commit 0de25e5a5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 15 14:46:03 2021 +0000 Restructured web/import.php | 52 ++++++++++++++++++++++++++++++---------------- web/lang/lang.en | 1 + 2 files changed, 35 insertions(+), 18 deletions(-) commit bd155dd73 Author: jberanek <john@redux.org.uk> Date: Thu Nov 11 19:51:36 2021 +0000 Update issue templates .github/ISSUE_TEMPLATE/feature_request.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 59b00da97 Merge: 21504a510 e9f23d4f6 Author: jberanek <jberanek@users.sourceforge.net> Date: Thu Nov 11 19:25:42 2021 +0000 Merge pull request #23 from meeting-room-booking-system/update_update Update update commit 21504a510 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 11 18:03:06 2021 +0000 Updated links to PostgreSQL web/site_faq/site_faq.html | 2 +- web/site_faq/site_faq_cs.html | 2 +- web/site_faq/site_faq_de.html | 2 +- web/site_faq/site_faq_es.html | 2 +- web/site_faq/site_faq_fr.html | 2 +- web/site_faq/site_faq_it.html | 2 +- web/site_faq/site_faq_nl.html | 2 +- web/site_faq/site_faq_sv.html | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) commit d1f673fd7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 11 18:00:26 2021 +0000 Updated links to MySQL web/site_faq/site_faq.html | 2 +- web/site_faq/site_faq_cs.html | 2 +- web/site_faq/site_faq_de.html | 2 +- web/site_faq/site_faq_es.html | 2 +- web/site_faq/site_faq_fr.html | 2 +- web/site_faq/site_faq_it.html | 2 +- web/site_faq/site_faq_nl.html | 2 +- web/site_faq/site_faq_sv.html | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) commit 93117471e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 11 17:57:46 2021 +0000 Updated links to PHP web/site_faq/site_faq.html | 2 +- web/site_faq/site_faq_cs.html | 2 +- web/site_faq/site_faq_de.html | 2 +- web/site_faq/site_faq_es.html | 2 +- web/site_faq/site_faq_fr.html | 2 +- web/site_faq/site_faq_it.html | 2 +- web/site_faq/site_faq_nl.html | 2 +- web/site_faq/site_faq_sv.html | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) commit b70366071 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 11 17:54:15 2021 +0000 Updated links to MRBS project web/site_faq/site_faq.html | 48 ++++++------ web/site_faq/site_faq_cs.html | 134 ++++++++++++++++---------------- web/site_faq/site_faq_de.html | 58 +++++++------- web/site_faq/site_faq_es.html | 126 +++++++++++++++--------------- web/site_faq/site_faq_fr.html | 44 +++++------ web/site_faq/site_faq_it.html | 38 ++++----- web/site_faq/site_faq_nl.html | 2 +- web/site_faq/site_faq_sv.html | 12 +-- 8 files changed, 231 insertions(+), 231 deletions(-) commit e9f23d4f6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 11 17:45:04 2021 +0000 Delete upgrade3.my.sql upgrade3.my.sql (gone) | 9 --------- 1 file changed, 9 deletions(-) commit 96333ba4e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 11 17:44:51 2021 +0000 Delete upgrade2.pg.sql upgrade2.pg.sql (gone) | 3 --- 1 file changed, 3 deletions(-) commit 6e4060738 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 11 17:44:36 2021 +0000 Delete upgrade2.my.sql upgrade2.my.sql (gone) | 3 --- 1 file changed, 3 deletions(-) commit ec7b27f8c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 11 17:44:22 2021 +0000 Delete upgrade.my.sql upgrade.my.sql (gone) | 44 ----------------------------------------- 1 file changed, 44 deletions(-) commit b65edfe3a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 11 17:42:50 2021 +0000 Revert "Delete upgrade.my.sql" This reverts commit 15ddd559484f9b3d19f6eb6d868c5dbce29e3bfa. upgrade.my.sql (new) | 44 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) commit aa16a9f98 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 11 17:42:45 2021 +0000 Revert "Delete upgrade2.my.sql" This reverts commit 75eb49605cdd9d67cb207876bac0abf8d1505acc. upgrade2.my.sql (new) | 3 +++ 1 file changed, 3 insertions(+) commit 508ff0c82 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 11 17:42:39 2021 +0000 Revert "Delete upgrade2.pg.sql" This reverts commit 01940c57e6e2894ffc41570a37f5a765f948c45f. upgrade2.pg.sql (new) | 3 +++ 1 file changed, 3 insertions(+) commit 56f24374f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 11 17:42:29 2021 +0000 Revert "Delete upgrade3.my.sql" This reverts commit f70ebbd5e611440ac3202085fe917a7dc07eeadc. upgrade3.my.sql (new) | 9 +++++++++ 1 file changed, 9 insertions(+) commit f70ebbd5e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 11 17:31:39 2021 +0000 Delete upgrade3.my.sql upgrade3.my.sql (gone) | 9 --------- 1 file changed, 9 deletions(-) commit 01940c57e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 11 17:31:24 2021 +0000 Delete upgrade2.pg.sql upgrade2.pg.sql (gone) | 3 --- 1 file changed, 3 deletions(-) commit 75eb49605 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 11 17:31:03 2021 +0000 Delete upgrade2.my.sql upgrade2.my.sql (gone) | 3 --- 1 file changed, 3 deletions(-) commit 15ddd5594 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 11 17:30:41 2021 +0000 Delete upgrade.my.sql upgrade.my.sql (gone) | 44 ----------------------------------------- 1 file changed, 44 deletions(-) commit 1abff496a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Nov 11 17:21:51 2021 +0000 Updated update instructions to remove references to old upgrade files. UPGRADE | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) commit 08552cecf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 8 11:27:30 2021 +0000 Added a kiosk refresh rate web/js/refresh.js.php | 20 ++++++++++++++++---- web/systemdefaults.inc.php | 3 +++ 2 files changed, 19 insertions(+), 4 deletions(-) commit c61846e2b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 8 10:59:29 2021 +0000 Disabled prefetch if the Next and Prev links are not visible web/js/index.js.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) commit 6089aff49 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 8 10:20:13 2021 +0000 Added kiosk to headers data on refresh web/js/refresh.js.php | 6 ++++++ 1 file changed, 6 insertions(+) commit aa072471f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Nov 8 09:55:40 2021 +0000 Started on kiosk mode web/Themes/default/header.inc | 5 +++++ web/css/mrbs.css.php | 6 ++++++ web/index.php | 3 ++- web/standard_vars.inc.php | 5 +++-- 4 files changed, 16 insertions(+), 3 deletions(-) commit 4111913d1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 31 14:45:20 2021 +0000 Added type declarations web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0c23ff315 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 31 14:43:08 2021 +0000 Ignored anything in brackets after the name if sorting by last name web/functions.inc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) commit a9e62a6a8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 30 17:30:49 2021 +0100 Added return type declaration web/lib/MRBS/DBStatement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 73c22ea94 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 30 17:19:33 2021 +0100 Removed unused imports web/lib/MRBS/Auth/AuthDb.php | 1 - web/lib/MRBS/DB_mysql.php | 1 - web/lib/MRBS/DB_pgsql.php | 1 - 3 files changed, 3 deletions(-) commit 9a4af1179 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 30 16:40:28 2021 +0100 Removed redundant language token web/lang/lang.ca | 1 - web/lang/lang.cs | 1 - web/lang/lang.da | 1 - web/lang/lang.de | 1 - web/lang/lang.el | 1 - web/lang/lang.en | 1 - web/lang/lang.es | 1 - web/lang/lang.eu | 1 - web/lang/lang.fi | 1 - web/lang/lang.fr | 1 - web/lang/lang.he | 1 - web/lang/lang.hu | 1 - web/lang/lang.id | 1 - web/lang/lang.it | 1 - web/lang/lang.ja | 1 - web/lang/lang.ko | 1 - web/lang/lang.ms | 1 - web/lang/lang.nb | 1 - web/lang/lang.nl | 1 - web/lang/lang.nn | 1 - web/lang/lang.no | 1 - web/lang/lang.pl | 1 - web/lang/lang.pt | 1 - web/lang/lang.pt-br | 1 - web/lang/lang.ro | 1 - web/lang/lang.ru | 1 - web/lang/lang.sk | 1 - web/lang/lang.sl | 1 - web/lang/lang.sr-latn-rs | 1 - web/lang/lang.sv | 1 - web/lang/lang.th | 1 - web/lang/lang.tr | 1 - web/lang/lang.zh-cn | 1 - web/lang/lang.zh-tw | 1 - 34 files changed, 34 deletions(-) commit 1a6f575a1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 30 16:23:34 2021 +0100 Improved consistency of button labelling web/del.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e1807e005 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 30 16:18:32 2021 +0100 Improved consistency of button labelling web/edit_area.php | 2 +- web/edit_room.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 5c6bc8eb9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 30 16:11:10 2021 +0100 Improved consistency of button labelling web/edit_area.php | 2 +- web/edit_room.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 071ccc7ed Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 29 18:05:03 2021 +0100 Fixed problem when a conflict is reported with a booking that was made when there were more periods defined. web/mrbs_sql.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 0cd04444d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 26 15:42:29 2021 +0100 Added the ability to add custom JavaScript web/js.inc | 8 +++++++- web/systemdefaults.inc.php | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) commit fd95d6d36 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 26 09:16:05 2021 +0100 Added new config setting $auth['show_registrant_names_in_public_calendar'] allowing the choice of whether or not to show registrants' names if the calendar is open to the public. web/functions_table.inc | 8 ++++++++ web/systemdefaults.inc.php | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) commit 084ea3ee3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Oct 24 17:16:16 2021 +0100 Added comment web/functions.inc | 4 ++++ 1 file changed, 4 insertions(+) commit 9a4f122b8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 23 19:00:04 2021 +0100 Removed redundant code web/lib/MRBS/Auth/Auth.php | 10 ---------- 1 file changed, 10 deletions(-) commit 3430c6f5a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 23 18:50:09 2021 +0100 Made display names sort order consistent everywhere with $sort_users_by_last_name web/functions.inc | 30 ++++++++++++++++++++++++++++++ web/lib/MRBS/Auth/Auth.php | 23 ++++++++++++++++++++++- web/lib/MRBS/Auth/AuthDb.php | 5 ++++- 3 files changed, 56 insertions(+), 2 deletions(-) commit 7b1a2fece Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Oct 23 11:29:17 2021 +0100 Fixed bug causing the "Back to Rooms" button on the edit_room page to go to the wrong area. web/edit_room.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit ecfce58de Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Oct 22 19:51:30 2021 +0100 Git-renormalized ICS files under web/tzurl. .../zoneinfo-outlook/Africa/Abidjan.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Accra.ics | 32 +- .../zoneinfo-outlook/Africa/Addis_Ababa.ics | 32 +- .../zoneinfo-outlook/Africa/Algiers.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Asmara.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Bamako.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Bangui.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Banjul.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Bissau.ics | 32 +- .../zoneinfo-outlook/Africa/Blantyre.ics | 32 +- .../zoneinfo-outlook/Africa/Brazzaville.ics | 32 +- .../zoneinfo-outlook/Africa/Bujumbura.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Cairo.ics | 32 +- .../zoneinfo-outlook/Africa/Casablanca.ics | 34 +- web/tzurl/zoneinfo-outlook/Africa/Ceuta.ics | 48 +- .../zoneinfo-outlook/Africa/Conakry.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Dakar.ics | 32 +- .../Africa/Dar_es_Salaam.ics | 32 +- .../zoneinfo-outlook/Africa/Djibouti.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Douala.ics | 32 +- .../zoneinfo-outlook/Africa/El_Aaiun.ics | 34 +- .../zoneinfo-outlook/Africa/Freetown.ics | 32 +- .../zoneinfo-outlook/Africa/Gaborone.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Harare.ics | 32 +- .../zoneinfo-outlook/Africa/Johannesburg.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Juba.ics | 32 +- .../zoneinfo-outlook/Africa/Kampala.ics | 32 +- .../zoneinfo-outlook/Africa/Khartoum.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Kigali.ics | 32 +- .../zoneinfo-outlook/Africa/Kinshasa.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Lagos.ics | 32 +- .../zoneinfo-outlook/Africa/Libreville.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Lome.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Luanda.ics | 32 +- .../zoneinfo-outlook/Africa/Lubumbashi.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Lusaka.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Malabo.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Maputo.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Maseru.ics | 32 +- .../zoneinfo-outlook/Africa/Mbabane.ics | 32 +- .../zoneinfo-outlook/Africa/Mogadishu.ics | 32 +- .../zoneinfo-outlook/Africa/Monrovia.ics | 32 +- .../zoneinfo-outlook/Africa/Nairobi.ics | 32 +- .../zoneinfo-outlook/Africa/Ndjamena.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Niamey.ics | 32 +- .../zoneinfo-outlook/Africa/Nouakchott.ics | 32 +- .../zoneinfo-outlook/Africa/Ouagadougou.ics | 32 +- .../zoneinfo-outlook/Africa/Porto-Novo.ics | 32 +- .../zoneinfo-outlook/Africa/Sao_Tome.ics | 32 +- .../zoneinfo-outlook/Africa/Tripoli.ics | 32 +- web/tzurl/zoneinfo-outlook/Africa/Tunis.ics | 32 +- .../zoneinfo-outlook/Africa/Windhoek.ics | 32 +- web/tzurl/zoneinfo-outlook/America/Adak.ics | 48 +- .../zoneinfo-outlook/America/Anchorage.ics | 48 +- .../zoneinfo-outlook/America/Anguilla.ics | 32 +- .../zoneinfo-outlook/America/Antigua.ics | 32 +- .../zoneinfo-outlook/America/Araguaina.ics | 32 +- .../America/Argentina/Buenos_Aires.ics | 32 +- .../America/Argentina/Catamarca.ics | 32 +- .../America/Argentina/Cordoba.ics | 32 +- .../America/Argentina/Jujuy.ics | 32 +- .../America/Argentina/La_Rioja.ics | 32 +- .../America/Argentina/Mendoza.ics | 32 +- .../America/Argentina/Rio_Gallegos.ics | 32 +- .../America/Argentina/Salta.ics | 32 +- .../America/Argentina/San_Juan.ics | 32 +- .../America/Argentina/San_Luis.ics | 32 +- .../America/Argentina/Tucuman.ics | 32 +- .../America/Argentina/Ushuaia.ics | 32 +- web/tzurl/zoneinfo-outlook/America/Aruba.ics | 32 +- .../zoneinfo-outlook/America/Asuncion.ics | 48 +- .../zoneinfo-outlook/America/Atikokan.ics | 32 +- web/tzurl/zoneinfo-outlook/America/Bahia.ics | 32 +- .../America/Bahia_Banderas.ics | 48 +- .../zoneinfo-outlook/America/Barbados.ics | 32 +- web/tzurl/zoneinfo-outlook/America/Belem.ics | 32 +- .../zoneinfo-outlook/America/Belize.ics | 32 +- .../America/Blanc-Sablon.ics | 32 +- .../zoneinfo-outlook/America/Boa_Vista.ics | 32 +- .../zoneinfo-outlook/America/Bogota.ics | 32 +- web/tzurl/zoneinfo-outlook/America/Boise.ics | 48 +- .../America/Cambridge_Bay.ics | 48 +- .../America/Campo_Grande.ics | 32 +- .../zoneinfo-outlook/America/Cancun.ics | 32 +- .../zoneinfo-outlook/America/Caracas.ics | 32 +- .../zoneinfo-outlook/America/Cayenne.ics | 32 +- .../zoneinfo-outlook/America/Cayman.ics | 32 +- .../zoneinfo-outlook/America/Chicago.ics | 48 +- .../zoneinfo-outlook/America/Chihuahua.ics | 48 +- .../zoneinfo-outlook/America/Costa_Rica.ics | 32 +- .../zoneinfo-outlook/America/Creston.ics | 32 +- .../zoneinfo-outlook/America/Cuiaba.ics | 32 +- .../zoneinfo-outlook/America/Curacao.ics | 32 +- .../America/Danmarkshavn.ics | 32 +- .../zoneinfo-outlook/America/Dawson.ics | 32 +- .../America/Dawson_Creek.ics | 32 +- .../zoneinfo-outlook/America/Denver.ics | 48 +- .../zoneinfo-outlook/America/Detroit.ics | 48 +- .../zoneinfo-outlook/America/Dominica.ics | 32 +- .../zoneinfo-outlook/America/Edmonton.ics | 48 +- .../zoneinfo-outlook/America/Eirunepe.ics | 32 +- .../zoneinfo-outlook/America/El_Salvador.ics | 30 +- .../zoneinfo-outlook/America/Fort_Nelson.ics | 32 +- .../zoneinfo-outlook/America/Fortaleza.ics | 32 +- .../zoneinfo-outlook/America/Glace_Bay.ics | 48 +- .../zoneinfo-outlook/America/Godthab.ics | 48 +- .../zoneinfo-outlook/America/Goose_Bay.ics | 48 +- .../zoneinfo-outlook/America/Grand_Turk.ics | 48 +- .../zoneinfo-outlook/America/Grenada.ics | 32 +- .../zoneinfo-outlook/America/Guadeloupe.ics | 32 +- .../zoneinfo-outlook/America/Guatemala.ics | 32 +- .../zoneinfo-outlook/America/Guayaquil.ics | 32 +- .../zoneinfo-outlook/America/Guyana.ics | 32 +- .../zoneinfo-outlook/America/Halifax.ics | 48 +- .../zoneinfo-outlook/America/Havana.ics | 48 +- .../zoneinfo-outlook/America/Hermosillo.ics | 32 +- .../America/Indiana/Indianapolis.ics | 48 +- .../America/Indiana/Knox.ics | 48 +- .../America/Indiana/Marengo.ics | 48 +- .../America/Indiana/Petersburg.ics | 48 +- .../America/Indiana/Tell_City.ics | 48 +- .../America/Indiana/Vevay.ics | 48 +- .../America/Indiana/Vincennes.ics | 48 +- .../America/Indiana/Winamac.ics | 48 +- .../zoneinfo-outlook/America/Inuvik.ics | 48 +- .../zoneinfo-outlook/America/Iqaluit.ics | 48 +- .../zoneinfo-outlook/America/Jamaica.ics | 32 +- .../zoneinfo-outlook/America/Juneau.ics | 48 +- .../America/Kentucky/Louisville.ics | 48 +- .../America/Kentucky/Monticello.ics | 48 +- .../zoneinfo-outlook/America/Kralendijk.ics | 32 +- .../zoneinfo-outlook/America/La_Paz.ics | 32 +- web/tzurl/zoneinfo-outlook/America/Lima.ics | 32 +- .../zoneinfo-outlook/America/Los_Angeles.ics | 48 +- .../America/Lower_Princes.ics | 32 +- .../zoneinfo-outlook/America/Maceio.ics | 32 +- .../zoneinfo-outlook/America/Managua.ics | 32 +- .../zoneinfo-outlook/America/Manaus.ics | 32 +- .../zoneinfo-outlook/America/Marigot.ics | 32 +- .../zoneinfo-outlook/America/Martinique.ics | 32 +- .../zoneinfo-outlook/America/Matamoros.ics | 48 +- .../zoneinfo-outlook/America/Mazatlan.ics | 48 +- .../zoneinfo-outlook/America/Menominee.ics | 48 +- .../zoneinfo-outlook/America/Merida.ics | 48 +- .../zoneinfo-outlook/America/Metlakatla.ics | 48 +- .../zoneinfo-outlook/America/Mexico_City.ics | 48 +- .../zoneinfo-outlook/America/Miquelon.ics | 48 +- .../zoneinfo-outlook/America/Moncton.ics | 48 +- .../zoneinfo-outlook/America/Monterrey.ics | 48 +- .../zoneinfo-outlook/America/Montevideo.ics | 32 +- .../zoneinfo-outlook/America/Montserrat.ics | 32 +- .../zoneinfo-outlook/America/Nassau.ics | 48 +- .../zoneinfo-outlook/America/New_York.ics | 48 +- .../zoneinfo-outlook/America/Nipigon.ics | 48 +- web/tzurl/zoneinfo-outlook/America/Nome.ics | 48 +- .../zoneinfo-outlook/America/Noronha.ics | 32 +- .../America/North_Dakota/Beulah.ics | 48 +- .../America/North_Dakota/Center.ics | 48 +- .../America/North_Dakota/New_Salem.ics | 48 +- .../zoneinfo-outlook/America/Ojinaga.ics | 48 +- .../zoneinfo-outlook/America/Panama.ics | 32 +- .../zoneinfo-outlook/America/Pangnirtung.ics | 48 +- .../zoneinfo-outlook/America/Paramaribo.ics | 32 +- .../zoneinfo-outlook/America/Phoenix.ics | 32 +- .../America/Port-au-Prince.ics | 48 +- .../America/Port_of_Spain.ics | 32 +- .../zoneinfo-outlook/America/Porto_Velho.ics | 32 +- .../zoneinfo-outlook/America/Puerto_Rico.ics | 32 +- .../America/Punta_Arenas.ics | 32 +- .../zoneinfo-outlook/America/Rainy_River.ics | 48 +- .../America/Rankin_Inlet.ics | 48 +- .../zoneinfo-outlook/America/Recife.ics | 32 +- .../zoneinfo-outlook/America/Regina.ics | 32 +- .../zoneinfo-outlook/America/Resolute.ics | 48 +- .../zoneinfo-outlook/America/Rio_Branco.ics | 32 +- .../zoneinfo-outlook/America/Santarem.ics | 32 +- .../zoneinfo-outlook/America/Santiago.ics | 48 +- .../America/Santo_Domingo.ics | 32 +- .../zoneinfo-outlook/America/Sao_Paulo.ics | 32 +- .../America/Scoresbysund.ics | 48 +- web/tzurl/zoneinfo-outlook/America/Sitka.ics | 48 +- .../America/St_Barthelemy.ics | 32 +- .../zoneinfo-outlook/America/St_Johns.ics | 48 +- .../zoneinfo-outlook/America/St_Kitts.ics | 32 +- .../zoneinfo-outlook/America/St_Lucia.ics | 32 +- .../zoneinfo-outlook/America/St_Thomas.ics | 32 +- .../zoneinfo-outlook/America/St_Vincent.ics | 32 +- .../America/Swift_Current.ics | 32 +- .../zoneinfo-outlook/America/Tegucigalpa.ics | 32 +- web/tzurl/zoneinfo-outlook/America/Thule.ics | 48 +- .../zoneinfo-outlook/America/Thunder_Bay.ics | 48 +- .../zoneinfo-outlook/America/Tijuana.ics | 48 +- .../zoneinfo-outlook/America/Toronto.ics | 48 +- .../zoneinfo-outlook/America/Tortola.ics | 32 +- .../zoneinfo-outlook/America/Vancouver.ics | 48 +- .../zoneinfo-outlook/America/Whitehorse.ics | 32 +- .../zoneinfo-outlook/America/Winnipeg.ics | 48 +- .../zoneinfo-outlook/America/Yakutat.ics | 48 +- .../zoneinfo-outlook/America/Yellowknife.ics | 48 +- .../zoneinfo-outlook/Antarctica/Casey.ics | 32 +- .../zoneinfo-outlook/Antarctica/Davis.ics | 32 +- .../Antarctica/DumontDUrville.ics | 32 +- .../Antarctica/Macquarie.ics | 48 +- .../zoneinfo-outlook/Antarctica/Mawson.ics | 32 +- .../zoneinfo-outlook/Antarctica/McMurdo.ics | 48 +- .../zoneinfo-outlook/Antarctica/Palmer.ics | 32 +- .../zoneinfo-outlook/Antarctica/Rothera.ics | 32 +- .../zoneinfo-outlook/Antarctica/Syowa.ics | 32 +- .../zoneinfo-outlook/Antarctica/Troll.ics | 48 +- .../zoneinfo-outlook/Antarctica/Vostok.ics | 32 +- .../zoneinfo-outlook/Arctic/Longyearbyen.ics | 48 +- web/tzurl/zoneinfo-outlook/Asia/Aden.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Almaty.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Amman.ics | 48 +- web/tzurl/zoneinfo-outlook/Asia/Anadyr.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Aqtau.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Aqtobe.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Ashgabat.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Atyrau.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Baghdad.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Bahrain.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Baku.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Bangkok.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Barnaul.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Beirut.ics | 48 +- web/tzurl/zoneinfo-outlook/Asia/Bishkek.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Brunei.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Chita.ics | 32 +- .../zoneinfo-outlook/Asia/Choibalsan.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Colombo.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Damascus.ics | 48 +- web/tzurl/zoneinfo-outlook/Asia/Dhaka.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Dili.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Dubai.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Dushanbe.ics | 32 +- .../zoneinfo-outlook/Asia/Famagusta.ics | 48 +- web/tzurl/zoneinfo-outlook/Asia/Gaza.ics | 48 +- web/tzurl/zoneinfo-outlook/Asia/Hebron.ics | 48 +- .../zoneinfo-outlook/Asia/Ho_Chi_Minh.ics | 32 +- .../zoneinfo-outlook/Asia/Hong_Kong.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Hovd.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Irkutsk.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Istanbul.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Jakarta.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Jayapura.ics | 32 +- .../zoneinfo-outlook/Asia/Jerusalem.ics | 48 +- web/tzurl/zoneinfo-outlook/Asia/Kabul.ics | 32 +- .../zoneinfo-outlook/Asia/Kamchatka.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Karachi.ics | 32 +- .../zoneinfo-outlook/Asia/Kathmandu.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Khandyga.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Kolkata.ics | 32 +- .../zoneinfo-outlook/Asia/Krasnoyarsk.ics | 32 +- .../zoneinfo-outlook/Asia/Kuala_Lumpur.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Kuching.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Kuwait.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Macau.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Magadan.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Makassar.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Manila.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Muscat.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Nicosia.ics | 48 +- .../zoneinfo-outlook/Asia/Novokuznetsk.ics | 32 +- .../zoneinfo-outlook/Asia/Novosibirsk.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Omsk.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Oral.ics | 32 +- .../zoneinfo-outlook/Asia/Phnom_Penh.ics | 32 +- .../zoneinfo-outlook/Asia/Pontianak.ics | 32 +- .../zoneinfo-outlook/Asia/Pyongyang.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Qatar.ics | 32 +- .../zoneinfo-outlook/Asia/Qyzylorda.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Riyadh.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Sakhalin.ics | 32 +- .../zoneinfo-outlook/Asia/Samarkand.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Seoul.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Shanghai.ics | 32 +- .../zoneinfo-outlook/Asia/Singapore.ics | 32 +- .../zoneinfo-outlook/Asia/Srednekolymsk.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Taipei.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Tashkent.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Tbilisi.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Tehran.ics | 48 +- web/tzurl/zoneinfo-outlook/Asia/Thimphu.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Tokyo.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Tomsk.ics | 32 +- .../zoneinfo-outlook/Asia/Ulaanbaatar.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Urumqi.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Ust-Nera.ics | 32 +- .../zoneinfo-outlook/Asia/Vientiane.ics | 32 +- .../zoneinfo-outlook/Asia/Vladivostok.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Yakutsk.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Yangon.ics | 32 +- .../zoneinfo-outlook/Asia/Yekaterinburg.ics | 32 +- web/tzurl/zoneinfo-outlook/Asia/Yerevan.ics | 32 +- .../zoneinfo-outlook/Atlantic/Azores.ics | 48 +- .../zoneinfo-outlook/Atlantic/Bermuda.ics | 48 +- .../zoneinfo-outlook/Atlantic/Canary.ics | 48 +- .../zoneinfo-outlook/Atlantic/Cape_Verde.ics | 32 +- .../zoneinfo-outlook/Atlantic/Faroe.ics | 48 +- .../zoneinfo-outlook/Atlantic/Madeira.ics | 48 +- .../zoneinfo-outlook/Atlantic/Reykjavik.ics | 32 +- .../Atlantic/South_Georgia.ics | 32 +- .../zoneinfo-outlook/Atlantic/St_Helena.ics | 32 +- .../zoneinfo-outlook/Atlantic/Stanley.ics | 32 +- .../zoneinfo-outlook/Australia/Adelaide.ics | 48 +- .../zoneinfo-outlook/Australia/Brisbane.ics | 32 +- .../Australia/Broken_Hill.ics | 48 +- .../zoneinfo-outlook/Australia/Currie.ics | 48 +- .../zoneinfo-outlook/Australia/Darwin.ics | 32 +- .../zoneinfo-outlook/Australia/Eucla.ics | 32 +- .../zoneinfo-outlook/Australia/Hobart.ics | 48 +- .../zoneinfo-outlook/Australia/Lindeman.ics | 32 +- .../zoneinfo-outlook/Australia/Lord_Howe.ics | 48 +- .../zoneinfo-outlook/Australia/Melbourne.ics | 48 +- .../zoneinfo-outlook/Australia/Perth.ics | 32 +- .../zoneinfo-outlook/Australia/Sydney.ics | 48 +- .../zoneinfo-outlook/Europe/Amsterdam.ics | 48 +- .../zoneinfo-outlook/Europe/Andorra.ics | 48 +- .../zoneinfo-outlook/Europe/Astrakhan.ics | 32 +- web/tzurl/zoneinfo-outlook/Europe/Athens.ics | 48 +- .../zoneinfo-outlook/Europe/Belgrade.ics | 48 +- web/tzurl/zoneinfo-outlook/Europe/Berlin.ics | 48 +- .../zoneinfo-outlook/Europe/Bratislava.ics | 48 +- .../zoneinfo-outlook/Europe/Brussels.ics | 48 +- .../zoneinfo-outlook/Europe/Bucharest.ics | 48 +- .../zoneinfo-outlook/Europe/Budapest.ics | 48 +- .../zoneinfo-outlook/Europe/Busingen.ics | 48 +- .../zoneinfo-outlook/Europe/Chisinau.ics | 48 +- .../zoneinfo-outlook/Europe/Copenhagen.ics | 48 +- web/tzurl/zoneinfo-outlook/Europe/Dublin.ics | 48 +- .../zoneinfo-outlook/Europe/Gibraltar.ics | 48 +- .../zoneinfo-outlook/Europe/Guernsey.ics | 48 +- .../zoneinfo-outlook/Europe/Helsinki.ics | 48 +- .../zoneinfo-outlook/Europe/Isle_of_Man.ics | 48 +- .../zoneinfo-outlook/Europe/Istanbul.ics | 32 +- web/tzurl/zoneinfo-outlook/Europe/Jersey.ics | 48 +- .../zoneinfo-outlook/Europe/Kaliningrad.ics | 32 +- web/tzurl/zoneinfo-outlook/Europe/Kiev.ics | 48 +- web/tzurl/zoneinfo-outlook/Europe/Kirov.ics | 32 +- web/tzurl/zoneinfo-outlook/Europe/Lisbon.ics | 48 +- .../zoneinfo-outlook/Europe/Ljubljana.ics | 48 +- web/tzurl/zoneinfo-outlook/Europe/London.ics | 48 +- .../zoneinfo-outlook/Europe/Luxembourg.ics | 48 +- web/tzurl/zoneinfo-outlook/Europe/Madrid.ics | 48 +- web/tzurl/zoneinfo-outlook/Europe/Malta.ics | 48 +- .../zoneinfo-outlook/Europe/Mariehamn.ics | 48 +- web/tzurl/zoneinfo-outlook/Europe/Minsk.ics | 32 +- web/tzurl/zoneinfo-outlook/Europe/Monaco.ics | 48 +- web/tzurl/zoneinfo-outlook/Europe/Moscow.ics | 32 +- .../zoneinfo-outlook/Europe/Nicosia.ics | 48 +- web/tzurl/zoneinfo-outlook/Europe/Oslo.ics | 48 +- web/tzurl/zoneinfo-outlook/Europe/Paris.ics | 48 +- .../zoneinfo-outlook/Europe/Podgorica.ics | 48 +- web/tzurl/zoneinfo-outlook/Europe/Prague.ics | 48 +- web/tzurl/zoneinfo-outlook/Europe/Riga.ics | 48 +- web/tzurl/zoneinfo-outlook/Europe/Rome.ics | 48 +- web/tzurl/zoneinfo-outlook/Europe/Samara.ics | 32 +- .../zoneinfo-outlook/Europe/San_Marino.ics | 48 +- .../zoneinfo-outlook/Europe/Sarajevo.ics | 48 +- .../zoneinfo-outlook/Europe/Saratov.ics | 32 +- .../zoneinfo-outlook/Europe/Simferopol.ics | 32 +- web/tzurl/zoneinfo-outlook/Europe/Skopje.ics | 48 +- web/tzurl/zoneinfo-outlook/Europe/Sofia.ics | 48 +- .../zoneinfo-outlook/Europe/Stockholm.ics | 48 +- .../zoneinfo-outlook/Europe/Tallinn.ics | 48 +- web/tzurl/zoneinfo-outlook/Europe/Tirane.ics | 48 +- .../zoneinfo-outlook/Europe/Ulyanovsk.ics | 32 +- .../zoneinfo-outlook/Europe/Uzhgorod.ics | 48 +- web/tzurl/zoneinfo-outlook/Europe/Vaduz.ics | 48 +- .../zoneinfo-outlook/Europe/Vatican.ics | 48 +- web/tzurl/zoneinfo-outlook/Europe/Vienna.ics | 48 +- .../zoneinfo-outlook/Europe/Vilnius.ics | 48 +- .../zoneinfo-outlook/Europe/Volgograd.ics | 32 +- web/tzurl/zoneinfo-outlook/Europe/Warsaw.ics | 48 +- web/tzurl/zoneinfo-outlook/Europe/Zagreb.ics | 48 +- .../zoneinfo-outlook/Europe/Zaporozhye.ics | 48 +- web/tzurl/zoneinfo-outlook/Europe/Zurich.ics | 48 +- .../zoneinfo-outlook/Indian/Antananarivo.ics | 32 +- web/tzurl/zoneinfo-outlook/Indian/Chagos.ics | 32 +- .../zoneinfo-outlook/Indian/Christmas.ics | 32 +- web/tzurl/zoneinfo-outlook/Indian/Cocos.ics | 32 +- web/tzurl/zoneinfo-outlook/Indian/Comoro.ics | 32 +- .../zoneinfo-outlook/Indian/Kerguelen.ics | 32 +- web/tzurl/zoneinfo-outlook/Indian/Mahe.ics | 32 +- .../zoneinfo-outlook/Indian/Maldives.ics | 32 +- .../zoneinfo-outlook/Indian/Mauritius.ics | 32 +- .../zoneinfo-outlook/Indian/Mayotte.ics | 32 +- .../zoneinfo-outlook/Indian/Reunion.ics | 32 +- web/tzurl/zoneinfo-outlook/Pacific/Apia.ics | 48 +- .../zoneinfo-outlook/Pacific/Auckland.ics | 48 +- .../Pacific/Bougainville.ics | 32 +- .../zoneinfo-outlook/Pacific/Chatham.ics | 48 +- web/tzurl/zoneinfo-outlook/Pacific/Chuuk.ics | 32 +- .../zoneinfo-outlook/Pacific/Easter.ics | 48 +- web/tzurl/zoneinfo-outlook/Pacific/Efate.ics | 32 +- .../zoneinfo-outlook/Pacific/Enderbury.ics | 32 +- .../zoneinfo-outlook/Pacific/Fakaofo.ics | 32 +- web/tzurl/zoneinfo-outlook/Pacific/Fiji.ics | 48 +- .../zoneinfo-outlook/Pacific/Funafuti.ics | 32 +- .../zoneinfo-outlook/Pacific/Galapagos.ics | 32 +- .../zoneinfo-outlook/Pacific/Gambier.ics | 32 +- .../zoneinfo-outlook/Pacific/Guadalcanal.ics | 32 +- web/tzurl/zoneinfo-outlook/Pacific/Guam.ics | 32 +- .../zoneinfo-outlook/Pacific/Honolulu.ics | 32 +- .../zoneinfo-outlook/Pacific/Kiritimati.ics | 32 +- .../zoneinfo-outlook/Pacific/Kosrae.ics | 32 +- .../zoneinfo-outlook/Pacific/Kwajalein.ics | 32 +- .../zoneinfo-outlook/Pacific/Majuro.ics | 32 +- .../zoneinfo-outlook/Pacific/Marquesas.ics | 32 +- .../zoneinfo-outlook/Pacific/Midway.ics | 32 +- web/tzurl/zoneinfo-outlook/Pacific/Nauru.ics | 32 +- web/tzurl/zoneinfo-outlook/Pacific/Niue.ics | 32 +- .../zoneinfo-outlook/Pacific/Norfolk.ics | 48 +- .../zoneinfo-outlook/Pacific/Noumea.ics | 32 +- .../zoneinfo-outlook/Pacific/Pago_Pago.ics | 32 +- web/tzurl/zoneinfo-outlook/Pacific/Palau.ics | 32 +- .../zoneinfo-outlook/Pacific/Pitcairn.ics | 32 +- .../zoneinfo-outlook/Pacific/Pohnpei.ics | 32 +- .../Pacific/Port_Moresby.ics | 32 +- .../zoneinfo-outlook/Pacific/Rarotonga.ics | 32 +- .../zoneinfo-outlook/Pacific/Saipan.ics | 32 +- .../zoneinfo-outlook/Pacific/Tahiti.ics | 32 +- .../zoneinfo-outlook/Pacific/Tarawa.ics | 32 +- .../zoneinfo-outlook/Pacific/Tongatapu.ics | 32 +- web/tzurl/zoneinfo-outlook/Pacific/Wake.ics | 32 +- .../zoneinfo-outlook/Pacific/Wallis.ics | 32 +- web/tzurl/zoneinfo/Africa/Abidjan.ics | 34 +- web/tzurl/zoneinfo/Africa/Accra.ics | 62 +- web/tzurl/zoneinfo/Africa/Addis_Ababa.ics | 70 +- web/tzurl/zoneinfo/Africa/Algiers.ics | 186 +-- web/tzurl/zoneinfo/Africa/Asmara.ics | 70 +- web/tzurl/zoneinfo/Africa/Bamako.ics | 34 +- web/tzurl/zoneinfo/Africa/Bangui.ics | 34 +- web/tzurl/zoneinfo/Africa/Banjul.ics | 34 +- web/tzurl/zoneinfo/Africa/Bissau.ics | 46 +- web/tzurl/zoneinfo/Africa/Blantyre.ics | 34 +- web/tzurl/zoneinfo/Africa/Brazzaville.ics | 34 +- web/tzurl/zoneinfo/Africa/Bujumbura.ics | 34 +- web/tzurl/zoneinfo/Africa/Cairo.ics | 238 ++-- web/tzurl/zoneinfo/Africa/Casablanca.ics | 494 +++---- web/tzurl/zoneinfo/Africa/Ceuta.ics | 178 +-- web/tzurl/zoneinfo/Africa/Conakry.ics | 34 +- web/tzurl/zoneinfo/Africa/Dakar.ics | 34 +- web/tzurl/zoneinfo/Africa/Dar_es_Salaam.ics | 70 +- web/tzurl/zoneinfo/Africa/Djibouti.ics | 70 +- web/tzurl/zoneinfo/Africa/Douala.ics | 34 +- web/tzurl/zoneinfo/Africa/El_Aaiun.ics | 472 +++---- web/tzurl/zoneinfo/Africa/Freetown.ics | 34 +- web/tzurl/zoneinfo/Africa/Gaborone.ics | 34 +- web/tzurl/zoneinfo/Africa/Harare.ics | 34 +- web/tzurl/zoneinfo/Africa/Johannesburg.ics | 74 +- web/tzurl/zoneinfo/Africa/Juba.ics | 88 +- web/tzurl/zoneinfo/Africa/Kampala.ics | 70 +- web/tzurl/zoneinfo/Africa/Khartoum.ics | 100 +- web/tzurl/zoneinfo/Africa/Kigali.ics | 34 +- web/tzurl/zoneinfo/Africa/Kinshasa.ics | 34 +- web/tzurl/zoneinfo/Africa/Lagos.ics | 34 +- web/tzurl/zoneinfo/Africa/Libreville.ics | 34 +- web/tzurl/zoneinfo/Africa/Lome.ics | 34 +- web/tzurl/zoneinfo/Africa/Luanda.ics | 34 +- web/tzurl/zoneinfo/Africa/Lubumbashi.ics | 34 +- web/tzurl/zoneinfo/Africa/Lusaka.ics | 34 +- web/tzurl/zoneinfo/Africa/Malabo.ics | 34 +- web/tzurl/zoneinfo/Africa/Maputo.ics | 34 +- web/tzurl/zoneinfo/Africa/Maseru.ics | 74 +- web/tzurl/zoneinfo/Africa/Mbabane.ics | 74 +- web/tzurl/zoneinfo/Africa/Mogadishu.ics | 70 +- web/tzurl/zoneinfo/Africa/Monrovia.ics | 58 +- web/tzurl/zoneinfo/Africa/Nairobi.ics | 70 +- web/tzurl/zoneinfo/Africa/Ndjamena.ics | 58 +- web/tzurl/zoneinfo/Africa/Niamey.ics | 34 +- web/tzurl/zoneinfo/Africa/Nouakchott.ics | 34 +- web/tzurl/zoneinfo/Africa/Ouagadougou.ics | 34 +- web/tzurl/zoneinfo/Africa/Porto-Novo.ics | 34 +- web/tzurl/zoneinfo/Africa/Sao_Tome.ics | 70 +- web/tzurl/zoneinfo/Africa/Tripoli.ics | 166 +-- web/tzurl/zoneinfo/Africa/Tunis.ics | 164 +-- web/tzurl/zoneinfo/Africa/Windhoek.ics | 124 +- web/tzurl/zoneinfo/America/Adak.ics | 244 ++-- web/tzurl/zoneinfo/America/Anchorage.ics | 244 ++-- web/tzurl/zoneinfo/America/Anguilla.ics | 34 +- web/tzurl/zoneinfo/America/Antigua.ics | 34 +- web/tzurl/zoneinfo/America/Araguaina.ics | 236 ++-- .../America/Argentina/Buenos_Aires.ics | 284 ++-- .../zoneinfo/America/Argentina/Catamarca.ics | 314 ++--- .../zoneinfo/America/Argentina/Cordoba.ics | 324 ++--- .../zoneinfo/America/Argentina/Jujuy.ics | 290 ++-- .../zoneinfo/America/Argentina/La_Rioja.ics | 302 ++--- .../zoneinfo/America/Argentina/Mendoza.ics | 304 ++--- .../America/Argentina/Rio_Gallegos.ics | 274 ++-- .../zoneinfo/America/Argentina/Salta.ics | 310 ++--- .../zoneinfo/America/Argentina/San_Juan.ics | 302 ++--- .../zoneinfo/America/Argentina/San_Luis.ics | 296 ++--- .../zoneinfo/America/Argentina/Tucuman.ics | 328 ++--- .../zoneinfo/America/Argentina/Ushuaia.ics | 274 ++-- web/tzurl/zoneinfo/America/Aruba.ics | 46 +- web/tzurl/zoneinfo/America/Asuncion.ics | 292 ++--- web/tzurl/zoneinfo/America/Atikokan.ics | 96 +- web/tzurl/zoneinfo/America/Bahia.ics | 274 ++-- .../zoneinfo/America/Bahia_Banderas.ics | 200 +-- web/tzurl/zoneinfo/America/Barbados.ics | 100 +- web/tzurl/zoneinfo/America/Belem.ics | 164 +-- web/tzurl/zoneinfo/America/Belize.ics | 90 +- web/tzurl/zoneinfo/America/Blanc-Sablon.ics | 84 +- web/tzurl/zoneinfo/America/Boa_Vista.ics | 172 +-- web/tzurl/zoneinfo/America/Bogota.ics | 70 +- web/tzurl/zoneinfo/America/Boise.ics | 208 +-- web/tzurl/zoneinfo/America/Cambridge_Bay.ics | 252 ++-- web/tzurl/zoneinfo/America/Campo_Grande.ics | 344 ++--- web/tzurl/zoneinfo/America/Cancun.ics | 168 +-- web/tzurl/zoneinfo/America/Caracas.ics | 72 +- web/tzurl/zoneinfo/America/Cayenne.ics | 46 +- web/tzurl/zoneinfo/America/Cayman.ics | 46 +- web/tzurl/zoneinfo/America/Chicago.ics | 284 ++-- web/tzurl/zoneinfo/America/Chihuahua.ics | 174 +-- web/tzurl/zoneinfo/America/Costa_Rica.ics | 102 +- web/tzurl/zoneinfo/America/Creston.ics | 58 +- web/tzurl/zoneinfo/America/Cuiaba.ics | 356 ++--- web/tzurl/zoneinfo/America/Curacao.ics | 46 +- web/tzurl/zoneinfo/America/Danmarkshavn.ics | 86 +- web/tzurl/zoneinfo/America/Dawson.ics | 206 +-- web/tzurl/zoneinfo/America/Dawson_Creek.ics | 138 +- web/tzurl/zoneinfo/America/Denver.ics | 198 +-- web/tzurl/zoneinfo/America/Detroit.ics | 190 +-- web/tzurl/zoneinfo/America/Dominica.ics | 34 +- web/tzurl/zoneinfo/America/Edmonton.ics | 202 +-- web/tzurl/zoneinfo/America/Eirunepe.ics | 182 +-- web/tzurl/zoneinfo/America/El_Salvador.ics | 62 +- web/tzurl/zoneinfo/America/Fort_Nelson.ics | 180 +-- web/tzurl/zoneinfo/America/Fortaleza.ics | 194 +-- web/tzurl/zoneinfo/America/Glace_Bay.ics | 158 +-- web/tzurl/zoneinfo/America/Godthab.ics | 88 +- web/tzurl/zoneinfo/America/Goose_Bay.ics | 376 +++--- web/tzurl/zoneinfo/America/Grand_Turk.ics | 168 +-- web/tzurl/zoneinfo/America/Grenada.ics | 34 +- web/tzurl/zoneinfo/America/Guadeloupe.ics | 34 +- web/tzurl/zoneinfo/America/Guatemala.ics | 70 +- web/tzurl/zoneinfo/America/Guayaquil.ics | 70 +- web/tzurl/zoneinfo/America/Guyana.ics | 58 +- web/tzurl/zoneinfo/America/Halifax.ics | 388 +++--- web/tzurl/zoneinfo/America/Havana.ics | 408 +++--- web/tzurl/zoneinfo/America/Hermosillo.ics | 118 +- .../America/Indiana/Indianapolis.ics | 236 ++-- web/tzurl/zoneinfo/America/Indiana/Knox.ics | 306 ++--- .../zoneinfo/America/Indiana/Marengo.ics | 260 ++-- .../zoneinfo/America/Indiana/Petersburg.ics | 270 ++-- .../zoneinfo/America/Indiana/Tell_City.ics | 260 ++-- web/tzurl/zoneinfo/America/Indiana/Vevay.ics | 190 +-- .../zoneinfo/America/Indiana/Vincennes.ics | 270 ++-- .../zoneinfo/America/Indiana/Winamac.ics | 248 ++-- web/tzurl/zoneinfo/America/Inuvik.ics | 140 +- web/tzurl/zoneinfo/America/Iqaluit.ics | 216 +-- web/tzurl/zoneinfo/America/Jamaica.ics | 88 +- web/tzurl/zoneinfo/America/Juneau.ics | 284 ++-- .../zoneinfo/America/Kentucky/Louisville.ics | 298 ++--- .../zoneinfo/America/Kentucky/Monticello.ics | 236 ++-- web/tzurl/zoneinfo/America/Kralendijk.ics | 46 +- web/tzurl/zoneinfo/America/La_Paz.ics | 58 +- web/tzurl/zoneinfo/America/Lima.ics | 134 +- web/tzurl/zoneinfo/America/Los_Angeles.ics | 228 ++-- web/tzurl/zoneinfo/America/Lower_Princes.ics | 46 +- web/tzurl/zoneinfo/America/Maceio.ics | 198 +-- web/tzurl/zoneinfo/America/Managua.ics | 124 +- web/tzurl/zoneinfo/America/Manaus.ics | 168 +-- web/tzurl/zoneinfo/America/Marigot.ics | 34 +- web/tzurl/zoneinfo/America/Martinique.ics | 70 +- web/tzurl/zoneinfo/America/Matamoros.ics | 146 +-- web/tzurl/zoneinfo/America/Mazatlan.ics | 160 +-- web/tzurl/zoneinfo/America/Menominee.ics | 214 +-- web/tzurl/zoneinfo/America/Merida.ics | 128 +- web/tzurl/zoneinfo/America/Metlakatla.ics | 206 +-- web/tzurl/zoneinfo/America/Mexico_City.ics | 170 +-- web/tzurl/zoneinfo/America/Miquelon.ics | 102 +- web/tzurl/zoneinfo/America/Moncton.ics | 312 ++--- web/tzurl/zoneinfo/America/Monterrey.ics | 118 +- web/tzurl/zoneinfo/America/Montevideo.ics | 332 ++--- web/tzurl/zoneinfo/America/Montserrat.ics | 34 +- web/tzurl/zoneinfo/America/Nassau.ics | 104 +- web/tzurl/zoneinfo/America/New_York.ics | 238 ++-- web/tzurl/zoneinfo/America/Nipigon.ics | 156 +-- web/tzurl/zoneinfo/America/Nome.ics | 244 ++-- web/tzurl/zoneinfo/America/Noronha.ics | 194 +-- .../zoneinfo/America/North_Dakota/Beulah.ics | 236 ++-- .../zoneinfo/America/North_Dakota/Center.ics | 236 ++-- .../America/North_Dakota/New_Salem.ics | 236 ++-- web/tzurl/zoneinfo/America/Ojinaga.ics | 202 +-- web/tzurl/zoneinfo/America/Panama.ics | 46 +- web/tzurl/zoneinfo/America/Pangnirtung.ics | 268 ++-- web/tzurl/zoneinfo/America/Paramaribo.ics | 70 +- web/tzurl/zoneinfo/America/Phoenix.ics | 104 +- .../zoneinfo/America/Port-au-Prince.ics | 198 +-- web/tzurl/zoneinfo/America/Port_of_Spain.ics | 34 +- web/tzurl/zoneinfo/America/Porto_Velho.ics | 164 +-- web/tzurl/zoneinfo/America/Puerto_Rico.ics | 70 +- web/tzurl/zoneinfo/America/Punta_Arenas.ics | 348 ++--- web/tzurl/zoneinfo/America/Rainy_River.ics | 156 +-- web/tzurl/zoneinfo/America/Rankin_Inlet.ics | 180 +-- web/tzurl/zoneinfo/America/Recife.ics | 194 +-- web/tzurl/zoneinfo/America/Regina.ics | 192 +-- web/tzurl/zoneinfo/America/Resolute.ics | 184 +-- web/tzurl/zoneinfo/America/Rio_Branco.ics | 178 +-- web/tzurl/zoneinfo/America/Santarem.ics | 176 +-- web/tzurl/zoneinfo/America/Santiago.ics | 392 +++--- web/tzurl/zoneinfo/America/Santo_Domingo.ics | 128 +- web/tzurl/zoneinfo/America/Sao_Paulo.ics | 344 ++--- web/tzurl/zoneinfo/America/Scoresbysund.ics | 112 +- web/tzurl/zoneinfo/America/Sitka.ics | 232 ++-- web/tzurl/zoneinfo/America/St_Barthelemy.ics | 34 +- web/tzurl/zoneinfo/America/St_Johns.ics | 366 +++--- web/tzurl/zoneinfo/America/St_Kitts.ics | 34 +- web/tzurl/zoneinfo/America/St_Lucia.ics | 34 +- web/tzurl/zoneinfo/America/St_Thomas.ics | 34 +- web/tzurl/zoneinfo/America/St_Vincent.ics | 34 +- web/tzurl/zoneinfo/America/Swift_Current.ics | 160 +-- web/tzurl/zoneinfo/America/Tegucigalpa.ics | 86 +- web/tzurl/zoneinfo/America/Thule.ics | 118 +- web/tzurl/zoneinfo/America/Thunder_Bay.ics | 180 +-- web/tzurl/zoneinfo/America/Tijuana.ics | 202 +-- web/tzurl/zoneinfo/America/Toronto.ics | 314 ++--- web/tzurl/zoneinfo/America/Tortola.ics | 34 +- web/tzurl/zoneinfo/America/Vancouver.ics | 170 +-- web/tzurl/zoneinfo/America/Whitehorse.ics | 206 +-- web/tzurl/zoneinfo/America/Winnipeg.ics | 250 ++-- web/tzurl/zoneinfo/America/Yakutat.ics | 220 ++-- web/tzurl/zoneinfo/America/Yellowknife.ics | 164 +-- web/tzurl/zoneinfo/Antarctica/Casey.ics | 76 +- web/tzurl/zoneinfo/Antarctica/Davis.ics | 76 +- .../zoneinfo/Antarctica/DumontDUrville.ics | 48 +- web/tzurl/zoneinfo/Antarctica/Macquarie.ics | 282 ++-- web/tzurl/zoneinfo/Antarctica/Mawson.ics | 46 +- web/tzurl/zoneinfo/Antarctica/McMurdo.ics | 236 ++-- web/tzurl/zoneinfo/Antarctica/Palmer.ics | 300 ++--- web/tzurl/zoneinfo/Antarctica/Rothera.ics | 34 +- web/tzurl/zoneinfo/Antarctica/Syowa.ics | 34 +- web/tzurl/zoneinfo/Antarctica/Troll.ics | 62 +- web/tzurl/zoneinfo/Antarctica/Vostok.ics | 34 +- web/tzurl/zoneinfo/Arctic/Longyearbyen.ics | 160 +-- web/tzurl/zoneinfo/Asia/Aden.ics | 34 +- web/tzurl/zoneinfo/Asia/Almaty.ics | 182 +-- web/tzurl/zoneinfo/Asia/Amman.ics | 272 ++-- web/tzurl/zoneinfo/Asia/Anadyr.ics | 222 ++-- web/tzurl/zoneinfo/Asia/Aqtau.ics | 234 ++-- web/tzurl/zoneinfo/Asia/Aqtobe.ics | 218 +-- web/tzurl/zoneinfo/Asia/Ashgabat.ics | 128 +- web/tzurl/zoneinfo/Asia/Atyrau.ics | 246 ++-- web/tzurl/zoneinfo/Asia/Baghdad.ics | 144 +- web/tzurl/zoneinfo/Asia/Bahrain.ics | 46 +- web/tzurl/zoneinfo/Asia/Baku.ics | 216 +-- web/tzurl/zoneinfo/Asia/Bangkok.ics | 46 +- web/tzurl/zoneinfo/Asia/Barnaul.ics | 204 +-- web/tzurl/zoneinfo/Asia/Beirut.ics | 222 ++-- web/tzurl/zoneinfo/Asia/Bishkek.ics | 194 +-- web/tzurl/zoneinfo/Asia/Brunei.ics | 46 +- web/tzurl/zoneinfo/Asia/Chita.ics | 196 +-- web/tzurl/zoneinfo/Asia/Choibalsan.ics | 180 +-- web/tzurl/zoneinfo/Asia/Colombo.ics | 118 +- web/tzurl/zoneinfo/Asia/Damascus.ics | 340 ++--- web/tzurl/zoneinfo/Asia/Dhaka.ics | 106 +- web/tzurl/zoneinfo/Asia/Dili.ics | 60 +- web/tzurl/zoneinfo/Asia/Dubai.ics | 34 +- web/tzurl/zoneinfo/Asia/Dushanbe.ics | 126 +- web/tzurl/zoneinfo/Asia/Famagusta.ics | 178 +-- web/tzurl/zoneinfo/Asia/Gaza.ics | 406 +++--- web/tzurl/zoneinfo/Asia/Hebron.ics | 410 +++--- web/tzurl/zoneinfo/Asia/Ho_Chi_Minh.ics | 100 +- web/tzurl/zoneinfo/Asia/Hong_Kong.ics | 196 +-- web/tzurl/zoneinfo/Asia/Hovd.ics | 168 +-- web/tzurl/zoneinfo/Asia/Irkutsk.ics | 206 +-- web/tzurl/zoneinfo/Asia/Istanbul.ics | 372 +++--- web/tzurl/zoneinfo/Asia/Jakarta.ics | 118 +- web/tzurl/zoneinfo/Asia/Jayapura.ics | 58 +- web/tzurl/zoneinfo/Asia/Jerusalem.ics | 320 ++--- web/tzurl/zoneinfo/Asia/Kabul.ics | 46 +- web/tzurl/zoneinfo/Asia/Kamchatka.ics | 176 +-- web/tzurl/zoneinfo/Asia/Karachi.ics | 124 +- web/tzurl/zoneinfo/Asia/Kathmandu.ics | 46 +- web/tzurl/zoneinfo/Asia/Khandyga.ics | 246 ++-- web/tzurl/zoneinfo/Asia/Kolkata.ics | 86 +- web/tzurl/zoneinfo/Asia/Krasnoyarsk.ics | 194 +-- web/tzurl/zoneinfo/Asia/Kuala_Lumpur.ics | 118 +- web/tzurl/zoneinfo/Asia/Kuching.ics | 98 +- web/tzurl/zoneinfo/Asia/Kuwait.ics | 34 +- web/tzurl/zoneinfo/Asia/Macau.ics | 276 ++-- web/tzurl/zoneinfo/Asia/Magadan.ics | 196 +-- web/tzurl/zoneinfo/Asia/Makassar.ics | 70 +- web/tzurl/zoneinfo/Asia/Manila.ics | 92 +- web/tzurl/zoneinfo/Asia/Muscat.ics | 34 +- web/tzurl/zoneinfo/Asia/Nicosia.ics | 136 +- web/tzurl/zoneinfo/Asia/Novokuznetsk.ics | 176 +-- web/tzurl/zoneinfo/Asia/Novosibirsk.ics | 214 +-- web/tzurl/zoneinfo/Asia/Omsk.ics | 194 +-- web/tzurl/zoneinfo/Asia/Oral.ics | 232 ++-- web/tzurl/zoneinfo/Asia/Phnom_Penh.ics | 46 +- web/tzurl/zoneinfo/Asia/Pontianak.ics | 118 +- web/tzurl/zoneinfo/Asia/Pyongyang.ics | 82 +- web/tzurl/zoneinfo/Asia/Qatar.ics | 46 +- web/tzurl/zoneinfo/Asia/Qyzylorda.ics | 232 ++-- web/tzurl/zoneinfo/Asia/Riyadh.ics | 34 +- web/tzurl/zoneinfo/Asia/Sakhalin.ics | 214 +-- web/tzurl/zoneinfo/Asia/Samarkand.ics | 150 +-- web/tzurl/zoneinfo/Asia/Seoul.ics | 210 +-- web/tzurl/zoneinfo/Asia/Shanghai.ics | 126 +- web/tzurl/zoneinfo/Asia/Singapore.ics | 118 +- web/tzurl/zoneinfo/Asia/Srednekolymsk.ics | 194 +-- web/tzurl/zoneinfo/Asia/Taipei.ics | 194 +-- web/tzurl/zoneinfo/Asia/Tashkent.ics | 138 +- web/tzurl/zoneinfo/Asia/Tbilisi.ics | 260 ++-- web/tzurl/zoneinfo/Asia/Tehran.ics | 1094 ++++++++-------- web/tzurl/zoneinfo/Asia/Thimphu.ics | 46 +- web/tzurl/zoneinfo/Asia/Tokyo.ics | 76 +- web/tzurl/zoneinfo/Asia/Tomsk.ics | 216 +-- web/tzurl/zoneinfo/Asia/Ulaanbaatar.ics | 168 +-- web/tzurl/zoneinfo/Asia/Urumqi.ics | 34 +- web/tzurl/zoneinfo/Asia/Ust-Nera.ics | 218 +-- web/tzurl/zoneinfo/Asia/Vientiane.ics | 46 +- web/tzurl/zoneinfo/Asia/Vladivostok.ics | 194 +-- web/tzurl/zoneinfo/Asia/Yakutsk.ics | 194 +-- web/tzurl/zoneinfo/Asia/Yangon.ics | 70 +- web/tzurl/zoneinfo/Asia/Yekaterinburg.ics | 206 +-- web/tzurl/zoneinfo/Asia/Yerevan.ics | 186 +-- web/tzurl/zoneinfo/Atlantic/Azores.ics | 478 +++---- web/tzurl/zoneinfo/Atlantic/Bermuda.ics | 116 +- web/tzurl/zoneinfo/Atlantic/Canary.ics | 112 +- web/tzurl/zoneinfo/Atlantic/Cape_Verde.ics | 70 +- web/tzurl/zoneinfo/Atlantic/Faroe.ics | 76 +- web/tzurl/zoneinfo/Atlantic/Madeira.ics | 434 +++--- web/tzurl/zoneinfo/Atlantic/Reykjavik.ics | 194 +-- .../zoneinfo/Atlantic/South_Georgia.ics | 34 +- web/tzurl/zoneinfo/Atlantic/St_Helena.ics | 34 +- web/tzurl/zoneinfo/Atlantic/Stanley.ics | 222 ++-- web/tzurl/zoneinfo/Australia/Adelaide.ics | 206 +-- web/tzurl/zoneinfo/Australia/Brisbane.ics | 112 +- web/tzurl/zoneinfo/Australia/Broken_Hill.ics | 252 ++-- web/tzurl/zoneinfo/Australia/Currie.ics | 232 ++-- web/tzurl/zoneinfo/Australia/Darwin.ics | 92 +- web/tzurl/zoneinfo/Australia/Eucla.ics | 108 +- web/tzurl/zoneinfo/Australia/Hobart.ics | 250 ++-- web/tzurl/zoneinfo/Australia/Lindeman.ics | 124 +- web/tzurl/zoneinfo/Australia/Lord_Howe.ics | 202 +-- web/tzurl/zoneinfo/Australia/Melbourne.ics | 228 ++-- web/tzurl/zoneinfo/Australia/Perth.ics | 108 +- web/tzurl/zoneinfo/Australia/Sydney.ics | 232 ++-- web/tzurl/zoneinfo/Europe/Amsterdam.ics | 302 ++--- web/tzurl/zoneinfo/Europe/Andorra.ics | 88 +- web/tzurl/zoneinfo/Europe/Astrakhan.ics | 202 +-- web/tzurl/zoneinfo/Europe/Athens.ics | 202 +-- web/tzurl/zoneinfo/Europe/Belgrade.ics | 126 +- web/tzurl/zoneinfo/Europe/Berlin.ics | 222 ++-- web/tzurl/zoneinfo/Europe/Bratislava.ics | 260 ++-- web/tzurl/zoneinfo/Europe/Brussels.ics | 316 ++--- web/tzurl/zoneinfo/Europe/Bucharest.ics | 234 ++-- web/tzurl/zoneinfo/Europe/Budapest.ics | 264 ++-- web/tzurl/zoneinfo/Europe/Busingen.ics | 116 +- web/tzurl/zoneinfo/Europe/Chisinau.ics | 316 ++--- web/tzurl/zoneinfo/Europe/Copenhagen.ics | 154 +-- web/tzurl/zoneinfo/Europe/Dublin.ics | 466 +++---- web/tzurl/zoneinfo/Europe/Gibraltar.ics | 390 +++--- web/tzurl/zoneinfo/Europe/Guernsey.ics | 508 +++---- web/tzurl/zoneinfo/Europe/Helsinki.ics | 140 +- web/tzurl/zoneinfo/Europe/Isle_of_Man.ics | 508 +++---- web/tzurl/zoneinfo/Europe/Istanbul.ics | 372 +++--- web/tzurl/zoneinfo/Europe/Jersey.ics | 508 +++---- web/tzurl/zoneinfo/Europe/Kaliningrad.ics | 282 ++-- web/tzurl/zoneinfo/Europe/Kiev.ics | 246 ++-- web/tzurl/zoneinfo/Europe/Kirov.ics | 200 +-- web/tzurl/zoneinfo/Europe/Lisbon.ics | 502 +++---- web/tzurl/zoneinfo/Europe/Ljubljana.ics | 126 +- web/tzurl/zoneinfo/Europe/London.ics | 508 +++---- web/tzurl/zoneinfo/Europe/Luxembourg.ics | 286 ++-- web/tzurl/zoneinfo/Europe/Madrid.ics | 330 ++--- web/tzurl/zoneinfo/Europe/Malta.ics | 256 ++-- web/tzurl/zoneinfo/Europe/Mariehamn.ics | 140 +- web/tzurl/zoneinfo/Europe/Minsk.ics | 234 ++-- web/tzurl/zoneinfo/Europe/Monaco.ics | 274 ++-- web/tzurl/zoneinfo/Europe/Moscow.ics | 320 ++--- web/tzurl/zoneinfo/Europe/Nicosia.ics | 136 +- web/tzurl/zoneinfo/Europe/Oslo.ics | 160 +-- web/tzurl/zoneinfo/Europe/Paris.ics | 282 ++-- web/tzurl/zoneinfo/Europe/Podgorica.ics | 126 +- web/tzurl/zoneinfo/Europe/Prague.ics | 260 ++-- web/tzurl/zoneinfo/Europe/Riga.ics | 306 ++--- web/tzurl/zoneinfo/Europe/Rome.ics | 298 ++--- web/tzurl/zoneinfo/Europe/Samara.ics | 224 ++-- web/tzurl/zoneinfo/Europe/San_Marino.ics | 298 ++--- web/tzurl/zoneinfo/Europe/Sarajevo.ics | 126 +- web/tzurl/zoneinfo/Europe/Saratov.ics | 204 +-- web/tzurl/zoneinfo/Europe/Simferopol.ics | 306 ++--- web/tzurl/zoneinfo/Europe/Skopje.ics | 126 +- web/tzurl/zoneinfo/Europe/Sofia.ics | 240 ++-- web/tzurl/zoneinfo/Europe/Stockholm.ics | 114 +- web/tzurl/zoneinfo/Europe/Tallinn.ics | 296 ++--- web/tzurl/zoneinfo/Europe/Tirane.ics | 156 +-- web/tzurl/zoneinfo/Europe/Ulyanovsk.ics | 234 ++-- web/tzurl/zoneinfo/Europe/Uzhgorod.ics | 250 ++-- web/tzurl/zoneinfo/Europe/Vaduz.ics | 116 +- web/tzurl/zoneinfo/Europe/Vatican.ics | 298 ++--- web/tzurl/zoneinfo/Europe/Vienna.ics | 188 +-- web/tzurl/zoneinfo/Europe/Vilnius.ics | 332 ++--- web/tzurl/zoneinfo/Europe/Volgograd.ics | 204 +-- web/tzurl/zoneinfo/Europe/Warsaw.ics | 342 ++--- web/tzurl/zoneinfo/Europe/Zagreb.ics | 126 +- web/tzurl/zoneinfo/Europe/Zaporozhye.ics | 244 ++-- web/tzurl/zoneinfo/Europe/Zurich.ics | 116 +- web/tzurl/zoneinfo/Indian/Antananarivo.ics | 70 +- web/tzurl/zoneinfo/Indian/Chagos.ics | 46 +- web/tzurl/zoneinfo/Indian/Christmas.ics | 34 +- web/tzurl/zoneinfo/Indian/Cocos.ics | 34 +- web/tzurl/zoneinfo/Indian/Comoro.ics | 70 +- web/tzurl/zoneinfo/Indian/Kerguelen.ics | 34 +- web/tzurl/zoneinfo/Indian/Mahe.ics | 34 +- web/tzurl/zoneinfo/Indian/Maldives.ics | 46 +- web/tzurl/zoneinfo/Indian/Mauritius.ics | 62 +- web/tzurl/zoneinfo/Indian/Mayotte.ics | 70 +- web/tzurl/zoneinfo/Indian/Reunion.ics | 34 +- web/tzurl/zoneinfo/Pacific/Apia.ics | 124 +- web/tzurl/zoneinfo/Pacific/Auckland.ics | 236 ++-- web/tzurl/zoneinfo/Pacific/Bougainville.ics | 82 +- web/tzurl/zoneinfo/Pacific/Chatham.ics | 156 +-- web/tzurl/zoneinfo/Pacific/Chuuk.ics | 74 +- web/tzurl/zoneinfo/Pacific/Easter.ics | 342 ++--- web/tzurl/zoneinfo/Pacific/Efate.ics | 92 +- web/tzurl/zoneinfo/Pacific/Enderbury.ics | 58 +- web/tzurl/zoneinfo/Pacific/Fakaofo.ics | 46 +- web/tzurl/zoneinfo/Pacific/Fiji.ics | 160 +-- web/tzurl/zoneinfo/Pacific/Funafuti.ics | 34 +- web/tzurl/zoneinfo/Pacific/Galapagos.ics | 60 +- web/tzurl/zoneinfo/Pacific/Gambier.ics | 34 +- web/tzurl/zoneinfo/Pacific/Guadalcanal.ics | 34 +- web/tzurl/zoneinfo/Pacific/Guam.ics | 154 +-- web/tzurl/zoneinfo/Pacific/Honolulu.ics | 96 +- web/tzurl/zoneinfo/Pacific/Kiritimati.ics | 58 +- web/tzurl/zoneinfo/Pacific/Kosrae.ics | 120 +- web/tzurl/zoneinfo/Pacific/Kwajalein.ics | 94 +- web/tzurl/zoneinfo/Pacific/Majuro.ics | 96 +- web/tzurl/zoneinfo/Pacific/Marquesas.ics | 34 +- web/tzurl/zoneinfo/Pacific/Midway.ics | 46 +- web/tzurl/zoneinfo/Pacific/Nauru.ics | 70 +- web/tzurl/zoneinfo/Pacific/Niue.ics | 58 +- web/tzurl/zoneinfo/Pacific/Norfolk.ics | 122 +- web/tzurl/zoneinfo/Pacific/Noumea.ics | 86 +- web/tzurl/zoneinfo/Pacific/Pago_Pago.ics | 46 +- web/tzurl/zoneinfo/Pacific/Palau.ics | 46 +- web/tzurl/zoneinfo/Pacific/Pitcairn.ics | 46 +- web/tzurl/zoneinfo/Pacific/Pohnpei.ics | 96 +- web/tzurl/zoneinfo/Pacific/Port_Moresby.ics | 46 +- web/tzurl/zoneinfo/Pacific/Rarotonga.ics | 74 +- web/tzurl/zoneinfo/Pacific/Saipan.ics | 154 +-- web/tzurl/zoneinfo/Pacific/Tahiti.ics | 34 +- web/tzurl/zoneinfo/Pacific/Tarawa.ics | 34 +- web/tzurl/zoneinfo/Pacific/Tongatapu.ics | 102 +- web/tzurl/zoneinfo/Pacific/Wake.ics | 34 +- web/tzurl/zoneinfo/Pacific/Wallis.ics | 34 +- 852 files changed, 42593 insertions(+), 42593 deletions(-) commit 7d84aab18 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 21 11:53:53 2021 +0100 Added option of showing registrants on the calendar page web/functions_table.inc | 10 +++++++--- web/lang/lang.en | 6 ++++-- web/systemdefaults.inc.php | 5 +++++ 3 files changed, 16 insertions(+), 5 deletions(-) commit 212ed61dd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 20 17:21:04 2021 +0100 Restructured for potential slight performance improvement web/lib/MRBS/Auth/Auth.php | 15 ++++++++------- web/report.php | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) commit 1a70d4348 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 19 16:49:39 2021 +0100 Escaped the JavaScript in the recent commit web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 56ab7885c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Oct 19 14:17:41 2021 +0100 Added the ability to set the pattern attribute for custom fields in the Users table INSTALL | 15 +++++++++++++++ web/edit_users.php | 18 +++++++++++++++++- web/systemdefaults.inc.php | 13 +++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) commit 4fc6522dc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 14 17:56:30 2021 +0100 Fixed occasional TypeError exception web/mrbs_sql.inc | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) commit 169ed8026 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Oct 7 12:12:54 2021 +0100 Restructured web/lib/MRBS/Auth/Auth.php | 33 ++++++++++++++++++++++ web/lib/MRBS/Auth/AuthDb.php | 23 ++++++++++++++++ web/mrbs_sql.inc | 50 ---------------------------------- web/report.php | 2 +- 4 files changed, 57 insertions(+), 51 deletions(-) commit 932a7fbb6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 6 15:52:10 2021 +0100 Added sorting of registrants' names web/mrbs_sql.inc | 1 + 1 file changed, 1 insertion(+) commit 1157efcde Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 6 13:04:04 2021 +0100 Fixed PHP 8.1 deprecation error when generating reports in .ics format web/lib/MRBS/DB_pgsql.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit fb955e0b4 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 6 12:30:56 2021 +0100 Improved performance of reports on registrations when using the 'db' auth type web/mrbs_sql.inc | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) commit 22077efed Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 6 11:29:56 2021 +0100 Only display the Registered column in report output if there is at least one entry in the table where registration is allowed. web/mrbs_sql.inc | 12 ++++++++++++ web/report.php | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) commit 1d8bfbf05 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 6 11:11:49 2021 +0100 Added registrants' names to report output web/lang/lang.en | 2 ++ web/mrbs_sql.inc | 24 ++++++++++++++++++++++++ web/report.php | 25 +++++++++++++++++++++---- 3 files changed, 47 insertions(+), 4 deletions(-) commit 189b40209 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Oct 6 09:01:25 2021 +0100 Back-ported two new methods from the roles branch web/lib/MRBS/DB_mysql.php | 12 ++++++++++++ web/lib/MRBS/DB_pgsql.php | 13 +++++++++++++ 2 files changed, 25 insertions(+) commit 4643ab80d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 4 16:56:53 2021 +0100 Added server side checking of date field values web/edit_users.php | 51 +++++++++++++++++++++++++++----------------- web/lang/lang.en | 1 + 2 files changed, 33 insertions(+), 19 deletions(-) commit 923e409d0 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Oct 4 16:55:39 2021 +0100 Fixed typo in comment web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0791b3b34 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 1 20:15:23 2021 +0100 Replaced qualifier with import web/lib/MRBS/SessionHandlerDb.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 8804caef7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 1 20:09:37 2021 +0100 Fixed occasional problem with "Session object destruction failed" warning when the session has already been destroyed. web/lib/MRBS/SessionHandlerDb.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) commit 91ba9cca3 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 1 14:38:14 2021 +0100 Allowed a custom date field to be nullified web/edit_users.php | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) commit a4c155f6d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Oct 1 14:29:32 2021 +0100 Fixed uncaught exception when using custom fields of type Date in the users table. web/edit_users.php | 10 +++++++++- web/functions.inc | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) commit 24a7574b8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 30 18:08:59 2021 +0100 Added support for date custom fields in the user table. INSTALL | 2 ++ web/edit_users.php | 16 ++++++++++++++++ web/systemdefaults.inc.php | 4 ++-- 3 files changed, 20 insertions(+), 2 deletions(-) commit bcdb1e9b8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 29 13:38:09 2021 +0100 Added support for date custom fields in the user table. INSTALL | 13 +++++++------ web/edit_users.php | 8 ++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) commit 3f5a23d1d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sat Sep 25 09:31:13 2021 +0100 Expanded message on password reset to remind users to check their spam/junk folder for a password reset email. web/lang/lang.en | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit ba6dbc593 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 24 11:34:35 2021 +0100 Fixed PHP 8.1 deprecation error when using PostgreSQL and deleting bookings with email notifications enabled. web/mrbs_sql.inc | 2 ++ 1 file changed, 2 insertions(+) commit 1db314aaf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 24 10:41:56 2021 +0100 Fixed occasional uncaught TypeError exception and added type declarations web/mrbs_sql.inc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) commit 41b045928 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Sep 24 10:10:03 2021 +0100 Added type declaration web/del_entry.php | 2 +- web/edit_entry_handler.php | 2 +- web/mrbs_sql.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 731843f12 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 23 18:42:27 2021 +0100 Removed redundant global declaration web/functions_table.inc | 1 - 1 file changed, 1 deletion(-) commit 16c0f41d2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 23 14:26:26 2021 +0100 Added type declarations web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8834a9e71 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 23 14:11:37 2021 +0100 Corrected typo in comment web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit fe7513f86 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 23 10:05:49 2021 +0100 Fixed uncaught exception error if someone tries to login under the 'db' scheme by email address when their password _hash is null. web/lib/MRBS/Auth/AuthDb.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 1082333ef Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 23 09:20:51 2021 +0100 Fixed problem with misleading "Are you sure you want to delete this entry?" message being shown when deleting a series. web/lang/lang.en | 1 + web/view_entry.php | 48 ++++++++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 22 deletions(-) commit a50620723 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Sep 21 14:16:36 2021 +0100 Added display on the calendar view of how many people have registered for an event web/functions_table.inc | 19 ++++++++++++++++--- web/lang/lang.en | 2 ++ web/systemdefaults.inc.php | 7 +++++++ 3 files changed, 25 insertions(+), 3 deletions(-) commit 5c3355d65 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Sep 21 12:43:46 2021 +0100 Simplified code web/functions_table.inc | 80 ++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 43 deletions(-) commit 93f153624 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Sep 21 12:19:46 2021 +0100 Switched to using class constant. web/language.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit f7530d8dd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Sep 20 16:37:47 2021 +0100 Added type declarations web/language.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 57ec94f80 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Sep 15 19:30:50 2021 +0100 Fixed bug causing the reset link URL to contain the scheme twice when $url_base is set. See SF Support Requests #2421. web/functions.inc | 9 ++++++++- web/lib/MRBS/Auth/AuthDb.php | 3 +-- 2 files changed, 9 insertions(+), 3 deletions(-) commit 648b3c931 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Sep 14 20:54:06 2021 +0100 Fixed bug causing an incompatibility with LDAP config settings from earlier versions of MRBS. See SF Support Requests #2419. web/lib/MRBS/Auth/AuthLdap.php | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) commit d8214cb83 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 9 18:20:23 2021 +0100 Fixed problem with LDAP admin groups being case sensitive when they shouldn't be. See SF Support Requests #2406. web/lib/MRBS/Auth/AuthLdap.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 893a3abaf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 9 15:37:01 2021 +0100 Fixed undefined index notice problem. See SF Support Requests #2406 web/language.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 29a770684 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 2 12:02:38 2021 +0100 Added comment. web/functions_mail.inc | 3 +++ 1 file changed, 3 insertions(+) commit 5ea0d56f9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 2 11:57:21 2021 +0100 Corrected typo in comment web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit af8240916 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 2 11:36:21 2021 +0100 Simplified code web/language.inc | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) commit 5a7400102 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Sep 2 11:14:31 2021 +0100 Fixed bug saving an entry with custom fields when using PostgreSQL and an explicit $db_schema. See SF Support Requests #2408. web/dbsys.inc | 20 ++++++++++++++++++++ web/functions_mail.inc | 12 +++--------- web/mrbs_sql.inc | 6 +++--- 3 files changed, 26 insertions(+), 12 deletions(-) commit 6bd01a6a1 Merge: 9e3fb0dc5 c26167788 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 30 14:49:12 2021 +0100 Merge pull request #16 from meeting-room-booking-system/auth_and_session_documentation Auth and session documentation commit c26167788 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 30 14:29:48 2021 +0100 Updated documentation to reflect new class structure. AUTHENTICATION | 90 +++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 54 deletions(-) commit 4ddbb068f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 30 14:08:51 2021 +0100 Added type declarations web/lib/MRBS/Session/SessionCas.php | 11 +++--- web/lib/MRBS/Session/SessionCookie.php | 12 +++--- web/lib/MRBS/Session/SessionFactory.php | 12 +++--- web/lib/MRBS/Session/SessionHost.php | 17 +++++---- web/lib/MRBS/Session/SessionHttp.php | 13 ++++--- web/lib/MRBS/Session/SessionInterface.php | 10 +++-- web/lib/MRBS/Session/SessionIp.php | 14 ++++--- web/lib/MRBS/Session/SessionJoomla.php | 7 ++-- web/lib/MRBS/Session/SessionNt.php | 4 +- web/lib/MRBS/Session/SessionOmni.php | 36 +++++++++--------- web/lib/MRBS/Session/SessionPhp.php | 31 +++++++-------- web/lib/MRBS/Session/SessionRemoteUser.php | 32 ++++++++-------- web/lib/MRBS/Session/SessionSaml.php | 13 ++++--- web/lib/MRBS/Session/SessionWithLogin.php | 24 ++++++------ web/lib/MRBS/Session/SessionWithoutLogin.php | 6 ++- web/lib/MRBS/Session/SessionWordpress.php | 10 +++-- 16 files changed, 138 insertions(+), 114 deletions(-) commit 28b1a9e41 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 30 12:32:04 2021 +0100 Fixed previous merge and also made signatures for validateUser() match abstract method web/lib/MRBS/Auth/AuthAuthBasic.php | 2 +- web/lib/MRBS/Auth/AuthCas.php | 2 +- web/lib/MRBS/Auth/AuthConfig.php | 2 +- web/lib/MRBS/Auth/AuthCrypt.php | 2 +- web/lib/MRBS/Auth/AuthDb.php | 2 +- web/lib/MRBS/Auth/AuthDbExt.php | 2 +- web/lib/MRBS/Auth/AuthExt.php | 2 +- web/lib/MRBS/Auth/AuthImap.php | 2 +- web/lib/MRBS/Auth/AuthImapPhp.php | 2 +- web/lib/MRBS/Auth/AuthJoomla.php | 2 +- web/lib/MRBS/Auth/AuthLdap.php | 2 +- web/lib/MRBS/Auth/AuthNone.php | 2 +- web/lib/MRBS/Auth/AuthNw.php | 2 +- web/lib/MRBS/Auth/AuthPop3.php | 2 +- web/lib/MRBS/Auth/AuthSaml.php | 2 +- web/lib/MRBS/Auth/AuthWordpress.php | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) commit 87c3d5f5a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 30 12:24:18 2021 +0100 Fixed merge web/lib/MRBS/Auth/Auth.php | 18 +++++++++--------- web/lib/MRBS/Auth/AuthIdcheck.php | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) commit 005082760 Merge: 9eab4d9d1 9e3fb0dc5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 30 12:19:46 2021 +0100 Merge branch 'main' into auth_and_session_documentation # Conflicts: # web/lib/MRBS/Auth/Auth.php # web/lib/MRBS/Auth/AuthIdcheck.php commit 9e3fb0dc5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 30 12:16:29 2021 +0100 Made validateUser() an abstract method. web/lib/MRBS/Auth/Auth.php | 14 ++++++++++++++ web/lib/MRBS/Auth/AuthIdcheck.php | 19 +++++++++++++++++++ 2 files changed, 33 insertions(+) commit 9eab4d9d1 Merge: 1e7c08903 54b8b6be9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 30 12:02:35 2021 +0100 Merge branch 'main' into auth_and_session_documentation commit 54b8b6be9 Merge: 41de5559d dfcb6ccbc Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 30 12:01:35 2021 +0100 Merge branch 'main' of https://github.com/meeting-room-booking-system/mrbs-code into main commit 1e7c08903 Merge: 85505312f 41de5559d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 30 11:57:33 2021 +0100 Merge branch 'main' into auth_and_session_documentation # Conflicts: # web/lib/MRBS/Auth/AuthNone.php commit 41de5559d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 30 11:35:39 2021 +0100 Replaced references in comments to authValidateUser() by validateUser() web/lib/MRBS/Auth/AuthAuthBasic.php | 2 +- web/lib/MRBS/Auth/AuthCas.php | 2 +- web/lib/MRBS/Auth/AuthConfig.php | 2 +- web/lib/MRBS/Auth/AuthCrypt.php | 2 +- web/lib/MRBS/Auth/AuthDbExt.php | 2 +- web/lib/MRBS/Auth/AuthExt.php | 2 +- web/lib/MRBS/Auth/AuthImap.php | 2 +- web/lib/MRBS/Auth/AuthImapPhp.php | 2 +- web/lib/MRBS/Auth/AuthNw.php | 2 +- web/lib/MRBS/Auth/AuthPop3.php | 2 +- web/lib/MRBS/Auth/AuthSaml.php | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) commit 61915b5c5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 30 10:49:00 2021 +0100 Fixed error in method name web/lib/MRBS/Auth/AuthNone.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 85505312f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 30 10:45:01 2021 +0100 Added type declarations web/lib/MRBS/Auth/Auth.php | 18 ++++++------- web/lib/MRBS/Auth/AuthAuthBasic.php | 2 +- web/lib/MRBS/Auth/AuthCas.php | 8 +++--- web/lib/MRBS/Auth/AuthConfig.php | 4 +-- web/lib/MRBS/Auth/AuthCrypt.php | 2 +- web/lib/MRBS/Auth/AuthDb.php | 38 +++++++++++++-------------- web/lib/MRBS/Auth/AuthDbExt.php | 6 ++--- web/lib/MRBS/Auth/AuthExt.php | 2 +- web/lib/MRBS/Auth/AuthFactory.php | 11 ++++---- web/lib/MRBS/Auth/AuthIdcheck.php | 2 +- web/lib/MRBS/Auth/AuthImap.php | 6 ++--- web/lib/MRBS/Auth/AuthImapPhp.php | 4 +-- web/lib/MRBS/Auth/AuthJoomla.php | 10 +++---- web/lib/MRBS/Auth/AuthLdap.php | 22 ++++++++-------- web/lib/MRBS/Auth/AuthNone.php | 2 +- web/lib/MRBS/Auth/AuthNw.php | 2 +- web/lib/MRBS/Auth/AuthPop3.php | 4 +-- web/lib/MRBS/Auth/AuthSaml.php | 8 +++--- web/lib/MRBS/Auth/AuthWordpress.php | 14 +++++----- 19 files changed, 82 insertions(+), 83 deletions(-) commit dfcb6ccbc Author: jberanek <john@redux.org.uk> Date: Sat Aug 28 09:29:44 2021 +0100 Update issue templates Added MRBS version .github/ISSUE_TEMPLATE/bug_report.md | 1 + .github/ISSUE_TEMPLATE/support-request.md | 1 + 2 files changed, 2 insertions(+) commit a7fb39d61 Author: jberanek <john@redux.org.uk> Date: Fri Aug 27 14:44:02 2021 +0100 Update issue templates Added "Support request" .../ISSUE_TEMPLATE/support-request.md (new) | 25 ++++++++++++++++++ 1 file changed, 25 insertions(+) commit 9a4d860fd Author: jberanek <john@redux.org.uk> Date: Fri Aug 27 14:41:40 2021 +0100 Update issue templates .github/ISSUE_TEMPLATE/bug_report.md (new) | 38 ++++++++++++++++++ .../ISSUE_TEMPLATE/feature_request.md (new) | 20 +++++++++ 2 files changed, 58 insertions(+) commit 91bf84465 Merge: 795fad5b6 bb7aab05f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 20 14:13:46 2021 +0100 Merge pull request #14 from dertimm/patch-1 Documentation fix commit bb7aab05f Author: dertimm <dertimm@users.noreply.github.com> Date: Fri Aug 20 15:05:24 2021 +0200 Documentation fix web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 795fad5b6 Merge: 45b110998 8b6260ea5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 20 14:05:15 2021 +0100 Merge pull request #12 from meeting-room-booking-system/edit_entry_handler_back_button Edit entry handler back button commit 8b6260ea5 (origin/edit_entry_handler_back_button) Merge: dd6f1de91 45b110998 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 20 13:04:43 2021 +0100 Merge branch 'main' into edit_entry_handler_back_button commit 45b110998 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 20 13:04:06 2021 +0100 Made parameter to get_type_options() mandatory and added type declarations web/edit_area.php | 2 +- web/functions.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit d3fe7541a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 20 10:45:51 2021 +0100 Improved fix if no booking types are set. See https://github.com/meeting-room-booking-system/mrbs-code/issues/11#issuecomment-902546852 web/edit_area.php | 7 ++++--- web/edit_entry.php | 12 +++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) commit b1c3ae3ed Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 20 08:59:41 2021 +0100 Improved print layout web/Themes/classic126/styling.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 164f3dfbb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 19 16:04:48 2021 +0100 Improved print layout web/Themes/default/styling.inc | 8 ++++---- web/css/mrbs-print.css.php | 15 ++++----------- 2 files changed, 8 insertions(+), 15 deletions(-) commit 6b111d9ad Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 19 14:06:42 2021 +0100 Reverted previous commit web/functions.inc | 4 ---- 1 file changed, 4 deletions(-) commit 4b82e70e1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 19 14:04:23 2021 +0100 Fixed PHP 8.1 deprecation error web/edit_users.php | 2 +- web/functions.inc | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) commit e8b2c0ab9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 19 09:51:19 2021 +0100 Fixed bug causing English days of the week to be shown. See SF Support Requests #2374. web/language.inc | 1 + 1 file changed, 1 insertion(+) commit f9d63fd34 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 18 17:37:10 2021 +0100 Upgraded to PHPMailer Release 6.5.1 web/lib/PHPMailer/README.md | 2 +- web/lib/PHPMailer/VERSION | 2 +- .../PHPMailer/language/phpmailer.lang-ja.php | 15 ++++++------ web/lib/PHPMailer/src/PHPMailer.php | 23 +++++++++++------- web/lib/PHPMailer/src/POP3.php | 2 +- web/lib/PHPMailer/src/SMTP.php | 2 +- 6 files changed, 26 insertions(+), 20 deletions(-) commit ee5f19924 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 18 15:33:36 2021 +0100 Fixed incorrect vocab tag in Swedish translation web/lang/lang.sv | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit d559e1d93 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 18 15:07:22 2021 +0100 Updated Swedish translation. Thanks to Niclas Nilsson. web/lang/lang.sv | 186 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 143 insertions(+), 43 deletions(-) commit 3b5298dee Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 18 09:46:00 2021 +0100 Removed deprecated display widths INSTALL | 2 +- web/edit_room.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit e3c786cc6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 16 10:10:55 2021 +0100 Added configuration variables for setting hostname and HELO strings. See SF Bugs #508. web/lib/MRBS/MailQueue.php | 2 ++ web/systemdefaults.inc.php | 12 ++++++++++++ 2 files changed, 14 insertions(+) commit 5f19e2479 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Aug 14 13:40:57 2021 +0100 * Fixed typo in AUTHENTICATION. AUTHENTICATION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a02329c15 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Aug 14 13:38:43 2021 +0100 * Removed all mentions of badpw.pl - it's too bad even for explanation purposes. AUTHENTICATION | 55 +++++++---------------------------------------- badpw.pl (gone) | 29 ------------------------- 2 files changed, 8 insertions(+), 76 deletions(-) commit 6af5d847a Merge: a545dfd0d fe7f1884d Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Aug 14 13:23:15 2021 +0100 Merge branch 'main' of github.com:meeting-room-booking-system/mrbs-code commit a545dfd0d Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Aug 14 13:22:31 2021 +0100 crypt_passwd.pl - Replaced an errant TAB with spaces. crypt_passwd.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit fe7f1884d Merge: 009a48bda 33fbb04c1 Author: jberanek <jberanek@users.sourceforge.net> Date: Sat Aug 14 13:09:21 2021 +0100 Merge pull request #7 from being-peace/patch-1 Update lang.de/ Series / Periods commit 009a48bda Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 13 20:32:16 2021 +0100 Upgraded to the latest code of PHPMailer in the master branch (ie post 6.5.0). Fixes an uncaught exception if the imap and mbstring extensions are not installed. See SF Support Requests 2400. web/lib/PHPMailer/README.md | 15 +- web/lib/PHPMailer/SECURITY.md | 5 + web/lib/PHPMailer/VERSION | 2 +- web/lib/PHPMailer/composer.json | 12 +- .../PHPMailer/language/phpmailer.lang-ar.php | 3 +- .../PHPMailer/language/phpmailer.lang-nl.php | 7 +- web/lib/PHPMailer/phpunit.xml.dist (gone) | 35 ---- web/lib/PHPMailer/src/Exception.php | 2 +- web/lib/PHPMailer/src/PHPMailer.php | 152 ++++++++++++----- web/lib/PHPMailer/src/POP3.php | 2 +- web/lib/PHPMailer/src/SMTP.php | 3 +- 11 files changed, 150 insertions(+), 88 deletions(-) commit dd6f1de91 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 13 17:26:44 2021 +0100 Fixed problem with time selects not showing the correct value web/js/edit_entry.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3fb9fd62b Merge: fbfbee308 21a4e74ef Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 13 16:45:58 2021 +0100 Merge branch 'main' into edit_entry_handler_back_button commit 21a4e74ef Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 13 16:32:22 2021 +0100 Changed formatting to be consistent with the rest of MRBS web/mrbs_sql.inc | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) commit e7065db56 Merge: 01eb4cd56 07051f791 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 13 16:24:51 2021 +0100 Merge pull request #8 from being-peace/start_and_end_time Improve conflict display (start and end time, no date if only one day) commit 01eb4cd56 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 13 15:49:38 2021 +0100 Fixed bug when no $booking_types is unset. See https://github.com/meeting-room-booking-system/mrbs-code/issues/11. web/edit_area.php | 15 +++++++++------ web/edit_area_handler.php | 5 +++++ 2 files changed, 14 insertions(+), 6 deletions(-) commit 07051f791 Author: Tobias Polzin <58709258+being-peace@users.noreply.github.com> Date: Fri Aug 13 11:05:47 2021 +0200 don´t double escape periods web/mrbs_sql.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 4cbaaf202 Author: Tobias Polzin <58709258+being-peace@users.noreply.github.com> Date: Fri Aug 13 10:59:58 2021 +0200 correction for start_date and htmlspecialchars for timestr web/mrbs_sql.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit fbfbee308 Merge: 952308592 c2a5bf77e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 12 15:00:07 2021 +0100 Merge branch 'main' into edit_entry_handler_back_button commit c2a5bf77e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 12 14:59:43 2021 +0100 Fixed potential bug when $force_resolution is set. web/functions_table.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 952308592 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 12 14:26:04 2021 +0100 Fixed problem with previous fix. web/js/edit_entry.js.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) commit ec464af56 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 12 12:33:30 2021 +0100 Fixed problem with incorrect rooms being displayed for the selected area. web/js/edit_entry.js.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) commit 1be8cc5d8 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 12 12:20:20 2021 +0100 Tweaked warn warning message web/js/edit_entry.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bb00d192e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Aug 12 12:19:08 2021 +0100 Restructured web/js/edit_entry.js.php | 175 +++++++++++++++++++------------------ 1 file changed, 90 insertions(+), 85 deletions(-) commit dee21d471 Author: Tobias Polzin <58709258+being-peace@users.noreply.github.com> Date: Tue Aug 10 20:47:42 2021 +0200 unfortunately one date is necessary for conflicts with series web/mrbs_sql.inc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit e193c135d Author: Tobias Polzin <58709258+being-peace@users.noreply.github.com> Date: Mon Aug 9 23:13:41 2021 +0200 start and end time, no date if only one day web/mrbs_sql.inc | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) commit f2afddbf6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 6 18:49:23 2021 +0100 Fixed CSS web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c437bb883 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 6 18:44:33 2021 +0100 Added a sanity check web/js/edit_entry.js.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) commit e8c0ab6af Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 6 18:33:24 2021 +0100 Got datalists working web/js/edit_entry.js.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit 74e8ec7eb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 6 18:05:55 2021 +0100 Fixed repopulating the form for select elements with multiple values web/js/edit_entry.js.php | 117 +++++++++++++++++++++++-------------- 1 file changed, 74 insertions(+), 43 deletions(-) commit d177760eb Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 6 17:00:07 2021 +0100 Only fill the form fields if we've come from edit_entry_handler.php. web/edit_entry.php | 8 ++++ web/edit_entry_handler.php | 1 + web/js/edit_entry.js.php | 75 +++++++++++++++++++----------------- 3 files changed, 49 insertions(+), 35 deletions(-) commit 5fe2a7a48 Merge: 84e9763c5 dad76ceb1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 6 16:22:28 2021 +0100 Merge branch 'main' into edit_entry_handler_back_button commit dad76ceb1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 6 16:21:47 2021 +0100 Fixed repeated colon problem web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 181016a3a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 6 16:12:53 2021 +0100 Better fix for preventing selection of multiple rooms. This fix does not destroy the Ajax policy feedback. See SF Support Requests #2396. web/edit_entry_handler.php | 8 -------- web/mrbs_sql.inc | 22 +++++++++++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) commit 9948048d7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 6 15:38:45 2021 +0100 Fixed a bug in earlier commit. See SF Support Requests #2396. web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 84e9763c5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 6 15:31:18 2021 +0100 Don't change the CSRF token web/js/edit_entry.js.php | 7 +++++++ 1 file changed, 7 insertions(+) commit 9a6229d71 Merge: 3464f909c cc2e8767f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 6 15:10:54 2021 +0100 Merge branch 'main' into edit_entry_handler_back_button commit cc2e8767f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 6 15:06:39 2021 +0100 Added type declarations web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cbf1f49ba Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Aug 6 14:59:06 2021 +0100 Fixed problem allowing a booking for multiple rooms to be made when it shouldn't be. See SF Support Requests #2396. web/edit_entry_handler.php | 8 ++++++++ web/lang/lang.en | 1 + 2 files changed, 9 insertions(+) commit 3464f909c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 4 18:29:42 2021 +0100 Fixed restoring values for a checkbox group web/js/edit_entry.js.php | 53 ++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 20 deletions(-) commit 440b1674e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 4 17:47:03 2021 +0100 First attempt at a back button web/js/edit_entry.js.php | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) commit bb6ac1097 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 4 12:27:22 2021 +0100 Changed form web/edit_entry_handler.php | 79 ++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 40 deletions(-) commit e3119d528 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 4 10:35:01 2021 +0100 Added type and return type declarations web/language.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit feeb60e8b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Aug 4 10:24:47 2021 +0100 Fixed problem with display of type when the field is private. See SF Support Requests #2394 web/functions_view.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) commit 33fbb04c1 Author: Tobias Polzin <58709258+being-peace@users.noreply.github.com> Date: Tue Aug 3 15:00:36 2021 +0200 Typo web/lang/lang.de | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e2976e47e Author: Polzin <58709258+being-peace@users.noreply.github.com> Date: Tue Aug 3 14:55:18 2021 +0200 Update lang.de/ Series / Periods The previous translation used the German "Serie" for series and periods, which was confusing. We use "Serienbuchung" for series (as it is a Room-_Booking_-System, therefore not "Serientermin") and "Zeitblock" for periods. Any comment @Stachelritter ? web/lang/lang.de | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) commit 996d6b563 Merge: a2f68439a 556c8003c Author: jberanek <jberanek@users.sourceforge.net> Date: Mon Aug 2 21:54:46 2021 +0100 Merge pull request #2 from being-peace/docker Docker development environment for simple testing commit 556c8003c Author: jberanek <jberanek@users.sourceforge.net> Date: Mon Aug 2 21:53:50 2021 +0100 Update HOWTO.md Fixed typo in Docker HOWTO. docker_app/HOWTO.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a2f68439a Merge: 773a4a19d 19f3663af Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 2 19:13:47 2021 +0100 Merge pull request #4 from being-peace/repetition_skip_hide edit_entry shows repetition and skipping only if necessary commit 773a4a19d Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 2 18:57:09 2021 +0100 Added return tye declarations web/functions_table.inc | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) commit 19f3663af Author: Tobias Polzin <58709258+being-peace@users.noreply.github.com> Date: Mon Aug 2 19:45:12 2021 +0200 edit_entry shows repetition and skipping only if necessary web/js/edit_entry.js.php | 4 ++++ 1 file changed, 4 insertions(+) commit a5be6bf31 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 2 18:33:39 2021 +0100 Replaced qualifier with import web/lib/MRBS/Form/FieldTimeWithUnits.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit ed1ec15cf Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 2 18:32:37 2021 +0100 Removed assert now that we can use nullable types web/lib/MRBS/Form/FieldTimeWithUnits.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) commit 9423c7191 Merge: bf8f9e500 a6ea557d9 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Mon Aug 2 17:14:54 2021 +0100 Merge pull request #3 from being-peace/booking_admin_level New option $min_booking_admin_level commit a6ea557d9 Author: Tobias Polzin <58709258+being-peace@users.noreply.github.com> Date: Mon Aug 2 15:04:41 2021 +0200 New option $min_booking_admin_level, e.g. to allow all users to edit all bookings for some settings web/mrbs_auth.inc | 4 +++- web/systemdefaults.inc.php | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) commit ec658a62c Author: Tobias Polzin <58709258+being-peace@users.noreply.github.com> Date: Sun Aug 1 16:24:59 2021 +0200 Docker development environment for simple testing docker_app/HOWTO.md (new) | 59 +++++++++++++++++++++++++++ docker_app/docker-compose.yml (new) | 38 +++++++++++++++++ docker_app/php/Dockerfile (new) | 7 ++++ docker_app/php/config.inc.php (new) | 11 +++++ 4 files changed, 115 insertions(+) commit bf8f9e500 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 30 19:31:27 2021 +0100 Fixed PHP 8.1 deprecation error web/edit_users.php | 14 +++++++++----- web/language.inc | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) commit 6f23c5b56 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 30 18:54:21 2021 +0100 Replaced qualifier with import web/lib/MRBS/DBStatement.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit cf280108b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 30 18:41:29 2021 +0100 Replaced qualifiers with imports web/lib/MRBS/Auth/AuthDb.php | 94 +++++++++++++++++++--------------- 1 file changed, 54 insertions(+), 40 deletions(-) commit cf62e97dd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 30 12:35:31 2021 +0100 Fixed problem with E_DEPRECATED notice being thrown when generating a report and running PHP 8.1 and PostgreSQL where the timestamp column can hold a float. web/language.inc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) commit 6854667f7 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 30 11:06:59 2021 +0100 Replaced qualifiers with imports web/lib/MRBS/Form/Form.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) commit 2dc0f89ab Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 30 11:00:28 2021 +0100 Added return types web/lib/MRBS/Form/Form.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) commit 1b860636b Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 30 10:54:20 2021 +0100 Fixed occasional problem with CSRF tokens web/lib/MRBS/Form/Form.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) commit 0922b22dd Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 30 10:00:50 2021 +0100 Replaced qualifiers with imports web/lib/MRBS/Form/Form.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit 6c012539a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Thu Jul 29 14:59:27 2021 +0100 Fixed PHP 8.1 deprecation error web/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2c69565fe Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 28 18:31:32 2021 +0100 Added function return types web/init.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit fb44895e5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 28 18:27:55 2021 +0100 Replaced qualifier with an import web/init.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit d5e39224c Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 28 18:16:44 2021 +0100 Added configuration variable $auth['saml']['disable_mrbs_session_init'] to allow MRBS session initialisation to be disabled when using SAML. See SF Support Requests #2390. web/init.inc | 7 +++++++ web/systemdefaults.inc.php | 3 +++ 2 files changed, 10 insertions(+) commit dddbbb89a Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 28 14:57:21 2021 +0100 Fixed PHP 8.1 deprecation error and added some more return types web/lib/MRBS/Columns.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) commit 28b4ca402 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 28 12:51:46 2021 +0100 Fixed formatting web/lang/lang.de | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) commit 258db31e2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 28 12:27:20 2021 +0100 Avoided using strftime() if IntlDateFormatter is available as strftime() is deprecated in PHP 8.1. web/del_entry.php | 6 +- web/edit_entry.php | 12 +- web/functions_table.inc | 12 +- web/language.inc | 238 ++++++++++++++++++++++++++++++++++- web/systemdefaults.inc.php | 4 + 5 files changed, 251 insertions(+), 21 deletions(-) commit 842ef0dc2 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 28 10:19:11 2021 +0100 Fixed PHP 8.1 deprecation error web/edit_users.php | 4 ++++ 1 file changed, 4 insertions(+) commit 46c99715b Merge: 67457634f 5e030ccf5 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Tue Jul 27 20:30:52 2021 +0100 Merge pull request #1 from Stachelritter/update-german-lang Updated german translation... commit 5e030ccf5 Author: Stachelritter <88002233+Stachelritter@users.noreply.github.com> Date: Tue Jul 27 20:29:58 2021 +0200 Updated german translation web/lang/lang.de | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) commit 67457634f Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Sun Jul 25 17:27:35 2021 +0100 Trivial commit for testing UPGRADE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 352326c30 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 23 16:44:34 2021 +0100 Fixed PHP 8.1 deprecation error web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1f872bfb1 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 23 13:25:40 2021 +0100 Fixed PHP 8.1 deprecation notice. web/lib/MRBS/Session/SessionWithLogin.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 86c8ee95e Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 23 13:08:51 2021 +0100 Suppressed deprecation notices in SessionHandlerDb.php until we get to requiring a minimum of PHP 8 when union types are supported. web/lib/MRBS/SessionHandlerDb.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) commit 3ad648fc6 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 23 12:27:15 2021 +0100 Fixed deprecated notices when running under 8.1. Note that the return types for gc() and read() cannot be specified because union types are not available until PHP 8. web/lib/MRBS/SessionHandlerDb.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 0dcd16bde Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Fri Jul 23 11:49:15 2021 +0100 Updated minimum PHP version to 7.2. (We need at least 7.0 to fix the deprecated notices about missing return types when implementing an interface when running PHP 8.1) INSTALL | 2 +- README | 2 +- web/defaultincludes.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit dbeeef29d Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jul 23 09:22:19 2021 +0100 Updated ChangeLog to a format produced by 'git log' ChangeLog | 107385 +++++++++++++++++++++++++++++-------------------- 1 file changed, 64851 insertions(+), 42534 deletions(-) commit 2b760169a Author: John Beranek <john@redux.org.uk> Date: Thu Jul 22 19:54:36 2021 +0100 Fixed .gitattributes syntax. .gitattributes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit b5c38e116 Merge: 1a324c4e1 51b27d823 Author: John Beranek <john@redux.org.uk> Date: Thu Jul 22 19:46:35 2021 +0100 Merge branch 'main' of github.com:meeting-room-booking-system/mrbs-code commit 1a324c4e1 Author: John Beranek <john@redux.org.uk> Date: Thu Jul 22 19:46:19 2021 +0100 Added .gitattributes file to tell Git how to handle line-endings .gitattributes (new) | 5 +++++ 1 file changed, 5 insertions(+) commit 51b27d823 Author: campbell-m <87438215+campbell-m@users.noreply.github.com> Date: Wed Jul 21 15:25:07 2021 +0100 Trivial commit - testing UPGRADE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3c8995ee7 Author: John Beranek <john@redux.org.uk> Date: Tue Jul 20 21:28:44 2021 +0100 Updated version code to support git. web/systemdefaults.inc.php | 12 ++++++------ web/version.inc | 11 ++++++++--- 2 files changed, 14 insertions(+), 9 deletions(-) commit b979b08ec Author: John Beranek <john@redux.org.uk> Date: Tue Jul 20 21:03:45 2021 +0100 Added a .gitignore .gitignore (new) | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit c1878777d Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jul 20 20:36:58 2021 +0100 Added tag mrbs-1_9_4 for changeset 24f15ef43bfd commit dad1486c3 (tag: mrbs-1_9_4) Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jul 20 20:36:22 2021 +0100 Updated ChangeLog and NEWS for release of MRBS 1.9.4 ChangeLog | 1520 ++++++++++++++++++++++++++++++++++++++++++++++++++- NEWS | 56 ++ 2 files changed, 1575 insertions(+), 1 deletion(-) commit d27bc6c26 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 20 15:33:07 2021 +0100 Added additional information about the change in config file structure from MRBS 1.4.7 and earlier. See SF Support Requests #2380. UPGRADE | 3 +++ 1 file changed, 3 insertions(+) commit 0fcff41cd Merge: 23c43f532 ca65b29fc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 18 14:34:36 2021 +0100 Merge commit ca65b29fc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 18 14:29:36 2021 +0100 Updated README README | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) commit 91a038a14 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 18 14:19:13 2021 +0100 Removed convert_db_to_utf8.php as it is (a) rarely necessary now and (b) would need work to get it to work with the latest code. Updated UPGRADE to include advice to run the script _BEFORE_ upgrading to the latest version of MRBS. INSTALL | 8 - UPGRADE | 51 ++-- convert_db_to_utf8.php (gone) | 416 -------------------------------- 3 files changed, 18 insertions(+), 457 deletions(-) commit 23c43f532 Merge: 102d0931d c9a79c9e7 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jul 14 19:10:46 2021 +0100 Merged with default commit c9a79c9e7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 12 19:55:43 2021 +0100 Removed redundant code web/lib/MRBS/SessionHandlerDb.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 998e778b0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 12 19:54:03 2021 +0100 Made parameter names correspond to the interface. web/lib/MRBS/SessionHandlerDb.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) commit e2e4bff7d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 12 18:58:56 2021 +0100 Fixed dynamic call of a static method web/functions_mail.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) commit 3a1fcb3fe Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 12 17:59:04 2021 +0100 Removed redundant function (now a method in Auth.php) web/functions.inc | 37 ------------------------------------- 1 file changed, 37 deletions(-) commit c8701ece6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 6 20:49:27 2021 +0100 Reverted last change web/edit_entry.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) commit f8ff2a0b2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 6 18:25:02 2021 +0100 Fixed problem with $datalist_options not being recognised when the column is an integer. See SF Support Requests #2379. web/edit_entry.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit 102d0931d Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jul 5 10:11:27 2021 +0100 * Updated version number for release. web/version_num.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 602582d47 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 2 19:10:56 2021 +0100 Simplified code web/functions_ical.inc | 6 +----- web/language.inc | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) commit 5b6ffa0be Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 2 19:04:06 2021 +0100 Simplified code web/language.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 390a76029 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 2 18:57:52 2021 +0100 Simplified code web/language.inc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) commit f921e0375 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 2 16:00:06 2021 +0100 Added more LDAP debugging web/lib/MRBS/Auth/AuthLdap.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 6632b1661 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jun 30 17:50:02 2021 +0100 Downgraded error message level from WARNING to NOTICE web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit fccaa1222 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jun 30 17:32:35 2021 +0100 Fixed bug. See SF Support Requests #2375 web/functions_ical.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 8281b8d37 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 26 18:29:22 2021 +0100 Added "MRBS" to debug strings web/language.inc | 2 +- web/lib/MRBS/Auth/AuthLdap.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 1ef254bab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 26 18:11:39 2021 +0100 Fixed bug when running from the CLI web/language.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit b70626747 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 26 18:07:21 2021 +0100 Restructured web/language.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 4eea82113 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 26 17:45:25 2021 +0100 Added language debugging capability controlled by a new config variable $language_debug web/language.inc | 38 +++++++++++++++++++++++++++++++++++- web/systemdefaults.inc.php | 4 ++++ 2 files changed, 41 insertions(+), 1 deletion(-) commit 5b346bdbd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 26 14:34:49 2021 +0100 Improved handling of locales and locale setting. See SF Support Requests #2372 web/language.inc | 65 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 20 deletions(-) commit cd4262bd0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 24 17:38:48 2021 +0100 Added type hinting web/lib/MRBS/Locale.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0374292a7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 21 08:47:43 2021 +0100 Expanded debugging information. See SF Support Requests #2363. web/lib/MRBS/Auth/AuthLdap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 42116c8be Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 21 08:31:47 2021 +0100 Introduced a higher level of LDAP debugging that will additionally output an entry's attribute names and values. See SF Support Requests #2363. web/lib/MRBS/Auth/AuthLdap.php | 28 +++++++++++++++++++++++----- web/systemdefaults.inc.php | 4 ++++ 2 files changed, 27 insertions(+), 5 deletions(-) commit 0cda5c0fe Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 17 07:32:24 2021 +0100 Added comment. web/systemdefaults.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 71893df6b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 17 07:21:25 2021 +0100 Added more debug info web/lib/MRBS/Auth/AuthLdap.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) commit 8bf7893bc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 11 18:24:48 2021 +0100 Fixed bug causing the user's display name not to be exported when the user is editable. web/js/datatables.js.php | 70 ++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 25 deletions(-) commit 9a14e5e77 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 11 18:22:47 2021 +0100 Upgradsed to latest release of DataTables .../css/buttons.bootstrap.min.css (gone) | 1 - .../css/buttons.bootstrap4.min.css (gone) | 1 - .../css/buttons.dataTables.min.css (gone) | 1 - .../css/buttons.foundation.min.css (gone) | 1 - .../css/buttons.jqueryui.min.css (gone) | 1 - .../css/buttons.semanticui.min.css (gone) | 1 - .../Buttons-1.6.5/js/buttons.flash.js (gone) | 1458 ----------- .../js/buttons.flash.min.js (gone) | 39 - .../js/buttons.print.min.js (gone) | 9 - .../js/dataTables.buttons.min.js (gone) | 44 - .../Buttons-1.6.5/swf/flashExport.swf (gone) | Bin 64603 -> 0 bytes .../css/buttons.bootstrap.css | 2 +- .../css/buttons.bootstrap.min.css (new) | 1 + .../css/buttons.bootstrap4.css | 2 +- .../css/buttons.bootstrap4.min.css (new) | 1 + .../css/buttons.bootstrap5.css (new) | 195 ++ .../css/buttons.bootstrap5.min.css (new) | 1 + .../css/buttons.bulma.css (new) | 195 ++ .../css/buttons.bulma.min.css (new) | 1 + .../css/buttons.dataTables.css | 14 +- .../css/buttons.dataTables.min.css (new) | 1 + .../css/buttons.foundation.css | 2 +- .../css/buttons.foundation.min.css (new) | 1 + .../css/buttons.jqueryui.css | 2 +- .../css/buttons.jqueryui.min.css (new) | 1 + .../css/buttons.semanticui.css | 3 +- .../css/buttons.semanticui.min.css (new) | 1 + .../css/common.scss | 0 .../css/mixins.scss | 0 .../js/buttons.bootstrap.js | 0 .../js/buttons.bootstrap.min.js | 0 .../js/buttons.bootstrap4.js | 0 .../js/buttons.bootstrap4.min.js | 0 .../js/buttons.bootstrap5.js (new) | 68 + .../js/buttons.bootstrap5.min.js (new) | 6 + .../Buttons-1.7.1/js/buttons.bulma.js (new) | 79 + .../js/buttons.bulma.min.js (new) | 6 + .../js/buttons.colVis.js | 0 .../js/buttons.colVis.min.js | 0 .../js/buttons.dataTables.js (new) | 38 + .../js/buttons.dataTables.min.js (new) | 5 + .../js/buttons.foundation.js | 0 .../js/buttons.foundation.min.js | 0 .../js/buttons.html5.js | 2 +- .../js/buttons.html5.min.js | 2 +- .../js/buttons.jqueryui.js | 0 .../js/buttons.jqueryui.min.js | 0 .../js/buttons.print.js | 11 + .../js/buttons.print.min.js (new) | 9 + .../js/buttons.semanticui.js | 0 .../js/buttons.semanticui.min.js | 0 .../js/dataTables.buttons.js | 278 +- .../js/dataTables.buttons.min.js (new) | 43 + .../css/colReorder.bootstrap.min.css (gone) | 1 - .../css/colReorder.bootstrap4.min.css (gone) | 1 - .../css/colReorder.dataTables.min.css (gone) | 1 - .../css/colReorder.foundation.min.css (gone) | 1 - .../css/colReorder.jqueryui.min.css (gone) | 1 - .../css/colReorder.semanticui.min.css (gone) | 1 - .../js/colReorder.semanicui.js (gone) | 0 .../js/dataTables.colReorder.min.js (gone) | 40 - .../css/colReorder.bootstrap.css | 0 .../css/colReorder.bootstrap.min.css (new) | 1 + .../css/colReorder.bootstrap4.css | 0 .../css/colReorder.bootstrap4.min.css (new) | 1 + .../css/colReorder.bootstrap5.css (new) | 11 + .../css/colReorder.bootstrap5.min.css (new) | 1 + .../css/colReorder.bulma.css (new) | 11 + .../css/colReorder.bulma.min.css (new) | 1 + .../css/colReorder.dataTables.css | 0 .../css/colReorder.dataTables.min.css (new) | 1 + .../css/colReorder.foundation.css | 0 .../css/colReorder.foundation.min.css (new) | 1 + .../css/colReorder.jqueryui.css | 0 .../css/colReorder.jqueryui.min.css (new) | 1 + .../css/colReorder.semanticui.css | 0 .../css/colReorder.semanticui.min.css (new) | 1 + .../js/colReorder.bootstrap.js | 0 .../js/colReorder.bootstrap.min.js | 0 .../js/colReorder.bootstrap4.js | 0 .../js/colReorder.bootstrap4.min.js | 0 .../js/colReorder.bootstrap5.js (new) | 38 + .../js/colReorder.bootstrap5.min.js (new) | 5 + .../js/colReorder.bulma.js (new) | 38 + .../js/colReorder.bulma.min.js (new) | 5 + .../js/colReorder.dataTables.js | 0 .../js/colReorder.dataTables.min.js (new) | 5 + .../js/colReorder.foundation.js | 0 .../js/colReorder.foundation.min.js | 0 .../js/colReorder.jqueryui.js | 0 .../js/colReorder.jqueryui.min.js | 0 .../js/colReorder.semanticui.js | 0 .../js/colReorder.semanticui.min.js | 0 .../js/dataTables.colReorder.js | 16 +- .../js/dataTables.colReorder.min.js (new) | 40 + .../css/dataTables.bootstrap.min.css (gone) | 1 - .../css/dataTables.bootstrap4.min.css (gone) | 1 - .../css/dataTables.foundation.min.css (gone) | 1 - .../css/dataTables.jqueryui.min.css (gone) | 1 - .../css/dataTables.semanticui.min.css (gone) | 1 - .../css/jquery.dataTables.min.css (gone) | 1 - .../js/jquery.dataTables.min.js (gone) | 184 -- .../css/dataTables.bootstrap.css | 21 +- .../css/dataTables.bootstrap.min.css (new) | 1 + .../css/dataTables.bootstrap4.css | 15 +- .../css/dataTables.bootstrap4.min.css (new) | 1 + .../css/dataTables.bootstrap5.css (new) | 224 ++ .../css/dataTables.bootstrap5.min.css (new) | 5 + .../css/dataTables.bulma.css (new) | 155 ++ .../css/dataTables.bulma.min.css (new) | 3 + .../css/dataTables.dataTables.css (new) | 470 ++++ .../css/dataTables.dataTables.min.css (new) | 1 + .../css/dataTables.foundation.css | 4 +- .../css/dataTables.foundation.min.css (new) | 1 + .../css/dataTables.jqueryui.css | 4 +- .../css/dataTables.jqueryui.min.css (new) | 1 + .../css/dataTables.semanticui.css | 7 +- .../css/dataTables.semanticui.min.css (new) | 1 + .../css/jquery.dataTables.css | 8 +- .../css/jquery.dataTables.min.css (new) | 1 + .../images/sort_asc.png | Bin .../images/sort_asc_disabled.png} | Bin .../images/sort_both.png | Bin .../images/sort_desc.png | Bin .../images/sort_desc_disabled.png} | Bin .../js/dataTables.bootstrap.js | 0 .../js/dataTables.bootstrap.min.js | 0 .../js/dataTables.bootstrap4.js | 0 .../js/dataTables.bootstrap4.min.js | 0 .../js/dataTables.bootstrap5.js (new) | 184 ++ .../js/dataTables.bootstrap5.min.js (new) | 14 + .../js/dataTables.bulma.js (new) | 199 ++ .../js/dataTables.bulma.min.js (new) | 15 + .../js/dataTables.dataTables.js (new) | 37 + .../js/dataTables.dataTables.min.js (new) | 5 + .../js/dataTables.foundation.js | 0 .../js/dataTables.foundation.min.js | 0 .../js/dataTables.jqueryui.js | 18 +- .../js/dataTables.jqueryui.min.js | 2 +- .../js/dataTables.semanticui.js | 0 .../js/dataTables.semanticui.min.js | 0 .../js/jquery.dataTables.js | 82 +- .../js/jquery.dataTables.min.js (new) | 184 ++ .../js/dataTables.fixedColumns.min.js (gone) | 49 - .../js/fixedColumns.semanicui.js (gone) | 0 .../css/fixedColumns.bootstrap.css | 0 .../css/fixedColumns.bootstrap.min.css | 0 .../css/fixedColumns.bootstrap4.css | 0 .../css/fixedColumns.bootstrap4.min.css | 0 .../css/fixedColumns.bootstrap5.css (new) | 73 + .../fixedColumns.bootstrap5.min.css (new) | 1 + .../css/fixedColumns.bulma.css} | 0 .../css/fixedColumns.bulma.min.css} | 0 .../css/fixedColumns.dataTables.css | 0 .../css/fixedColumns.dataTables.min.css | 0 .../css/fixedColumns.foundation.css (new) | 32 + .../fixedColumns.foundation.min.css (new) | 1 + .../css/fixedColumns.jqueryui.css | 0 .../css/fixedColumns.jqueryui.min.css | 0 .../css/fixedColumns.semanticui.css | 0 .../css/fixedColumns.semanticui.min.css | 0 .../js/dataTables.fixedColumns.js | 23 +- .../js/dataTables.fixedColumns.min.js (new) | 46 + .../js/fixedColumns.bootstrap.js | 0 .../js/fixedColumns.bootstrap.min.js | 0 .../js/fixedColumns.bootstrap4.js | 0 .../js/fixedColumns.bootstrap4.min.js | 0 .../js/fixedColumns.bootstrap5.js (new) | 38 + .../js/fixedColumns.bootstrap5.min.js (new) | 5 + .../js/fixedColumns.bulma.js (new) | 38 + .../js/fixedColumns.bulma.min.js (new) | 5 + .../js/fixedColumns.dataTables.js | 0 .../js/fixedColumns.dataTables.min.js (new) | 5 + .../js/fixedColumns.foundation.js | 0 .../js/fixedColumns.foundation.min.js | 0 .../js/fixedColumns.jqueryui.js | 0 .../js/fixedColumns.jqueryui.min.js | 0 .../js/fixedColumns.semanticui.js | 0 .../js/fixedColumns.semanticui.min.js | 0 web/jquery/datatables/datatables.css | 32 +- web/jquery/datatables/datatables.js | 2156 +++------------- web/jquery/datatables/datatables.min.css | 10 +- web/jquery/datatables/datatables.min.js | 617 +++-- .../datatables/language/Afrikaans.lang | 2 +- web/jquery/datatables/language/Albanian.lang | 2 +- web/jquery/datatables/language/Amharic.lang | 2 +- web/jquery/datatables/language/Arabic.lang | 25 +- web/jquery/datatables/language/Armenian.lang | 2 +- .../datatables/language/Azerbaijan.lang | 2 +- web/jquery/datatables/language/Bangla.lang | 3 +- web/jquery/datatables/language/Basque.lang | 3 +- .../datatables/language/Belarusian.lang | 19 +- .../datatables/language/Bulgarian.lang | 3 +- web/jquery/datatables/language/Catalan.lang | 3 +- .../language/Chinese-traditional.lang | 24 +- web/jquery/datatables/language/Chinese.lang | 3 +- web/jquery/datatables/language/Croatian.lang | 2 +- web/jquery/datatables/language/Czech.lang | 2 +- web/jquery/datatables/language/Danish.lang | 3 +- web/jquery/datatables/language/Dutch.lang | 2 +- web/jquery/datatables/language/English.lang | 153 +- .../datatables/language/Esperanto.lang | 2 +- web/jquery/datatables/language/Estonian.lang | 2 +- web/jquery/datatables/language/Filipino.lang | 3 +- web/jquery/datatables/language/Finnish.lang | 2 +- web/jquery/datatables/language/French.lang | 2 +- web/jquery/datatables/language/Galician.lang | 3 +- web/jquery/datatables/language/Georgian.lang | 2 +- web/jquery/datatables/language/German.lang | 3 +- web/jquery/datatables/language/Greek.lang | 3 +- web/jquery/datatables/language/Gujarati.lang | 2 +- web/jquery/datatables/language/Hebrew.lang | 3 +- web/jquery/datatables/language/Hindi.lang | 3 +- .../datatables/language/Hungarian.lang | 3 +- .../datatables/language/Icelandic.lang | 2 +- .../language/Indonesian-Alternative.lang | 3 +- .../datatables/language/Indonesian.lang | 98 +- web/jquery/datatables/language/Irish.lang | 3 +- web/jquery/datatables/language/Italian.lang | 2 +- web/jquery/datatables/language/Japanese.lang | 2 +- web/jquery/datatables/language/Kannada.lang | 2 +- web/jquery/datatables/language/Kazakh.lang | 2 +- web/jquery/datatables/language/Khmer.lang | 2 +- web/jquery/datatables/language/Korean.lang | 2 +- web/jquery/datatables/language/Kurdish.lang | 3 +- web/jquery/datatables/language/Kyrgyz.lang | 2 +- web/jquery/datatables/language/Lao.lang | 2 +- web/jquery/datatables/language/Latvian.lang | 2 +- .../datatables/language/Lithuanian.lang | 3 +- .../datatables/language/Macedonian.lang | 3 +- web/jquery/datatables/language/Malay.lang | 2 +- .../datatables/language/Mongolian.lang | 2 +- web/jquery/datatables/language/Nepali.lang | 3 +- .../language/Norwegian-Bokmal.lang | 3 +- .../language/Norwegian-Nynorsk.lang | 3 +- web/jquery/datatables/language/Pashto.lang | 2 +- web/jquery/datatables/language/Persian.lang | 2 +- web/jquery/datatables/language/Polish.lang | 2 +- .../language/Portuguese-Brasil.lang | 2 +- .../datatables/language/Portuguese.lang | 13 +- web/jquery/datatables/language/Punjabi.lang | 34 +- web/jquery/datatables/language/Romanian.lang | 3 +- .../datatables/language/Rumantsch.lang | 3 +- web/jquery/datatables/language/Russian.lang | 2 +- web/jquery/datatables/language/Serbian.lang | 2 +- .../datatables/language/Serbian_latin.lang | 2 +- web/jquery/datatables/language/Sinhala.lang | 2 +- web/jquery/datatables/language/Slovak.lang | 2 +- .../datatables/language/Slovenian.lang | 2 +- web/jquery/datatables/language/Spanish.lang | 3 +- web/jquery/datatables/language/Swahili.lang | 2 +- web/jquery/datatables/language/Swedish.lang | 2 +- web/jquery/datatables/language/Tajik.lang | 2 +- web/jquery/datatables/language/Tamil.lang | 2 +- web/jquery/datatables/language/Thai.lang | 2 +- web/jquery/datatables/language/Turkish.lang | 3 +- .../datatables/language/Ukrainian.lang | 3 +- web/jquery/datatables/language/Urdu.lang | 3 +- web/jquery/datatables/language/Uzbek.lang | 2 +- .../datatables/language/Vietnamese.lang | 3 +- web/jquery/datatables/language/Welsh.lang | 2 +- web/jquery/datatables/language/telugu.lang | 2 +- 262 files changed, 3863 insertions(+), 4408 deletions(-) commit 1e2abbcd7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 7 16:09:39 2021 +0100 Fixed bug when working in multisite mode web/mrbs_sql.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) commit c4cc213a5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 7 15:44:07 2021 +0100 Removed deprecated integer display width tables.my.sql | 62 +++++++++++++++++++------------------- web/upgrade/11/mysql.sql | 4 +-- web/upgrade/13/mysql.sql | 4 +-- web/upgrade/16/mysql.sql | 2 +- web/upgrade/19/mysql.sql | 2 +- web/upgrade/20/mysql.sql | 4 +-- web/upgrade/22/mysql.sql | 4 +-- web/upgrade/27/mysql.sql | 2 +- web/upgrade/3/mysql.sql | 4 +-- web/upgrade/30/mysql.sql | 10 +++--- web/upgrade/38/mysql.sql | 8 ++--- web/upgrade/4/mysql.sql | 6 ++-- web/upgrade/43/mysql.sql | 2 +- web/upgrade/65/mysql.sql | 2 +- web/upgrade/66/mysql.sql | 10 +++--- web/upgrade/67/mysql.sql | 4 +-- web/upgrade/81/mysql.sql | 4 +-- web/upgrade/81/post.inc | 2 +- 18 files changed, 68 insertions(+), 68 deletions(-) commit 1b72191e1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 7 14:59:15 2021 +0100 Tweak to code formatting web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 107db02fb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 7 11:50:17 2021 +0100 Added HTML escaping. See SF Bugs #505. web/mrbs_sql.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 2dd917a70 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 6 17:18:45 2021 +0100 Updated timezone definitions .../zoneinfo-outlook/Africa/Abidjan.ics | 5 +- web/tzurl/zoneinfo-outlook/Africa/Accra.ics | 5 +- .../zoneinfo-outlook/Africa/Addis_Ababa.ics | 11 +- .../zoneinfo-outlook/Africa/Algiers.ics | 5 +- web/tzurl/zoneinfo-outlook/Africa/Asmara.ics | 11 +- web/tzurl/zoneinfo-outlook/Africa/Bamako.ics | 11 +- web/tzurl/zoneinfo-outlook/Africa/Bangui.ics | 11 +- web/tzurl/zoneinfo-outlook/Africa/Banjul.ics | 11 +- web/tzurl/zoneinfo-outlook/Africa/Bissau.ics | 5 +- .../zoneinfo-outlook/Africa/Blantyre.ics | 11 +- .../zoneinfo-outlook/Africa/Brazzaville.ics | 11 +- .../zoneinfo-outlook/Africa/Bujumbura.ics | 11 +- web/tzurl/zoneinfo-outlook/Africa/Cairo.ics | 5 +- .../zoneinfo-outlook/Africa/Casablanca.ics | 18 +- web/tzurl/zoneinfo-outlook/Africa/Ceuta.ics | 7 +- .../zoneinfo-outlook/Africa/Conakry.ics | 11 +- web/tzurl/zoneinfo-outlook/Africa/Dakar.ics | 11 +- .../Africa/Dar_es_Salaam.ics | 11 +- .../zoneinfo-outlook/Africa/Djibouti.ics | 11 +- web/tzurl/zoneinfo-outlook/Africa/Douala.ics | 11 +- .../zoneinfo-outlook/Africa/El_Aaiun.ics | 18 +- .../zoneinfo-outlook/Africa/Freetown.ics | 11 +- .../zoneinfo-outlook/Africa/Gaborone.ics | 11 +- web/tzurl/zoneinfo-outlook/Africa/Harare.ics | 11 +- .../zoneinfo-outlook/Africa/Johannesburg.ics | 5 +- web/tzurl/zoneinfo-outlook/Africa/Juba.ics | 5 +- .../zoneinfo-outlook/Africa/Kampala.ics | 11 +- .../zoneinfo-outlook/Africa/Khartoum.ics | 5 +- web/tzurl/zoneinfo-outlook/Africa/Kigali.ics | 11 +- .../zoneinfo-outlook/Africa/Kinshasa.ics | 11 +- web/tzurl/zoneinfo-outlook/Africa/Lagos.ics | 5 +- .../zoneinfo-outlook/Africa/Libreville.ics | 11 +- web/tzurl/zoneinfo-outlook/Africa/Lome.ics | 11 +- web/tzurl/zoneinfo-outlook/Africa/Luanda.ics | 11 +- .../zoneinfo-outlook/Africa/Lubumbashi.ics | 11 +- web/tzurl/zoneinfo-outlook/Africa/Lusaka.ics | 11 +- web/tzurl/zoneinfo-outlook/Africa/Malabo.ics | 11 +- web/tzurl/zoneinfo-outlook/Africa/Maputo.ics | 5 +- web/tzurl/zoneinfo-outlook/Africa/Maseru.ics | 11 +- .../zoneinfo-outlook/Africa/Mbabane.ics | 11 +- .../zoneinfo-outlook/Africa/Mogadishu.ics | 11 +- .../zoneinfo-outlook/Africa/Monrovia.ics | 5 +- .../zoneinfo-outlook/Africa/Nairobi.ics | 5 +- .../zoneinfo-outlook/Africa/Ndjamena.ics | 5 +- web/tzurl/zoneinfo-outlook/Africa/Niamey.ics | 11 +- .../zoneinfo-outlook/Africa/Nouakchott.ics | 11 +- .../zoneinfo-outlook/Africa/Ouagadougou.ics | 11 +- .../zoneinfo-outlook/Africa/Porto-Novo.ics | 11 +- .../zoneinfo-outlook/Africa/Sao_Tome.ics | 9 +- .../zoneinfo-outlook/Africa/Tripoli.ics | 5 +- web/tzurl/zoneinfo-outlook/Africa/Tunis.ics | 5 +- .../zoneinfo-outlook/Africa/Windhoek.ics | 5 +- web/tzurl/zoneinfo-outlook/America/Adak.ics | 7 +- .../zoneinfo-outlook/America/Anchorage.ics | 7 +- .../zoneinfo-outlook/America/Anguilla.ics | 11 +- .../zoneinfo-outlook/America/Antigua.ics | 11 +- .../zoneinfo-outlook/America/Araguaina.ics | 5 +- .../America/Argentina/Buenos_Aires.ics | 5 +- .../America/Argentina/Catamarca.ics | 5 +- .../America/Argentina/Cordoba.ics | 5 +- .../America/Argentina/Jujuy.ics | 5 +- .../America/Argentina/La_Rioja.ics | 5 +- .../America/Argentina/Mendoza.ics | 5 +- .../America/Argentina/Rio_Gallegos.ics | 5 +- .../America/Argentina/Salta.ics | 5 +- .../America/Argentina/San_Juan.ics | 5 +- .../America/Argentina/San_Luis.ics | 5 +- .../America/Argentina/Tucuman.ics | 5 +- .../America/Argentina/Ushuaia.ics | 5 +- web/tzurl/zoneinfo-outlook/America/Aruba.ics | 11 +- .../zoneinfo-outlook/America/Asuncion.ics | 7 +- .../zoneinfo-outlook/America/Atikokan.ics | 5 +- web/tzurl/zoneinfo-outlook/America/Bahia.ics | 5 +- .../America/Bahia_Banderas.ics | 7 +- .../zoneinfo-outlook/America/Barbados.ics | 5 +- web/tzurl/zoneinfo-outlook/America/Belem.ics | 5 +- .../zoneinfo-outlook/America/Belize.ics | 5 +- .../America/Blanc-Sablon.ics | 5 +- .../zoneinfo-outlook/America/Boa_Vista.ics | 5 +- .../zoneinfo-outlook/America/Bogota.ics | 5 +- web/tzurl/zoneinfo-outlook/America/Boise.ics | 7 +- .../America/Cambridge_Bay.ics | 7 +- .../America/Campo_Grande.ics | 15 +- .../zoneinfo-outlook/America/Cancun.ics | 5 +- .../zoneinfo-outlook/America/Caracas.ics | 5 +- .../zoneinfo-outlook/America/Cayenne.ics | 5 +- .../zoneinfo-outlook/America/Cayman.ics | 11 +- .../zoneinfo-outlook/America/Chicago.ics | 7 +- .../zoneinfo-outlook/America/Chihuahua.ics | 7 +- .../zoneinfo-outlook/America/Costa_Rica.ics | 5 +- .../zoneinfo-outlook/America/Creston.ics | 5 +- .../zoneinfo-outlook/America/Cuiaba.ics | 15 +- .../zoneinfo-outlook/America/Curacao.ics | 5 +- .../America/Danmarkshavn.ics | 5 +- .../zoneinfo-outlook/America/Dawson.ics | 17 +- .../America/Dawson_Creek.ics | 5 +- .../zoneinfo-outlook/America/Denver.ics | 7 +- .../zoneinfo-outlook/America/Detroit.ics | 7 +- .../zoneinfo-outlook/America/Dominica.ics | 11 +- .../zoneinfo-outlook/America/Edmonton.ics | 7 +- .../zoneinfo-outlook/America/Eirunepe.ics | 5 +- .../zoneinfo-outlook/America/Fort_Nelson.ics | 5 +- .../zoneinfo-outlook/America/Fortaleza.ics | 5 +- .../zoneinfo-outlook/America/Glace_Bay.ics | 7 +- .../zoneinfo-outlook/America/Godthab.ics | 13 +- .../zoneinfo-outlook/America/Goose_Bay.ics | 7 +- .../zoneinfo-outlook/America/Grand_Turk.ics | 7 +- .../zoneinfo-outlook/America/Grenada.ics | 11 +- .../zoneinfo-outlook/America/Guadeloupe.ics | 11 +- .../zoneinfo-outlook/America/Guatemala.ics | 5 +- .../zoneinfo-outlook/America/Guayaquil.ics | 5 +- .../zoneinfo-outlook/America/Guyana.ics | 5 +- .../zoneinfo-outlook/America/Halifax.ics | 7 +- .../zoneinfo-outlook/America/Havana.ics | 7 +- .../zoneinfo-outlook/America/Hermosillo.ics | 5 +- .../America/Indiana/Indianapolis.ics | 7 +- .../America/Indiana/Knox.ics | 7 +- .../America/Indiana/Marengo.ics | 7 +- .../America/Indiana/Petersburg.ics | 7 +- .../America/Indiana/Tell_City.ics | 7 +- .../America/Indiana/Vevay.ics | 7 +- .../America/Indiana/Vincennes.ics | 7 +- .../America/Indiana/Winamac.ics | 7 +- .../zoneinfo-outlook/America/Inuvik.ics | 7 +- .../zoneinfo-outlook/America/Iqaluit.ics | 7 +- .../zoneinfo-outlook/America/Jamaica.ics | 5 +- .../zoneinfo-outlook/America/Juneau.ics | 7 +- .../America/Kentucky/Louisville.ics | 7 +- .../America/Kentucky/Monticello.ics | 7 +- .../zoneinfo-outlook/America/Kralendijk.ics | 11 +- .../zoneinfo-outlook/America/La_Paz.ics | 5 +- web/tzurl/zoneinfo-outlook/America/Lima.ics | 5 +- .../zoneinfo-outlook/America/Los_Angeles.ics | 7 +- .../America/Lower_Princes.ics | 11 +- .../zoneinfo-outlook/America/Maceio.ics | 5 +- .../zoneinfo-outlook/America/Managua.ics | 5 +- .../zoneinfo-outlook/America/Manaus.ics | 5 +- .../zoneinfo-outlook/America/Marigot.ics | 11 +- .../zoneinfo-outlook/America/Martinique.ics | 5 +- .../zoneinfo-outlook/America/Matamoros.ics | 7 +- .../zoneinfo-outlook/America/Mazatlan.ics | 7 +- .../zoneinfo-outlook/America/Menominee.ics | 7 +- .../zoneinfo-outlook/America/Merida.ics | 7 +- .../zoneinfo-outlook/America/Metlakatla.ics | 19 +- .../zoneinfo-outlook/America/Mexico_City.ics | 7 +- .../zoneinfo-outlook/America/Miquelon.ics | 7 +- .../zoneinfo-outlook/America/Moncton.ics | 7 +- .../zoneinfo-outlook/America/Monterrey.ics | 7 +- .../zoneinfo-outlook/America/Montevideo.ics | 5 +- .../zoneinfo-outlook/America/Montserrat.ics | 11 +- .../zoneinfo-outlook/America/Nassau.ics | 7 +- .../zoneinfo-outlook/America/New_York.ics | 7 +- .../zoneinfo-outlook/America/Nipigon.ics | 7 +- web/tzurl/zoneinfo-outlook/America/Nome.ics | 7 +- .../zoneinfo-outlook/America/Noronha.ics | 5 +- .../America/North_Dakota/Beulah.ics | 7 +- .../America/North_Dakota/Center.ics | 7 +- .../America/North_Dakota/New_Salem.ics | 7 +- .../zoneinfo-outlook/America/Ojinaga.ics | 7 +- .../zoneinfo-outlook/America/Panama.ics | 5 +- .../zoneinfo-outlook/America/Pangnirtung.ics | 7 +- .../zoneinfo-outlook/America/Paramaribo.ics | 5 +- .../zoneinfo-outlook/America/Phoenix.ics | 5 +- .../America/Port-au-Prince.ics | 7 +- .../America/Port_of_Spain.ics | 5 +- .../zoneinfo-outlook/America/Porto_Velho.ics | 5 +- .../zoneinfo-outlook/America/Puerto_Rico.ics | 5 +- .../America/Punta_Arenas.ics | 5 +- .../zoneinfo-outlook/America/Rainy_River.ics | 7 +- .../America/Rankin_Inlet.ics | 7 +- .../zoneinfo-outlook/America/Recife.ics | 5 +- .../zoneinfo-outlook/America/Regina.ics | 5 +- .../zoneinfo-outlook/America/Resolute.ics | 7 +- .../zoneinfo-outlook/America/Rio_Branco.ics | 5 +- .../zoneinfo-outlook/America/Santarem.ics | 5 +- .../zoneinfo-outlook/America/Santiago.ics | 15 +- .../America/Santo_Domingo.ics | 5 +- .../zoneinfo-outlook/America/Sao_Paulo.ics | 15 +- .../America/Scoresbysund.ics | 7 +- web/tzurl/zoneinfo-outlook/America/Sitka.ics | 7 +- .../America/St_Barthelemy.ics | 11 +- .../zoneinfo-outlook/America/St_Johns.ics | 7 +- .../zoneinfo-outlook/America/St_Kitts.ics | 11 +- .../zoneinfo-outlook/America/St_Lucia.ics | 11 +- .../zoneinfo-outlook/America/St_Thomas.ics | 11 +- .../zoneinfo-outlook/America/St_Vincent.ics | 11 +- .../America/Swift_Current.ics | 5 +- .../zoneinfo-outlook/America/Tegucigalpa.ics | 5 +- web/tzurl/zoneinfo-outlook/America/Thule.ics | 7 +- .../zoneinfo-outlook/America/Thunder_Bay.ics | 7 +- .../zoneinfo-outlook/America/Tijuana.ics | 7 +- .../zoneinfo-outlook/America/Toronto.ics | 7 +- .../zoneinfo-outlook/America/Tortola.ics | 11 +- .../zoneinfo-outlook/America/Vancouver.ics | 7 +- .../zoneinfo-outlook/America/Whitehorse.ics | 17 +- .../zoneinfo-outlook/America/Winnipeg.ics | 7 +- .../zoneinfo-outlook/America/Yakutat.ics | 7 +- .../zoneinfo-outlook/America/Yellowknife.ics | 7 +- .../zoneinfo-outlook/Antarctica/Casey.ics | 5 +- .../zoneinfo-outlook/Antarctica/Davis.ics | 5 +- .../Antarctica/DumontDUrville.ics | 5 +- .../Antarctica/Macquarie.ics | 17 +- .../zoneinfo-outlook/Antarctica/Mawson.ics | 5 +- .../zoneinfo-outlook/Antarctica/McMurdo.ics | 13 +- .../zoneinfo-outlook/Antarctica/Palmer.ics | 5 +- .../zoneinfo-outlook/Antarctica/Rothera.ics | 5 +- .../zoneinfo-outlook/Antarctica/Syowa.ics | 5 +- .../zoneinfo-outlook/Antarctica/Troll.ics | 7 +- .../zoneinfo-outlook/Antarctica/Vostok.ics | 5 +- .../zoneinfo-outlook/Arctic/Longyearbyen.ics | 13 +- web/tzurl/zoneinfo-outlook/Asia/Aden.ics | 11 +- web/tzurl/zoneinfo-outlook/Asia/Almaty.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Amman.ics | 11 +- web/tzurl/zoneinfo-outlook/Asia/Anadyr.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Aqtau.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Aqtobe.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Ashgabat.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Atyrau.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Baghdad.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Bahrain.ics | 11 +- web/tzurl/zoneinfo-outlook/Asia/Baku.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Bangkok.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Barnaul.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Beirut.ics | 7 +- web/tzurl/zoneinfo-outlook/Asia/Bishkek.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Brunei.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Chita.ics | 5 +- .../zoneinfo-outlook/Asia/Choibalsan.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Colombo.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Damascus.ics | 7 +- web/tzurl/zoneinfo-outlook/Asia/Dhaka.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Dili.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Dubai.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Dushanbe.ics | 5 +- .../zoneinfo-outlook/Asia/Famagusta.ics | 19 +- web/tzurl/zoneinfo-outlook/Asia/Gaza.ics | 19 +- web/tzurl/zoneinfo-outlook/Asia/Hebron.ics | 19 +- .../zoneinfo-outlook/Asia/Ho_Chi_Minh.ics | 5 +- .../zoneinfo-outlook/Asia/Hong_Kong.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Hovd.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Irkutsk.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Istanbul.ics | 11 +- web/tzurl/zoneinfo-outlook/Asia/Jakarta.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Jayapura.ics | 5 +- .../zoneinfo-outlook/Asia/Jerusalem.ics | 7 +- web/tzurl/zoneinfo-outlook/Asia/Kabul.ics | 5 +- .../zoneinfo-outlook/Asia/Kamchatka.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Karachi.ics | 5 +- .../zoneinfo-outlook/Asia/Kathmandu.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Khandyga.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Kolkata.ics | 5 +- .../zoneinfo-outlook/Asia/Krasnoyarsk.ics | 5 +- .../zoneinfo-outlook/Asia/Kuala_Lumpur.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Kuching.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Kuwait.ics | 11 +- web/tzurl/zoneinfo-outlook/Asia/Macau.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Magadan.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Makassar.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Manila.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Muscat.ics | 11 +- web/tzurl/zoneinfo-outlook/Asia/Nicosia.ics | 7 +- .../zoneinfo-outlook/Asia/Novokuznetsk.ics | 5 +- .../zoneinfo-outlook/Asia/Novosibirsk.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Omsk.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Oral.ics | 5 +- .../zoneinfo-outlook/Asia/Phnom_Penh.ics | 11 +- .../zoneinfo-outlook/Asia/Pontianak.ics | 5 +- .../zoneinfo-outlook/Asia/Pyongyang.ics | 7 +- web/tzurl/zoneinfo-outlook/Asia/Qatar.ics | 5 +- .../zoneinfo-outlook/Asia/Qyzylorda.ics | 9 +- web/tzurl/zoneinfo-outlook/Asia/Riyadh.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Sakhalin.ics | 5 +- .../zoneinfo-outlook/Asia/Samarkand.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Seoul.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Shanghai.ics | 5 +- .../zoneinfo-outlook/Asia/Singapore.ics | 5 +- .../zoneinfo-outlook/Asia/Srednekolymsk.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Taipei.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Tashkent.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Tbilisi.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Tehran.ics | 7 +- web/tzurl/zoneinfo-outlook/Asia/Thimphu.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Tokyo.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Tomsk.ics | 5 +- .../zoneinfo-outlook/Asia/Ulaanbaatar.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Urumqi.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Ust-Nera.ics | 5 +- .../zoneinfo-outlook/Asia/Vientiane.ics | 11 +- .../zoneinfo-outlook/Asia/Vladivostok.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Yakutsk.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Yangon.ics | 5 +- .../zoneinfo-outlook/Asia/Yekaterinburg.ics | 5 +- web/tzurl/zoneinfo-outlook/Asia/Yerevan.ics | 5 +- .../zoneinfo-outlook/Atlantic/Azores.ics | 7 +- .../zoneinfo-outlook/Atlantic/Bermuda.ics | 7 +- .../zoneinfo-outlook/Atlantic/Canary.ics | 7 +- .../zoneinfo-outlook/Atlantic/Cape_Verde.ics | 5 +- .../zoneinfo-outlook/Atlantic/Faroe.ics | 7 +- .../zoneinfo-outlook/Atlantic/Madeira.ics | 7 +- .../zoneinfo-outlook/Atlantic/Reykjavik.ics | 5 +- .../Atlantic/South_Georgia.ics | 5 +- .../zoneinfo-outlook/Atlantic/St_Helena.ics | 11 +- .../zoneinfo-outlook/Atlantic/Stanley.ics | 5 +- .../zoneinfo-outlook/Australia/Adelaide.ics | 7 +- .../zoneinfo-outlook/Australia/Brisbane.ics | 5 +- .../Australia/Broken_Hill.ics | 7 +- .../zoneinfo-outlook/Australia/Currie.ics | 7 +- .../zoneinfo-outlook/Australia/Darwin.ics | 5 +- .../zoneinfo-outlook/Australia/Eucla.ics | 5 +- .../zoneinfo-outlook/Australia/Hobart.ics | 7 +- .../zoneinfo-outlook/Australia/Lindeman.ics | 5 +- .../zoneinfo-outlook/Australia/Lord_Howe.ics | 7 +- .../zoneinfo-outlook/Australia/Melbourne.ics | 7 +- .../zoneinfo-outlook/Australia/Perth.ics | 5 +- .../zoneinfo-outlook/Australia/Sydney.ics | 7 +- .../zoneinfo-outlook/Europe/Amsterdam.ics | 7 +- .../zoneinfo-outlook/Europe/Andorra.ics | 7 +- .../zoneinfo-outlook/Europe/Astrakhan.ics | 5 +- web/tzurl/zoneinfo-outlook/Europe/Athens.ics | 7 +- .../zoneinfo-outlook/Europe/Belgrade.ics | 7 +- web/tzurl/zoneinfo-outlook/Europe/Berlin.ics | 7 +- .../zoneinfo-outlook/Europe/Bratislava.ics | 13 +- .../zoneinfo-outlook/Europe/Brussels.ics | 7 +- .../zoneinfo-outlook/Europe/Bucharest.ics | 7 +- .../zoneinfo-outlook/Europe/Budapest.ics | 7 +- .../zoneinfo-outlook/Europe/Busingen.ics | 13 +- .../zoneinfo-outlook/Europe/Chisinau.ics | 7 +- .../zoneinfo-outlook/Europe/Copenhagen.ics | 7 +- web/tzurl/zoneinfo-outlook/Europe/Dublin.ics | 7 +- .../zoneinfo-outlook/Europe/Gibraltar.ics | 7 +- .../zoneinfo-outlook/Europe/Guernsey.ics | 13 +- .../zoneinfo-outlook/Europe/Helsinki.ics | 7 +- .../zoneinfo-outlook/Europe/Isle_of_Man.ics | 13 +- .../zoneinfo-outlook/Europe/Istanbul.ics | 5 +- web/tzurl/zoneinfo-outlook/Europe/Jersey.ics | 13 +- .../zoneinfo-outlook/Europe/Kaliningrad.ics | 5 +- web/tzurl/zoneinfo-outlook/Europe/Kiev.ics | 7 +- web/tzurl/zoneinfo-outlook/Europe/Kirov.ics | 5 +- web/tzurl/zoneinfo-outlook/Europe/Lisbon.ics | 7 +- .../zoneinfo-outlook/Europe/Ljubljana.ics | 13 +- web/tzurl/zoneinfo-outlook/Europe/London.ics | 7 +- .../zoneinfo-outlook/Europe/Luxembourg.ics | 7 +- web/tzurl/zoneinfo-outlook/Europe/Madrid.ics | 7 +- web/tzurl/zoneinfo-outlook/Europe/Malta.ics | 7 +- .../zoneinfo-outlook/Europe/Mariehamn.ics | 13 +- web/tzurl/zoneinfo-outlook/Europe/Minsk.ics | 5 +- web/tzurl/zoneinfo-outlook/Europe/Monaco.ics | 7 +- web/tzurl/zoneinfo-outlook/Europe/Moscow.ics | 5 +- .../zoneinfo-outlook/Europe/Nicosia.ics | 13 +- web/tzurl/zoneinfo-outlook/Europe/Oslo.ics | 7 +- web/tzurl/zoneinfo-outlook/Europe/Paris.ics | 7 +- .../zoneinfo-outlook/Europe/Podgorica.ics | 13 +- web/tzurl/zoneinfo-outlook/Europe/Prague.ics | 7 +- web/tzurl/zoneinfo-outlook/Europe/Riga.ics | 7 +- web/tzurl/zoneinfo-outlook/Europe/Rome.ics | 7 +- web/tzurl/zoneinfo-outlook/Europe/Samara.ics | 5 +- .../zoneinfo-outlook/Europe/San_Marino.ics | 13 +- .../zoneinfo-outlook/Europe/Sarajevo.ics | 13 +- .../zoneinfo-outlook/Europe/Saratov.ics | 5 +- .../zoneinfo-outlook/Europe/Simferopol.ics | 5 +- web/tzurl/zoneinfo-outlook/Europe/Skopje.ics | 13 +- web/tzurl/zoneinfo-outlook/Europe/Sofia.ics | 7 +- .../zoneinfo-outlook/Europe/Stockholm.ics | 7 +- .../zoneinfo-outlook/Europe/Tallinn.ics | 7 +- web/tzurl/zoneinfo-outlook/Europe/Tirane.ics | 7 +- .../zoneinfo-outlook/Europe/Ulyanovsk.ics | 5 +- .../zoneinfo-outlook/Europe/Uzhgorod.ics | 7 +- web/tzurl/zoneinfo-outlook/Europe/Vaduz.ics | 13 +- .../zoneinfo-outlook/Europe/Vatican.ics | 13 +- web/tzurl/zoneinfo-outlook/Europe/Vienna.ics | 7 +- .../zoneinfo-outlook/Europe/Vilnius.ics | 7 +- .../zoneinfo-outlook/Europe/Volgograd.ics | 9 +- web/tzurl/zoneinfo-outlook/Europe/Warsaw.ics | 7 +- web/tzurl/zoneinfo-outlook/Europe/Zagreb.ics | 13 +- .../zoneinfo-outlook/Europe/Zaporozhye.ics | 7 +- web/tzurl/zoneinfo-outlook/Europe/Zurich.ics | 7 +- .../zoneinfo-outlook/Indian/Antananarivo.ics | 11 +- web/tzurl/zoneinfo-outlook/Indian/Chagos.ics | 5 +- .../zoneinfo-outlook/Indian/Christmas.ics | 5 +- web/tzurl/zoneinfo-outlook/Indian/Cocos.ics | 5 +- web/tzurl/zoneinfo-outlook/Indian/Comoro.ics | 11 +- .../zoneinfo-outlook/Indian/Kerguelen.ics | 5 +- web/tzurl/zoneinfo-outlook/Indian/Mahe.ics | 5 +- .../zoneinfo-outlook/Indian/Maldives.ics | 5 +- .../zoneinfo-outlook/Indian/Mauritius.ics | 5 +- .../zoneinfo-outlook/Indian/Mayotte.ics | 11 +- .../zoneinfo-outlook/Indian/Reunion.ics | 5 +- web/tzurl/zoneinfo-outlook/Pacific/Apia.ics | 7 +- .../zoneinfo-outlook/Pacific/Auckland.ics | 7 +- .../Pacific/Bougainville.ics | 5 +- .../zoneinfo-outlook/Pacific/Chatham.ics | 7 +- web/tzurl/zoneinfo-outlook/Pacific/Chuuk.ics | 5 +- .../zoneinfo-outlook/Pacific/Easter.ics | 15 +- web/tzurl/zoneinfo-outlook/Pacific/Efate.ics | 5 +- .../zoneinfo-outlook/Pacific/Enderbury.ics | 5 +- .../zoneinfo-outlook/Pacific/Fakaofo.ics | 5 +- web/tzurl/zoneinfo-outlook/Pacific/Fiji.ics | 19 +- .../zoneinfo-outlook/Pacific/Funafuti.ics | 5 +- .../zoneinfo-outlook/Pacific/Galapagos.ics | 5 +- .../zoneinfo-outlook/Pacific/Gambier.ics | 5 +- .../zoneinfo-outlook/Pacific/Guadalcanal.ics | 5 +- web/tzurl/zoneinfo-outlook/Pacific/Guam.ics | 5 +- .../zoneinfo-outlook/Pacific/Honolulu.ics | 5 +- .../zoneinfo-outlook/Pacific/Kiritimati.ics | 5 +- .../zoneinfo-outlook/Pacific/Kosrae.ics | 5 +- .../zoneinfo-outlook/Pacific/Kwajalein.ics | 5 +- .../zoneinfo-outlook/Pacific/Majuro.ics | 5 +- .../zoneinfo-outlook/Pacific/Marquesas.ics | 5 +- .../zoneinfo-outlook/Pacific/Midway.ics | 11 +- web/tzurl/zoneinfo-outlook/Pacific/Nauru.ics | 5 +- web/tzurl/zoneinfo-outlook/Pacific/Niue.ics | 5 +- .../zoneinfo-outlook/Pacific/Norfolk.ics | 17 +- .../zoneinfo-outlook/Pacific/Noumea.ics | 5 +- .../zoneinfo-outlook/Pacific/Pago_Pago.ics | 5 +- web/tzurl/zoneinfo-outlook/Pacific/Palau.ics | 5 +- .../zoneinfo-outlook/Pacific/Pitcairn.ics | 5 +- .../zoneinfo-outlook/Pacific/Pohnpei.ics | 5 +- .../Pacific/Port_Moresby.ics | 5 +- .../zoneinfo-outlook/Pacific/Rarotonga.ics | 5 +- .../zoneinfo-outlook/Pacific/Saipan.ics | 11 +- .../zoneinfo-outlook/Pacific/Tahiti.ics | 5 +- .../zoneinfo-outlook/Pacific/Tarawa.ics | 5 +- .../zoneinfo-outlook/Pacific/Tongatapu.ics | 5 +- web/tzurl/zoneinfo-outlook/Pacific/Wake.ics | 5 +- .../zoneinfo-outlook/Pacific/Wallis.ics | 5 +- web/tzurl/zoneinfo/Africa/Abidjan.ics | 7 +- web/tzurl/zoneinfo/Africa/Accra.ics | 59 +- web/tzurl/zoneinfo/Africa/Addis_Ababa.ics | 22 +- web/tzurl/zoneinfo/Africa/Algiers.ics | 50 +- web/tzurl/zoneinfo/Africa/Asmara.ics | 22 +- web/tzurl/zoneinfo/Africa/Bamako.ics | 13 +- web/tzurl/zoneinfo/Africa/Bangui.ics | 13 +- web/tzurl/zoneinfo/Africa/Banjul.ics | 13 +- web/tzurl/zoneinfo/Africa/Bissau.ics | 12 +- web/tzurl/zoneinfo/Africa/Blantyre.ics | 13 +- web/tzurl/zoneinfo/Africa/Brazzaville.ics | 13 +- web/tzurl/zoneinfo/Africa/Bujumbura.ics | 13 +- web/tzurl/zoneinfo/Africa/Cairo.ics | 209 +++--- web/tzurl/zoneinfo/Africa/Casablanca.ics | 222 ++++-- web/tzurl/zoneinfo/Africa/Ceuta.ics | 87 ++- web/tzurl/zoneinfo/Africa/Conakry.ics | 13 +- web/tzurl/zoneinfo/Africa/Dakar.ics | 13 +- web/tzurl/zoneinfo/Africa/Dar_es_Salaam.ics | 22 +- web/tzurl/zoneinfo/Africa/Djibouti.ics | 22 +- web/tzurl/zoneinfo/Africa/Douala.ics | 13 +- web/tzurl/zoneinfo/Africa/El_Aaiun.ics | 238 +++++-- web/tzurl/zoneinfo/Africa/Freetown.ics | 13 +- web/tzurl/zoneinfo/Africa/Gaborone.ics | 13 +- web/tzurl/zoneinfo/Africa/Harare.ics | 13 +- web/tzurl/zoneinfo/Africa/Johannesburg.ics | 20 +- web/tzurl/zoneinfo/Africa/Juba.ics | 53 +- web/tzurl/zoneinfo/Africa/Kampala.ics | 22 +- web/tzurl/zoneinfo/Africa/Khartoum.ics | 60 +- web/tzurl/zoneinfo/Africa/Kigali.ics | 13 +- web/tzurl/zoneinfo/Africa/Kinshasa.ics | 13 +- web/tzurl/zoneinfo/Africa/Lagos.ics | 7 +- web/tzurl/zoneinfo/Africa/Libreville.ics | 13 +- web/tzurl/zoneinfo/Africa/Lome.ics | 13 +- web/tzurl/zoneinfo/Africa/Luanda.ics | 13 +- web/tzurl/zoneinfo/Africa/Lubumbashi.ics | 13 +- web/tzurl/zoneinfo/Africa/Lusaka.ics | 13 +- web/tzurl/zoneinfo/Africa/Malabo.ics | 13 +- web/tzurl/zoneinfo/Africa/Maputo.ics | 7 +- web/tzurl/zoneinfo/Africa/Maseru.ics | 26 +- web/tzurl/zoneinfo/Africa/Mbabane.ics | 26 +- web/tzurl/zoneinfo/Africa/Mogadishu.ics | 22 +- web/tzurl/zoneinfo/Africa/Monrovia.ics | 13 +- web/tzurl/zoneinfo/Africa/Nairobi.ics | 16 +- web/tzurl/zoneinfo/Africa/Ndjamena.ics | 13 +- web/tzurl/zoneinfo/Africa/Niamey.ics | 13 +- web/tzurl/zoneinfo/Africa/Nouakchott.ics | 13 +- web/tzurl/zoneinfo/Africa/Ouagadougou.ics | 13 +- web/tzurl/zoneinfo/Africa/Porto-Novo.ics | 13 +- web/tzurl/zoneinfo/Africa/Sao_Tome.ics | 21 +- web/tzurl/zoneinfo/Africa/Tripoli.ics | 61 +- web/tzurl/zoneinfo/Africa/Tunis.ics | 55 +- web/tzurl/zoneinfo/Africa/Windhoek.ics | 82 +-- web/tzurl/zoneinfo/America/Adak.ics | 173 ++--- web/tzurl/zoneinfo/America/Anchorage.ics | 172 ++--- web/tzurl/zoneinfo/America/Anguilla.ics | 13 +- web/tzurl/zoneinfo/America/Antigua.ics | 13 +- web/tzurl/zoneinfo/America/Araguaina.ics | 100 ++- .../America/Argentina/Buenos_Aires.ics | 130 ++-- .../zoneinfo/America/Argentina/Catamarca.ics | 132 ++-- .../zoneinfo/America/Argentina/Cordoba.ics | 140 ++-- .../zoneinfo/America/Argentina/Jujuy.ics | 119 ++-- .../zoneinfo/America/Argentina/La_Rioja.ics | 131 ++-- .../zoneinfo/America/Argentina/Mendoza.ics | 123 ++-- .../America/Argentina/Rio_Gallegos.ics | 122 ++-- .../zoneinfo/America/Argentina/Salta.ics | 132 ++-- .../zoneinfo/America/Argentina/San_Juan.ics | 131 ++-- .../zoneinfo/America/Argentina/San_Luis.ics | 120 ++-- .../zoneinfo/America/Argentina/Tucuman.ics | 140 ++-- .../zoneinfo/America/Argentina/Ushuaia.ics | 122 ++-- web/tzurl/zoneinfo/America/Aruba.ics | 16 +- web/tzurl/zoneinfo/America/Asuncion.ics | 196 +++--- web/tzurl/zoneinfo/America/Atikokan.ics | 24 +- web/tzurl/zoneinfo/America/Bahia.ics | 115 +++- .../zoneinfo/America/Bahia_Banderas.ics | 107 ++- web/tzurl/zoneinfo/America/Barbados.ics | 35 +- web/tzurl/zoneinfo/America/Belem.ics | 69 +- web/tzurl/zoneinfo/America/Belize.ics | 69 +- web/tzurl/zoneinfo/America/Blanc-Sablon.ics | 26 +- web/tzurl/zoneinfo/America/Boa_Vista.ics | 70 +- web/tzurl/zoneinfo/America/Bogota.ics | 16 +- web/tzurl/zoneinfo/America/Boise.ics | 167 ++--- web/tzurl/zoneinfo/America/Cambridge_Bay.ics | 142 ++-- web/tzurl/zoneinfo/America/Campo_Grande.ics | 195 +++--- web/tzurl/zoneinfo/America/Cancun.ics | 89 ++- web/tzurl/zoneinfo/America/Caracas.ics | 16 +- web/tzurl/zoneinfo/America/Cayenne.ics | 10 +- web/tzurl/zoneinfo/America/Cayman.ics | 16 +- web/tzurl/zoneinfo/America/Chicago.ics | 297 +++----- web/tzurl/zoneinfo/America/Chihuahua.ics | 82 ++- web/tzurl/zoneinfo/America/Costa_Rica.ics | 36 +- web/tzurl/zoneinfo/America/Creston.ics | 13 +- web/tzurl/zoneinfo/America/Cuiaba.ics | 203 +++--- web/tzurl/zoneinfo/America/Curacao.ics | 10 +- web/tzurl/zoneinfo/America/Danmarkshavn.ics | 54 +- web/tzurl/zoneinfo/America/Dawson.ics | 131 ++-- web/tzurl/zoneinfo/America/Dawson_Creek.ics | 93 +-- web/tzurl/zoneinfo/America/Denver.ics | 184 ++--- web/tzurl/zoneinfo/America/Detroit.ics | 155 ++--- web/tzurl/zoneinfo/America/Dominica.ics | 13 +- web/tzurl/zoneinfo/America/Edmonton.ics | 167 ++--- web/tzurl/zoneinfo/America/Eirunepe.ics | 74 +- web/tzurl/zoneinfo/America/El_Salvador.ics | 17 +- web/tzurl/zoneinfo/America/Fort_Nelson.ics | 201 ++---- web/tzurl/zoneinfo/America/Fortaleza.ics | 81 ++- web/tzurl/zoneinfo/America/Glace_Bay.ics | 138 ++-- web/tzurl/zoneinfo/America/Godthab.ics | 61 +- web/tzurl/zoneinfo/America/Goose_Bay.ics | 307 +++------ web/tzurl/zoneinfo/America/Grand_Turk.ics | 151 ++--- web/tzurl/zoneinfo/America/Grenada.ics | 13 +- web/tzurl/zoneinfo/America/Guadeloupe.ics | 13 +- web/tzurl/zoneinfo/America/Guatemala.ics | 13 +- web/tzurl/zoneinfo/America/Guayaquil.ics | 16 +- web/tzurl/zoneinfo/America/Guyana.ics | 13 +- web/tzurl/zoneinfo/America/Halifax.ics | 289 ++++---- web/tzurl/zoneinfo/America/Havana.ics | 270 +++++--- web/tzurl/zoneinfo/America/Hermosillo.ics | 36 +- .../America/Indiana/Indianapolis.ics | 136 ++-- web/tzurl/zoneinfo/America/Indiana/Knox.ics | 213 +++--- .../zoneinfo/America/Indiana/Marengo.ics | 144 ++-- .../zoneinfo/America/Indiana/Petersburg.ics | 159 ++--- .../zoneinfo/America/Indiana/Tell_City.ics | 139 ++-- web/tzurl/zoneinfo/America/Indiana/Vevay.ics | 94 ++- .../zoneinfo/America/Indiana/Vincennes.ics | 152 ++--- .../zoneinfo/America/Indiana/Winamac.ics | 142 ++-- web/tzurl/zoneinfo/America/Inuvik.ics | 113 +--- web/tzurl/zoneinfo/America/Iqaluit.ics | 138 ++-- web/tzurl/zoneinfo/America/Jamaica.ics | 52 +- web/tzurl/zoneinfo/America/Juneau.ics | 194 +++--- .../zoneinfo/America/Kentucky/Louisville.ics | 245 +++---- .../zoneinfo/America/Kentucky/Monticello.ics | 179 ++--- web/tzurl/zoneinfo/America/Kralendijk.ics | 16 +- web/tzurl/zoneinfo/America/La_Paz.ics | 13 +- web/tzurl/zoneinfo/America/Lima.ics | 52 +- web/tzurl/zoneinfo/America/Los_Angeles.ics | 219 ++---- web/tzurl/zoneinfo/America/Lower_Princes.ics | 16 +- web/tzurl/zoneinfo/America/Maceio.ics | 83 ++- web/tzurl/zoneinfo/America/Managua.ics | 37 +- web/tzurl/zoneinfo/America/Manaus.ics | 71 +- web/tzurl/zoneinfo/America/Marigot.ics | 13 +- web/tzurl/zoneinfo/America/Martinique.ics | 16 +- web/tzurl/zoneinfo/America/Matamoros.ics | 94 ++- web/tzurl/zoneinfo/America/Mazatlan.ics | 72 +- web/tzurl/zoneinfo/America/Menominee.ics | 166 ++--- web/tzurl/zoneinfo/America/Merida.ics | 66 +- web/tzurl/zoneinfo/America/Metlakatla.ics | 126 ++-- web/tzurl/zoneinfo/America/Mexico_City.ics | 73 +- web/tzurl/zoneinfo/America/Miquelon.ics | 89 +-- web/tzurl/zoneinfo/America/Moncton.ics | 278 +++----- web/tzurl/zoneinfo/America/Monterrey.ics | 67 +- web/tzurl/zoneinfo/America/Montevideo.ics | 215 +++--- web/tzurl/zoneinfo/America/Montserrat.ics | 13 +- web/tzurl/zoneinfo/America/Nassau.ics | 133 +--- web/tzurl/zoneinfo/America/New_York.ics | 280 +++----- web/tzurl/zoneinfo/America/Nipigon.ics | 134 ++-- web/tzurl/zoneinfo/America/Nome.ics | 173 ++--- web/tzurl/zoneinfo/America/Noronha.ics | 81 ++- .../zoneinfo/America/North_Dakota/Beulah.ics | 195 +++--- .../zoneinfo/America/North_Dakota/Center.ics | 179 ++--- .../America/North_Dakota/New_Salem.ics | 179 ++--- web/tzurl/zoneinfo/America/Ojinaga.ics | 111 ++- web/tzurl/zoneinfo/America/Panama.ics | 10 +- web/tzurl/zoneinfo/America/Pangnirtung.ics | 149 ++-- web/tzurl/zoneinfo/America/Paramaribo.ics | 16 +- web/tzurl/zoneinfo/America/Phoenix.ics | 40 +- .../zoneinfo/America/Port-au-Prince.ics | 130 ++-- web/tzurl/zoneinfo/America/Port_of_Spain.ics | 7 +- web/tzurl/zoneinfo/America/Porto_Velho.ics | 69 +- web/tzurl/zoneinfo/America/Puerto_Rico.ics | 23 +- web/tzurl/zoneinfo/America/Punta_Arenas.ics | 195 +++--- web/tzurl/zoneinfo/America/Rainy_River.ics | 134 ++-- web/tzurl/zoneinfo/America/Rankin_Inlet.ics | 124 ++-- web/tzurl/zoneinfo/America/Recife.ics | 81 ++- web/tzurl/zoneinfo/America/Regina.ics | 102 ++- web/tzurl/zoneinfo/America/Resolute.ics | 125 ++-- web/tzurl/zoneinfo/America/Rio_Branco.ics | 72 +- web/tzurl/zoneinfo/America/Santarem.ics | 72 +- web/tzurl/zoneinfo/America/Santiago.ics | 236 ++++--- web/tzurl/zoneinfo/America/Santo_Domingo.ics | 40 +- web/tzurl/zoneinfo/America/Sao_Paulo.ics | 192 +++--- web/tzurl/zoneinfo/America/Scoresbysund.ics | 62 +- web/tzurl/zoneinfo/America/Sitka.ics | 172 ++--- web/tzurl/zoneinfo/America/St_Barthelemy.ics | 13 +- web/tzurl/zoneinfo/America/St_Johns.ics | 314 +++------ web/tzurl/zoneinfo/America/St_Kitts.ics | 13 +- web/tzurl/zoneinfo/America/St_Lucia.ics | 13 +- web/tzurl/zoneinfo/America/St_Thomas.ics | 13 +- web/tzurl/zoneinfo/America/St_Vincent.ics | 13 +- web/tzurl/zoneinfo/America/Swift_Current.ics | 61 +- web/tzurl/zoneinfo/America/Tegucigalpa.ics | 31 +- web/tzurl/zoneinfo/America/Thule.ics | 79 +-- web/tzurl/zoneinfo/America/Thunder_Bay.ics | 160 ++--- web/tzurl/zoneinfo/America/Tijuana.ics | 170 ++--- web/tzurl/zoneinfo/America/Toronto.ics | 292 +++----- web/tzurl/zoneinfo/America/Tortola.ics | 13 +- web/tzurl/zoneinfo/America/Vancouver.ics | 195 ++---- web/tzurl/zoneinfo/America/Whitehorse.ics | 131 ++-- web/tzurl/zoneinfo/America/Winnipeg.ics | 199 ++---- web/tzurl/zoneinfo/America/Yakutat.ics | 170 ++--- web/tzurl/zoneinfo/America/Yellowknife.ics | 120 +--- web/tzurl/zoneinfo/Antarctica/Casey.ics | 19 +- web/tzurl/zoneinfo/Antarctica/Davis.ics | 16 +- .../zoneinfo/Antarctica/DumontDUrville.ics | 10 +- web/tzurl/zoneinfo/Antarctica/Macquarie.ics | 196 +++--- web/tzurl/zoneinfo/Antarctica/Mawson.ics | 10 +- web/tzurl/zoneinfo/Antarctica/McMurdo.ics | 190 ++---- web/tzurl/zoneinfo/Antarctica/Palmer.ics | 177 ++--- web/tzurl/zoneinfo/Antarctica/Rothera.ics | 7 +- web/tzurl/zoneinfo/Antarctica/Syowa.ics | 7 +- web/tzurl/zoneinfo/Antarctica/Troll.ics | 21 +- web/tzurl/zoneinfo/Antarctica/Vostok.ics | 7 +- web/tzurl/zoneinfo/Arctic/Longyearbyen.ics | 98 ++- web/tzurl/zoneinfo/Asia/Aden.ics | 13 +- web/tzurl/zoneinfo/Asia/Almaty.ics | 109 ++- web/tzurl/zoneinfo/Asia/Amman.ics | 166 +++-- web/tzurl/zoneinfo/Asia/Anadyr.ics | 122 ++-- web/tzurl/zoneinfo/Asia/Aqtau.ics | 112 ++- web/tzurl/zoneinfo/Asia/Aqtobe.ics | 117 ++-- web/tzurl/zoneinfo/Asia/Ashgabat.ics | 56 +- web/tzurl/zoneinfo/Asia/Atyrau.ics | 120 ++-- web/tzurl/zoneinfo/Asia/Baghdad.ics | 101 ++- web/tzurl/zoneinfo/Asia/Bahrain.ics | 16 +- web/tzurl/zoneinfo/Asia/Baku.ics | 137 ++-- web/tzurl/zoneinfo/Asia/Bangkok.ics | 10 +- web/tzurl/zoneinfo/Asia/Barnaul.ics | 118 ++-- web/tzurl/zoneinfo/Asia/Beirut.ics | 137 ++-- web/tzurl/zoneinfo/Asia/Bishkek.ics | 108 ++- web/tzurl/zoneinfo/Asia/Brunei.ics | 10 +- web/tzurl/zoneinfo/Asia/Chita.ics | 121 ++-- web/tzurl/zoneinfo/Asia/Choibalsan.ics | 104 ++- web/tzurl/zoneinfo/Asia/Colombo.ics | 28 +- web/tzurl/zoneinfo/Asia/Damascus.ics | 211 +++--- web/tzurl/zoneinfo/Asia/Dhaka.ics | 34 +- web/tzurl/zoneinfo/Asia/Dili.ics | 13 +- web/tzurl/zoneinfo/Asia/Dubai.ics | 7 +- web/tzurl/zoneinfo/Asia/Dushanbe.ics | 56 +- web/tzurl/zoneinfo/Asia/Famagusta.ics | 152 ++--- web/tzurl/zoneinfo/Asia/Gaza.ics | 201 +++--- web/tzurl/zoneinfo/Asia/Hebron.ics | 198 +++--- web/tzurl/zoneinfo/Asia/Ho_Chi_Minh.ics | 22 +- web/tzurl/zoneinfo/Asia/Hong_Kong.ics | 141 ++-- web/tzurl/zoneinfo/Asia/Hovd.ics | 111 +-- web/tzurl/zoneinfo/Asia/Irkutsk.ics | 128 ++-- web/tzurl/zoneinfo/Asia/Istanbul.ics | 248 ++++--- web/tzurl/zoneinfo/Asia/Jakarta.ics | 28 +- web/tzurl/zoneinfo/Asia/Jayapura.ics | 13 +- web/tzurl/zoneinfo/Asia/Jerusalem.ics | 88 +-- web/tzurl/zoneinfo/Asia/Kabul.ics | 10 +- web/tzurl/zoneinfo/Asia/Kamchatka.ics | 113 ++-- web/tzurl/zoneinfo/Asia/Karachi.ics | 34 +- web/tzurl/zoneinfo/Asia/Kathmandu.ics | 10 +- web/tzurl/zoneinfo/Asia/Khandyga.ics | 141 ++-- web/tzurl/zoneinfo/Asia/Kolkata.ics | 19 +- web/tzurl/zoneinfo/Asia/Krasnoyarsk.ics | 125 ++-- web/tzurl/zoneinfo/Asia/Kuala_Lumpur.ics | 28 +- web/tzurl/zoneinfo/Asia/Kuching.ics | 36 +- web/tzurl/zoneinfo/Asia/Kuwait.ics | 13 +- web/tzurl/zoneinfo/Asia/Macau.ics | 162 +++-- web/tzurl/zoneinfo/Asia/Magadan.ics | 121 ++-- web/tzurl/zoneinfo/Asia/Makassar.ics | 16 +- web/tzurl/zoneinfo/Asia/Manila.ics | 19 +- web/tzurl/zoneinfo/Asia/Muscat.ics | 13 +- web/tzurl/zoneinfo/Asia/Nicosia.ics | 98 +-- web/tzurl/zoneinfo/Asia/Novokuznetsk.ics | 113 ++-- web/tzurl/zoneinfo/Asia/Novosibirsk.ics | 125 ++-- web/tzurl/zoneinfo/Asia/Omsk.ics | 125 ++-- web/tzurl/zoneinfo/Asia/Oral.ics | 112 ++- web/tzurl/zoneinfo/Asia/Phnom_Penh.ics | 16 +- web/tzurl/zoneinfo/Asia/Pontianak.ics | 28 +- web/tzurl/zoneinfo/Asia/Pyongyang.ics | 22 +- web/tzurl/zoneinfo/Asia/Qatar.ics | 10 +- web/tzurl/zoneinfo/Asia/Qyzylorda.ics | 118 ++-- web/tzurl/zoneinfo/Asia/Riyadh.ics | 7 +- web/tzurl/zoneinfo/Asia/Sakhalin.ics | 126 ++-- web/tzurl/zoneinfo/Asia/Samarkand.ics | 65 +- web/tzurl/zoneinfo/Asia/Seoul.ics | 79 ++- web/tzurl/zoneinfo/Asia/Shanghai.ics | 66 +- web/tzurl/zoneinfo/Asia/Singapore.ics | 28 +- web/tzurl/zoneinfo/Asia/Srednekolymsk.ics | 125 ++-- web/tzurl/zoneinfo/Asia/Taipei.ics | 103 +-- web/tzurl/zoneinfo/Asia/Tashkent.ics | 59 +- web/tzurl/zoneinfo/Asia/Tbilisi.ics | 127 ++-- web/tzurl/zoneinfo/Asia/Tehran.ics | 598 ++++++++++++++--- web/tzurl/zoneinfo/Asia/Thimphu.ics | 10 +- web/tzurl/zoneinfo/Asia/Tokyo.ics | 32 +- web/tzurl/zoneinfo/Asia/Tomsk.ics | 126 ++-- web/tzurl/zoneinfo/Asia/Ulaanbaatar.ics | 111 +-- web/tzurl/zoneinfo/Asia/Urumqi.ics | 7 +- web/tzurl/zoneinfo/Asia/Ust-Nera.ics | 130 ++-- web/tzurl/zoneinfo/Asia/Vientiane.ics | 16 +- web/tzurl/zoneinfo/Asia/Vladivostok.ics | 125 ++-- web/tzurl/zoneinfo/Asia/Yakutsk.ics | 125 ++-- web/tzurl/zoneinfo/Asia/Yangon.ics | 16 +- web/tzurl/zoneinfo/Asia/Yekaterinburg.ics | 128 ++-- web/tzurl/zoneinfo/Asia/Yerevan.ics | 114 ++-- web/tzurl/zoneinfo/Atlantic/Azores.ics | 269 ++++---- web/tzurl/zoneinfo/Atlantic/Bermuda.ics | 119 +--- web/tzurl/zoneinfo/Atlantic/Canary.ics | 66 +- web/tzurl/zoneinfo/Atlantic/Cape_Verde.ics | 18 +- web/tzurl/zoneinfo/Atlantic/Faroe.ics | 50 +- web/tzurl/zoneinfo/Atlantic/Madeira.ics | 247 +++---- web/tzurl/zoneinfo/Atlantic/Reykjavik.ics | 132 ++-- .../zoneinfo/Atlantic/South_Georgia.ics | 7 +- web/tzurl/zoneinfo/Atlantic/St_Helena.ics | 13 +- web/tzurl/zoneinfo/Atlantic/Stanley.ics | 138 ++-- web/tzurl/zoneinfo/Australia/Adelaide.ics | 148 ++-- web/tzurl/zoneinfo/Australia/Brisbane.ics | 41 +- web/tzurl/zoneinfo/Australia/Broken_Hill.ics | 173 ++--- web/tzurl/zoneinfo/Australia/Currie.ics | 168 +++-- web/tzurl/zoneinfo/Australia/Darwin.ics | 25 +- web/tzurl/zoneinfo/Australia/Eucla.ics | 33 +- web/tzurl/zoneinfo/Australia/Hobart.ics | 181 +++-- web/tzurl/zoneinfo/Australia/Lindeman.ics | 50 +- web/tzurl/zoneinfo/Australia/Lord_Howe.ics | 138 ++-- web/tzurl/zoneinfo/Australia/Melbourne.ics | 170 +++-- web/tzurl/zoneinfo/Australia/Perth.ics | 33 +- web/tzurl/zoneinfo/Australia/Sydney.ics | 168 +++-- web/tzurl/zoneinfo/Europe/Amsterdam.ics | 170 +++-- web/tzurl/zoneinfo/Europe/Andorra.ics | 52 +- web/tzurl/zoneinfo/Europe/Astrakhan.ics | 122 ++-- web/tzurl/zoneinfo/Europe/Athens.ics | 86 +-- web/tzurl/zoneinfo/Europe/Belgrade.ics | 62 +- web/tzurl/zoneinfo/Europe/Berlin.ics | 108 +-- web/tzurl/zoneinfo/Europe/Bratislava.ics | 153 +++-- web/tzurl/zoneinfo/Europe/Brussels.ics | 145 ++-- web/tzurl/zoneinfo/Europe/Bucharest.ics | 149 ++-- web/tzurl/zoneinfo/Europe/Budapest.ics | 153 +++-- web/tzurl/zoneinfo/Europe/Busingen.ics | 75 +-- web/tzurl/zoneinfo/Europe/Chisinau.ics | 166 +++-- web/tzurl/zoneinfo/Europe/Copenhagen.ics | 70 +- web/tzurl/zoneinfo/Europe/Dublin.ics | 269 ++++---- web/tzurl/zoneinfo/Europe/Gibraltar.ics | 201 +++--- web/tzurl/zoneinfo/Europe/Guernsey.ics | 297 ++++---- web/tzurl/zoneinfo/Europe/Helsinki.ics | 81 ++- web/tzurl/zoneinfo/Europe/Isle_of_Man.ics | 297 ++++---- web/tzurl/zoneinfo/Europe/Istanbul.ics | 242 +++---- web/tzurl/zoneinfo/Europe/Jersey.ics | 297 ++++---- web/tzurl/zoneinfo/Europe/Kaliningrad.ics | 155 ++--- web/tzurl/zoneinfo/Europe/Kiev.ics | 113 ++-- web/tzurl/zoneinfo/Europe/Kirov.ics | 122 ++-- web/tzurl/zoneinfo/Europe/Lisbon.ics | 287 ++++---- web/tzurl/zoneinfo/Europe/Ljubljana.ics | 68 +- web/tzurl/zoneinfo/Europe/London.ics | 291 ++++---- web/tzurl/zoneinfo/Europe/Luxembourg.ics | 117 ++-- web/tzurl/zoneinfo/Europe/Madrid.ics | 172 +++-- web/tzurl/zoneinfo/Europe/Malta.ics | 148 ++-- web/tzurl/zoneinfo/Europe/Mariehamn.ics | 87 ++- web/tzurl/zoneinfo/Europe/Minsk.ics | 121 ++-- web/tzurl/zoneinfo/Europe/Monaco.ics | 129 ++-- web/tzurl/zoneinfo/Europe/Moscow.ics | 157 ++--- web/tzurl/zoneinfo/Europe/Nicosia.ics | 104 ++- web/tzurl/zoneinfo/Europe/Oslo.ics | 92 ++- web/tzurl/zoneinfo/Europe/Paris.ics | 132 ++-- web/tzurl/zoneinfo/Europe/Podgorica.ics | 68 +- web/tzurl/zoneinfo/Europe/Prague.ics | 147 ++-- web/tzurl/zoneinfo/Europe/Riga.ics | 143 ++-- web/tzurl/zoneinfo/Europe/Rome.ics | 160 +++-- web/tzurl/zoneinfo/Europe/Samara.ics | 134 ++-- web/tzurl/zoneinfo/Europe/San_Marino.ics | 166 ++--- web/tzurl/zoneinfo/Europe/Sarajevo.ics | 68 +- web/tzurl/zoneinfo/Europe/Saratov.ics | 123 ++-- web/tzurl/zoneinfo/Europe/Simferopol.ics | 168 +++-- web/tzurl/zoneinfo/Europe/Skopje.ics | 68 +- web/tzurl/zoneinfo/Europe/Sofia.ics | 128 ++-- web/tzurl/zoneinfo/Europe/Stockholm.ics | 66 +- web/tzurl/zoneinfo/Europe/Tallinn.ics | 138 ++-- web/tzurl/zoneinfo/Europe/Tirane.ics | 68 +- web/tzurl/zoneinfo/Europe/Ulyanovsk.ics | 132 ++-- web/tzurl/zoneinfo/Europe/Uzhgorod.ics | 124 ++-- web/tzurl/zoneinfo/Europe/Vaduz.ics | 75 +-- web/tzurl/zoneinfo/Europe/Vatican.ics | 166 ++--- web/tzurl/zoneinfo/Europe/Vienna.ics | 94 +-- web/tzurl/zoneinfo/Europe/Vilnius.ics | 147 ++-- web/tzurl/zoneinfo/Europe/Volgograd.ics | 131 ++-- web/tzurl/zoneinfo/Europe/Warsaw.ics | 172 ++--- web/tzurl/zoneinfo/Europe/Zagreb.ics | 68 +- web/tzurl/zoneinfo/Europe/Zaporozhye.ics | 115 ++-- web/tzurl/zoneinfo/Europe/Zurich.ics | 69 +- web/tzurl/zoneinfo/Indian/Antananarivo.ics | 22 +- web/tzurl/zoneinfo/Indian/Chagos.ics | 10 +- web/tzurl/zoneinfo/Indian/Christmas.ics | 7 +- web/tzurl/zoneinfo/Indian/Cocos.ics | 7 +- web/tzurl/zoneinfo/Indian/Comoro.ics | 22 +- web/tzurl/zoneinfo/Indian/Kerguelen.ics | 7 +- web/tzurl/zoneinfo/Indian/Mahe.ics | 7 +- web/tzurl/zoneinfo/Indian/Maldives.ics | 10 +- web/tzurl/zoneinfo/Indian/Mauritius.ics | 13 +- web/tzurl/zoneinfo/Indian/Mayotte.ics | 22 +- web/tzurl/zoneinfo/Indian/Reunion.ics | 7 +- web/tzurl/zoneinfo/Pacific/Apia.ics | 50 +- web/tzurl/zoneinfo/Pacific/Auckland.ics | 184 ++--- web/tzurl/zoneinfo/Pacific/Bougainville.ics | 19 +- web/tzurl/zoneinfo/Pacific/Chatham.ics | 133 ++-- web/tzurl/zoneinfo/Pacific/Chuuk.ics | 27 +- web/tzurl/zoneinfo/Pacific/Easter.ics | 221 +++--- web/tzurl/zoneinfo/Pacific/Efate.ics | 44 +- web/tzurl/zoneinfo/Pacific/Enderbury.ics | 15 +- web/tzurl/zoneinfo/Pacific/Fakaofo.ics | 10 +- web/tzurl/zoneinfo/Pacific/Fiji.ics | 80 ++- web/tzurl/zoneinfo/Pacific/Funafuti.ics | 7 +- web/tzurl/zoneinfo/Pacific/Galapagos.ics | 13 +- web/tzurl/zoneinfo/Pacific/Gambier.ics | 7 +- web/tzurl/zoneinfo/Pacific/Guadalcanal.ics | 7 +- web/tzurl/zoneinfo/Pacific/Guam.ics | 59 +- web/tzurl/zoneinfo/Pacific/Honolulu.ics | 29 +- web/tzurl/zoneinfo/Pacific/Kiritimati.ics | 15 +- web/tzurl/zoneinfo/Pacific/Kosrae.ics | 44 +- web/tzurl/zoneinfo/Pacific/Kwajalein.ics | 33 +- web/tzurl/zoneinfo/Pacific/Majuro.ics | 35 +- web/tzurl/zoneinfo/Pacific/Marquesas.ics | 7 +- web/tzurl/zoneinfo/Pacific/Midway.ics | 16 +- web/tzurl/zoneinfo/Pacific/Nauru.ics | 22 +- web/tzurl/zoneinfo/Pacific/Niue.ics | 13 +- web/tzurl/zoneinfo/Pacific/Norfolk.ics | 41 +- web/tzurl/zoneinfo/Pacific/Noumea.ics | 31 +- web/tzurl/zoneinfo/Pacific/Pago_Pago.ics | 10 +- web/tzurl/zoneinfo/Pacific/Palau.ics | 13 +- web/tzurl/zoneinfo/Pacific/Pitcairn.ics | 10 +- web/tzurl/zoneinfo/Pacific/Pohnpei.ics | 38 +- web/tzurl/zoneinfo/Pacific/Port_Moresby.ics | 10 +- web/tzurl/zoneinfo/Pacific/Rarotonga.ics | 41 +- web/tzurl/zoneinfo/Pacific/Saipan.ics | 65 +- web/tzurl/zoneinfo/Pacific/Tahiti.ics | 7 +- web/tzurl/zoneinfo/Pacific/Tarawa.ics | 7 +- web/tzurl/zoneinfo/Pacific/Tongatapu.ics | 41 +- web/tzurl/zoneinfo/Pacific/Wake.ics | 7 +- web/tzurl/zoneinfo/Pacific/Wallis.ics | 7 +- 851 files changed, 19636 insertions(+), 21609 deletions(-) commit 2e5caba6c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 5 16:35:18 2021 +0100 Upgraded to jQuery Release 3.6.0 web/jquery/jquery-3.5.1.min.js (gone) | 2 - .../{jquery-3.5.1.js => jquery-3.6.0.js} | 227 +++++++++-------- web/jquery/jquery-3.6.0.min.js (new) | 2 + .../jquery-migrate-3.3.0.min.js (gone) | 2 - ...rate-3.3.0.js => jquery-migrate-3.3.2.js} | 65 +++-- web/jquery/jquery-migrate-3.3.2.min.js (new) | 2 + web/js.inc | 4 +- 7 files changed, 167 insertions(+), 137 deletions(-) commit d27770d05 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 5 08:09:33 2021 +0100 Added comment web/lib/MRBS/DB_mysql.php | 4 ++++ 1 file changed, 4 insertions(+) commit f61a6bc62 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 4 18:50:35 2021 +0100 Changed default retry delay web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f87e121c5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 4 18:43:43 2021 +0100 MRBS now retries opening a MySQL connection if the attempt failed because there were already too many connections. web/lib/MRBS/DB_mysql.php | 69 ++++++++++++++++++++++++++++-------- web/systemdefaults.inc.php | 5 +++ 2 files changed, 59 insertions(+), 15 deletions(-) commit 72b3470b6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 4 18:41:52 2021 +0100 Fixed bug introduced in last commit web/lib/MRBS/DB_pgsql.php | 4 ---- 1 file changed, 4 deletions(-) commit 90b539163 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 4 13:52:51 2021 +0100 Restructured web/lib/MRBS/DB.php | 68 ++++++++++++++----------------------- web/lib/MRBS/DB_mysql.php | 24 ++++++++++--- web/lib/MRBS/DB_pgsql.php | 23 +++++++++++++ 3 files changed, 67 insertions(+), 48 deletions(-) commit 7b553a863 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 3 16:31:35 2021 +0100 Added more debug output web/lib/MRBS/Auth/AuthLdap.php | 1 + 1 file changed, 1 insertion(+) commit 68fd33a87 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jun 2 17:10:19 2021 +0100 Added more debug output web/lib/MRBS/Auth/AuthLdap.php | 1 + 1 file changed, 1 insertion(+) commit 5867a73a0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 27 17:44:17 2021 +0100 Simplified code web/lib/MRBS/DB_mysql.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) commit 3e47d7a03 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 26 18:52:24 2021 +0100 Fixed problem when running on MySQL 8 (?). See SF Support Requests #2357 web/lib/MRBS/DB_mysql.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit b6a2f111f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 26 16:49:11 2021 +0100 Added a pointer cursor to password show/hide icons web/css/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit d7ba72012 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 26 15:19:21 2021 +0100 Fixed bug preventing ordinary users cancelling registrattions they have made web/registration_handler.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit c7d6074d2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue May 25 11:51:04 2021 +0100 Removed redundant global declarations web/view_entry.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit f03d7d439 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue May 25 11:26:34 2021 +0100 Added the ability for users to cancel registrations made on their behalf by someone else. web/view_entry.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 458204230 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue May 25 11:11:26 2021 +0100 Added new config setting, $auth['users_can_register_others'], allowing ordinary users to register others for events. web/ajax/usernames.php | 4 ++-- web/mrbs_auth.inc | 16 ++++++++++++++++ web/registration_handler.php | 2 +- web/systemdefaults.inc.php | 3 +++ web/view_entry.php | 8 +++++--- 5 files changed, 27 insertions(+), 6 deletions(-) commit d957d0d12 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun May 23 17:44:42 2021 +0100 Fixed problem when incorrect credentials are supplied on database upgrade. web/lib/MRBS/DB.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 39f5828a9 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat May 22 22:05:43 2021 +0100 Added tag mrbs-1_9_3 for changeset 63a72a1ce343 commit 682cf8a63 (tag: mrbs-1_9_3) Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat May 22 22:05:30 2021 +0100 * Updated ChangeLog and NEWS for release. ChangeLog | 1221 ++++++++++++++++++++++++++++++++++++++++++++++++++- NEWS | 198 +++++++++ 2 files changed, 1418 insertions(+), 1 deletion(-) commit 11b5986be Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat May 22 20:58:36 2021 +0100 * Updated version number for release. web/version_num.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0ac7fc52c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun May 16 11:23:29 2021 +0100 Reformatted web/images/eye.svg | 5 ++++- web/images/eye_off.svg | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) commit 842f16f96 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun May 16 10:45:56 2021 +0100 Upgraded to PHPMailer Release 6.4.1 web/lib/PHPMailer/README.md | 135 +-- web/lib/PHPMailer/SECURITY.md | 6 +- web/lib/PHPMailer/VERSION | 2 +- web/lib/PHPMailer/composer.json | 30 +- web/lib/PHPMailer/get_oauth_token.php | 34 +- .../PHPMailer/language/phpmailer.lang-af.php | 1 + .../PHPMailer/language/phpmailer.lang-ar.php | 1 + .../PHPMailer/language/phpmailer.lang-az.php | 1 + .../PHPMailer/language/phpmailer.lang-ba.php | 3 +- .../PHPMailer/language/phpmailer.lang-be.php | 1 + .../PHPMailer/language/phpmailer.lang-bg.php | 1 + .../PHPMailer/language/phpmailer.lang-ca.php | 1 + .../PHPMailer/language/phpmailer.lang-ch.php | 1 + .../PHPMailer/language/phpmailer.lang-cs.php | 3 + .../PHPMailer/language/phpmailer.lang-da.php | 33 +- .../PHPMailer/language/phpmailer.lang-de.php | 3 + .../PHPMailer/language/phpmailer.lang-el.php | 1 + .../PHPMailer/language/phpmailer.lang-eo.php | 1 + .../PHPMailer/language/phpmailer.lang-es.php | 1 + .../PHPMailer/language/phpmailer.lang-et.php | 1 + .../PHPMailer/language/phpmailer.lang-fa.php | 1 + .../PHPMailer/language/phpmailer.lang-fi.php | 1 + .../PHPMailer/language/phpmailer.lang-fo.php | 1 + .../PHPMailer/language/phpmailer.lang-fr.php | 3 + .../PHPMailer/language/phpmailer.lang-gl.php | 1 + .../PHPMailer/language/phpmailer.lang-he.php | 1 + .../PHPMailer/language/phpmailer.lang-hi.php | 3 +- .../PHPMailer/language/phpmailer.lang-hr.php | 1 + .../PHPMailer/language/phpmailer.lang-hu.php | 1 + .../language/phpmailer.lang-hy.php (new) | 27 + .../PHPMailer/language/phpmailer.lang-id.php | 28 +- .../PHPMailer/language/phpmailer.lang-it.php | 1 + .../PHPMailer/language/phpmailer.lang-ja.php | 1 + .../PHPMailer/language/phpmailer.lang-ka.php | 1 + .../PHPMailer/language/phpmailer.lang-ko.php | 1 + .../PHPMailer/language/phpmailer.lang-lt.php | 1 + .../PHPMailer/language/phpmailer.lang-lv.php | 1 + .../PHPMailer/language/phpmailer.lang-mg.php | 2 + .../PHPMailer/language/phpmailer.lang-ms.php | 1 + .../PHPMailer/language/phpmailer.lang-nb.php | 1 + .../PHPMailer/language/phpmailer.lang-nl.php | 3 + .../PHPMailer/language/phpmailer.lang-pl.php | 3 +- .../PHPMailer/language/phpmailer.lang-pt.php | 1 + .../language/phpmailer.lang-pt_br.php | 1 + .../PHPMailer/language/phpmailer.lang-ro.php | 1 + .../PHPMailer/language/phpmailer.lang-ru.php | 1 + .../PHPMailer/language/phpmailer.lang-sk.php | 3 + .../PHPMailer/language/phpmailer.lang-sl.php | 6 +- .../PHPMailer/language/phpmailer.lang-sr.php | 1 + .../phpmailer.lang-sr_latn.php (new) | 28 + .../PHPMailer/language/phpmailer.lang-sv.php | 5 +- .../PHPMailer/language/phpmailer.lang-tl.php | 25 +- .../PHPMailer/language/phpmailer.lang-tr.php | 1 + .../PHPMailer/language/phpmailer.lang-uk.php | 5 +- .../PHPMailer/language/phpmailer.lang-vi.php | 1 + .../PHPMailer/language/phpmailer.lang-zh.php | 1 + .../language/phpmailer.lang-zh_cn.php | 1 + web/lib/PHPMailer/phpunit.xml.dist (new) | 35 + web/lib/PHPMailer/src/Exception.php | 3 +- web/lib/PHPMailer/src/OAuth.php | 5 +- web/lib/PHPMailer/src/PHPMailer.php | 758 ++++++++++------- web/lib/PHPMailer/src/POP3.php | 87 +- web/lib/PHPMailer/src/SMTP.php | 227 +++-- 63 files changed, 1007 insertions(+), 533 deletions(-) commit 5919219e2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 15 17:07:45 2021 +0100 Added password visibility toggling web/css/mrbs.css.php | 18 ++++++++++++++++-- web/images/eye.svg (new) | 5 +++++ web/images/eye_off.svg (new) | 5 +++++ web/js/general.js.php | 21 +++++++++++++++++++++ 4 files changed, 47 insertions(+), 2 deletions(-) commit 2aa8f3d2b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 13 14:10:21 2021 +0100 Improved error message. web/lang/lang.en | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit bbf6048a1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 13 14:03:11 2021 +0100 Removed unused local variable web/functions_error.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 482ee9ccd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 13 14:00:40 2021 +0100 Hid arguments in debug backtrace, unless $debug is set, in order to avoid giving away database credentials. web/functions_error.inc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) commit 5b590224a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 12 15:23:55 2021 +0100 Added a configuration option to limit the appearance of the Copy button to bookings for which you have write permission. web/systemdefaults.inc.php | 4 +++ web/view_entry.php | 47 ++++++++++++++++++------------------ 2 files changed, 28 insertions(+), 23 deletions(-) commit ea7f9d5ba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 8 17:12:10 2021 +0100 Added a check that the repeat end date has been set. web/js/edit_entry.js.php | 28 ++++++++++++++++++++-------- web/lang/lang.en | 2 ++ 2 files changed, 22 insertions(+), 8 deletions(-) commit 0673bd818 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 1 17:35:47 2021 +0100 Prevented the database credentials being given away when there's an error web/lib/MRBS/DB.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 5104b575b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 1 17:26:34 2021 +0100 Prevented multiple uncaught exceptions when there's a database connection error web/Themes/default/header.inc | 196 +++++++++++++++++--------------- 1 file changed, 102 insertions(+), 94 deletions(-) commit 06b745b56 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 28 18:00:18 2021 +0100 Fixed bug preventing booking admins from getting a list of users in the Created By drop-down on the edit_entry form. web/ajax/usernames.php | 6 ++++++ web/mrbs_auth.inc | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) commit c22fcde5a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 27 09:30:53 2021 +0100 Tweaked parse_address() web/functions_mail.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit 34a1a796f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 26 11:54:08 2021 +0100 Added a confirmation step for deleting a user. See SF Support Requests #2341. web/edit_users.php | 6 ++++++ web/lang/lang.en | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) commit 57e2707dc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 26 11:27:13 2021 +0100 Improved parse_address() by adding alternatives to mb_decode_mimeheader() web/functions_mail.inc | 18 +++++++++++++++--- web/lib/MRBS/Auth/AuthDb.php | 1 + web/lib/MRBS/User.php | 2 ++ 3 files changed, 18 insertions(+), 3 deletions(-) commit 659491505 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 26 10:11:47 2021 +0100 Restructured web/functions_ical.inc | 2 +- web/functions_mail.inc | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) commit 376ae4f01 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 26 10:03:41 2021 +0100 Restructured web/functions_ical.inc | 4 ++-- web/functions_mail.inc | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) commit b2f1a31e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 25 17:46:21 2021 +0100 Tweaked comment web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 828bfad50 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 25 17:45:51 2021 +0100 Added comment web/functions_mail.inc | 3 +++ 1 file changed, 3 insertions(+) commit c67574e7f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 25 17:40:27 2021 +0100 Fixed typo in comment web/functions_ical.inc | 2 +- web/functions_mail.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 4079b07ad Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 25 16:54:21 2021 +0100 Fixed problem with multibyte common names in ical events web/functions_mail.inc | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) commit f7f80411d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 25 15:28:47 2021 +0100 Fixed problem with multibyte display names in email addresses web/lib/MRBS/Auth/AuthDb.php | 1 + web/lib/MRBS/MailQueue.php | 2 +- web/lib/MRBS/User.php | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) commit ee5b2732e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 19 07:46:25 2021 +0100 Renamed room_admin_email and area_admin_email fields to make it less confusing, as they don't have any admin powers web/lang/lang.en | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 54ae936d2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 18 13:56:19 2021 +0100 Fixed broken links when in multisite mode web/pending.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) commit e1a5842ab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 18 11:53:27 2021 +0100 Added the display name to email notifications web/functions_mail.inc | 6 +++--- web/lib/MRBS/User.php | 44 +++++++++++++++++++++++++++++----------- 2 files changed, 35 insertions(+), 15 deletions(-) commit 351f02728 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 18 09:26:05 2021 +0100 Fixed bug in previous commit when there's more than one user with the same email address web/lib/MRBS/Auth/AuthDb.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) commit e41141b7a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 17 18:56:19 2021 +0100 Used the user's display name in the body of the password reset email. web/lang/lang.en | 6 +++--- web/lib/MRBS/Auth/AuthDb.php | 16 +++++++++++----- 2 files changed, 14 insertions(+), 8 deletions(-) commit 8087187b0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 17 18:29:31 2021 +0100 Added the display name, if there is one, to the To address for a password reset email web/lib/MRBS/Auth/AuthDb.php | 7 +++++++ 1 file changed, 7 insertions(+) commit 95749a8ab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 17 10:19:14 2021 +0100 Fixed occasional undefined index: path error. web/view_entry.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit 84763d737 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 12 17:59:56 2021 +0100 Fixed problem when users try to go directly to edit_users.php when the authentication scheme is other than 'db'. web/edit_users.php | 6 ++++++ 1 file changed, 6 insertions(+) commit 24cb5e457 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 10 09:54:41 2021 +0100 Allowed $mrbs_company_more_info to contain HTML. See SF Support Requests #2067. web/Themes/default/header.inc | 4 +++- web/systemdefaults.inc.php | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) commit eb6be8096 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 8 16:17:55 2021 +0100 Added support for more data types for custom fields - see SF Support Requests #2333 web/lib/MRBS/DB_mysql.php | 7 ++++++- web/lib/MRBS/DB_pgsql.php | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) commit e8b3a429f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 8 15:26:15 2021 +0100 Fixed fatal error. web/lib/MRBS/DB_pgsql.php | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) commit 473aceba5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 8 14:11:04 2021 +0100 Fixed bug causing "Cancel registration" button sometimes not to appear when it should do. web/mrbs_sql.inc | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) commit 62d0ec5ba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 7 18:21:49 2021 +0100 Minor tweak web/lib/MRBS/DB.php | 4 ++-- web/lib/MRBS/DBFactory.php | 2 +- web/lib/MRBS/DB_mysql.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) commit d631f2ad8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 7 17:09:31 2021 +0100 Temporary fix for SQL errors of the type "Syntax error or access violation: 1055 'mrbs.E.start_time' isn't in GROUP BY". See SF Support Requests #2333. web/lib/MRBS/DB_mysql.php | 10 ++++++++++ 1 file changed, 10 insertions(+) commit b8d2f5aa3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 5 18:13:36 2021 +0100 Minor tweak web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9450cf913 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 5 07:54:55 2021 +0100 Removed whitespace from the beginning of the file web/functions_mail.inc | 2 ++ 1 file changed, 2 insertions(+) commit f66663e58 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 5 07:42:23 2021 +0100 Converted CSS LF endings to CRLF web/functions_mail.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit a25cb323c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 4 19:05:37 2021 +0100 Simplified regex web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1dd5f8de1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 4 18:24:19 2021 +0100 Replaced \n with \r\n for EOL in mail messages. See RFC 5322 2.1. web/functions_mail.inc | 110 +++++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 52 deletions(-) commit a55b53038 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 4 14:34:51 2021 +0100 Fixed bug resulting in email not being delivered: "550 Maximum line length exceeded (see RFC 5322 2.1.1)". web/functions_mail.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit f1e734692 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 29 10:20:30 2021 +0100 Fixed bug when working in multisite mode web/js.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 28bc0dacf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 29 07:46:28 2021 +0100 Reformatted web/js/resizable.js.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 53e8fdc8b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 29 07:29:18 2021 +0100 Restructured web/js/resizable.js.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) commit 0737766ac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 28 15:15:44 2021 +0100 Removed redundant code web/Themes/default/header.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 9067ef867 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 28 15:14:16 2021 +0100 Added a username data attribute web/Themes/default/header.inc | 6 ++++++ 1 file changed, 6 insertions(+) commit 77a1923db Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 28 12:43:03 2021 +0100 Only included visible columns in sizing, in case some have been hidden web/js/refresh.js.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit c1f69effc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 28 11:43:46 2021 +0100 Fixed bug in previous commit web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 41c86d702 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 28 11:28:03 2021 +0100 Restructured web/functions_table.inc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) commit d1abe0f17 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 27 09:50:55 2021 +0000 Corrected comment web/systemdefaults.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 8c2aaa3c2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 22 14:45:50 2021 +0000 Added a new config setting, $measure_max_to_start_time, to allow max book ahead times to be measured to the start rather than end time. [The time interval is normally measured to the end time of the booking. This is to prevent users cheating the system by booking a very long slot with the start time just inside the limit and then either not using the early part of the booking, or else editing it down to what they actually need later. However this is not very intuitive for users who might expect the measurement to be relative to the start time.] web/lang/lang.en | 2 ++ web/mrbs_sql.inc | 17 +++++++++-------- web/systemdefaults.inc.php | 8 ++++++++ 3 files changed, 19 insertions(+), 8 deletions(-) commit dbf3dfe42 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 22 14:10:33 2021 +0000 Fixed registration opens and closes so that they compensate for DST changes and the user sees what they expect to see. web/mrbs_sql.inc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) commit bc2409219 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 22 12:45:06 2021 +0000 Fixed bug introduced in recent commits web/edit_entry_handler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 6222854fb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 22 12:32:57 2021 +0000 Fixed bug causing the registration limit value to be overwritten if registration is disabled web/edit_entry_handler.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) commit f28d10837 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 22 12:19:01 2021 +0000 Removed redundant code web/edit_entry_handler.php | 8 -------- 1 file changed, 8 deletions(-) commit 593454c97 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 22 12:09:08 2021 +0000 Fixed bug causing the registration opens and closes values to be overwritten if registration is disabled web/edit_entry_handler.php | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) commit 166da2494 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 22 09:06:13 2021 +0000 Removed redundant code now that the minimum version of PHP includes the DateTimeZone class in the core. web/functions.inc | 37 ++++++++----------------------------- 1 file changed, 8 insertions(+), 29 deletions(-) commit ab066a39a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 21 17:54:12 2021 +0000 Fixed bug when advance booking policies cross a DST boundary. The assumed correct behaviour is that a policy of, for example, "2 weeks ahead" means 2 nominal weeks rather than 2*7*24*60*60 seconds. web/functions.inc | 1 + web/mrbs_sql.inc | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) commit 2bfe8a09d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 21 17:05:35 2021 +0000 Removed commented out debugging lines web/mrbs_sql.inc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) commit 6fadf92bb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 20 09:30:05 2021 +0000 Added a new config variable, $default_name_display_name, to allow the brief description to default to the user's display name. web/edit_entry.php | 9 ++++++++- web/systemdefaults.inc.php | 7 ++++++- 2 files changed, 14 insertions(+), 2 deletions(-) commit 803ab4a07 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 17 15:08:19 2021 +0000 Added comment web/edit_entry.php | 2 ++ 1 file changed, 2 insertions(+) commit ea4c1b944 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 17 15:05:04 2021 +0000 Provided a more helpful error message than a fatal error if somebody accesses edit_entry.php with an invalid room id (usually because they've been using a bookmark that is no longer valid). web/edit_entry.php | 8 ++++++++ web/lang/lang.en | 7 +++++++ 2 files changed, 15 insertions(+) commit 21a1e9e20 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 14 10:42:38 2021 +0000 Fixed bug when usernames are all numeric web/js/general.js.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit f59fa3c2b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 9 11:56:56 2021 +0000 Removed unnecessary exception throw. web/edit_room_handler.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) commit 2278271b1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 3 15:46:32 2021 +0000 Made $periods_booking_opens apply to registrations web/edit_entry.php | 16 ++++++++++++---- web/functions.inc | 10 +++++++--- web/lang/lang.en | 2 +- web/mrbs_sql.inc | 12 ++++++------ 4 files changed, 26 insertions(+), 14 deletions(-) commit 9bfd48bf3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 28 18:32:15 2021 +0000 Added comments web/Themes/default/header.inc | 1 + web/css/mrbs.css.php | 4 ++++ 2 files changed, 5 insertions(+) commit f9d353972 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 28 18:19:22 2021 +0000 Fixed SF Bugs #502 (day number obscured by week number in month view) web/Themes/default/header.inc | 9 +++++++-- web/css/mrbs.css.php | 8 ++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) commit 03ea40fa8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 22 14:08:07 2021 +0000 Fixed bug in recent commit web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0c67d86dc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 21 09:57:32 2021 +0000 Retrieve the headers as well as the body in url_get_contents web/functions.inc | 65 +++++++++++++++++++++++++++++++++++----- web/functions_ical.inc | 3 +- 2 files changed, 59 insertions(+), 9 deletions(-) commit f8f15efb5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 20 09:47:35 2021 +0000 Removed unnecessary return statement web/js/resizable.js.php | 1 - 1 file changed, 1 deletion(-) commit 63c00baa5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 20 09:40:35 2021 +0000 Simplified code web/js/resizable.js.php | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) commit c7934899d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 18 16:40:14 2021 +0000 Fixed misleading error message and changed name of config variable to $periods_booking_opens web/mrbs_sql.inc | 15 +++++++++------ web/systemdefaults.inc.php | 3 ++- 2 files changed, 11 insertions(+), 7 deletions(-) commit 8c3e4e439 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 18 16:28:18 2021 +0000 Added a new config variable $periods_booking_day_starts to set the time of day when bookings open when using periods web/mrbs_sql.inc | 17 ++++++++++------- web/systemdefaults.inc.php | 6 ++++++ 2 files changed, 16 insertions(+), 7 deletions(-) commit a17be342d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 18 15:57:59 2021 +0000 Fixed bug when $force_resolution is set stopping periods working properly (bug introduced in the recent commit to fix $force_resolution) web/functions.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 53661f693 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 18 09:52:13 2021 +0000 Restructured web/mrbs_sql.inc | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) commit 900993f49 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 7 10:07:30 2021 +0000 Tweaked code and added comments web/functions.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit 5311d97c1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 7 09:52:37 2021 +0000 Added emulations of the new PHP 8 string functions web/functions.inc | 54 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) commit d85a993fd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 29 16:42:22 2021 +0000 Fixed bug causing times not to be converted to an integral number of units web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 232f2b8af Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 27 17:10:00 2021 +0000 Fixed bug when trying to rename an area to a name that has already been used web/edit_area_handler.php | 7 +++++++ web/lang/lang.en | 2 +- web/mrbs_sql.inc | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) commit be4475d35 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 26 16:58:09 2021 +0000 Fixed potential minor bug web/edit_area_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f4b26e9fc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 26 16:56:55 2021 +0000 Fixed bug preventing the default_type being set correctly when the area is changed web/internalconfig.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6baa84e84 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 24 12:54:19 2021 +0000 Imposed a minimum value of 0 for registration opens web/edit_entry.php | 3 ++- web/lib/MRBS/Form/FieldTimeWithUnits.php | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) commit e15870e11 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 24 08:47:34 2021 +0000 Fixed uncaught exception if you try and set a registration opens/closes time outside the range for its database type (4 byte signed int). web/edit_entry_handler.php | 5 +++-- web/functions.inc | 21 ++++++++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) commit 680d292a1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 22 17:19:16 2021 +0000 Fixed bug when importing bookings that are not private or confidential web/import.php | 2 ++ web/mrbs_sql.inc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) commit 0da4eaaac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 21 17:21:21 2021 +0000 Updated minimum PHP version. See SF Bugs #500. INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5b6c11e61 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 20 18:53:32 2021 +0000 Slightly improved performance web/js/datepicker.js.php | 53 ++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 25 deletions(-) commit 78127503c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 20 15:01:53 2021 +0000 Fixed bug causing the $force_resolution config setting to be ignored web/functions.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 792ceed6f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 14 11:56:36 2021 +0000 Fixed spelling mistake. See SF Bugs #499 web/lang/lang.de | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d8e160f2f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 12 17:12:57 2021 +0000 Removed redundant code (the room id will have been set if necessary in standard_vars.inc.php web/edit_entry.php | 15 --------------- 1 file changed, 15 deletions(-) commit 7a0c94ecd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 12 16:48:04 2021 +0000 Improved usability by returning to admin.php with the correct area set when trying to dfelete an area that still contains rooms. web/del.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 16dfaf728 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 11 14:14:01 2021 +0000 Changed error message for the case when the PHP 'ldap' extension is not available. web/lib/MRBS/Auth/AuthLdap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3cbaed91c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 8 11:38:08 2021 +0000 Added comment web/mrbs_sql.inc | 9 +++++++++ 1 file changed, 9 insertions(+) commit baee2a412 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 7 12:10:27 2021 +0000 Fixed bug when using an LDAP library that doesn't suport LDAP_OPT_DIAGNOSTIC_MESSAGE web/lib/MRBS/Auth/AuthLdap.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 5f1e19522 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 3 14:04:50 2021 +0000 Eliminated duplicate ID web/Themes/default/header.inc | 2 +- web/css/mrbs.css.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit c3396e27d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 29 08:08:16 2020 +0000 Added more profiling information web/lib/MRBS/Auth/AuthLdap.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 294e7a8ab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 29 07:59:40 2020 +0000 Replaced value with constant web/lib/MRBS/Auth/AuthLdap.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 6c1ed5e38 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 29 07:51:35 2020 +0000 Improved error reporting web/lib/MRBS/Auth/AuthLdap.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) commit 4c630b3ea Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 28 18:18:57 2020 +0000 Trivial change web/lib/MRBS/Auth/AuthLdap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bfce82f87 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 28 18:18:03 2020 +0000 Trivial change web/lib/MRBS/Auth/AuthLdap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 59e70f59f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 28 18:16:26 2020 +0000 Removed redundant code web/lib/MRBS/Auth/AuthLdap.php | 248 +------------------------------ 1 file changed, 1 insertion(+), 247 deletions(-) commit 156938301 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 28 18:11:18 2020 +0000 Fixed bug causing admins not to be recognised in some circumstances when using an array of LDAP hosts. At the same time improved performance. web/lib/MRBS/Auth/AuthLdap.php | 227 ++++++++++++++++++++++++++++++- 1 file changed, 223 insertions(+), 4 deletions(-) commit 8eb9fc85c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 28 16:06:13 2020 +0000 Fixed potential bug when working with an array of LDAP hosts web/lib/MRBS/Auth/AuthLdap.php | 4 ++++ 1 file changed, 4 insertions(+) commit 25ef26304 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 24 15:26:25 2020 +0000 Added line number to debug information web/lib/MRBS/Auth/AuthLdap.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit f5e72f5bd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 24 15:05:57 2020 +0000 Added debugging information web/lib/MRBS/Auth/AuthLdap.php | 1 + 1 file changed, 1 insertion(+) commit 9fb8b2a2a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 24 14:46:32 2020 +0000 Fixed bug occurring when $ldap_unbind_between_attempts is set web/lib/MRBS/Auth/AuthLdap.php | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) commit 91f0d2a5d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 24 14:38:23 2020 +0000 Restructured web/lib/MRBS/Auth/AuthLdap.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) commit f92189b46 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 24 14:27:07 2020 +0000 Fixed bug web/lib/MRBS/Auth/AuthLdap.php | 6 ------ 1 file changed, 6 deletions(-) commit a03f499f7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 24 14:13:10 2020 +0000 Restructured web/lib/MRBS/Auth/AuthLdap.php | 80 ++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 36 deletions(-) commit 7b846bce6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 24 12:35:58 2020 +0000 Suppressed legitimate "no such object" LDAP errors web/lib/MRBS/Auth/AuthLdap.php | 66 ++++++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 12 deletions(-) commit 9b2f144bb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 24 12:16:36 2020 +0000 Restructured web/lib/MRBS/Auth/AuthLdap.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit b580c9316 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 23 16:57:02 2020 +0000 Added comments tables.my.sql | 10 +++++----- tables.pg.sql | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) commit ae28472e1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 23 16:06:10 2020 +0000 Added comment web/systemdefaults.inc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit fb00cd65a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 23 15:47:46 2020 +0000 Eliminated use of deprecated parameter signature for ldap_connect(). web/lib/MRBS/Auth/AuthLdap.php | 51 +++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 11 deletions(-) commit c01dd80cc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 23 10:42:00 2020 +0000 Fixed bug when an entry doesn't have a name attribute web/lib/MRBS/Auth/AuthLdap.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) commit 1c2bcf7f5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 23 10:29:57 2020 +0000 Improved performance web/lib/MRBS/Auth/AuthLdap.php | 34 ++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 13 deletions(-) commit 3c267e1b5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 21 18:31:47 2020 +0000 Added comments tables.my.sql | 2 +- tables.pg.sql | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) commit 14a863a38 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 21 18:05:20 2020 +0000 Fixed problem in last commit web/upgrade/81/post.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 624ef1efa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 21 17:48:57 2020 +0000 Fixed problem in upgrade procedure web/upgrade/67/mysql.sql | 12 +++++------ web/upgrade/67/pgsql.sql | 2 +- web/upgrade/81/mysql.sql | 2 -- web/upgrade/81/pgsql.sql | 4 ---- web/upgrade/81/post.inc (new) | 36 +++++++++++++++++++++++++++++++++ 5 files changed, 43 insertions(+), 13 deletions(-) commit d1a56fbd0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 20 13:28:52 2020 +0000 Improved performance when making a booking and using LDAP authentication web/lib/MRBS/Auth/AuthLdap.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) commit 5278c5024 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 18 14:12:53 2020 +0000 Restructured web/report.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) commit 27759c743 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 18 14:02:20 2020 +0000 Fixed bug in last commit web/search.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit 4b63966de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 18 13:54:53 2020 +0000 Restructured web/search.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 547863129 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 18 09:44:21 2020 +0000 Fixed bug when editing a room and $booking_types is not set. See SF Support Requests #2264. web/edit_room.php | 24 ++++++++++++++---------- web/edit_room_handler.php | 10 +++++++++- 2 files changed, 23 insertions(+), 11 deletions(-) commit b1eaeb55c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 5 18:51:07 2020 +0000 Replaced == with === web/js/datatables.js.php | 2 +- web/js/datepicker.js.php | 2 +- web/js/index.js.php | 2 +- web/js/resizable.js.php | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) commit bcb4ce65b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 5 18:48:03 2020 +0000 Replaced == with === web/js/edit_entry.js.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 823a3f572 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 5 18:44:28 2020 +0000 Replaced == with === web/js/general.js.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 45908ae18 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 5 18:28:29 2020 +0000 Fixed invalid CSS selector web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 12c8dc6d0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 5 18:17:48 2020 +0000 Changed parameter name to match interface web/lib/MRBS/SessionHandlerDb.php | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) commit 90e4f8f23 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 5 18:12:22 2020 +0000 Corrected typo in comment web/Themes/classic126/styling.inc | 2 +- web/Themes/default/styling.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 22376e81a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 5 13:40:53 2020 +0000 Added comments. See SF Bugs #497. web/Themes/classic126/styling.inc | 8 ++++---- web/Themes/default/styling.inc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) commit 2e59b522d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 2 15:39:10 2020 +0000 Fixed invalid HTML web/edit_users.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 884bbb193 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 1 16:15:30 2020 +0000 Removed redundant global declaration web/lib/MRBS/Auth/AuthDb.php | 2 -- 1 file changed, 2 deletions(-) commit ec66ad0e8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 1 16:13:18 2020 +0000 Made the "Lost your password" feature in the 'db' auth scheme accept equivalent Gmail addresses. web/lib/MRBS/Auth/AuthDb.php | 108 +++++++++++++++++---------------- 1 file changed, 55 insertions(+), 53 deletions(-) commit 6e8cc1cc7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 1 15:41:26 2020 +0000 Made logging in by email address under the 'db' auth scheme accept equivalent Gmail addresses, ie ignoring dots in the local part of the address and accepting either 'gmail.com' or 'googlemail.com' for the domain. web/functions.inc | 18 ++++++++++++++++++ web/lib/MRBS/Auth/AuthDb.php | 19 +++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) commit 6de7c1aff Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 30 14:17:56 2020 +0000 Fixed bug "Unknown nature 'mediumtext'" introduced in recent commit web/lib/MRBS/DB_mysql.php | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) commit e50ef28da Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 29 12:08:21 2020 +0000 Introduced a new config setting $auth['only_admin_can_book_before'] allowing site admins to set a 'go live' date for bookings. web/mrbs_auth.inc | 31 ++++++++++++++++++++++++++++++- web/systemdefaults.inc.php | 10 ++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) commit 333eac179 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 24 16:05:08 2020 +0000 Restructured web/functions_mail.inc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) commit 89af8aa55 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 24 15:45:44 2020 +0000 Added Column and Columns classes web/lib/MRBS/Column.php (new) | 141 +++++++++++++++++++++++++++++++ web/lib/MRBS/Columns.php (new) | 121 ++++++++++++++++++++++++++ 2 files changed, 262 insertions(+) commit d32a4a180 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 23 16:32:52 2020 +0000 Added new config variable $auth['force_private_for_guests'] which will display all bookings as private to unlogged in users. See SF Support Requests #2213. web/functions.inc | 8 ++++++++ web/systemdefaults.inc.php | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) commit 568257769 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 20 18:44:52 2020 +0000 Fixed bug causing the x-msg scheme to be used sometimes in the reset password link. web/functions.inc | 24 ++++++++++++++++++++++++ web/lib/MRBS/Auth/AuthDb.php | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) commit 4bcfe5a0a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 19 15:05:15 2020 +0000 Fixed bug preventing admins from making public bookings when bookings are forced to be private. web/edit_entry.php | 2 +- web/edit_entry_handler.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 418e09c0a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 11 17:30:25 2020 +0000 Updated zh-cn translations. See SF Patches #106. web/lang/lang.zh-cn | 297 +++++++++++++++++++++++++++++------------- 1 file changed, 207 insertions(+), 90 deletions(-) commit 1d4a0d986 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 6 18:29:00 2020 +0000 Slightly better fix for the recent $override_locale fatal error problem web/internalconfig.inc.php | 13 ------------- web/language.inc | 14 +++++++++++++- web/lib/MRBS/System.php | 4 ++-- 3 files changed, 15 insertions(+), 16 deletions(-) commit 014c67974 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 6 17:04:00 2020 +0000 Fixed bug introduced since 1.9.2 causing a fatal error when using $override_locale. web/lib/MRBS/System.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 2361b5bc8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 6 14:11:19 2020 +0000 Added "[DEBUG] " prefix to LDAP debug messages for consistency with mail debug. web/lib/MRBS/Auth/AuthLdap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f320d6744 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 5 14:33:27 2020 +0000 Updated comments web/mrbs_sql.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 170482700 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 5 14:05:20 2020 +0000 Added support for periods when using registration opens and closes web/edit_entry.php | 11 ++++++++-- web/functions.inc | 10 +++++++++ web/lang/lang.en | 1 + web/mrbs_sql.inc | 48 ++++++++++++++++++++++++++++++++++++++------ web/view_entry.php | 4 ++-- 5 files changed, 64 insertions(+), 10 deletions(-) commit 958f6c1c7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 5 11:24:44 2020 +0000 Added some text at the end of the registration_opens and _closes fields web/edit_entry.php | 14 ++++++++++++-- web/lang/lang.en | 1 + web/lib/MRBS/Form/FieldTimeWithUnits.php | 11 ++++++++++- 3 files changed, 23 insertions(+), 3 deletions(-) commit 0ba0bb2c9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 5 09:47:54 2020 +0000 Made the enablers toggle the disabled checkboxes. Fixed a bug causing the registrant_limit_enabled checkbox to be ignored. web/edit_entry_handler.php | 5 ++++- web/js/edit_entry.js.php | 34 +++++++++++++++++++++++++++++++--- web/js/general.js.php | 3 ++- web/mrbs_sql.inc | 2 +- 4 files changed, 38 insertions(+), 6 deletions(-) commit 6e71dbee2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 4 12:01:21 2020 +0000 Made the registrant_limit_enabled checkbox into an enabler. web/edit_entry.php | 7 +++++-- web/js/general.js.php | 20 +++++++++++++------- 2 files changed, 18 insertions(+), 9 deletions(-) commit 859674246 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 4 11:33:01 2020 +0000 Made the registration opens and closes enabler checkboxes toggle the disabled state of their corresponding times. web/js/edit_area.js.php | 20 -------------------- web/js/general.js.php | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-) commit f2b599e67 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 4 11:27:00 2020 +0000 Fixed minor bug causing the maximum duration units select element not to be disabled when the enabler checkbox is not checked. web/js/edit_area.js.php | 50 +++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 25 deletions(-) commit 3b8b27833 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 3 16:23:28 2020 +0000 Added default settings for registration web/edit_entry.php | 14 +++++++++----- web/systemdefaults.inc.php | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) commit fe49b23b8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 3 15:14:02 2020 +0000 Enforced registration_closes web/mrbs_sql.inc | 16 ++++++++++++++++ web/registration_handler.php | 7 ++++--- web/view_entry.php | 4 ++-- 3 files changed, 22 insertions(+), 5 deletions(-) commit 9969aa54b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 3 14:40:04 2020 +0000 Enforced registration_opens web/mrbs_sql.inc | 8 ++++++++ web/registration_handler.php | 9 ++++++++- web/view_entry.php | 17 +++++++---------- 3 files changed, 23 insertions(+), 11 deletions(-) commit e66f51618 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 3 12:49:16 2020 +0000 Added registration opens and closes dates web/view_entry.php | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) commit ad43aa023 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 1 16:49:22 2020 +0000 Registration opens and closes now saved when making a booking, but not yet used in registration. tables.my.sql | 52 +++++++++-------- tables.pg.sql | 64 ++++++++++---------- web/edit_entry.php | 35 +++++++---- web/edit_entry_handler.php | 92 +++++++++++++++++------------ web/functions_table.inc | 2 +- web/functions_view.inc | 4 +- web/internalconfig.inc.php | 104 +++++++++++++++++---------------- web/lang/lang.de | 10 ++-- web/lang/lang.en | 10 ++-- web/mrbs_sql.inc | 10 +++- web/registration_handler.php | 2 +- web/upgrade/67/mysql.sql | 2 +- web/upgrade/67/pgsql.sql | 2 +- web/upgrade/81/mysql.sql | 10 +++- web/upgrade/81/pgsql.sql | 10 +++- web/view_entry.php | 4 +- 16 files changed, 238 insertions(+), 175 deletions(-) commit 9e9a5ba0b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 1 14:25:39 2020 +0000 Added stub for registration opens field web/edit_entry.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) commit 1b32c9c98 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 31 18:12:51 2020 +0000 Restructured web/edit_area.php | 25 ++-------------------- web/lib/MRBS/Form/FieldTimeWithUnits.php | 2 +- web/lib/MRBS/Form/Form.php | 2 +- 3 files changed, 4 insertions(+), 25 deletions(-) commit 226d0c651 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 31 18:02:08 2020 +0000 Restructured web/edit_area.php | 126 ++++------------- .../MRBS/Form/FieldTimeWithUnits.php (new) | 45 ++++++ web/lib/MRBS/Form/Form.php | 19 +++ 3 files changed, 93 insertions(+), 97 deletions(-) commit 7e52e4564 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 31 11:06:46 2020 +0000 Fixed problem in recent commit web/upgrade/78/mysql.sql | 6 +----- web/upgrade/78/pgsql.sql | 7 ------- 2 files changed, 1 insertion(+), 12 deletions(-) commit 95650f7a0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 31 10:15:52 2020 +0000 Changed schema version to facilitate merge into the roles branch and back again. tables.my.sql | 2 +- tables.pg.sql | 2 +- web/lib/MRBS/DB.php | 2 +- web/upgrade/79/mysql.sql (new) | 1 + web/upgrade/79/pgsql.sql (new) | 0 web/upgrade/80/mysql.sql (new) | 1 + web/upgrade/80/pgsql.sql (new) | 0 web/upgrade/81/mysql.sql (new) | 5 +++++ web/upgrade/81/pgsql.sql (new) | 8 ++++++++ 9 files changed, 18 insertions(+), 3 deletions(-) commit 46d7d0ce4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 30 18:03:37 2020 +0000 Added registration_opens and registration_closes columns. Not used yet. tables.my.sql | 4 +++- tables.pg.sql | 8 ++++++-- web/functions_view.inc | 6 ++++-- web/internalconfig.inc.php | 4 +++- web/lib/MRBS/DB.php | 2 +- web/mrbs_sql.inc | 2 ++ web/upgrade/78/mysql.sql (new) | 5 +++++ web/upgrade/78/pgsql.sql (new) | 8 ++++++++ 8 files changed, 32 insertions(+), 7 deletions(-) commit 0a1cf318b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 30 16:01:35 2020 +0000 Fixed note about backwards compatibility. See SF Support Requests #2219. UPGRADE | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) commit 40bbb39d9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 29 16:22:55 2020 +0000 Fixed bug causing error when editing an entry immediately after registering for an event. See SF Bugs #490. web/view_entry.php | 9 +++++++++ 1 file changed, 9 insertions(+) commit 316e7a8cd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 29 16:07:12 2020 +0000 Fixed typo in comment web/registration_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8efa1693c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 29 15:11:36 2020 +0000 Fixed "DevTools failed to load SourceMap" 404 error. See SF Bugs #493. web/jquery/datatables/pdfmake.min.js.map (new) | 1 + 1 file changed, 1 insertion(+) commit d8968c494 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 29 15:07:16 2020 +0000 Upgraded to latest version of DataTables .../css/buttons.bootstrap.min.css (gone) | 1 - .../css/buttons.dataTables.min.css (gone) | 1 - .../js/buttons.colVis.min.js (gone) | 10 - .../js/buttons.print.min.js (gone) | 9 - .../js/dataTables.buttons.min.js (gone) | 44 -- .../css/buttons.bootstrap.css | 2 + .../css/buttons.bootstrap.min.css (new) | 1 + .../css/buttons.bootstrap4.css | 0 .../css/buttons.bootstrap4.min.css | 0 .../css/buttons.dataTables.css | 23 +- .../css/buttons.dataTables.min.css (new) | 1 + .../css/buttons.foundation.css | 0 .../css/buttons.foundation.min.css | 0 .../css/buttons.jqueryui.css | 0 .../css/buttons.jqueryui.min.css | 0 .../css/buttons.semanticui.css | 0 .../css/buttons.semanticui.min.css | 0 .../css/common.scss | 0 .../css/mixins.scss | 0 .../js/buttons.bootstrap.js | 0 .../js/buttons.bootstrap.min.js | 4 +- .../js/buttons.bootstrap4.js | 0 .../js/buttons.bootstrap4.min.js | 4 +- .../js/buttons.colVis.js | 2 +- .../js/buttons.colVis.min.js (new) | 10 + .../js/buttons.flash.js | 4 +- .../js/buttons.flash.min.js | 54 +- .../js/buttons.foundation.js | 0 .../js/buttons.foundation.min.js | 6 +- .../js/buttons.html5.js | 4 +- .../js/buttons.html5.min.js | 52 +- .../js/buttons.jqueryui.js | 0 .../js/buttons.jqueryui.min.js | 4 +- .../js/buttons.print.js | 0 .../js/buttons.print.min.js (new) | 9 + .../js/buttons.semanticui.js | 0 .../js/buttons.semanticui.min.js | 4 +- .../js/dataTables.buttons.js | 34 +- .../js/dataTables.buttons.min.js (new) | 44 ++ .../swf/flashExport.swf | Bin .../css/dataTables.bootstrap4.min.css (gone) | 1 - .../js/dataTables.bootstrap.min.js (gone) | 11 - .../js/dataTables.bootstrap4.min.js (gone) | 11 - .../js/dataTables.foundation.min.js (gone) | 9 - .../js/dataTables.jqueryui.min.js (gone) | 12 - .../js/dataTables.semanticui.min.js (gone) | 12 - .../js/jquery.dataTables.min.js (gone) | 181 ------ .../css/dataTables.bootstrap.css | 0 .../css/dataTables.bootstrap.min.css | 0 .../css/dataTables.bootstrap4.css | 73 ++- .../css/dataTables.bootstrap4.min.css (new) | 1 + .../css/dataTables.foundation.css | 0 .../css/dataTables.foundation.min.css | 0 .../css/dataTables.jqueryui.css | 13 +- .../css/dataTables.jqueryui.min.css | 2 +- .../css/dataTables.semanticui.css | 0 .../css/dataTables.semanticui.min.css | 0 .../css/jquery.dataTables.css | 13 +- .../css/jquery.dataTables.min.css | 2 +- .../images/sort_asc.png | Bin .../images/sort_asc_disabled.png | Bin .../images/sort_both.png | Bin .../images/sort_desc.png | Bin .../images/sort_desc_disabled.png | Bin .../js/dataTables.bootstrap.js | 2 +- .../js/dataTables.bootstrap.min.js (new) | 14 + .../js/dataTables.bootstrap4.js | 2 +- .../js/dataTables.bootstrap4.min.js (new) | 14 + .../js/dataTables.foundation.js | 2 +- .../js/dataTables.foundation.min.js (new) | 9 + .../js/dataTables.jqueryui.js | 0 .../js/dataTables.jqueryui.min.js (new) | 15 + .../js/dataTables.semanticui.js | 2 +- .../js/dataTables.semanticui.min.js (new) | 15 + .../js/jquery.dataTables.js | 113 ++-- .../js/jquery.dataTables.min.js (new) | 184 ++++++ web/jquery/datatables/datatables.css | 50 +- web/jquery/datatables/datatables.js | 163 +++-- web/jquery/datatables/datatables.min.css | 8 +- web/jquery/datatables/datatables.min.js | 553 +++++++++-------- 80 files changed, 978 insertions(+), 836 deletions(-) commit d090a55c1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 28 15:21:00 2020 +0000 Fixed bug causing the version parameter not to be added to a filename if there's already another parameter in the query string. web/functions.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 2de74e532 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 23 15:29:59 2020 +0100 Updated German translations. See SF Support Requests #2205. web/lang/lang.de | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 012dce726 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 23 14:22:30 2020 +0100 Updated German translations. See SF Support Requests #2205. web/lang/lang.de | 53 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 8 deletions(-) commit bc93c3308 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 22 18:20:50 2020 +0100 Replaced calls to strpos() with utf8_strpos(0 web/approve_entry_handler.php | 2 +- web/dbsys.inc | 2 +- web/edit_area.php | 2 +- web/functions.inc | 2 +- web/functions_error.inc | 4 ++-- web/functions_ical.inc | 6 +++--- web/functions_mail.inc | 2 +- web/import.php | 6 +++--- web/init.inc | 4 ++-- web/lib/MRBS/Auth/AuthDb.php | 2 +- web/lib/MRBS/DB_pgsql.php | 2 +- web/lib/MRBS/MailQueue.php | 2 +- web/lib/MRBS/Session/SessionWithLogin.php | 2 +- web/lib/MRBS/System.php | 4 ++-- web/mrbs_sql.inc | 2 +- web/report.php | 4 ++-- web/search.php | 2 +- web/upgrade/24/post.inc | 2 +- web/upgrade/47/post.inc | 2 +- 19 files changed, 27 insertions(+), 27 deletions(-) commit 32cedf313 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 22 17:47:06 2020 +0100 Fixed bug introduced in last commit web/language.inc | 4 ++++ 1 file changed, 4 insertions(+) commit 2fa8a2f04 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 22 17:36:04 2020 +0100 Added utf8_strpos() web/language.inc | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) commit 888726d94 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 22 17:23:29 2020 +0100 Fixed bug in getting column labels when using PostreSQL with a schema. web/language.inc | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) commit 69ca9182e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 22 15:01:55 2020 +0100 For reminder and more_info emails, put the user's address on the cc line if it can't be put on the from line, in order that the recipient can use it in replies. web/functions_mail.inc | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) commit d350f7a84 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 22 14:37:19 2020 +0100 Changed email notifications so that if the email is a reminder or a request for more information, an iCalendar attachment is not included. Otherwise the recipient may not be able to reply to it. web/functions_mail.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit d6e811c60 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 22 09:40:48 2020 +0100 Fixed a bug preventing email being sent in some circumstances on Apache servers when an open_basedir restriction is in effect. See SF Bugs #489. web/lib/MRBS/MailQueue.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) commit 13537ef72 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 20 09:32:42 2020 +0100 Improved resilience of code to Ajax results from usernames.php. See SF Bugs #491. web/js/general.js.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) commit 2c883306f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 16 18:48:43 2020 +0100 Fixed incorrect links in search results when using multisite. web/search.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit d045968a0 Merge: 913632383 813fd02e5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 15 16:11:30 2020 +0100 Merge commit 813fd02e5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 15 15:57:29 2020 +0100 Fixed problem when an LDAP search returns an entry with a null username. See SF Support Requests #2200. web/lib/MRBS/Auth/AuthLdap.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) commit 913632383 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Oct 14 21:09:40 2020 +0100 Added tag mrbs-1_9_2 for changeset 5e0361b9fbfa commit f9d86eadc (tag: mrbs-1_9_2) Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Oct 14 21:09:30 2020 +0100 Updated NEWS and ChangeLog for release of 1.9.2 ChangeLog | 37 ++++++++++++++++++++++++++++++++++++- NEWS | 14 ++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) commit 86d81f84c Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Oct 14 21:06:50 2020 +0100 Updated version number for release. web/version_num.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit dee02e23b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 14 15:21:30 2020 +0100 Prevented ordinary users from cancelling a registration for an event after it has started. web/registration_handler.php | 6 ++++++ web/view_entry.php | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) commit 5a84ee4bb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 14 14:52:12 2020 +0100 Added a new config variable, $enable_registration, to allow sites to remove the ability to create events for which other people can register. See SF Support Requests #2199. web/edit_entry.php | 3 ++- web/systemdefaults.inc.php | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) commit 9202e2467 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 12 12:15:42 2020 +0100 Fixed bug when upgrading to or installing MRBS 1.9.1 and using MySQL 5.6 or below. See SF Bugs #486. tables.my.sql | 2 +- tables.pg.sql | 2 +- web/upgrade/67/mysql.sql | 2 +- web/upgrade/67/pgsql.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) commit f8a4f5d84 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Oct 10 15:05:35 2020 +0100 Added tag mrbs-1_9_1 for changeset ca4d9201a657 commit 2eac8ec9b (tag: mrbs-1_9_1) Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Oct 10 15:05:23 2020 +0100 NEWS and ChangeLog updated for 1.9.1 release. ChangeLog | 1068 ++++++++++++++++++++++++++++++++++++++++++++++++++- NEWS | 77 ++++ 2 files changed, 1144 insertions(+), 1 deletion(-) commit d36269138 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Oct 10 11:32:19 2020 +0100 Updated version number for release. web/version_num.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0cf628397 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 9 16:50:32 2020 +0100 Improved the password reset request acknowledgement message. web/lang/lang.en | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 184d624a9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 8 17:16:24 2020 +0100 Fixed bug in upgrade process web/standard_vars.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 045337882 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 8 16:04:37 2020 +0100 Fixed bug in PostgreQSL update process when a schema is being used web/upgrade/52/post.inc | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) commit 98a98e044 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 8 15:48:00 2020 +0100 Fixed bug when upgrading from a version before the area table had a sort_key column. web/functions.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit f80497fc0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 8 15:30:23 2020 +0100 Used unqualified table prefix for PostgreSQL constraint, index and trigger names web/dbsys.inc | 4 ++-- web/upgrade.inc | 15 +++++++-------- web/upgrade/44/pgsql.sql | 10 +++++----- web/upgrade/56/pgsql.sql | 2 +- web/upgrade/63/pgsql.sql | 2 +- web/upgrade/67/pgsql.sql | 2 +- web/upgrade/8/pgsql.sql | 2 +- 7 files changed, 18 insertions(+), 19 deletions(-) commit c69ebd88e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 7 18:07:08 2020 +0100 Quoted PostgreSQL constraint identifiers web/upgrade/67/pgsql.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 132306fa4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 3 17:15:00 2020 +0100 Removed redundant code given that the minimum PHP version is 5.5.0 web/lib/MRBS/Auth/Auth.php | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) commit 824dac597 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 30 16:16:48 2020 +0100 Removed redundant global declaration web/functions.inc | 2 -- 1 file changed, 2 deletions(-) commit fd8cd5e7f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 29 18:46:21 2020 +0100 Removed unnecessary qualifiers web/lib/MRBS/Locale.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1500df3c3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 29 18:44:03 2020 +0100 Simplified code web/lib/MRBS/System.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 6b2c16be0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 29 18:39:27 2020 +0100 Fixed potential bug web/lib/MRBS/System.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6c4730d61 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 29 18:33:50 2020 +0100 Added support for more languages in Windows web/lib/MRBS/System.php | 158 +++++++++++++++++++++++++++++--------- 1 file changed, 121 insertions(+), 37 deletions(-) commit 3a032ae27 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 28 18:42:43 2020 +0100 Added support for more languages in Windows web/lib/MRBS/System.php | 157 ++++++++++++++++++++++++++++++-------- 1 file changed, 127 insertions(+), 30 deletions(-) commit 0c13dfc72 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 27 18:14:55 2020 +0100 Added support for more languages in Windows web/lib/MRBS/System.php | 158 ++++++++++++++++++++++++++++++++------ 1 file changed, 133 insertions(+), 25 deletions(-) commit 4032522bb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 26 17:33:59 2020 +0100 Fixed minor mistake in error message web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 51e0c256d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 25 09:29:50 2020 +0100 Added policy check for invalid types web/lang/lang.en | 1 + web/mrbs_sql.inc | 13 ++++++++++++- web/systemdefaults.inc.php | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) commit 4438c8031 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 25 07:55:14 2020 +0100 Fixed upgrade for PostgreSQL web/upgrade/77/pgsql.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1ae8ee3a0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 24 17:02:29 2020 +0100 Added the invalid_types column to the room table. Not used yet - have yet to implement the policy code. tables.my.sql | 3 ++- tables.pg.sql | 3 ++- web/admin.php | 4 ++++ web/css/mrbs.css.php | 4 ++++ web/edit_room.php | 15 ++++++++++++++- web/edit_room_handler.php | 8 ++++++++ web/functions.inc | 21 +++++++++++++++++++++ web/internalconfig.inc.php | 1 + web/lang/lang.en | 3 +++ web/lib/MRBS/DB.php | 2 +- web/mrbs_sql.inc | 14 +++++++++++++- web/upgrade/70/mysql.sql (new) | 1 + web/upgrade/70/pgsql.sql (new) | 0 web/upgrade/71/mysql.sql (new) | 1 + web/upgrade/71/pgsql.sql (new) | 0 web/upgrade/72/mysql.sql (new) | 1 + web/upgrade/72/pgsql.sql (new) | 0 web/upgrade/73/mysql.sql (new) | 1 + web/upgrade/73/pgsql.sql (new) | 0 web/upgrade/74/mysql.sql (new) | 1 + web/upgrade/74/pgsql.sql (new) | 0 web/upgrade/75/mysql.sql (new) | 1 + web/upgrade/75/pgsql.sql (new) | 0 web/upgrade/76/mysql.sql (new) | 1 + web/upgrade/76/pgsql.sql (new) | 0 web/upgrade/77/mysql.sql (new) | 4 ++++ web/upgrade/77/pgsql.sql (new) | 4 ++++ 27 files changed, 88 insertions(+), 5 deletions(-) commit 5cd95555f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 24 14:04:09 2020 +0100 Made the password reset link shorter to avoid problems with the complete address not being copied into the browser address bar. web/lib/MRBS/Auth/AuthDb.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b7b3cc637 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 24 13:40:51 2020 +0100 Fixed problem with MRBS not accepting 'zh-TW' as a locale when using the intl extension. See SF Support Requests #2178. web/language.inc | 3 +- web/lib/MRBS/Auth/AuthCas.php | 3 +- web/lib/{ => MRBS}/Locale.php | 95 ++++++++++++++++++--------------- web/lib/MRBS/System.php | 10 ++-- 4 files changed, 60 insertions(+), 51 deletions(-) commit c2182ee98 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 24 12:34:15 2020 +0100 Fixed bug causing problems if the old auth files are still present web/mrbs_auth.inc | 5 ----- 1 file changed, 5 deletions(-) commit 6d711c2cf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 21 18:58:37 2020 +0100 Added support in Windows for more languages web/lib/MRBS/System.php | 120 ++++++++++++++++++++++---------------- 1 file changed, 69 insertions(+), 51 deletions(-) commit f639727eb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 21 16:44:30 2020 +0100 Changed methods to be protected instead of private to allow extension web/lib/MRBS/Auth/AuthLdap.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit fc407d766 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 21 14:24:20 2020 +0100 Fixed typo in German translation web/lang/lang.de | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) commit 55627bf0a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 21 14:21:49 2020 +0100 Added support in Windows for more Arabic languages web/lib/MRBS/System.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) commit 142753807 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 20 15:07:51 2020 +0100 Fixed typo web/lang/lang.fr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 11f305d49 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 20 14:56:20 2020 +0100 Updated French translations. Thanks to Philippe. See SF Patches #105. web/lang/lang.fr | 232 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 211 insertions(+), 21 deletions(-) commit ebe28f865 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 20 14:46:16 2020 +0100 Added Windows support for Cuban (es-CU) and Latin American (es-419) Spanish. web/lib/MRBS/System.php | 4 ++++ 1 file changed, 4 insertions(+) commit c84f64e1c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 18 10:32:24 2020 +0100 Added the 'idcheck' authentication type. See SF Support Requests #2173. AUTHENTICATION | 9 +++++ web/lib/MRBS/Auth/AuthIdcheck.php (new) | 47 +++++++++++++++++++++++ web/systemdefaults.inc.php | 4 +- 3 files changed, 58 insertions(+), 2 deletions(-) commit 0fd5a42de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 18 09:16:52 2020 +0100 Changed "Possible CSRF attack" message from E_USER_WARNING to E_USER_NOTICE. See SF Support Requests #2174. web/lib/MRBS/Form/Form.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 5da7f131a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 14 17:12:12 2020 +0100 Removed code that's redundant now that the minimum supported PHP version is 5.5.0. web/lib/MRBS/DateTime.php | 74 +------------------------------------ 1 file changed, 1 insertion(+), 73 deletions(-) commit a6c0b6657 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 14 16:24:04 2020 +0100 Advanced the date to the first non-hidden day. See SF Bugs #482 web/lib/MRBS/DateTime.php | 30 ++++++++++++++++++++++++------ web/standard_vars.inc.php | 15 +++++++++++++++ 2 files changed, 39 insertions(+), 6 deletions(-) commit 7b425295a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 12 11:40:11 2020 +0100 Fixed SF Bugs #482 (hidden days not disabled in datepickers). web/css/mrbs.css.php | 4 ++++ web/js/datepicker.js.php | 36 +++++++++++++++++++++++++++--------- web/systemdefaults.inc.php | 4 ---- 3 files changed, 31 insertions(+), 13 deletions(-) commit edaa9c00f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 12 08:07:16 2020 +0100 Fixed bug causing the location not to be shown in print view. See SF Feature Requests #426. web/css/mrbs-print.css.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit 3dc12782a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 8 18:57:35 2020 +0100 Allowed admins to override the private_mandatory setting. See SF Patches #102. web/edit_entry.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit e8d03dfb7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 6 18:24:14 2020 +0100 Added a configuration option to display the mini-calendars above the main calendar when the window narrrows. See SF Support Requests #2156. web/css/mrbs.css.php | 27 ++++++++++++++++++++++++++- web/systemdefaults.inc.php | 7 ++++++- 2 files changed, 32 insertions(+), 2 deletions(-) commit 3f18e0afd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 6 16:04:12 2020 +0100 Reverted accidental change web/css/mrbs.css.php | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) commit 311efa557 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 3 16:18:45 2020 +0100 Fixed typo in comment web/add.php | 2 +- web/css/mrbs.css.php | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) commit f44980b51 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 3 09:02:31 2020 +0100 Fixed bug when a limit is set on both the maximum number and also the total length of bookings per day. See SF Bugs #480. web/mrbs_sql.inc | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) commit 0ea4575b5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 2 17:08:44 2020 +0100 Trivial change forced by editorconfig web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ee8901e8a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 2 15:53:18 2020 +0100 Fixed SF Bugs #479 (cannot edit a booking when $prevent_simultaneous_bookings = true;) web/mrbs_sql.inc | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) commit f8f879fda Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 30 16:33:38 2020 +0100 Removed redundant global declarations web/index.php | 1 - 1 file changed, 1 deletion(-) commit 3e12222c2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 29 11:37:47 2020 +0100 Added missing 'public' declaration web/lib/MRBS/Auth/Auth.php | 2 +- web/lib/MRBS/Session/SessionWordpress.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit efe951e47 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 29 11:25:45 2020 +0100 Added checks where necessary that the authentication type is the same as the session scheme. web/lib/MRBS/Session/SessionCas.php | 1 + web/lib/MRBS/Session/SessionJoomla.php | 7 +++++ web/lib/MRBS/Session/SessionSaml.php | 3 ++ web/lib/MRBS/Session/SessionWithLogin.php | 16 +++++++++++ web/lib/MRBS/Session/SessionWordpress.php | 31 +++++++++++++-------- 5 files changed, 46 insertions(+), 12 deletions(-) commit cf9c82223 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 29 11:16:12 2020 +0100 Added checks where necessary that the session sdcheme is the same as the authentication type. web/lib/MRBS/Auth/Auth.php | 15 +++++++++++++++ web/lib/MRBS/Auth/AuthCas.php | 1 + web/lib/MRBS/Auth/AuthJoomla.php | 8 +------- web/lib/MRBS/Auth/AuthSaml.php | 8 +------- web/lib/MRBS/Auth/AuthWordpress.php | 8 +------- 5 files changed, 19 insertions(+), 21 deletions(-) commit e0916ffc0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 29 10:47:16 2020 +0100 Fixed SF Bugs #477 - CAS setup error web/lib/MRBS/Auth/AuthCas.php | 19 ++++++++++++++++++- web/lib/MRBS/Session/SessionCas.php | 7 +++++++ 2 files changed, 25 insertions(+), 1 deletion(-) commit 5108cfd58 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 24 14:47:43 2020 +0100 Updated DataTables language mappings for new languages. web/language.inc | 3 +++ 1 file changed, 3 insertions(+) commit 4d67e3645 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 24 14:32:58 2020 +0100 Removed old versions of DataTables .../css/buttons.bootstrap.css (gone) | 187 - .../css/buttons.bootstrap.min.css (gone) | 1 - .../css/buttons.bootstrap4.css (gone) | 195 - .../css/buttons.bootstrap4.min.css (gone) | 1 - .../css/buttons.dataTables.css (gone) | 380 - .../css/buttons.dataTables.min.css (gone) | 1 - .../css/buttons.foundation.css (gone) | 214 - .../css/buttons.foundation.min.css (gone) | 1 - .../css/buttons.jqueryui.css (gone) | 240 - .../css/buttons.jqueryui.min.css (gone) | 1 - .../css/buttons.semanticui.css (gone) | 193 - .../css/buttons.semanticui.min.css (gone) | 1 - .../Buttons-1.6.1/css/common.scss (gone) | 37 - .../Buttons-1.6.1/css/mixins.scss (gone) | 153 - .../js/buttons.bootstrap.js (gone) | 70 - .../js/buttons.bootstrap.min.js (gone) | 6 - .../js/buttons.bootstrap4.js (gone) | 68 - .../js/buttons.bootstrap4.min.js (gone) | 6 - .../js/buttons.colVis.js (gone) | 206 - .../js/buttons.colVis.min.js (gone) | 10 - .../Buttons-1.6.1/js/buttons.flash.js (gone) | 1456 -- .../js/buttons.flash.min.js (gone) | 39 - .../js/buttons.foundation.js (gone) | 88 - .../js/buttons.foundation.min.js (gone) | 6 - .../Buttons-1.6.1/js/buttons.html5.js (gone) | 1459 -- .../js/buttons.html5.min.js (gone) | 35 - .../js/buttons.jqueryui.js (gone) | 62 - .../js/buttons.jqueryui.min.js (gone) | 6 - .../Buttons-1.6.1/js/buttons.print.js (gone) | 210 - .../js/buttons.print.min.js (gone) | 9 - .../js/buttons.semanticui.js (gone) | 57 - .../js/buttons.semanticui.min.js (gone) | 6 - .../js/dataTables.buttons.js (gone) | 2015 -- .../js/dataTables.buttons.min.js (gone) | 42 - .../Buttons-1.6.1/swf/flashExport.swf (gone) | Bin 64603 -> 0 bytes .../css/dataTables.bootstrap.css (gone) | 187 - .../css/dataTables.bootstrap.min.css (gone) | 1 - .../css/dataTables.bootstrap4.css (gone) | 206 - .../css/dataTables.bootstrap4.min.css (gone) | 1 - .../css/dataTables.foundation.css (gone) | 118 - .../css/dataTables.foundation.min.css (gone) | 1 - .../css/dataTables.jqueryui.css (gone) | 481 - .../css/dataTables.jqueryui.min.css (gone) | 1 - .../css/dataTables.semanticui.css (gone) | 102 - .../css/dataTables.semanticui.min.css (gone) | 1 - .../css/jquery.dataTables.css (gone) | 448 - .../css/jquery.dataTables.min.css (gone) | 1 - .../images/sort_asc.png (gone) | Bin 160 -> 0 bytes .../images/sort_asc_disabled.png (gone) | Bin 148 -> 0 bytes .../images/sort_both.png (gone) | Bin 201 -> 0 bytes .../images/sort_desc.png (gone) | Bin 158 -> 0 bytes .../images/sort_desc_disabled.png (gone) | Bin 146 -> 0 bytes .../js/dataTables.bootstrap.js (gone) | 182 - .../js/dataTables.bootstrap.min.js (gone) | 11 - .../js/dataTables.bootstrap4.js (gone) | 184 - .../js/dataTables.bootstrap4.min.js (gone) | 11 - .../js/dataTables.foundation.js (gone) | 174 - .../js/dataTables.foundation.min.js (gone) | 9 - .../js/dataTables.jqueryui.js (gone) | 164 - .../js/dataTables.jqueryui.min.js (gone) | 12 - .../js/dataTables.semanticui.js (gone) | 212 - .../js/dataTables.semanticui.min.js (gone) | 12 - .../js/jquery.dataTables.js (gone) | 15334 --------------- .../js/jquery.dataTables.min.js (gone) | 180 - .../css/fixedColumns.bootstrap.css (gone) | 60 - .../fixedColumns.bootstrap.min.css (gone) | 1 - .../css/fixedColumns.bootstrap4.css (gone) | 64 - .../fixedColumns.bootstrap4.min.css (gone) | 1 - .../css/fixedColumns.dataTables.css (gone) | 18 - .../fixedColumns.dataTables.min.css (gone) | 1 - .../css/fixedColumns.foundation.css (gone) | 32 - .../fixedColumns.foundation.min.css (gone) | 1 - .../css/fixedColumns.jqueryui.css (gone) | 12 - .../css/fixedColumns.jqueryui.min.css (gone) | 1 - .../css/fixedColumns.semanticui.css (gone) | 40 - .../fixedColumns.semanticui.min.css (gone) | 1 - .../js/dataTables.fixedColumns.js (gone) | 1659 -- .../js/dataTables.fixedColumns.min.js (gone) | 48 - .../js/fixedColumns.bootstrap.js (gone) | 38 - .../js/fixedColumns.bootstrap.min.js (gone) | 5 - .../js/fixedColumns.bootstrap4.js (gone) | 38 - .../js/fixedColumns.bootstrap4.min.js (gone) | 5 - .../js/fixedColumns.dataTables.js (gone) | 38 - .../js/fixedColumns.foundation.js (gone) | 38 - .../js/fixedColumns.foundation.min.js (gone) | 5 - .../js/fixedColumns.jqueryui.js (gone) | 38 - .../js/fixedColumns.jqueryui.min.js (gone) | 5 - .../js/fixedColumns.semanicui.js (gone) | 0 .../js/fixedColumns.semanticui.js (gone) | 38 - .../js/fixedColumns.semanticui.min.js (gone) | 5 - 90 files changed, 27686 deletions(-) commit 27d265ffd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 24 14:31:13 2020 +0100 Updated DataTables translations web/jquery/datatables/language/Catalan.lang | 62 +++++++++++++----- .../datatables/language/Kannada.lang (new) | 30 +++++++++ .../datatables/language/Mongolian.lang | 4 +- .../datatables/language/Portuguese.lang | 10 +-- .../datatables/language/Punjabi.lang (new) | 30 +++++++++ .../datatables/language/Rumantsch.lang (new) | 54 +++++++++++++++ web/jquery/datatables/language/Serbian.lang | 2 +- .../datatables/language/Serbian_latin.lang | 2 +- web/jquery/datatables/language/Slovak.lang | 2 +- web/jquery/datatables/language/Spanish.lang | 2 +- web/jquery/datatables/language/Swedish.lang | 6 +- 11 files changed, 173 insertions(+), 31 deletions(-) commit 47700b261 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 24 14:23:20 2020 +0100 Upgraded to latest version of DataTables .../css/buttons.bootstrap.css (new) | 187 + .../css/buttons.bootstrap.min.css (new) | 1 + .../css/buttons.bootstrap4.css (new) | 195 + .../css/buttons.bootstrap4.min.css (new) | 1 + .../css/buttons.dataTables.css (new) | 374 + .../css/buttons.dataTables.min.css (new) | 1 + .../css/buttons.foundation.css (new) | 214 + .../css/buttons.foundation.min.css (new) | 1 + .../css/buttons.jqueryui.css (new) | 240 + .../css/buttons.jqueryui.min.css (new) | 1 + .../css/buttons.semanticui.css (new) | 193 + .../css/buttons.semanticui.min.css (new) | 1 + .../Buttons-1.6.3/css/common.scss (new) | 37 + .../Buttons-1.6.3/css/mixins.scss (new) | 161 + .../js/buttons.bootstrap.js (new) | 70 + .../js/buttons.bootstrap.min.js (new) | 6 + .../js/buttons.bootstrap4.js (new) | 68 + .../js/buttons.bootstrap4.min.js (new) | 6 + .../Buttons-1.6.3/js/buttons.colVis.js (new) | 212 + .../js/buttons.colVis.min.js (new) | 10 + .../Buttons-1.6.3/js/buttons.flash.js (new) | 1456 ++ .../js/buttons.flash.min.js (new) | 39 + .../js/buttons.foundation.js (new) | 99 + .../js/buttons.foundation.min.js (new) | 7 + .../Buttons-1.6.3/js/buttons.html5.js (new) | 1461 ++ .../js/buttons.html5.min.js (new) | 36 + .../js/buttons.jqueryui.js (new) | 62 + .../js/buttons.jqueryui.min.js (new) | 6 + .../Buttons-1.6.3/js/buttons.print.js (new) | 210 + .../js/buttons.print.min.js (new) | 9 + .../js/buttons.semanticui.js (new) | 69 + .../js/buttons.semanticui.min.js (new) | 6 + .../js/dataTables.buttons.js (new) | 2157 ++ .../js/dataTables.buttons.min.js (new) | 44 + .../Buttons-1.6.3/swf/flashExport.swf (new) | Bin 0 -> 64603 bytes .../css/dataTables.bootstrap.css (new) | 190 + .../css/dataTables.bootstrap.min.css (new) | 1 + .../css/dataTables.bootstrap4.css (new) | 212 + .../css/dataTables.bootstrap4.min.css (new) | 1 + .../css/dataTables.foundation.css (new) | 118 + .../css/dataTables.foundation.min.css (new) | 1 + .../css/dataTables.jqueryui.css (new) | 481 + .../css/dataTables.jqueryui.min.css (new) | 1 + .../css/dataTables.semanticui.css (new) | 102 + .../css/dataTables.semanticui.min.css (new) | 1 + .../css/jquery.dataTables.css (new) | 448 + .../css/jquery.dataTables.min.css (new) | 1 + .../images/sort_asc.png (new) | Bin 0 -> 160 bytes .../images/sort_asc_disabled.png (new) | Bin 0 -> 148 bytes .../images/sort_both.png (new) | Bin 0 -> 201 bytes .../images/sort_desc.png (new) | Bin 0 -> 158 bytes .../images/sort_desc_disabled.png (new) | Bin 0 -> 146 bytes .../js/dataTables.bootstrap.js (new) | 182 + .../js/dataTables.bootstrap.min.js (new) | 11 + .../js/dataTables.bootstrap4.js (new) | 184 + .../js/dataTables.bootstrap4.min.js (new) | 11 + .../js/dataTables.foundation.js (new) | 174 + .../js/dataTables.foundation.min.js (new) | 9 + .../js/dataTables.jqueryui.js (new) | 164 + .../js/dataTables.jqueryui.min.js (new) | 12 + .../js/dataTables.semanticui.js (new) | 212 + .../js/dataTables.semanticui.min.js (new) | 12 + .../js/jquery.dataTables.js (new) | 15354 +++++++++++++++ .../js/jquery.dataTables.min.js (new) | 181 + .../css/fixedColumns.bootstrap.css (new) | 60 + .../css/fixedColumns.bootstrap.min.css (new) | 1 + .../css/fixedColumns.bootstrap4.css (new) | 64 + .../fixedColumns.bootstrap4.min.css (new) | 1 + .../css/fixedColumns.dataTables.css (new) | 22 + .../fixedColumns.dataTables.min.css (new) | 1 + .../css/fixedColumns.foundation.css (new) | 32 + .../fixedColumns.foundation.min.css (new) | 1 + .../css/fixedColumns.jqueryui.css (new) | 12 + .../css/fixedColumns.jqueryui.min.css (new) | 1 + .../css/fixedColumns.semanticui.css (new) | 40 + .../fixedColumns.semanticui.min.css (new) | 1 + .../js/dataTables.fixedColumns.js (new) | 1677 ++ .../js/dataTables.fixedColumns.min.js (new) | 49 + .../js/fixedColumns.bootstrap.js (new) | 38 + .../js/fixedColumns.bootstrap.min.js (new) | 5 + .../js/fixedColumns.bootstrap4.js (new) | 38 + .../js/fixedColumns.bootstrap4.min.js (new) | 5 + .../js/fixedColumns.dataTables.js (new) | 38 + .../js/fixedColumns.foundation.js (new) | 38 + .../js/fixedColumns.foundation.min.js (new) | 5 + .../js/fixedColumns.jqueryui.js (new) | 38 + .../js/fixedColumns.jqueryui.min.js (new) | 5 + .../js/fixedColumns.semanicui.js (new) | 0 .../js/fixedColumns.semanticui.js (new) | 38 + .../js/fixedColumns.semanticui.min.js (new) | 5 + web/jquery/datatables/datatables.css | 122 +- web/jquery/datatables/datatables.js | 378 +- web/jquery/datatables/datatables.min.css | 10 +- web/jquery/datatables/datatables.min.js | 519 +- 94 files changed, 28528 insertions(+), 419 deletions(-) commit 8b9880beb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 24 12:30:35 2020 +0100 Improved error handling web/ajax/usernames.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit cc301f79d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 24 12:01:51 2020 +0100 Improved previous fix web/report.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit 2fac46558 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 24 11:53:07 2020 +0100 Fixed bug causing no entries to be found in a report when there's a custom field which is an integer and it is left blank in the report form. See SF Support Requests #2142. web/report.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 86b99d546 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 23 17:20:51 2020 +0100 Restructured code web/Themes/default/header.inc | 14 ++++++++++++++ web/style.inc | 15 +-------------- 2 files changed, 15 insertions(+), 14 deletions(-) commit e9edc4479 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 23 17:12:27 2020 +0100 Fixed bug in earlier commit web/style.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 690c014cf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 23 17:09:34 2020 +0100 Fixed bug in earlier commit web/js.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit ffcb248c3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 23 17:06:51 2020 +0100 Added a version parameter to the query string for CSS files to avoid problems with caching. web/functions.inc | 11 ++++++-- web/style.inc | 66 ++++++++++++++++++--------------------------- 2 files changed, 35 insertions(+), 42 deletions(-) commit 20d0bbf13 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 23 14:48:52 2020 +0100 Added a version parameter to the query string for JavaScript files to avoid problems with caching. web/functions.inc | 35 ++++++++--- web/js.inc | 140 ++++++++++++-------------------------------- 2 files changed, 64 insertions(+), 111 deletions(-) commit d67c8d69c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 23 11:31:12 2020 +0100 Removed redundant require statements checklang.php | 3 --- 1 file changed, 3 deletions(-) commit 5968d368c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 23 09:47:46 2020 +0100 Tweaked layout checklang.php | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) commit 67996a240 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 23 09:36:41 2020 +0100 Associated the label with the checkbox checklang.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 0e1948ebf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 23 07:30:20 2020 +0100 Removed redundant code checklang.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit fa541ffb1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 22 18:49:25 2020 +0100 Added label checklang.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) commit 82d5add61 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 22 18:33:45 2020 +0100 Added a lang attribute. checklang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7b521b39c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 22 18:20:09 2020 +0100 Tweaked CSS checklang.php | 1 + 1 file changed, 1 insertion(+) commit 2d8df6a4d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 22 18:15:30 2020 +0100 Added a DOCTYPE checklang.php | 1 + 1 file changed, 1 insertion(+) commit b3a1fbe8f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 22 18:11:45 2020 +0100 Fixed use of deprecated HTML attribute 'border'. checklang.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) commit ee879e79a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 22 17:52:42 2020 +0100 Added translation for 'times_along_top'. See SF Support Requests #2137 web/lang/lang.no | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit d196d14de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 22 17:36:57 2020 +0100 Fixed use of deprecated each() function. checklang.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 5690c3feb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 20 18:49:18 2020 +0100 Added exception handling when calling random_bytes() web/functions.inc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) commit 082552208 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 19 17:53:12 2020 +0100 Updated German translation. Thanks to Tobias Zeumer. See SF Patches #101. web/lang/lang.de | 77 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 71 insertions(+), 6 deletions(-) commit b2367860f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 19 13:54:18 2020 +0100 Respected the sort key when getting the deefault area. web/functions.inc | 2 ++ 1 file changed, 2 insertions(+) commit 350fb8973 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 18 20:34:03 2020 +0100 Fixed bug with error logging. Se SF Support Requests #2132. web/init.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit befaa8a0b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 18 20:11:04 2020 +0100 Fixed LDAP bug. See SF Bugs #475. web/lib/MRBS/Auth/AuthLdap.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 83405edea Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 18 19:00:46 2020 +0100 Tweaked comment web/js/general.js.php | 1 - 1 file changed, 1 deletion(-) commit 499472ec2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 18 18:58:10 2020 +0100 Fixed bug causing unnecessary Ajax POST requests to be fired. web/js/general.js.php | 7 +++++++ 1 file changed, 7 insertions(+) commit c80e9a01e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 18 18:13:28 2020 +0100 Enhanced password reset so that it can handle users with the same email address. web/lang/lang.en | 4 +- web/lib/MRBS/Auth/AuthDb.php | 112 +++++++++++++++++++------------ web/reset_password.php | 56 ++++++++++------ web/reset_password_handler.php | 26 +++++-- 4 files changed, 128 insertions(+), 70 deletions(-) commit 6e47b2a2c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 17 17:20:17 2020 +0100 Added trimming of the username on password reset requests web/reset_password.php | 5 +++++ web/reset_password_handler.php | 1 + 2 files changed, 6 insertions(+) commit 6696563a6 Merge: b7d8ee4e7 f2e572f9c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 17 09:19:24 2020 +0100 Merge with sign_ups commit b7d8ee4e7 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Aug 16 22:47:08 2020 +0100 Added tag mrbs-1_9_0 for changeset f6573540c7f1 commit efb4f2b75 (tag: mrbs-1_9_0) Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Aug 16 22:46:56 2020 +0100 Updated ChangeLog and NEWS for 1.9.0 release ChangeLog | 4772 +++++++++++++++++++++++++++++++++++++++++++++------ NEWS | 95 + 2 files changed, 4330 insertions(+), 537 deletions(-) commit b8b795f20 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Aug 16 22:09:38 2020 +0100 Updated version number for 1.9.0 release web/version_num.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f2e572f9c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 16 17:39:51 2020 +0100 Fixed password reset for PostgreSQL tables.pg.sql | 4 +++- web/lib/MRBS/Auth/AuthDb.php | 6 ++---- web/upgrade/69/pgsql.sql (new) | 5 +++++ 3 files changed, 10 insertions(+), 5 deletions(-) commit 0b527eafc Merge: 0441488ce 16a015b0a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 16 17:17:33 2020 +0100 Merge with db_password_reset commit 16a015b0a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 16 17:16:57 2020 +0100 Fixed problems with edit_users caused by the new columns web/edit_users.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) commit 41d1e11e5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 16 16:27:06 2020 +0100 Fixed problem when £auth['deny_public_access'] is set. web/mrbs_auth.inc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) commit 20bc15481 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 16 16:16:35 2020 +0100 Fleshed out. web/css/mrbs.css.php | 5 ++ web/edit_users.php | 50 +------------------ web/lang/lang.en | 3 ++ web/lib/MRBS/Auth/Auth.php | 48 ++++++++++++++++++ web/lib/MRBS/Auth/AuthDb.php | 35 +++++++++++-- web/reset_password.php | 86 +++++++++++++++++++++++++++----- web/reset_password_handler.php | 53 +++++++++++++++++++- 7 files changed, 214 insertions(+), 66 deletions(-) commit d19932623 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 16 11:39:54 2020 +0100 Tweaked CSS web/css/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit 64da2f613 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 16 11:38:02 2020 +0100 Completed new password form web/css/mrbs.css.php | 4 ++++ web/lang/lang.en | 2 ++ web/reset_password.php | 43 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 48 insertions(+), 1 deletion(-) commit ee873fc17 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 16 08:24:10 2020 +0100 Checked for a valid reset link web/lang/lang.en | 3 ++ web/lib/MRBS/Auth/AuthDb.php | 34 +++++++++++++++++++++ web/reset_password.php | 55 ++++++++++++++++++++++++++++++++-- 3 files changed, 90 insertions(+), 2 deletions(-) commit 3c7cfafce Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 16 07:25:45 2020 +0100 Included the link in the mail message web/lib/MRBS/Auth/AuthDb.php | 45 +++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 14 deletions(-) commit db91599ee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 15 18:30:24 2020 +0100 Almost completed email notification web/lang/lang.en | 5 +++ web/lib/MRBS/Auth/AuthDb.php | 51 ++++++++++++++++++++++++-- web/reset_password_handler.php (new) | 25 +++++++++++++ 3 files changed, 78 insertions(+), 3 deletions(-) commit d7639b8d8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 15 17:07:56 2020 +0100 Implemented writing the reset key to the database tables.my.sql | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) commit d862035bf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 15 17:06:15 2020 +0100 Implemented writing the reset key to the database web/functions.inc | 21 ++++++ web/lib/MRBS/Auth/AuthDb.php | 120 ++++++++++++++++++++++++++++--- web/lib/MRBS/DB.php | 2 +- web/lib/MRBS/Form/Form.php | 29 ++------ web/mrbs_auth.inc | 2 + web/systemdefaults.inc.php | 2 + web/upgrade/69/mysql.sql (new) | 5 ++ 7 files changed, 145 insertions(+), 36 deletions(-) commit aacc68a77 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 15 12:58:31 2020 +0100 Don't allow the user to enter an email address if there are duplicate email addresses in the table web/lib/MRBS/Auth/AuthDb.php | 32 +++++++++++++++++--------------- web/lib/MRBS/DB.php | 12 ++++++++++++ 2 files changed, 29 insertions(+), 15 deletions(-) commit f2c5b2879 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 15 12:19:14 2020 +0100 Restructured web/lib/MRBS/Auth/Auth.php | 8 ++++++++ web/lib/MRBS/Auth/AuthDb.php | 7 +++++++ web/reset_password.php | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) commit cd044984e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 15 12:14:05 2020 +0100 Added password reset form web/lang/lang.en | 33 +++++++------ web/mrbs_auth.inc | 1 + web/reset_password.php (new) | 90 ++++++++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+), 14 deletions(-) commit 8ea0f8b9f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 15 11:21:25 2020 +0100 Added a "Lost your password?" link web/css/mrbs.css.php | 4 ++++ web/lang/lang.en | 1 + web/lib/MRBS/Auth/Auth.php | 6 ++++++ web/lib/MRBS/Auth/AuthDb.php | 7 +++++++ web/lib/MRBS/Form/ElementA.php (new) | 13 +++++++++++++ web/lib/MRBS/Session/SessionWithLogin.php | 19 +++++++++++++++++++ 6 files changed, 50 insertions(+) commit 8b64d2746 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 15 09:56:32 2020 +0100 Operned a new branch for the development of a password reset feature for the 'db' auth scheme. commit 3cae5fa06 Merge: 6a6d061db b16d08771 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 15 09:54:11 2020 +0100 Merge with password_reset commit b16d08771 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 15 09:48:32 2020 +0100 Opened a new branch for the development of a pasword reset feature for the 'db' auth scheme. commit 0441488ce Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 14 17:05:12 2020 +0100 Fixed typos in comments INSTALL | 4 ++-- web/css/mrbs.css.php | 2 +- web/edit_entry_handler.php | 2 +- web/edit_room_handler.php | 6 +++--- web/edit_users.php | 2 +- web/js/functions.js.php | 2 +- web/js/general.js.php | 8 ++++---- web/js/index.js.php | 2 +- web/js/resizable.js.php | 30 +++++++++++++++--------------- web/mrbs_auth.inc | 2 +- 10 files changed, 30 insertions(+), 30 deletions(-) commit b668a9f30 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 14 16:53:43 2020 +0100 Fixed typo in comment web/approve_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b82b28e30 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 14 16:06:11 2020 +0100 Added upgrade for PostgreSQL tables.pg.sql | 4 +++- web/upgrade/68/pgsql.sql (new) | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) commit f39289925 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 14 15:23:22 2020 +0100 Fixed bug causing ajax-loading gif to appear when it shouldn't web/js/general.js.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) commit 007c05c4b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 14 12:32:30 2020 +0100 Only show the person who registered someone if it's someone other than the registrant web/view_entry.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) commit 71c84d03e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 14 12:12:51 2020 +0100 Tweaked CSS web/css/mrbs.css.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 6d43f4e4c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 14 11:47:37 2020 +0100 Removed superfluous buttons web/view_entry.php | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) commit e6edfbd7a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 14 11:38:29 2020 +0100 Restructured code web/css/mrbs.css.php | 4 ++ web/view_entry.php | 110 +++++++++++++++++++---------------------- 2 files changed, 54 insertions(+), 60 deletions(-) commit 441daeb40 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 14 11:00:00 2020 +0100 Fixed HTML validation error web/view_entry.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 4997ba577 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 14 10:52:19 2020 +0100 Tweaked CSS web/css/mrbs.css.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit 4b767c99f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 14 10:46:21 2020 +0100 Fixed HTML validation errors web/view_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 6942bea6a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 14 10:33:45 2020 +0100 Tweaked CSS web/css/mrbs.css.php | 7 +++++++ 1 file changed, 7 insertions(+) commit 0a0b160ec Merge: 472e9e0cd 6a6d061db Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 14 09:18:09 2020 +0100 Merge with default commit 6a6d061db Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 14 09:17:40 2020 +0100 Added note about wotdPress multisite. INSTALL | 3 +++ 1 file changed, 3 insertions(+) commit 472e9e0cd Merge: 7043b0542 6ba85122d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 13 17:55:39 2020 +0100 Merge with default commit 6ba85122d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 13 17:55:04 2020 +0100 Fixed typo in comment web/lib/MRBS/Auth/AuthDb.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 54e76762c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 13 17:54:20 2020 +0100 Fixed bug preventing login when the username is the same as the local part of the email address and the user enters a username containing some uppercase characters. web/lib/MRBS/Auth/AuthDb.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 7043b0542 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 13 17:03:27 2020 +0100 Made the datalist work on mobiles web/js/functions.js.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit 2c0f945d9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 13 16:13:08 2020 +0100 Fixed sorting web/view_entry.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 4a88c41cd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 13 15:49:04 2020 +0100 Fixed bug web/registration_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 039ef37c4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 13 15:36:00 2020 +0100 Made names sortable by last name web/edit_users.php | 36 ------------------------------------ web/functions.inc | 36 ++++++++++++++++++++++++++++++++++++ web/view_entry.php | 13 +++++++++---- 3 files changed, 45 insertions(+), 40 deletions(-) commit 1015b4800 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 12 18:44:44 2020 +0100 Brought into step with latest schema version tables.my.sql | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) commit 055f4bdd4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 12 18:12:45 2020 +0100 Tweaked datatable layout web/css/mrbs.css.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit e9ac7a402 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 12 17:50:55 2020 +0100 Tidied up datatable web/css/mrbs.css.php | 2 +- web/js/view_entry.js.php | 4 +--- web/view_entry.php | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) commit 3157709bd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 12 17:20:38 2020 +0100 Made the table into a datatable web/css/mrbs.css.php | 4 ---- web/js.inc | 2 +- web/js/view_entry.js.php (new) | 21 +++++++++++++++++++++ web/view_entry.php | 4 +++- 4 files changed, 25 insertions(+), 6 deletions(-) commit c6d7bc0ce Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 12 16:23:51 2020 +0100 Added a confirm delete message web/lang/lang.en | 91 ++++++++++++++++++++++---------------------- web/view_entry.php | 19 ++++++--- 2 files changed, 59 insertions(+), 51 deletions(-) commit 9207bb431 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 12 15:45:22 2020 +0100 Tweaked CSS web/css/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit 6eb21cd75 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 12 15:41:08 2020 +0100 Changed cancel button text web/view_entry.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) commit 34078eef2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 12 15:37:15 2020 +0100 Added a cancel button in table of registrants web/css/mrbs.css.php | 9 ++-- web/mrbs_sql.inc | 27 +++++++++++ web/registration_handler.php | 45 ++++++++++++------ web/view_entry.php | 87 ++++++++++++++++++++++++++++++++-- 4 files changed, 146 insertions(+), 22 deletions(-) commit b64ca3a44 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 11 17:31:10 2020 +0100 Added registration date web/css/mrbs.css.php | 6 ++---- web/lang/lang.en | 3 +++ web/view_entry.php | 11 +++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) commit 9ed401c04 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 11 16:49:11 2020 +0100 Restructured web/view_entry.php | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) commit 16dc6ad04 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 11 16:45:14 2020 +0100 Added a create_by column to the list of registrants web/registration_handler.php | 11 +++++++---- web/view_entry.php | 5 ++++- 2 files changed, 11 insertions(+), 5 deletions(-) commit 5c71ecc5f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 11 16:16:09 2020 +0100 Restructured web/mrbs_sql.inc | 8 +++++--- web/registration_handler.php | 2 +- web/view_entry.php | 7 ++++--- 3 files changed, 10 insertions(+), 7 deletions(-) commit 483b89b7d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 11 15:54:02 2020 +0100 Changed text string web/view_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c3a5b7373 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 11 15:49:49 2020 +0100 Made the existing registrant check case insensitive web/functions.inc | 9 +++++++++ web/registration_handler.php | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) commit c490d5049 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 11 15:38:59 2020 +0100 Stopped a user from being registered twice web/registration_handler.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) commit 348d4213a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 11 15:28:52 2020 +0100 Fixed problem preventing others being registered when you are already registered web/view_entry.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit afd249a60 Merge: 51a430843 748b2725b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 11 15:02:19 2020 +0100 Merge with default commit 748b2725b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 11 15:01:57 2020 +0100 Fixed layout problem web/mrbs_auth.inc | 3 +++ 1 file changed, 3 insertions(+) commit 51a430843 Merge: d2f7f80a3 09f83b6e4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 11 14:38:21 2020 +0100 Merge with default commit 09f83b6e4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 11 14:37:47 2020 +0100 Fixed bug when a remote_user login/logoff link has a query string. See SF Support Requests #2126. web/Themes/default/header.inc | 13 +++++++++++++ 1 file changed, 13 insertions(+) commit d2f7f80a3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 11 13:44:53 2020 +0100 Tweaked CSS web/css/mrbs.css.php | 36 +++++++++++++++++++++++++----------- web/view_entry.php | 13 ++++++++++--- 2 files changed, 35 insertions(+), 14 deletions(-) commit 0a345c832 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 10 18:36:18 2020 +0100 Added the ability for admins to register others web/edit_entry.php | 134 ++-------------------------- web/functions.inc | 144 +++++++++++++++++++++++++++++++ web/js/edit_entry.js.php | 88 ------------------- web/js/functions.js.php | 4 +- web/js/general.js.php | 102 ++++++++++++++++++++++ web/lib/MRBS/DB.php | 2 +- web/upgrade/68/mysql.sql (new) | 8 ++ web/view_entry.php | 19 +++- 8 files changed, 283 insertions(+), 218 deletions(-) commit 5b2581af1 Merge: a1d13ef36 7660079b8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 7 15:33:29 2020 +0100 Merge with default commit 7660079b8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 7 15:32:57 2020 +0100 Added information on multisite operation. INSTALL | 13 +++++++++++++ 1 file changed, 13 insertions(+) commit a1d13ef36 Merge: 875a25528 0027075a8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 7 15:11:40 2020 +0100 Merge with default commit 0027075a8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 7 15:10:53 2020 +0100 Fixed SF Bugs #470 web/js/edit_entry.js.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 875a25528 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 6 18:09:56 2020 +0100 Added a config option to control whether other registrants' names are shown. web/systemdefaults.inc.php | 4 ++++ web/view_entry.php | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) commit 9c1d51982 Merge: d2c55b918 ce687cc73 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 6 17:49:35 2020 +0100 Merge with default commit ce687cc73 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 6 17:48:42 2020 +0100 Restored the "Goto" button in the banner on small screens on all pages except the index page, as it's a useful means of returning to the index page. web/css/mrbs.css.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit d2c55b918 Merge: 56d12b182 cd3e0bd49 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 4 17:27:13 2020 +0100 Merge with default commit cd3e0bd49 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 4 17:26:45 2020 +0100 Removed the Login link from the banner when the login form is being displayed in order to avoid users getting confused by having two login buttons and clicking the wrong one. web/Themes/default/header.inc | 10 ++++++---- web/functions.inc | 5 +++-- web/lib/MRBS/Session/SessionWithLogin.php | 7 ++++--- 3 files changed, 13 insertions(+), 9 deletions(-) commit 71259ebd3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 4 17:10:24 2020 +0100 Restructured code web/Themes/default/header.inc | 50 ++++++++++++--------------------- 1 file changed, 18 insertions(+), 32 deletions(-) commit f81a59e7b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 4 16:59:08 2020 +0100 Restructured code web/Themes/default/header.inc | 55 ++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 25 deletions(-) commit fcfe5c198 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 4 16:38:47 2020 +0100 Restructured code web/Themes/default/header.inc | 60 ++++++++++++++++++++++++++++++--- web/functions.inc | 54 +---------------------------- 2 files changed, 56 insertions(+), 58 deletions(-) commit d20b5e13f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 4 16:33:43 2020 +0100 Restructured code web/Themes/default/header.inc | 24 +++++++++++++++++------- web/functions.inc | 11 +---------- 2 files changed, 18 insertions(+), 17 deletions(-) commit 1e8e375a4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 4 16:19:49 2020 +0100 Restructured code web/admin.php | 15 ++++++- web/del.php | 27 ++++++++---- web/edit_area.php | 12 +++++- web/edit_entry.php | 12 +++++- web/edit_entry_handler.php | 24 ++++++++++- web/edit_room.php | 12 +++++- web/edit_users.php | 24 ++++++++++- web/functions.inc | 80 +++++++++++++++++++++++------------- web/help.php | 22 +++++++--- web/import.php | 12 +++++- web/index.php | 14 +++++-- web/mrbs_auth.inc | 24 +++++++---- web/pending.php | 12 +++++- web/report.php | 12 +++++- web/search.php | 12 +++++- web/view_entry.php | 14 ++++++- 16 files changed, 259 insertions(+), 69 deletions(-) commit 56d12b182 Merge: 0c0fdc723 fd5d0aa1b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 2 18:35:27 2020 +0100 Merge with default commit fd5d0aa1b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 2 18:35:06 2020 +0100 Removed unnecessary local variable web/functions_ical.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit c322e7689 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 2 18:32:37 2020 +0100 Removed unnecessary local variable web/functions_table.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit 2076adc27 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 2 18:31:11 2020 +0100 Removed unnecessary local variable web/mrbs_sql.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 0c0fdc723 Merge: f55f2082e 63f5e220f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 31 12:49:07 2020 +0100 Merge with default commit 63f5e220f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 31 12:48:13 2020 +0100 Added a "Copy email addresses" button to the users table so that they can be pasted into an email client enabling admins to email all users. web/edit_users.php | 2 +- web/js/datatables.js.php | 17 +++++++++++-- web/js/edit_users.js.php | 30 +++++++++++++++++++---- web/lang/lang.en | 49 +++++++++++++++++++------------------- 4 files changed, 67 insertions(+), 31 deletions(-) commit f55f2082e Merge: c4e08e880 898ebac9a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 30 14:36:01 2020 +0100 Merge with default commit 898ebac9a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 30 14:35:30 2020 +0100 Fixed bug in last commit web/report.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c4e08e880 Merge: 45a179bc6 90b5b0b63 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 30 14:31:49 2020 +0100 Merge with default commit 90b5b0b63 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 30 14:30:58 2020 +0100 Fixed multisite bug in link in report output web/report.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit 45a179bc6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 27 18:30:24 2020 +0100 Added support for PostgreSQL tables.pg.sql | 129 +++++++++++++++++-------------- web/upgrade/67/pgsql.sql (new) | 19 +++++ 2 files changed, 91 insertions(+), 57 deletions(-) commit 6afa64c48 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 27 16:37:44 2020 +0100 Updated for schema version 67 tables.my.sql | 74 ++++++++++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 29 deletions(-) commit e256b5e8c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 25 18:51:09 2020 +0100 Fixed bug causing mutex lock not to be released. web/registration_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8741239ab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 25 16:24:39 2020 +0100 Restricted ability to create sign-on events to booking admins web/edit_entry.php | 5 +++++ web/mrbs_sql.inc | 22 +++++++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) commit 791ab0c22 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 25 15:40:18 2020 +0100 Added a warning about editing series web/lang/lang.en | 3 +++ web/mrbs_sql.inc | 15 +++++++++++++++ web/view_entry.php | 16 +++++++++++++--- 3 files changed, 31 insertions(+), 3 deletions(-) commit 026fe2b15 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 25 14:31:18 2020 +0100 Fixed edit_entry so that participants are preserved web/mrbs_sql.inc | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) commit efdc3a05b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 25 10:12:50 2020 +0100 Tweaked CSS web/css/mrbs.css.php | 10 ++++++++++ 1 file changed, 10 insertions(+) commit 6803e3f00 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 25 10:01:20 2020 +0100 Converted to showing display names web/view_entry.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit c82a7e775 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 25 07:40:35 2020 +0100 Tweaked CSS web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c2f1a6988 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 25 07:36:42 2020 +0100 Added list of registrants web/view_entry.php | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) commit 374e400c3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 24 14:21:41 2020 +0100 Tweaked CSS web/css/mrbs.css.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 4a87084f8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 24 13:35:10 2020 +0100 Tweaked CSS web/css/mrbs.css.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit d67fda0ee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 24 09:49:53 2020 +0100 Made CSS work on all_rooms view web/functions_table.inc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) commit 42b0efa94 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 24 09:23:55 2020 +0100 Made ordinary week view work web/mrbs_sql.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 8a554de08 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 24 08:54:03 2020 +0100 Fixed CSS web/css/mrbs.css.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit b1d652bd0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 23 17:20:47 2020 +0100 Added styling for registrable events web/css/mrbs.css.php | 5 +++-- web/functions_table.inc | 15 ++++++++++++++- web/mrbs_sql.inc | 11 +++++++---- 3 files changed, 24 insertions(+), 7 deletions(-) commit 186d64551 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 23 14:16:39 2020 +0100 Tweaked CSS web/css/mrbs.css.php | 5 +++++ 1 file changed, 5 insertions(+) commit ebf376c55 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 23 14:10:26 2020 +0100 Tweaked layout web/lang/lang.en | 1 + web/view_entry.php | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) commit 5ec2d6b9e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 23 13:55:37 2020 +0100 Tweaked CSS web/css/mrbs.css.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) commit 7f2adc167 Merge: 78d72cc7c 5bc062971 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 23 12:22:26 2020 +0100 Merge with default commit 5bc062971 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 23 12:21:33 2020 +0100 Added comment web/lib/MRBS/Form/Field.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 78d72cc7c Merge: 435758fe6 9bf288b41 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 23 12:17:44 2020 +0100 Merge with default commit 9bf288b41 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 23 12:17:18 2020 +0100 Added a $raw parameter to Field->setLabel() to enable HTML tags to be used in a label. See SF Feature Requests #422. web/lib/MRBS/Form/Field.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 435758fe6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 23 12:09:10 2020 +0100 Tweaked CSS web/css/mrbs.css.php | 8 +++++++- web/lang/lang.en | 1 + web/view_entry.php | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) commit 173869d67 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 22 16:13:22 2020 +0100 Fixed returning to the previous page web/view_entry.php | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) commit e93154b14 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 22 14:35:19 2020 +0100 Fixed bug when working in multisite mode web/view_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e6d9fa938 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 22 14:24:38 2020 +0100 Added a check that there are spare places web/registration_handler.php | 35 +++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) commit cafbc49bc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 22 14:10:26 2020 +0100 Started on cancellation web/registration_handler.php | 50 ++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 9 deletions(-) commit 7720a5e95 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 22 13:52:48 2020 +0100 Added timestamp web/lang/lang.en | 3 +++ web/registration_handler.php | 7 ++++--- web/upgrade/67/mysql.sql | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) commit b9f45a5c6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 22 12:36:47 2020 +0100 Started registering web/functions_view.inc | 11 ---- web/lang/lang.en | 4 +- web/mrbs_auth.inc | 13 ++--- web/mrbs_sql.inc | 8 +-- web/registration_handler.php (new) | 36 +++++++++++++ web/view_entry.php | 76 +++++++++++++++++++++++++++- 6 files changed, 124 insertions(+), 24 deletions(-) commit 6966202a6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 21 15:46:31 2020 +0100 Restructured web/view_entry.php | 255 +++++++++++++++++++++---------------------- 1 file changed, 127 insertions(+), 128 deletions(-) commit 2830cf17e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 21 15:31:55 2020 +0100 Added number of registrants web/functions_view.inc | 10 +++++++--- web/lang/lang.en | 1 + web/mrbs_sql.inc | 19 +++++++++++++++++++ web/upgrade/67/mysql.sql (new) | 19 +++++++++++++++++++ 4 files changed, 46 insertions(+), 3 deletions(-) commit 0a0e24e12 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 21 14:56:16 2020 +0100 Fixed view_entry web/functions_view.inc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) commit 28c5c45a0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 21 14:37:15 2020 +0100 Initial columns added and working web/css/mrbs.css.php | 4 +- web/edit_entry.php | 45 ++++++++++++++++++++++ web/edit_entry_handler.php | 73 ++++++++++++++++++++---------------- web/internalconfig.inc.php | 5 ++- web/lang/lang.en | 3 ++ web/lib/MRBS/DB.php | 2 +- web/mrbs_sql.inc | 14 ++++++- 7 files changed, 109 insertions(+), 37 deletions(-) commit 9da1ed7cb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 21 09:21:32 2020 +0100 Opened a new branch to allow users to sign up to a booking commit cfb57215c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 20 08:54:36 2020 +0100 Changed the way that $auth['log_credentials'] works so that the username and password are not replaced by '****' if they are set to the empty string. This is so that it's possible to spot logout actions. web/functions_error.inc | 2 +- web/systemdefaults.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit d7b3f592f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 19 16:08:26 2020 +0100 Fixed problem with native datepickers not being used in iOS 13 Safari. See SF Bugs #473. web/js/datepicker.js.php | 22 +++++++++++++++++++++- web/js/functions.js.php | 11 ++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) commit d9486d2e2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 19 15:43:21 2020 +0100 Fixed bug causing datepickers not to be shown in Safari and Firefox on iPhone. See SF Bugs #473. web/css/mrbs.css.php | 4 ---- 1 file changed, 4 deletions(-) commit 6482e3ba5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 17 16:07:58 2020 +0100 Fixed 404 error in Ajax requests when the user is not logged in to index.php and index.php requires a logged in user web/js/index.js.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) commit 7dc65011c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 17 15:43:52 2020 +0100 Fixed problem causing "session_destroy(): Session object destruction failed" error messages when the page becomes visible again after the inactivity timeout has been exceeded. web/js/refresh.js.php | 60 ++++++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 24 deletions(-) commit 96d22f846 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 17 12:42:43 2020 +0100 Fixed minor bug web/js/index.js.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit d96125159 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 16 19:32:31 2020 +0100 Removed unnecessary semicolon. web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 41164efe1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 16 17:44:55 2020 +0100 Fixed missing return argument. web/edit_users.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 4de877c55 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 16 16:17:46 2020 +0100 Fixed problem caused by trailing spaces in the username in the 'http' session scheme. web/lib/MRBS/Session/SessionHttp.php | 38 ++++++++++++++++---------- 1 file changed, 23 insertions(+), 15 deletions(-) commit ee76ae1aa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 13 08:55:59 2020 +0100 Fixed problem with an unnecessary CSRF error message being generated if the user logs off after the session has expired due to inactivity. web/lib/MRBS/Session/SessionWithLogin.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) commit 9bb9f3e53 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 12 18:27:18 2020 +0100 Added a config option $prevent_simultaneous_bookings to stop users booking two different rooms at the same time. See SF Bugs #472. web/lang/lang.en | 1 + web/mrbs_sql.inc | 56 ++++++++++++++++++++++++++++++++++-- web/systemdefaults.inc.php | 4 +++ 3 files changed, 59 insertions(+), 2 deletions(-) commit 3d1021bb5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 11 18:31:08 2020 +0100 Fixed bug in import.php web/import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 01c4b51a9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 11 17:38:26 2020 +0100 Removed redundant file web/Mail.php (gone) | 270 ------------------------------------------ 1 file changed, 270 deletions(-) commit edb87c5db Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 11 17:31:02 2020 +0100 Fixed bug causing the user not to be logged off in the event of a CSRF token mismatch. web/lib/MRBS/Form/Form.php | 4 ++-- web/lib/MRBS/Session/SessionCas.php | 2 +- web/lib/MRBS/Session/SessionCookie.php | 2 +- web/lib/MRBS/Session/SessionJoomla.php | 2 +- web/lib/MRBS/Session/SessionPhp.php | 2 +- web/lib/MRBS/Session/SessionWithLogin.php | 2 +- web/lib/MRBS/Session/SessionWordpress.php | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) commit 0febf8db4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 11 16:19:42 2020 +0100 Fixed incompatible return type warning. web/functions_mail.inc | 1 - 1 file changed, 1 deletion(-) commit 386b472ba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 11 02:07:10 2020 +0100 Fixed bug introduced in recent commit causing incorrect policy checking of the number of bookings. web/mrbs_sql.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit d56eb7933 Merge: 47bd269aa 4deb1cbb0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 10 15:09:23 2020 +0100 Merge with session_and_auth_classes commit 4deb1cbb0 Merge: 407eeff69 47bd269aa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 10 14:54:47 2020 +0100 Merge with default commit 47bd269aa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 10 14:54:26 2020 +0100 Fixed bug causing high client CPU load in some circumstances when $show_timeline is true. See SF Support Requests #2107. web/js/refresh.js.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) commit 407eeff69 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 9 17:51:40 2020 +0100 Removed 'smtp' authentication type web/Net/SMTP.php (gone) | 1275 ------------------------------- web/Net/Socket.php (gone) | 738 ------------------ web/auth/auth_smtp.inc (gone) | 111 --- web/systemdefaults.inc.php | 2 +- 4 files changed, 1 insertion(+), 2125 deletions(-) commit 647412f26 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 9 17:40:55 2020 +0100 Converted auth_auth_basic to a class. Not sure that this auth type has ever worked: it seems to require a file System.php which doesn't exist? web/auth/auth_auth_basic.inc (gone) | 118 -------------------- web/lib/MRBS/Auth/AuthAuthBasic.php (new) | 74 ++++++++++++ 2 files changed, 74 insertions(+), 118 deletions(-) commit 117a4daac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 9 17:09:56 2020 +0100 Converted auth_saml to a class. Not tested. web/auth/auth_saml.inc (gone) | 104 -------------------- web/lib/MRBS/Auth/AuthSaml.php (new) | 130 +++++++++++++++++++++++++ web/lib/MRBS/Session/SessionSaml.php | 64 ++++++------ 3 files changed, 166 insertions(+), 132 deletions(-) commit cf5b5ce89 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 9 15:35:25 2020 +0100 Converted auth_cas to a class web/auth/auth_cas.inc (gone) | 147 -------------------------- web/lib/MRBS/Auth/AuthCas.php (new) | 129 ++++++++++++++++++++++ web/lib/MRBS/Session/SessionCas.php | 32 +++--- 3 files changed, 145 insertions(+), 163 deletions(-) commit d414d8361 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 9 14:25:53 2020 +0100 Converted auth_crypt to a class web/auth/auth_crypt.inc (gone) | 121 ------------------------ web/lib/MRBS/Auth/AuthCrypt.php (new) | 76 +++++++++++++++ 2 files changed, 76 insertions(+), 121 deletions(-) commit 81b43f570 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 7 16:22:03 2020 +0100 Removed redundant global declaration web/lib/MRBS/Auth/AuthPop3.php | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) commit 092e146cf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 7 16:16:02 2020 +0100 Converted auth_pop3 to a class web/auth/auth_pop3.inc (gone) | 198 ------------------------- web/lib/MRBS/Auth/AuthPop3.php (new) | 162 ++++++++++++++++++++ 2 files changed, 162 insertions(+), 198 deletions(-) commit 497a0dcb9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 7 15:19:57 2020 +0100 Removed unused use declarations web/lib/MRBS/Auth/AuthExt.php | 2 -- web/lib/MRBS/Auth/AuthImap.php | 2 -- web/lib/MRBS/Auth/AuthImapPhp.php | 2 -- web/lib/MRBS/Auth/AuthNw.php | 3 +-- 4 files changed, 1 insertion(+), 8 deletions(-) commit 807ebaf28 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 7 15:15:09 2020 +0100 Converted auth_nw to a class web/auth/auth_nw.inc (gone) | 91 ---------------------------- web/lib/MRBS/Auth/AuthNw.php (new) | 51 ++++++++++++++++ 2 files changed, 51 insertions(+), 91 deletions(-) commit 0dfa0b248 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 7 15:07:09 2020 +0100 Fixed comments web/lib/MRBS/Auth/AuthImap.php | 34 +++++++++----- web/lib/MRBS/Auth/AuthImapPhp.php | 70 ++++++++++++++++------------- 2 files changed, 62 insertions(+), 42 deletions(-) commit ddd0cc206 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 7 14:58:31 2020 +0100 Converted auth_ext to a class web/auth/auth_ext.inc (gone) | 131 -------------------------- web/lib/MRBS/Auth/AuthExt.php (new) | 75 +++++++++++++++ 2 files changed, 75 insertions(+), 131 deletions(-) commit 137bf91f8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 7 14:45:07 2020 +0100 Removed the 'nis' authentication type as the PHP YP/NIS functions were dropped in PHP 5.1.0. AUTHENTICATION | 17 +---- web/auth/auth_nis.inc (gone) | 111 --------------------------------- web/systemdefaults.inc.php | 2 +- 3 files changed, 2 insertions(+), 128 deletions(-) commit cc1d0162d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 7 14:30:42 2020 +0100 Removed redundant global declaratioon web/lib/MRBS/Auth/AuthImap.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit 7181360e6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 7 14:23:56 2020 +0100 Converted auth_imap to a class web/auth/auth_imap.inc (gone) | 173 ------------------------- web/lib/MRBS/Auth/AuthImap.php (new) | 125 ++++++++++++++++++ 2 files changed, 125 insertions(+), 173 deletions(-) commit 2bff29938 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 7 13:55:32 2020 +0100 Converted auth_imap_php to a class web/auth/auth_imap_php.inc (gone) | 145 ---------------------- web/lib/MRBS/Auth/AuthImapPhp.php (new) | 110 ++++++++++++++++ 2 files changed, 110 insertions(+), 145 deletions(-) commit d30fafa05 Merge: 77f939f1d 03d3d87c1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 7 11:58:28 2020 +0100 Merge with default commit 03d3d87c1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 7 11:22:52 2020 +0100 Fixed undefined index errors web/auth/auth_imap_php.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 77f939f1d Merge: b6e2c2606 f4ac99292 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 6 18:21:27 2020 +0100 Merge with default commit f4ac99292 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 6 18:20:59 2020 +0100 Improved internationalisation of password policy rule text strings web/edit_users.php | 2 +- web/lang/lang.cs | 12 ++++++------ web/lang/lang.de | 12 ++++++------ web/lang/lang.en | 12 ++++++------ web/lang/lang.es | 12 ++++++------ web/lang/lang.fi | 12 ++++++------ web/lang/lang.fr | 12 ++++++------ web/lang/lang.he | 12 ++++++------ web/lang/lang.hu | 12 ++++++------ web/lang/lang.id | 12 ++++++------ web/lang/lang.it | 12 ++++++------ web/lang/lang.ja | 12 ++++++------ web/lang/lang.ms | 12 ++++++------ web/lang/lang.nb | 12 ++++++------ web/lang/lang.nl | 12 ++++++------ web/lang/lang.nn | 12 ++++++------ web/lang/lang.no | 12 ++++++------ web/lang/lang.pl | 12 ++++++------ web/lang/lang.pt | 12 ++++++------ web/lang/lang.pt-br | 12 ++++++------ web/lang/lang.ro | 12 ++++++------ web/lang/lang.ru | 12 ++++++------ web/lang/lang.sk | 12 ++++++------ web/lang/lang.sr-latn-rs | 12 ++++++------ web/lang/lang.sv | 12 ++++++------ web/lang/lang.th | 12 ++++++------ web/lang/lang.tr | 12 ++++++------ web/lang/lang.zh-cn | 12 ++++++------ 28 files changed, 163 insertions(+), 163 deletions(-) commit 44323946c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 6 17:55:23 2020 +0100 Only display password policy rules broken of the number of this type of character required is greater than 0. web/edit_users.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit b6e2c2606 Merge: bcdfd614d c11f96da5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 3 18:32:56 2020 +0100 Merge with default commit c11f96da5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 3 18:29:57 2020 +0100 Fixed bug causing incorrect language string to be output web/upgrade.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bcdfd614d Merge: ea4729828 3b83d8da2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 3 18:08:54 2020 +0100 Merge with default commit 3b83d8da2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 3 18:08:33 2020 +0100 Removed unnecessary pass by reference declarations web/mrbs_sql.inc | 2 +- web/report.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit ea4729828 Merge: e89c4c646 e6728140c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 3 18:02:07 2020 +0100 Merge with default commit e6728140c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 3 17:59:25 2020 +0100 Removed unnecessary pass by reference declarations web/report.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 3fd85dd65 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 3 17:54:18 2020 +0100 Removed unnecessary pass by reference declarations web/mrbs_sql.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit b13dc0251 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 3 17:49:32 2020 +0100 Removed unnecessary pass by reference web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e7d6e91a9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 3 17:39:00 2020 +0100 Removed unnecessary semicolon web/js/edit_entry.js.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 82d316ae3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 3 17:35:44 2020 +0100 Simplified code web/js/index.js.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit a6e03ae70 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 3 17:23:19 2020 +0100 Removed unnecessary semicolons web/Themes/default/header.inc | 2 +- web/Themes/default/styling.inc | 2 +- web/edit_users.php | 4 +- web/import.php | 124 +++++++++++++++---------------- web/language.inc | 2 +- web/view_entry.php | 4 +- 6 files changed, 69 insertions(+), 69 deletions(-) commit e89c4c646 Merge: 5e09b88b3 6ea61cb21 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 3 16:47:04 2020 +0100 Merge with default commit 6ea61cb21 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 3 16:46:44 2020 +0100 Fixed timetohighlight in the week view web/functions_table.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 5e09b88b3 Merge: 259b74136 3e4f8fa4a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 3 11:56:59 2020 +0100 Merge with default commit 3e4f8fa4a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 3 11:56:36 2020 +0100 Made it clear that the new limits on total length of bookings only apply to areas in "times" mode and changed the code so that only bookings in those areas are included in the check. web/areadefaults.inc.php | 1 + web/lang/lang.en | 2 +- web/mrbs_sql.inc | 7 ++++++- web/systemdefaults.inc.php | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) commit 259b74136 Merge: a21e369ac 6d5237270 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 3 10:51:42 2020 +0100 Merge with default commit 6d5237270 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 3 10:51:20 2020 +0100 Fixed problem with the brief description field not receiving focus. See SF Bugs #468 web/js/edit_entry.js.php | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) commit a21e369ac Merge: bf89135b9 12590f0b4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 30 21:49:10 2020 +0100 Merge with default commit 12590f0b4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 30 21:47:06 2020 +0100 Fixed undefined function bug. web/lib/MRBS/DB_pgsql.php | 2 +- web/lib/MRBS/Form/Form.php | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) commit bf89135b9 Merge: 716b1e7d8 e20af7317 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 30 21:22:41 2020 +0100 Merge with default commit e20af7317 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 30 21:22:07 2020 +0100 Changed calls to resolve_table from dynamic to static web/lib/MRBS/DB_pgsql.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 716b1e7d8 Merge: 6b6f72413 8b241bccb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 30 20:49:37 2020 +0100 Merge with default commit 8b241bccb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 30 20:47:19 2020 +0100 Replaced dynamic calls to PHPMailer::parseAddresses() with static calls web/functions_mail.inc | 3 +-- web/lib/MRBS/MailQueue.php | 11 +++++------ 2 files changed, 6 insertions(+), 8 deletions(-) commit 6b6f72413 Merge: c7dc2717b 03e89dbf0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 30 18:49:04 2020 +0100 Merge with default commit 03e89dbf0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 30 18:48:37 2020 +0100 Improved previous fix to account for DST transitions web/mrbs_sql.inc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) commit c7dc2717b Merge: 07950e95c 690c2736d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 30 18:40:19 2020 +0100 Merge with default commit 690c2736d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 30 18:39:32 2020 +0100 Fixed typo in comment web/mrbs_sql.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 07950e95c Merge: e766aee94 de1ccda23 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 30 17:26:44 2020 +0100 Merge with default commit de1ccda23 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 30 17:26:24 2020 +0100 Fixed SF Bugs #466 (it's possible to create a series which has overlapping entries) web/lang/lang.en | 1 + web/mrbs_sql.inc | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) commit dfc8f55b2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 30 17:09:58 2020 +0100 Improved wording of "Too many entries" message web/lang/lang.ca | 2 +- web/lang/lang.cs | 2 +- web/lang/lang.da | 2 +- web/lang/lang.de | 2 +- web/lang/lang.el | 2 +- web/lang/lang.en | 2 +- web/lang/lang.es | 2 +- web/lang/lang.eu | 2 +- web/lang/lang.fi | 2 +- web/lang/lang.fr | 2 +- web/lang/lang.he | 2 +- web/lang/lang.hu | 2 +- web/lang/lang.id | 2 +- web/lang/lang.it | 2 +- web/lang/lang.ja | 2 +- web/lang/lang.ko | 2 +- web/lang/lang.ms | 2 +- web/lang/lang.nb | 2 +- web/lang/lang.nl | 2 +- web/lang/lang.nn | 2 +- web/lang/lang.no | 2 +- web/lang/lang.pl | 2 +- web/lang/lang.pt | 2 +- web/lang/lang.pt-br | 2 +- web/lang/lang.ro | 2 +- web/lang/lang.ru | 2 +- web/lang/lang.sk | 2 +- web/lang/lang.sl | 2 +- web/lang/lang.sr-latn-rs | 2 +- web/lang/lang.sv | 2 +- web/lang/lang.th | 2 +- web/lang/lang.tr | 2 +- web/lang/lang.zh-cn | 2 +- web/lang/lang.zh-tw | 2 +- web/mrbs_sql.inc | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) commit a5170be25 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 30 16:55:59 2020 +0100 Fixed bug causing the too many entries error mesage not to be displayed web/mrbs_sql.inc | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) commit e766aee94 Merge: 3f1a70b41 5e0fd0374 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 30 11:30:40 2020 +0100 Merge with default commit 5e0fd0374 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 30 11:30:01 2020 +0100 Fixed bug introduced in recent change web/internalconfig.inc.php | 5 +++++ 1 file changed, 5 insertions(+) commit 3f1a70b41 Merge: ce825a3e0 e98297e6d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 29 15:58:48 2020 +0100 Merge with default commit e98297e6d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 29 15:30:09 2020 +0100 Tweaked CSS web/css/mrbs.css.php | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) commit 2ccaed916 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 29 14:10:35 2020 +0100 Limited the highest unit of time to 'hours' to avoid confusion between a calendar and booking day. web/edit_area.php | 24 ++++++++++++++++++------ web/functions.inc | 33 +++++++++++++++++++++------------ 2 files changed, 39 insertions(+), 18 deletions(-) commit 6d969a077 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 29 12:33:49 2020 +0100 Added a GUI for managing the per-area limits on total length of bookings. web/areadefaults.inc.php | 22 +++++++++ web/css/mrbs.css.php | 8 ++-- web/edit_area.php | 91 +++++++++++++++++++++++++++++++++++- web/edit_area_handler.php | 27 +++++++++++ web/functions.inc | 23 ++++++++- web/internalconfig.inc.php | 11 +++++ web/lang/lang.en | 6 +++ web/systemdefaults.inc.php | 5 +- 8 files changed, 184 insertions(+), 9 deletions(-) commit 9e6899dda Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 28 11:58:57 2020 +0100 Upgraded database to allow per-area settings for total length of bookings. Management GUI yet to be implemented. tables.my.sql | 106 +++++++++++++++++-------------- tables.pg.sql | 106 +++++++++++++++++-------------- web/lib/MRBS/DB.php | 2 +- web/upgrade/66/mysql.sql (new) | 13 ++++ web/upgrade/66/pgsql.sql (new) | 13 ++++ 5 files changed, 143 insertions(+), 97 deletions(-) commit ce825a3e0 Merge: 2bdd176f8 8cde8ec52 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 28 11:20:02 2020 +0100 Merge with default commit 8cde8ec52 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 28 11:19:18 2020 +0100 Removed redundant functions web/functions.inc | 47 --------------------------------------------- 1 file changed, 47 deletions(-) commit 06c3d3770 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 28 11:16:13 2020 +0100 Removed redundant function web/functions.inc | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) commit 2bdd176f8 Merge: f16fc132c 784d36e1c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 28 10:37:16 2020 +0100 Merge with default commit 784d36e1c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 28 10:35:21 2020 +0100 Fixed problem with booking admins not being able to resize rooms. See also SF Bugs #463. web/js/resizable.js.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit e4b69236a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 28 10:24:39 2020 +0100 Fixed SF Bugs #463 web/Themes/default/header.inc | 17 +++++++++-------- web/js/edit_entry.js.php | 8 ++++---- 2 files changed, 13 insertions(+), 12 deletions(-) commit f16fc132c Merge: fc9334bbd 2f110c5a7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 28 08:04:10 2020 +0100 Merge with default commit 2f110c5a7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 28 07:58:59 2020 +0100 Updated to be compatible with PHP8 ("Error handlers that expect error_reporting to be 0 when @ is used, should be adjusted to use a mask check instead") web/functions_error.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 14f19ca90 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 28 07:43:37 2020 +0100 Changed function parameter order (having required parameters after optional parameters is deprecated in PHP8). web/del_entry.php | 4 ++-- web/functions_mail.inc | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) commit d86558b24 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 28 07:34:57 2020 +0100 Changed function parameter order (having required parameters after optional parameters is deprecated in PHP8). web/functions_mail.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit fc9334bbd Merge: e0ac6aad8 3dc827fda Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 23 16:48:35 2020 +0100 Merge with default commit 3dc827fda Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 23 16:48:14 2020 +0100 Implemented global limits on the total *length" of bookings per day/week/month/year web/lang/lang.en | 10 ++++ web/mrbs_sql.inc | 103 +++++++++++++++++++++++++++++------ web/systemdefaults.inc.php | 22 +++++++- 3 files changed, 118 insertions(+), 17 deletions(-) commit e0ac6aad8 Merge: 09e79a87e 07dc07c8f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 23 12:46:13 2020 +0100 Merge with default commit 07dc07c8f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 23 12:45:49 2020 +0100 Switched to using scandir() instead of the DirectoryIterator in order to ensure that the sites are sorted. web/upgrade.inc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) commit 09e79a87e Merge: 6deb7700a ff0617a7f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 22 10:06:19 2020 +0100 Merge with default commit ff0617a7f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 22 10:05:58 2020 +0100 Moved $times_along_top and $default_type into areadefaults.inc.php web/areadefaults.inc.php | 42 ++++++++++++++++++++++++++---------- web/systemdefaults.inc.php | 10 --------- 2 files changed, 31 insertions(+), 21 deletions(-) commit 6deb7700a Merge: 733116380 20a2f8635 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 21 16:55:52 2020 +0100 Merge with default commit 20a2f8635 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 21 16:55:09 2020 +0100 Updated schema version numbers tables.my.sql | 2 +- tables.pg.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 3bdfa9c69 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 21 16:51:42 2020 +0100 Reordered fields web/edit_area.php | 54 ++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 27 deletions(-) commit feb5ea113 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 21 16:51:25 2020 +0100 Inserted a null upgrade to avoid a conflict with upgrade 64 in the session_and_auth_classes branch web/lib/MRBS/DB.php | 2 +- web/upgrade/64/mysql.sql | 6 +----- web/upgrade/64/pgsql.sql | 5 ----- web/upgrade/65/mysql.sql (new) | 5 +++++ web/upgrade/65/pgsql.sql (new) | 5 +++++ web/upgrade/{64 => 65}/post.inc | 0 6 files changed, 12 insertions(+), 11 deletions(-) commit 733116380 Merge: bda73749a e7c288574 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 21 16:20:48 2020 +0100 Merge with default commit e7c288574 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 21 15:51:11 2020 +0100 Restructured web/functions.inc | 15 +++++++++------ web/report.php | 10 ++-------- 2 files changed, 11 insertions(+), 14 deletions(-) commit efbc97ce7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 21 15:28:43 2020 +0100 Restructured web/edit_entry.php | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) commit 5bffa835b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 21 15:17:43 2020 +0100 Restructured web/edit_area.php | 21 --------------------- web/functions.inc | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 21 deletions(-) commit bfb963579 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 21 15:03:48 2020 +0100 Added management GUI for default_type web/edit_area.php | 28 ++++++++++++++++++++++++++++ web/edit_area_handler.php | 3 +++ 2 files changed, 31 insertions(+) commit bbc501996 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 21 14:18:57 2020 +0100 Added management GUI for times_along_top web/edit_area.php | 7 +++++++ web/edit_area_handler.php | 37 ++++++++++++++++++++++--------------- web/lang/lang.en | 1 + 3 files changed, 30 insertions(+), 15 deletions(-) commit 3c605a460 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 21 08:30:56 2020 +0100 Added two new per-area settings to the area table (no GUI for managing them yet) tables.my.sql | 4 +++- tables.pg.sql | 4 +++- web/functions.inc | 4 +++- web/internalconfig.inc.php | 9 ++++++--- web/lib/MRBS/DB.php | 2 +- web/upgrade/64/mysql.sql (new) | 5 +++++ web/upgrade/64/pgsql.sql (new) | 5 +++++ web/upgrade/64/post.inc (new) | 21 +++++++++++++++++++++ 8 files changed, 47 insertions(+), 7 deletions(-) commit bda73749a Merge: bc582d669 ee3f41638 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 20 18:40:35 2020 +0100 Merge with default commit ee3f41638 Merge: c138438d2 c726b4fc5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 20 18:38:32 2020 +0100 Merge with multisite_upgrade commit c726b4fc5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 20 18:15:55 2020 +0100 Made database upgrading work in multisite mode web/lang/lang.en | 3 ++ web/upgrade.inc | 92 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 80 insertions(+), 15 deletions(-) commit bc582d669 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jun 17 17:50:03 2020 +0100 Fixed bugs from merge web/lib/MRBS/Auth/AuthDb.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit b0df19242 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jun 17 17:08:06 2020 +0100 Fixed merge web/lib/MRBS/Auth/AuthDb.php | 39 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 19 deletions(-) commit dada3c43c Merge: 79405abc0 c138438d2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jun 17 16:56:57 2020 +0100 Merge with default commit c138438d2 Merge: 97fb9781b 635536734 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jun 17 16:48:36 2020 +0100 Merge with multisite_upgrade commit 635536734 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jun 17 16:18:37 2020 +0100 Fixed merge web/mrbs_sql.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit e90dc97ad Merge: 4382d17f4 97fb9781b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jun 17 16:17:23 2020 +0100 Merge with default commit 97fb9781b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jun 17 16:16:58 2020 +0100 Fixed bug when upgrading from early versions of MRBS web/mrbs_sql.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit 4382d17f4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 16 16:25:42 2020 +0100 Replaced use of $tbl_* globals with new _tbl() function web/admin.php | 13 +- web/ajax/del_entries.php | 6 +- web/auth/auth_db.inc | 44 +++---- web/dbsys.inc | 49 +++---- web/del.php | 33 +++-- web/edit_area_handler.php | 2 +- web/edit_entry.php | 19 +-- web/edit_entry_handler.php | 14 +- web/edit_room.php | 6 +- web/edit_room_handler.php | 20 ++- web/edit_users.php | 42 ++++-- web/functions.inc | 73 ++++++----- web/functions_ical.inc | 15 ++- web/functions_mail.inc | 17 +-- web/functions_view.inc | 5 +- web/import.php | 14 +- web/lib/MRBS/SessionHandlerDb.php | 4 +- web/mrbs_sql.inc | 196 ++++++++++++---------------- web/pending.php | 4 +- web/report.php | 23 ++-- web/search.php | 6 +- web/upgrade.inc | 5 +- web/upgrade/13/post.inc | 3 +- web/upgrade/15/post.inc | 6 +- web/upgrade/16/post.inc | 3 +- web/upgrade/17/post.inc | 18 +-- web/upgrade/2/post.inc | 3 +- web/upgrade/21/post.inc | 8 +- web/upgrade/24/post.inc | 28 ++-- web/upgrade/32/post.inc | 9 +- web/upgrade/34/post.inc | 6 +- web/upgrade/4/post.inc | 3 +- web/upgrade/43/post.inc | 3 +- web/upgrade/47/post.inc | 24 ++-- web/upgrade/5/post.inc | 5 +- web/upgrade/50/post.inc | 3 +- web/upgrade/51/post.inc | 3 +- web/upgrade/52/post.inc | 7 +- web/upgrade/53/post.inc | 5 +- web/upgrade/6/post.inc | 9 +- web/upgrade/7/post.inc | 2 +- web/upgrade/8/post.inc | 4 +- web/view_entry.php | 8 +- 43 files changed, 400 insertions(+), 370 deletions(-) commit e5b730ece Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 15 12:22:54 2020 +0100 Opened a new named branch for the extension of the database upgrade process to cover multisite installations. commit 79405abc0 Merge: ed49f0bbf 1b33a8f96 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 15 07:40:15 2020 +0100 Merge with default commit 1b33a8f96 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 15 07:39:52 2020 +0100 Fixed JavaScript bug again that was showing up in early iOS devices web/js/functions.js.php | 7 ++++++ web/js/general.js.php | 52 +++++++++++++++++---------------------- 2 files changed, 30 insertions(+), 29 deletions(-) commit ed49f0bbf Merge: 4e111c139 fffa29867 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 14 18:21:19 2020 +0100 Merge with default commit fffa29867 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 14 18:20:41 2020 +0100 Upgraded to jQuery 3.5.1. web/jquery/jquery-3.4.1.min.js (gone) | 2 - .../{jquery-3.4.1.js => jquery-3.5.1.js} | 1238 ++++++++++------ web/jquery/jquery-3.5.1.min.js (new) | 2 + .../jquery-migrate-3.1.0.min.js (gone) | 2 - ...rate-3.1.0.js => jquery-migrate-3.3.0.js} | 292 +++- web/jquery/jquery-migrate-3.3.0.min.js (new) | 2 + web/js.inc | 8 +- 7 files changed, 990 insertions(+), 556 deletions(-) commit 4e111c139 Merge: a789ad44a 87c62c38a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 14 18:06:53 2020 +0100 Merge with default commit 87c62c38a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 14 18:06:32 2020 +0100 More improvements for narrow devices: left aligned the company information in the banner and suppressed the display of the mrbs_more_info text. web/css/mrbs.css.php | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) commit a789ad44a Merge: a2892e277 9184b9303 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 14 07:21:50 2020 +0100 Merge with default commit 9184b9303 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 14 07:21:24 2020 +0100 Fixed bug in JavaScript web/js/general.js.php | 52 +++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 25 deletions(-) commit a2892e277 Merge: d1380fca5 b3e537f28 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 13 17:39:34 2020 +0100 Merge with default commit b3e537f28 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 13 17:39:12 2020 +0100 Moved check whether there are any recipients from sendMail() into add(), so that we don't waste space in the queue if the message is never going to be sent. web/lib/MRBS/MailQueue.php | 38 ++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) commit d1380fca5 Merge: b80272a8e 0a7a529e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 13 11:34:45 2020 +0100 Merge with default commit 0a7a529e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 13 11:32:26 2020 +0100 Moved the code dealing with disabled mail into add() from sendMail(), in case the site is a multisite installation and the sending has been modified to run from a cron job (in which case the site specific settings won't be available). web/lib/MRBS/MailQueue.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) commit b80272a8e Merge: 650930581 21ac723d3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 13 07:02:58 2020 +0100 Merge with default commit 21ac723d3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 13 07:02:13 2020 +0100 Removed redundant code web/js/edit_entry.js.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 650930581 Merge: 976c4b05b c0f1bcd1b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 11 15:10:27 2020 +0100 Merge with default commit c0f1bcd1b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 11 15:10:05 2020 +0100 Simplified code web/lib/MRBS/MailQueue.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 976c4b05b Merge: 0479d7044 ca8ddea9f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jun 10 10:39:12 2020 +0100 Merge with default commit ca8ddea9f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jun 10 10:38:33 2020 +0100 Updated Spanish translation. Thanks to Jose Luis Martin Jimenez. See SF Feature Requests #355. web/lang/lang.es | 441 ++++++++++++++++++++++++--------------------- 1 file changed, 240 insertions(+), 201 deletions(-) commit c3d32a7c4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jun 10 10:32:53 2020 +0100 Fixed bug introduced during recent change web/js/index.js.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 0479d7044 Merge: 0a752687c cf5b337d6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 9 20:37:34 2020 +0100 Merge with default commit cf5b337d6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 9 20:37:11 2020 +0100 Fixed bug introduced in last commit causing an error due to having more than one active lock. web/functions_ical.inc | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) commit 0a752687c Merge: fd1a50591 f8c5628bd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 9 16:53:38 2020 +0100 Merge with default commit f8c5628bd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 9 16:53:12 2020 +0100 Fixed bug introduced in recent change causing email notifications with .ics attachments to give the incorrect time in Outlook calendar (because they were missing the VTIMEZONE component). web/functions_ical.inc | 187 ++++++++++++++++++++------------------- 1 file changed, 97 insertions(+), 90 deletions(-) commit fd1a50591 Merge: 5e4c72c61 16f22b76e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 8 09:38:58 2020 +0100 Merge with default commit 16f22b76e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 8 09:31:54 2020 +0100 Fixed bug preventing the create_by field being populated on mobiles web/js/edit_entry.js.php | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) commit 5e4c72c61 Merge: e44c5c9ae 04a0bcb0e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 7 17:36:08 2020 +0100 Merge with default commit 04a0bcb0e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 7 17:33:18 2020 +0100 Further improvements for mobile devices web/css/mrbs.css.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) commit e44c5c9ae Merge: 574ed94a6 c16a4d5b8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 7 05:07:33 2020 +0100 Merge with default commit c16a4d5b8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 7 05:07:07 2020 +0100 Fixed multisite link bug web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 574ed94a6 Merge: e6ff7dc9f 143ffd5e9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 6 18:37:34 2020 +0100 Merge with default commit 143ffd5e9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 6 18:37:14 2020 +0100 Tweaked CSS for mobiles web/css/mrbs.css.php | 4 ++++ web/edit_entry.php | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) commit e6ff7dc9f Merge: 1d56dc832 bfcdd54d6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 6 17:31:32 2020 +0100 Merge with default commit bfcdd54d6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 6 17:30:57 2020 +0100 Improved form layout on narrow screens and mobile devices web/css/mrbs.css.php | 25 +++++++++++++++++++++---- web/edit_users.php | 3 ++- web/js/general.js.php | 37 ++++++++++++++++++++----------------- 3 files changed, 43 insertions(+), 22 deletions(-) commit 142176a11 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 6 15:29:04 2020 +0100 Removed the "Goto" button on narrow screens web/css/mrbs.css.php | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) commit 1d56dc832 Merge: 6fb0f08be 8400fdeb1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 6 10:25:56 2020 +0100 Merge with default commit 8400fdeb1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 6 10:25:29 2020 +0100 Reduced flickering during load of banner datepicker web/Themes/default/header.inc | 1 + web/js/datepicker.js.php | 4 ++++ 2 files changed, 5 insertions(+) commit ab288592e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 6 10:06:20 2020 +0100 Fixed width of date inputs web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 72a0fa795 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 6 09:17:38 2020 +0100 Further improvement of calendar navigation layout on mobile devices web/css/mrbs.css.php | 18 ++++++++++++++++++ web/js/index.js.php | 6 +++++- 2 files changed, 23 insertions(+), 1 deletion(-) commit 781f87645 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 6 07:57:22 2020 +0100 Improved layout of calendar navigation on mobile devices web/css/mrbs.css.php | 18 ++++++++++++++++++ web/js/index.js.php | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 56 insertions(+), 2 deletions(-) commit 6fb0f08be Merge: dbb4459bb 6fdb14f56 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 5 18:55:21 2020 +0100 Merge with default commit 6fdb14f56 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 5 18:42:56 2020 +0100 Fixed problem with the left hand margin on the calendar view on mobile devices being too wide. web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 563ee2f50 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 5 18:30:53 2020 +0100 Fixed problem with the minicalendars not appearing when the screen is widened. web/css/mrbs.css.php | 7 +++++++ 1 file changed, 7 insertions(+) commit e0c6071e1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 5 17:55:42 2020 +0100 Suppressed the display of the logo on narrow devices (eg mobiles) web/css/mrbs.css.php | 6 ++++++ 1 file changed, 6 insertions(+) commit dbb4459bb Merge: 1771bca9f fe5b3effc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jun 3 13:02:32 2020 +0100 Merge with default commit fe5b3effc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jun 3 13:01:58 2020 +0100 Fixed last fix! web/js/index.js.php | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) commit 1771bca9f Merge: cdce59204 2bbcec85a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jun 3 10:15:39 2020 +0100 Merge with default commit 2bbcec85a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jun 3 10:15:09 2020 +0100 Fixed bug introduced in recent commit causing a JavaScript error when navigating between pages using the mini-calendars. web/js/datepicker.js.php | 3 +- web/js/index.js.php | 61 +++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 35 deletions(-) commit cdce59204 Merge: 8d8db730b 32f1a58f4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 1 12:23:18 2020 +0100 Merge with default commit 32f1a58f4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 1 12:22:58 2020 +0100 Added code to convert the error_log file into an absolute path in order to avoid problems during shutdown when the working directory can change. web/init.inc | 11 +++++++++++ 1 file changed, 11 insertions(+) commit 8d8db730b Merge: 6ea8df339 23b376ed1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 1 11:35:35 2020 +0100 Merge with default commit 23b376ed1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 1 11:35:11 2020 +0100 Removed inclusion of language preferences in the datepicker JavaScript code in order to avoid caching problems. The language preferences are now obtained dynamically from a data atrtribute in the body tag. See SF Support Requests #2073. web/Themes/default/header.inc | 15 +++---- web/js/datepicker.js.php | 69 +++++++++++++++------------------ 2 files changed, 39 insertions(+), 45 deletions(-) commit 6ea8df339 Merge: 01da955be cc09639a9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 27 15:05:40 2020 +0100 Merge with default commit cc09639a9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 27 15:05:18 2020 +0100 Added a config option for types that can only be used by admins web/edit_entry.php | 12 +++++++++--- web/edit_entry_handler.php | 6 ++++++ web/lang/lang.en | 5 +++-- web/systemdefaults.inc.php | 3 +++ 4 files changed, 21 insertions(+), 5 deletions(-) commit 01da955be Merge: b2bff1787 c83cbacae Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon May 25 16:43:44 2020 +0100 Merge with default commit c83cbacae Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon May 25 16:43:26 2020 +0100 Fixed fatal error on search web/lib/MRBS/Form/Form.php | 2 +- web/search.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit b2bff1787 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon May 25 16:15:27 2020 +0100 Fixed merge web/lib/MRBS/Form/Form.php | 108 +++++++++++++++++++++-------------- 1 file changed, 65 insertions(+), 43 deletions(-) commit 5a00424b8 Merge: 42445e09b b1469bd0b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon May 25 16:12:05 2020 +0100 Merge with default commit b1469bd0b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon May 25 16:09:24 2020 +0100 Fixed a problem with the CSRF token occasionally not being found web/lib/MRBS/Form/Form.php | 112 +++++++++++++++++++++-------------- 1 file changed, 67 insertions(+), 45 deletions(-) commit 42445e09b Merge: 08c55df04 ae4902d13 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun May 24 17:33:06 2020 +0100 Merge with default commit ae4902d13 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun May 24 17:32:42 2020 +0100 Don't show the goto box if the user isn't allowed to view the calendar web/Themes/default/header.inc | 6 ++++++ 1 file changed, 6 insertions(+) commit 08c55df04 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 23 17:59:01 2020 +0100 Added comment web/edit_entry.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 2baf899c4 Merge: f0db1b39f bdd73481b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 23 17:52:02 2020 +0100 Merge with default commit bdd73481b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 23 17:51:38 2020 +0100 Handled the case of a booking creator who has left the organisation and is no longer in the list of users when constructing the create_by field on the edit_entry form. web/js/edit_entry.js.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) commit f0db1b39f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 23 17:14:07 2020 +0100 Fixed problem if the original user has been deleted web/edit_entry.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) commit c4b0b0876 Merge: a4cf36584 338d5baf7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 23 16:18:42 2020 +0100 Merge with default commit 338d5baf7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 23 16:17:05 2020 +0100 Fixed occasional uncaught exception 'TypeError' web/mrbs_sql.inc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) commit a4cf36584 Merge: 655ee995d fe46170bd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri May 22 17:13:35 2020 +0100 Merge with default commit fe46170bd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri May 22 17:13:10 2020 +0100 Tweaked CSS web/css/mrbs.css.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 655ee995d Merge: 6308ebe41 5e335beab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 21 17:28:03 2020 +0100 Merge with default commit 5e335beab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 21 17:26:26 2020 +0100 Took account of the number of addresses when calculating the throttle rate web/lib/MRBS/MailQueue.php | 6 ++++-- web/systemdefaults.inc.php | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) commit 9d926d878 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 21 16:52:02 2020 +0100 Added mail throttling web/lib/MRBS/MailQueue.php | 23 ++++++++++++++++++++++- web/systemdefaults.inc.php | 6 ++++++ 2 files changed, 28 insertions(+), 1 deletion(-) commit 046139286 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 21 15:28:14 2020 +0100 Moved mail sending into a MailQueue class. Normally the queue is flushed on shutdown using a register_shutdown_function() callback. However the class could easily be extended so that the mail queue is held in the database and emptied by a cron job. This would enable rate limits to be adhered to more accurately, as there would be just one queue. web/approve_entry_handler.php | 38 +-- web/del_entry.php | 4 +- web/functions_mail.inc | 366 ++-------------------------- web/init.inc | 3 + web/lib/MRBS/MailQueue.php (new) | 372 +++++++++++++++++++++++++++++ 5 files changed, 412 insertions(+), 371 deletions(-) commit 6308ebe41 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 21 10:00:20 2020 +0100 Fixed problem leading to inability to edit a user when there is no display_name. It shouldn't be possible to get into this situation but just in case. web/edit_users.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit 172d4c264 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 21 09:14:10 2020 +0100 Further fix for SF Bugs #464 web/lib/MRBS/Session/SessionCas.php | 2 +- web/lib/MRBS/Session/SessionHttp.php | 2 +- web/lib/MRBS/Session/SessionRemoteUser.php | 2 +- web/lib/MRBS/Session/SessionSaml.php | 2 +- web/lib/MRBS/Session/SessionWithLogin.php | 9 ++++++--- web/lib/MRBS/Session/SessionWordpress.php | 2 +- web/mrbs_auth.inc | 10 ++++++---- 7 files changed, 17 insertions(+), 12 deletions(-) commit da74647a4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 20 09:14:44 2020 +0100 Removed debugging code accidentally left in web/lib/MRBS/Session/SessionWithLogin.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit 4e6834ea4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 20 09:13:34 2020 +0100 Fixed merge web/lib/MRBS/Session/SessionWithLogin.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit aeebeec17 Merge: b47242286 360d8cfba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 20 09:03:34 2020 +0100 Merge with default commit 360d8cfba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 20 09:03:04 2020 +0100 Added some urlencoding web/session/session_joomla.inc | 10 ++-------- web/session/session_wordpress.inc | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) commit 2ca1c0b39 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 20 08:59:35 2020 +0100 Fixed bug when editing an entry without being logged in fiorst. See SF Bugs #464 web/session/session_cookie.inc | 2 +- web/session/session_php.inc | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) commit b47242286 Merge: 943594d1f 50e834010 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue May 19 05:58:04 2020 +0100 Merge with default commit 50e834010 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue May 19 05:54:55 2020 +0100 Fixed a couple of bugs in multisite mode web/view_entry.php | 92 ++++++++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 46 deletions(-) commit 943594d1f Merge: d90d68836 af5107824 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon May 18 12:05:47 2020 +0100 Merge with default commit af5107824 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon May 18 12:05:20 2020 +0100 Fixed bug in selection of create_by option when the original creator had logged in with their username not completely in lowercase. web/js/edit_entry.js.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit d90d68836 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon May 18 11:49:16 2020 +0100 Fixed merge web/lib/MRBS/Session/SessionWithLogin.php | 3 +++ 1 file changed, 3 insertions(+) commit 8f6030ca5 Merge: fae9d37a2 4628b44ff Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon May 18 11:42:12 2020 +0100 Merge with default commit 4628b44ff Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon May 18 11:40:29 2020 +0100 Trimmed the username to get rid of problems on mobiles and tablets when a trailing space is often included in the username. web/session/session_cookie.inc | 2 ++ web/session/session_joomla.inc | 2 ++ web/session/session_php.inc | 2 ++ web/session/session_wordpress.inc | 2 ++ 4 files changed, 8 insertions(+) commit fae9d37a2 Merge: ba98916d6 a72df50b9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 16 11:56:42 2020 +0100 Merge with default commit a72df50b9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 16 11:55:18 2020 +0100 Fixed bug in email notifications. When changing a series from a daily to a weekly repeat the repeat day of the daily series was given incorrectly. web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ce65e57d2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 16 11:27:42 2020 +0100 Fixed uninitialized string offset notice problem web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ba98916d6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 16 10:05:19 2020 +0100 Improved error handling when the cookie IP address has changed. web/lib/MRBS/Session/SessionCookie.php | 77 ++++++++++++------------ 1 file changed, 40 insertions(+), 37 deletions(-) commit 491bc6f48 Merge: a6c1778ca d89c74ce4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 13 17:28:12 2020 +0100 Merge with default commit d89c74ce4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 13 17:22:21 2020 +0100 Fixed bug in multisite mode web/del.php | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) commit a6c1778ca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 9 08:13:40 2020 +0100 Cleaned up merge web/edit_entry_handler.php | 48 ++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 21 deletions(-) commit f9affb5ac Merge: 9dba8ca37 c018b198c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 9 08:08:05 2020 +0100 Merge with default commit c018b198c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 9 08:05:36 2020 +0100 Fixed bug causing the create_by value to be changed in some circumstances. See Support Requests #2052. web/edit_entry_handler.php | 50 ++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 22 deletions(-) commit cc81a0b73 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 9 07:17:47 2020 +0100 Fixed minor bug web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9dba8ca37 Merge: d12ae4edb 941051895 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 7 16:01:06 2020 +0100 Merge with default commit 941051895 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 7 15:56:26 2020 +0100 Fixed CSS problem. See SF Bugs #460. web/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d12ae4edb Merge: 96fb522d6 eb04e86e5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 6 15:30:02 2020 +0100 Merge with default commit eb04e86e5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 6 15:29:33 2020 +0100 Fixed bug when the booking day goes past midnight. See SF Support Requests #2045. web/edit_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 96fb522d6 Merge: 683d2de2b 53a1475e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue May 5 16:30:25 2020 +0100 Merge with default commit 53a1475e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue May 5 16:29:43 2020 +0100 Fixed incorrect link in mail notifications when working in multisite mode. web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 683d2de2b Merge: 1e33fc909 b6eea83f1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun May 3 19:14:10 2020 +0100 Merge with default commit b6eea83f1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun May 3 19:13:46 2020 +0100 Removed comment web/functions_table.inc | 1 - 1 file changed, 1 deletion(-) commit cb069de0e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun May 3 19:12:25 2020 +0100 Fixed problem with escaping of HTML. See SF Support Requests #2045. web/functions_table.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 1e33fc909 Merge: dce176083 2506d2e5b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun May 3 18:43:00 2020 +0100 Merge with default commit 2506d2e5b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun May 3 18:42:42 2020 +0100 Fixed typo in comment web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit dce176083 Merge: 058c4d762 b8c5c4151 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun May 3 06:55:29 2020 +0100 Merge with default commit b8c5c4151 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun May 3 06:55:05 2020 +0100 Fixed bug resulting in the all rooms view being shown in the month view when the default view is 'month' and there is only one room in the default area. See SF Support Requests #2043. web/standard_vars.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 058c4d762 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri May 1 10:56:58 2020 +0100 Fixed bug preventing users from editing their own details web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 830e58c0b Merge: 9ff524a0e f0e49663b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri May 1 10:46:22 2020 +0100 Merge with default commit f0e49663b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri May 1 10:45:58 2020 +0100 Fixed bug when a password policy is set web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9ff524a0e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri May 1 10:26:32 2020 +0100 Fixed undefined index bug web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6ba1f3b3f Merge: 378d81d19 c5ebf932d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri May 1 10:15:28 2020 +0100 Merge with default commit c5ebf932d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri May 1 10:12:45 2020 +0100 Added the password fields to the list of fields that can be protected (useful for public demo sites). web/edit_users.php | 12 ++++++++++-- web/systemdefaults.inc.php | 5 +++-- 2 files changed, 13 insertions(+), 4 deletions(-) commit 378d81d19 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 28 20:45:27 2020 +0100 Fixed bug when operating in multisite mode web/Themes/default/header.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 90c243197 Merge: fe441ef0a a0f3036ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 28 14:31:51 2020 +0100 Merge with default commit a0f3036ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 28 14:31:21 2020 +0100 Fixed bugs when using the Back buttons in multisite mode web/edit_area.php | 234 ++++++++++++++++++++++---------------------- web/edit_room.php | 48 ++++----- 2 files changed, 141 insertions(+), 141 deletions(-) commit fe441ef0a Merge: 55bb16014 29689f2b9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 28 14:06:32 2020 +0100 Merge with default commit 29689f2b9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 28 14:06:10 2020 +0100 Tweaked CSS web/Themes/default/styling.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 55bb16014 Merge: 51c1bfea3 53b309de3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 28 12:27:37 2020 +0100 Merge with default commit 53b309de3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 28 12:27:08 2020 +0100 Fixed bug in links when working in multisite mode web/functions_table.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 51c1bfea3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 27 19:02:44 2020 +0100 Fixed merge web/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3ba6096df Merge: 55f3a9caa 30bfc8d56 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 27 19:01:19 2020 +0100 Merge with default commit 30bfc8d56 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 27 18:57:08 2020 +0100 Moved the check for number of users to before the check for page authorisation, so that it's possible to set up MRBS even if you have $auth['deny_public_access'] set. web/index.php | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) commit 55f3a9caa Merge: 7ec0887e0 de3587530 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 26 15:13:23 2020 +0100 Merge with default commit de3587530 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 26 15:13:01 2020 +0100 Fixed bug when operating in multisite mode web/js/edit_entry.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7ec0887e0 Merge: 52be8e523 c6b8520b4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 25 07:16:32 2020 +0100 Merge with default commit c6b8520b4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 25 07:14:29 2020 +0100 Simplified code web/ajax/usernames.php | 14 +------------- web/js/edit_entry.js.php | 4 ++-- 2 files changed, 3 insertions(+), 15 deletions(-) commit 52be8e523 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 24 16:43:39 2020 +0100 Fixed potential bugs when the user is not logged in web/approve_entry_handler.php | 3 ++- web/edit_entry.php | 7 ++++--- web/edit_entry_handler.php | 9 +++++---- web/functions_mail.inc | 9 ++++++++- web/import.php | 4 +++- web/lib/MRBS/Auth/AuthLdap.php | 10 ++++++++-- web/pending.php | 3 ++- web/view_entry.php | 7 ++++--- 8 files changed, 36 insertions(+), 16 deletions(-) commit ce702aae7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 24 15:58:23 2020 +0100 Fixed bug when not logged in web/mrbs_auth.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit a25a52664 Merge: d4ba55455 8492463f6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 24 15:15:34 2020 +0100 Merge with default commit 8492463f6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 24 15:15:14 2020 +0100 Removed a '"' which had accidentally crept into the output string web/upgrade.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d4ba55455 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 24 13:57:21 2020 +0100 Fixed bug caused by a clash with the WordPress global $current_user. web/Themes/default/header.inc | 18 ++++++++--------- web/approve_entry_handler.php | 4 ++-- web/edit_entry.php | 8 ++++---- web/edit_entry_handler.php | 10 +++++----- web/edit_users.php | 20 +++++++++---------- web/functions_mail.inc | 10 +++++----- web/lib/MRBS/Auth/AuthLdap.php | 4 ++-- web/lib/MRBS/Session/SessionWordpress.php | 4 ++-- web/mrbs_auth.inc | 22 ++++++++++----------- web/pending.php | 4 ++-- web/report.php | 12 +++++------ web/search.php | 8 ++++---- web/view_entry.php | 8 ++++---- 13 files changed, 66 insertions(+), 66 deletions(-) commit 7f4905b2c Merge: 25b5c57e3 787e5a67f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 23 16:32:43 2020 +0100 Merge with default commit 787e5a67f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 23 16:32:19 2020 +0100 Kept the control open after the Ajax data arrives if it was previously open web/js/edit_entry.js.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) commit 25b5c57e3 Merge: a33cf1e98 7ec50be81 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 23 14:51:13 2020 +0100 Merge with default commit 7ec50be81 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 23 14:50:50 2020 +0100 Used new Option() to insert the new data in order to avoid having to rebuild the Select2 control. web/js/edit_entry.js.php | 263 +++++++++++++++++++------------------ 1 file changed, 136 insertions(+), 127 deletions(-) commit a33cf1e98 Merge: b82d04332 40c1c4e26 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 22 18:37:54 2020 +0100 Merge with default commit 40c1c4e26 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 22 18:37:31 2020 +0100 Added comments web/ajax/usernames.php | 4 ---- web/js/edit_entry.js.php | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) commit 2914e6d37 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 22 17:52:17 2020 +0100 Changed the way that Ajax loading works for the create_by field, so that the Ajax request is fired only once and also when the document is ready and not when the select element is opened. web/ajax/usernames.php | 7 +++---- web/css/mrbs.css.php | 7 +++++++ web/images/ajax-loader.gif (new) | Bin 0 -> 1849 bytes web/js/edit_entry.js.php | 19 ++++++++++++++++++- web/js/functions.js.php | 10 ---------- 5 files changed, 28 insertions(+), 15 deletions(-) commit b82d04332 Merge: 7062f82a4 8b4999bd3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 22 12:42:20 2020 +0100 Merge with default commit 8b4999bd3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 22 12:41:55 2020 +0100 Disabled Ajax loading of the select element pending a fix for a bug web/js/functions.js.php | 4 ++++ 1 file changed, 4 insertions(+) commit 7062f82a4 Merge: fad9fb5ed 6b931cd6f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 21 18:00:20 2020 +0100 Merge with default commit 6b931cd6f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 21 17:52:28 2020 +0100 Restructured web/js/datatables.js.php | 9 +++------ web/language.inc | 18 ++++++++++++++---- 2 files changed, 17 insertions(+), 10 deletions(-) commit 0c425b38a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 21 17:32:26 2020 +0100 Restructured web/js.inc | 5 ++--- web/js/datepicker.js.php | 4 ++-- web/language.inc | 21 ++++++++++++++++----- 3 files changed, 20 insertions(+), 10 deletions(-) commit fad9fb5ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 21 16:54:37 2020 +0100 Fixed merge web/ajax/usernames.php | 4 ++-- web/edit_entry.php | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) commit f5cadb86e Merge: 5131e4ed1 f988258c5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 21 16:25:07 2020 +0100 Merge with default commit f988258c5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 21 16:20:22 2020 +0100 Removed the options from the initial page load, because they will follow later by Ajax web/edit_entry.php | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) commit 96a95f23a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 21 16:02:31 2020 +0100 Added comments web/ajax/usernames.php | 8 ++++++++ 1 file changed, 8 insertions(+) commit f53153f38 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 21 15:56:35 2020 +0100 Added caching for performance web/js.inc | 4 ++-- web/js/functions.js.php | 2 +- web/language.inc | 18 +++++++++++++----- 3 files changed, 16 insertions(+), 8 deletions(-) commit a9dfe5549 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 21 15:45:52 2020 +0100 Internationalised Select2 web/js.inc | 6 +++++- web/js/functions.js.php | 9 +++++++++ web/language.inc | 9 +++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) commit 88fde6b06 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 21 14:23:18 2020 +0100 Added Ajax loading of usernames. See SF Support Requests #2031 web/ajax/usernames.php (new) | 35 +++++++++++++++++++++ web/js/functions.js.php | 10 +++++- web/mrbs_auth.inc | 57 +++++++++++++++++----------------- 3 files changed, 73 insertions(+), 29 deletions(-) commit 5131e4ed1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 20 14:41:25 2020 +0100 Replaced getUserName() with getCurrentUser() web/lib/MRBS/Session/SessionHost.php | 14 +++++++++----- web/lib/MRBS/Session/SessionIp.php | 12 +++++++++--- web/lib/MRBS/Session/SessionNt.php | 5 ++--- web/lib/MRBS/Session/SessionOmni.php | 14 ++++++++++---- 4 files changed, 30 insertions(+), 15 deletions(-) commit fd5443473 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 20 14:18:47 2020 +0100 Removed redundant code web/auth/auth_none.inc (gone) | 71 --------------------------------- 1 file changed, 71 deletions(-) commit 9b03ff836 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 20 14:18:05 2020 +0100 Replaced getUserName() with getCurrentUser() web/auth/auth_none.inc | 14 +------- web/lib/MRBS/Auth/AuthNone.php (new) | 20 ++++++++++++ web/lib/MRBS/Session/SessionCookie.php | 21 ------------ web/lib/MRBS/Session/SessionHttp.php | 30 +++++------------- web/lib/MRBS/Session/SessionInterface.php | 2 +- web/lib/MRBS/Session/SessionJoomla.php | 6 ---- web/lib/MRBS/Session/SessionPhp.php | 12 ------- web/lib/MRBS/Session/SessionRemoteUser.php | 10 +++--- web/lib/MRBS/Session/SessionWithLogin.php | 2 +- web/lib/MRBS/Session/SessionWithoutLogin.php | 2 +- web/lib/MRBS/Session/SessionWordpress.php | 12 ------- 11 files changed, 36 insertions(+), 95 deletions(-) commit bc574185f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 19 18:38:10 2020 +0100 Replaced calls to getUserName() with calls to getCurrentUser() web/view_entry.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 45adfb7e2 Merge: fbb7e6a7b 61b09bff2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 19 18:23:26 2020 +0100 Merge with default commit 61b09bff2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 19 18:22:37 2020 +0100 Fixed bug causing Report not to treat privacy settings correctly (I think it was not showing some bookings that it should have shown, rather than the other way round). web/report.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit fbb7e6a7b Merge: 8d265c89d 5d46e4779 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 19 18:09:02 2020 +0100 Merge with default commit 5d46e4779 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 19 18:08:08 2020 +0100 Fixed bug causing Search not to treat privacy settings correctly (I think it was not showing some bookings that it should have shown, rather than the other way round). web/search.php | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) commit 8d265c89d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 19 17:38:07 2020 +0100 Replaced calls to getUserName() with calls to getCurrentUser() web/approve_entry_handler.php | 4 ++-- web/edit_entry.php | 2 +- web/edit_entry_handler.php | 2 +- web/import.php | 2 +- web/mrbs_auth.inc | 3 +-- web/pending.php | 4 ++-- web/search.php | 8 ++++---- 7 files changed, 12 insertions(+), 13 deletions(-) commit e0a619f2e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 19 15:20:02 2020 +0100 Made the display_name both a mandatory and protected field web/lib/MRBS/Auth/AuthDbExt.php | 2 +- web/systemdefaults.inc.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) commit 72e1e528a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 19 08:18:49 2020 +0100 Improved last change web/lib/MRBS/Auth/AuthDbExt.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) commit 4c8e06698 Merge: 1c55ed5e4 e2ee5a708 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 19 07:56:59 2020 +0100 Merge with default commit e2ee5a708 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 19 07:54:20 2020 +0100 Fixed bug when the timestamp is "0000-00-00 00:00:00". web/edit_users.php | 210 +++++++++++++++++++++---------------------- 1 file changed, 105 insertions(+), 105 deletions(-) commit e6e842695 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 19 06:38:41 2020 +0100 Reinstated the kludge fix for Select2 widths. web/js/functions.js.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit 1c55ed5e4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 19 06:21:18 2020 +0100 Added more data to the User object in the db_ext auth scheme to make it easier to extend. web/lib/MRBS/Auth/AuthDbExt.php | 5 +++++ 1 file changed, 5 insertions(+) commit 73a008935 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 18 18:41:59 2020 +0100 Added a config option for sorting users by their last names web/edit_users.php | 39 +++++++++++++++++++++++++++++++++++- web/systemdefaults.inc.php | 3 +++ 2 files changed, 41 insertions(+), 1 deletion(-) commit 7c835cf1e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 18 18:27:27 2020 +0100 Changed the English language string for 'display_name' from 'Display name' to 'Name'. web/lang/lang.en | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1f415692a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 18 18:22:33 2020 +0100 Made the display name instead if the username the first column in the list of users web/edit_users.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit 84e04093e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 18 17:31:36 2020 +0100 Changed private variables to protected so that the class can be extended web/lib/MRBS/Auth/AuthDbExt.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit 1d4463b0c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 18 17:25:32 2020 +0100 Added a display name capability to the db_ext auth type web/lib/MRBS/Auth/AuthDbExt.php | 12 ++++++++++-- web/systemdefaults.inc.php | 3 ++- 2 files changed, 12 insertions(+), 3 deletions(-) commit 432d194ac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 18 17:11:50 2020 +0100 Removed redundant file web/auth/auth_db_ext.inc (gone) | 25 ------------------------- 1 file changed, 25 deletions(-) commit 879b63684 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 18 17:10:57 2020 +0100 Moved auth_db_ext code to class web/auth/auth_db_ext.inc | 208 --------------------- web/lib/MRBS/Auth/AuthDbExt.php (new) | 235 ++++++++++++++++++++++++ 2 files changed, 235 insertions(+), 208 deletions(-) commit c309fc3d9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 18 06:47:30 2020 +0100 Changed the display_name length from 255 to 191 to allow for the possibility of a key being added in the future. (The character limit for keys only applies to MySQL, but the PostgreSQL columns have been changed as well for consistency. 191 characters should be more than enough anyway.) tables.my.sql | 2 +- tables.pg.sql | 2 +- web/upgrade/64/mysql.sql | 2 +- web/upgrade/64/pgsql.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) commit fba3443ec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 17 17:11:28 2020 +0100 Used the display_name in the 'db' auth scheme web/lib/MRBS/Auth/AuthDb.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) commit c73b45a49 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 17 17:00:07 2020 +0100 Changed order of fields web/edit_users.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) commit 68ab57c3b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 17 16:36:52 2020 +0100 Fixed bug web/edit_users.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit a52fadd89 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 17 15:51:51 2020 +0100 Added a display name to the users table tables.my.sql | 18 ++-- tables.pg.sql | 18 ++-- web/edit_users.php | 239 ++++++++++++++++++++++++------------------- web/lang/lang.en | 3 +- 4 files changed, 155 insertions(+), 123 deletions(-) commit 7a41f0977 Merge: ef8c36c13 9d2cad303 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 17 14:58:52 2020 +0100 Merge with default commit 9d2cad303 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 17 14:58:33 2020 +0100 Fixed a couple of instances of MRBS not returning to the local site when in multisite mode. web/Themes/default/header.inc | 2 +- web/upgrade.inc | 44 ++++++++++++++++----------------- 2 files changed, 23 insertions(+), 23 deletions(-) commit ef8c36c13 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 17 14:51:38 2020 +0100 Commit before updating web/lib/MRBS/DB.php | 2 +- web/upgrade/64/mysql.sql (new) | 8 ++++++++ web/upgrade/64/pgsql.sql (new) | 8 ++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) commit 019004525 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 17 14:32:25 2020 +0100 Fixed merge problems web/lib/MRBS/Session/SessionWithLogin.php | 89 +++++++++++---------- 1 file changed, 45 insertions(+), 44 deletions(-) commit efdfaa757 Merge: de8ab4475 2aeb60060 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 17 14:07:28 2020 +0100 Merge with default commit 2aeb60060 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 17 14:07:01 2020 +0100 Fixed bug introduced in multisite branch causing the CSS not to load when an upgrade is required. web/site_config.inc (new) | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) commit 4cf430f27 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 17 14:06:09 2020 +0100 Fixed bug introduced in multisite branch causing the CSS not to load when an upgrade is required. web/Themes/default/header.inc | 4 ++-- web/css/mrbs.css.php | 6 +++++- web/defaultincludes.inc | 20 +------------------- 3 files changed, 8 insertions(+), 22 deletions(-) commit e37fb9bcb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 17 12:10:50 2020 +0100 Fixed bug preventing editing of rooms when in multisite mode web/admin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 17ffd7eab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 17 11:59:59 2020 +0100 Fixed bug preventing editing of areas when in multisite mode web/admin.php | 98 ++++++++++++++++++++++++------------------------- 1 file changed, 49 insertions(+), 49 deletions(-) commit 042d66a72 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 17 11:55:11 2020 +0100 Removed redundant code web/functions.inc | 16 ---------------- 1 file changed, 16 deletions(-) commit de8ab4475 Merge: 811283183 d5e4a5ea7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 17 10:41:07 2020 +0100 Merge with default commit d5e4a5ea7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 17 10:34:38 2020 +0100 Removed kludge web/js/functions.js.php | 49 +++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 28 deletions(-) commit 78a76b947 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 17 10:16:36 2020 +0100 Upgraded to Select2 version 4.0.13 web/jquery/select2/dist/js/i18n/af.js | 2 +- web/jquery/select2/dist/js/i18n/ar.js | 2 +- web/jquery/select2/dist/js/i18n/az.js | 2 +- web/jquery/select2/dist/js/i18n/bg.js | 2 +- web/jquery/select2/dist/js/i18n/bn.js | 2 +- web/jquery/select2/dist/js/i18n/bs.js | 2 +- web/jquery/select2/dist/js/i18n/ca.js | 2 +- web/jquery/select2/dist/js/i18n/cs.js | 2 +- web/jquery/select2/dist/js/i18n/da.js | 2 +- web/jquery/select2/dist/js/i18n/de.js | 2 +- web/jquery/select2/dist/js/i18n/dsb.js | 2 +- web/jquery/select2/dist/js/i18n/el.js | 2 +- web/jquery/select2/dist/js/i18n/en.js | 2 +- web/jquery/select2/dist/js/i18n/es.js | 2 +- web/jquery/select2/dist/js/i18n/et.js | 2 +- web/jquery/select2/dist/js/i18n/eu.js | 2 +- web/jquery/select2/dist/js/i18n/fa.js | 2 +- web/jquery/select2/dist/js/i18n/fi.js | 2 +- web/jquery/select2/dist/js/i18n/fr.js | 2 +- web/jquery/select2/dist/js/i18n/gl.js | 2 +- web/jquery/select2/dist/js/i18n/he.js | 2 +- web/jquery/select2/dist/js/i18n/hi.js | 2 +- web/jquery/select2/dist/js/i18n/hr.js | 2 +- web/jquery/select2/dist/js/i18n/hsb.js | 2 +- web/jquery/select2/dist/js/i18n/hu.js | 2 +- web/jquery/select2/dist/js/i18n/hy.js | 2 +- web/jquery/select2/dist/js/i18n/id.js | 2 +- web/jquery/select2/dist/js/i18n/is.js | 2 +- web/jquery/select2/dist/js/i18n/it.js | 2 +- web/jquery/select2/dist/js/i18n/ja.js | 2 +- web/jquery/select2/dist/js/i18n/ka.js | 2 +- web/jquery/select2/dist/js/i18n/km.js | 2 +- web/jquery/select2/dist/js/i18n/ko.js | 2 +- web/jquery/select2/dist/js/i18n/lt.js | 2 +- web/jquery/select2/dist/js/i18n/lv.js | 2 +- web/jquery/select2/dist/js/i18n/mk.js | 2 +- web/jquery/select2/dist/js/i18n/ms.js | 2 +- web/jquery/select2/dist/js/i18n/nb.js | 2 +- web/jquery/select2/dist/js/i18n/ne.js | 2 +- web/jquery/select2/dist/js/i18n/nl.js | 2 +- web/jquery/select2/dist/js/i18n/pl.js | 2 +- web/jquery/select2/dist/js/i18n/ps.js | 2 +- web/jquery/select2/dist/js/i18n/pt-BR.js | 2 +- web/jquery/select2/dist/js/i18n/pt.js | 2 +- web/jquery/select2/dist/js/i18n/ro.js | 2 +- web/jquery/select2/dist/js/i18n/ru.js | 2 +- web/jquery/select2/dist/js/i18n/sk.js | 2 +- web/jquery/select2/dist/js/i18n/sl.js | 2 +- web/jquery/select2/dist/js/i18n/sq.js | 2 +- web/jquery/select2/dist/js/i18n/sr-Cyrl.js | 2 +- web/jquery/select2/dist/js/i18n/sr.js | 2 +- web/jquery/select2/dist/js/i18n/sv.js | 2 +- web/jquery/select2/dist/js/i18n/th.js | 2 +- web/jquery/select2/dist/js/i18n/tk.js | 2 +- web/jquery/select2/dist/js/i18n/tr.js | 2 +- web/jquery/select2/dist/js/i18n/uk.js | 2 +- web/jquery/select2/dist/js/i18n/vi.js | 2 +- web/jquery/select2/dist/js/i18n/zh-CN.js | 2 +- web/jquery/select2/dist/js/i18n/zh-TW.js | 2 +- web/jquery/select2/dist/js/select2.full.js | 110 +++++++++++++---- .../select2/dist/js/select2.full.min.js | 4 +- web/jquery/select2/dist/js/select2.js | 104 +++++++++++++--- web/jquery/select2/dist/js/select2.min.js | 4 +- 63 files changed, 234 insertions(+), 106 deletions(-) commit 811283183 Merge: b1d9c4f36 8fa42668d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 17 09:50:04 2020 +0100 Merge with default commit 8fa42668d Merge: 6ec1c6ddb 748250f1f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 17 09:48:13 2020 +0100 Merge with multisite commit 748250f1f (origin/multisite, multisite) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 17 09:47:41 2020 +0100 Closed branch commit 86fd94475 Merge: 905a6bafb 6ec1c6ddb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 13 15:22:46 2020 +0100 Merge with default commit b1d9c4f36 Merge: 9433b9b16 6ec1c6ddb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 13 15:22:24 2020 +0100 Merge with default commit 6ec1c6ddb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 13 15:21:59 2020 +0100 Improved appearance helper when resizing by clipping it to ensure it stays within the table body. web/js/resizable.js.php | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) commit c66c15e06 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 13 13:24:11 2020 +0100 Fixed bug when resizing bookings after the table container has been scrolled. web/js/resizable.js.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) commit 95b5ec1ec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 13 11:28:08 2020 +0100 Restructured web/js/resizable.js.php | 69 ++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 34 deletions(-) commit a6fa739f9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 13 11:21:46 2020 +0100 Restructured web/js/resizable.js.php | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) commit 64d0df7a7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 13 10:51:30 2020 +0100 Recorded the original scroll position of the table container web/js/resizable.js.php | 7 +++++++ 1 file changed, 7 insertions(+) commit 5254eba58 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 13 10:33:40 2020 +0100 Restructured code web/js/resizable.js.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) commit 905a6bafb Merge: 30eaacb66 5fb0f6359 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 12 17:39:30 2020 +0100 Merge with default commit 9433b9b16 Merge: b180bbcab 5fb0f6359 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 12 17:39:11 2020 +0100 Merge with default commit 5fb0f6359 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 12 17:06:32 2020 +0100 Fixed bug causing problems in resizing booking web/js/resizable.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 60730ac81 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 12 16:02:51 2020 +0100 Removed debugging code web/js/refresh.js.php | 2 -- 1 file changed, 2 deletions(-) commit 265e4b0bd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 12 15:53:06 2020 +0100 Tweaked timeline width in day view web/js/refresh.js.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit f9840bd2e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 12 15:33:06 2020 +0100 Tweaked CSS web/Themes/classic126/styling.inc | 8 ++++---- web/Themes/default/styling.inc | 8 ++++---- web/css/mrbs.css.php | 19 ------------------- 3 files changed, 8 insertions(+), 27 deletions(-) commit 30eaacb66 Merge: 5bfe94997 ae41231fd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 12 12:33:32 2020 +0100 Merge with default commit b180bbcab Merge: 243d96be7 ae41231fd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 12 12:33:10 2020 +0100 Merge with default commit ae41231fd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 12 12:32:52 2020 +0100 Removed redundant comment web/systemdefaults.inc.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit 5bfe94997 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 12 12:31:18 2020 +0100 Fixed bug causing site specific config settings to be ignored in the CSS web/css/mrbs.css.php | 5 +---- web/style.inc | 12 ++++++------ 2 files changed, 7 insertions(+), 10 deletions(-) commit 04a93d696 Merge: 6fcb445df 6caaff503 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 12 12:01:01 2020 +0100 Merge with default commit 243d96be7 Merge: 5f2653be3 6caaff503 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 12 12:00:40 2020 +0100 Merge with default commit 6caaff503 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 12 12:00:03 2020 +0100 Fixed bug causing the week and month views to switch from single room to all rooms mode after an automatic refresh. web/js/refresh.js.php | 1 + 1 file changed, 1 insertion(+) commit 6fcb445df Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 12 11:28:41 2020 +0100 Fixed bug in area and room selects web/index.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) commit 827d4c5de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 12 11:12:27 2020 +0100 Fixed bug web/defaultincludes.inc | 4 +++- web/internalconfig.inc.php | 1 - web/js.inc | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) commit 41cdb2e12 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 12 09:47:19 2020 +0100 Fixed bug in drag selection web/js/resizable.js.php | 4 ++++ 1 file changed, 4 insertions(+) commit 19f8845dd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 11 19:11:14 2020 +0100 Fixed some links web/js/edit_entry.js.php | 11 +++++++++++ web/js/general.js.php | 9 ++++++++- web/js/refresh.js.php | 5 +++++ web/js/report.js.php | 9 +++++++-- web/js/resizable.js.php | 5 +++++ 5 files changed, 36 insertions(+), 3 deletions(-) commit ba1ac0560 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 11 18:52:31 2020 +0100 Fixed some links web/js/report.js.php | 2 +- web/js/search.js.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 887852737 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 11 18:32:40 2020 +0100 Fixed some links web/functions_table.inc | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) commit 5a05b288a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 11 18:12:33 2020 +0100 Fixed some links web/Themes/default/header.inc | 14 ++++++++++++++ web/index.php | 7 ++++++- web/js/datepicker.js.php | 4 ++++ 3 files changed, 24 insertions(+), 1 deletion(-) commit 04c19a057 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 11 17:06:15 2020 +0100 Fixed form action pages web/Themes/default/header.inc | 6 ++-- web/admin.php | 6 ++-- web/del.php | 4 +-- web/edit_area.php | 2 +- web/edit_entry.php | 2 +- web/edit_entry_handler.php | 2 +- web/edit_room.php | 2 +- web/functions.inc | 14 ++++---- web/index.php | 4 +-- web/pending.php | 8 ++--- web/report.php | 2 +- web/search.php | 4 +-- web/session/functions_session.inc | 6 ++-- web/session/session_php.inc | 2 +- web/view_entry.php | 54 ++++++++++++++--------------- 15 files changed, 59 insertions(+), 59 deletions(-) commit 5ca52ed1a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 11 16:29:07 2020 +0100 Restructured web/admin.php | 2 +- web/edit_entry_handler.php | 2 +- web/edit_users.php | 6 ++-- web/functions.inc | 48 +++++++++++++++++------------ web/import.php | 2 +- web/pending.php | 2 +- web/session/session_cas.inc | 2 +- web/session/session_cookie.inc | 10 +++--- web/session/session_http.inc | 2 +- web/session/session_joomla.inc | 10 +++--- web/session/session_php.inc | 10 +++--- web/session/session_saml.inc | 2 +- web/session/session_wordpress.inc | 10 +++--- web/upgrade.inc | 2 +- 14 files changed, 59 insertions(+), 51 deletions(-) commit d3dd8a086 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 11 15:44:17 2020 +0100 First stab web/admin.php | 2 +- web/defaultincludes.inc | 19 +++++++++++++ web/edit_entry_handler.php | 2 +- web/edit_users.php | 6 ++--- web/functions.inc | 41 +++++++++++++++++++++++++---- web/import.php | 2 +- web/index.php | 1 - web/pending.php | 2 +- web/session/functions_session.inc | 5 ++++ web/session/session_cas.inc | 2 +- web/session/session_cookie.inc | 10 +++---- web/session/session_http.inc | 2 +- web/session/session_joomla.inc | 10 +++---- web/session/session_php.inc | 10 +++---- web/session/session_saml.inc | 2 +- web/session/session_wordpress.inc | 10 +++---- web/systemdefaults.inc.php | 7 +++++ web/upgrade.inc | 2 +- web/view_entry.php | 12 +++++++++ 19 files changed, 110 insertions(+), 37 deletions(-) commit 038fceb41 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 11 11:19:54 2020 +0100 Opened a new branch for the development of multisite capability commit 5f2653be3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 14:43:57 2020 +0100 Moved sanity check into class web/auth/auth_wordpress.inc (gone) | 12 ------------ web/lib/MRBS/Auth/AuthJoomla.php | 2 +- web/lib/MRBS/Auth/AuthWordpress.php | 10 ++++++++++ 3 files changed, 11 insertions(+), 13 deletions(-) commit e10f7d68a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 14:31:01 2020 +0100 Fixed bugs web/auth/cms/wordpress.inc | 2 ++ 1 file changed, 2 insertions(+) commit d1df4cf71 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 13:47:07 2020 +0100 Removed redundant code web/auth/auth_joomla.inc (gone) | 7 ------- web/lib/MRBS/Auth/AuthJoomla.php | 2 +- web/lib/MRBS/Session/SessionJoomla.php | 14 +++++++------- 3 files changed, 8 insertions(+), 15 deletions(-) commit e5f4df88f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 12:33:49 2020 +0100 Moved sanity check into class web/auth/auth_joomla.inc | 5 ----- web/lib/MRBS/Auth/AuthJoomla.php | 12 ++++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) commit 021abd096 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 12:20:29 2020 +0100 Removed redundant code web/auth/auth_db.inc (gone) | 30 ------------------------------ 1 file changed, 30 deletions(-) commit 786e58920 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 12:17:40 2020 +0100 Shifted authGetUsers() into the Auth class web/edit_users.php | 2 +- web/index.php | 2 +- web/lib/MRBS/Auth/AuthDb.php | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) commit c1d87b6d4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 12:10:06 2020 +0100 Removed redundant code web/auth/auth_db.inc | 226 --------------------------------- web/lib/MRBS/Auth/AuthDb.php | 226 +++++++++++++++++++++++++++++++++ 2 files changed, 226 insertions(+), 226 deletions(-) commit 0641453b2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 11:39:18 2020 +0100 Removed redundant code web/auth/auth_config.inc (gone) | 24 ------------------------ web/mrbs_auth.inc | 6 ++++-- 2 files changed, 4 insertions(+), 26 deletions(-) commit 6c47ffc22 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 11:35:09 2020 +0100 Shifted authValidateUser() into the Auth class web/auth/auth_config.inc | 33 ---------------------------- web/lib/MRBS/Auth/AuthConfig.php | 35 ++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 33 deletions(-) commit 2ab6f7030 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 10:38:52 2020 +0100 Removed redundant code web/auth/auth_ldap.inc (gone) | 83 --------------------------------- 1 file changed, 83 deletions(-) commit 685c2ed11 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 10:36:39 2020 +0100 Removed redundant code web/auth/auth_ldap.inc | 50 ---------------------------------------- 1 file changed, 50 deletions(-) commit 5db3edf51 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 10:34:02 2020 +0100 Removed redundant code web/auth/auth_ldap.inc | 270 --------------------------------------- 1 file changed, 270 deletions(-) commit c5578847b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 10:32:50 2020 +0100 Removed redundant code web/auth/auth_ldap.inc | 13 ------------- 1 file changed, 13 deletions(-) commit 2912c105c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 10:31:40 2020 +0100 Removed redundant code web/auth/auth_ldap.inc | 19 ------------------- web/lib/MRBS/Auth/AuthLdap.php | 2 +- 2 files changed, 1 insertion(+), 20 deletions(-) commit 7488dbf87 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 10:27:45 2020 +0100 Removed redundant code web/auth/auth_ldap.inc | 69 ---------------------------------------- 1 file changed, 69 deletions(-) commit e1ed7c8fc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 10:26:02 2020 +0100 Removed redundant code web/auth/auth_ldap.inc | 68 ---------------------------------------- 1 file changed, 68 deletions(-) commit b2d2f33f7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 10:22:40 2020 +0100 Removed redundant code web/auth/auth_ldap.inc | 55 -------------------------------- web/lib/MRBS/Auth/AuthLdap.php | 1 + 2 files changed, 1 insertion(+), 55 deletions(-) commit dfd4f0988 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 10:19:26 2020 +0100 Shifted authValidateUser() into the Auth class web/auth/auth_ldap.inc | 136 ------------------------- web/lib/MRBS/Auth/AuthJoomla.php | 2 +- web/lib/MRBS/Auth/AuthLdap.php | 138 ++++++++++++++++++++++++++ web/lib/MRBS/Auth/AuthWordpress.php | 2 +- 4 files changed, 140 insertions(+), 138 deletions(-) commit e6bc07ce4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 09:54:16 2020 +0100 Shifted authValidateUser() into the Auth class web/auth/auth_joomla.inc | 20 -------------------- web/lib/MRBS/Auth/AuthJoomla.php | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 20 deletions(-) commit 0325d9a98 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 09:45:17 2020 +0100 Shifted authValidateUser() into the Auth class web/auth/auth_wordpress.inc | 46 --------------------- web/lib/MRBS/Auth/AuthWordpress.php | 17 ++++++++ web/lib/MRBS/Session/SessionHttp.php | 4 +- web/lib/MRBS/Session/SessionWithLogin.php | 2 +- 4 files changed, 20 insertions(+), 49 deletions(-) commit 6fe341920 Merge: dd3274580 07d39fc9a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 09:21:17 2020 +0100 Merge with default commit 07d39fc9a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 10 09:20:57 2020 +0100 Added a noarchive directive web/style.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit dd3274580 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 9 16:44:23 2020 +0100 Removed redundant code web/auth/auth_config.inc | 2 +- web/auth/auth_joomla.inc | 2 +- web/auth/auth_ldap.inc | 2 +- web/auth/auth_wordpress.inc | 2 +- web/auth/functions_auth.inc (gone) | 32 ---------------------------- 5 files changed, 4 insertions(+), 36 deletions(-) commit d449c9494 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 9 16:32:49 2020 +0100 Shifted authGetUsernames into the Auth class web/auth/auth_db.inc | 11 ----------- web/lib/MRBS/Auth/AuthDb.php | 27 +++++++++++++++++++-------- 2 files changed, 19 insertions(+), 19 deletions(-) commit ff490af5b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 9 16:25:24 2020 +0100 Shifted authGetUsernames into the Auth class web/auth/auth_wordpress.inc | 52 ---------------- web/lib/MRBS/Auth/AuthWordpress.php | 89 ++++++++++++++++++++++----- 2 files changed, 72 insertions(+), 69 deletions(-) commit f3f8258eb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 9 15:50:56 2020 +0100 Shifted authGetUsernames into the Auth class web/auth/auth_config.inc | 20 -------------------- web/lib/MRBS/Auth/AuthConfig.php | 21 +++++++++++++++++++-- 2 files changed, 19 insertions(+), 22 deletions(-) commit e4df407f6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 9 15:30:41 2020 +0100 Shifted authGetUsernames into the Auth class web/auth/auth_ldap.inc | 112 ------------------------------- web/lib/MRBS/Auth/AuthLdap.php | 106 +++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 112 deletions(-) commit 02cc0859b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 9 12:01:20 2020 +0100 Fixed bug web/lib/MRBS/Auth/AuthLdap.php | 116 +++++++++++++++---------------- 1 file changed, 58 insertions(+), 58 deletions(-) commit 8b255da1e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 9 11:49:52 2020 +0100 Shifted authGetUsernames into the Auth class web/auth/auth_joomla.inc | 79 ------------------------------ web/edit_entry.php | 4 +- web/lib/MRBS/Auth/Auth.php | 50 +++++++++++++++---- web/lib/MRBS/Auth/AuthJoomla.php | 77 +++++++++++++++++++++++++++++ 4 files changed, 119 insertions(+), 91 deletions(-) commit 9794acd0f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 9 10:33:43 2020 +0100 Used the display name in email notifications web/functions_mail.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 8d4770eec Merge: 32169e6cd e8e960fac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 8 14:38:41 2020 +0100 Merge with default commit e8e960fac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 8 14:38:00 2020 +0100 Code formatting change only. web/functions.inc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) commit d0d8d5b91 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 8 14:36:52 2020 +0100 Added comment. See SF Support Requests #2025. web/systemdefaults.inc.php | 1 + 1 file changed, 1 insertion(+) commit 32169e6cd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 5 12:01:38 2020 +0100 Completed merge web/lib/MRBS/Session/SessionCas.php | 3 +-- web/lib/MRBS/Session/SessionWithLogin.php | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) commit d2e9e5010 Merge: bfa5956ba 7f3e0410f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 5 11:56:40 2020 +0100 Merge with default commit 7f3e0410f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 5 11:55:51 2020 +0100 Moved urlencoding into location_header() web/edit_area_handler.php | 4 ++-- web/edit_room_handler.php | 4 ++-- web/edit_users.php | 4 ++-- web/functions.inc | 32 ++++++++++++++++++++++++++--- web/session/session_cookie.inc | 2 +- web/session/session_joomla.inc | 4 ++-- web/session/session_php.inc | 2 +- web/session/session_wordpress.inc | 4 ++-- 8 files changed, 41 insertions(+), 15 deletions(-) commit 55aca6dc3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 5 10:37:51 2020 +0100 Created a wrapper function for header("Location:") calls to make it easier to manipulate the location. web/add.php | 2 +- web/approve_entry_handler.php | 4 +--- web/del.php | 6 ++---- web/del_entry.php | 3 +-- web/edit_area_handler.php | 6 ++---- web/edit_entry_handler.php | 12 ++++-------- web/edit_room_handler.php | 6 ++---- web/edit_users.php | 14 +++++--------- web/functions.inc | 9 +++++++++ web/index.php | 3 +-- web/session/session_cas.inc | 3 +-- web/session/session_cookie.inc | 3 +-- web/session/session_joomla.inc | 3 +-- web/session/session_php.inc | 3 +-- web/session/session_wordpress.inc | 3 +-- web/view_entry.php | 3 +-- 16 files changed, 34 insertions(+), 49 deletions(-) commit bfa5956ba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 3 16:36:39 2020 +0100 Trivial code layout change web/functions.inc | 1 + 1 file changed, 1 insertion(+) commit 821caaeb7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 3 16:33:05 2020 +0100 Restructured web/functions.inc | 20 ++++++++++++++++++++ web/lib/MRBS/Auth/AuthJoomla.php | 2 +- web/report.php | 2 +- web/search.php | 2 +- 4 files changed, 23 insertions(+), 3 deletions(-) commit 4fa011f90 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 3 16:29:50 2020 +0100 Added display name to pending results web/pending.php | 96 +++++++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 48 deletions(-) commit e6947832a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 3 15:59:20 2020 +0100 Fixed bug when the user is not a Joomla user web/lib/MRBS/Auth/AuthJoomla.php | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) commit 470fd652a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 3 15:12:39 2020 +0100 Added display name to search results web/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c4483e8f9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 3 15:03:58 2020 +0100 Added display name to report results web/report.php | 3 +++ 1 file changed, 3 insertions(+) commit 1d6d13180 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 3 12:05:38 2020 +0100 Changed username to display name in the header web/Themes/default/header.inc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) commit 8c51b0b77 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Apr 1 15:38:07 2020 +0100 Updated Norwegian translation from Pål Viland Monstad web/lang/lang.nb | 228 ++++++++++++++++++++++++++++++++++++--------- web/lang/lang.nn | 226 +++++++++++++++++++++++++++++++++++--------- web/lang/lang.no | 226 +++++++++++++++++++++++++++++++++++--------- 3 files changed, 547 insertions(+), 133 deletions(-) commit 5941213b2 Merge: 2dac070fe ec1928bd9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 1 07:24:47 2020 +0100 Merge with default commit ec1928bd9 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Mar 31 19:51:54 2020 +0100 Added tag mrbs-1_8_0 for changeset 298dd950f6c9 commit a2a0f6e6b (tag: mrbs-1_8_0) Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Mar 31 19:51:30 2020 +0100 Updated ChangeLog and NEWS for 1.8.0 release ChangeLog | 20032 ++++++++++++++++++++++++++++++++++++++++++-------- NEWS | 274 +- 2 files changed, 17148 insertions(+), 3158 deletions(-) commit 2dac070fe Merge: a74269b0e 576a47d85 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 31 15:03:55 2020 +0100 Merge with default commit 576a47d85 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 31 14:54:03 2020 +0100 Tidied up print CSS web/css/mrbs-print.css.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit b0fe2cb6c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 31 14:44:09 2020 +0100 Tidied up classic126 theme web/Themes/classic126/styling.inc | 21 +++++++++++---------- web/Themes/default/styling.inc | 19 ++++++++++--------- web/css/mrbs.css.php | 2 +- 3 files changed, 22 insertions(+), 20 deletions(-) commit a74269b0e Merge: a6bf5b51d ce7c2a485 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 30 09:47:36 2020 +0100 Merge with default commit ce7c2a485 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 30 09:47:15 2020 +0100 Fixed bug introduced in recent commits in week_view_all_rooms branch. web/js/refresh.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit a6bf5b51d Merge: d25d7bc64 b820efa8e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 30 09:35:29 2020 +0100 Merge with default commit b820efa8e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 30 09:34:46 2020 +0100 Fixed bug in vocab for custom field names in email notifications. See SF Patches #95. web/functions_mail.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 70f33ea6a Merge: 3131f6480 7436c734a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 27 14:28:20 2020 +0000 Merge with week_view_all_rooms commit 7436c734a (origin/week_view_all_rooms) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 27 14:25:27 2020 +0000 Close week_view_all_rooms branch commit 41cb31547 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 27 12:50:10 2020 +0000 Optimised the timeline timer so that it doesn't fire more often than necessary. web/functions_table.inc | 2 +- web/js/refresh.js.php | 20 ++++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) commit 95e7c2f7c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 26 16:38:39 2020 +0000 Added comments web/functions_table.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) commit 34b3f4d9b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 26 16:31:10 2020 +0000 Added comments web/functions_table.inc | 3 +++ 1 file changed, 3 insertions(+) commit cf82a1e67 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 26 16:27:13 2020 +0000 Updated comments web/js/refresh.js.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) commit ce2b10f61 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 26 16:18:19 2020 +0000 Removed redundant code web/js/refresh.js.php | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) commit 37b470e2d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 26 16:14:17 2020 +0000 Added timeline to all rooms views web/functions_table.inc | 46 +++++++++++--- web/js/refresh.js.php | 125 ++++++++++++++++++-------------------- 2 files changed, 97 insertions(+), 74 deletions(-) commit 05837c46e Merge: 978a3186b 3131f6480 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 25 16:07:08 2020 +0000 Merge with default commit d25d7bc64 Merge: 14e53a413 3131f6480 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 25 16:06:45 2020 +0000 Merge with default commit 3131f6480 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 25 16:03:25 2020 +0000 Fixed bug in error handling. See SF Support Requests #1989 web/functions_error.inc | 2 +- web/init.inc | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) commit 978a3186b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 22 17:13:46 2020 +0000 Restructured web/functions_table.inc | 47 ++++++++++++--------------------------- 1 file changed, 14 insertions(+), 33 deletions(-) commit 45ff6be73 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 22 16:50:07 2020 +0000 Restructured web/functions_table.inc | 26 ++++++++++++++++---------- web/js/refresh.js.php | 2 +- 2 files changed, 17 insertions(+), 11 deletions(-) commit 5b4408c72 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 22 16:13:59 2020 +0000 Restructured web/functions_table.inc | 55 ++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 18 deletions(-) commit 16e9e3b96 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 15 18:23:43 2020 +0000 Fixed bug in view links web/index.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) commit 5bd88bbce Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 15 18:16:44 2020 +0000 Renamed function web/functions_table.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit d56bfff9c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 15 18:06:25 2020 +0000 Fixed incorrect link in room cell web/functions_table.inc | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) commit 6b9df1700 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 15 17:47:02 2020 +0000 Removed the option of $days_along_top = false as it doesn't seem very useful web/functions_table.inc | 19 ++++++++++++++++++- web/systemdefaults.inc.php | 5 ----- 2 files changed, 18 insertions(+), 6 deletions(-) commit bcdfd90cf Merge: 46c5c87a8 cde6cdbee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 14 12:07:13 2020 +0000 Merge with default commit 14e53a413 Merge: 18341142b cde6cdbee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 14 12:06:54 2020 +0000 Merge with default commit cde6cdbee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 14 12:06:33 2020 +0000 Made url_get_contents() a little more resilient. web/functions.inc | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) commit 46c5c87a8 Merge: 778859094 def84db83 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 1 08:02:55 2020 +0000 Merge with default commit 18341142b Merge: 8535388e4 def84db83 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 1 08:02:32 2020 +0000 Merge with default commit def84db83 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 1 08:02:01 2020 +0000 Updated comments web/css/mrbs.css.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) commit 778859094 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 29 18:36:05 2020 +0000 Fixed problem with the second row of a sticky header on page refresh web/js/refresh.js.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) commit 013706ec3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 29 17:09:03 2020 +0000 Fixed problem with sticky headers when there is more than one row in the thead. web/js/refresh.js.php | 11 +++++++++++ 1 file changed, 11 insertions(+) commit 68e2670d4 Merge: 0ba6ef368 c45e35998 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 29 16:17:30 2020 +0000 Merge with default commit 8535388e4 Merge: cbc3be40c c45e35998 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 29 16:17:06 2020 +0000 Merge with default commit c45e35998 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 29 16:16:43 2020 +0000 Fixed problem with sticky headers causing the main table to slide up to meet the navigation bar. web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0ba6ef368 Merge: 0932131a4 509d9fc83 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 29 14:20:49 2020 +0000 Merge with default commit cbc3be40c Merge: c0e5f905c 509d9fc83 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 29 14:19:45 2020 +0000 Merge with default commit 509d9fc83 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 29 14:19:07 2020 +0000 Added sticky headers for the main calendar view. See SF Support Requests #1951. web/css/mrbs.css.php | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) commit 0932131a4 Merge: 24b0a6001 01697670b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 28 14:11:10 2020 +0000 Merge with default commit c0e5f905c Merge: 09fbe8ed4 01697670b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 28 14:10:34 2020 +0000 Merge with default commit 01697670b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 28 13:45:10 2020 +0000 Added a $default_name. See SF Feature Requests #415. web/edit_entry.php | 392 +++++++++++++++++------------------ web/systemdefaults.inc.php | 5 +- 2 files changed, 200 insertions(+), 197 deletions(-) commit 24b0a6001 Merge: 3c0a7d717 eb5a641bf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 24 17:03:31 2020 +0000 Merge with default commit 09fbe8ed4 Merge: 60ad84f71 eb5a641bf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 24 17:02:59 2020 +0000 Merge with default commit eb5a641bf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 24 17:02:26 2020 +0000 Simplified code web/functions.inc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) commit 3c0a7d717 Merge: 1bc631a84 8f2fb21a0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 24 15:59:48 2020 +0000 Merge with default commit 60ad84f71 Merge: 255a0f4de 8f2fb21a0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 24 15:59:04 2020 +0000 Merge with default commit 8f2fb21a0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 24 15:57:54 2020 +0000 Updated the AUTHENTICATION document. See SF Support Requests #1995. AUTHENTICATION | 78 +++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 44 deletions(-) commit 1bc631a84 Merge: 0a6a91b99 99199c805 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 14 12:16:27 2020 +0000 Merge with default commit 255a0f4de Merge: 6f953c04e 99199c805 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 14 12:16:10 2020 +0000 Merge with default commit 99199c805 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 14 12:13:06 2020 +0000 Fixed bug preventing the Type field being made into a mandatory field. See SF Support Requests #1985. web/lib/MRBS/Form/Element.php | 174 ++++++++++++++++---------------- 1 file changed, 88 insertions(+), 86 deletions(-) commit 0a6a91b99 Merge: e01e7563b 1a77cb47b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 13 20:52:30 2020 +0000 Merge with default commit 6f953c04e Merge: 2410119e3 1a77cb47b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 13 20:52:11 2020 +0000 Merge with default commit 1a77cb47b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 13 20:51:47 2020 +0000 Made capitalisation consistent. web/lang/lang.it | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0b9a7858c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 13 20:50:38 2020 +0000 Added missing Italian translation. See SF Bugs #456. web/lang/lang.it | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit e01e7563b Merge: 1a29c09b1 bad6a6e26 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 8 10:08:21 2020 +0000 Merge with default commit 2410119e3 Merge: 158eaa590 bad6a6e26 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 8 10:07:58 2020 +0000 Merge with default commit bad6a6e26 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 8 10:07:36 2020 +0000 Added an "All" option to the DataTables entries length menu. See SF Support Requests #1955. web/js/datatables.js.php | 1 + web/lang/lang.en | 1 + 2 files changed, 2 insertions(+) commit 1a29c09b1 Merge: 3dd310c62 b6516f7a7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 7 18:26:16 2020 +0000 Merge with default commit 158eaa590 Merge: 2e8dba0aa b6516f7a7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 7 18:25:49 2020 +0000 Merge with default commit b6516f7a7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 7 18:23:53 2020 +0000 Restricted the export buttons to using visible columns web/js/datatables.js.php | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) commit 3dd310c62 Merge: 93845157a 95db468ba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 7 17:55:13 2020 +0000 Merge with default commit 2e8dba0aa Merge: 2ae0fff92 95db468ba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 7 17:54:50 2020 +0000 Merge with default commit 95db468ba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 7 17:52:59 2020 +0000 Added config settings for the default PDF paper size and orientation web/js/datatables.js.php | 17 ++++++++++++----- web/systemdefaults.inc.php | 7 +++++++ 2 files changed, 19 insertions(+), 5 deletions(-) commit 93845157a Merge: ba6b7bba3 7d5af62a2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 7 16:14:35 2020 +0000 Merge with default commit 2ae0fff92 Merge: 19c924615 7d5af62a2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 7 16:14:18 2020 +0000 Merge with default commit 7d5af62a2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 7 16:09:36 2020 +0000 Added comment web/report.php | 277 ++++++++++++++++++++++++----------------------- 1 file changed, 140 insertions(+), 137 deletions(-) commit bf6e6af6f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 7 16:05:19 2020 +0000 Added comment web/js.inc | 6 ++++++ 1 file changed, 6 insertions(+) commit d874efbe6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 7 16:00:33 2020 +0000 Internationalised button strings web/js/datatables.js.php | 10 +++++++++- web/lang/lang.en | 9 +++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) commit 459764877 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 7 15:33:57 2020 +0000 Added Copy, CSV, etc. buttons web/js/datatables.js.php | 49 ++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 21 deletions(-) commit ce48b5730 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 7 14:20:31 2020 +0000 Updated DataTables translations web/jquery/datatables/language/Arabic.lang | 6 +++ .../datatables/language/Esperanto.lang (new) | 30 +++++++++++ web/jquery/datatables/language/French.lang | 37 +++++++------- web/jquery/datatables/language/German.lang | 4 ++ web/jquery/datatables/language/Gujarati.lang | 9 ++-- .../datatables/language/Kurdish.lang (new) | 30 +++++++++++ .../datatables/language/Lao.lang (new) | 29 +++++++++++ web/jquery/datatables/language/Malay.lang | 2 +- web/jquery/datatables/language/Persian.lang | 14 ++--- .../language/Portuguese-Brasil.lang | 8 +++ .../datatables/language/Portuguese.lang | 3 +- web/jquery/datatables/language/Russian.lang | 7 +++ web/jquery/datatables/language/Serbian.lang | 44 +++++++++------- .../language/Serbian_latin.lang (new) | 30 +++++++++++ web/jquery/datatables/language/Spanish.lang | 48 ++++++++++-------- .../datatables/language/Tajik.lang (new) | 36 +++++++++++++ web/language.inc | 5 ++ 17 files changed, 270 insertions(+), 72 deletions(-) commit 8091a01de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 7 13:58:12 2020 +0000 Upgraded to latest version of DataTables .../css/buttons.bootstrap.css (new) | 187 + .../css/buttons.bootstrap.min.css (new) | 1 + .../css/buttons.bootstrap4.css (new) | 195 + .../css/buttons.bootstrap4.min.css (new) | 1 + .../css/buttons.dataTables.css | 31 +- .../css/buttons.dataTables.min.css (new) | 1 + .../css/buttons.foundation.css (new) | 214 + .../css/buttons.foundation.min.css (new) | 1 + .../css/buttons.jqueryui.css (new) | 240 + .../css/buttons.jqueryui.min.css (new) | 1 + .../css/buttons.semanticui.css (new) | 193 + .../css/buttons.semanticui.min.css (new) | 1 + .../Buttons-1.6.1/css/common.scss (new) | 37 + .../Buttons-1.6.1/css/mixins.scss (new) | 153 + .../js/buttons.bootstrap.js (new) | 70 + .../js/buttons.bootstrap.min.js (new) | 6 + .../js/buttons.bootstrap4.js (new) | 68 + .../js/buttons.bootstrap4.min.js (new) | 6 + .../{ => Buttons-1.6.1}/js/buttons.colVis.js | 19 +- .../js/buttons.colVis.min.js (new) | 10 + .../Buttons-1.6.1/js/buttons.flash.js (new) | 1456 + .../js/buttons.flash.min.js (new) | 39 + .../js/buttons.foundation.js (new) | 88 + .../js/buttons.foundation.min.js (new) | 6 + .../Buttons-1.6.1/js/buttons.html5.js (new) | 1459 + .../js/buttons.html5.min.js (new) | 35 + .../js/buttons.jqueryui.js (new) | 62 + .../js/buttons.jqueryui.min.js (new) | 6 + .../Buttons-1.6.1/js/buttons.print.js (new) | 210 + .../js/buttons.print.min.js (new) | 9 + .../js/buttons.semanticui.js (new) | 57 + .../js/buttons.semanticui.min.js (new) | 6 + .../js/dataTables.buttons.js | 415 +- .../js/dataTables.buttons.min.js (new) | 42 + .../Buttons-1.6.1/swf/flashExport.swf (new) | Bin 0 -> 64603 bytes .../css/colReorder.bootstrap.css (new) | 11 + .../css/colReorder.bootstrap.min.css (new) | 1 + .../css/colReorder.bootstrap4.css (new) | 11 + .../css/colReorder.bootstrap4.min.css (new) | 1 + .../css/colReorder.dataTables.css | 0 .../css/colReorder.dataTables.min.css | 0 .../css/colReorder.foundation.css (new) | 11 + .../css/colReorder.foundation.min.css (new) | 1 + .../css/colReorder.jqueryui.css (new) | 11 + .../css/colReorder.jqueryui.min.css (new) | 1 + .../css/colReorder.semanticui.css (new) | 11 + .../css/colReorder.semanticui.min.css (new) | 1 + .../js/colReorder.bootstrap.js (new) | 38 + .../js/colReorder.bootstrap.min.js (new) | 5 + .../js/colReorder.bootstrap4.js (new) | 38 + .../js/colReorder.bootstrap4.min.js (new) | 5 + .../js/colReorder.dataTables.js (new) | 38 + .../js/colReorder.foundation.js (new) | 38 + .../js/colReorder.foundation.min.js (new) | 5 + .../js/colReorder.jqueryui.js (new) | 38 + .../js/colReorder.jqueryui.min.js (new) | 5 + .../js/colReorder.semanicui.js (new) | 0 .../js/colReorder.semanticui.js (new) | 38 + .../js/colReorder.semanticui.min.js (new) | 5 + .../js/dataTables.colReorder.js | 173 +- .../js/dataTables.colReorder.min.js (new) | 40 + .../css/dataTables.bootstrap.css (new) | 187 + .../css/dataTables.bootstrap.min.css (new) | 1 + .../css/dataTables.bootstrap4.css (new) | 206 + .../css/dataTables.bootstrap4.min.css (new) | 1 + .../css/dataTables.foundation.css (new) | 118 + .../css/dataTables.foundation.min.css (new) | 1 + .../css/dataTables.jqueryui.css (new) | 481 + .../css/dataTables.jqueryui.min.css (new) | 1 + .../css/dataTables.semanticui.css (new) | 102 + .../css/dataTables.semanticui.min.css (new) | 1 + .../css/jquery.dataTables.css | 0 .../css/jquery.dataTables.min.css | 0 .../images/sort_asc.png | Bin .../images/sort_asc_disabled.png | Bin .../images/sort_both.png | Bin .../images/sort_desc.png | Bin .../images/sort_desc_disabled.png | Bin .../js/dataTables.bootstrap.js (new) | 182 + .../js/dataTables.bootstrap.min.js (new) | 11 + .../js/dataTables.bootstrap4.js (new) | 184 + .../js/dataTables.bootstrap4.min.js (new) | 11 + .../js/dataTables.foundation.js (new) | 174 + .../js/dataTables.foundation.min.js (new) | 9 + .../js/dataTables.jqueryui.js (new) | 164 + .../js/dataTables.jqueryui.min.js (new) | 12 + .../js/dataTables.semanticui.js (new) | 212 + .../js/dataTables.semanticui.min.js (new) | 12 + .../js/jquery.dataTables.js | 160 +- .../js/jquery.dataTables.min.js (new) | 180 + .../css/fixedColumns.bootstrap.css (new) | 60 + .../css/fixedColumns.bootstrap.min.css (new) | 1 + .../css/fixedColumns.bootstrap4.css (new) | 64 + .../fixedColumns.bootstrap4.min.css (new) | 1 + .../css/fixedColumns.dataTables.css | 0 .../css/fixedColumns.dataTables.min.css | 0 .../css/fixedColumns.foundation.css (new) | 32 + .../fixedColumns.foundation.min.css (new) | 1 + .../css/fixedColumns.jqueryui.css (new) | 12 + .../css/fixedColumns.jqueryui.min.css (new) | 1 + .../css/fixedColumns.semanticui.css (new) | 40 + .../fixedColumns.semanticui.min.css (new) | 1 + .../js/dataTables.fixedColumns.js | 37 +- .../js/dataTables.fixedColumns.min.js (new) | 48 + .../js/fixedColumns.bootstrap.js (new) | 38 + .../js/fixedColumns.bootstrap.min.js (new) | 5 + .../js/fixedColumns.bootstrap4.js (new) | 38 + .../js/fixedColumns.bootstrap4.min.js (new) | 5 + .../js/fixedColumns.dataTables.js (new) | 38 + .../js/fixedColumns.foundation.js (new) | 38 + .../js/fixedColumns.foundation.min.js (new) | 5 + .../js/fixedColumns.jqueryui.js (new) | 38 + .../js/fixedColumns.jqueryui.min.js (new) | 5 + .../js/fixedColumns.semanicui.js (new) | 0 .../js/fixedColumns.semanticui.js (new) | 38 + .../js/fixedColumns.semanticui.min.js (new) | 5 + .../datatables/JSZip-2.5.0/jszip.js (new) | 9155 ++ .../JSZip-2.5.0/jszip.min.js (new) | 14 + .../css/buttons.dataTables.min.css (gone) | 1 - web/jquery/datatables/datatables.css (new) | 877 + web/jquery/datatables/datatables.js (new) | 83490 +++++++++++++++ .../datatables/datatables.min.css (new) | 24 + .../datatables/datatables.min.js (new) | 458 + .../images/Sorting icons.psd (gone) | Bin 27490 -> 0 bytes .../images/back_disabled.png (gone) | Bin 345 -> 0 bytes .../images/back_enabled.png (gone) | Bin 453 -> 0 bytes .../images/back_enabled_hover.png (gone) | Bin 450 -> 0 bytes .../datatables/images/favicon.ico (gone) | Bin 894 -> 0 bytes .../images/forward_disabled.jpg (gone) | Bin 635 -> 0 bytes .../images/forward_disabled.png (gone) | Bin 335 -> 0 bytes .../images/forward_enabled.jpg (gone) | Bin 852 -> 0 bytes .../images/forward_enabled.png (gone) | Bin 445 -> 0 bytes .../images/forward_enabled_hover.png (gone) | Bin 444 -> 0 bytes .../datatables/images/insert.png (gone) | Bin 1885 -> 0 bytes .../js/buttons.colVis.min.js (gone) | 10 - .../js/dataTables.buttons.min.js (gone) | 44 - .../js/dataTables.colReorder.min.js (gone) | 29 - .../js/dataTables.fixedColumns.min.js (gone) | 35 - .../js/jquery.dataTables.min.js (gone) | 166 - .../pdfmake-0.1.36/pdfmake.js (new) | 50468 +++++++++ .../pdfmake-0.1.36/pdfmake.min.js (new) | 3 + .../pdfmake-0.1.36/vfs_fonts.js (new) | 6 + web/jquery/datatables/{js => }/plugins.js | 0 web/js.inc | 28 +- web/style.inc | 10 +- 145 files changed, 153022 insertions(+), 608 deletions(-) commit ba6b7bba3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 5 14:26:04 2020 +0000 Fixed problem where the page gets stuck on "Loading ..." if the session has been timed out due to inactivity. web/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5b954d4b4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 5 13:35:29 2020 +0000 Simplified code web/functions_table.inc | 129 +++++++++++++++++++------------------- 1 file changed, 63 insertions(+), 66 deletions(-) commit d03440727 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 5 13:33:09 2020 +0000 Simplified code web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b28c0f8a9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 5 13:29:44 2020 +0000 Improved performance web/functions_table.inc | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) commit ab48b6253 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 5 13:07:42 2020 +0000 Removed profiling code web/functions_table.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 198dc903d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 5 13:05:48 2020 +0000 Improved performance web/functions_table.inc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) commit 107a327a6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 5 11:12:55 2020 +0000 Improved performance web/functions_table.inc | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) commit 04a80eb71 Merge: 7b08729be 4a52d33db Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 3 19:15:36 2020 +0000 Merge with default commit 19c924615 Merge: 39bd61b82 4a52d33db Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 3 19:15:21 2020 +0000 Merge with default commit 4a52d33db Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 3 19:14:56 2020 +0000 Clarified wording of upgrade procedure. See SF Support Requests #1978. UPGRADE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 7b08729be Merge: 7af7b088c e2e2ffb5b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 27 18:05:58 2020 +0000 Merge with default commit 39bd61b82 Merge: e17c1142a e2e2ffb5b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 27 18:05:40 2020 +0000 Merge with default commit e2e2ffb5b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 27 18:05:16 2020 +0000 Fixed CSS problem (see SF Support Requests #1951. web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7af7b088c Merge: b8f2736e5 48b748b16 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 26 17:20:43 2020 +0000 Merge with default commit e17c1142a Merge: 74dd65fb1 48b748b16 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 26 17:20:24 2020 +0000 Merge with default commit 48b748b16 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 26 17:20:01 2020 +0000 Added an index for greatly improved performance tables.my.sql | 5 +++-- tables.pg.sql | 3 ++- web/lib/MRBS/DB.php | 2 +- web/upgrade/63/mysql.sql (new) | 5 +++++ web/upgrade/63/pgsql.sql (new) | 3 +++ 5 files changed, 14 insertions(+), 4 deletions(-) commit b8f2736e5 Merge: b90c45d39 bc6a0fa76 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 26 08:38:20 2020 +0000 Merge with default commit 74dd65fb1 Merge: 33c315e45 bc6a0fa76 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 26 08:37:57 2020 +0000 Merge with default commit bc6a0fa76 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 26 08:37:34 2020 +0000 Fixed a few more instances of a bug when $booking_types is not set. See SF Support Requests #1962. web/edit_entry.php | 2 +- web/functions_mail.inc | 2 +- web/functions_view.inc | 2 +- web/report.php | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) commit b90c45d39 Merge: ca288139d be52b8d00 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 24 13:39:07 2020 +0000 Merge with default commit 33c315e45 Merge: 360a01003 be52b8d00 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 24 13:38:27 2020 +0000 Merge with default commit be52b8d00 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 24 13:36:14 2020 +0000 Added border to sticky cells web/css/mrbs.css.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit ddecd4fba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 24 13:08:43 2020 +0000 Made the left-hand column sticky web/css/mrbs.css.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) commit 682fd00aa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 24 12:55:51 2020 +0000 Fixed problem with wide tables on the index page overflowing web/css/mrbs.css.php | 51 +++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 25 deletions(-) commit ca288139d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 16 16:31:26 2020 +0000 Fixed problem which seems to have been accidentally created in a recent commit. web/lib/MRBS/DB_pgsql.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit a3cb0f0c7 Merge: 52a76ff19 598e86a20 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 16 14:56:18 2020 +0000 Merge commit cf32c68f1 Merge: 7108894c7 52a76ff19 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 16 14:42:32 2020 +0000 Merge with default commit 360a01003 Merge: 8f6ecccdf 52a76ff19 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 16 14:42:10 2020 +0000 Merge with default commit 52a76ff19 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 16 14:41:32 2020 +0000 Fixed bug when $booking_types is not set. See SF Support Requests #1962. web/index.php | 100 ++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 50 deletions(-) commit 841ebfb1d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 16 14:39:52 2020 +0000 Backed out changeset: ca298d70597f web/index.php | 100 ++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 50 deletions(-) commit 7108894c7 Merge: 1c6a62b6f 53d79256a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 16 14:16:16 2020 +0000 Merge with default commit 8f6ecccdf Merge: ba902bc7e 53d79256a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 16 14:15:23 2020 +0000 Merge with default commit 53d79256a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 16 14:14:59 2020 +0000 Fixed bug when $booking_types is not set. See SF Support Requests #1962. web/index.php | 100 ++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 50 deletions(-) commit 1c6a62b6f Merge: dc9a16228 598e86a20 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 14 14:35:00 2020 +0000 Merge with default commit ba902bc7e Merge: 664b7a633 598e86a20 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 14 14:34:38 2020 +0000 Merge with default commit 598e86a20 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 14 14:34:10 2020 +0000 Fixed flatpickr Malaysian localisation for Sunday. See SF Support Requests #1958 web/js/flatpickr/l10n/ms.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit dc9a16228 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 11 19:00:50 2020 +0000 Tweaked comment web/functions_table.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit ce566c775 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 11 18:55:22 2020 +0000 Added some error handling web/functions_table.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) commit f98e2844c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 11 18:47:16 2020 +0000 Used IntlDateFormatter, if available, in the week view as well, for consistency. web/functions_table.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 188f707bb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 11 18:43:40 2020 +0000 Used the IntlDateFormatter class, if available, to save space in the month view. web/functions_table.inc | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) commit f2da463b5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 11 16:50:17 2020 +0000 Switched to having two header rows instead of a single row with line breaks web/functions_table.inc | 98 +++++++++++++++++++++--------------- web/js/refresh.js.php | 28 +++++------ web/lib/MRBS/DB_pgsql.php | 3 +- web/systemdefaults.inc.php | 3 +- 4 files changed, 75 insertions(+), 57 deletions(-) commit 13e8689a7 Merge: afb00fa31 e3ba69352 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 10 11:29:06 2020 +0000 Merge with default commit 664b7a633 Merge: e643bac82 e3ba69352 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 10 11:28:40 2020 +0000 Merge with default commit e3ba69352 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 10 11:28:14 2020 +0000 Fixed problem with users not being to login when the auth type is 'db_ext' and the collation of the external database is not utf8 and the username contains non-ASCII characters, eg "Müller". See SF Support Requests #1949. web/lib/MRBS/DB_mysql.php | 78 +++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 37 deletions(-) commit afb00fa31 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 8 15:29:49 2020 +0000 Restructed code web/functions_table.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 13c120e9e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 8 15:19:49 2020 +0000 Changed date format in all rooms month view web/functions_table.inc | 20 +++++++++------- web/systemdefaults.inc.php | 45 ++++++++++++++++++------------------ 2 files changed, 35 insertions(+), 30 deletions(-) commit dd513e600 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 8 15:02:14 2020 +0000 Stopped wrapping of text in table header web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 73729f6fd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 8 14:54:31 2020 +0000 First attempt at an all rooms month view web/css/mrbs.css.php | 20 ++++++------- web/functions_table.inc | 62 +++++++++++++++++++++++++++++---------- web/index.php | 8 ++--- 3 files changed, 60 insertions(+), 30 deletions(-) commit e643bac82 Merge: 961591c22 1238cf807 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 8 10:18:01 2020 +0000 Merge with default commit a8ba50d61 Merge: 200585dce 1238cf807 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 8 10:17:37 2020 +0000 Merge with default commit 1238cf807 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 8 10:16:58 2020 +0000 Fixed bug preventing the db_ext auth scheme working when the external usernames contain uppercase characters. See SF Support Requests 1949. web/auth/auth_db_ext.inc | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) commit 200585dce Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 7 15:11:24 2020 +0000 Passed through the view_all parameter web/functions_table.inc | 49 +++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 22 deletions(-) commit 6e0fe05ac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 7 15:02:48 2020 +0000 Added a new config setting $default_view_all. See SF Support Requests #1948 web/standard_vars.inc.php | 2 +- web/systemdefaults.inc.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) commit 77e1e4b03 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 7 14:53:09 2020 +0000 Added a link to the day cell in the header web/functions_table.inc | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) commit b89872404 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 7 13:51:46 2020 +0000 Restructured code web/functions_table.inc | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) commit a1d38a7c0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 7 13:44:55 2020 +0000 Restructured code web/functions_table.inc | 55 +++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 22 deletions(-) commit d0bb1edac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 7 13:29:08 2020 +0000 Restructured code web/functions_table.inc | 80 ++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 47 deletions(-) commit efc7c73ae Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 7 11:51:01 2020 +0000 Restructured code web/functions_table.inc | 53 +++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 30 deletions(-) commit bcbe04f66 Merge: 31371f4e1 a29403a05 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 2 16:54:38 2020 +0000 Merge with default commit 961591c22 Merge: 90074d379 a29403a05 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 2 16:54:17 2020 +0000 Merge with default commit a29403a05 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 2 16:53:51 2020 +0000 Fixed bug: the custom CSS should override standard MRBS CSS. web/style.inc | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) commit 31371f4e1 Merge: 1bad2c8ed 80fac8ba9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 26 14:28:40 2019 +0000 Merge with default commit 90074d379 Merge: 1c21a0177 80fac8ba9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 26 14:28:14 2019 +0000 Merge with default commit 80fac8ba9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 26 14:27:35 2019 +0000 Fixed SF Bugs #454: uncaught exception when using $mail_settings['debug'] = true, introduced on 2 Dec 2019 when the PHPMailer version was upgraded. web/functions_mail.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 1bad2c8ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 25 01:34:46 2019 +0000 Simplified code web/functions_table.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit f42ea24e6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 25 01:27:59 2019 +0000 Simplified code web/functions_table.inc | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) commit 5fc6152e6 Merge: fe304e09b 828c28527 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 25 00:56:48 2019 +0000 Merge with default commit 1c21a0177 Merge: 0643aec11 828c28527 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 25 00:52:39 2019 +0000 Merge with default commit 828c28527 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 25 00:51:53 2019 +0000 Fixed bug resulting in an incorrect link to the week view when in day view with $times_along_top = false. web/functions_table.inc | 253 +++++++++++++++++++------------------- 1 file changed, 127 insertions(+), 126 deletions(-) commit fe304e09b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 25 00:36:47 2019 +0000 Simplified code web/functions_table.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 0681b9535 Merge: 48ca869c7 14fa9489c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 23 16:14:54 2019 +0000 Merge with default commit 0643aec11 Merge: 4c5d5f630 14fa9489c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 23 16:14:24 2019 +0000 Merge with default commit 14fa9489c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 23 16:12:06 2019 +0000 Fixed bug in Flatpickr Malay localisation web/js/flatpickr/l10n/ms.js | 1 + 1 file changed, 1 insertion(+) commit d74ae3719 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 23 16:11:29 2019 +0000 Added Malay translaton. Thanks to aizuddin hadi. See SF Support Requests 1940. web/lang/lang.ms (new) | 533 ++++++++++++++++++++++++++++++++++++++ web/lib/MRBS/System.php | 123 ++++----- 2 files changed, 595 insertions(+), 61 deletions(-) commit 48ca869c7 Merge: 6e16cc092 67188e133 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 21 09:28:35 2019 +0000 Merge with default commit 4c5d5f630 Merge: c79400b20 67188e133 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 21 09:28:06 2019 +0000 Merge with default commit 67188e133 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 21 09:27:29 2019 +0000 Made the code resilient to $default_language_tokens being set to ''. See SF Support Requests #1932. web/language.inc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) commit 81e2c391d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 21 08:55:40 2019 +0000 Removed potential notice error. web/language.inc | 144 +++++++++++++++++++++++---------------------- 1 file changed, 73 insertions(+), 71 deletions(-) commit 6e16cc092 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 19 16:59:59 2019 +0000 Tweaked CSS web/css/mrbs.css.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit 8fb8da695 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 19 16:52:19 2019 +0000 Tweaked CSS web/css/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit 48efad018 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 19 16:46:46 2019 +0000 Added the booking short description to the view web/css/mrbs.css.php | 17 +++++++++++++++++ web/functions_table.inc | 22 ++++++++++++++++------ 2 files changed, 33 insertions(+), 6 deletions(-) commit e5bbf3fc6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 17 19:24:43 2019 +0000 Fixed height of bookings in Firefox web/css/mrbs.css.php | 4 ++++ 1 file changed, 4 insertions(+) commit 2de4afb5f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 17 19:22:04 2019 +0000 Tweaked CSS web/css/mrbs.css.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 4ad1595cd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 17 18:58:33 2019 +0000 Only show all the rooms if there's more than one of them. web/standard_vars.inc.php | 7 +++++++ 1 file changed, 7 insertions(+) commit 20330a37e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 17 18:31:48 2019 +0000 Fixed bottom border web/css/mrbs.css.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 0a98f4796 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 17 18:24:47 2019 +0000 Added a bottom border to bookings web/css/mrbs.css.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit faea2696f Merge: b0137aa77 332876080 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 17 17:19:28 2019 +0000 Merge with default commit c79400b20 Merge: 39b44687d 332876080 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 17 17:19:04 2019 +0000 Merge with default commit 332876080 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 17 17:17:01 2019 +0000 Made the code more resilient by not requiring getimagesize() on the company logo to be successful. See SF Support Requests #1932. web/Themes/default/header.inc | 126 +++++++++++++++++--------------- 1 file changed, 66 insertions(+), 60 deletions(-) commit b0137aa77 Merge: 9d4882f34 41c90e931 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 16 20:19:40 2019 +0000 Merge with default commit 39b44687d Merge: 32ad71c2a 41c90e931 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 16 20:18:01 2019 +0000 Merge with default commit 41c90e931 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 16 20:17:29 2019 +0000 Fixed bug introduced when the password compatibility library was removed. See SF Support requests #1926. web/auth/auth_db.inc | 17 +---------------- web/edit_users.php | 10 +--------- 2 files changed, 2 insertions(+), 25 deletions(-) commit 9d4882f34 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 16 16:58:54 2019 +0000 Restructured code web/Themes/default/header.inc | 3 +- web/admin.php | 2 +- web/approve_entry_handler.php | 2 +- web/del.php | 4 +- web/del_entry.php | 2 +- web/edit_area.php | 2 +- web/edit_entry.php | 4 +- web/edit_entry_handler.php | 12 ++-- web/edit_room.php | 2 +- web/edit_users.php | 4 +- web/functions.inc | 6 +- web/functions_table.inc | 33 ++++++----- web/help.php | 2 +- web/import.php | 2 +- web/index.php | 97 ++++++++++++++++----------------- web/js/resizable.js.php | 5 +- web/mrbs_auth.inc | 8 +-- web/pending.php | 2 +- web/report.php | 2 +- web/search.php | 2 +- web/standard_vars.inc.php | 1 + web/view_entry.php | 2 +- 22 files changed, 101 insertions(+), 98 deletions(-) commit b520120c8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 16 14:08:33 2019 +0000 Fixed links web/functions_table.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 92612fde9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 16 14:02:18 2019 +0000 Updated comment web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4e9a1d49a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 16 14:01:15 2019 +0000 Made the room links consistent with the day view web/functions_table.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit 8fc47c849 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 16 13:52:39 2019 +0000 Added link from room name web/css/mrbs.css.php | 9 ++++----- web/functions_table.inc | 12 +++++++++++- 2 files changed, 15 insertions(+), 6 deletions(-) commit 40ad0260c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 16 13:28:35 2019 +0000 Restructured code web/index.php | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) commit 0e5b8e9a3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 14 18:13:58 2019 +0000 Fixed some CSS issues web/css/mrbs.css.php | 17 +++++++++++------ web/index.php | 10 +++++++--- 2 files changed, 18 insertions(+), 9 deletions(-) commit c86fcca11 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 14 17:24:45 2019 +0000 Added a border between bookings web/css/mrbs.css.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) commit 116ccbd9a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 12 19:08:55 2019 +0000 Fixed a JavaScript error in the all-rooms week view web/js/resizable.js.php | 5 +++++ 1 file changed, 5 insertions(+) commit a44a3591a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 12 18:50:04 2019 +0000 Tweaked vocab web/lang/lang.en | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0a2321ae5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 12 18:47:56 2019 +0000 Integrated the old week view (showing only one room) with the new week view (showing all rooms) in a single view, with All Rooms now being an option in the select room drop-down. web/functions_table.inc | 15 +++- web/index.php | 146 +++++++++++++++++++++++------------- web/js/resizable.js.php | 5 +- web/lang/lang.en | 5 +- web/standard_vars.inc.php | 2 +- 5 files changed, 115 insertions(+), 58 deletions(-) commit ea895926c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 11 15:40:50 2019 +0000 Fixed links to day view web/functions.inc | 11 ++++++++++- web/functions_table.inc | 10 ++++------ 2 files changed, 14 insertions(+), 7 deletions(-) commit bbe952ab3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 10 08:34:04 2019 +0000 Added a title attribute to bookings. web/functions_table.inc | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) commit 2a83fd9d5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 9 19:09:46 2019 +0000 Now showing data web/css/mrbs.css.php | 9 +++++++++ web/functions_table.inc | 42 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 1 deletion(-) commit f2ab8d074 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 9 18:17:47 2019 +0000 First attempt - table, but no data yet. web/css/mrbs.css.php | 56 ++--- web/functions_table.inc | 399 ++++++++++++++++++++++++----------- web/systemdefaults.inc.php | 11 +- 3 files changed, 309 insertions(+), 157 deletions(-) commit 5c9eb0272 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 9 16:43:49 2019 +0000 Opened a new branch for the development of a week view showing all rooms in an area commit 32ad71c2a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 6 09:31:50 2019 +0000 Fixed spelling errors in comments. See SF Bugs #451. web/lib/MRBS/Session/SessionNt.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 02b2c9f92 Merge: a17ab1f9d 52dbadb40 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 6 09:30:37 2019 +0000 Merge with default commit 52dbadb40 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 6 09:30:00 2019 +0000 Fixed spelling errors in comments. See SF Bugs #451. AUTHENTICATION | 48 ++--- INSTALL | 48 ++--- NEWS | 110 +++++----- UPGRADE | 16 +- web/auth/auth_none.inc | 12 +- web/del_entry.php | 12 +- web/edit_area_handler.php | 22 +- web/edit_entry_handler.php | 74 +++---- web/edit_room_handler.php | 4 +- web/functions.inc | 286 ++++++++++++------------- web/functions_ical.inc | 140 ++++++------- web/functions_mail.inc | 216 +++++++++---------- web/functions_view.inc | 66 +++--- web/grab_globals.inc.php | 14 +- web/internalconfig.inc.php | 34 +-- web/js/resizable.js.php | 224 ++++++++++---------- web/lib/MRBS/DB_pgsql.php | 48 ++--- web/mrbs_sql.inc | 392 +++++++++++++++++------------------ web/search.php | 66 +++--- web/session/session_nt.inc | 8 +- web/systemdefaults.inc.php | 82 ++++---- 21 files changed, 961 insertions(+), 961 deletions(-) commit a17ab1f9d Merge: 3cdfd95fc d74167a81 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 4 17:41:26 2019 +0000 Merge with default commit d74167a81 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 4 17:40:56 2019 +0000 Removed password_compat now that MRBS requires a minimum of PHP 5.5.0. web/defaultincludes.inc | 1 - web/password_compat/password.php (gone) | 317 ---------------------- 2 files changed, 318 deletions(-) commit 3cdfd95fc Merge: f23fbdc6e 95227fefd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 3 16:40:01 2019 +0000 Merge with default commit 95227fefd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 3 16:39:43 2019 +0000 Fixed bug introduced with recent commit adding a type declaration web/lib/MRBS/DB.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f23fbdc6e Merge: 5dfcdc9b9 52e01a364 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 3 16:22:24 2019 +0000 Merge with default commit 52e01a364 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 3 16:21:23 2019 +0000 Fixed problem with exception handling in PHP7. web/functions_error.inc | 59 ++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 28 deletions(-) commit 5dfcdc9b9 Merge: 405ed3e2d 3baa23990 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 3 15:45:57 2019 +0000 Merge with default commit 3baa23990 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 3 15:40:37 2019 +0000 Upgraded to latest release of pear/Mail_Mime web/Mail/mime.php | 28 ++++++++++++++-------------- web/Mail/mimePart.php | 16 ++++++++-------- 2 files changed, 22 insertions(+), 22 deletions(-) commit 405ed3e2d Merge: 2dabf2a64 ee138680a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 2 17:37:00 2019 +0000 Merge with default commit ee138680a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 2 17:36:29 2019 +0000 Upgraded to the latest release of PHPMailer (6.1.3) and as a consequence increased the minimum PHP version required for MRBS from 5.4.0 to 5.5.0. web/defaultincludes.inc | 3 +- web/functions.inc | 3 +- web/functions_mail.inc | 6 +- web/lib/PHPMailer/COMMITMENT (new) | 46 + .../PHPMailer/PHPMailerAutoload.php (gone) | 61 - web/lib/PHPMailer/README.md (new) | 221 + web/lib/PHPMailer/SECURITY.md (new) | 28 + web/lib/PHPMailer/VERSION | 2 +- .../class.phpmaileroauth.php (gone) | 197 - .../class.phpmaileroauthgoogle.php (gone) | 77 - web/lib/PHPMailer/composer.json (new) | 51 + web/lib/PHPMailer/get_oauth_token.php | 230 +- .../language/phpmailer.lang-af.php (new) | 25 + .../PHPMailer/language/phpmailer.lang-ar.php | 2 +- .../PHPMailer/language/phpmailer.lang-ba.php | 2 +- .../language/phpmailer.lang-br.php (gone) | 27 - .../language/phpmailer.lang-cz.php (gone) | 25 - .../language/phpmailer.lang-dk.php (gone) | 26 - .../PHPMailer/language/phpmailer.lang-eo.php | 2 +- .../PHPMailer/language/phpmailer.lang-es.php | 2 +- .../PHPMailer/language/phpmailer.lang-fa.php | 2 +- .../PHPMailer/language/phpmailer.lang-fr.php | 2 +- .../language/phpmailer.lang-hi.php (new) | 26 + .../PHPMailer/language/phpmailer.lang-hu.php | 2 +- .../PHPMailer/language/phpmailer.lang-id.php | 23 +- .../PHPMailer/language/phpmailer.lang-it.php | 2 +- .../language/phpmailer.lang-mg.php (new) | 25 + .../PHPMailer/language/phpmailer.lang-ms.php | 2 +- .../PHPMailer/language/phpmailer.lang-nb.php | 2 +- .../PHPMailer/language/phpmailer.lang-nl.php | 4 +- .../language/phpmailer.lang-no.php (gone) | 25 - .../language/phpmailer.lang-pt_br.php | 2 +- .../language/phpmailer.lang-rs.php (gone) | 26 - .../PHPMailer/language/phpmailer.lang-ru.php | 16 +- .../language/phpmailer.lang-se.php (gone) | 26 - .../PHPMailer/language/phpmailer.lang-sk.php | 3 +- .../PHPMailer/language/phpmailer.lang-sl.php | 5 +- .../PHPMailer/language/phpmailer.lang-sr.php | 15 +- .../language/phpmailer.lang-tl.php (new) | 27 + .../PHPMailer/language/phpmailer.lang-uk.php | 22 +- web/lib/PHPMailer/src/Exception.php (new) | 39 + web/lib/PHPMailer/src/OAuth.php (new) | 138 + .../PHPMailer.php} | 3339 ++++++++++------ .../{class.pop3.php => src/POP3.php} | 246 +- .../{class.smtp.php => src/SMTP.php} | 738 ++-- web/lib/autoload.inc | 18 +- 46 files changed, 3379 insertions(+), 2432 deletions(-) commit 2dabf2a64 Merge: d35d1db0b 9a2a3ff4c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 2 12:26:13 2019 +0000 Merge with default commit 9a2a3ff4c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 2 12:25:32 2019 +0000 Updated .editorconfig to cater for iCalendar line endings .editorconfig | 4 ++++ 1 file changed, 4 insertions(+) commit d35d1db0b Merge: d1a8bb00d 8641700fb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 2 09:59:26 2019 +0000 Merge with default commit 8641700fb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 2 09:59:01 2019 +0000 Added some type hinting web/lib/MRBS/DB.php | 54 +++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) commit d1a8bb00d Merge: 37f45fd4f e97a51ed7 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Dec 1 01:07:03 2019 +0000 Merge from default commit e97a51ed7 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Dec 1 01:04:50 2019 +0000 First attempt at a .editorconfig file .editorconfig (new) | 15 +++++++++++++++ 1 file changed, 15 insertions(+) commit 37f45fd4f Merge: ccac20969 1cc81b5ac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 28 17:10:25 2019 +0000 Merge with default commit 1cc81b5ac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 28 17:08:16 2019 +0000 Changed capitalisation of titles web/lang/lang.en | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit 34dc5ec6a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 28 17:02:38 2019 +0000 Added title for the "Today" button. web/index.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit ccac20969 Merge: a54c74a40 538167cf4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 27 17:27:27 2019 +0000 Merge with default commit 538167cf4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 27 17:26:29 2019 +0000 Fixed problem with the iconv message not being output on shutdown when required. (Problem caused by the fact that the error message contains the namespace, so wasn't passing the original test). web/functions_error.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit a54c74a40 Merge: 27e9f927e d3083123d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 27 16:23:04 2019 +0000 Merge with default commit d3083123d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 27 16:21:59 2019 +0000 Fixed problem with warning messages being generated on some systems if PHP doesn't recognise the LC_ constants returned by setlocale(LC_ALL, 0). web/lib/MRBS/System.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) commit 27e9f927e Merge: 63fe4036b 095e87fe5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 27 15:19:23 2019 +0000 Merge with default commit 095e87fe5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 27 15:15:10 2019 +0000 Made behaviour of utf8_substr() compatible with mb_substr() (and fixed a notice error) when $start is past the end of the string. web/language.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 333669be0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 27 15:01:41 2019 +0000 Fixed bugs in utf8_substr() when $str is the empty string or $length is zero. web/language.inc | 9 +++++++++ 1 file changed, 9 insertions(+) commit dc3552bd2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 27 14:37:08 2019 +0000 Expanded comment web/language.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 63fe4036b Merge: 6fe3cce18 66e66ab00 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 27 14:30:42 2019 +0000 Merge with default commit 66e66ab00 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 27 14:28:43 2019 +0000 Backed out changeset: 4674eafa6021 web/language.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 6fe3cce18 Merge: 9e12ba8df bf7631852 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 26 19:17:25 2019 +0000 Merge with default commit bf7631852 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 26 19:15:33 2019 +0000 Fixed problems with utf8_* functions when passed an empty string. (I assume that versions of PHP sometime before 5.4 did not treat '' as a string for string offset purposes and so the dummy string was necessary.) web/language.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 0b3c2612c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 26 19:01:49 2019 +0000 Fixed some "Uninitialized string offset" notice errors. web/language.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 9e12ba8df Merge: 94e9b7634 e60a993cf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 23 19:29:06 2019 +0000 Merge with default commit e60a993cf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 23 19:28:47 2019 +0000 Fixed potential notice error in PHP 7.4: "Trying to access array offset on value of type bool" web/Themes/default/header.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 94e9b7634 Merge: a52a097e3 99644814c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 23 18:55:06 2019 +0000 Merge with default commit 99644814c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 23 18:54:16 2019 +0000 Fixed warning given by PHP 7.4: "Trying to access array offset on value of type null". web/functions_error.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit a52a097e3 Merge: a658cb9a8 1ae07c5c2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 19 16:09:44 2019 +0000 Merge with default commit 1ae07c5c2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 19 16:09:02 2019 +0000 Added some type hinting web/mrbs_sql.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) commit a658cb9a8 Merge: 38943c834 420f8272d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 19 15:48:54 2019 +0000 Merge with default commit 420f8272d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 19 15:45:02 2019 +0000 Restructured code web/edit_entry.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit c6653f8e7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 19 15:41:38 2019 +0000 Fixed a problem causing the time slot selector to be blank in some circumstances. See SF Support Requests #1911. web/edit_entry.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) commit 38943c834 Merge: 46a696190 708103844 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 16 12:35:35 2019 +0000 Merge with default commit 708103844 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 16 12:26:17 2019 +0000 Added some type hinting web/functions_error.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 46a696190 Merge: 32bde254a 2a31e8b23 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 16 12:11:36 2019 +0000 Merge with default commit 2a31e8b23 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 16 12:11:04 2019 +0000 Updated comment. web/ajax/del_entries.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 32bde254a Merge: fd4056e06 8001aafcc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 16 12:05:27 2019 +0000 Merge with default commit 8001aafcc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 16 12:04:15 2019 +0000 Renamed constant for consistency with change in file name web/internalconfig.inc.php | 2 +- web/js/report.js.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 8251ddcae Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 16 11:57:06 2019 +0000 Renamed file to eliminate duplicate case in switch statement problem web/ajax/{del_entry.php => del_entries.php} | 2 +- web/internalconfig.inc.php | 2 +- web/js/report.js.php | 2 +- web/mrbs_auth.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) commit fd4056e06 Merge: ab223d316 6f77eacb1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 13 14:19:55 2019 +0000 Merge with default commit 6f77eacb1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 13 14:19:27 2019 +0000 Switched to using $_SERVER['SCRIPT_NAME'] instead of $_SERVER['PHP_SELF'] web/functions.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit ab223d316 Merge: 88042495a e8d65dfb8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 13 11:51:21 2019 +0000 Merge with default commit e8d65dfb8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 13 11:50:54 2019 +0000 Added some HTML escaping web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 88042495a Merge: 3210e189b dbb7de806 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 13 11:44:02 2019 +0000 Merge with default commit dbb7de806 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 13 11:43:31 2019 +0000 Added some HTML escaping web/js.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit 3210e189b Merge: 34aca0ab6 8ad99ac89 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 10 20:34:14 2019 +0000 Merge with default commit 8ad99ac89 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 10 20:33:52 2019 +0000 Fixed problem in Firefox with the edit entry not validating when a required text field is filled by browser autocomplete. web/js/edit_entry.js.php | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) commit 34aca0ab6 Merge: b0fc32c10 39b78a8b0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 10 17:14:53 2019 +0000 Merge with default commit 39b78a8b0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 10 17:13:40 2019 +0000 Fixed problem with the border below the header row in the day/week/month views not appearing in Edge. web/css/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit b0fc32c10 Merge: 2837c03ca 2aa3709bb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 9 10:39:20 2019 +0000 Merge with default commit 2aa3709bb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 9 10:31:16 2019 +0000 Eliminated flickering when navigating between pages in the calendar view in some browsrs, eg Firefox. web/Themes/default/header.inc | 10 ++-------- web/js.inc | 5 ++++- web/js/index.js.php | 3 --- web/js/init.js.php | 6 ++++-- 4 files changed, 10 insertions(+), 14 deletions(-) commit 2837c03ca Merge: c658b0dd1 a7761d79b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 8 17:38:10 2019 +0000 Merge with default commit a7761d79b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 8 17:22:15 2019 +0000 Added missing semicolon. web/js/refresh.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 06cc509bd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 8 17:20:22 2019 +0000 Removed unnecessary semicolon. web/js/refresh.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 95be8e446 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 8 16:59:30 2019 +0000 Got rid of smudgy border below the header row in the month view web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 75994f74a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 8 16:34:47 2019 +0000 Removed some new lines to make the HTML easier to read web/functions_table.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit c658b0dd1 Merge: d59fdcc72 5f7bcaf9f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 8 16:25:09 2019 +0000 Merge with default commit 5f7bcaf9f Merge: 1b98e2022 c4256182e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 8 16:24:39 2019 +0000 Merge with timeline commit c4256182e (origin/timeline) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 8 16:24:11 2019 +0000 Close timeline branch commit b4ee9eafb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 8 16:21:53 2019 +0000 Fixed the timeline on window resize web/js/refresh.js.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) commit c6bb081a6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 8 16:04:26 2019 +0000 Tweaked height of timeline in the week view with times along the top web/js/refresh.js.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit 123fcfcc2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 8 15:43:23 2019 +0000 Fixed the position of the timeline for $times_along_top web/js/refresh.js.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit 463751773 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 8 15:27:49 2019 +0000 Tidied up code web/js/refresh.js.php | 52 +++++++++++------------------------------ 1 file changed, 13 insertions(+), 39 deletions(-) commit 02afb4d75 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 8 15:14:03 2019 +0000 Removed debugging web/functions_table.inc | 2 +- web/js/refresh.js.php | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) commit 1ab80fca7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 8 15:07:49 2019 +0000 Restructured code web/functions_table.inc | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) commit eb86cf22d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 8 15:06:23 2019 +0000 Made the treatment of hidden days the same, regardless of the setting of $times_along_top. web/functions_table.inc | 73 ++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 44 deletions(-) commit 32272ffdb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 8 14:33:05 2019 +0000 Made the timeline work when there are hiden days with $times_along_top. web/functions_table.inc | 33 ++++++++++++++++++++++----------- web/js/refresh.js.php | 5 +++-- 2 files changed, 25 insertions(+), 13 deletions(-) commit 17490e76c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 8 13:34:04 2019 +0000 Introduced DAYS_PER_WEEK constant web/edit_entry.php | 10 ++++----- web/edit_entry_handler.php | 2 +- web/functions.inc | 32 ++++++++++++++--------------- web/functions_ical.inc | 2 +- web/functions_table.inc | 40 +++++++++++++++++------------------- web/index.php | 6 +++--- web/internalconfig.inc.php | 8 +++++--- web/mrbs_sql.inc | 8 ++++---- 8 files changed, 54 insertions(+), 54 deletions(-) commit f9c3e64d8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 8 12:55:46 2019 +0000 Fixed bug affecting display of areas using periods web/functions_table.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 18f35ee53 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 8 12:42:25 2019 +0000 Committing work so far web/functions_table.inc | 87 +++++++---- web/js/functions.js.php | 1 + web/js/refresh.js.php | 296 +++++++++++++++++++++++++++----------- 3 files changed, 279 insertions(+), 105 deletions(-) commit bb107c21b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 8 12:06:39 2019 +0000 Opened a branch for the development of a timeline showing the curent time commit d59fdcc72 Merge: 99bf3f40e 1b98e2022 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 6 11:23:02 2019 +0000 Merge with default commit 1b98e2022 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 6 11:22:42 2019 +0000 Fixed bug introduced in recent commits that meant that switching views or dates didn't work. web/index.php | 3 ++- web/js/refresh.js.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) commit 99bf3f40e Merge: d5b3ef8e6 82d73e59b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 6 10:22:20 2019 +0000 Merge with default commit 82d73e59b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 6 10:21:52 2019 +0000 Tightened up the regex patterns for matching specifiers in HTTP_ACCEPT_LANGUAGE web/language.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit d5b3ef8e6 Merge: 664f481e9 7aa10a113 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 5 21:08:47 2019 +0000 Merge with default commit 7aa10a113 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 5 21:05:35 2019 +0000 Fixed mismatch in parameters between function declaration and call web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 664f481e9 Merge: ee1cf52f9 742324818 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 5 19:07:31 2019 +0000 Merge with default commit 742324818 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 5 19:07:03 2019 +0000 Removed redundant character escape web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ee1cf52f9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 5 17:19:57 2019 +0000 Fixed merge web/lib/MRBS/Session/SessionPhp.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) commit 018d6e425 Merge: caf3a40d5 96f4ead49 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 5 17:17:18 2019 +0000 Merge with default commit 96f4ead49 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 5 17:16:53 2019 +0000 Switched to using the is_ajax() function web/index.php | 7 ++++--- web/js/general.js.php | 2 +- web/js/refresh.js.php | 3 +-- web/js/report.js.php | 1 - web/js/search.js.php | 5 ++--- web/report.php | 38 +++++++++++++++++------------------ web/search.php | 27 +++++++++++++------------ web/session/session_php.inc | 8 +------- 8 files changed, 42 insertions(+), 49 deletions(-) commit 2a29a5950 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 5 16:05:56 2019 +0000 Switched to using the is_ajax() function web/edit_users.php | 18 +++++++++--------- web/js/edit_users.js.php | 5 ----- 2 files changed, 9 insertions(+), 14 deletions(-) commit 010f9a6bc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 5 15:57:03 2019 +0000 Switched to using the is_ajax() function web/edit_entry_handler.php | 19 ++++++++++--------- web/js/edit_entry.js.php | 2 +- web/js/resizable.js.php | 1 - 3 files changed, 11 insertions(+), 11 deletions(-) commit caf3a40d5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 5 15:41:38 2019 +0000 Fixed merge web/lib/MRBS/Session/SessionPhp.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit 55b91af8b Merge: 938124146 0c234d31f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 5 15:38:52 2019 +0000 Merge with default commit 0c234d31f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 5 15:32:34 2019 +0000 Fixed bug resulting in users not being logged out after a period of inactivity. See SF Support Requests #1900. web/functions.inc | 9 +++++++++ web/session/session_php.inc | 7 ++++++- 2 files changed, 15 insertions(+), 1 deletion(-) commit c4c2930c1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 5 14:54:22 2019 +0000 Fixed the clipping of the year in the inline datepickers. web/css/mrbs.css.php | 4 ++++ 1 file changed, 4 insertions(+) commit 938124146 Merge: 5b487e61c 8befed7c4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 4 20:12:47 2019 +0000 Merge with default commit 8befed7c4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 4 20:11:29 2019 +0000 Reverse merged (hadn't realised I'd been working in the wrong branch) web/language.inc | 53 +++++++++++++++++++++++------------- web/lib/Locale.php | 24 +++++------------ web/lib/MRBS/System.php | 56 ++++++++++++++++++++++----------------- 3 files changed, 73 insertions(+), 60 deletions(-) commit 5b487e61c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 4 19:29:40 2019 +0000 Simplified code web/language.inc | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) commit 94fde98e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 4 19:00:53 2019 +0000 Restructured code web/help.php | 2 +- web/language.inc | 18 +++++++++--------- web/lib/Locale.php | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) commit 4929e916d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 4 18:47:29 2019 +0000 Added comments web/language.inc | 4 ++++ 1 file changed, 4 insertions(+) commit 5f7a28aa7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 4 18:41:44 2019 +0000 Added support for the wildcard language identifier ('*') in $_SERVER['HTTP_ACCEPT_LANGUAGE'], eg 'en, *;q=0.7'. web/help.php | 2 +- web/language.inc | 60 +++++++++++++++++++++++++++----------------- web/lib/Locale.php | 19 ++------------ 3 files changed, 40 insertions(+), 41 deletions(-) commit 88accb4b7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 4 15:35:19 2019 +0000 Fixed bug causing an infinite recursion if the HTTP_ACCEPT_LANGUAGE is something like 'en, *;q=0.7'. web/lib/MRBS/System.php | 60 +++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 28 deletions(-) commit 4926ca549 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 4 15:23:47 2019 +0000 Improved error handling web/lib/Locale.php | 3 +++ 1 file changed, 3 insertions(+) commit a1f47c0ec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 4 14:51:12 2019 +0000 Made sure we don't duplicate locales to try web/lib/MRBS/System.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit d8941122e Merge: 8797a4d56 41f33dd25 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 3 20:51:48 2019 +0000 Merge with default commit 41f33dd25 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 3 20:51:15 2019 +0000 Eliminated unused function parameter web/functions_table.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 8797a4d56 Merge: 709d992d1 720622acf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 3 16:46:43 2019 +0000 Merge with default commit 720622acf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 3 16:41:09 2019 +0000 Put the capacity in a span to give greater flexibility in styling. web/css/mrbs.css.php | 11 +++++++++++ web/functions_table.inc | 11 +++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) commit 710f2911d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 3 16:16:52 2019 +0000 Added escaping web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 709d992d1 Merge: 1ecc3a588 9fbddbc40 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 3 16:05:21 2019 +0000 Merge with default commit 9fbddbc40 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 3 16:00:34 2019 +0000 Updated comment web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cb80e3898 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 3 15:58:05 2019 +0000 Restructured code web/functions_table.inc | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) commit 2c26b1bf2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 3 15:48:16 2019 +0000 Restructured code web/functions_table.inc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) commit 321a07731 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 3 15:21:33 2019 +0000 Removed an unnecessary <div> web/functions_table.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 9e063fe16 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 3 14:57:45 2019 +0000 Restructured code web/functions_table.inc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) commit 8c211c299 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 3 14:41:09 2019 +0000 Restructured code web/functions_table.inc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) commit 1ecc3a588 Merge: 1ad6ccb94 705e6a49c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 2 16:51:45 2019 +0000 Merge with default commit 705e6a49c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 2 16:51:16 2019 +0000 Fixed a "cannot get property of undefined" error notice web/js/refresh.js.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 1ad6ccb94 Merge: 6e7f28bbc add78604b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 27 18:14:53 2019 +0000 Merge with default commit add78604b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 27 18:14:26 2019 +0000 Got rid of some instances of deprecated jQuery event shorthand web/js/datepicker.js.php | 2 +- web/js/edit_area.js.php | 12 ++++++------ web/js/edit_entry.js.php | 16 ++++++++-------- web/js/general.js.php | 4 ++-- web/js/report.js.php | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) commit 6e7f28bbc Merge: 8a189a27e 25feb9c73 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 27 17:57:46 2019 +0000 Merge with default commit 25feb9c73 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 27 17:56:54 2019 +0000 Upgraded to Select2 version 4.0.11 web/jquery/select2/dist/css/select2.css | 9 +- web/jquery/select2/dist/css/select2.min.css | 2 +- web/jquery/select2/dist/js/i18n/af.js | 4 +- web/jquery/select2/dist/js/i18n/ar.js | 4 +- web/jquery/select2/dist/js/i18n/az.js | 4 +- web/jquery/select2/dist/js/i18n/bg.js | 4 +- web/jquery/select2/dist/js/i18n/bn.js (new) | 3 + web/jquery/select2/dist/js/i18n/bs.js | 4 +- web/jquery/select2/dist/js/i18n/ca.js | 4 +- web/jquery/select2/dist/js/i18n/cs.js | 4 +- web/jquery/select2/dist/js/i18n/da.js | 4 +- web/jquery/select2/dist/js/i18n/de.js | 4 +- web/jquery/select2/dist/js/i18n/dsb.js | 4 +- web/jquery/select2/dist/js/i18n/el.js | 4 +- web/jquery/select2/dist/js/i18n/en.js | 4 +- web/jquery/select2/dist/js/i18n/es.js | 4 +- web/jquery/select2/dist/js/i18n/et.js | 4 +- web/jquery/select2/dist/js/i18n/eu.js | 4 +- web/jquery/select2/dist/js/i18n/fa.js | 4 +- web/jquery/select2/dist/js/i18n/fi.js | 4 +- web/jquery/select2/dist/js/i18n/fr.js | 4 +- web/jquery/select2/dist/js/i18n/gl.js | 4 +- web/jquery/select2/dist/js/i18n/he.js | 4 +- web/jquery/select2/dist/js/i18n/hi.js | 4 +- web/jquery/select2/dist/js/i18n/hr.js | 4 +- web/jquery/select2/dist/js/i18n/hsb.js | 4 +- web/jquery/select2/dist/js/i18n/hu.js | 4 +- web/jquery/select2/dist/js/i18n/hy.js | 4 +- web/jquery/select2/dist/js/i18n/id.js | 4 +- web/jquery/select2/dist/js/i18n/is.js | 4 +- web/jquery/select2/dist/js/i18n/it.js | 4 +- web/jquery/select2/dist/js/i18n/ja.js | 4 +- web/jquery/select2/dist/js/i18n/ka.js (new) | 3 + web/jquery/select2/dist/js/i18n/km.js | 4 +- web/jquery/select2/dist/js/i18n/ko.js | 4 +- web/jquery/select2/dist/js/i18n/lt.js | 4 +- web/jquery/select2/dist/js/i18n/lv.js | 4 +- web/jquery/select2/dist/js/i18n/mk.js | 4 +- web/jquery/select2/dist/js/i18n/ms.js | 4 +- web/jquery/select2/dist/js/i18n/nb.js | 4 +- web/jquery/select2/dist/js/i18n/ne.js (new) | 3 + web/jquery/select2/dist/js/i18n/nl.js | 4 +- web/jquery/select2/dist/js/i18n/pl.js | 4 +- web/jquery/select2/dist/js/i18n/ps.js | 4 +- web/jquery/select2/dist/js/i18n/pt-BR.js | 4 +- web/jquery/select2/dist/js/i18n/pt.js | 4 +- web/jquery/select2/dist/js/i18n/ro.js | 4 +- web/jquery/select2/dist/js/i18n/ru.js | 4 +- web/jquery/select2/dist/js/i18n/sk.js | 4 +- web/jquery/select2/dist/js/i18n/sl.js | 4 +- web/jquery/select2/dist/js/i18n/sq.js (new) | 3 + web/jquery/select2/dist/js/i18n/sr-Cyrl.js | 4 +- web/jquery/select2/dist/js/i18n/sr.js | 4 +- web/jquery/select2/dist/js/i18n/sv.js | 4 +- web/jquery/select2/dist/js/i18n/th.js | 4 +- web/jquery/select2/dist/js/i18n/tk.js | 4 +- web/jquery/select2/dist/js/i18n/tr.js | 4 +- web/jquery/select2/dist/js/i18n/uk.js | 4 +- web/jquery/select2/dist/js/i18n/vi.js | 4 +- web/jquery/select2/dist/js/i18n/zh-CN.js | 4 +- web/jquery/select2/dist/js/i18n/zh-TW.js | 4 +- web/jquery/select2/dist/js/select2.full.js | 513 ++++++++++++----- .../select2/dist/js/select2.full.min.js | 3 +- web/jquery/select2/dist/js/select2.js | 513 ++++++++++++----- web/jquery/select2/dist/js/select2.min.js | 3 +- 65 files changed, 840 insertions(+), 435 deletions(-) commit 8a189a27e Merge: b510440ae c7f88a854 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 27 08:21:41 2019 +0000 Merge with default commit c7f88a854 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 27 08:21:20 2019 +0000 Added locale suport for Serbian-Cyrillic web/lib/MRBS/System.php | 2 ++ 1 file changed, 2 insertions(+) commit b510440ae Merge: 47d1b2251 fb53836a0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 26 18:58:55 2019 +0100 Merge with default commit fb53836a0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 26 18:38:29 2019 +0100 Tidied up formatting web/language.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit bbd3bc014 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 26 18:34:30 2019 +0100 Fixed flatpickr input widths after upgrade to latest version of flatpickr web/css/mrbs.css.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 3914f44d1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 26 18:24:00 2019 +0100 Added flatpickr support for Serbian Cyrillic web/js/flatpickr/l10n/sr-cyr.js (new) | 67 +++++++++++++++++++++++++ web/language.inc | 2 + 2 files changed, 69 insertions(+) commit 46d706e4f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 26 18:02:22 2019 +0100 Added comments web/js/datepicker.js.php | 2 +- web/language.inc | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) commit 4b476fe09 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 26 17:27:04 2019 +0100 Added Traditional Chinese flatpickr localisation. web/js/datepicker.js.php | 2 +- web/js/flatpickr/l10n/zh-tw.js (new) | 68 ++++++++++++++++++++++++++ web/language.inc | 15 +++++- 3 files changed, 83 insertions(+), 2 deletions(-) commit 81b294513 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 26 09:54:44 2019 +0100 Updated flatpickr localisations web/js/flatpickr/l10n/ar.js | 65 +++++++++++----- web/js/flatpickr/l10n/at.js | 75 +++++++++++++----- web/js/flatpickr/l10n/az.js (new) | 74 ++++++++++++++++++ web/js/flatpickr/l10n/be.js | 82 ++++++++++++++------ web/js/flatpickr/l10n/bg.js | 79 ++++++++++++++----- web/js/flatpickr/l10n/bn.js | 75 +++++++++++++----- web/js/flatpickr/l10n/bs.js (new) | 66 ++++++++++++++++ web/js/flatpickr/l10n/cat.js | 114 ++++++++++++++++++---------- web/js/flatpickr/l10n/cs.js | 82 ++++++++++++++------ web/js/flatpickr/l10n/cy.js | 113 +++++++++++++++++++-------- web/js/flatpickr/l10n/da.js | 82 ++++++++++++++------ web/js/flatpickr/l10n/de.js | 78 ++++++++++++++----- web/js/flatpickr/l10n/en.js | 99 ++++++++++++++++-------- web/js/flatpickr/l10n/eo.js | 82 ++++++++++++++------ web/js/flatpickr/l10n/es.js | 82 ++++++++++++++------ web/js/flatpickr/l10n/et.js | 82 ++++++++++++++------ web/js/flatpickr/l10n/fa.js | 79 +++++++++++++------ web/js/flatpickr/l10n/fi.js | 82 ++++++++++++++------ web/js/flatpickr/l10n/fo.js (new) | 74 ++++++++++++++++++ web/js/flatpickr/l10n/fr.js | 85 +++++++++++++++------ web/js/flatpickr/l10n/gr.js | 79 +++++++++++++------ web/js/flatpickr/l10n/he.js | 71 ++++++++++++----- web/js/flatpickr/l10n/hi.js | 75 +++++++++++++----- web/js/flatpickr/l10n/hr.js | 78 ++++++++++++++----- web/js/flatpickr/l10n/hu.js | 83 ++++++++++++++------ web/js/flatpickr/l10n/id.js | 75 ++++++++++++------ web/js/flatpickr/l10n/is.js (new) | 72 ++++++++++++++++++ web/js/flatpickr/l10n/it.js | 82 ++++++++++++++------ web/js/flatpickr/l10n/ja.js | 80 ++++++++++++++----- web/js/flatpickr/l10n/ka.js (new) | 75 ++++++++++++++++++ web/js/flatpickr/l10n/km.js | 82 ++++++++++++++------ web/js/flatpickr/l10n/ko.js | 82 ++++++++++++++------ web/js/flatpickr/l10n/kz.js | 79 +++++++++++++------ web/js/flatpickr/l10n/lt.js | 82 ++++++++++++++------ web/js/flatpickr/l10n/lv.js | 78 ++++++++++++++----- web/js/flatpickr/l10n/mk.js | 78 ++++++++++++++----- web/js/flatpickr/l10n/mn.js | 70 ++++++++++++----- web/js/flatpickr/l10n/ms.js | 77 ++++++++++++++----- web/js/flatpickr/l10n/my.js | 82 ++++++++++++++------ web/js/flatpickr/l10n/nl.js | 83 ++++++++++++++------ web/js/flatpickr/l10n/no.js | 80 +++++++++++++------ web/js/flatpickr/l10n/pa.js | 78 ++++++++++++++----- web/js/flatpickr/l10n/pl.js | 84 ++++++++++++++------ web/js/flatpickr/l10n/pt.js | 78 ++++++++++++++----- web/js/flatpickr/l10n/ro.js | 80 +++++++++++++------ web/js/flatpickr/l10n/ru.js | 82 ++++++++++++++------ web/js/flatpickr/l10n/si.js | 78 ++++++++++++++----- web/js/flatpickr/l10n/sk.js | 80 +++++++++++++------ web/js/flatpickr/l10n/sl.js | 80 +++++++++++++------ web/js/flatpickr/l10n/sq.js | 78 ++++++++++++++----- web/js/flatpickr/l10n/sr.js | 78 ++++++++++++++----- web/js/flatpickr/l10n/sv.js | 80 +++++++++++++------ web/js/flatpickr/l10n/th.js | 80 +++++++++++++------ web/js/flatpickr/l10n/tr.js | 82 ++++++++++++++------ web/js/flatpickr/l10n/uk.js | 78 ++++++++++++++----- web/js/flatpickr/l10n/vn.js | 78 ++++++++++++++----- web/js/flatpickr/l10n/zh.js | 75 +++++++++++++----- 57 files changed, 3383 insertions(+), 1179 deletions(-) commit 3fc5fdcdc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 25 18:21:32 2019 +0100 Updated to flatpickr 4.6.3 web/js/flatpickr/css/flatpickr.min.css | 4 ++-- web/js/flatpickr/flatpickr.min.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit 70c0a8cb2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 25 18:02:47 2019 +0100 Got rid of some instances of deprecated jQuery event shorthand web/js/edit_area.js.php | 6 +++--- web/js/edit_entry.js.php | 8 ++++---- web/js/general.js.php | 4 ++-- web/js/index.js.php | 2 +- web/js/report.js.php | 2 +- web/js/resizable.js.php | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) commit 4602a9008 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 25 17:53:55 2019 +0100 Got rid of some instances of deprecated jQuery event shorthand web/js/datatables.js.php | 2 +- web/js/general.js.php | 2 +- web/js/index.js.php | 4 ++-- web/js/resizable.js.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) commit 0de9b1890 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 25 17:43:34 2019 +0100 Got rid of some instances of deprecated jQuery event shorthand web/js/resizable.js.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 47d1b2251 Merge: ef683e858 95cc78f3e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 24 20:53:10 2019 +0100 Merge with default commit 95cc78f3e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 24 20:51:56 2019 +0100 Upgraded to jQuery 3.4.1 web/jquery/jquery-3.3.1.min.js (gone) | 2 - .../{jquery-3.3.1.js => jquery-3.4.1.js} | 596 ++++++++++++----- web/jquery/jquery-3.4.1.min.js (new) | 2 + .../jquery-migrate-3.0.0.min.js (gone) | 2 - ...rate-3.0.0.js => jquery-migrate-3.1.0.js} | 222 ++++-- web/jquery/jquery-migrate-3.1.0.min.js (new) | 2 + web/js.inc | 8 +- 7 files changed, 603 insertions(+), 231 deletions(-) commit ef683e858 Merge: d3e41bc19 ca1cc6e4d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 24 11:33:17 2019 +0100 Merge with default commit ca1cc6e4d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 24 11:32:42 2019 +0100 Improved accessibility web/index.php | 14 ++++++++------ web/lang/lang.en | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) commit 14b17452d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 24 11:09:53 2019 +0100 Improved accessibility web/Themes/default/header.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit d3e41bc19 Merge: cdb60954e acc0509b3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 23 10:59:24 2019 +0100 Merge with default commit acc0509b3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 23 10:58:39 2019 +0100 Improved accessibility web/index.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit cdb60954e Merge: bade5e22e 8b4a0172f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 23 10:25:26 2019 +0100 Merge with default commit 8b4a0172f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 23 10:25:00 2019 +0100 Improved accessibility. See SF Support Requests #1884. web/functions_table.inc | 6 ++++-- web/lang/lang.en | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) commit bade5e22e Merge: c383c5466 b0ec86ebc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 22 18:53:49 2019 +0100 Merge with default commit b0ec86ebc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 22 18:53:31 2019 +0100 Added a lang attribute to HTML email notifications web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c383c5466 Merge: 82b3e94aa b697a1d99 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 22 14:47:28 2019 +0100 Merge with default commit b697a1d99 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 22 14:47:09 2019 +0100 Fixed the JavaScript so that hiding the All day checkbox with a custom CSS rule wil work. web/js/edit_entry.js.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 82b3e94aa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 21 17:26:46 2019 +0100 Improved debugging info web/lib/MRBS/Auth/AuthLdap.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) commit 8ee053248 Merge: 5e7fefba5 83ea7b286 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 21 17:22:09 2019 +0100 Merge with default commit 83ea7b286 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 21 17:21:37 2019 +0100 Improved debugging info web/auth/auth_ldap.inc | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) commit 5e7fefba5 Merge: d5fdcecd4 e73aaf5ba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 21 15:55:12 2019 +0100 Merge with default commit e73aaf5ba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 21 15:54:47 2019 +0100 Centred the timeline on the current time. web/css/mrbs.css.php | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) commit d5fdcecd4 Merge: dcb720d20 b3eaf08a1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 20 17:00:38 2019 +0100 Merge with default commit b3eaf08a1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 20 16:58:57 2019 +0100 Fixed potential bug web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit dcb720d20 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 20 15:54:56 2019 +0100 Fixed merge web/Themes/default/header.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 266c19018 Merge: 7d814e7f7 64818b929 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 20 15:52:54 2019 +0100 Merge with default commit 64818b929 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 20 15:52:31 2019 +0100 Added a logged_in class to aid styling. See SF Support Requests #1884. web/Themes/default/header.inc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) commit 7d814e7f7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 20 10:31:01 2019 +0100 Fixed undefined function problem web/lib/MRBS/Auth/AuthLdap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 392f35b60 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 20 10:28:42 2019 +0100 Added some error checking and more diagnostics web/lib/MRBS/Auth/AuthLdap.php | 34 +++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 12 deletions(-) commit 31b0c4092 Merge: 1f914c217 ea6ee182f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 19 13:59:50 2019 +0100 Merge with default commit ea6ee182f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 19 13:59:23 2019 +0100 Added some error checking and more diagnostics web/auth/auth_ldap.inc | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) commit 0183792d2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 19 13:43:22 2019 +0100 Added left border for right hand set of row labels web/css/mrbs.css.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit 0f85414ee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 19 13:38:55 2019 +0100 Added border under header row web/css/mrbs.css.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit 1f914c217 Merge: c50bdfd13 8cfbc9a99 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 19 12:14:43 2019 +0100 Merge with default commit 8cfbc9a99 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 19 12:14:20 2019 +0100 Fixed minor CSS problem web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c50bdfd13 Merge: f22b36611 bc9450247 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 19 10:50:11 2019 +0100 Merge with default commit bc9450247 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 19 10:49:53 2019 +0100 Fixed minor CSS problem web/css/mrbs.css.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) commit c461fb369 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 19 10:25:52 2019 +0100 Fixed invalid CSS web/css/mrbs.css.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) commit f22b36611 Merge: 95199fafa 3a3fcc9a2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 19 09:31:34 2019 +0100 Merge with default commit 3a3fcc9a2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 19 09:30:59 2019 +0100 Fixed the timeline for the transition into DST. web/js/refresh.js.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit dfcd27cc2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 19 09:15:21 2019 +0100 Fixed a few problems and tidied up web/js/refresh.js.php | 105 ++++++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 47 deletions(-) commit 4bf0ebdae Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 18 19:02:45 2019 +0100 Restructured web/js/refresh.js.php | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) commit 36ced589c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 18 18:56:29 2019 +0100 Optimised timeline algorithm. web/functions_table.inc | 3 +- web/js/refresh.js.php | 97 ++++++++++++++++++++++++++++++--------- 2 files changed, 77 insertions(+), 23 deletions(-) commit 95199fafa Merge: 2a122be99 660e53949 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 17 11:39:30 2019 +0100 Merge with default commit 660e53949 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 17 11:39:07 2019 +0100 Fixed another bug causing the timeline to be in the wrong place when the table is scrollable. web/js/refresh.js.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 2a122be99 Merge: 024d8f0a9 8698af3cd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 17 11:16:37 2019 +0100 Merge with default commit 8698af3cd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 17 11:16:04 2019 +0100 Fixed bug causing the timeline to be in the wrong place when the table is scrollable. web/js/refresh.js.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 024d8f0a9 Merge: 888fb32bf e1038fc79 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 17 10:58:24 2019 +0100 Merge with default commit e1038fc79 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 17 10:57:35 2019 +0100 Fixed bug causing the timer to fire all the time if there's no timeline on the page. web/js/refresh.js.php | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) commit ea737ac1c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 17 09:57:32 2019 +0100 Cut out unnecessary searches for the current time after a timeline has been found. web/js/refresh.js.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 350832153 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 17 09:43:33 2019 +0100 Fixed bug causing an old timeline not to be cleared when the page becomes visible again and a timeline isn't due to be created. web/js/refresh.js.php | 170 ++++++++++++++++++++-------------------- 1 file changed, 86 insertions(+), 84 deletions(-) commit 888fb32bf Merge: bbfe05000 e5a423125 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 16 18:14:35 2019 +0100 Merge with default commit e5a423125 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 16 18:14:11 2019 +0100 Added comments web/js/refresh.js.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit bbfe05000 Merge: e49b8dd3c 47919e2ad Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 16 17:54:56 2019 +0100 Merge with default commit 47919e2ad Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 16 17:54:33 2019 +0100 Made bookings clickable even if the timeline is above them. web/css/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit e49b8dd3c Merge: b600dcf18 542ab5fb5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 16 17:13:54 2019 +0100 Merge with default commit 542ab5fb5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 16 17:13:35 2019 +0100 Implemented the timeline for times_along_top in the day view. web/css/mrbs.css.php | 5 ++ web/functions_table.inc | 17 ++++-- web/js/refresh.js.php | 109 +++++++++++++++++++++++++------------- 3 files changed, 91 insertions(+), 40 deletions(-) commit 45151962e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 16 17:10:20 2019 +0100 Fixed bug introduced in row_labels commit web/js/resizable.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit b600dcf18 Merge: 7879a8692 a480c7d5e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 16 15:23:59 2019 +0100 Merge with default commit a480c7d5e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 16 15:15:04 2019 +0100 Switched to using <th> instead of <td class="row_labels"> for the row headers in the day and week views. web/css/mrbs-print.css.php | 10 +++---- web/css/mrbs.css.php | 52 ++++++++++++++++++------------------ web/functions_table.inc | 32 ++++++++++------------ web/js/refresh.js.php | 4 +-- web/js/resizable.js.php | 2 +- 5 files changed, 48 insertions(+), 52 deletions(-) commit 7879a8692 Merge: 41cc39c3a 076220acd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 15 17:05:20 2019 +0100 Merge with default commit 076220acd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 15 17:04:59 2019 +0100 Added missing closing </td> tag (didn't seem to spotted by the HTML5 validator). web/functions_table.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 41cc39c3a Merge: 537ca5f53 895cbdbd7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 15 16:35:47 2019 +0100 Merge with default commit 895cbdbd7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 15 16:35:15 2019 +0100 Ensured that only one timer can be running web/js/refresh.js.php | 97 ++++++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 45 deletions(-) commit 156077020 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 15 14:47:37 2019 +0100 Added a timer for the timeline web/js/refresh.js.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) commit 87d0591a5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 15 14:11:56 2019 +0100 Moved timline code into a function web/js/refresh.js.php | 74 ++++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 35 deletions(-) commit 537ca5f53 Merge: bea8b843f 5f646dcc1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 14 07:56:18 2019 +0100 Merge with default commit 5f646dcc1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 14 07:56:01 2019 +0100 Don't add the timestamp data attributes if we are using periods web/functions_table.inc | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) commit bea8b843f Merge: 52bc764b5 02ac8f835 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 13 20:57:36 2019 +0100 Merge with default commit 02ac8f835 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 13 20:57:13 2019 +0100 Don't show the timeline if we are using periods web/js/refresh.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 52bc764b5 Merge: e3e2987be 747148838 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 13 20:32:42 2019 +0100 Merge with default commit 747148838 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 13 20:32:19 2019 +0100 Added a timeline. At the moment it only works in the day view and when times are down the side. It also doesn't move with time yet. web/Themes/classic126/styling.inc | 1 + web/Themes/default/styling.inc | 1 + web/css/mrbs.css.php | 9 ++++++ web/functions_table.inc | 5 +++- web/js/refresh.js.php | 45 ++++++++++++++++++++++++++++- web/systemdefaults.inc.php | 3 ++ 6 files changed, 62 insertions(+), 2 deletions(-) commit e3e2987be Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 13 11:06:38 2019 +0100 Fixed bug when there's no modified_by user web/lib/MRBS/Auth/AuthJoomla.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit 95b75bb32 Merge: 5cfc4bdb2 d3c4e2c70 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 13 10:49:52 2019 +0100 Merge with default commit d3c4e2c70 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 13 10:46:43 2019 +0100 Fixed bug preventing logged in Joomla user being recognised. See SF Support Requests #1870. web/init.inc | 5 ----- 1 file changed, 5 deletions(-) commit 5cfc4bdb2 Merge: 755b7eef6 b6a576570 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 12 10:06:08 2019 +0100 Merge with default commit b6a576570 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 12 10:05:36 2019 +0100 Simplified code web/functions_ical.inc | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) commit 361ac1072 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 12 09:52:10 2019 +0100 Fixed bug in export as iCalendars when the last series is only one event long web/functions_ical.inc | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) commit 659a514ee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 12 09:23:16 2019 +0100 Fixed bug introduced in recent change web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 755b7eef6 Merge: 5e03ef20c 0b3362111 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 11 17:56:49 2019 +0100 Merge with default commit 0b3362111 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 11 17:43:16 2019 +0100 Fixed bug when resizing a booking in the week view to makeit into a series web/functions_mail.inc | 13 +++++++++++-- web/js/resizable.js.php | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) commit 222afe5ee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 11 17:03:33 2019 +0100 Fixed bug in recent commit web/functions_table.inc | 5 +++++ 1 file changed, 5 insertions(+) commit 5e03ef20c Merge: 4b5fbdccb 08458a1e2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 11 16:49:47 2019 +0100 Merge with default commit 08458a1e2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 11 16:31:24 2019 +0100 Fixed some problems with resizing when week mumbers are displayed in the minicalendars or the browser zoom level > 100% web/css/mrbs.css.php | 2 +- web/js/resizable.js.php | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) commit 4b5fbdccb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 11 10:36:16 2019 +0100 Fixed merge web/lib/MRBS/Auth/AuthDb.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5761a0fc5 Merge: febead864 8ce538934 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 11 10:34:48 2019 +0100 Merge with default commit 8ce538934 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 11 10:34:23 2019 +0100 Replaced DBStatement->row_keyed($i) with DBStatement->next_row_keyed(). See SF Bugs #445. web/admin.php | 5 +-- web/auth/auth_db.inc | 2 +- web/del.php | 2 +- web/edit_entry.php | 8 ++--- web/edit_users.php | 2 +- web/functions.inc | 4 +-- web/functions_ical.inc | 6 ++-- web/lib/MRBS/DBStatement.php | 20 ++++------- web/lib/MRBS/DB_mysql.php | 15 ++++---- web/lib/MRBS/DB_pgsql.php | 16 +++++---- web/mrbs_sql.inc | 64 +++++++++++----------------------- web/pending.php | 2 +- web/report.php | 4 +-- web/search.php | 2 +- web/upgrade/17/post.inc | 2 +- web/upgrade/32/post.inc | 2 +- web/upgrade/34/post.inc | 2 +- 17 files changed, 67 insertions(+), 91 deletions(-) commit febead864 Merge: 9e29ed1b3 ef5500999 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 11 09:15:15 2019 +0100 Merge with default commit ef5500999 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 11 09:14:53 2019 +0100 Replaced DBStatement->row($i) with DBStatement->next_row(). See SF Bugs #445. web/auth/auth_db_ext.inc | 10 +++------- web/lib/MRBS/DB.php | 4 +++- web/lib/MRBS/DBStatement.php | 15 ++++----------- web/lib/MRBS/DB_mysql.php | 6 ++---- web/mrbs_sql.inc | 6 ++---- 5 files changed, 14 insertions(+), 27 deletions(-) commit 9e29ed1b3 Merge: b057f2cc0 826653f12 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 10 19:42:15 2019 +0100 Merge with default commit 826653f12 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 10 19:41:37 2019 +0100 Fixed bug when using PHP < 5.5.0 web/edit_entry.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit b057f2cc0 Merge: cf6665a78 f85b2a100 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 10 14:40:23 2019 +0100 Merge with default commit f85b2a100 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 10 14:40:04 2019 +0100 Fixed typo in comment web/auth/cms/wordpress.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cf6665a78 Merge: 0d7c2c27e dc2f8d657 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 10 14:36:17 2019 +0100 Merge with default commit dc2f8d657 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 10 14:35:23 2019 +0100 Fixed problem with $theme being overwritten by WordPress. See SF Bugs #444. Thanks to Johan Hattne. web/auth/cms/wordpress.inc | 4 ++++ 1 file changed, 4 insertions(+) commit 0d7c2c27e Merge: 05605535d 731519dbc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 10 09:26:54 2019 +0100 Merge with default commit 731519dbc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 10 09:26:27 2019 +0100 Fixed a number of bugs in the export of entries as iCalendars. See SF Support Requests #1865. web/functions_ical.inc | 118 +++++---------------- web/lib/MRBS/ICalendar/Series.php (new) | 120 ++++++++++++++++++++++ 2 files changed, 146 insertions(+), 92 deletions(-) commit 05605535d Merge: f1f821f77 e51bf2eb3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 8 14:54:22 2019 +0100 Merge with default commit e51bf2eb3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 8 14:53:16 2019 +0100 Fixed a bug causing the last_login field not to be updated when an email address rather than username is used to login. See SF Support Requests #1863. web/auth/auth_db.inc | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) commit f1f821f77 Merge: 00ccbc450 3b9c47c04 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 7 17:48:25 2019 +0100 Merge with default commit 3b9c47c04 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 7 17:46:05 2019 +0100 Fixed problem of multiple bookings in the same slot not being displayed correctly. See SF Bugs #442. Thanks to dwpoon. web/css/mrbs.css.php | 16 +++-- web/functions_table.inc | 121 ++++++++++++++++++++------------------ web/mrbs_sql.inc | 4 +- 3 files changed, 77 insertions(+), 64 deletions(-) commit 00ccbc450 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 5 17:02:14 2019 +0100 Improved debug information web/lib/MRBS/Auth/AuthLdap.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 587fc6cc1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 5 15:59:37 2019 +0100 Fixed merge web/lib/MRBS/Auth/AuthLdap.php | 46 +++++++++++++++----------------- 1 file changed, 21 insertions(+), 25 deletions(-) commit c1e4867e2 Merge: 20a7b9237 61a237e86 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 5 15:48:49 2019 +0100 Merge with default commit 61a237e86 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 5 15:48:20 2019 +0100 Simplified LDAP debugging code web/auth/auth_ldap.inc | 85 +++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 48 deletions(-) commit 5fee921d0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 5 15:08:12 2019 +0100 Moved debug statement to where I think it was meant to be, avoiding a possible 'undefined variable $dn' error. web/auth/auth_ldap.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 20a7b9237 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 4 18:59:48 2019 +0100 Fixed merge web/lib/MRBS/Session/SessionCookie.php | 2 +- web/lib/MRBS/Session/SessionHttp.php | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) commit 89c0b7b39 Merge: fd7d45f9b 4937d3aaa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 4 18:56:56 2019 +0100 Merge with default commit 4937d3aaa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 4 18:52:31 2019 +0100 Removed the unslashes() function as it is redundant now that MRBS requires PHP 5.4.0 or above. web/functions.inc | 16 ---------------- web/grab_globals.inc.php | 14 +------------- web/lib/MRBS/Form/Form.php | 2 +- web/session/session_cookie.inc | 2 +- web/session/session_http.inc | 11 ++--------- 5 files changed, 5 insertions(+), 40 deletions(-) commit 7b52d3216 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 4 18:31:49 2019 +0100 Removed redundant line of code web/edit_room_handler.php | 1 - 1 file changed, 1 deletion(-) commit fd7d45f9b Merge: 9833c92e0 3c5551148 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 3 18:14:38 2019 +0100 Merge with default commit 3c5551148 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 3 18:14:17 2019 +0100 Added server side truncation of form variables on the room and area forms to ensure they fit the database columns web/edit_area_handler.php | 89 ++++++++++++++++++-------------- web/edit_entry_handler.php | 98 ++++++++++++++---------------------- web/edit_room_handler.php | 42 ++++++++++++---- web/functions.inc | 25 +++++++++ 4 files changed, 147 insertions(+), 107 deletions(-) commit 9833c92e0 Merge: 994342233 c6a54ba97 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 3 15:56:29 2019 +0100 Merge with default commit c6a54ba97 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 3 15:55:42 2019 +0100 Removed redundant code and fixed a bug in previous commit web/mrbs_sql.inc | 3 +-- web/pending.php | 10 +--------- 2 files changed, 2 insertions(+), 11 deletions(-) commit 994342233 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 3 15:48:26 2019 +0100 Fixed merge web/mrbs_sql.inc | 2 +- web/pending.php | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) commit 763e3afbd Merge: 7b080bf5f 9f920dbf1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 3 15:41:00 2019 +0100 Merge with default commit 9f920dbf1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 3 15:37:48 2019 +0100 Made pending bookings work when users can be booking admins for only some rooms. web/mrbs_sql.inc | 22 +++++++++++++++------- web/pending.php | 14 ++++++++++++-- 2 files changed, 27 insertions(+), 9 deletions(-) commit 7b080bf5f Merge: a4b48f06d f9f7593ca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 2 19:01:55 2019 +0100 Merge with default commit f9f7593ca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 2 19:01:33 2019 +0100 Added maxlength attributes web/edit_area.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) commit a4b48f06d Merge: 9bc359cbe 05a5b7883 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 2 18:52:57 2019 +0100 Merge with default commit 05a5b7883 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 2 18:52:26 2019 +0100 Added more maxlength attributes to the form web/edit_room.php | 53 ++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 25 deletions(-) commit 1f4c019f2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 2 18:33:25 2019 +0100 Added a maxlength attribute to the description field. See SF Bugs #443. web/edit_room.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit 9bc359cbe Merge: 0579b60c2 49b680df3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 25 16:17:21 2019 +0100 Merge with default commit 49b680df3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 25 16:16:58 2019 +0100 Fixed problem with presenting all users in the created by field if the LDAP server can't be contacted. web/auth/auth_ldap.inc | 7 ++++++- web/edit_entry.php | 5 ++--- 2 files changed, 8 insertions(+), 4 deletions(-) commit 0579b60c2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 25 15:33:28 2019 +0100 Fixed merge web/lib/MRBS/Auth/AuthLdap.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit 6a12d6bb1 Merge: cc9fb530f 571125734 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 25 15:30:52 2019 +0100 Merge with default commit 571125734 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 25 15:29:59 2019 +0100 Fixed undefined variable problem web/auth/auth_ldap.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1ad293969 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 25 15:21:38 2019 +0100 Fixed bug when searching for multiple entries and an LDAP server is not available. web/auth/auth_ldap.inc | 6 ++++++ 1 file changed, 6 insertions(+) commit cc9fb530f Merge: eb33a061e d6ec0693e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 25 09:13:34 2019 +0100 Merge with default commit d6ec0693e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 25 09:12:54 2019 +0100 Rewrote last commit so that (a) $_POST isn't overwritten and (b) the original versions (ie before modification by WordPress) of $_POST and $_GET are dumped. web/functions_error.inc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) commit eb33a061e Merge: 092bdc791 973999009 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 24 16:50:19 2019 +0100 Merge with default commit 973999009 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 24 16:49:20 2019 +0100 Suppressed by default the dumping of $_POST['username'] and $_POST['password'] in the error log. If desired, they can be logged by setting in the config file $auth['log_credentials'] = true; web/functions_error.inc | 14 +++++++++++++- web/systemdefaults.inc.php | 5 +++++ 2 files changed, 18 insertions(+), 1 deletion(-) commit 092bdc791 Merge: 4b01218f4 65b90ed62 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 18 17:18:49 2019 +0100 Merge with default commit 65b90ed62 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 18 17:18:26 2019 +0100 Fixed bug resulting in undefined index errors when $mail_settings['details'] is false and $mail_settings['icalendar'] is true. See SF Support Requests #1835. web/mrbs_sql.inc | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) commit 4b01218f4 Merge: dde21b965 940f52713 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Sep 18 14:19:15 2019 +0100 Manual merges of [hg-code:accb92] and [hg-code:ee7426]. commit 940f52713 Merge: 08a28fb1b 6386418b7 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Sep 18 14:10:50 2019 +0100 Merged with default commit 6386418b7 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Sep 18 13:52:11 2019 +0100 [support-requests:#1836] Make SAML authentication redirects use an absolute URL to the MRBS page. web/session/session_saml.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit 91219358a Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Sep 18 13:47:48 2019 +0100 Added support for supplying a TLS cert/key pair for LDAP client authentication - requires PHP 7.1.0 or later. web/auth/auth_ldap.inc | 16 +++++++++++++++- web/systemdefaults.inc.php | 7 ++++++- 2 files changed, 21 insertions(+), 2 deletions(-) commit dde21b965 Merge: 99830d01a 08a28fb1b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 17 15:59:56 2019 +0100 Merge with default commit 08a28fb1b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 17 15:59:35 2019 +0100 Removed redundant global declaration web/functions_mail.inc | 1 - 1 file changed, 1 deletion(-) commit 99830d01a Merge: 7b77f208e f3d2eada8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 17 15:51:05 2019 +0100 Merge with default commit f3d2eada8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 17 15:50:37 2019 +0100 Improved the way that the mail.css/php file is included. Apart from being complicated, the previous method didn't work when the site was protected by a .htaccess username and password - and although this could have been solved the solution would have added more complications. web/css/mrbs-mail.css.php | 9 ++++++--- web/functions_mail.inc | 11 +++-------- 2 files changed, 9 insertions(+), 11 deletions(-) commit 7b77f208e Merge: 9c42570a2 db1b07350 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 15 18:58:25 2019 +0100 Merge with default commit db1b07350 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 15 18:58:04 2019 +0100 Fixed undefined index problem introduced in recent commit web/mrbs_sql.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 9c42570a2 Merge: 18816ea79 ffb443b85 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 15 18:51:23 2019 +0100 Merge with default commit ffb443b85 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 15 18:50:48 2019 +0100 Restructured code web/functions.inc | 61 ++++++++++++++++++++++++++++++++++++++++ web/functions_ical.inc | 52 +--------------------------------- web/functions_mail.inc | 13 ++------- 3 files changed, 64 insertions(+), 62 deletions(-) commit 18816ea79 Merge: 622725c74 4c51ced90 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 15 17:51:34 2019 +0100 Merge with default commit 4c51ced90 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 15 17:51:08 2019 +0100 Made email CSS use the same styling as the rest of the site. web/css/{mrbs-mail.css => mrbs-mail.css.php} | 17 +++++++++---- web/functions_mail.inc | 24 +++++++++++++++--- 2 files changed, 32 insertions(+), 9 deletions(-) commit 622725c74 Merge: fe85d14e0 ec971193b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 14 17:32:26 2019 +0100 Merge with default commit ec971193b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 14 17:28:49 2019 +0100 Fixed various CSS issues web/css/mrbs-mail.css | 2 +- web/css/mrbs-rtl.css.php | 2 +- web/css/mrbs.css.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) commit fe85d14e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 13 16:54:24 2019 +0100 Fixed merge web/lib/MRBS/Auth/AuthLdap.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) commit 99cb90c59 Merge: 3a1eed170 e9322c4de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 13 16:48:30 2019 +0100 Merge with default commit e9322c4de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 13 16:47:52 2019 +0100 Added more LDAP diagnostic information web/auth/auth_ldap.inc | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) commit 3a1eed170 Merge: f0f5dc0d6 f4c2c19c4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 11 15:17:38 2019 +0100 Merge with default commit f4c2c19c4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 11 15:17:20 2019 +0100 Fixed bug when the attribute name isn't all lower case web/auth/auth_ldap.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit f0f5dc0d6 Merge: 7fa094e9e da0e8e3dd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 11 14:20:39 2019 +0100 Merge with default commit da0e8e3dd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 11 14:20:22 2019 +0100 Tweaked formatting web/auth/auth_ldap.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7fa094e9e Merge: ab9c8b768 7b8c9ac91 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 11 14:17:52 2019 +0100 Merge with default commit 7b8c9ac91 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 11 14:15:52 2019 +0100 Tweaked ldap debug message web/auth/auth_ldap.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2fc9babe2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 11 14:00:29 2019 +0100 Restructured code to avoid the use of the error suppression operator web/auth/auth_ldap.inc | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) commit ab9c8b768 Merge: 14350375b a52d26fb8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 10 20:54:55 2019 +0100 Merge with default commit a52d26fb8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 10 20:54:32 2019 +0100 Simplified code web/auth/auth_ldap.inc | 103 ++++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 49 deletions(-) commit 14350375b Merge: c3e8ad6bb f97a4d361 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 8 15:57:39 2019 +0100 Merge with default commit f97a4d361 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 8 15:57:15 2019 +0100 Renamed functions web/auth/auth_ldap.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) commit c3e8ad6bb Merge: abc6206f2 f67a39ee9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 8 15:32:35 2019 +0100 Fixed merge commit f67a39ee9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 8 15:26:10 2019 +0100 Added an authGetUsernames() function for LDAP web/auth/auth_ldap.inc | 119 +++++++++++++++++++++++++++++++++++---- 1 file changed, 109 insertions(+), 10 deletions(-) commit abc6206f2 Merge: f0619c553 ce5fa7c7a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 8 13:37:16 2019 +0100 Merge with default commit ce5fa7c7a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 8 13:36:54 2019 +0100 Added escaping of confirm deletion message. See SF Support Requests #1824 web/view_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f0619c553 Merge: 1f3d1abe3 97fe585db Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 7 08:25:46 2019 +0100 Merge with default commit 97fe585db Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 7 08:25:26 2019 +0100 Added comment. web/view_entry.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 1f3d1abe3 Merge: 55560aad3 a2a082d0c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 7 08:13:25 2019 +0100 Merge with default commit a2a082d0c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 7 08:13:03 2019 +0100 Disabled the edit and delete buttons if an entry can't be deleted, showing the reason in a tootip. See SF Support Requests #1824. web/view_entry.php | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) commit 55560aad3 Merge: c1579ff45 d4a2a7f29 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 6 16:30:34 2019 +0100 Merge with default commit d4a2a7f29 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 6 16:30:13 2019 +0100 Corrected some translations. See SF Support Requests #1824 web/lang/lang.it | 48 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) commit c1579ff45 Merge: 231e5eb7e 0922ef31e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 6 15:44:54 2019 +0100 Merge with default commit 0922ef31e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 6 15:44:27 2019 +0100 Fixed comment in last commit web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 231e5eb7e Merge: 3bc60343d 23177324a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 6 15:31:41 2019 +0100 Merge with default commit 23177324a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 6 15:31:20 2019 +0100 Added new policy allowing the prevention of changing approved bookings. See SF Support Requests #1824. web/lang/lang.da | 3 ++- web/lang/lang.en | 1 + web/lang/lang.it | 1 + web/mrbs_sql.inc | 6 ++++++ web/systemdefaults.inc.php | 6 ++++++ 5 files changed, 16 insertions(+), 1 deletion(-) commit 3bc60343d Merge: 2aa3de79c e559d7f0f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 6 12:45:34 2019 +0100 Merge with default commit e559d7f0f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 6 12:45:01 2019 +0100 Fixed bug causing STATUS not to be exported properly when exporting entries as iCalendar files. See SF Bugs #441. web/functions_ical.inc | 1 + 1 file changed, 1 insertion(+) commit 2aa3de79c Merge: 10f8f9715 0d31e8906 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 3 10:40:33 2019 +0100 Merge with default commit 0d31e8906 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 3 10:39:50 2019 +0100 Removed redundant global declarations web/report.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit 10f8f9715 Merge: 0b17b1b3a 69d4edd91 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 29 14:11:07 2019 +0100 Merge with default commit 69d4edd91 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 29 14:10:43 2019 +0100 Fixed problem with MRBS not recognising numerals in the HTTP_ACCEPT_LANGUAGE header, eg 'es-419'. See SF Support Requests #1828. web/language.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit 3b0779018 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 25 18:03:30 2019 +0100 Made case of function call match declaration (not necessary, but good practice) web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0b17b1b3a Merge: 1ecc8efa3 8fd335266 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 22 16:13:32 2019 +0100 Merge with default commit 8fd335266 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 22 16:13:11 2019 +0100 Reverted SF Patches #84 as it causes problems on some systems. I think the escaping should be done on the individual values in the filter and not on the whole filter. At the same time made the web/auth/auth_ldap.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 1ecc8efa3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 22 15:55:23 2019 +0100 Fixed potential undefined index problem web/lib/MRBS/Auth/Auth.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit 366260301 Merge: 9d1b0220d 53eaea34d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 22 15:51:42 2019 +0100 Merge with default commit 53eaea34d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 22 15:51:16 2019 +0100 Fixed potential undefined index problem web/auth/auth_ldap.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9d1b0220d Merge: 499be0800 ac65b1701 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 22 15:03:00 2019 +0100 Merge with default commit ac65b1701 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 22 14:58:39 2019 +0100 Fixed a problem that caused users not being able to login when an $ldap_filter is specified and the user does not have read access to the directory, even for their own entry. web/auth/auth_ldap.inc | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) commit 499be0800 Merge: 21d5630bc 0ee3bc405 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 19 17:09:34 2019 +0100 Merge with default commit 0ee3bc405 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 19 17:08:57 2019 +0100 Fixed bug causing form error messages not to be displayed when adding new users. web/edit_users.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 40d17cf94 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 18 17:52:47 2019 +0100 Simplified code web/functions_table.inc | 52 ++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 20 deletions(-) commit aac57f269 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 18 17:35:14 2019 +0100 Simplified code web/functions_table.inc | 82 ++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 48 deletions(-) commit e0cdddb2b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 18 17:09:06 2019 +0100 Simplified code web/functions_table.inc | 77 +++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 40 deletions(-) commit 21d5630bc Merge: 0dd383991 31780d890 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 18 16:29:48 2019 +0100 Merge with default commit 31780d890 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 18 16:29:14 2019 +0100 Simplified code web/functions_table.inc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) commit 0dd383991 Merge: 89f5f50d5 486d0f343 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 18 16:21:40 2019 +0100 Merge with default commit 486d0f343 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 18 16:20:03 2019 +0100 Simplified code web/functions_table.inc | 40 ++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) commit 8f3226f07 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 18 16:12:25 2019 +0100 Simplified code web/functions_table.inc | 46 +++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 21 deletions(-) commit 89f5f50d5 Merge: 39ff4be7d 7256529f6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 18 15:38:12 2019 +0100 Merge with default commit 7256529f6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 18 15:31:02 2019 +0100 Removed redundant global declarations web/functions_table.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 1ee1e726f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 18 15:28:30 2019 +0100 Simplified code web/functions.inc | 11 ++++++++++- web/functions_table.inc | 41 +-------------------------------------- 2 files changed, 11 insertions(+), 41 deletions(-) commit 39ff4be7d Merge: 4ebd2f07e 87c8670d3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 18 14:59:29 2019 +0100 Merge with default commit 87c8670d3 Merge: dc64680ae aa3a2efca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 18 14:58:40 2019 +0100 Merge commit aa3a2efca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 18 14:56:21 2019 +0100 Corrected typo in comment web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4ebd2f07e Merge: 2a2e41e1c dc64680ae Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Aug 17 22:48:03 2019 +0100 Merge from default commit dc64680ae Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Aug 17 22:42:07 2019 +0100 Updated the 'crypt' auth method to use the safer 'password_verify()' instead of 'crypt()' web/auth/auth_crypt.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 106da348f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 17 09:53:08 2019 +0100 Corrected typo in comment web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2a2e41e1c Merge: 1123b1aa3 192fe3133 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 30 14:35:04 2019 +0100 Merge with default commit 192fe3133 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 30 14:34:38 2019 +0100 Fixed bug introduced in recent commit web/functions.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 1123b1aa3 Merge: 4902829e0 5c9f6be86 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 28 16:28:42 2019 +0100 Merge with default commit 5c9f6be86 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 28 16:15:33 2019 +0100 Ensured that the default room is visible web/functions.inc | 51 ++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 24 deletions(-) commit 420eb4bba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 28 10:25:30 2019 +0100 Restructured web/functions.inc | 58 +++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 34 deletions(-) commit 47de42801 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 28 09:51:40 2019 +0100 Restructured web/functions.inc | 55 ++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 33 deletions(-) commit 4902829e0 Merge: ff0f360f4 806bfda1f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 27 17:49:05 2019 +0100 Merge with default commit 806bfda1f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 27 17:48:12 2019 +0100 Fixed bug - removed form validation from Back button on the Add User form. web/edit_users.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit ff0f360f4 Merge: 072086d27 598dd38d2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 25 20:26:37 2019 +0100 Merge with default commit 598dd38d2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 25 20:26:02 2019 +0100 Fixed bug in updating timezone data. See SF Bugs #440. web/functions_ical.inc | 1 + 1 file changed, 1 insertion(+) commit 41dd5fefb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 21 19:10:55 2019 +0100 Fixed a problem with borders of navigation buttons when the browser zoom level is less than 100%. See SF Support Requests #1800. web/css/mrbs.css.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 072086d27 Merge: 44726c7cd ba2736749 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 20 19:23:57 2019 +0100 Merge with default commit ba2736749 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 20 19:23:37 2019 +0100 Removed invisible rooms from the list of options in the report form web/report.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) commit 44726c7cd Merge: b282e4efa 499ed6f5f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 20 19:12:36 2019 +0100 Merge with default commit 499ed6f5f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 20 19:09:40 2019 +0100 Stopped bookings in invisible rooms being viewed web/mrbs_sql.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) commit 4e4d88ced Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 20 19:09:17 2019 +0100 Stopped bookings being made in invisible rooms web/mrbs_auth.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit a4cdb30a8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 20 18:38:31 2019 +0100 Removed invisible rooms from the edit_entry form web/edit_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit edcee6125 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 20 18:30:49 2019 +0100 Prevented an invisible room id being used by edit_room.php. web/mrbs_sql.inc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) commit e5689bcc3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 20 18:26:13 2019 +0100 Fixed bug introduced in last commit and excluded invisible rooms from room list. web/admin.php | 15 ++++++--------- web/mrbs_sql.inc | 8 ++++---- 2 files changed, 10 insertions(+), 13 deletions(-) commit a3480cae8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 20 18:06:38 2019 +0100 Simplified code web/mrbs_sql.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 2fbc5ed5b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 20 17:53:33 2019 +0100 Excluded invisible rooms from report results web/report.php | 7 +++++++ 1 file changed, 7 insertions(+) commit 5fd9bea74 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 20 17:46:17 2019 +0100 Excluded invisible rooms from search results web/mrbs_sql.inc | 23 +++++++++++++++++++++++ web/search.php | 7 +++++++ 2 files changed, 30 insertions(+) commit a932d807c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 20 17:25:17 2019 +0100 Restructured code web/functions_table.inc | 15 --------------- web/mrbs_sql.inc | 27 +++++++++++++++++++++------ 2 files changed, 21 insertions(+), 21 deletions(-) commit 1389ca524 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 20 16:56:58 2019 +0100 Added the capability of making rooms invisible to certain users. web/functions_table.inc | 47 ++++++++++++++++++++++++++------------- web/mrbs_auth.inc | 8 +++++++ web/mrbs_sql.inc | 5 ++++- 3 files changed, 43 insertions(+), 17 deletions(-) commit b282e4efa Merge: cf99b5ffc 155f70128 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 14 12:27:47 2019 +0100 Merge with default commit 155f70128 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 14 12:23:29 2019 +0100 Fixed problem in IE11 with bookings not filling the full slot height in the day and week views. web/css/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit cf99b5ffc Merge: 212260364 710c86bb0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 9 09:59:44 2019 +0100 Merge with default commit 710c86bb0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 9 09:59:16 2019 +0100 Fixed problem with empty values for decimal custom fields. See SF Support Requests #1797. web/grab_globals.inc.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit 212260364 Merge: 555b3b83c 620c4857b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 8 15:57:14 2019 +0100 Merge with default commit 620c4857b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 8 15:56:42 2019 +0100 Added support for decimal/numeric custom fields in the entry table. See SF Support Requests #1797. INSTALL | 12 ++++++------ web/css/mrbs.css.php | 4 ++++ web/edit_entry.php | 21 ++++++++++++++++----- web/edit_entry_handler.php | 5 ++++- web/grab_globals.inc.php | 10 ++++++++++ web/lib/MRBS/DB_mysql.php | 8 +++++--- web/lib/MRBS/DB_pgsql.php | 13 +++++++++++-- 7 files changed, 56 insertions(+), 17 deletions(-) commit 555b3b83c Merge: 14240ca0d f8f2614b8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 6 12:07:53 2019 +0100 Merge with default commit f8f2614b8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 6 12:07:10 2019 +0100 Added an option to show the slot end times in the day and week views. It is controlled by the new config variable $show_slot_endtime, which is set to false by default. See SF Support Requests 1796. web/functions_table.inc | 22 ++++++++++++++++++---- web/systemdefaults.inc.php | 4 ++++ 2 files changed, 22 insertions(+), 4 deletions(-) commit 14240ca0d Merge: c6fb3fbb2 65b6eb6a4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 29 12:27:07 2019 +0100 Merge with default commit 65b6eb6a4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 29 12:26:23 2019 +0100 Added escaping of filters - see SF Patches #84 web/auth/auth_ldap.inc | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) commit c6fb3fbb2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 17 18:06:36 2019 +0100 Added autocomplete attributes to the login form web/lib/MRBS/Session/SessionWithLogin.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) commit 53fb48df6 Merge: 6376b5a06 b4b434481 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 17 18:03:43 2019 +0100 Merge with default commit b4b434481 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 17 18:02:49 2019 +0100 Added autocomplete attributes to the login form web/session/functions_session.inc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) commit 6376b5a06 Merge: 84c82d22f 2c9c872fd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 17 17:38:41 2019 +0100 Merge with default commit 2c9c872fd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 17 17:38:19 2019 +0100 Changed so that thge Edit and Delete buttons are only shown if the user is allowed to use them. See SF Support Requests #1776. web/view_entry.php | 114 ++++++++++++++++++++++--------------------- 1 file changed, 59 insertions(+), 55 deletions(-) commit 84c82d22f Merge: a39603044 b1432dfc9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 16 16:58:30 2019 +0100 Merge with default commit b1432dfc9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 16 16:55:53 2019 +0100 Fixed the units (days/weeks/months/years) shown for the repeat interval. web/edit_entry.php | 4 +++- web/js/edit_entry.js.php | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) commit 057214978 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 16 16:13:13 2019 +0100 Removed redundant language token web/lang/lang.ca | 1 - web/lang/lang.cs | 1 - web/lang/lang.da | 1 - web/lang/lang.de | 1 - web/lang/lang.el | 1 - web/lang/lang.en | 1 - web/lang/lang.es | 1 - web/lang/lang.eu | 1 - web/lang/lang.fi | 1 - web/lang/lang.fr | 1 - web/lang/lang.he | 1 - web/lang/lang.id | 1 - web/lang/lang.it | 1 - web/lang/lang.ja | 1 - web/lang/lang.ko | 1 - web/lang/lang.nb | 1 - web/lang/lang.nl | 1 - web/lang/lang.nn | 1 - web/lang/lang.no | 1 - web/lang/lang.pl | 1 - web/lang/lang.pt | 1 - web/lang/lang.pt-br | 1 - web/lang/lang.ro | 1 - web/lang/lang.ru | 1 - web/lang/lang.sk | 1 - web/lang/lang.sl | 1 - web/lang/lang.sr-latn-rs | 1 - web/lang/lang.sv | 1 - web/lang/lang.th | 1 - web/lang/lang.tr | 1 - web/lang/lang.zh-cn | 1 - web/lang/lang.zh-tw | 1 - 32 files changed, 32 deletions(-) commit fb739e124 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 16 16:02:42 2019 +0100 Removed redundant reference to rep_num_months web/edit_entry_handler.php | 1 - 1 file changed, 1 deletion(-) commit a8541dbff Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 16 16:01:07 2019 +0100 Changed vocab token rep_num_weeks to rep_interval and removed any translations that were incorrectly (even before) translated from "Number of weeks" instead of "Repeat every". web/functions_mail.inc | 2 +- web/functions_view.inc | 2 +- web/internalconfig.inc.php | 2 +- web/js/edit_entry.js.php | 2 +- web/lang/lang.ca | 1 - web/lang/lang.cs | 2 +- web/lang/lang.da | 1 - web/lang/lang.de | 2 +- web/lang/lang.el | 1 - web/lang/lang.en | 3 +-- web/lang/lang.es | 1 - web/lang/lang.eu | 1 - web/lang/lang.fi | 1 - web/lang/lang.fr | 1 - web/lang/lang.he | 1 - web/lang/lang.hu | 1 - web/lang/lang.id | 2 +- web/lang/lang.it | 1 - web/lang/lang.ja | 2 +- web/lang/lang.ko | 1 - web/lang/lang.nb | 1 - web/lang/lang.nl | 2 +- web/lang/lang.nn | 1 - web/lang/lang.no | 1 - web/lang/lang.pl | 1 - web/lang/lang.pt | 1 - web/lang/lang.pt-br | 1 - web/lang/lang.ro | 2 +- web/lang/lang.ru | 1 - web/lang/lang.sk | 2 +- web/lang/lang.sl | 1 - web/lang/lang.sr-latn-rs | 1 - web/lang/lang.sv | 1 - web/lang/lang.th | 1 - web/lang/lang.tr | 1 - web/lang/lang.zh-cn | 1 - web/lang/lang.zh-tw | 1 - web/report.php | 2 +- 38 files changed, 13 insertions(+), 39 deletions(-) commit b61c5892c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 16 15:35:30 2019 +0100 Converted iCalendar notifications to use rep_interval web/functions_ical.inc | 61 +++++++++++++------------------------- web/lang/lang.cs | 1 - web/lang/lang.de | 1 - web/lang/lang.en | 1 - web/lang/lang.es | 1 - web/lang/lang.fi | 1 - web/lang/lang.id | 1 - web/lang/lang.it | 1 - web/lang/lang.ja | 1 - web/lang/lang.ro | 1 - web/lang/lang.sk | 1 - web/lang/lang.sr-latn-rs | 1 - web/lang/lang.sv | 1 - web/lang/lang.zh-cn | 1 - 14 files changed, 21 insertions(+), 53 deletions(-) commit fa7037118 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 16 15:16:20 2019 +0100 Fixed bug in French language file web/lang/lang.fr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 23afcbddb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 16 15:11:44 2019 +0100 Switched to using rep_interval instead of rep_num_weeks and rep_num_moths. (Development not yet finished). tables.my.sql | 5 +- tables.pg.sql | 5 +- web/css/mrbs.css.php | 3 +- web/edit_entry.php | 95 +++++++++----------------------- web/edit_entry_handler.php | 18 ++---- web/functions.inc | 46 ++++++++++++++++ web/functions_mail.inc | 31 ++++------- web/functions_view.inc | 13 ++--- web/internalconfig.inc.php | 4 -- web/js/edit_entry.js.php | 25 +-------- web/lang/lang.ca | 2 - web/lang/lang.cs | 2 - web/lang/lang.da | 2 - web/lang/lang.de | 2 - web/lang/lang.el | 2 - web/lang/lang.en | 4 +- web/lang/lang.es | 2 - web/lang/lang.eu | 2 - web/lang/lang.fi | 2 - web/lang/lang.fr | 2 - web/lang/lang.he | 2 - web/lang/lang.hu | 2 - web/lang/lang.id | 2 - web/lang/lang.it | 2 - web/lang/lang.ja | 2 - web/lang/lang.ko | 2 - web/lang/lang.nb | 2 - web/lang/lang.nl | 2 - web/lang/lang.nn | 2 - web/lang/lang.no | 2 - web/lang/lang.pl | 2 - web/lang/lang.pt | 2 - web/lang/lang.pt-br | 2 - web/lang/lang.ro | 2 - web/lang/lang.ru | 2 - web/lang/lang.sk | 2 - web/lang/lang.sl | 2 - web/lang/lang.sr-latn-rs | 2 - web/lang/lang.sv | 2 - web/lang/lang.th | 2 - web/lang/lang.tr | 2 - web/lang/lang.zh-cn | 2 - web/lang/lang.zh-tw | 2 - web/lib/MRBS/DB.php | 2 +- web/mrbs_sql.inc | 27 ++++----- web/upgrade/62/mysql.sql (new) | 29 ++++++++++ web/upgrade/62/pgsql.sql (new) | 25 +++++++++ web/view_entry.php | 2 +- 48 files changed, 170 insertions(+), 228 deletions(-) commit 835e88455 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 15 16:49:16 2019 +0100 Fixed bug introduced in recent commit web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4ce82dc86 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 15 16:40:02 2019 +0100 Improved layout web/css/mrbs.css.php | 2 +- web/edit_entry.php | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) commit 49044e8c0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 15 11:50:39 2019 +0100 Added capability of defining repeats every n months. See SF Feature Requests #398 tables.my.sql | 3 ++- tables.pg.sql | 3 ++- web/css/mrbs.css.php | 2 +- web/edit_entry.php | 33 +++++++++++++++++++++++++++++--- web/edit_entry_handler.php | 17 ++++++++++++---- web/functions_ical.inc | 14 ++++++++++++++ web/functions_mail.inc | 11 ++++++++++- web/functions_view.inc | 4 ++++ web/internalconfig.inc.php | 3 ++- web/js/edit_entry.js.php | 30 ++++++++++++++++++++++++----- web/lang/lang.en | 5 ++++- web/lib/MRBS/DB.php | 2 +- web/mrbs_sql.inc | 13 ++++++++++--- web/report.php | 2 +- web/upgrade/61/mysql.sql (new) | 5 +++++ web/upgrade/61/pgsql.sql (new) | 5 +++++ 16 files changed, 129 insertions(+), 23 deletions(-) commit a39603044 Merge: 998aed723 1f5fd56b7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 11 18:33:51 2019 +0100 Merge with default commit 1f5fd56b7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 11 18:33:27 2019 +0100 Made the calendar view tables scroll horizontally within the container rather than having to scroll the whole page web/css/mrbs.css.php | 6 ++++++ web/index.php | 2 ++ 2 files changed, 8 insertions(+) commit 998aed723 Merge: f2d835bd1 49647a6b5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 29 11:41:26 2019 +0100 Merge with default commit 49647a6b5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 29 11:41:02 2019 +0100 Fixed problem with the areamatch and roommatch fields not being passed through with the form variables in the Edge browser. See SF Support Requests #1763. web/js/general.js.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit f2d835bd1 Merge: c5c36c0a6 b263291ee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun May 5 15:29:25 2019 +0100 Merge with default commit b263291ee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun May 5 15:27:43 2019 +0100 Fixed HTML5 validation error web/edit_area.php | 3 ++- web/lib/MRBS/Form/Field.php | 15 ++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) commit 2f5fb37b8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun May 5 15:07:20 2019 +0100 Fixed HTML5 validation error web/edit_users.php | 6 ++++++ web/lib/MRBS/Form/Field.php | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) commit ddea5169c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun May 5 14:49:36 2019 +0100 Aded 'autocomplete="new-password"' attribute to password fields on the Add/Edit User form to stop browsers trying to autocomplete those fields. web/edit_users.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit c5c36c0a6 Merge: 417ccb282 25710f3ac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 25 18:10:03 2019 +0100 Merge with default commit 25710f3ac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 25 18:09:45 2019 +0100 Updated comments web/mrbs_auth.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit 417ccb282 Merge: e2902fc8e a47ceecab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 25 18:04:38 2019 +0100 Merge with default commit a47ceecab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 25 18:04:18 2019 +0100 Removed some whitespace web/mrbs_auth.inc | 2 -- 1 file changed, 2 deletions(-) commit e2902fc8e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 25 18:00:49 2019 +0100 Fixed merge web/mrbs_auth.inc | 1 + 1 file changed, 1 insertion(+) commit 363437a47 Merge: 3534c73c2 8f0baded3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 25 17:58:01 2019 +0100 Merge with default commit 8f0baded3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 25 17:12:38 2019 +0100 Only displayed rooms that the user has write access for. See SF Support Requests #1744. web/edit_entry.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit b9ca68772 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 25 17:01:13 2019 +0100 Prevented rooms being booked for which the user doesn't have write access. See SF Support Requests #1744. web/edit_entry_handler.php | 32 +++++------- web/mrbs_auth.inc | 99 +++++++++++++++++++++++++++++------- 2 files changed, 96 insertions(+), 35 deletions(-) commit 3534c73c2 Merge: 432e4f720 b9d9e1b15 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 21 10:58:54 2019 +0100 Merge with default commit b9d9e1b15 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 21 10:55:22 2019 +0100 Fixed another HTML5 validation error in email notifications web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1786173fa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 21 10:48:06 2019 +0100 Fixed HTML5 validation error in email notifications web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 432e4f720 Merge: 27e597f08 adc4160cc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 20 12:21:35 2019 +0100 Merge with default commit adc4160cc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 20 12:21:08 2019 +0100 Fixed bug causing the Remind button not to work web/pending.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 27e597f08 Merge: b8e985df1 8d76f3d4e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 20 11:55:49 2019 +0100 Merge with default commit 8d76f3d4e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 20 11:53:18 2019 +0100 Removed redundant global web/language.inc | 1 - 1 file changed, 1 deletion(-) commit 7eb42cf2c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 20 11:51:18 2019 +0100 Moved %mrbs_admin out of lang files web/lang/lang.cs | 2 +- web/lang/lang.de | 2 +- web/lang/lang.en | 2 +- web/lang/lang.es | 2 +- web/lang/lang.fi | 2 +- web/lang/lang.fr | 2 +- web/lang/lang.he | 2 +- web/lang/lang.hu | 2 +- web/lang/lang.id | 2 +- web/lang/lang.it | 2 +- web/lang/lang.ja | 2 +- web/lang/lang.nb | 2 +- web/lang/lang.nl | 2 +- web/lang/lang.nn | 2 +- web/lang/lang.no | 2 +- web/lang/lang.pl | 2 +- web/lang/lang.pt | 2 +- web/lang/lang.pt-br | 2 +- web/lang/lang.ro | 2 +- web/lang/lang.ru | 2 +- web/lang/lang.sk | 2 +- web/lang/lang.sr-latn-rs | 2 +- web/lang/lang.sv | 2 +- web/lang/lang.th | 2 +- web/lang/lang.tr | 2 +- web/lang/lang.zh-cn | 2 +- web/upgrade.inc | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) commit 45ed77491 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 20 11:37:20 2019 +0100 Removed redundant global web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d3aafcbf0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 20 11:33:29 2019 +0100 Moved more instances of %mrbs_company out of lang files web/functions_mail.inc | 2 +- web/lang/lang.cs | 2 +- web/lang/lang.de | 2 +- web/lang/lang.en | 2 +- web/lang/lang.es | 2 +- web/lang/lang.fi | 2 +- web/lang/lang.fr | 2 +- web/lang/lang.he | 2 +- web/lang/lang.hu | 2 +- web/lang/lang.id | 2 +- web/lang/lang.it | 2 +- web/lang/lang.ja | 2 +- web/lang/lang.nb | 2 +- web/lang/lang.nl | 2 +- web/lang/lang.nn | 2 +- web/lang/lang.no | 2 +- web/lang/lang.pl | 2 +- web/lang/lang.pt | 2 +- web/lang/lang.pt-br | 2 +- web/lang/lang.ro | 2 +- web/lang/lang.ru | 2 +- web/lang/lang.sk | 2 +- web/lang/lang.sl | 2 +- web/lang/lang.sr-latn-rs | 2 +- web/lang/lang.sv | 2 +- web/lang/lang.th | 2 +- web/lang/lang.tr | 2 +- web/lang/lang.zh-cn | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) commit 088c2d064 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 20 11:23:16 2019 +0100 Moved more instances of %mrbs_company out of lang files web/functions_mail.inc | 2 +- web/lang/lang.cs | 2 +- web/lang/lang.de | 2 +- web/lang/lang.en | 2 +- web/lang/lang.es | 2 +- web/lang/lang.fi | 2 +- web/lang/lang.fr | 2 +- web/lang/lang.he | 2 +- web/lang/lang.hu | 2 +- web/lang/lang.id | 2 +- web/lang/lang.it | 2 +- web/lang/lang.ja | 2 +- web/lang/lang.nb | 2 +- web/lang/lang.nl | 2 +- web/lang/lang.nn | 2 +- web/lang/lang.no | 2 +- web/lang/lang.pl | 2 +- web/lang/lang.pt | 2 +- web/lang/lang.pt-br | 2 +- web/lang/lang.ro | 2 +- web/lang/lang.ru | 2 +- web/lang/lang.sk | 2 +- web/lang/lang.sl | 2 +- web/lang/lang.sr-latn-rs | 2 +- web/lang/lang.sv | 2 +- web/lang/lang.th | 2 +- web/lang/lang.tr | 4 ++-- web/lang/lang.zh-cn | 2 +- 28 files changed, 29 insertions(+), 29 deletions(-) commit cfb1bbada Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 20 11:12:14 2019 +0100 Moved more instances of %mrbs_company out of lang files web/functions_mail.inc | 2 +- web/lang/lang.cs | 2 +- web/lang/lang.de | 2 +- web/lang/lang.en | 2 +- web/lang/lang.es | 2 +- web/lang/lang.fi | 2 +- web/lang/lang.fr | 2 +- web/lang/lang.he | 2 +- web/lang/lang.hu | 2 +- web/lang/lang.id | 2 +- web/lang/lang.it | 2 +- web/lang/lang.ja | 2 +- web/lang/lang.nb | 2 +- web/lang/lang.nl | 2 +- web/lang/lang.nn | 2 +- web/lang/lang.no | 2 +- web/lang/lang.pl | 2 +- web/lang/lang.pt | 2 +- web/lang/lang.pt-br | 2 +- web/lang/lang.ro | 2 +- web/lang/lang.ru | 2 +- web/lang/lang.sk | 2 +- web/lang/lang.sl | 2 +- web/lang/lang.sr-latn-rs | 2 +- web/lang/lang.sv | 2 +- web/lang/lang.th | 2 +- web/lang/lang.tr | 2 +- web/lang/lang.zh-cn | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) commit 4a6a8b135 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 20 10:55:26 2019 +0100 Moved more instances of %mrbs_company out of lang files web/functions_mail.inc | 2 +- web/lang/lang.cs | 2 +- web/lang/lang.de | 2 +- web/lang/lang.en | 2 +- web/lang/lang.es | 2 +- web/lang/lang.fi | 2 +- web/lang/lang.fr | 2 +- web/lang/lang.he | 2 +- web/lang/lang.hu | 2 +- web/lang/lang.id | 2 +- web/lang/lang.it | 2 +- web/lang/lang.ja | 2 +- web/lang/lang.nb | 2 +- web/lang/lang.nl | 2 +- web/lang/lang.nn | 2 +- web/lang/lang.no | 2 +- web/lang/lang.pl | 2 +- web/lang/lang.pt | 2 +- web/lang/lang.pt-br | 2 +- web/lang/lang.ro | 2 +- web/lang/lang.ru | 2 +- web/lang/lang.sk | 2 +- web/lang/lang.sr-latn-rs | 2 +- web/lang/lang.sv | 2 +- web/lang/lang.th | 2 +- web/lang/lang.tr | 2 +- web/lang/lang.zh-cn | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) commit d27ff63ac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 20 10:41:20 2019 +0100 Moved more instances of %mrbs_company out of lang files web/functions_mail.inc | 2 +- web/lang/lang.cs | 2 +- web/lang/lang.de | 2 +- web/lang/lang.en | 2 +- web/lang/lang.es | 2 +- web/lang/lang.fi | 2 +- web/lang/lang.fr | 2 +- web/lang/lang.he | 2 +- web/lang/lang.hu | 2 +- web/lang/lang.id | 2 +- web/lang/lang.it | 2 +- web/lang/lang.ja | 2 +- web/lang/lang.nb | 2 +- web/lang/lang.nl | 2 +- web/lang/lang.nn | 2 +- web/lang/lang.no | 2 +- web/lang/lang.pl | 2 +- web/lang/lang.pt | 2 +- web/lang/lang.pt-br | 2 +- web/lang/lang.ro | 2 +- web/lang/lang.ru | 2 +- web/lang/lang.sk | 2 +- web/lang/lang.sr-latn-rs | 2 +- web/lang/lang.sv | 2 +- web/lang/lang.th | 2 +- web/lang/lang.tr | 2 +- web/lang/lang.zh-cn | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) commit 9f3bd3c03 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 20 10:28:28 2019 +0100 Moved %mrbs_company out of lang files web/functions_mail.inc | 6 ++++-- web/lang/lang.cs | 4 ++-- web/lang/lang.de | 4 ++-- web/lang/lang.en | 4 ++-- web/lang/lang.es | 4 ++-- web/lang/lang.fi | 4 ++-- web/lang/lang.fr | 4 ++-- web/lang/lang.he | 4 ++-- web/lang/lang.hu | 4 ++-- web/lang/lang.id | 4 ++-- web/lang/lang.it | 4 ++-- web/lang/lang.ja | 4 ++-- web/lang/lang.nb | 4 ++-- web/lang/lang.nl | 4 ++-- web/lang/lang.nn | 4 ++-- web/lang/lang.no | 4 ++-- web/lang/lang.pl | 4 ++-- web/lang/lang.pt | 4 ++-- web/lang/lang.pt-br | 4 ++-- web/lang/lang.ro | 4 ++-- web/lang/lang.ru | 4 ++-- web/lang/lang.sk | 4 ++-- web/lang/lang.sr-latn-rs | 4 ++-- web/lang/lang.sv | 4 ++-- web/lang/lang.th | 4 ++-- web/lang/lang.tr | 4 ++-- web/lang/lang.zh-cn | 4 ++-- 27 files changed, 56 insertions(+), 54 deletions(-) commit b8e985df1 Merge: 73cab0f0a 332fe7dd4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 16 18:51:15 2019 +0100 Merge with default commit 332fe7dd4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 16 18:50:54 2019 +0100 Added DB schema version to Help information web/help.php | 2 ++ web/lang/lang.en | 24 +++++++++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) commit 73cab0f0a Merge: 59af1b13d f1d3c9ac3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 16 18:38:10 2019 +0100 Merge with default commit f1d3c9ac3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 16 18:37:45 2019 +0100 Simplified code web/index.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) commit 59af1b13d Merge: 5d8993d90 315ae4834 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 15 18:15:49 2019 +0100 Merge with default commit 315ae4834 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 15 18:12:47 2019 +0100 Reunited comments with function web/functions_mail.inc | 67 ++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 33 deletions(-) commit 5d8993d90 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 15 15:53:51 2019 +0100 Fixed merge web/mrbs_auth.inc | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) commit 4fda6a8f3 Merge: c4e3b7a5a 9f8a12275 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 15 15:51:16 2019 +0100 Merge with default commit 9f8a12275 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 15 15:48:43 2019 +0100 Made is_book_admin() cope with an array of rooms web/edit_entry_handler.php | 8 ++++---- web/mrbs_auth.inc | 21 ++++++++++++++++++--- 2 files changed, 22 insertions(+), 7 deletions(-) commit c4e3b7a5a Merge: 5a0ca5c8a 38b6bc40e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 14 08:55:11 2019 +0100 Merge with default commit 38b6bc40e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 14 08:54:47 2019 +0100 Fixed a bug that occasionally (especially on slow connections) caused the wrong data to be displayed in the calendar view after switching days. The problem would arise if the user switched days in between an Ajax refresh request being made and the response being returned. web/js/refresh.js.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) commit 5a0ca5c8a Merge: 1f9200685 7da1731b8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 9 16:24:53 2019 +0100 Merge with default commit 7da1731b8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 9 16:24:30 2019 +0100 Added a type declaration web/upgrade.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1f9200685 Merge: bc15db452 1c9f0c7d6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 8 17:45:28 2019 +0100 Merge with default commit 1c9f0c7d6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 8 17:43:28 2019 +0100 Removed redundant global declaration web/functions_table.inc | 1 - 1 file changed, 1 deletion(-) commit f6a24d59b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 8 17:41:43 2019 +0100 Removed redundant global declaration web/functions_table.inc | 1 - 1 file changed, 1 deletion(-) commit bc15db452 Merge: f0134b4ea 5419abcfe Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 8 07:12:04 2019 +0100 Merge with default commit 5419abcfe Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 8 07:11:43 2019 +0100 Removed redundant version check. web/import.php | 5 ----- 1 file changed, 5 deletions(-) commit f0134b4ea Merge: d0fe9616b 53e4479ad Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 7 18:42:11 2019 +0100 Merge with default commit 53e4479ad Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 7 18:39:41 2019 +0100 Fixed possible undefined index error when exporting bookings as an iCalendar web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 54d88b22e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 7 18:32:21 2019 +0100 Added a type declaration web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d0fe9616b Merge: ec97e9ee8 5dd8d3899 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 7 18:15:23 2019 +0100 Merge with default commit 5dd8d3899 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 7 18:06:39 2019 +0100 Removed redundant global declaration web/functions_ical.inc | 2 -- 1 file changed, 2 deletions(-) commit bce85a84c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 7 18:03:42 2019 +0100 Tidied up web/functions_ical.inc | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) commit e44fc2f17 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 7 17:58:34 2019 +0100 Removed redundant global declaration web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cfcff8c72 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 7 17:56:37 2019 +0100 Removed redundant line of code web/functions_ical.inc | 2 -- 1 file changed, 2 deletions(-) commit da56beaee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 7 17:54:46 2019 +0100 Removed redundant global declaration web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f751fcded Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 7 17:47:16 2019 +0100 Fixed bug preventing compressed files from being imported. web/import.php | 1 + 1 file changed, 1 insertion(+) commit ec97e9ee8 Merge: 117262c89 a266d04e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 5 17:49:28 2019 +0100 Merge with default commit a266d04e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 5 17:49:07 2019 +0100 Fixed problem with the create_by field being turned into a fancy select box when it shouldn't be. See SF Support Requests #1732. web/js/edit_entry.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 117262c89 Merge: 906f5d7c3 6f5607a9b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 2 17:18:18 2019 +0100 Merge with default commit 6f5607a9b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 2 17:17:49 2019 +0100 Fixed poroblem when $_SERVER['PHP_SELF'] is empty. See SF Bugs #437. web/functions.inc | 90 ++++++++++++++++++++++++++++++--------------- web/report.php | 2 +- 2 files changed, 61 insertions(+), 31 deletions(-) commit 906f5d7c3 Merge: 862750f37 dc2323b4b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 1 18:14:42 2019 +0100 Merge with default commit dc2323b4b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 1 18:14:23 2019 +0100 Restructured web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 860c1a14e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 1 18:06:13 2019 +0100 Restructured web/functions.inc | 17 ++++++++++++----- web/functions_mail.inc | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) commit 862750f37 Merge: ea11eddb4 81b87c575 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 1 17:35:31 2019 +0100 Merge with default commit 81b87c575 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 1 17:35:06 2019 +0100 Eliminated a potential undefined index problem if the user agent doesn't have HTTP_ACCEPT_LANGUAGE set. web/help.php | 5 ++++- web/language.inc | 9 ++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) commit ea11eddb4 Merge: 18af3c50c b59876368 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 1 17:10:42 2019 +0100 Merge with default commit b59876368 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 1 17:10:20 2019 +0100 Removed redundant global declaration. web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 18af3c50c Merge: ba45b7544 11c02ff46 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 1 17:01:43 2019 +0100 Merge with default commit 11c02ff46 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 1 17:00:33 2019 +0100 Fixed a problem with links in email notifications not being calculated automatically when $url_base is empty. web/functions.inc | 20 ++++++++++++++++++++ web/functions_mail.inc | 12 ++---------- web/systemdefaults.inc.php | 8 ++------ 3 files changed, 24 insertions(+), 16 deletions(-) commit ba45b7544 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 20 17:48:50 2019 +0000 Fixed merge web/functions_mail.inc | 1 - 1 file changed, 1 deletion(-) commit 1fbb2c110 Merge: f38df7175 dcd111185 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 20 17:47:45 2019 +0000 Merge with default commit dcd111185 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 20 17:46:34 2019 +0000 Fixed bug in recent commit web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f38df7175 Merge: 318639fce 9bfeabf1c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 20 17:32:50 2019 +0000 Merge with default commit 9bfeabf1c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 20 17:32:17 2019 +0000 Deleted redundant language tokens web/lang/lang.fr | 1 - web/lang/lang.he | 1 - web/lang/lang.hu | 1 - 3 files changed, 3 deletions(-) commit 318639fce Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 20 17:30:32 2019 +0000 Converted to using display names instead of usernames in email notifications. web/functions_mail.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 907051364 Merge: 5447cc6af 7690e2394 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 20 17:18:41 2019 +0000 Merge with default commit 7690e2394 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 20 17:17:30 2019 +0000 Added details of person booking/approving/rejecting etc to email notifications. See SF Support Requests #1714. web/functions_mail.inc | 24 ++++++++++++------------ web/lang/lang.cs | 1 - web/lang/lang.de | 1 - web/lang/lang.en | 13 ++++++------- web/lang/lang.es | 1 - web/lang/lang.fi | 1 - web/lang/lang.id | 1 - web/lang/lang.it | 1 - web/lang/lang.ja | 1 - web/lang/lang.nb | 1 - web/lang/lang.nl | 1 - web/lang/lang.nn | 1 - web/lang/lang.no | 1 - web/lang/lang.pl | 1 - web/lang/lang.pt | 1 - web/lang/lang.pt-br | 1 - web/lang/lang.ro | 1 - web/lang/lang.ru | 1 - web/lang/lang.sk | 1 - web/lang/lang.sr-latn-rs | 1 - web/lang/lang.sv | 1 - web/lang/lang.th | 1 - web/lang/lang.tr | 1 - web/lang/lang.zh-cn | 1 - 24 files changed, 18 insertions(+), 41 deletions(-) commit 5447cc6af Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 19 17:58:04 2019 +0000 Formatted code web/lib/MRBS/Auth/AuthWordpress.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit e317ee793 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 19 17:53:09 2019 +0000 Fixed merge web/auth/auth_wordpress.inc | 4 ++-- web/lib/MRBS/Auth/AuthWordpress.php | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) commit a4cb9b33c Merge: 101f7677c 244782043 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 19 17:32:47 2019 +0000 Merge with default commit 244782043 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 19 17:30:20 2019 +0000 Fixed bug when WordPress roles are not an array web/auth/auth_wordpress.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit c22750bfc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 19 17:21:16 2019 +0000 Added a new config option $auth['wordpress']['blacklisted_roles']. See SF Support Requests #1719. web/auth/auth_wordpress.inc | 11 +++++++++++ web/systemdefaults.inc.php | 4 ++++ 2 files changed, 15 insertions(+) commit 101f7677c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 19 16:57:48 2019 +0000 Trivial commit web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 682ade069 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 19 16:43:34 2019 +0000 Fixed merge web/functions_mail.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 963814431 Merge: 1959fa1c3 1b619c949 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 19 16:40:44 2019 +0000 Merge with default commit 1b619c949 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 19 16:38:33 2019 +0000 Added the configuration option $mail_settings['use_from_for_all_mail'] to allow the standard From address to be used for all emails. See SF Support Requests #1714. web/functions_mail.inc | 14 ++++++-------- web/systemdefaults.inc.php | 7 +++++++ 2 files changed, 13 insertions(+), 8 deletions(-) commit 1959fa1c3 Merge: e0ec3b8e9 d0f2331c9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 8 15:13:45 2019 +0000 Merge with default commit d0f2331c9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 8 15:13:15 2019 +0000 Made the PHP session name a config setting. See SF Feature Requests #379. web/init.inc | 2 +- web/systemdefaults.inc.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) commit e0ec3b8e9 Merge: e9cb08899 11fb09a6b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 6 16:25:49 2019 +0000 Merge with default commit 11fb09a6b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 6 16:24:22 2019 +0000 Added comment web/grab_globals.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit e9cb08899 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 6 16:19:12 2019 +0000 Fixed merge web/lib/MRBS/Session/SessionCookie.php | 12 ++++++------ web/lib/MRBS/Session/SessionHost.php | 4 +++- web/lib/MRBS/Session/SessionHttp.php | 12 ++++++++---- web/lib/MRBS/Session/SessionIp.php | 4 +++- web/lib/MRBS/Session/SessionOmni.php | 4 +++- web/lib/MRBS/Session/SessionRemoteUser.php | 10 ++++++---- web/mrbs_auth.inc | 4 ++-- 7 files changed, 31 insertions(+), 19 deletions(-) commit a5f5a54b7 Merge: b85e74c74 ec61f67f9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 6 16:07:15 2019 +0000 Merge with default commit ec61f67f9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 6 15:57:58 2019 +0000 Reverted changes that got rid of MRBS variables such as $PHP_SELF because the use of $_SERVER['PHP_SELF'] etc. will be a problem when authenticating on WordPress sites due to WordPress automatically adding slashes to the PHP superglobals. Did not change the CAS library as (a) it's third party code and (b) if you are using CAS authentication then you won't be using WordPress. Also did not change PHPMailer as that's third party code as well. However, although PHPMailer is used when using WordPress sites, the use of $_SERVER variables by PHPMailer makes it unlikely that there wilkl be a problem. web/edit_entry.php | 4 ++-- web/functions.inc | 32 ++++++++++++++++----------- web/grab_globals.inc.php | 26 +++++++++++----------- web/help.php | 2 +- web/language.inc | 2 +- web/lib/MRBS/Form/Form.php | 8 ++++--- web/mrbs_auth.inc | 4 +++- web/report.php | 2 +- web/session/session_cookie.inc | 8 +++---- web/session/session_host.inc | 4 +++- web/session/session_http.inc | 12 ++++++---- web/session/session_ip.inc | 4 +++- web/session/session_omni.inc | 4 +++- web/session/session_remote_user.inc | 10 +++++---- web/upgrade/24/post.inc | 10 ++++----- web/upgrade/47/post.inc | 10 ++++----- web/view_entry.php | 8 +++---- 17 files changed, 86 insertions(+), 64 deletions(-) commit b85e74c74 Merge: 37e1b36bc 79c548a82 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 2 10:13:03 2019 +0000 Merge with default commit 79c548a82 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 2 10:11:33 2019 +0000 Removed unused use statement web/lib/MRBS/DBStatement.php | 1 - 1 file changed, 1 deletion(-) commit 6dbc5414b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 2 10:08:03 2019 +0000 Added some type declarations web/lib/MRBS/DBStatement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 37e1b36bc Merge: ac37cfb2e 8077ac9b5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 2 09:42:57 2019 +0000 Merge with default commit 8077ac9b5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 2 09:42:01 2019 +0000 Restructured in order to help IDEs with code inspection. web/lib/MRBS/DBFactory.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit 33d40fbe2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 2 09:29:34 2019 +0000 Removed redundant semicolon. web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ac37cfb2e Merge: 3a79df7c3 19b394f23 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 1 18:52:22 2019 +0000 Merge with default commit 19b394f23 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 1 18:43:49 2019 +0000 Added explicit return value. web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f83a4ca58 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 1 18:37:51 2019 +0000 Removed redundant global declarations. web/edit_entry.php | 1 - 1 file changed, 1 deletion(-) commit 003ec3919 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 1 18:35:14 2019 +0000 Removed redundant line of code web/edit_entry.php | 4 ---- 1 file changed, 4 deletions(-) commit 3a79df7c3 Merge: 6dc47cbf6 dab4b9938 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 28 15:31:04 2019 +0000 Merge with default commit dab4b9938 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 28 15:30:42 2019 +0000 Removed redundant line web/edit_users.php | 2 -- 1 file changed, 2 deletions(-) commit 6dc47cbf6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 28 15:25:46 2019 +0000 Removed redundant line web/edit_users.php | 2 -- 1 file changed, 2 deletions(-) commit 5cc3dc6a1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 28 14:59:11 2019 +0000 Fixed problem when not logged in web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4366e7fae Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 28 14:57:03 2019 +0000 Fixed merge web/edit_users.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) commit cb1b02310 Merge: c8010adf5 08cb8048c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 28 14:47:33 2019 +0000 Merge with default commit 08cb8048c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 28 14:47:02 2019 +0000 Fixed problem with $min_user_viewing_level. See SF Support Requests #1690. web/edit_users.php | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) commit c8010adf5 Merge: 4bf1ec5de 54baafdad Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 25 15:55:11 2019 +0000 Merge with default commit 54baafdad Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 25 15:47:32 2019 +0000 Fixed bug in bulk deletion of entries from the report page web/ajax/del_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4bf1ec5de Merge: 5f6ae385e 5305be1cc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 16 19:16:05 2019 +0000 Merge with default commit 5305be1cc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 16 19:15:45 2019 +0000 Added missing break statement. web/functions_view.inc | 1 + 1 file changed, 1 insertion(+) commit 5f6ae385e Merge: d3a2479ed 8e1447591 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 16 19:12:20 2019 +0000 Merge with default commit 8e1447591 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 16 19:11:52 2019 +0000 Removed redundant global declarations web/functions_table.inc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) commit d3a2479ed Merge: a11085c7a 45d6375b1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 15 13:38:15 2019 +0000 Merge with default commit 45d6375b1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 15 13:31:08 2019 +0000 Fixed problem with $skip_default config setting not being recognised. See SF Bugs #434. web/edit_entry.php | 2 ++ 1 file changed, 2 insertions(+) commit a11085c7a Merge: ddb61917e ddebf3806 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 6 13:57:00 2019 +0000 Merge with default commit ddebf3806 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 6 13:56:32 2019 +0000 Tidied code web/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ddb61917e Merge: 22e85def0 be51f2719 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 5 17:23:31 2019 +0000 Merge with default commit be51f2719 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 5 17:15:40 2019 +0000 Tidied code web/index.php | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) commit 22e85def0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 5 16:59:54 2019 +0000 Removed redundant use statatement web/lib/MRBS/Session/SessionWithLogin.php | 1 - 1 file changed, 1 deletion(-) commit 3c2e89a59 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 5 16:57:40 2019 +0000 Moved canValidateByEmail() into Auth classes web/auth/auth_db.inc | 8 -------- web/auth/auth_wordpress.inc | 9 --------- web/lib/MRBS/Auth/Auth.php | 11 +++++++++-- web/lib/MRBS/Auth/AuthDb.php | 7 +++++++ web/lib/MRBS/Auth/AuthWordpress.php | 11 ++++++++++- web/lib/MRBS/Session/SessionWithLogin.php | 11 ++--------- 6 files changed, 28 insertions(+), 29 deletions(-) commit bde531534 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 4 18:37:24 2019 +0000 Fixed a number of problems web/lib/MRBS/Auth/AuthConfig.php | 2 -- web/lib/MRBS/Auth/AuthLdap.php | 26 ++++++++++---------- web/lib/MRBS/Session/SessionCas.php | 3 ++- web/lib/MRBS/Session/SessionCookie.php | 6 ++--- web/lib/MRBS/Session/SessionHttp.php | 2 +- web/lib/MRBS/Session/SessionRemoteUser.php | 2 +- web/lib/MRBS/Session/SessionSaml.php | 2 +- 7 files changed, 21 insertions(+), 22 deletions(-) commit f873e6005 Merge: 9470234ee d82615dec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 4 17:18:16 2019 +0000 Merge with default commit d82615dec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 4 17:09:56 2019 +0000 Tidied code web/functions_mail.inc | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) commit 1b9f5a124 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 4 16:57:41 2019 +0000 Removed redundant global web/functions_mail.inc | 2 -- 1 file changed, 2 deletions(-) commit 9470234ee Merge: a691d8a37 6f9a7698e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 4 16:48:57 2019 +0000 Merge with default commit 6f9a7698e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 4 16:48:31 2019 +0000 Tidied code web/functions_mail.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit a691d8a37 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 4 16:40:10 2019 +0000 Got rid of authGetUserEmail() for the 5 auth schemes that have been converted to classes so far (config, db, ldap, joomla and wordpress). web/auth/auth_config.inc | 13 ------------- web/auth/auth_db.inc | 22 ---------------------- web/auth/auth_joomla.inc | 15 --------------- web/auth/auth_ldap.inc | 24 ------------------------ web/auth/auth_wordpress.inc | 14 -------------- web/functions_mail.inc | 20 +++++++------------- web/mrbs_sql.inc | 2 +- 7 files changed, 8 insertions(+), 102 deletions(-) commit 90a671137 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 4 16:16:40 2019 +0000 Fixed undefined variable problem introduced in last commit web/Themes/default/header.inc | 2 +- web/mrbs_sql.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit 0b7519556 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 4 15:31:29 2019 +0000 Got rid of authGetUserLevel() for the 5 auth schemes that have been converted to classes so far (config, db, ldap, joomla and wordpress). web/Themes/default/header.inc | 6 ++-- web/auth/auth_config.inc | 33 ------------------ web/auth/auth_db.inc | 25 ------------- web/auth/auth_joomla.inc | 48 ------------------------- web/auth/auth_ldap.inc | 54 ---------------------------- web/auth/auth_wordpress.inc | 62 --------------------------------- web/edit_users.php | 13 ++++--- web/mrbs_auth.inc | 24 ++++++------- web/report.php | 13 ++++--- 9 files changed, 27 insertions(+), 251 deletions(-) commit 34b64d4a8 Merge: aa643c501 0f797e2ff Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 4 13:46:20 2019 +0000 Merge with default commit 0f797e2ff Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Feb 3 23:17:10 2019 +0000 Updated DB schema version in initial tables tables.my.sql | 2 +- tables.pg.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit aa643c501 Merge: ad21860d1 4aa7110ad Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 3 18:53:11 2019 +0000 Merge with default commit 4aa7110ad Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 3 18:48:40 2019 +0000 Removed duplicate array key web/edit_entry_handler.php | 1 - 1 file changed, 1 deletion(-) commit ad21860d1 Merge: a02c0affb 0ebd588a6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 3 17:14:29 2019 +0000 Merge with default commit 0ebd588a6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 3 17:13:59 2019 +0000 Brought PostgreSQL column lengths into line with MySQL. (Not strictly necessary as it's only MySQL that has the problem with the key sizes, but it's simpler for testing and support if both behave the same way.) tables.pg.sql | 4 ++-- web/upgrade/60/pgsql.sql (new) | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) commit 647681d77 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 3 16:46:34 2019 +0000 Added upgrade step to bring existing tables into line with the new tables.my.sql web/lib/MRBS/DB.php | 2 +- web/upgrade/60/mysql.sql (new) | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) commit a25312a5b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 3 16:28:24 2019 +0000 Reduced the length of the session id to 191 now that we are using utf8mb4. tables.my.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit f5cbac8c5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 3 16:05:47 2019 +0000 Reduced the VARCHAR size to avoid running into the limit on the size of the index now that we have switched to utf8mb4. VARCHAR(127) should be more than enough for this field. (Strictly speaking we don't need really need utf8mb4, but it keeps tings simpler using it throughout). tables.my.sql | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 2108f8bcb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 1 18:57:30 2019 +0000 Eliminated the warning message "Warning: #3719 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous." tables.my.sql | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit a02c0affb Merge: 42e5100ca 228078ed3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 27 18:59:21 2019 +0000 Merge with default commit 228078ed3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 27 18:58:58 2019 +0000 Fixed problem causing spurious errors being triggered if no rooms are selected on the form when an Ajax conflict check is carried out. (Even though the rooms field is a required field, it is perfectly possible to deselect all rooms using Ctrl-click before the form is submitted). web/edit_entry_handler.php | 40 +++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 16 deletions(-) commit 42e5100ca Merge: d3b7f7f59 622b9a6ac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 26 18:03:53 2019 +0000 Merge with default commit 622b9a6ac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 26 18:03:21 2019 +0000 Fixed bug that caused you not to return to the correct calendar view (unless it happened to be the default view) after making a booking if you clicked on an empty cell before having logged in. web/edit_entry_handler.php | 4 ++-- web/functions_table.inc | 22 ++++++++++++---------- web/index.php | 6 +++--- 3 files changed, 17 insertions(+), 15 deletions(-) commit d3b7f7f59 Merge: c26e1f2a8 a55a12779 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 22 15:44:56 2019 +0000 Merge with default commit a55a12779 Merge: 14b7170e6 bcf85b866 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 22 15:44:35 2019 +0000 Merge with mrbs_17_branch commit bcf85b866 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 22 15:43:57 2019 +0000 Fixed minimum version requirements. See SF Support Requests #1671. README | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) commit c26e1f2a8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 20 16:59:29 2019 +0000 Implemented getUser() method for AuthLdap web/lib/MRBS/Auth/Auth.php | 8 ++++++-- web/lib/MRBS/Auth/AuthLdap.php | 28 ++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 10 deletions(-) commit dfa83eba5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 20 15:10:55 2019 +0000 Commit of work so far web/lib/MRBS/Auth/AuthLdap.php | 64 ++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) commit f342a3f60 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 17 20:16:48 2019 +0000 Added in LDAP errror codes web/lib/MRBS/Auth/AuthLdap.php | 80 +++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 2 deletions(-) commit e01a68046 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 17 18:50:26 2019 +0000 Added email to AuthLdap->getUser() web/lib/MRBS/Auth/Auth.php | 35 +++++++++++++++++ web/lib/MRBS/Auth/AuthLdap.php | 66 +++++++++++++++++++++++++++++++- 2 files changed, 100 insertions(+), 1 deletion(-) commit aa7ea14ae Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 17 18:15:49 2019 +0000 Changed method name web/lib/MRBS/Auth/AuthLdap.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) commit c155eb92c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 17 18:11:17 2019 +0000 Restructured web/lib/MRBS/Auth/AuthLdap.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) commit d4d49c30f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 17 17:59:33 2019 +0000 Changed method name web/lib/MRBS/Auth/AuthLdap.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) commit 057117d16 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 17 17:53:21 2019 +0000 Started on getUser() method for authLdap web/lib/MRBS/Auth/AuthLdap.php (new) | 359 +++++++++++++++++++++++++ 1 file changed, 359 insertions(+) commit aa392ad9b Merge: ed3a98f28 14b7170e6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 15 16:25:08 2019 +0000 Merge with default commit 14b7170e6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 15 16:24:47 2019 +0000 Fixed formatting after merge web/edit_users.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) commit ed3a98f28 Merge: 667288da9 b43178877 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 12 21:03:02 2019 +0000 Merge with default commit b43178877 Merge: 623ab79a3 737fa4b74 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 12 21:02:44 2019 +0000 Merge with mrbs_17_branch commit 737fa4b74 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 12 21:00:10 2019 +0000 Fixed bug introduced in recent changes causing admins to be downgraded to users when they edit their details web/edit_users.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 667288da9 Merge: eabf59e18 623ab79a3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 12 20:29:54 2019 +0000 Merge with default commit 623ab79a3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 12 20:29:30 2019 +0000 Fixed bug preventing ordinary users from editing their own details web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit eabf59e18 Merge: e329434b3 e82557b38 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 12 17:59:31 2019 +0000 Merge with default commit e82557b38 Merge: 56e70bb25 d2f80490d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 12 17:56:50 2019 +0000 Merge with mrbs_17_branch commit d2f80490d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 12 17:55:25 2019 +0000 Fixed problem with custom checkboxes - see SF Bugs 429 web/edit_room_handler.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) commit 392bb3840 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 12 17:47:25 2019 +0000 Fixed problem with custom checkboxes - see SF Bugs 429 web/edit_users.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) commit e329434b3 Merge: 2a4a4be87 56e70bb25 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 12 16:16:34 2019 +0000 Merge with default commit 56e70bb25 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 12 16:16:06 2019 +0000 Optionally suppressed LDAP "invalid credentials" errors. See SF Bugs #426. web/auth/auth_ldap.inc | 105 +++++++++++++++++++++++++++++++++-- web/systemdefaults.inc.php | 6 ++ 2 files changed, 107 insertions(+), 4 deletions(-) commit 2a4a4be87 Merge: 58239fc97 55ddc03df Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 12 13:58:58 2019 +0000 Merge with default commit 55ddc03df Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 12 13:58:19 2019 +0000 Fixed bug preventing resizing of bookings web/edit_entry_handler.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 58239fc97 Merge: f4b40c1b4 326880ebe Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 12 11:30:45 2019 +0000 Merge with default commit 326880ebe Merge: 7573f748b 9969e30e4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 12 11:30:18 2019 +0000 Merge with mrbs_17_branch commit 9969e30e4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 12 11:29:49 2019 +0000 Fixed undefined index notice introduced in last change web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f4b40c1b4 Merge: fe0de4ee4 7573f748b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 12 11:18:23 2019 +0000 Merge with default commit 7573f748b Merge: 471857b07 1b395b46b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 12 11:17:48 2019 +0000 Merge with mrbs_17_branch commit 1b395b46b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 12 11:11:40 2019 +0000 Fixed bug causing checkbox custom fields not to be saved. See SF Bugs #429. web/edit_entry.php | 4 ++++ web/edit_entry_handler.php | 27 ++++++++++++++++++--------- web/lib/MRBS/Form/Field.php | 9 +++++++++ 3 files changed, 31 insertions(+), 9 deletions(-) commit 471857b07 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 11 15:13:20 2019 +0000 Fixed problem with last commit web/auth/auth_ldap.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit feb7a8c9b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 11 15:03:44 2019 +0000 Fixed undefined index notice when $ldap_filter is not set. web/auth/auth_ldap.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 56e1f4416 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 10 18:18:51 2019 +0000 Improved formatting of error output web/functions_error.inc | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) commit 5becb24dc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 10 18:13:05 2019 +0000 Removed error control operators. See SG Bugs #425 web/auth/auth_ldap.inc | 66 +++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 35 deletions(-) commit a27208b19 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 10 17:15:28 2019 +0000 Added missing global declaration web/auth/auth_ldap.inc | 2 ++ 1 file changed, 2 insertions(+) commit fe0de4ee4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 8 21:53:59 2019 +0000 Implemented getCurrentUser() for SessionJoomla web/lib/MRBS/Auth/AuthJoomla.php | 45 ++++++++++++++++++++++-- web/lib/MRBS/Session/SessionJoomla.php | 6 ++++ 2 files changed, 48 insertions(+), 3 deletions(-) commit 35bde0299 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 7 17:58:38 2019 +0000 Implemented getCurrentUser() for SessionWordpress web/lib/MRBS/Auth/AuthWordpress.php | 68 +++++++++++++++++++++ web/lib/MRBS/Session/SessionWordpress.php | 13 ++++ 2 files changed, 81 insertions(+) commit 6e1d5b6f7 Merge: d086237c2 4fdead844 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 7 16:35:09 2019 +0000 Merge with default commit 4fdead844 Merge: da7bca1da 72820e18c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 7 16:34:45 2019 +0000 Merge with mrbs_17_branch commit 72820e18c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 7 16:30:17 2019 +0000 Fixed bug when a field is disabled in the edit_entry form. See SF Support Requests #1664. web/edit_entry.php | 1 + web/edit_entry_handler.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) commit d086237c2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 6 18:29:34 2019 +0000 Added comment web/lib/MRBS/User.php | 3 +++ 1 file changed, 3 insertions(+) commit a74e482dc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 6 18:23:15 2019 +0000 Restructured code web/lib/MRBS/Session/SessionCookie.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) commit d68ab936e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 6 18:19:32 2019 +0000 Implemented getCurrentUser() for SessionCookie web/lib/MRBS/Session/SessionCookie.php | 44 ++++++++++++++++++++++-- web/lib/MRBS/User.php | 11 +++++- 2 files changed, 51 insertions(+), 4 deletions(-) commit ee9220c28 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 6 17:27:49 2019 +0000 Started switching to using getCurrentUser() web/Themes/default/header.inc | 17 ++++----- web/lib/MRBS/Auth/Auth.php | 46 +++++++++--------------- web/lib/MRBS/Auth/AuthConfig.php (new) | 10 ++++++ web/lib/MRBS/Auth/AuthDb.php | 1 + web/lib/MRBS/User.php | 43 ++++++++++++++++++++++ 5 files changed, 80 insertions(+), 37 deletions(-) commit f346c9d0f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 6 13:58:30 2019 +0000 Added AuthConfig class web/lib/MRBS/Auth/Auth.php | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) commit 692c20580 Merge: 80607a930 da7bca1da Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 6 11:31:24 2019 +0000 Merge with default commit da7bca1da Merge: 20887356d e498f5c42 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 6 11:30:58 2019 +0000 Merge with mrbs_17_branch commit e498f5c42 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 6 11:30:23 2019 +0000 Made the upgrade message look less like an error message. See SF Support Requests #1661. web/lang/lang.en | 2 +- web/lang/lang.sr-rs-latin | 2 +- web/upgrade.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 80607a930 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 5 18:53:22 2019 +0000 Fixed comment web/lib/MRBS/Auth/AuthFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f36ffca6b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 5 18:08:41 2019 +0000 Added getUser() method for WordPress web/lib/MRBS/Auth/Auth.php | 10 +++++++- web/lib/MRBS/Auth/AuthWordpress.php (new) | 28 +++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) commit ff986cb47 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 5 17:26:09 2019 +0000 Used display_name instead of username for Modified By field web/functions_view.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9d7a6a04e Merge: 45446f1df 20887356d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 5 17:21:25 2019 +0000 Merge with default commit 20887356d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 5 17:20:59 2019 +0000 Fixed problem when a Joomla user doesn't exist web/lib/MRBS/JFactory.php | 5 +++++ 1 file changed, 5 insertions(+) commit 45446f1df Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 5 17:14:10 2019 +0000 Started on Auth class web/functions.inc | 7 ++++ web/functions_view.inc | 10 ++++-- web/lib/MRBS/Auth/Auth.php (new) | 7 ++++ web/lib/MRBS/Auth/AuthDb.php (new) | 43 +++++++++++++++++++++++ web/lib/MRBS/Auth/AuthFactory.php (new) | 17 +++++++++ web/lib/MRBS/Auth/AuthJoomla.php (new) | 29 +++++++++++++++ web/lib/MRBS/JFactory.php | 5 +++ web/lib/MRBS/Session/SessionPhp.php | 10 ++++++ web/lib/MRBS/User.php (new) | 16 +++++++++ web/mrbs_auth.inc | 19 +++++++++- 10 files changed, 159 insertions(+), 4 deletions(-) commit 822f1c697 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 4 15:43:52 2019 +0000 Simplified code web/lib/MRBS/Session/SessionWithLogin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit a9156ab5c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 4 15:39:38 2019 +0000 Simplified code web/lib/MRBS/Session/SessionCas.php | 2 +- web/lib/MRBS/Session/SessionInterface.php | 2 -- web/lib/MRBS/Session/SessionWithoutLogin.php | 5 ----- web/mrbs_auth.inc | 7 ++++++- 4 files changed, 7 insertions(+), 9 deletions(-) commit bdb7ba6ab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 4 15:29:21 2019 +0000 Simplified code web/Themes/default/header.inc | 18 ++++++++++++------ web/lib/MRBS/Session/SessionInterface.php | 9 +-------- web/lib/MRBS/Session/SessionWithLogin.php | 4 ++++ web/lib/MRBS/Session/SessionWithoutLogin.php | 11 ----------- 4 files changed, 17 insertions(+), 25 deletions(-) commit fc5effbce Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 4 09:53:05 2019 +0000 Simplified code web/lib/MRBS/Session/SessionWithLogin.php | 20 +++++++++++--------- web/lib/MRBS/Session/SessionWordpress.php | 5 ++--- 2 files changed, 13 insertions(+), 12 deletions(-) commit c5a983517 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 3 18:27:24 2019 +0000 Fixed bug in session schemes without a login web/mrbs_auth.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 263cf3cba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 3 16:48:45 2019 +0000 Tidied up code web/lib/MRBS/Session/SessionWithLogin.php | 48 ++++++++++----------- 1 file changed, 24 insertions(+), 24 deletions(-) commit f66bae6a5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 3 16:40:41 2019 +0000 session directory now completely replaced by Session classes web/mrbs_auth.inc | 4 -- web/session/functions_session.inc (gone) | 84 ---------------------- 2 files changed, 88 deletions(-) commit 3bf5cad6d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 3 16:34:20 2019 +0000 Completed SessionPhp web/lib/MRBS/Session/SessionPhp.php | 29 ++++++++++++++++ web/session/session_php.inc (gone) | 49 --------------------------- 2 files changed, 29 insertions(+), 49 deletions(-) commit f7927c9b5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 3 16:04:57 2019 +0000 Completed SessionSaml web/auth/auth_saml.inc | 7 ++-- web/lib/MRBS/Session/SessionSaml.php | 34 ++++++++++++++++++- web/session/session_saml.inc (gone) | 47 -------------------------- 3 files changed, 36 insertions(+), 52 deletions(-) commit 465217eba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 3 15:23:17 2019 +0000 Removed redundant file web/session/session_cas.inc (gone) | 6 ------ 1 file changed, 6 deletions(-) commit 3de09636e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 3 15:21:55 2019 +0000 Implemented logon in SessionCas web/lib/MRBS/Session/SessionCas.php | 34 +++++++++++++++++++++++ web/session/session_cas.inc | 39 --------------------------- 2 files changed, 34 insertions(+), 39 deletions(-) commit 91139434c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 3 14:46:46 2019 +0000 Changed some methods from public to protected web/lib/MRBS/Session/SessionCookie.php | 4 ++-- web/lib/MRBS/Session/SessionJoomla.php | 4 ++-- web/lib/MRBS/Session/SessionPhp.php | 4 ++-- web/lib/MRBS/Session/SessionWithLogin.php | 7 ++++++- web/lib/MRBS/Session/SessionWordpress.php | 4 ++-- 5 files changed, 14 insertions(+), 9 deletions(-) commit 620a20bde Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 3 14:35:47 2019 +0000 Implemented logon in SessionWordpress web/lib/MRBS/Session/SessionWithLogin.php | 24 ++++-- web/lib/MRBS/Session/SessionWordpress.php | 39 ++++++++++ web/session/session_wordpress.inc (gone) | 82 --------------------- 3 files changed, 56 insertions(+), 89 deletions(-) commit 5f29fc7aa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 3 13:48:54 2019 +0000 Removed redundant file web/mrbs_auth.inc | 6 +++++- web/session/session_joomla.inc (gone) | 12 ------------ 2 files changed, 5 insertions(+), 13 deletions(-) commit 7dcabc16e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 3 13:43:07 2019 +0000 Implemented logon in SessionJoomla web/auth/auth_joomla.inc | 20 +++++++ web/lib/MRBS/Session/SessionJoomla.php | 14 +++++ web/session/session_joomla.inc | 69 ------------------------ 3 files changed, 34 insertions(+), 69 deletions(-) commit 56d2784ba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 3 11:23:59 2019 +0000 Removed redundant file web/session/session_cookie.inc (gone) | 25 ------------------------- 1 file changed, 25 deletions(-) commit 57e3aa71f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 3 11:23:24 2019 +0000 Moved remaining code out of session_cookie.inc web/lib/MRBS/Session/SessionCookie.php | 24 +++++++++++++++++++++--- web/session/session_cookie.inc | 6 ------ 2 files changed, 21 insertions(+), 9 deletions(-) commit 0d309ffdf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 3 11:09:12 2019 +0000 Fixed bug in setting CSRF token cookie web/lib/MRBS/Form/Form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d19c96820 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 3 10:49:11 2019 +0000 Restructured web/lib/MRBS/Form/Form.php | 2 +- web/lib/MRBS/Session/SessionCookie.php | 37 ++++++++++-------------- 2 files changed, 17 insertions(+), 22 deletions(-) commit 7de50ed7f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 3 09:52:27 2019 +0000 Moved cookie functions into SessionCookie class web/functions.inc | 101 -------------------- web/lib/MRBS/Form/Form.php | 17 ++-- web/lib/MRBS/Session/SessionCookie.php | 116 +++++++++++++++++++++-- 3 files changed, 117 insertions(+), 117 deletions(-) commit 39d5c02cf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 3 09:39:06 2019 +0000 Moved code for getting and setting cookies into functions web/functions.inc | 101 ++++++++++++++++++++++ web/lib/MRBS/Form/Form.php | 84 +++--------------- web/lib/MRBS/Session/SessionCookie.php | 104 +++-------------------- 3 files changed, 126 insertions(+), 163 deletions(-) commit d02e5fa68 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 2 17:15:19 2019 +0000 Implemented logon for SessionCookie class web/lib/MRBS/Session/SessionCookie.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a1a905931 Merge: 0082b4edb b92538a75 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 2 17:07:12 2019 +0000 Merge with default commit b92538a75 Merge: b823a3ea2 e2b6a292c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 2 17:06:48 2019 +0000 Merge with mrbs_17_branch commit e2b6a292c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 2 17:05:47 2019 +0000 Fixed 'headers already sent' problem when using the 'cookie' session scheme. web/Themes/default/header.inc | 4 ++++ 1 file changed, 4 insertions(+) commit 0082b4edb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 2 16:43:20 2019 +0000 Interim commit web/lib/MRBS/Session/SessionCookie.php | 53 ++++++++++ web/lib/MRBS/Session/SessionPhp.php | 18 ++++ web/lib/MRBS/Session/SessionWithLogin.php | 13 +-- web/session/session_cookie.inc | 109 +------------------- 4 files changed, 76 insertions(+), 117 deletions(-) commit f55345e8d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 2 15:52:45 2019 +0000 Made methods non-static web/lib/MRBS/Session/SessionCas.php | 6 +-- web/lib/MRBS/Session/SessionCookie.php | 2 +- web/lib/MRBS/Session/SessionHost.php | 2 +- web/lib/MRBS/Session/SessionHttp.php | 6 +-- web/lib/MRBS/Session/SessionInterface.php | 8 ++-- web/lib/MRBS/Session/SessionIp.php | 2 +- web/lib/MRBS/Session/SessionJoomla.php | 2 +- web/lib/MRBS/Session/SessionNt.php | 2 +- web/lib/MRBS/Session/SessionOmni.php | 2 +- web/lib/MRBS/Session/SessionPhp.php | 2 +- web/lib/MRBS/Session/SessionRemoteUser.php | 8 ++-- web/lib/MRBS/Session/SessionSaml.php | 22 +++++----- web/lib/MRBS/Session/SessionWithLogin.php | 40 +++++++++--------- web/lib/MRBS/Session/SessionWithoutLogin.php | 10 ++--- web/lib/MRBS/Session/SessionWordpress.php | 2 +- 15 files changed, 56 insertions(+), 60 deletions(-) commit bfe005370 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 2 15:32:26 2019 +0000 Moved login code to class for 'php' session scheme web/lib/MRBS/Session/SessionPhp.php | 12 +++- web/lib/MRBS/Session/SessionWithLogin.php | 62 +++++++++++++++++++++ web/mrbs_auth.inc | 2 + web/session/session_php.inc | 60 -------------------- 4 files changed, 74 insertions(+), 62 deletions(-) commit fd94ee735 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 2 14:51:43 2019 +0000 Removed redundant code web/session/functions_session.inc | 52 ----------------------------- 1 file changed, 52 deletions(-) commit 143e429f5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 2 14:47:09 2019 +0000 Split the Session class into two: SessionWithLogin and SessionWithoutLogin web/lib/MRBS/Session/SessionCas.php | 2 +- web/lib/MRBS/Session/SessionCookie.php | 2 +- web/lib/MRBS/Session/SessionHost.php | 20 ++---------- web/lib/MRBS/Session/SessionHttp.php | 2 +- web/lib/MRBS/Session/SessionIp.php | 19 ++--------- web/lib/MRBS/Session/SessionJoomla.php | 2 +- web/lib/MRBS/Session/SessionNt.php | 17 +--------- web/lib/MRBS/Session/SessionOmni.php | 17 +--------- web/lib/MRBS/Session/SessionPhp.php | 2 +- web/lib/MRBS/Session/SessionRemoteUser.php | 2 +- web/lib/MRBS/Session/SessionSaml.php | 2 +- .../{Session.php => SessionWithLogin.php} | 3 +- .../Session/SessionWithoutLogin.php (new) | 30 ++++++++++++++++++ web/lib/MRBS/Session/SessionWordpress.php | 2 +- 14 files changed, 46 insertions(+), 76 deletions(-) commit 14f8c284e Merge: f4ff2e74f b823a3ea2 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jan 1 19:49:58 2019 +0000 Merge changes from default commit f4ff2e74f Merge: 6154cd6d3 4c625ac11 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jan 1 19:49:39 2019 +0000 Merge changes from default commit b823a3ea2 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jan 1 19:47:46 2019 +0000 Removed some old unsafe/fragile authentication methods AUTHENTICATION | 205 ++---------------------------------- README.nwauth (gone) | 45 -------- auth_ldap.pl (gone) | 13 --- auth_ldapsearch.pl (gone) | 31 ------ smb_auth.c (gone) | 34 ------ 5 files changed, 9 insertions(+), 319 deletions(-) commit 4c625ac11 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jan 1 19:37:48 2019 +0000 Updated example crypted password file to use better hash algorithm crypt_passwd.example | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit cd2278411 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jan 1 19:21:39 2019 +0000 Removed execute permission from config.inc.php-sample web/config.inc.php-sample (mode -x) | 0 1 file changed, 0 insertions(+), 0 deletions(-) commit 6154cd6d3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 1 17:36:34 2019 +0000 Removed redundant files web/lib/MRBS/Session/SessionHttp.php | 3 +++ web/lib/MRBS/Session/SessionRemoteUser.php | 18 ++++++++++++++ web/session/session_http.inc (gone) | 19 -------------- web/session/session_remote_user.inc (gone) | 26 -------------------- 4 files changed, 21 insertions(+), 45 deletions(-) commit 3af257456 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 1 17:23:13 2019 +0000 Implemented print_logon_box() for remaining session schemes. web/lib/MRBS/Session/SessionIp.php | 12 +++ web/lib/MRBS/Session/SessionJoomla.php | 2 + web/lib/MRBS/Session/SessionNt.php | 12 +++ web/lib/MRBS/Session/SessionOmni.php | 14 +++- web/lib/MRBS/Session/SessionRemoteUser.php | 36 +++++++++ web/lib/MRBS/Session/SessionSaml.php | 46 +++++++++++- web/session/session_joomla.inc | 19 ----- web/session/session_remote_user.inc | 35 --------- web/session/session_saml.inc | 78 -------------------- web/session/session_wordpress.inc | 18 ----- web/systemdefaults.inc.php | 16 ++++ 11 files changed, 134 insertions(+), 154 deletions(-) commit f9190dad5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 1 14:57:23 2019 +0000 Switched to calling session() methods with -> instead of :: to avoid the "Parse error: syntax error, unexpected '::' (T_PAAMAYIM_NEKUDOTAYIM)" error in earlier versions of PHP. web/Themes/default/header.inc | 8 ++++---- web/approve_entry_handler.php | 2 +- web/auth/auth_saml.inc | 6 +++--- web/edit_entry.php | 2 +- web/edit_entry_handler.php | 2 +- web/edit_users.php | 4 ++-- web/functions_mail.inc | 4 ++-- web/import.php | 2 +- web/mrbs_auth.inc | 14 +++++++------- web/pending.php | 2 +- web/report.php | 2 +- web/search.php | 2 +- web/session/session_joomla.inc | 2 +- web/session/session_remote_user.inc | 2 +- web/session/session_saml.inc | 2 +- web/session/session_wordpress.inc | 2 +- web/view_entry.php | 2 +- 17 files changed, 30 insertions(+), 30 deletions(-) commit 4b2d66f97 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 1 14:38:42 2019 +0000 Implemented logon buttons for 'cas', 'host' and 'http' session schemes web/Themes/default/header.inc | 41 ++++++++++++++++++++++++++ web/lib/MRBS/Session/SessionCas.php | 14 +++++++++ web/lib/MRBS/Session/SessionHost.php | 12 ++++++++ web/lib/MRBS/Session/SessionHttp.php | 6 ++-- web/session/functions_session.inc | 41 -------------------------- web/session/session_cas.inc | 17 ----------- web/session/session_cookie.inc | 19 ------------ web/session/session_http.inc | 16 +--------- web/session/session_php.inc | 18 ----------- 9 files changed, 72 insertions(+), 112 deletions(-) commit ea9d42f6b Merge: afe58b974 e6480d3da Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 1 10:15:20 2019 +0000 Merge with default commit e6480d3da Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 1 10:14:09 2019 +0000 Hid the form until all the elements are in place to avoid screen jiggling web/edit_entry.php | 2 +- web/js/edit_entry.js.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) commit afe58b974 Merge: d29bee304 31cec94c9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 1 10:04:47 2019 +0000 Merge with default commit 31cec94c9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 1 10:00:46 2019 +0000 Restructured code web/js/edit_entry.js.php | 21 ++------------------- web/js/functions.js.php | 29 +++++++++++++++++++++++++++++ web/js/index.js.php | 15 +-------------- 3 files changed, 32 insertions(+), 33 deletions(-) commit f3f1f62ca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 1 09:21:01 2019 +0000 Fixed problem with Select2 element width web/js/edit_entry.js.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) commit 9bd037d82 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 1 09:12:53 2019 +0000 Turned the create_by select into a Select2 control. See SF Support Requests #1659. web/js/edit_entry.js.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit d29bee304 Merge: 0dc8fdc6c a4ce2e957 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 31 16:29:05 2018 +0000 Merge with default commit a4ce2e957 Merge: eeada8e94 895911fd9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 31 16:28:27 2018 +0000 Merge with mrbs_17_branch commit 895911fd9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 31 16:27:28 2018 +0000 Updated to latest phpCAS client to fix problem with '"continue" targeting switch is equivalent to "break". Did you mean to use "continue 2"?' warning messages in PHP 7.3.0. web/lib/CAS.php | 27 +++++++++++++++++++++++---- web/lib/CAS/Client.php | 37 +++++++++++++++---------------------- 2 files changed, 38 insertions(+), 26 deletions(-) commit eeada8e94 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 31 16:19:56 2018 +0000 Updated to latest phpCAS client to fix problem with '"continue" targeting switch is equivalent to "break". Did you mean to use "continue 2"?' warning messages in PHP 7.3.0. web/lib/CAS.php | 27 +++++++++++++++++++++++---- web/lib/CAS/Client.php | 37 +++++++++++++++---------------------- 2 files changed, 38 insertions(+), 26 deletions(-) commit 6d28b9f22 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 31 16:18:08 2018 +0000 Fixed problem with calls to unknown functions web/session/session_cas.inc | 3 --- 1 file changed, 3 deletions(-) commit 0dc8fdc6c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 31 15:54:13 2018 +0000 Implemented a print_logon_box() replacement for the 'php' session scheme web/Themes/default/header.inc | 59 +++++++++++++++++---- web/lib/MRBS/Session/Session.php | 24 +++++++++ web/lib/MRBS/Session/SessionHttp.php | 5 ++ web/lib/MRBS/Session/SessionInterface.php | 8 +++ 4 files changed, 85 insertions(+), 11 deletions(-) commit 00af545a5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 31 12:02:00 2018 +0000 Removed redundant files web/session/session_host.inc (gone) | 6 ------ web/session/session_ip.inc (gone) | 7 ------- web/session/session_nt.inc (gone) | 8 -------- web/session/session_omni.inc (gone) | 6 ------ 4 files changed, 27 deletions(-) commit 2cf9732ed Merge: 22e535d27 6e4268d67 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 31 11:11:46 2018 +0000 Merge with default commit 22e535d27 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 31 11:10:48 2018 +0000 First implementation of Session class with getUsername() and authGet() methods. web/Themes/default/header.inc | 4 +- web/approve_entry_handler.php | 2 +- web/auth/auth_saml.inc | 6 +- web/edit_entry.php | 19 ++- web/edit_entry_handler.php | 2 +- web/edit_users.php | 4 +- web/functions_mail.inc | 4 +- web/import.php | 2 +- web/js/index.js.php | 3 +- web/lib/MRBS/Session/Session.php (new) | 111 +++++++++++++++++ web/lib/MRBS/Session/SessionCas.php (new) | 20 +++ web/lib/MRBS/Session/SessionCookie.php (new) | 81 ++++++++++++ .../MRBS/Session/SessionFactory.php (new) | 17 +++ web/lib/MRBS/Session/SessionHost.php (new) | 40 ++++++ web/lib/MRBS/Session/SessionHttp.php (new) | 57 +++++++++ .../MRBS/Session/SessionInterface.php (new) | 11 ++ web/lib/MRBS/Session/SessionIp.php (new) | 35 ++++++ web/lib/MRBS/Session/SessionJoomla.php (new) | 14 +++ web/lib/MRBS/Session/SessionNt.php (new) | 36 ++++++ web/lib/MRBS/Session/SessionOmni.php (new) | 53 ++++++++ web/lib/MRBS/Session/SessionPhp.php (new) | 16 +++ .../MRBS/Session/SessionRemoteUser.php (new) | 26 ++++ web/lib/MRBS/Session/SessionSaml.php (new) | 67 ++++++++++ .../MRBS/Session/SessionWordpress.php (new) | 20 +++ web/mrbs_auth.inc | 44 +++++-- web/pending.php | 2 +- web/report.php | 2 +- web/search.php | 2 +- web/session/session_cas.inc | 14 +-- web/session/session_cookie.inc | 94 +------------- web/session/session_host.inc | 28 ----- web/session/session_http.inc | 55 +------- web/session/session_ip.inc | 26 +--- web/session/session_joomla.inc | 23 +--- web/session/session_nt.inc | 32 +---- web/session/session_omni.inc | 47 +------ web/session/session_php.inc | 31 +---- web/session/session_remote_user.inc | 27 +--- web/session/session_saml.inc | 38 +----- web/session/session_wordpress.inc | 32 +---- web/view_entry.php | 2 +- 41 files changed, 683 insertions(+), 466 deletions(-) commit 6e4268d67 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Dec 30 09:05:47 2018 +0000 Updated version number to 1.8.0 web/version_num.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4e4c1e467 Merge: 9a04b091e 1995db2a1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 30 08:37:40 2018 +0000 Merge with mrbs_17_branch commit 1995db2a1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 30 08:31:54 2018 +0000 Back-ported the fix for upgrading to schema 56 to the mrbs_17_branch. See SF Support Requests #1658. web/dbsys.inc | 43 +++++++++++++++++++++++++++++++++++++++++++ web/init.inc | 22 ++++++++++++++-------- web/upgrade.inc | 19 ++----------------- 3 files changed, 59 insertions(+), 25 deletions(-) commit 9a04b091e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 30 08:03:24 2018 +0000 Fixed problem with merge web/edit_entry.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit d36ab5055 Merge: fb5a4dd0a a56cd4110 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 30 07:49:56 2018 +0000 Merged recent changes from mrbs_17_branch back into default commit a56cd4110 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 30 07:46:02 2018 +0000 Added a maxlength attribute to custom textareas web/edit_entry.php | 5 +++++ 1 file changed, 5 insertions(+) commit 6c25e3eb0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 30 07:28:41 2018 +0000 Fixed HTML5 validation error web/edit_entry.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) commit fb5a4dd0a Merge: 7494b654d 398a8e531 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Dec 29 22:14:55 2018 +0000 Merged fix from mrbs_17_branch commit 398a8e531 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Dec 29 22:07:40 2018 +0000 Fix for problem editing long custom fields described in [support-requests:#1658] web/edit_entry.php | 4 ++++ 1 file changed, 4 insertions(+) commit 7494b654d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 29 08:46:15 2018 +0000 Fixed bug causing the navigation buttons to get stuck on "Loading..." when running on a metered connection or when prefetch is disabled. web/js/index.js.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 5c5d028be Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 28 13:49:12 2018 +0000 Opened a new branch to convert the session and auth code into classes and then to go on to use display names rather than usernames in MRBS output. commit 14dd0dda2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 27 17:56:47 2018 +0000 Changed so that error messages relating to DB sessions are only output if the current DB schema version as recorded in the database is >= 56, ie the upgrade when the sessions table was created. See SF Support Requests #1658. web/dbsys.inc | 43 +++++++++++++++++++++++++++++++++++++++++++ web/init.inc | 22 ++++++++++++++-------- web/upgrade.inc | 19 ++----------------- 3 files changed, 59 insertions(+), 25 deletions(-) commit 810b22896 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 27 09:43:30 2018 +0000 Switched to using page_date in the query string for consistency web/Themes/default/header.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit 3d44e22e4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 27 09:36:44 2018 +0000 Used page_date in query string parameters so that the pre-fetched pages can be used when possible when navigating via the mini-calendars. web/index.php | 30 ++++++++++++------------------ web/js/datepicker.js.php | 7 ++++++- 2 files changed, 18 insertions(+), 19 deletions(-) commit cf29253e3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 27 09:12:20 2018 +0000 Refreshed the pre-fetched pages once the page becomes visible again. web/js/refresh.js.php | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) commit 95df2f280 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 26 15:24:13 2018 +0000 Disabled refreshing of pre-fetched pages when the page is hidden web/js/index.js.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) commit 1c1849316 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 26 15:12:08 2018 +0000 Added refreshing of prefetched pages to stop them becoming out of date. web/js/index.js.php | 19 ++++++++++++++++++- web/systemdefaults.inc.php | 10 ++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) commit e8d45f3c6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 26 11:45:46 2018 +0000 Added loading... message before every update, including the pre-fetched ones. web/js/index.js.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 495d54417 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 26 11:34:07 2018 +0000 Disabled pre-fetching on metered connections in order to save bandwidth. web/js/index.js.php | 7 +++++++ 1 file changed, 7 insertions(+) commit 513653861 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 26 11:27:48 2018 +0000 Added pre-fetching of the Next and Previous pages in order to improve performance. web/js/index.js.php | 146 ++++++++++++++++++++++++++---------------- 1 file changed, 92 insertions(+), 54 deletions(-) commit f0809d554 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 26 08:11:51 2018 +0000 Fixed problem with DataTables CSS introduced during recent changes web/style.inc | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) commit 3233a2646 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 24 19:19:35 2018 +0000 Added a "Loading..." message web/css/mrbs.css.php | 11 ++++++++++- web/js/index.js.php | 6 ++++++ web/lang/lang.en | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) commit 5bae74e5b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 24 17:05:28 2018 +0000 Added a js class to the new body web/js/index.js.php | 5 +++++ 1 file changed, 5 insertions(+) commit 9413e2129 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 24 17:02:07 2018 +0000 Restructured and added comments web/js/datepicker.js.php | 3 +- web/js/general.js.php | 55 ------------------------------ web/js/index.js.php | 70 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 57 deletions(-) commit 0e0c6c3e9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 24 16:48:23 2018 +0000 Extended flicker elimanation to navigation via the mini-calendars web/js/datepicker.js.php | 3 ++- web/js/general.js.php | 55 ++++++++++++++++++++++++++++++++++++++ web/js/index.js.php | 40 --------------------------- 3 files changed, 57 insertions(+), 41 deletions(-) commit e046fe9be Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 24 16:26:14 2018 +0000 Restructured web/js/index.js.php | 79 ++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 39 deletions(-) commit 9eb997a0f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 24 16:21:22 2018 +0000 Eliminated flickering when moving between pages in the calendar views. web/js.inc | 2 +- web/js/admin.js.php | 2 +- web/js/datepicker.js.php | 2 +- web/js/edit_area.js.php | 2 +- web/js/edit_entry.js.php | 2 +- web/js/edit_users.js.php | 2 +- web/js/general.js.php | 12 +++++-- web/js/index.js.php | 42 +++++++++++++++++++++- web/js/init.js.php | 3 -- web/js/pending.js.php | 2 +- web/js/refresh.js.php | 2 +- web/js/report.js.php | 2 +- web/js/resizable.js.php | 2 +- web/js/search.js.php | 2 +- web/style.inc | 71 ++++++++++++++++++++------------------ 15 files changed, 100 insertions(+), 50 deletions(-) commit eca8c83b8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 23 17:07:05 2018 +0000 Corrected typo in comment web/js/datepicker.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 47d42913e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 22 16:56:11 2018 +0000 Improved error output web/functions_error.inc | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) commit d46b7acc3 Merge: bd318bccc e1fbccd99 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 20 09:53:53 2018 +0000 Merged nav_improvements branch back into the default branch commit e1fbccd99 (origin/nav_improvements) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 20 09:52:53 2018 +0000 Close nav_improvements branch commit 97f70a7ad Merge: f4159a1be bd318bccc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 20 09:50:20 2018 +0000 Merge with default commit bd318bccc Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Dec 19 19:41:14 2018 +0000 Added tag mrbs-1_7_2 for changeset 2e25f23ace07 commit 913c61298 (tag: mrbs-1_7_2) Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Dec 19 19:41:11 2018 +0000 Removed tag mrbs-1_7_2 commit db6306919 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Dec 19 19:40:32 2018 +0000 Updated ChangeLog and NEWS for 1.7.2 release, again ChangeLog | 36 +++++++++++++++++++++++++++++++++++- NEWS | 2 ++ 2 files changed, 37 insertions(+), 1 deletion(-) commit 1643408ea Merge: 9bdad2f5e 97bddafba Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Dec 19 19:39:02 2018 +0000 Merge with default commit 9bdad2f5e Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Dec 19 19:34:25 2018 +0000 Added tag mrbs-1_7_2 for changeset b02368b8844d commit a220c4aff Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Dec 19 19:33:58 2018 +0000 Updated ChangeLog and NEWS for 1.7.2 release ChangeLog | 1703 ++++++++++++++++++++++++++++++++++++++++++++++++++- NEWS | 134 ++++ 2 files changed, 1836 insertions(+), 1 deletion(-) commit 26e4196d5 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Dec 19 19:03:44 2018 +0000 Update version number to 1.7.2 web/version_num.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f4159a1be Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 19 15:49:49 2018 +0000 Fixed problem when the display_name is empty web/edit_entry.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit 9ed0bc11b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 19 11:50:17 2018 +0000 Added ordering of users for the 'joomla' auth type web/auth/auth_joomla.inc | 4 ++++ 1 file changed, 4 insertions(+) commit bdaadf911 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 19 11:45:37 2018 +0000 Added ordering of users for the 'config' auth type web/auth/auth_config.inc | 5 +++++ 1 file changed, 5 insertions(+) commit 2110c15e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 19 11:30:24 2018 +0000 Added ordering of users for WordPress versions before 4.4 web/auth/auth_wordpress.inc | 17 ++++++++++++--- web/auth/functions_auth.inc (new) | 32 +++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 3 deletions(-) commit 55f278037 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 19 10:29:38 2018 +0000 Added ordering of usernames web/auth/auth_wordpress.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 912c38b5f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 18 19:00:14 2018 +0000 Added support for Wordpress < 4.4 web/auth/auth_wordpress.inc | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) commit 15b4a95de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 18 18:08:23 2018 +0000 Limited the list of Wordpress users to MRBS users and admins web/auth/auth_wordpress.inc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) commit c5e0ed456 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 18 17:11:43 2018 +0000 Added an authGetUsernames() for the 'joomla' authentication scheme web/auth/auth_joomla.inc | 76 +++++++++++++++++++++++++++++++++++++ web/lib/MRBS/JFactory.php | 9 ++++- 2 files changed, 84 insertions(+), 1 deletion(-) commit 96ead5f7c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 17 18:20:42 2018 +0000 Added an authGetUsernames() for the 'wordpress' authentication scheme web/auth/auth_wordpress.inc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) commit 9305d827b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 17 18:01:17 2018 +0000 Fixed bug caused by conflict with the WordPress global variable $current_user. web/edit_entry.php | 8 ++++---- web/edit_entry_handler.php | 10 +++++----- web/edit_users.php | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) commit 7cf56d3cb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 17 17:42:31 2018 +0000 Added comment web/lib/MRBS/Form/Element.php | 2 ++ 1 file changed, 2 insertions(+) commit ae21f2c88 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 17 17:39:36 2018 +0000 Fixed problem with Wordpress login error messages being escaped, when they are trusted HTML web/lib/MRBS/Form/Element.php | 15 ++++++++++++--- web/session/functions_session.inc | 5 +++-- web/session/session_wordpress.inc | 5 +++-- 3 files changed, 18 insertions(+), 7 deletions(-) commit 8d54b988d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 17 16:45:07 2018 +0000 Changed function names for consistency web/auth/auth_config.inc | 2 +- web/auth/auth_db.inc | 4 ++-- web/edit_entry.php | 4 ++-- web/edit_users.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) commit e065ad687 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 17 16:37:53 2018 +0000 Added get_usernames() for 'config' authentication web/auth/auth_config.inc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) commit 031231823 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 17 16:30:37 2018 +0000 First attempt at allowing administrators to choose the user when making a booking. See SF Feature Requests #361. web/auth/auth_db.inc | 11 +++++ web/edit_entry.php | 78 +++++++++++++++++++++++++++++++----- web/edit_entry_handler.php | 16 +++++++- web/systemdefaults.inc.php | 6 ++- 4 files changed, 98 insertions(+), 13 deletions(-) commit e33d50ec4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 17 14:39:49 2018 +0000 Restructured, creating the function get_users() web/auth/auth_db.inc | 11 +++++++++++ web/edit_users.php | 30 ++++++++++++++---------------- 2 files changed, 25 insertions(+), 16 deletions(-) commit 960a08780 Merge: fbf3b7ee3 97bddafba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 8 14:24:20 2018 +0000 Merge with default commit 97bddafba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 8 14:23:55 2018 +0000 Corrected typo in message web/lib/PHPMailer/PHPMailerAutoload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit fbf3b7ee3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 8 14:23:04 2018 +0000 Corrected typo in message web/lib/PHPMailer/PHPMailerAutoload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 379863446 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 7 19:05:26 2018 +0000 Fixed bug introduced during recent changes web/edit_users.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit e1e7c6530 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 7 18:44:32 2018 +0000 Fixed problem with the first user not being added to the database web/edit_users.php | 490 ++++++++++++++++++++++--------------------- 1 file changed, 251 insertions(+), 239 deletions(-) commit b9d761582 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 7 17:55:59 2018 +0000 Removed the message about changing a password if a new user is being created. web/edit_users.php | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) commit 7a507d65b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 7 17:15:05 2018 +0000 Switched to setting $id to null instead of -1 if there is no user web/edit_users.php | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) commit 7e781603b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 7 17:01:24 2018 +0000 Switched to using all lowercase for form parameters and values. web/edit_users.php | 74 ++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 37 deletions(-) commit 5af1afb49 Merge: e6afa337c 20c6e38a5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 7 16:37:31 2018 +0000 Merge with default commit 20c6e38a5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 7 16:26:05 2018 +0000 Got rid of deprecated error in PHP 7.2 and above. This is only a temporary fix though as we should really upgrade to PHPMailer V6, but that requires PHP 5.5 or later. web/lib/PHPMailer/PHPMailerAutoload.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit 810e0356b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 7 16:18:16 2018 +0000 Upgraded PHPMailer to Version 5.2.27. (Note that the 5.2 branch is now deprecated and we should really upgrade to PHPMailer Version 6, but that requires PHP 5.5 or greater.) web/lib/PHPMailer/VERSION | 2 +- web/lib/PHPMailer/class.phpmailer.php | 33 +++++++++++++++++++------ web/lib/PHPMailer/class.pop3.php | 2 +- web/lib/PHPMailer/class.smtp.php | 4 +-- 4 files changed, 29 insertions(+), 12 deletions(-) commit e6afa337c Merge: b017ae57e 98e069726 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 5 09:48:26 2018 +0000 Merge with default commit 98e069726 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 5 09:46:52 2018 +0000 Added error suppression to the exec because we are not interested if the exec fails, eg with an "unable to fork" message. web/version.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit b017ae57e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 5 09:43:32 2018 +0000 Fixed problem with column widths after a booking resize web/js/resizable.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6906bd46c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 5 09:32:26 2018 +0000 Added error suppression to the exec because we are not interested if the exec fails, eg with an "unable to fork" message. web/version.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit aae34acc4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 5 09:19:32 2018 +0000 Fixed bug preventing cells being selected after the first refresh web/js/resizable.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit d4d6bd74b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 4 16:57:00 2018 +0000 Simplified the code by getting rid of the local versions of the $_SERVER variables, as $_SERVER can now be relied upon. web/edit_entry.php | 6 +++--- web/functions.inc | 19 +++++++++--------- web/grab_globals.inc.php | 30 ----------------------------- web/help.php | 2 +- web/language.inc | 2 +- web/lib/MRBS/Form/Form.php | 8 +++----- web/mrbs_auth.inc | 4 +--- web/pending.php | 8 ++++---- web/report.php | 2 +- web/session/session_cas.inc | 2 -- web/session/session_cookie.inc | 6 +++--- web/session/session_host.inc | 4 ++-- web/session/session_http.inc | 18 +++++++---------- web/session/session_ip.inc | 4 +--- web/session/session_joomla.inc | 2 +- web/session/session_omni.inc | 3 +-- web/session/session_wordpress.inc | 2 +- web/view_entry.php | 10 +++++----- 18 files changed, 45 insertions(+), 87 deletions(-) commit 7bd32156c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 3 18:51:49 2018 +0000 Fixed problem with a colon appearing between the Back and Save buttons on the edit_entry page when the language is French. web/css/mrbs.css.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) commit 90d0294fb Merge: 0bd221671 59d610f75 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 3 14:19:20 2018 +0000 Merge with default commit 59d610f75 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 3 14:18:09 2018 +0000 Set the session.gc_maxlifetime to the same time as $auth['session_php']['session_expire_time'] so that users aren't logged out by the garbage collector before the session cookie is due to expire. web/init.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit 0bd221671 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 3 08:34:06 2018 +0000 Fixed CSS Warning error web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0c8cec5c3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 3 08:30:01 2018 +0000 Fixed undefined variable notice when $_SERVER['HTTP_ACCEPT_LANGUAGE'] is equal to ''. web/language.inc | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) commit e35153fd7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 2 17:35:27 2018 +0000 Fixed bug introduced in recent change web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4f12b1a78 Merge: 533331821 97e51ae76 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 2 16:46:38 2018 +0000 Merge with default commit 97e51ae76 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 2 16:45:42 2018 +0000 Fixed typo. See SF Support Requests #1650. web/internalconfig.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 533331821 Merge: 4c5788b69 d24825443 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 1 18:44:54 2018 +0000 Merge with default commit d24825443 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 1 18:44:02 2018 +0000 Added a note about how to include files from the config file. See SF Support Requests #1649. web/config.inc.php-sample | 4 ++++ 1 file changed, 4 insertions(+) commit 4c5788b69 Merge: 631db5049 cc0cf01bb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 1 18:26:50 2018 +0000 Merge with default commit cc0cf01bb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 1 18:25:56 2018 +0000 Removed the now redundant alternative redirection by a manual link instead of a redirection to a relative URL. The alternative link was generating errors after logoff because the session had been destroyed and the new CSRF token couldn't be stored (with the PHP session scheme anyway, but removed from all schemes for consistency). web/session/session_cas.inc | 10 +--------- web/session/session_cookie.inc | 9 +-------- web/session/session_joomla.inc | 10 +--------- web/session/session_php.inc | 10 +--------- web/session/session_wordpress.inc | 10 +--------- 5 files changed, 5 insertions(+), 44 deletions(-) commit 631db5049 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 1 18:20:06 2018 +0000 Removed the now redundant alternative redirection by a manual link instead of a redirection to a relative URL. The alternative link was generating errors after logoff because the session had been destroyed and the new CSRF token couldn't be stored (with the PHP session scheme anyway, but removed from all schemes for consistency). web/session/session_cas.inc | 10 +--------- web/session/session_cookie.inc | 9 +-------- web/session/session_joomla.inc | 10 +--------- web/session/session_php.inc | 10 +--------- web/session/session_wordpress.inc | 10 +--------- 5 files changed, 5 insertions(+), 44 deletions(-) commit b5074107b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 1 16:56:35 2018 +0000 Added some parameter checking web/functions.inc | 3 +++ web/init.inc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) commit 44ed3de7b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 1 16:50:19 2018 +0000 Added assertion capability when debugging web/init.inc | 5 +++++ 1 file changed, 5 insertions(+) commit 8b2ba06ef Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 1 16:29:06 2018 +0000 Swapped parameter order for this_page() to suit the most common defaults web/Themes/default/header.inc | 2 +- web/functions.inc | 2 +- web/js.inc | 2 +- web/session/session_cas.inc | 2 +- web/session/session_cookie.inc | 4 ++-- web/session/session_http.inc | 2 +- web/session/session_joomla.inc | 4 ++-- web/session/session_php.inc | 4 ++-- web/session/session_saml.inc | 2 +- web/session/session_wordpress.inc | 4 ++-- web/style.inc | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) commit 438ee5576 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 1 16:03:11 2018 +0000 Fixed problem with MRBS using empty query strings after login web/functions.inc | 20 +++++++++++++------- web/session/session_cas.inc | 10 +--------- web/session/session_cookie.inc | 24 ++++-------------------- web/session/session_http.inc | 10 +--------- web/session/session_joomla.inc | 20 ++------------------ web/session/session_php.inc | 20 ++------------------ web/session/session_saml.inc | 9 +-------- web/session/session_wordpress.inc | 20 ++------------------ 8 files changed, 26 insertions(+), 107 deletions(-) commit cb8c0aed2 Merge: 57de46496 a7fb854e8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 29 17:39:26 2018 +0000 Merge with default commit a7fb854e8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 29 17:38:18 2018 +0000 Fixed SQL syntax error in session garbage collection code, which looks like it was probably the cause of the "Could not start DB sessions" error. web/lib/MRBS/SessionHandlerDb.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 57de46496 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 29 16:25:47 2018 +0000 Fixed undefined index problem web/edit_entry_handler.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 50855eb74 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 29 16:08:45 2018 +0000 Removed the now redundant, and discouraged, type="text/javascript" attribute web/Themes/default/header.inc | 2 +- web/js.inc | 56 ++++++++++++++++----------------- web/upgrade/26/post.inc | 2 +- web/upgrade/46/post.inc | 2 +- web/upgrade/48/post.inc | 2 +- web/upgrade/53/post.inc | 2 +- web/upgrade/54/post.inc | 2 +- 7 files changed, 34 insertions(+), 34 deletions(-) commit e4bc3782e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 29 15:45:53 2018 +0000 Fixed HTML5 validation error: Stray end tag div web/session/functions_session.inc | 5 ----- 1 file changed, 5 deletions(-) commit 9d7a197d3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 29 15:40:21 2018 +0000 Fixed formatting problem when login fails on the index page. web/session/functions_session.inc | 17 ++++++++++------- web/session/session_cookie.inc | 3 +-- web/session/session_joomla.inc | 3 +-- web/session/session_php.inc | 3 +-- web/session/session_wordpress.inc | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) commit 14a081471 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 29 13:54:11 2018 +0000 Fixed bug which resulted in error reporting being disabled web/init.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit b3605e684 Merge: ab6d75c12 00648357d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 29 13:52:13 2018 +0000 Merge with default commit 00648357d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 29 13:50:12 2018 +0000 Fixed bug which resulted in error reporting being disabled web/internalconfig.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit ab6d75c12 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 29 10:57:38 2018 +0000 Fixed merge web/session/session_saml.inc | 165 +++++++++++++++++++-------------- 1 file changed, 95 insertions(+), 70 deletions(-) commit dbfdb1a62 Merge: 8662016bd 37888a99e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 29 10:49:41 2018 +0000 Merge with default commit 37888a99e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 29 10:47:57 2018 +0000 Replaced tabs with spaces in some recent changes that had been made after my editor mysteriously reset itself to the default settings. At the same time replaced tabs with spaces eleswhere in the MRBS code (except for third party libraries). Also brought the formatting of the two SAML files in line with MRBS conventions. web/auth/auth_joomla.inc | 2 +- web/auth/auth_saml.inc | 78 +++++++++------ web/auth/auth_wordpress.inc | 2 +- web/init.inc | 2 +- web/session/session_saml.inc | 173 +++++++++++++++++++-------------- 5 files changed, 151 insertions(+), 106 deletions(-) commit 8662016bd Merge: 2b4405201 c4a5dbb78 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 28 18:28:19 2018 +0000 Merge with default commit c4a5dbb78 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 28 18:25:03 2018 +0000 Added some diagnostic information. I'm occasionally getting the message "Could not start DB sessions, trying ordinary PHP sessions", but am not sure why. web/init.inc | 1 + 1 file changed, 1 insertion(+) commit 5b7f072a6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 28 18:20:23 2018 +0000 Fixed typo in comment web/lib/MRBS/SessionHandlerDb.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2b4405201 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 27 12:20:51 2018 +0000 Removed the superfluous "no rights" message before the login form. It's obvious that you have no rights as you are being asked to login. This page should anyway appear less often than in previous versions of MRBS as menu items are now only displayed in the header if you have rights to use them. The one time you are likely to see this page is if you have no public access to MRBS and this change then solves a CSS display problem. (Admittedly the display formatting could be solved another way, but as the "no rights" message is not necessary this way is easier). web/session/session_cookie.inc | 8 ++++---- web/session/session_joomla.inc | 8 ++++---- web/session/session_php.inc | 10 +++++----- web/session/session_wordpress.inc | 10 +++++----- 4 files changed, 18 insertions(+), 18 deletions(-) commit e957740a4 Merge: dff48960c 041c24143 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 25 13:22:20 2018 +0000 Merge with default commit 041c24143 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 25 13:19:58 2018 +0000 Fixed bug which prevented the name column of the users table being sorted by DataTables. (Temporary fix as we really need to move to using data-sort). web/edit_users.php | 8 +++++--- web/jquery/datatables/js/plugins.js | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) commit dff48960c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 22 16:38:39 2018 +0000 Fixed problem with merge web/edit_users.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit f2ce63893 Merge: f971f0952 da63af90c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 22 16:28:25 2018 +0000 Merge with default commit da63af90c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 22 16:23:16 2018 +0000 Changed behaviour so that if you are not a user admin then you are only allowed to see the last_updated and last_login times for yourself. web/edit_users.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) commit f971f0952 Merge: e6c6dead6 1d7d28ffb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 21 18:05:17 2018 +0000 Merge with default commit 1d7d28ffb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 21 17:36:08 2018 +0000 Changed code so that no last updated timestamp is shown if it is 0. web/edit_users.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit e6c6dead6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 20 09:10:21 2018 +0000 Fixed bug that allowed non-admins to see private bookings in search results and prevented admins from seeing them. See also SF Support Requests #1640. web/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4b70ba3c1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 19 20:11:08 2018 +0000 Removed redundant code web/functions_table.inc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) commit 44c85ff14 Merge: 0cd66ccd7 c7f044b86 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 19 17:56:12 2018 +0000 Merge with default commit c7f044b86 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 19 17:55:06 2018 +0000 Fixed bug preventing DataTables from sorting the last login column web/edit_users.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) commit 0cd66ccd7 Merge: 2a1925d6a a09301f41 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Nov 17 18:46:16 2018 +0000 Merged default branch commit a09301f41 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Nov 17 18:45:34 2018 +0000 Correct bad merge of DB schema 59 upgrade web/upgrade/59/mysql.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 7fd1cfa20 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Nov 17 18:39:01 2018 +0000 Added missing DB upgrade files web/upgrade/59/mysql.sql (new) | 4 ++++ web/upgrade/59/pgsql.sql (new) | 4 ++++ 2 files changed, 8 insertions(+) commit a752a6873 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Nov 17 18:35:55 2018 +0000 Added 'last login' functionality to 'db' auth scheme tables.my.sql | 3 ++- tables.pg.sql | 5 +++-- web/auth/auth_db.inc | 7 +++++++ web/edit_users.php | 13 +++++++++++++ web/lang/lang.en | 1 + web/lib/MRBS/DB.php | 2 +- 6 files changed, 27 insertions(+), 4 deletions(-) commit 2a1925d6a Merge: 09ab0559d 22450abdc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 15 15:50:41 2018 +0000 Merge with default commit 22450abdc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 15 15:48:02 2018 +0000 Fixed bug that prevented users with emojis in their usernames from logging in when using MySQL. tables.my.sql | 4 ++-- tables.pg.sql | 2 +- web/lib/MRBS/DB.php | 2 +- web/upgrade/58/mysql.sql (new) | 4 ++++ web/upgrade/58/pgsql.sql (new) | 0 5 files changed, 8 insertions(+), 4 deletions(-) commit 09ab0559d Merge: dee5da858 3fd27d89b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 12 11:08:06 2018 +0000 Merge with default commit 3fd27d89b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 12 10:53:46 2018 +0000 Switched to using the REQUEST_URI instead of PHP_SELF in order to get the cookie path. See SF Support Requests #1634. web/functions.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 184c7f5bc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 12 10:33:05 2018 +0000 Removed redundant global declaration web/mincals.inc | 1 - 1 file changed, 1 deletion(-) commit dee5da858 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 12 10:24:46 2018 +0000 Fixed bug that was causing the calendar views not to refresh if JavaScript was disabled. web/style.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f750598a0 Merge: 8ddb8299e 237634013 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 12 10:15:29 2018 +0000 Merge with default commit 237634013 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 12 10:12:08 2018 +0000 Removed redundant global declarations and simplified code web/session/session_cookie.inc | 12 ++---------- web/session/session_php.inc | 13 ++----------- 2 files changed, 4 insertions(+), 21 deletions(-) commit 45496bb98 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 12 10:10:38 2018 +0000 Added REQUEST_URI to the list of server variables 'grabbed'. web/grab_globals.inc.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit 183d17a77 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 12 10:00:47 2018 +0000 Got rid of an instance of using $PHP_SELF web/style.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 5d2672f98 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 12 09:47:12 2018 +0000 Removed redundant global declaration web/view_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8ddb8299e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 9 17:32:02 2018 +0000 Updated jQuery UI and removed the now redundant datepicker widget. web/jquery/ui/css/jquery-ui.structure.css | 175 -- .../ui/css/jquery-ui.structure.min.css | 4 +- ...i-bg_diagonals-medium_20_d34d17_40x40.png | Bin 382 -> 382 bytes .../ui-bg_gloss-wave_45_817865_500x100.png | Bin 5891 -> 5891 bytes .../ui-bg_gloss-wave_60_fece2f_500x100.png | Bin 5849 -> 5849 bytes .../ui-bg_gloss-wave_70_ffdd57_500x100.png | Bin 5543 -> 5543 bytes .../ui-bg_gloss-wave_90_fff9e5_500x100.png | Bin 5389 -> 5389 bytes ...ui-bg_highlight-soft_100_feeebd_1x100.png | Bin 343 -> 343 bytes .../ui-bg_inset-soft_30_ffffff_1x100.png | Bin 203 -> 203 bytes .../ui/css/sunny/jquery-ui.theme.min.css | 2 +- web/jquery/ui/jquery-ui.js | 2110 +--------------- web/jquery/ui/jquery-ui.min.js | 13 +- web/js.inc | 46 +- web/js/edit_entry.js.php | 16 +- 14 files changed, 42 insertions(+), 2324 deletions(-) commit 0d4b31893 Merge: de792bdd3 6153dcc47 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 9 15:03:41 2018 +0000 Merge with default commit 6153dcc47 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 9 15:01:06 2018 +0000 Removed redundant global declaration web/mrbs_auth.inc | 1 - 1 file changed, 1 deletion(-) commit 13683478a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 9 14:59:00 2018 +0000 Revised last change web/functions.inc | 5 +++++ web/mrbs_auth.inc | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) commit de792bdd3 Merge: 3cc3c7c92 f5791447b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 9 14:41:38 2018 +0000 Merge with default commit f5791447b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 9 14:39:10 2018 +0000 Added an error trigger if PHP_SELF is empty. See SF Support Requests #1633. web/mrbs_auth.inc | 5 +++++ 1 file changed, 5 insertions(+) commit 3cc3c7c92 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 9 11:44:55 2018 +0000 Fixed some non-standard language codes used by Flatpickr web/language.inc | 2 ++ 1 file changed, 2 insertions(+) commit 18f8106ef Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 9 11:15:02 2018 +0000 Updated Flatpickr translations to V4.5.2 web/js/flatpickr/l10n/ar.js | 67 +++++----------- web/js/flatpickr/l10n/at.js (new) | 34 ++++++++ web/js/flatpickr/l10n/be.js (new) | 39 +++++++++ web/js/flatpickr/l10n/bg.js | 80 +++++-------------- web/js/flatpickr/l10n/bn.js | 80 +++++-------------- web/js/flatpickr/l10n/cat.js | 120 ++++++++++------------------ web/js/flatpickr/l10n/cs.js | 95 ++++++++-------------- web/js/flatpickr/l10n/cy.js | 118 ++++++++------------------- web/js/flatpickr/l10n/da.js | 92 +++++++-------------- web/js/flatpickr/l10n/de.js | 90 +++++++-------------- web/js/flatpickr/l10n/en.js | 116 ++++++++++----------------- web/js/flatpickr/l10n/eo.js | 96 +++++++--------------- web/js/flatpickr/l10n/es.js | 89 +++++++-------------- web/js/flatpickr/l10n/et.js | 96 +++++++--------------- web/js/flatpickr/l10n/fa.js | 87 ++++++-------------- web/js/flatpickr/l10n/fi.js | 88 ++++++-------------- web/js/flatpickr/l10n/fr.js | 99 +++++++---------------- web/js/flatpickr/l10n/gr.js | 98 +++++++---------------- web/js/flatpickr/l10n/he.js | 72 +++++------------ web/js/flatpickr/l10n/hi.js | 80 +++++-------------- web/js/flatpickr/l10n/hr.js | 82 ++++++------------- web/js/flatpickr/l10n/hu.js | 94 +++++++--------------- web/js/flatpickr/l10n/id.js | 80 ++++++------------- web/js/flatpickr/l10n/it.js | 94 +++++++--------------- web/js/flatpickr/l10n/ja.js | 80 +++++-------------- web/js/flatpickr/l10n/km.js (new) | 38 +++++++++ web/js/flatpickr/l10n/ko.js | 86 ++++++-------------- web/js/flatpickr/l10n/kz.js (new) | 39 +++++++++ web/js/flatpickr/l10n/lt.js | 94 +++++++--------------- web/js/flatpickr/l10n/lv.js | 84 ++++++------------- web/js/flatpickr/l10n/mk.js | 86 ++++++-------------- web/js/flatpickr/l10n/mn.js | 76 ++++++------------ web/js/flatpickr/l10n/ms.js | 86 ++++++-------------- web/js/flatpickr/l10n/my.js | 88 ++++++-------------- web/js/flatpickr/l10n/nb.js | 96 +++++++--------------- web/js/flatpickr/l10n/nl.js | 99 +++++++---------------- web/js/flatpickr/l10n/nn.js | 96 +++++++--------------- web/js/flatpickr/l10n/no.js | 96 +++++++--------------- web/js/flatpickr/l10n/pa.js | 80 +++++-------------- web/js/flatpickr/l10n/pl.js | 92 +++++++-------------- web/js/flatpickr/l10n/pt.js | 82 ++++++------------- web/js/flatpickr/l10n/ro.js | 88 ++++++-------------- web/js/flatpickr/l10n/ru.js | 94 ++++++++-------------- web/js/flatpickr/l10n/si.js | 80 +++++-------------- web/js/flatpickr/l10n/sk.js | 90 +++++++-------------- web/js/flatpickr/l10n/sl.js | 90 +++++++-------------- web/js/flatpickr/l10n/sq.js | 80 +++++-------------- web/js/flatpickr/l10n/sr.js | 86 ++++++-------------- web/js/flatpickr/l10n/sv.js | 90 +++++++-------------- web/js/flatpickr/l10n/th.js | 94 +++++++--------------- web/js/flatpickr/l10n/tr.js | 98 +++++++---------------- web/js/flatpickr/l10n/uk.js | 82 ++++++------------- web/js/flatpickr/l10n/vn.js | 82 ++++++------------- web/js/flatpickr/l10n/zh.js | 88 ++++++-------------- 54 files changed, 1512 insertions(+), 3114 deletions(-) commit 902cbf101 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 9 10:34:28 2018 +0000 Upgraded to Flatpickr Version 4.5.2 web/js/flatpickr/css/flatpickr.min.css | 22 +++++++++++----------- web/js/flatpickr/flatpickr.min.js | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) commit 3b91b3b00 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 9 10:16:54 2018 +0000 Created nb and nn translations for flatpickr. They are just copies at this stage of the no translation and no attempt has been made to provide proper nb or nn translations. But presumably this is better than serving up the default, ie English. web/js/flatpickr/l10n/nb.js (new) | 73 +++++++++++++++++++++++++++++ web/js/flatpickr/l10n/nn.js (new) | 73 +++++++++++++++++++++++++++++ 2 files changed, 146 insertions(+) commit 565b210d4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 9 10:04:02 2018 +0000 Added 'nb' as an alias for 'no' as PHP's Locale::acceptFromHttp() does not accept 'no' on Windows IIS. web/language.inc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) commit 4bf846626 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 8 17:11:05 2018 +0000 Updated DataTables translations .../datatables/language/Amharic.lang (new) | 30 +++++++++++ web/jquery/datatables/language/Arabic.lang | 10 ++-- .../datatables/language/Bulgarian.lang | 4 +- .../language/Chinese-traditional.lang | 33 ++++++------ web/jquery/datatables/language/Dutch.lang | 4 ++ web/jquery/datatables/language/Finnish.lang | 36 +++++++++++--- web/jquery/datatables/language/French.lang | 7 +++ web/jquery/datatables/language/Galician.lang | 9 ++-- web/jquery/datatables/language/Georgian.lang | 31 +++++++----- web/jquery/datatables/language/German.lang | 28 +++++++++-- web/jquery/datatables/language/Hebrew.lang | 29 +++++------ .../datatables/language/Hungarian.lang | 47 ++++++++++++------ .../Indonesian-Alternative.lang (new) | 24 +++++++++ .../datatables/language/Indonesian.lang | 3 +- .../datatables/language/Kazakh.lang (new) | 28 +++++++++++ .../datatables/language/Khmer.lang (new) | 30 +++++++++++ web/jquery/datatables/language/Kyrgyz.lang | 6 +++ web/jquery/datatables/language/Latvian.lang | 15 +++--- .../language/Norwegian-Bokmal.lang (new) | 33 ++++++++++++ .../language/Norwegian-Nynorsk.lang (new) | 33 ++++++++++++ .../language/Norwegian.lang (gone) | 24 --------- .../datatables/language/Pashto.lang (new) | 30 +++++++++++ web/jquery/datatables/language/Persian.lang | 29 +++++++---- web/jquery/datatables/language/Polish.lang | 39 +++++++-------- .../language/Portuguese-Brasil.lang | 7 +++ .../datatables/language/Portuguese.lang | 7 ++- web/jquery/datatables/language/Romanian.lang | 16 +++--- web/jquery/datatables/language/Thai.lang | 38 ++++++++------ web/jquery/datatables/language/Turkish.lang | 38 +++++++++----- .../{Ukranian.lang => Ukrainian.lang} | 6 +-- .../datatables/language/telugu.lang (new) | 29 +++++++++++ web/language.inc | 10 +++- 32 files changed, 531 insertions(+), 182 deletions(-) commit c18d725ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 8 16:17:12 2018 +0000 Updated to latest version of DataTables. web/css/mrbs.css.php | 10 +- .../datatables/css/buttons.dataTables.css | 84 +- .../css/buttons.dataTables.min.css | 2 +- .../datatables/css/colReorder.dataTables.css | 3 +- .../css/colReorder.dataTables.min.css | 2 +- .../datatables/css/jquery.dataTables.css | 22 +- .../datatables/css/jquery.dataTables.min.css | 2 +- web/jquery/datatables/js/buttons.colVis.js | 118 +- .../datatables/js/buttons.colVis.min.js | 14 +- .../datatables/js/dataTables.buttons.js | 1133 +- .../datatables/js/dataTables.buttons.min.js | 72 +- .../datatables/js/dataTables.colReorder.js | 336 +- .../js/dataTables.colReorder.min.js | 50 +- .../datatables/js/dataTables.fixedColumns.js | 450 +- .../js/dataTables.fixedColumns.min.js | 61 +- .../datatables/js/jquery.dataTables.js | 11963 ++++++++------- .../datatables/js/jquery.dataTables.min.js | 325 +- web/js/datatables.js.php | 13 +- 18 files changed, 7906 insertions(+), 6754 deletions(-) commit a9fb8a64d Merge: d763cd8bf ebd417ca8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 8 10:32:34 2018 +0000 Merge with default commit ebd417ca8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 8 10:29:19 2018 +0000 Fixed bug that allowed areas with no enabled rooms to appear in the area select. [Fix back-ported from the nav_improvements branch - should have fixed it here first]. web/edit_entry.php | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) commit d763cd8bf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 8 10:19:02 2018 +0000 Fixed bug that allowed areas with no enabled rooms to appear in the area select. web/edit_entry.php | 7 +++++++ 1 file changed, 7 insertions(+) commit 8cb9e448b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 8 10:08:52 2018 +0000 Simplified code, removing a redundant SQL query web/edit_entry.php | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) commit 941deee07 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 7 16:10:09 2018 +0000 Removed more instances of inline styles web/css/mrbs.css.php | 2 +- web/edit_entry.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 7e53a2a27 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 7 15:56:50 2018 +0000 Removed more instances of inline styles web/edit_entry.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 1ebda1172 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 7 15:50:42 2018 +0000 Missing commit from last fix web/css/mrbs.css.php | 3 +++ 1 file changed, 3 insertions(+) commit 603abe149 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 7 15:46:01 2018 +0000 Fixed last change for non-JavaScript enabled browsers web/lib/MRBS/Form/ElementInputDatalist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a2716786a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 7 15:37:27 2018 +0000 Removed more instances of inline styles web/lib/MRBS/Form/ElementInputDatalist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit db0ea5e48 Merge: b33121316 1d6bb1115 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 7 12:07:44 2018 +0000 Merge with default commit 1d6bb1115 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 7 12:06:30 2018 +0000 Fixed typo in comment web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ca4bd15c7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 7 12:04:16 2018 +0000 Removed redundant code. web/functions.inc | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) commit 0c4ba96b7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 7 11:59:46 2018 +0000 Fixed bug in date_default_timezone_set() that was causing it to set the current area timnezone rather than the config timezone if no timezone was specified. web/functions.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit b33121316 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 7 11:32:45 2018 +0000 Removed inline styles from MRBS code. However DataTables is still using inline styles. web/css/mrbs.css.php | 39 +++--------- web/functions_table.inc | 60 ++++--------------- web/js/refresh.js.php | 113 ++++++++++++++++++++--------------- web/systemdefaults.inc.php | 2 +- 4 files changed, 85 insertions(+), 129 deletions(-) commit 91d160d5d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 6 16:28:37 2018 +0000 Disabled caching of files when $debug is set. web/functions.inc | 4 +++- web/systemdefaults.inc.php | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) commit c9192da44 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 4 16:22:02 2018 +0000 Got rid of inline JavaScript so that MRBS will now work with a web server Content Security Policy of "script-src 'self';". See also SF Support Requests #1601. Still need to get rid of inline styles. web/Themes/default/header.inc | 36 ++++++++++++++-- web/functions.inc | 50 +++++++++++++--------- web/js.inc | 46 -------------------- web/js/admin.js.php | 14 ++---- web/js/datepicker.js.php | 14 +++--- web/js/edit_area.js.php | 13 ++---- web/js/edit_entry.js.php | 13 ++---- web/js/edit_users.js.php | 11 ++--- web/js/general.js.php | 11 ++--- web/js/index.js.php | 12 ++---- web/js/{set_class.js.php => init.js.php} | 7 +-- web/js/pending.js.php | 12 ++---- web/js/refresh.js.php | 19 ++++---- web/js/report.js.php | 12 +----- web/js/resizable.js.php | 18 ++------ web/js/search.js.php | 11 ++--- 16 files changed, 114 insertions(+), 185 deletions(-) commit b22098c34 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 3 17:31:53 2018 +0000 Passed through day/week/month etc parameters to the header web/edit_users.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 7bdd09893 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 3 12:01:20 2018 +0000 Fixed bug that caused the header link to the list of upcoming entries for an ordinary user to go the Report page, for which ordinary users no longer have access. Fixed it by providing a link to the Search page instead - not ideal because you can only search for entries containing the search string anywhere in the entry and not just in the created_by field. web/css/mrbs.css.php | 3 ++- web/js/general.js.php | 4 ++-- web/session/functions_session.inc | 32 ++++++++++++++++++++++++----- 3 files changed, 31 insertions(+), 8 deletions(-) commit f52ed17d6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 3 10:41:08 2018 +0000 Fixed syntax error web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ef4b83c50 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 3 10:12:18 2018 +0000 Simplified code web/edit_users.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) commit fdb66145e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 2 18:40:25 2018 +0000 Removed $user parameter to mrbsDelEntry() as it's always the current user web/del_entry.php | 2 +- web/edit_entry_handler.php | 2 +- web/mrbs_sql.inc | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) commit 1f42a7639 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 2 18:33:58 2018 +0000 Removed $user parameter to is_book_admin() as it's always the current user web/mrbs_auth.inc | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) commit c222ff850 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 2 18:28:57 2018 +0000 Removed $user parameter to getWritable() as it's always the current user web/del_entry.php | 3 +-- web/edit_entry.php | 4 ++-- web/edit_entry_handler.php | 2 +- web/functions_table.inc | 10 +++------- web/mrbs_auth.inc | 9 +++++---- web/mrbs_sql.inc | 5 ++--- web/view_entry.php | 2 +- 7 files changed, 15 insertions(+), 20 deletions(-) commit c9ad15602 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 2 17:58:04 2018 +0000 Converted code to use the new is_user_admin() function web/edit_users.php | 10 ++++++---- web/mrbs_auth.inc | 30 ------------------------------ 2 files changed, 6 insertions(+), 34 deletions(-) commit f4aeff1f0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 2 17:41:20 2018 +0000 Introduced new function is_user_admin() to complement is_admin() and is_book_admin() web/edit_users.php | 20 ++++++++++---------- web/mrbs_auth.inc | 12 +++++++++++- 2 files changed, 21 insertions(+), 11 deletions(-) commit 21bebed53 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 2 17:25:42 2018 +0000 Tidied up code to use is_booking_admin() web/ajax/del_entry.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) commit 22eb5db7d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 2 17:24:49 2018 +0000 Removed redundant global web/js.inc | 1 - 1 file changed, 1 deletion(-) commit c100fe246 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 2 16:58:09 2018 +0000 Converted calls of is_admin() to is_book_admin() for those cases where the user only needs to be a booking and not a full admin. (By default these are the same thing, but there is the potential for them to be different). web/edit_entry.php | 14 +++++++------- web/edit_entry_handler.php | 6 +++--- web/mrbs_auth.inc | 3 ++- web/mrbs_sql.inc | 2 +- web/pending.php | 2 +- web/report.php | 2 +- web/search.php | 2 +- web/view_entry.php | 2 +- 8 files changed, 17 insertions(+), 16 deletions(-) commit 8a7fb38f7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 2 16:43:33 2018 +0000 Renamed auth_book_admin() to is_book_admin() for consistency with is_admin() web/approve_entry_handler.php | 2 +- web/del_entry.php | 2 +- web/edit_entry_handler.php | 2 +- web/functions_mail.inc | 2 +- web/mrbs_auth.inc | 13 ++++++++----- web/mrbs_sql.inc | 3 +-- web/pending.php | 4 ++-- web/view_entry.php | 2 +- 8 files changed, 16 insertions(+), 14 deletions(-) commit ca58aa5d2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 2 16:12:31 2018 +0000 Replaced use of $is_admin by a new function is_admin() web/admin.php | 32 ++++++++++++++------------------ web/edit_entry.php | 17 ++++++++--------- web/edit_entry_handler.php | 9 +++------ web/edit_room.php | 22 ++++++++-------------- web/help.php | 5 +---- web/js.inc | 8 ++------ web/mrbs_auth.inc | 13 +++++++++++++ web/mrbs_sql.inc | 6 ++---- web/pending.php | 4 +--- web/report.php | 19 +++++++------------ web/search.php | 4 +--- web/view_entry.php | 5 ++--- 12 files changed, 62 insertions(+), 82 deletions(-) commit 84a97d55d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 2 14:56:14 2018 +0000 Removed the redundant "non_js" class web/Themes/default/header.inc | 7 ++----- web/js/set_class.js.php | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) commit 48a5bd642 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 2 14:46:58 2018 +0000 Moved an inline script into a file. web/Themes/default/header.inc | 8 +------- web/js/set_class.js.php (new) | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 7 deletions(-) commit 76fca8538 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 26 20:37:10 2018 +0100 Partial improvement to header layout on mobiles web/css/mrbs.css.php | 2 ++ 1 file changed, 2 insertions(+) commit 3ab767e2c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 26 18:32:23 2018 +0100 Fixed problem with unequal row heights web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b98244041 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 26 16:39:44 2018 +0100 Parameterised some more colours web/Themes/default/styling.inc | 1 + web/css/mrbs.css.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) commit 1b2de229e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 26 15:01:08 2018 +0100 Rweaked the shade of blue in the header to improve contrast web/Themes/default/styling.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit da20fb1c9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 26 14:57:24 2018 +0100 Fixed comment web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d7939d9d3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 26 14:56:07 2018 +0100 Parameterised some more colours web/Themes/default/styling.inc | 1 + web/css/mrbs.css.php | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) commit 10fd309a7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 26 14:36:07 2018 +0100 Parameterised some colours web/Themes/classic126/styling.inc | 6 ++++++ web/Themes/default/styling.inc | 6 ++++++ web/css/mrbs.css.php | 8 ++++---- 3 files changed, 16 insertions(+), 4 deletions(-) commit c1f537190 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 24 17:12:05 2018 +0100 Fixed minor bug web/js.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 213dc76da Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 24 12:27:03 2018 +0100 Added a border-radius to the outer navigation buttons web/css/mrbs.css.php | 7 +++++++ 1 file changed, 7 insertions(+) commit 667cedd29 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 24 12:17:10 2018 +0100 Changed styling of navigation buttons to avoid a problem on mobile Safari where the buttons are rounded and so don't butt together properly. web/css/mrbs.css.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) commit ce292e454 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 20 18:36:00 2018 +0100 Fixed bug having a slight impact on performance web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 31fa5e2a3 Merge: e28bb5051 d986dc257 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 20 16:13:46 2018 +0100 Merge with default commit d986dc257 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 20 16:12:20 2018 +0100 Added comment. web/language.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit e28bb5051 Merge: 7a47b9f78 6594b607a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 20 15:58:17 2018 +0100 Merge with default commit 6594b607a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 20 15:56:03 2018 +0100 Fixed problem with date in search results heading being shown in the wrong format when using en_GB on Windows. Not a great fix - the language and locale handling is much better in the nav_improvements branch and this will eventually be merged back into the default branch. web/language.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) commit 7a47b9f78 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 20 15:10:41 2018 +0100 Fixed problem with date in search results heading being shown in the wrong format when using en_GB on Windows. web/lib/MRBS/System.php | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) commit 279e20dd2 Merge: b4f93dd25 c007b8426 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 20 11:43:52 2018 +0100 Merge with default commit c007b8426 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 20 11:09:43 2018 +0100 Fixed problem introduced in last few changes web/search.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit b4f93dd25 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 20 10:16:48 2018 +0100 Fixed merge web/search.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit 0687bdce4 Merge: 7a281f222 72db3dca1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 20 10:03:29 2018 +0100 Merge with default commit 72db3dca1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 20 10:01:00 2018 +0100 Fixed bug causing "Empty or invalid search string". See SF Bugs #421. web/functions.inc | 12 +++++++++--- web/search.php | 26 +++++++++++++++++--------- 2 files changed, 26 insertions(+), 12 deletions(-) commit 7a281f222 Merge: 50b862899 453c8b8e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 19 16:13:01 2018 +0100 Merge with default commit 453c8b8e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 19 16:11:23 2018 +0100 Fixed bug introduced in d21c016bf2ce causing automatic detection of scheduling conflicts to fail. web/mrbs_sql.inc | 1 + 1 file changed, 1 insertion(+) commit 4cb0ff610 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 19 15:09:54 2018 +0100 Clarified upgrade instructions. See SF Support Requests #1622. UPGRADE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 50b862899 Merge: b75810f5f 3b9b0a210 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 19 14:34:23 2018 +0100 Merge with default commit 3b9b0a210 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 19 14:33:11 2018 +0100 Disabled the default duration field on the area form if "All day" is checked. web/edit_area_handler.php | 9 +++++++-- web/js/edit_area.js.php | 7 ++++++- 2 files changed, 13 insertions(+), 3 deletions(-) commit b75810f5f Merge: 4d5287618 2052db817 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 19 12:12:48 2018 +0100 Merge with default commit 2052db817 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 19 12:11:07 2018 +0100 Tidied up code web/view_entry.php | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) commit f43744595 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 19 11:49:06 2018 +0100 Fixed bug causing series not to be approved. Might be related to SF Support Requests #1623 web/pending.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 4d5287618 Merge: 88bf8c342 35913076f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 13 15:50:08 2018 +0100 Merge with default commit 35913076f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 13 15:49:10 2018 +0100 Changed the code so that it is no longer necessary to include an '@' character at the beginning of $mail_settings['domain'] - though older config files that do have one will still work. web/functions.inc | 11 +++++++++-- web/systemdefaults.inc.php | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) commit d3f33319a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 13 15:35:49 2018 +0100 Fixed a bug that was causing the username_suffix to be stripped out of a username wherever it occurred, rather than just at the end. web/functions.inc | 15 ++++++++++++++- web/systemdefaults.inc.php | 4 ++-- 2 files changed, 16 insertions(+), 3 deletions(-) commit 88bf8c342 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 13 14:56:37 2018 +0100 Tweaked CSS to improve display of entries in the month view web/css/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit bec9dc4ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 13 14:48:22 2018 +0100 Fixed undefined index problem web/view_entry.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) commit 970cff3ef Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 13 14:20:07 2018 +0100 Fixed bug when the URL is a directory rather than a file. web/view_entry.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit cf8171aaf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 13 11:20:59 2018 +0100 Fixed merge web/view_entry.php | 45 ++++++++------------------------------------ 1 file changed, 8 insertions(+), 37 deletions(-) commit 56b94c059 Merge: 9be3f1dd1 4b3a9d822 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 13 11:01:55 2018 +0100 Merge with default commit 4b3a9d822 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 13 10:51:16 2018 +0100 Fixed a bug (SF Bugs #420) causing an "invalid id" message if you try an edit an entry without first having logged in. web/view_entry.php | 53 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 27 deletions(-) commit 9be3f1dd1 Merge: d815cf816 12571ab45 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 24 14:03:54 2018 +0100 Merge with default commit 12571ab45 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 24 12:54:38 2018 +0100 Fixed problem with disabled required fields on the edit_users form. See SF Bugs #419. web/edit_users.php | 14 +++++++++++--- web/lib/MRBS/Form/Field.php | 12 ++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) commit d815cf816 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 22 16:41:09 2018 +0100 Fixed problem with locales introduced in recent fix web/language.inc | 4 ++++ 1 file changed, 4 insertions(+) commit 53932af8a Merge: b5de890ee e7f3b6124 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 18 16:54:19 2018 +0100 Merge with default commit e7f3b6124 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 18 16:06:59 2018 +0100 Updated to latest version of PHP CAS source web/lib/CAS.php (new) | 2015 ++++ web/lib/CAS/AuthenticationException.php | 222 +- web/lib/CAS/Autoload.php | 195 +- web/lib/CAS/Client.php | 7905 ++++++++-------- web/lib/CAS/CookieJar.php | 770 +- web/lib/CAS/Exception.php | 116 +- .../CAS/GracefullTerminationException.php | 170 +- web/lib/CAS/InvalidArgumentException.php | 90 +- web/lib/CAS/LICENSE | 402 +- web/lib/CAS/Languages/Catalan.php | 228 +- web/lib/CAS/Languages/ChineseSimplified.php | 226 +- web/lib/CAS/Languages/English.php | 226 +- web/lib/CAS/Languages/French.php | 230 +- web/lib/CAS/Languages/German.php | 232 +- web/lib/CAS/Languages/Greek.php | 230 +- web/lib/CAS/Languages/Japanese.php | 226 +- web/lib/CAS/Languages/LanguageInterface.php | 190 +- web/lib/CAS/Languages/Spanish.php | 234 +- web/lib/CAS/NOTICE | 162 +- ...enceBeforeAuthenticationCallException.php | 112 +- .../OutOfSequenceBeforeClientException.php | 116 +- .../OutOfSequenceBeforeProxyException.php | 118 +- web/lib/CAS/OutOfSequenceException.php | 98 +- web/lib/CAS/PGTStorage/AbstractStorage.php | 444 +- web/lib/CAS/PGTStorage/Db.php | 880 +- web/lib/CAS/PGTStorage/File.php | 522 +- web/lib/CAS/ProxiedService.php | 144 +- web/lib/CAS/ProxiedService/Abstract.php | 298 +- web/lib/CAS/ProxiedService/Exception.php | 92 +- web/lib/CAS/ProxiedService/Http.php | 182 +- web/lib/CAS/ProxiedService/Http/Abstract.php | 720 +- web/lib/CAS/ProxiedService/Http/Get.php | 170 +- web/lib/CAS/ProxiedService/Http/Post.php | 304 +- web/lib/CAS/ProxiedService/Imap.php | 560 +- web/lib/CAS/ProxiedService/Testable.php | 150 +- web/lib/CAS/ProxyChain.php | 254 +- web/lib/CAS/ProxyChain/AllowedList.php | 238 +- web/lib/CAS/ProxyChain/Any.php | 128 +- web/lib/CAS/ProxyChain/Interface.php | 104 +- web/lib/CAS/ProxyChain/Trusted.php | 118 +- web/lib/CAS/ProxyTicketException.php | 142 +- web/lib/CAS/Request/AbstractRequest.php | 758 +- web/lib/CAS/Request/CurlMultiRequest.php | 292 +- web/lib/CAS/Request/CurlRequest.php | 400 +- web/lib/CAS/Request/Exception.php | 90 +- .../CAS/Request/MultiRequestInterface.php | 166 +- web/lib/CAS/Request/RequestInterface.php | 358 +- web/lib/CAS/TypeMismatchException.php | 140 +- web/lib/phpCAS.php | 2024 +--- 49 files changed, 12131 insertions(+), 12060 deletions(-) commit d44224ae7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 6 12:43:09 2018 +0100 Simplified code web/lib/MRBS/Form/Element.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ad98d951e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 6 12:31:05 2018 +0100 Fixed problem with checkboxes on forms not being filled properly. See SF Bugs #418. web/edit_area.php | 3 ++- web/lib/MRBS/Form/Element.php | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) commit b5de890ee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 1 15:21:33 2018 +0100 Added simple args to stack trace. web/functions_error.inc | 40 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) commit e8881ac70 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 1 14:55:15 2018 +0100 Simplified code web/functions_error.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 8c1f6dffc Merge: c8de39394 ad3a3c764 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 1 14:45:35 2018 +0100 Merge with default commit ad3a3c764 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 1 14:43:48 2018 +0100 Fixed problems with (a) the URL growing longer and longer when logging in and logging out and logging in again etc. and (b) the Back button on the edit_entry page not working after a login. web/auth/auth_db_ext.inc | 2 ++ web/edit_entry.php | 26 ++++++++++----------- web/session/session_cas.inc | 22 ------------------ web/session/session_cookie.inc | 31 ++++++++++--------------- web/session/session_joomla.inc | 34 +++++++++++---------------- web/session/session_php.inc | 36 ++++++++++++----------------- web/session/session_wordpress.inc | 34 +++++++++++---------------- 7 files changed, 67 insertions(+), 118 deletions(-) commit e59bc6da2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 31 18:57:23 2018 +0100 Improved earlier fix. web/auth/auth_db_ext.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c8de39394 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 31 16:47:47 2018 +0100 Added some HTML escaping to the stack trace. web/functions_error.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit fc1448205 Merge: ca51ee309 ddb65a587 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 31 16:40:50 2018 +0100 Merge with default commit ddb65a587 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 31 14:32:27 2018 +0100 Fixed bug when using db_ext and $auth['db_ext']['column_name_level']. See SF Bugs #417 web/auth/auth_db_ext.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 053dddb06 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 31 14:25:12 2018 +0100 Fixed bug when db_ext password_format is not defined. web/auth/auth_db_ext.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ca51ee309 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 30 20:55:01 2018 +0100 Added a stack trace to the debug output web/functions_error.inc | 43 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) commit 642dbd50b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 30 19:24:13 2018 +0100 Added comment web/language.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit b56afa809 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 30 17:18:26 2018 +0100 Fixed bug when $auth['only_admin_can_book_repeat'] is set web/edit_entry_handler.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) commit 268176b56 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 30 17:17:26 2018 +0100 Fixed bug to do with locales. web/language.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit e2efd82b4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 30 16:29:15 2018 +0100 Removed redundant code to do with multiple bookings. web/Themes/classic126/styling.inc | 2 -- web/Themes/default/styling.inc | 1 - web/js.inc | 3 +- web/js/multiple.js.php (gone) | 44 ----------------------------- web/js/resizable.js.php | 7 +---- 5 files changed, 2 insertions(+), 55 deletions(-) commit b776c688a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 30 16:05:16 2018 +0100 Fixed merge error web/js.inc | 1 + 1 file changed, 1 insertion(+) commit 9421113d5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 29 22:10:19 2018 +0100 Fixed merge problems. web/js.inc | 5 ----- 1 file changed, 5 deletions(-) commit 8fb744a4d Merge: 791d02d65 c3f53f8d9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 29 22:06:10 2018 +0100 Merge with default commit c3f53f8d9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 29 21:54:06 2018 +0100 Fixed problems to do with caching of the user level in JavaScript code. See SF Bugs #415. web/js.inc | 8 +- web/js/admin.js.php | 10 +- web/js/edit_entry.js.php | 70 +++++++------ web/js/multiple.js.php | 3 - web/js/report.js.php | 200 ++++++++++++++++++------------------- web/js/resizable.js.php | 27 ++--- 6 files changed, 152 insertions(+), 166 deletions(-) commit 791d02d65 Merge: 4360e9e62 e1b567008 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 29 18:37:50 2018 +0100 Merge with default commit e1b567008 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 29 18:36:33 2018 +0100 Fixed bug when multiday bookings are not allowed. See SF Bugs #416. web/edit_entry.php | 12 +++++++----- web/js/edit_entry.js.php | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) commit 4360e9e62 Merge: 191becf45 e516d7598 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 28 20:42:57 2018 +0100 Merge with default commit e516d7598 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 28 20:30:44 2018 +0100 Updated minimum PHP version number. See SF Bugs #414. INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 191becf45 Merge: c23298861 f90070c52 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 28 16:20:58 2018 +0100 Merge with default commit f90070c52 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 28 16:18:17 2018 +0100 fixed bug causing the datepicker date to be off by one day. See SF Support Requests #1591. web/js/datepicker.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1fe7c9dcd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 27 21:38:29 2018 +0100 Converted $twentyfourhour_format to a boolean web/systemdefaults.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 0da2a5189 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 27 17:42:42 2018 +0100 Corrected typo in comment web/init.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c23298861 Merge: 449dc2d62 402fe54d6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 26 13:41:04 2018 +0100 Merge with default commit 402fe54d6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 26 13:40:18 2018 +0100 Excluded the cookie session scheme from init_sessions(). web/init.inc | 6 ++++++ 1 file changed, 6 insertions(+) commit 1012b2435 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 24 17:52:07 2018 +0100 Increased the length of the id column in the sessions table from 32 to 255. See SF Feature Requests #158. tables.my.sql | 4 ++-- tables.pg.sql | 4 ++-- web/lib/MRBS/DB.php | 2 +- web/upgrade/57/mysql.sql (new) | 4 ++++ web/upgrade/57/pgsql.sql (new) | 4 ++++ 5 files changed, 13 insertions(+), 5 deletions(-) commit 449dc2d62 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 24 17:09:18 2018 +0100 Got rid of the $maxlength global, replacing it with a function. web/admin.php | 9 ++--- web/dbsys.inc | 33 ----------------- web/edit_entry.php | 7 ++-- web/edit_entry_handler.php | 68 ++++++++++++++++++------------------ web/edit_users.php | 22 +++++------- web/functions.inc | 42 ++++++++++++++++++++++ web/internalconfig.inc.php | 11 +----- web/js/datepicker.js.php | 6 +++- web/mrbs_sql.inc | 10 +++--- web/upgrade.inc | 4 --- 10 files changed, 102 insertions(+), 110 deletions(-) commit 6312e3232 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 21 16:16:31 2018 +0100 Fixed width of native date inputs on mobile devices (eg there was a problem on Safari/iPad where the date input was too narrow). web/css/mrbs.css.php | 10 ++++++++++ 1 file changed, 10 insertions(+) commit 3540d61d0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 20 16:00:25 2018 +0100 Improved scaling on mobile devices web/Themes/default/header.inc | 4 ++++ 1 file changed, 4 insertions(+) commit ab2ff9114 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 20 14:33:35 2018 +0100 Removed PHP mini-calendar code now that they're done using JavaScript. web/ajax/minicalendar.php (gone) | 48 ---- web/js/general.js.php | 160 ------------- web/lib/MRBS/MiniCalendar.php (gone) | 316 ------------------------- web/mrbs_auth.inc | 1 - 4 files changed, 525 deletions(-) commit 5c91c6c65 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 17 14:48:41 2018 +0100 Corrected typo web/internalconfig.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c1e86615a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 17 14:47:55 2018 +0100 Made strict mode the default for JavaScript web/internalconfig.inc.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit 165d12f55 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 17 14:44:01 2018 +0100 Removed redundant comments web/internalconfig.inc.php | 7 ------- 1 file changed, 7 deletions(-) commit 92f59e3f8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 17 14:31:05 2018 +0100 Moved more code into init.inc web/init.inc | 2 ++ web/internalconfig.inc.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) commit bc938f32f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 17 14:26:20 2018 +0100 Removed redundant code now that the minimum PHP version is 5.4.0 web/internalconfig.inc.php | 14 -------------- 1 file changed, 14 deletions(-) commit 9920c46f3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 17 14:20:46 2018 +0100 Created a new config variable $debug to make both development and support easier web/init.inc | 11 ++++++++++- web/internalconfig.inc.php | 8 +------- web/js.inc | 11 ++++++----- web/style.inc | 3 ++- web/systemdefaults.inc.php | 11 +++++++++++ 5 files changed, 30 insertions(+), 14 deletions(-) commit 84fe1c085 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 17 13:45:41 2018 +0100 Moved error handling initialisation into init.inc web/init.inc | 25 +++++++++++++++++++++++++ web/internalconfig.inc.php | 17 ----------------- 2 files changed, 25 insertions(+), 17 deletions(-) commit a7046ff09 Merge: 1016a2ab3 adb18b5dd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 17 13:15:42 2018 +0100 Merge with default commit adb18b5dd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 17 13:12:14 2018 +0100 Updated the report help page to reflect changes to the report parameters. help_report.html | 134 +++++++++++++++++++++++---------------------- 1 file changed, 70 insertions(+), 64 deletions(-) commit 1016a2ab3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 15 16:35:54 2018 +0100 Fixed problem with formatting of database upgrade page when accessing MRBS from index.php web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 757ecfb09 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 15 15:35:49 2018 +0100 Fixed problem with locale not being set on some systems when the only languages available do not contain a region, eg 'en' rather than 'en_GB'. web/lib/MRBS/System.php | 90 ++++++++++++++++++++++++++++++++------- 1 file changed, 74 insertions(+), 16 deletions(-) commit 019f55187 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 15 12:02:45 2018 +0100 Removed debug code accidentally committed web/language.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit fbd31dd2f Merge: 08e5984de e99071767 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 15 12:00:26 2018 +0100 Merge with default commit e99071767 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 15 10:50:35 2018 +0100 Fixed bug causing language file not to be used when in CLI mode. See SF Support Requests 1583. web/language.inc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) commit 08e5984de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 14 16:08:46 2018 +0100 Tidied up CSS file, reformatting and removing redundant code web/css/mrbs-ie.css | 23 ++- web/css/mrbs-mail.css | 60 +++++- web/css/mrbs-print.css.php | 18 +- web/css/mrbs.css.php | 384 +++++++++++++++++++++++++++-------- 4 files changed, 380 insertions(+), 105 deletions(-) commit 052e27293 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 14 14:49:44 2018 +0100 Tidied up CSS file, reformatting and removing redundant code web/css/mrbs-rtl.css.php | 3 +-- web/css/mrbs.css.php | 11 ++++------- 2 files changed, 5 insertions(+), 9 deletions(-) commit fc0ca8f6c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 14 14:41:46 2018 +0100 Tidied up CSS file, reformatting and removing redundant code web/css/mrbs.css.php | 133 ++++++++++++++++++++++++++++------------- 1 file changed, 91 insertions(+), 42 deletions(-) commit 74d4a1cd0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 2 14:33:18 2018 +0100 Fixed duplicate declaration of parseLocale(). See SF bugs #413. web/lib/Locale.php | 140 ------------------------------------------- 1 file changed, 140 deletions(-) commit 79b88681a Merge: 286a100cc cdad1f7d3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 2 09:19:06 2018 +0100 Merge with default commit cdad1f7d3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 2 09:06:57 2018 +0100 Rewrote code to avoid the use of the deprecated each() function web/auth/auth_pop3.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 04c6ccae2 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Aug 1 18:28:30 2018 +0100 Converted files to UniX LF line endings web/Mail/mime.php | 3224 +++++++++++++++++++-------------------- web/Mail/mimePart.php | 2552 +++++++++++++++---------------- web/Net/SMTP.php | 2550 +++++++++++++++---------------- web/Net/Socket.php | 1476 +++++++++--------- web/PEAR.php | 2226 +++++++++++++-------------- 5 files changed, 6014 insertions(+), 6014 deletions(-) commit 286a100cc Merge: ee546da43 411776273 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 1 12:36:45 2018 +0100 Merge with default commit 411776273 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 1 12:05:50 2018 +0100 Updated to version 1.2.2 web/Net/Socket.php | 1194 ++++++++++++++++++++++++++---------------- 1 file changed, 738 insertions(+), 456 deletions(-) commit 63df4c635 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 1 12:01:55 2018 +0100 Updated to version 1.8.0 web/Net/SMTP.php | 2493 ++++++++++++++++++++++---------------------- 1 file changed, 1275 insertions(+), 1218 deletions(-) commit e96a80b48 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 1 11:57:08 2018 +0100 Updated to version 1.10.5, though the deprecated each() function is still used. web/PEAR.php | 2207 ++++++++++++++++++++++++------------------------ 1 file changed, 1113 insertions(+), 1094 deletions(-) commit 577dcee54 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 1 11:44:42 2018 +0100 Updated Mail_Mime package to version 1.10.2 to avoid the use of the deprecated each() function. web/Mail/mime.php | 3238 +++++++++++++++++++-------------------- web/Mail/mimePart.php | 2525 +++++++++++++++--------------- 2 files changed, 2888 insertions(+), 2875 deletions(-) commit ce7cf2df0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 1 11:35:47 2018 +0100 Rewrote code to avoid the use of the deprecated each() function web/auth/auth_imap.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ee546da43 Merge: 634834eca 63fe3f316 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 21 08:38:19 2018 +0100 Merge with default commit 63fe3f316 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 21 08:37:14 2018 +0100 Fixed bug with confirmation status, introduced during recent changes. See SF Support Requests #1562. web/edit_entry.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) commit 634834eca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 20 18:34:41 2018 +0100 Tidied up merge web/functions_table.inc | 50 +++++++++++++++++++----------------- web/internalconfig.inc.php | 26 ++++++++++--------- 2 files changed, 41 insertions(+), 35 deletions(-) commit 3d79407fc Merge: 1e62d97a4 7cf127b7e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 20 18:07:58 2018 +0100 Merge with default commit 7cf127b7e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 20 18:03:19 2018 +0100 Made 'confirmation_status' and 'approval_status' work in $edit_entry_field_order for view_entry (see SF Support Requests #1562). In the process moved the packing and unpacking of the status bits into mrbs_sql.inc. web/edit_entry.php | 4 +- web/edit_entry_handler.php | 30 ++++++--------- web/functions_ical.inc | 4 +- web/functions_mail.inc | 8 ++-- web/functions_table.inc | 55 ++++++++++++++++---------- web/functions_view.inc | 21 ++++++++-- web/import.php | 25 +++++++----- web/month.php | 22 ++++++----- web/mrbs_sql.inc | 75 ++++++++++++++++++++++++++++++++---- web/report.php | 6 ++- web/view_entry.php | 14 +++---- 11 files changed, 177 insertions(+), 87 deletions(-) commit 3f32b553b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 20 12:05:39 2018 +0100 Replaced the values 'areas' and 'rooms' in the config setting $edit_entry_field_order with a single value 'room_id' (on the assumption that one would always want to have the room field next to the area field). This fixes a bug (see SF Support Requests #1562) and makes the use of the values consistent with the column names in the entry table. web/edit_entry.php | 9 +++------ web/internalconfig.inc.php | 23 +++++++++++++++++++++++ web/systemdefaults.inc.php | 9 ++++----- 3 files changed, 30 insertions(+), 11 deletions(-) commit 744b36e78 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 20 11:35:38 2018 +0100 Added some resilience for the case where an $edit_entry_field_order element does not exist. web/edit_entry.php | 7 +++++++ web/functions_view.inc | 7 +++++++ 2 files changed, 14 insertions(+) commit 1665df497 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 20 11:11:17 2018 +0100 Replaced the values 'start_date' and 'end_date' in the config setting $edit_entry_field_order with 'start_time' and 'end_time'. This fixes a bug (see SF Support Requests #1562) and makes the use of the values consistent with the column names in the entry table. web/edit_entry.php | 14 +++++++------- web/internalconfig.inc.php | 16 ++++++++++++++++ web/systemdefaults.inc.php | 4 ++-- 3 files changed, 25 insertions(+), 9 deletions(-) commit 1e62d97a4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 17 12:47:42 2018 +0100 Added some type hinting web/functions_table.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 6f91cdb22 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 17 12:28:01 2018 +0100 Added some type hinting web/edit_area.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 53016b3b8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 17 12:14:16 2018 +0100 Added HTML escaping of what could be user input web/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f210d2cfd Merge: b2f4d25c8 6e85c98ce Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 14 14:13:23 2018 +0100 Merge with default commit 6e85c98ce Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jul 14 11:19:44 2018 +0100 Got rid of a few global declarations web/lib/MRBS/SessionHandlerDb.php | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) commit d2bf58493 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 13 10:45:52 2018 +0100 Fixed another problem with upgrading to database sessions. It seems that in some versions of PHP (eg 7.0.25) session_start() generates a fatal error if the session handler open() returns false. Throwing an exception in open() doesn't work either because a try block round session_start() won't catch the exception (possibly because the open() method is actually a callback??). So instead we test for the existence of the session table in the constructor, which allows us to catch the exception when the object is created. web/init.inc | 14 +++++++++++--- web/lib/MRBS/SessionHandlerDb.php | 20 +++++++++++++++++--- 2 files changed, 28 insertions(+), 6 deletions(-) commit d803d86fb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 12 17:27:53 2018 +0100 Fixed another Catch 22 problem with upgrading to the new sessions table. web/lib/MRBS/SessionHandlerDb.php | 40 ++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 6 deletions(-) commit b3f018e0b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 11 16:42:55 2018 +0100 Fixed sessions for both Joomla 2 and Joomla 3 web/init.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit 1824a153d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 11 10:36:22 2018 +0100 Renamed functions web/init.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit d70037a11 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 11 10:29:48 2018 +0100 Restructured code, removing a global web/init.inc | 12 ++---------- web/lib/MRBS/Form/Form.php | 4 ---- web/lib/MRBS/JFactory.php | 3 +++ web/session/session_joomla.inc | 4 ++-- 4 files changed, 7 insertions(+), 16 deletions(-) commit 7cf75474f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 11 09:33:24 2018 +0100 Fixed operation of new session code with Joomla web/init.inc | 48 +++++++++++++++++++++-------- web/session/functions_session.inc | 1 - web/session/session_joomla.inc | 15 --------- web/systemdefaults.inc.php | 2 ++ 4 files changed, 37 insertions(+), 29 deletions(-) commit a8669cc5b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 10 18:27:35 2018 +0100 Fixed a bug when using Joomla authentication web/session/session_joomla.inc | 11 +++++++++++ 1 file changed, 11 insertions(+) commit 5eca4c0df Merge: 49c08c3fc 91c198137 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 8 11:14:03 2018 +0100 Merge commit 49c08c3fc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 8 11:12:30 2018 +0100 Simplified code web/functions.inc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) commit 25c0957de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 8 11:07:05 2018 +0100 Added some sanitization to split_iso_date() web/functions.inc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) commit 91c198137 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Jul 5 17:45:43 2018 +0100 Added config.inc.php to the .hgignore .hgignore | 1 + 1 file changed, 1 insertion(+) commit 147c47e25 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Jul 5 17:44:54 2018 +0100 Moved config.inc.php to config.inc.php-sample INSTALL | 21 ++++++++++-------- UPGRADE | 2 ++ ...{config.inc.php => config.inc.php-sample} | 0 3 files changed, 14 insertions(+), 9 deletions(-) commit b2f4d25c8 Merge: aa3869fd7 8892c82e1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 5 15:44:06 2018 +0100 Merge with default commit 8892c82e1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 5 15:26:23 2018 +0100 Implemented filtering by CAS attribute. See SF Support Requests 1533. web/auth/auth_cas.inc | 26 +++++++++++++++++++++++++- web/systemdefaults.inc.php | 8 ++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) commit aa3869fd7 Merge: 60d050890 89db31e3e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 5 06:44:40 2018 +0100 Merge with default commit 89db31e3e Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jul 4 20:13:23 2018 +0100 Added web/css/custom.css to .hgignore .hgignore | 1 + 1 file changed, 1 insertion(+) commit df312ebbe Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jul 4 20:12:30 2018 +0100 Backed out changeset f3ea15fe5a4a .hgignore | 1 - web/config.inc.php | 125 +------------------------------------------ 2 files changed, 1 insertion(+), 125 deletions(-) commit d61e423e4 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jul 4 20:10:26 2018 +0100 Added web/css/custom.css to .hgignore .hgignore | 1 + web/config.inc.php | 125 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 125 insertions(+), 1 deletion(-) commit 99619309d Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jul 4 20:02:21 2018 +0100 Added useful pattern to .hgignore .hgignore | 1 + 1 file changed, 1 insertion(+) commit 60d050890 Merge: bf9692d62 a57f10822 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 4 12:07:58 2018 +0100 Merge with default commit a57f10822 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 4 12:04:08 2018 +0100 Converted some functions to return a boolean instead of 0/1. web/mrbs_auth.inc | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) commit 0dc9fd620 Merge: 1aeb13ee8 c9d182474 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 4 11:26:59 2018 +0100 Merge with db_sessions commit c9d182474 (origin/db_sessions) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 4 11:26:17 2018 +0100 Close db_sessions branch commit 1eff02c40 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 4 11:25:49 2018 +0100 Expanded error message. web/init.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit b3b9739fc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 4 11:02:32 2018 +0100 Fixed bug in error handling code and reverted the now unnecessary previous commit. web/functions_error.inc | 2 +- web/init.inc | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) commit 889cfbbe3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 3 11:52:30 2018 +0100 Added a circumvention for strange behaviour in session_start() which seems to change the error_reporting level, at least when it fails. web/init.inc | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) commit 4e11c42eb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 3 11:20:02 2018 +0100 Added some checking to the open() method in the DB session handler and then added a fall-back to ordinary PHP sessions if DB sessions don't work. web/init.inc | 30 ++++++++++++++++++----------- web/lib/MRBS/SessionHandlerDb.php | 4 +++- 2 files changed, 22 insertions(+), 12 deletions(-) commit ffcd74a5f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 3 10:16:51 2018 +0100 Fixed bug in PostgreSQL updates web/upgrade/56/pgsql.sql | 2 +- web/upgrade/8/pgsql.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit a3d5c0e86 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jul 2 19:35:20 2018 +0100 Added an index to mrbs_sessions table. tables.my.sql | 4 +++- tables.pg.sql | 1 + web/upgrade/56/mysql.sql | 3 ++- web/upgrade/56/pgsql.sql | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) commit e47408154 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 2 15:59:17 2018 +0100 Fixed a bug causing the $maxlength global not to be populated web/dbsys.inc | 35 ++++++++++++++++++++++++++++++++++- web/upgrade.inc | 24 ++++++------------------ 2 files changed, 40 insertions(+), 19 deletions(-) commit 9f0c9bc54 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 2 15:11:07 2018 +0100 Made the db schema version numbers DB class constants web/lib/MRBS/DB.php | 6 ++++-- web/upgrade.inc | 32 ++++++++++++++------------------ 2 files changed, 18 insertions(+), 20 deletions(-) commit ce5fb4003 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 2 14:49:24 2018 +0100 Added comment web/upgrade.inc | 2 ++ 1 file changed, 2 insertions(+) commit fc8cf96ba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 2 14:47:05 2018 +0100 Moved the upgrade code to later in the start-ip sequence to avoid protential problems with sessions and the CSRF check failing. web/dbsys.inc | 170 +---------------------------------- web/defaultincludes.inc | 1 + web/upgrade.inc | 185 +++++++++++++++++++++++++++++++++++--- 3 files changed, 175 insertions(+), 181 deletions(-) commit 3eb51c0e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 1 18:38:30 2018 +0100 Moved session initialisation code to a more appropriate place web/init.inc | 5 +++++ web/internalconfig.inc.php | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) commit 09ec07c7b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 1 11:23:19 2018 +0100 Renamed class web/init.inc | 2 +- web/lib/MRBS/{SessionHandler.php => SessionHandlerDb.php} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit d18252c1a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 30 10:41:45 2018 +0100 Fixed bug in session write() code. (You can't rely on rowCount() to tell if the UPDATE worked because if the data being written is identical to what's already there rowCount() will return zero.) web/lib/MRBS/SessionHandler.php | 35 +++++++++++++------------------ 1 file changed, 14 insertions(+), 21 deletions(-) commit fc25c59b7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 30 10:06:14 2018 +0100 Simplified code web/init.inc | 40 +++++++++++++++++++++++++- web/lib/MRBS/SessionHandler.php | 47 +------------------------------ 2 files changed, 40 insertions(+), 47 deletions(-) commit ff75e2b90 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 29 10:50:10 2018 +0100 Now supports $auth["session_php"]["session_expire_time"] web/init.inc | 36 ------------------------------- web/lib/MRBS/SessionHandler.php | 33 ++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 38 deletions(-) commit 204178077 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 28 14:57:38 2018 +0100 Added comment web/lib/MRBS/SessionHandler.php | 6 ++++++ 1 file changed, 6 insertions(+) commit 67aa87b46 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 28 14:54:31 2018 +0100 Updated minimum PHP version number web/defaultincludes.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5070a9aab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 28 14:51:02 2018 +0100 Added PostgreSQL support tables.pg.sql | 9 ++++++++- web/upgrade/56/pgsql.sql (new) | 7 +++++++ 2 files changed, 15 insertions(+), 1 deletion(-) commit 04324c40d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 28 14:48:11 2018 +0100 Fixed bug in destroy() method web/lib/MRBS/SessionHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d19a076db Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 28 14:30:25 2018 +0100 First implementation of SessionHandler web/dbsys.inc | 2 +- web/defaultincludes.inc | 2 +- web/init.inc | 3 +- web/lib/MRBS/SessionHandler.php (new) | 108 ++++++++++++++++++++++++ 4 files changed, 112 insertions(+), 3 deletions(-) commit c939ed916 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 28 13:10:51 2018 +0100 Created new table (MySQL only at this stage) tables.my.sql | 11 ++++++++++- web/dbsys.inc | 2 +- web/upgrade/56/mysql.sql (new) | 9 +++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) commit 24da6a3f1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 28 12:42:14 2018 +0100 Created a new named branch for the development of using the database to store PHP sessions commit bf9692d62 Merge: 702a308a7 1aeb13ee8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 28 12:38:16 2018 +0100 Merge with default commit 1aeb13ee8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 28 11:16:15 2018 +0100 Added in CAS Server CA Certificate validation web/auth/auth_cas.inc | 4 ++++ web/systemdefaults.inc.php | 5 +++++ 2 files changed, 9 insertions(+) commit 4bfba1d80 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 28 10:56:47 2018 +0100 Fixed (I hope) problem with MRBS always returning to the admin page after successful CAS login web/session/functions_session.inc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) commit 6ec1961da Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 28 10:25:28 2018 +0100 Fixed a problem when logging off using CAS authentication web/session/session_cas.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 702a308a7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 26 17:33:43 2018 +0100 Fixed CSS for multiple bookings whern using $times_along_top web/css/mrbs.css.php | 6 ++++++ web/index.php | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) commit 381fd110f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 24 12:39:45 2018 +0100 Created specific language tokens for the Day-Week-Month nav buttons. See SF Support Requests #1443 web/css/mrbs.css.php | 10 ---------- web/index.php | 8 +++++--- web/lang/lang.ca | 3 +++ web/lang/lang.cs | 3 +++ web/lang/lang.da | 3 +++ web/lang/lang.de | 3 +++ web/lang/lang.el | 3 +++ web/lang/lang.en | 5 ++++- web/lang/lang.es | 3 +++ web/lang/lang.eu | 3 +++ web/lang/lang.fi | 3 +++ web/lang/lang.fr | 3 +++ web/lang/lang.he | 3 +++ web/lang/lang.hu | 3 +++ web/lang/lang.id | 3 +++ web/lang/lang.it | 3 +++ web/lang/lang.ja | 3 +++ web/lang/lang.ko | 3 +++ web/lang/lang.nb | 3 +++ web/lang/lang.nl | 3 +++ web/lang/lang.nn | 3 +++ web/lang/lang.no | 3 +++ web/lang/lang.pl | 3 +++ web/lang/lang.pt | 3 +++ web/lang/lang.pt-br | 3 +++ web/lang/lang.ro | 3 +++ web/lang/lang.ru | 3 +++ web/lang/lang.sk | 3 +++ web/lang/lang.sl | 3 +++ web/lang/lang.sr-latn-rs | 3 +++ web/lang/lang.sv | 3 +++ web/lang/lang.th | 3 +++ web/lang/lang.tr | 3 +++ web/lang/lang.zh-cn | 3 +++ web/lang/lang.zh-tw | 3 +++ 35 files changed, 105 insertions(+), 14 deletions(-) commit dae3f3055 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 24 11:28:41 2018 +0100 Made the date format in the Week view table header more configurable. See SF Support Requests #1443 web/functions_table.inc | 6 +++--- web/systemdefaults.inc.php | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) commit ce9ddbb30 Merge: a383695da 554195670 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 24 10:57:37 2018 +0100 Merge with default commit 554195670 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 24 10:55:46 2018 +0100 Changed lines endings to Unix(LF) web/auth/auth_cas.inc | 238 +++++++++++++++++----------------- web/session/session_cas.inc | 232 ++++++++++++++++----------------- 2 files changed, 235 insertions(+), 235 deletions(-) commit 1c62c3393 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 24 10:49:32 2018 +0100 Removed closing PHP tags web/auth/auth_cas.inc | 3 --- web/session/session_cas.inc | 2 -- 2 files changed, 5 deletions(-) commit a383695da Merge: 6d1367146 38ffbc276 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 24 09:47:58 2018 +0100 Merge with default commit 38ffbc276 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 24 09:37:53 2018 +0100 Tidied up the code web/session/session_cas.inc | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) commit 2b63d569a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 24 09:31:27 2018 +0100 Made CAS authentication resilient to the server port number being configured as a string. web/auth/auth_cas.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6d1367146 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 24 09:21:57 2018 +0100 Simplified code web/functions_table.inc | 284 +++++++++++--------------------------- 1 file changed, 83 insertions(+), 201 deletions(-) commit d42f23863 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 23 14:15:44 2018 +0100 Commented out debugging web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b10145745 Merge: d128def69 47faf95f3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 23 14:07:25 2018 +0100 Merge with default commit 47faf95f3 Merge: dcc27b8cf 24b976934 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 23 14:03:13 2018 +0100 Merge with CAS_authentication commit 24b976934 (origin/CAS_authentication) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 23 14:02:36 2018 +0100 Close CAS_authentication branch commit 6df40a44e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 23 14:00:09 2018 +0100 Updated the licence information LICENSE | 19 ++++ web/lib/CAS/LICENSE (new) | 201 ++++++++++++++++++++++++++++++++++++ web/lib/CAS/NOTICE (new) | 81 +++++++++++++++ 3 files changed, 301 insertions(+) commit e39162f0f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 23 13:51:06 2018 +0100 Updated Authentication info with CAS AUTHENTICATION | 8 ++++++++ 1 file changed, 8 insertions(+) commit 4c90c7fa8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 23 12:14:46 2018 +0100 Converted session code web/auth/auth_cas.inc | 10 ++++ web/session/session_cas.inc | 101 ++++++++++++++++++++++++++++------ web/systemdefaults.inc.php | 6 ++ 3 files changed, 100 insertions(+), 17 deletions(-) commit a57a2e83b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 23 11:26:07 2018 +0100 Fixed typo web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a4d73ed88 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 23 11:25:08 2018 +0100 Set phpCAS language web/auth/auth_cas.inc | 25 ++++++- web/lib/Locale.php | 148 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 172 insertions(+), 1 deletion(-) commit 8db148c68 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 23 10:37:45 2018 +0100 Added some configuration settings web/auth/auth_cas.inc | 14 ++++++++++++-- web/systemdefaults.inc.php | 17 ++++++++++++++--- 2 files changed, 26 insertions(+), 5 deletions(-) commit ab75dec5c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 22 16:55:25 2018 +0100 A bit more conversion of print_logon_box() web/session/session_cas.inc | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) commit 0620e009e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 22 16:44:45 2018 +0100 Styarted converting to new style session code web/session/session_cas.inc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) commit 153e2a814 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 22 16:35:05 2018 +0100 Added an authGetUserEmail() function web/auth/auth_cas.inc | 13 +++++++++++++ 1 file changed, 13 insertions(+) commit fee7f9e65 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 22 16:14:32 2018 +0100 Simplified code web/auth/auth_cas.inc | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) commit 4438cb0d8 Merge: dff936be3 dcc27b8cf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 22 16:10:25 2018 +0100 Merge with default commit dcc27b8cf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 22 16:09:44 2018 +0100 Simplified code web/auth/auth_auth_basic.inc | 13 +++++++------ web/auth/auth_config.inc | 13 +++++++------ web/auth/auth_crypt.inc | 13 +++++++------ web/auth/auth_db_ext.inc | 14 +++++++------- web/auth/auth_ext.inc | 13 +++++++------ web/auth/auth_imap.inc | 19 ++++++++++--------- web/auth/auth_imap_php.inc | 17 +++++++++-------- web/auth/auth_ldap.inc | 5 ++--- web/auth/auth_nis.inc | 21 +++++++++++---------- web/auth/auth_none.inc | 15 ++++++++------- web/auth/auth_nw.inc | 17 +++++++++-------- web/auth/auth_pop3.inc | 15 ++++++++------- web/auth/auth_smtp.inc | 15 ++++++++------- web/mrbs_auth.inc | 2 +- web/view_entry.php | 4 ++-- 15 files changed, 103 insertions(+), 93 deletions(-) commit dff936be3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 22 15:45:41 2018 +0100 Converted the auth functions to be consistent with the latest code web/auth/auth_cas.inc | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) commit 2b36bf9b1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 22 15:35:12 2018 +0100 Added MRBS namespace for consistency with other auth and session files web/auth/auth_cas.inc | 3 +++ web/session/session_cas.inc | 3 +++ 2 files changed, 6 insertions(+) commit 7da502e11 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 22 15:29:46 2018 +0100 Initialised CAS web/auth/auth_cas.inc | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) commit 919a1ac7f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 22 15:22:09 2018 +0100 Added main CAS files .../CAS/AuthenticationException.php (new) | 111 + web/lib/CAS/Autoload.php (new) | 105 + web/lib/CAS/Client.php (new) | 3935 ++++++++++++++++ web/lib/CAS/CookieJar.php (new) | 385 ++ web/lib/CAS/Exception.php (new) | 59 + .../GracefullTerminationException.php (new) | 86 + .../CAS/InvalidArgumentException.php (new) | 46 + web/lib/CAS/Languages/Catalan.php (new) | 114 + .../Languages/ChineseSimplified.php (new) | 114 + web/lib/CAS/Languages/English.php (new) | 114 + web/lib/CAS/Languages/French.php (new) | 116 + web/lib/CAS/Languages/German.php (new) | 116 + web/lib/CAS/Languages/Greek.php (new) | 115 + web/lib/CAS/Languages/Japanese.php (new) | 113 + .../Languages/LanguageInterface.php (new) | 96 + web/lib/CAS/Languages/Spanish.php (new) | 117 + ...foreAuthenticationCallException.php (new) | 56 + ...OfSequenceBeforeClientException.php (new) | 58 + ...tOfSequenceBeforeProxyException.php (new) | 59 + web/lib/CAS/OutOfSequenceException.php (new) | 49 + .../CAS/PGTStorage/AbstractStorage.php (new) | 222 + web/lib/CAS/PGTStorage/Db.php (new) | 440 ++ web/lib/CAS/PGTStorage/File.php (new) | 261 + web/lib/CAS/ProxiedService.php (new) | 72 + .../CAS/ProxiedService/Abstract.php (new) | 149 + .../CAS/ProxiedService/Exception.php (new) | 46 + web/lib/CAS/ProxiedService/Http.php (new) | 91 + .../ProxiedService/Http/Abstract.php (new) | 360 ++ .../CAS/ProxiedService/Http/Get.php (new) | 85 + .../CAS/ProxiedService/Http/Post.php (new) | 152 + web/lib/CAS/ProxiedService/Imap.php (new) | 280 ++ .../CAS/ProxiedService/Testable.php (new) | 75 + web/lib/CAS/ProxyChain.php (new) | 127 + web/lib/CAS/ProxyChain/AllowedList.php (new) | 119 + web/lib/CAS/ProxyChain/Any.php (new) | 64 + web/lib/CAS/ProxyChain/Interface.php (new) | 53 + web/lib/CAS/ProxyChain/Trusted.php (new) | 59 + web/lib/CAS/ProxyTicketException.php (new) | 71 + .../CAS/Request/AbstractRequest.php (new) | 379 ++ .../CAS/Request/CurlMultiRequest.php (new) | 146 + web/lib/CAS/Request/CurlRequest.php (new) | 200 + web/lib/CAS/Request/Exception.php (new) | 45 + .../Request/MultiRequestInterface.php (new) | 83 + .../CAS/Request/RequestInterface.php (new) | 179 + web/lib/CAS/TypeMismatchException.php (new) | 70 + 45 files changed, 9792 insertions(+) commit bee21944d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 22 15:15:59 2018 +0100 Renamed file so that it would autoload web/lib/{CAS.php => phpCAS.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) commit ecbee339a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 22 15:03:38 2018 +0100 Initial drop of CAS files web/auth/auth_cas.inc (new) | 76 + web/lib/CAS.php (new) | 1994 +++++++++++++++++++++++++++ web/session/session_cas.inc (new) | 72 + 3 files changed, 2142 insertions(+) commit 8f14308d3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 21 12:25:53 2018 +0100 Opened a new named branch for the development of CAS authentication commit d128def69 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 21 11:55:53 2018 +0100 Interim commit web/functions_table.inc | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) commit 122dfa419 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 10 18:41:41 2018 +0100 Made multiple bookings work web/css/mrbs.css.php | 46 +------ web/functions_table.inc | 276 +++++++++----------------------------- 2 files changed, 73 insertions(+), 249 deletions(-) commit 03012d34a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 10 16:50:41 2018 +0100 Restructured web/functions_table.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 411ec2f99 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 10 16:13:07 2018 +0100 Restructured web/functions_table.inc | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) commit 95ecafa2d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 10 15:57:19 2018 +0100 Restructured, shifting the classes that describe a booking from the <td> to the <div>, in preparation for having multiple bookings in a cell. web/css/mrbs.css.php | 44 ++++++++++++++--------- web/functions_table.inc | 74 ++++++++++++++++++++++----------------- web/js/resizable.js.php | 18 ++++------ 3 files changed, 76 insertions(+), 60 deletions(-) commit bc7a23d66 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 10 14:48:05 2018 +0100 Renamed class web/css/mrbs.css.php | 6 +++--- web/functions_table.inc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) commit 939a10099 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 10 13:12:06 2018 +0100 Restructured web/functions_table.inc | 55 ++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 27 deletions(-) commit a414534ca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 10 12:45:18 2018 +0100 Restructured web/functions_table.inc | 70 +++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 35 deletions(-) commit 8cd84d7ea Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 10 12:24:52 2018 +0100 Restructured web/functions_table.inc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) commit 1f86cc2a0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 10 12:14:40 2018 +0100 Renamed $descr to $name for consistency with the entry table web/functions_table.inc | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) commit 7ac098fb6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 10 12:03:44 2018 +0100 Renamed $long_descr to $description for consistency with the entry table web/functions_table.inc | 102 +++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 51 deletions(-) commit be06f320f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 10 11:46:54 2018 +0100 Moved the point of html escaping to make it more obvious web/functions_table.inc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) commit 61c707ebe Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 10 11:31:22 2018 +0100 Renamed variable web/functions_table.inc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) commit 2d3a8189d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri May 11 07:19:55 2018 +0100 Restructured web/js/resizable.js.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 2a4eb53d5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri May 11 07:16:04 2018 +0100 Restructured and turned row highlighting back on, though there ae still some problems with row highlighting to be fixed. web/js/resizable.js.php | 117 +++++++++++++++++++------------------- 1 file changed, 58 insertions(+), 59 deletions(-) commit 668e0dff1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri May 11 06:33:20 2018 +0100 Fixed another case when a booking couldn't be resized when it was adjacent to another and the browser zoom level was not 100%. web/js/resizable.js.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 08b25ea7b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 10 14:51:52 2018 +0100 Improved resilience when the browser zoom level is not 100% web/js/resizable.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 3b8a875b9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 10 14:48:23 2018 +0100 Restructured web/js/resizable.js.php | 708 +++++++++++++++++++------------------- 1 file changed, 352 insertions(+), 356 deletions(-) commit f7077fbfa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 9 09:15:30 2018 +0100 Took account of browser zoom level in snapToGrid() web/js/resizable.js.php | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) commit b4f6190d2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 9 07:35:14 2018 +0100 Simplified code web/js/resizable.js.php | 211 ++++++++++++++++++-------------------- 1 file changed, 101 insertions(+), 110 deletions(-) commit 941e06216 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 9 07:27:01 2018 +0100 Fixed problem with resizing adjacent bookings when the browser zoom level is less than 100% web/js/resizable.js.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit 280415835 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue May 8 07:02:58 2018 +0100 Fixed bug causing the booking to be the wrong size after the browser zoom level is changed if the booking had previously been resized to the same size. web/js/resizable.js.php | 6 ++++++ 1 file changed, 6 insertions(+) commit 449b14d2b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon May 7 07:40:46 2018 +0100 Improved code for testing whether rectangles are identical web/js/resizable.js.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) commit 7830f4155 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon May 7 07:32:35 2018 +0100 Added the includeBorder parameter to getSides() web/js/resizable.js.php | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) commit 4929a19d4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon May 7 07:21:21 2018 +0100 Added a better fix for the problem of sometimes not being able to resize bookings if they are adjacent to another booking web/js/resizable.js.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 6d2265076 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon May 7 06:36:10 2018 +0100 Used a simpler and more efficient algorithm for determining if two rectangles overlap. web/js/resizable.js.php | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) commit c5322ad70 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 5 18:54:24 2018 +0100 Fixed bug in some browsers preventing bookings being resized if they are adjacent to another web/js/resizable.js.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) commit 393aad7b5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 5 15:05:22 2018 +0100 Simplified code for tutning on and off page refresh web/js/refresh.js.php | 34 +++++++++++----------------------- web/js/resizable.js.php | 28 +++++++++------------------- 2 files changed, 20 insertions(+), 42 deletions(-) commit ea586821e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 5 14:24:35 2018 +0100 Improved resizing start-up performance by avoiding the need to change the DOM web/css/mrbs.css.php | 31 +++++++++++++++++++++---------- web/js/resizable.js.php | 22 ++++++++++++++-------- 2 files changed, 35 insertions(+), 18 deletions(-) commit 7d2961555 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri May 4 16:21:23 2018 +0100 Improved performance of resizing, especially on pages with lots of bookings. The resize helper should now appear more quickly when a resize starts. web/js/resizable.js.php | 89 ++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 49 deletions(-) commit 09ba932e3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 3 17:15:57 2018 +0100 Simplified code web/js/resizable.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 54b7964a3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 3 16:17:20 2018 +0100 Reverted to using jQuery .outerWidth/Height instead of .css web/js/resizable.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 72b922a4d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 3 16:12:51 2018 +0100 Removed redundant code web/js/resizable.js.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit ea228a952 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 3 15:36:05 2018 +0100 Simplified code web/js/resizable.js.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit f280d410c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 3 14:54:29 2018 +0100 Made it impossible to resize to less than one slot height web/css/mrbs.css.php | 1 + web/js/resizable.js.php | 39 +++++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 18 deletions(-) commit 66438a4b9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 3 14:30:42 2018 +0100 Simplified code web/js/resizable.js.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit d888a3426 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 3 14:12:00 2018 +0100 Fixed bumping into overlaps east web/js/resizable.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 165ca54fe Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 3 14:07:58 2018 +0100 Fixed bumping into overlaps west web/js/resizable.js.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit be085490b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 3 13:59:21 2018 +0100 Fixed bumping into overlaps north and south web/js/resizable.js.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 118fd9877 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 3 12:58:06 2018 +0100 Fixed problem with dragging to the right-hand edge falling a few pixels short web/js/resizable.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit c6f1edb00 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 3 12:37:26 2018 +0100 Simplified code web/js/resizable.js.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 4bd488396 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 2 16:35:45 2018 +0100 Fixed bug causing resizing not to work when the page has been scrolled web/js/resizable.js.php | 83 ++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 40 deletions(-) commit 954814c6e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 2 09:19:34 2018 +0100 Fixed bug causing MRBS not to return to the correct view and room after making a booking. web/edit_entry_handler.php | 3 --- 1 file changed, 3 deletions(-) commit 64010db71 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue May 1 18:41:27 2018 +0100 Fixed display of bookings for IE10 and IE11 web/css/mrbs.css.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) commit 3760d5b48 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue May 1 17:14:55 2018 +0100 Switched back to using a wrapping div for all bookings web/functions_table.inc | 11 ++++++++++- web/js/resizable.js.php | 7 +------ 2 files changed, 11 insertions(+), 7 deletions(-) commit 4a5fc20ab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue May 1 14:18:56 2018 +0100 Made resizing work if the result is a conflict or policy violation web/edit_entry_handler.php | 21 +++++++++++++-------- web/js/resizable.js.php | 36 +++++++++++++++--------------------- 2 files changed, 28 insertions(+), 29 deletions(-) commit 75c7186d7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue May 1 13:40:41 2018 +0100 Tweaks web/css/mrbs.css.php | 7 ++++--- web/js/resizable.js.php | 9 +++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) commit 9e54029be Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 30 16:31:15 2018 +0100 Renamed functions web/js/resizable.js.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) commit a9c5840eb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 30 16:24:48 2018 +0100 Removed debugging code preventing the Ajax post calls from being made web/js/resizable.js.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 8c6d6f2f8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 30 15:57:11 2018 +0100 Tweaked CSS web/css/mrbs.css.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit d8d2af59b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 30 15:52:20 2018 +0100 Removed debugging web/js/resizable.js.php | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) commit ea51a2829 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 30 15:22:20 2018 +0100 Implemented floating headers using CSS rather than JavaScript. Not suported in all browsers, but cuts out lots out a lot of expensive JavaScript. web/Themes/default/styling.inc | 2 +- web/css/mrbs.css.php | 13 ++--- web/js/general.js.php | 92 +------------------------------- web/js/refresh.js.php | 2 - web/js/resizable.js.php | 8 +-- 5 files changed, 11 insertions(+), 106 deletions(-) commit 1a2ffd314 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 30 13:56:04 2018 +0100 Reverted to using jQuery for setting offset, height and width, now that we're wrapping the booking in a div that doesn't use border-box. web/js/resizable.js.php | 82 ++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 44 deletions(-) commit 5a69d3727 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 29 15:36:58 2018 +0100 Simplified code web/js/resizable.js.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) commit 019e7248d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 29 15:30:57 2018 +0100 Simplified code web/js/resizable.js.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit 51eaeded2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 29 15:23:06 2018 +0100 Moved a function out of a function web/js/resizable.js.php | 342 +++++++++++++++++++------------------- 1 file changed, 168 insertions(+), 174 deletions(-) commit 11eb4e6d8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 29 15:15:43 2018 +0100 Moved functions out of a function and also solved the problem of extra hidden elements web/js/resizable.js.php | 454 +++++++++++++++++++------------------- 1 file changed, 226 insertions(+), 228 deletions(-) commit 153b4fb84 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 29 14:34:56 2018 +0100 Removed hidden elements left around by jQuery UI Resizable web/js/resizable.js.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) commit 7a6980956 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 29 14:09:04 2018 +0100 Removed redundant code web/js/resizable.js.php | 12 ------------ 1 file changed, 12 deletions(-) commit c7699ec05 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 29 14:06:13 2018 +0100 Wrapped resizable bookings in a div to get round the problems that jQuery UI Resizable has with border-box web/css/mrbs.css.php | 13 +++++++++---- web/js/resizable.js.php | 30 +++++++++++++++++++----------- 2 files changed, 28 insertions(+), 15 deletions(-) commit 965aee0ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 29 10:13:00 2018 +0100 Rewrote resizable code. web/css/mrbs.css.php | 6 ++- web/js/resizable.js.php | 82 ++++++++++++++++++++++++++------------- 2 files changed, 59 insertions(+), 29 deletions(-) commit eaca28fe9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 28 10:42:00 2018 +0100 Added comment web/js/resizable.js.php | 6 ++++++ 1 file changed, 6 insertions(+) commit 0d6e80692 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 28 10:37:45 2018 +0100 Rewrote snapToGrid() to use raw JavaScript because jQuery 3.3.1 has problems when using .outerWidth() as a setter when box-sizing os border-box and the browser zoom level is not 100%. web/css/mrbs.css.php | 22 ++-- web/js/resizable.js.php | 237 +++++++++++++++++--------------------- 2 files changed, 117 insertions(+), 142 deletions(-) commit 64691175b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 27 13:51:26 2018 +0100 Upgraded to jQuery 3.3.1 to get the fix for https://github.com/jquery/jquery/issues/3808 (css() reports wrong width/height in Chrome on certain zoom levels). web/jquery/jquery-3.2.1.min.js (gone) | 4 - .../{jquery-3.2.1.js => jquery-3.3.1.js} | 795 ++++++++++------- web/jquery/jquery-3.3.1.min.js (new) | 2 + web/js.inc | 4 +- 4 files changed, 457 insertions(+), 348 deletions(-) commit 5cf4e6927 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 23 12:18:57 2018 +0100 Added the Week number into the week view header when $mincals_week_numbers and $weekstarts == 1. web/index.php | 12 +++++++++++- web/lang/lang.en | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) commit e08d3b713 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 17 15:15:16 2018 +0100 Used css('width') instead of outerWidth() on border-box elements for performance web/css/mrbs.css.php | 3 +++ web/js/resizable.js.php | 55 ++++++++++++++++----------------------- 2 files changed, 25 insertions(+), 33 deletions(-) commit 77242d3c8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 16 10:01:59 2018 +0100 Added comment web/js/resizable.js.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) commit fba53926f Merge: 3af56cc2d 69b6073bf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 15 18:20:43 2018 +0100 Merge with default commit 69b6073bf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 15 18:20:00 2018 +0100 Improved last fix web/edit_entry_handler.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) commit 3af56cc2d Merge: 6808b16e4 3f007d82b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 15 18:12:04 2018 +0100 Merge with default commit 3f007d82b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 15 18:09:44 2018 +0100 Fixed bug causing edit_entry_handler to go to today when finished rather than the day of the srtart of the booking. web/edit_entry_handler.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 6808b16e4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 15 17:49:15 2018 +0100 Removed debugging aid web/js/resizable.js.php | 1 - 1 file changed, 1 deletion(-) commit 74f97a273 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 15 17:46:33 2018 +0100 Fixed colour of row labels when resizing web/css/mrbs.css.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) commit 68f362383 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 15 17:35:14 2018 +0100 Reverted previous change as the snap to grid didn't work properly web/js/resizable.js.php | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) commit 0608dfb85 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 15 17:16:39 2018 +0100 Simplified code web/js/resizable.js.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 20b6e0c41 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 15 16:57:06 2018 +0100 Tweaked CSS web/css/mrbs.css.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1d6fce3a9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 15 16:47:31 2018 +0100 Fixed a 1px problem with SnapToGrid when resizing left web/js/resizable.js.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) commit 4c24fa375 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 15 16:08:12 2018 +0100 Rewrote the resizing code. Also fixed a bug which was present in the old code which meant that resizing did not stop at another booking. web/css/mrbs.css.php | 2 + web/js/resizable.js.php | 314 ++++++++++++++++++++++++++------------ 2 files changed, 222 insertions(+), 94 deletions(-) commit 67e9c7ba7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 13 12:19:50 2018 +0100 Renamed variables web/js/resizable.js.php | 148 +++++++++++++++++++------------------- 1 file changed, 74 insertions(+), 74 deletions(-) commit b697263c5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 13 12:02:34 2018 +0100 Changed $main_cell_height to be in em rather than px web/Themes/classic126/styling.inc | 2 +- web/Themes/default/styling.inc | 2 +- web/css/mrbs.css.php | 12 ++++++------ web/functions_table.inc | 6 +++--- web/js/resizable.js.php | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) commit f55e72654 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 13 11:46:09 2018 +0100 Removed redundant code web/js/resizable.js.php | 1 - 1 file changed, 1 deletion(-) commit 430b3d320 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 13 11:19:06 2018 +0100 Tweaked CSS and fixed a one pixel shift when an element is resized web/css/mrbs.css.php | 11 ++++++++--- web/js/resizable.js.php | 7 ++----- 2 files changed, 10 insertions(+), 8 deletions(-) commit c9193880d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 13 10:46:32 2018 +0100 Interim commit of improvements to visual feedback on saving a resized booking web/css/mrbs.css.php | 36 ++++++++++++++++++++++++++++++++++++ web/js/resizable.js.php | 29 ++++++++++------------------- web/lang/lang.cs | 1 - web/lang/lang.de | 1 - web/lang/lang.en | 2 +- web/lang/lang.es | 2 -- web/lang/lang.fi | 1 - web/lang/lang.id | 1 - web/lang/lang.it | 5 ++++- web/lang/lang.pl | 2 +- web/lang/lang.ro | 1 - web/lang/lang.sk | 1 - web/lang/lang.sr-latn-rs | 1 - web/lang/lang.sv | 1 - web/lang/lang.zh-cn | 1 - 15 files changed, 52 insertions(+), 33 deletions(-) commit 479618f0a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 12 16:50:49 2018 +0100 Fixed link hover colour web/Themes/default/styling.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a6796d09a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 12 16:27:42 2018 +0100 Fixed feedback on booking resizing web/js/resizable.js.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) commit f953cdd4a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 12 15:19:01 2018 +0100 Renamed variables web/js/resizable.js.php | 58 +++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 29 deletions(-) commit c48ba94bb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 12 15:08:12 2018 +0100 Renamed variable web/js/resizable.js.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) commit f0e741fbc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 12 15:03:50 2018 +0100 Fixed horizontal snapping to grid web/js/resizable.js.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit abc382f63 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 12 15:00:39 2018 +0100 Started getting rid of enclosing divs in booked cells web/css/mrbs.css.php | 35 +++++++++++------------------------ web/functions_table.inc | 14 +++++++------- web/js/resizable.js.php | 20 ++++++++++---------- 3 files changed, 28 insertions(+), 41 deletions(-) commit 4fbc1866c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 12 12:55:04 2018 +0100 Restructured web/functions_table.inc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) commit 06578c207 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 12 12:41:27 2018 +0100 Got rid of enclosing div for new bookings web/css/mrbs.css.php | 19 +++++++++++++------ web/functions_table.inc | 2 -- 2 files changed, 13 insertions(+), 8 deletions(-) commit ac5a5e246 Merge: 5f6a3e8a6 226d05a22 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 11 20:04:50 2018 +0100 Merge with default commit 226d05a22 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 11 19:21:56 2018 +0100 Fixed bug whereby the password_hash would be wiped if the password field was left blank. The bug was introduced during the forms_rewrite. web/edit_users.php | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) commit 5f6a3e8a6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 11 16:07:33 2018 +0100 Replaced repeat symbol image with CSS generated character web/css/mrbs.css.php | 7 +++-- web/functions_table.inc | 49 +++++++++++++++++---------------- web/images/repeat.png (gone) | Bin 469 -> 0 bytes 3 files changed, 31 insertions(+), 25 deletions(-) commit 186c63b03 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 11 14:09:17 2018 +0100 Fixed bug in last change web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6a20cec43 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 11 13:58:27 2018 +0100 Restructured web/functions_table.inc | 61 ++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 24 deletions(-) commit 7e431dcdb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 10 20:26:36 2018 +0100 Ensured all table rows are the same height web/css/mrbs.css.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 6d17f287b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 10 19:09:02 2018 +0100 Major revamp of the CSS for the calendar view table, getting rid of the need for the $max_slots config variable UPGRADE | 5 +-- web/css/mrbs.css.php | 70 +++++++++--------------------------- web/edit_area_handler.php | 8 ----- web/functions_table.inc | 3 +- web/lang/lang.cs | 1 - web/lang/lang.de | 1 - web/lang/lang.en | 1 - web/lang/lang.es | 1 - web/lang/lang.fi | 1 - web/lang/lang.fr | 1 - web/lang/lang.he | 1 - web/lang/lang.hu | 1 - web/lang/lang.id | 1 - web/lang/lang.it | 1 - web/lang/lang.ja | 1 - web/lang/lang.nb | 1 - web/lang/lang.nl | 1 - web/lang/lang.nn | 1 - web/lang/lang.no | 1 - web/lang/lang.pl | 1 - web/lang/lang.pt | 1 - web/lang/lang.pt-br | 1 - web/lang/lang.ro | 1 - web/lang/lang.ru | 1 - web/lang/lang.sk | 1 - web/lang/lang.sr-latn-rs | 1 - web/lang/lang.sv | 1 - web/lang/lang.th | 1 - web/lang/lang.tr | 1 - web/lang/lang.zh-cn | 1 - web/systemdefaults.inc.php | 12 ------- 31 files changed, 21 insertions(+), 103 deletions(-) commit 04b8907d9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 10 14:58:03 2018 +0100 Fixed layout problem with the zebra stripes in the main table (the white stripes were previously 2px wider than the grey stripes). web/Themes/default/styling.inc | 4 ++-- web/css/mrbs.css.php | 16 ++++++++++++---- web/functions_table.inc | 6 +++--- 3 files changed, 17 insertions(+), 9 deletions(-) commit 26961fee7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 8 17:24:54 2018 +0100 Made the mini-calendars display by default web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 954c540ef Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 8 17:18:22 2018 +0100 Tweaked CSS web/Themes/default/styling.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit acea34bac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 8 16:57:58 2018 +0100 Removed unnecessary rule web/css/mrbs.css.php | 1 - 1 file changed, 1 deletion(-) commit d834117bc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 8 16:50:18 2018 +0100 Tweaked colours in header web/css/mrbs.css.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit f31e68b31 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 8 16:40:32 2018 +0100 Modified the flatpickr blue to be the same as the MRBS blue web/css/mrbs.css.php | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) commit af04712b3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 8 16:16:54 2018 +0100 Aligned top of minicalends with top of navigation bar web/Themes/default/styling.inc | 2 +- web/css/mrbs.css.php | 5 +++-- web/js/datepicker.js.php | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) commit dcdb40ab4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 8 15:31:40 2018 +0100 Changed highlighting colour web/css/mrbs.css.php | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) commit b3ef880f2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 8 15:12:40 2018 +0100 Changed default style web/Themes/default/styling.inc | 10 +- web/css/mrbs.css.php | 153 +++++++++++++++++++++++++------ 2 files changed, 130 insertions(+), 33 deletions(-) commit 803042c0f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 8 10:33:22 2018 +0100 Replaced odd_row and even_row classes with nth-child CSS selectors web/css/mrbs.css.php | 21 +++++++++++++++---- web/functions_table.inc | 43 +++++++++++++++++++++------------------ 2 files changed, 40 insertions(+), 24 deletions(-) commit cbf2bb27c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 7 08:38:33 2018 +0100 Added comment web/systemdefaults.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit bd16eb4c5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 7 08:35:50 2018 +0100 Added licence statement for jQuery-visible. LICENSE | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit 5d9a8674c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 7 08:27:08 2018 +0100 Restricted the display of mini-calendars to wide screens. web/css/mrbs.css.php | 9 +++++++++ web/js/datepicker.js.php | 10 ++++++++++ 2 files changed, 19 insertions(+) commit a65bdac1b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 6 16:52:52 2018 +0100 Tweaked CSS web/css/mrbs.css.php | 1 + web/js/datepicker.js.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) commit 201943d46 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 6 15:36:00 2018 +0100 Stopped the main table being shown until the mini-calendars are in place, in order to avoid the screen jiggling around web/index.php | 2 +- web/js/datepicker.js.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) commit e1dd5e9c8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 6 15:25:46 2018 +0100 Made the mini-calendar links work web/js/datepicker.js.php | 10 ++++++++++ 1 file changed, 10 insertions(+) commit 1289a65e2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 6 14:58:57 2018 +0100 Made the other mini-calndars change when you change the year on one of them web/js/datepicker.js.php | 71 ++++++++++++++++++++++-------------- web/systemdefaults.inc.php | 3 ++ 2 files changed, 47 insertions(+), 27 deletions(-) commit 18f44153a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 5 20:39:51 2018 +0100 Fixed a problem with the Select2 boxes in the bottom navigation bar web/index.php | 13 ++----- web/js/datepicker.js.php | 80 ++++++++++++++++++++++++++++++-------- web/js/index.js.php | 20 ++++++++-- 3 files changed, 83 insertions(+), 30 deletions(-) commit 56cb21e9c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 5 12:14:35 2018 +0100 Disabled conversion to Select2 on mobile devices as their native select elements tend to be superior. web/js/datepicker.js.php | 10 ++-------- web/js/functions.js.php | 5 +++++ web/js/index.js.php | 23 ++++++++++++++--------- 3 files changed, 21 insertions(+), 17 deletions(-) commit c95b9b2cf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 5 11:51:33 2018 +0100 Fixed a problem that Select2 seems to have in that it doesn't always make its boxes wide enough to display the selected option. web/js/index.js.php | 8 ++++++++ 1 file changed, 8 insertions(+) commit 3c85423cd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 5 11:40:01 2018 +0100 Hid the select elements while the conversion to Select2 is taking place, to avoid the screen jiggling around web/css/mrbs.css.php | 2 +- web/index.php | 2 +- web/js.inc | 1 + web/js/index.js.php | 6 ++++++ web/style.inc | 1 + 5 files changed, 10 insertions(+), 2 deletions(-) commit bebc4707e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 5 11:21:47 2018 +0100 Fixed CSS for Select2 elements web/css/mrbs.css.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) commit 4d92eca3c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 5 11:12:33 2018 +0100 Added Select2 licence statement LICENSE | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit 0a2497ec0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 5 11:07:54 2018 +0100 Added Select2 4.06 RC1 web/jquery/select2/LICENSE.md (new) | 21 + .../select2/dist/css/select2.css (new) | 484 ++ .../select2/dist/css/select2.min.css (new) | 1 + web/jquery/select2/dist/js/i18n/af.js (new) | 3 + web/jquery/select2/dist/js/i18n/ar.js (new) | 3 + web/jquery/select2/dist/js/i18n/az.js (new) | 3 + web/jquery/select2/dist/js/i18n/bg.js (new) | 3 + web/jquery/select2/dist/js/i18n/bs.js (new) | 3 + web/jquery/select2/dist/js/i18n/ca.js (new) | 3 + web/jquery/select2/dist/js/i18n/cs.js (new) | 3 + web/jquery/select2/dist/js/i18n/da.js (new) | 3 + web/jquery/select2/dist/js/i18n/de.js (new) | 3 + web/jquery/select2/dist/js/i18n/dsb.js (new) | 3 + web/jquery/select2/dist/js/i18n/el.js (new) | 3 + web/jquery/select2/dist/js/i18n/en.js (new) | 3 + web/jquery/select2/dist/js/i18n/es.js (new) | 3 + web/jquery/select2/dist/js/i18n/et.js (new) | 3 + web/jquery/select2/dist/js/i18n/eu.js (new) | 3 + web/jquery/select2/dist/js/i18n/fa.js (new) | 3 + web/jquery/select2/dist/js/i18n/fi.js (new) | 3 + web/jquery/select2/dist/js/i18n/fr.js (new) | 3 + web/jquery/select2/dist/js/i18n/gl.js (new) | 3 + web/jquery/select2/dist/js/i18n/he.js (new) | 3 + web/jquery/select2/dist/js/i18n/hi.js (new) | 3 + web/jquery/select2/dist/js/i18n/hr.js (new) | 3 + web/jquery/select2/dist/js/i18n/hsb.js (new) | 3 + web/jquery/select2/dist/js/i18n/hu.js (new) | 3 + web/jquery/select2/dist/js/i18n/hy.js (new) | 3 + web/jquery/select2/dist/js/i18n/id.js (new) | 3 + web/jquery/select2/dist/js/i18n/is.js (new) | 3 + web/jquery/select2/dist/js/i18n/it.js (new) | 3 + web/jquery/select2/dist/js/i18n/ja.js (new) | 3 + web/jquery/select2/dist/js/i18n/km.js (new) | 3 + web/jquery/select2/dist/js/i18n/ko.js (new) | 3 + web/jquery/select2/dist/js/i18n/lt.js (new) | 3 + web/jquery/select2/dist/js/i18n/lv.js (new) | 3 + web/jquery/select2/dist/js/i18n/mk.js (new) | 3 + web/jquery/select2/dist/js/i18n/ms.js (new) | 3 + web/jquery/select2/dist/js/i18n/nb.js (new) | 3 + web/jquery/select2/dist/js/i18n/nl.js (new) | 3 + web/jquery/select2/dist/js/i18n/pl.js (new) | 3 + web/jquery/select2/dist/js/i18n/ps.js (new) | 3 + .../select2/dist/js/i18n/pt-BR.js (new) | 3 + web/jquery/select2/dist/js/i18n/pt.js (new) | 3 + web/jquery/select2/dist/js/i18n/ro.js (new) | 3 + web/jquery/select2/dist/js/i18n/ru.js (new) | 3 + web/jquery/select2/dist/js/i18n/sk.js (new) | 3 + web/jquery/select2/dist/js/i18n/sl.js (new) | 3 + .../select2/dist/js/i18n/sr-Cyrl.js (new) | 3 + web/jquery/select2/dist/js/i18n/sr.js (new) | 3 + web/jquery/select2/dist/js/i18n/sv.js (new) | 3 + web/jquery/select2/dist/js/i18n/th.js (new) | 3 + web/jquery/select2/dist/js/i18n/tk.js (new) | 3 + web/jquery/select2/dist/js/i18n/tr.js (new) | 3 + web/jquery/select2/dist/js/i18n/uk.js (new) | 3 + web/jquery/select2/dist/js/i18n/vi.js (new) | 3 + .../select2/dist/js/i18n/zh-CN.js (new) | 3 + .../select2/dist/js/i18n/zh-TW.js (new) | 3 + .../select2/dist/js/select2.full.js (new) | 6559 ++++++++++++++++ .../dist/js/select2.full.min.js (new) | 1 + web/jquery/select2/dist/js/select2.js (new) | 5847 ++++++++++++++ .../select2/dist/js/select2.min.js (new) | 1 + 62 files changed, 13079 insertions(+) commit a285c1a5b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 4 18:51:06 2018 +0100 Fixed HTML5 validation error and started adding minicalendars web/Themes/default/header.inc | 36 --------------------------------- web/css/mrbs.css.php | 36 +++++++++++++++++++++++++++++++-- web/index.php | 13 +++++++++++- web/js/datepicker.js.php | 14 +++++++++++++ web/js/index.js.php | 1 + 5 files changed, 61 insertions(+), 39 deletions(-) commit 4096cfb61 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 4 16:07:48 2018 +0100 Tweaked the CSS for the logo web/css/mrbs.css.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) commit ebb7eb160 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 3 16:03:30 2018 +0100 Included the Import utility in the menu. web/Themes/default/header.inc | 1 + 1 file changed, 1 insertion(+) commit 653919df3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 1 17:43:04 2018 +0100 Tweaked CSS web/css/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit c461b500d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 1 17:35:32 2018 +0100 Made the banner wrap in IE10 web/css/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit 36e9289e7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 1 16:24:00 2018 +0100 Tweaked CSS web/css/mrbs.css.php | 2 ++ 1 file changed, 2 insertions(+) commit 6e194ebe6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 1 15:22:51 2018 +0100 Fixed banner layout in IE10 web/css/mrbs.css.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) commit 280830586 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 1 11:53:17 2018 +0100 Improved the dispay of the color_key in IE10 by using flexbox. web/css/mrbs.css.php | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) commit 06528a875 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 1 11:33:26 2018 +0100 Fixed display of calendar navigation for IE10. web/css/mrbs.css.php | 7 +++++++ 1 file changed, 7 insertions(+) commit 04633f2af Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 1 09:39:42 2018 +0100 Fixed comment web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ab9ad695a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 31 15:13:45 2018 +0100 Fixed the capitalisation of the view links (Day/Week/Month) in IE9 and IE10. web/css/mrbs.css.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) commit b9fdf9401 Merge: e7fe986e0 6980f3f0a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 31 12:27:24 2018 +0100 Merge with default commit 6980f3f0a Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Mar 31 08:53:24 2018 +0100 Fixed typo in upgrade script comment. web/upgrade/55/mysql.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5dde4ffcc Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Mar 31 08:52:03 2018 +0100 Added missing upgrade files. web/upgrade/55/mysql.sql (new) | 12 ++++++++++++ web/upgrade/55/pgsql.sql (new) | 0 2 files changed, 12 insertions(+) commit d184631ac Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Mar 30 19:06:23 2018 +0100 Set the zoneinfo table back to utf8. tables.my.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit ca80f4e00 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Mar 30 19:05:06 2018 +0100 Fixed typo in MySQL version requirement README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 79c9e0cfe Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Mar 30 19:03:49 2018 +0100 Changed MySQL schema/connection to use "utf8mb4" character set, in order to support full Unicode. This adds a requirement on MySQL 5.3.3 or later. INSTALL | 2 +- README | 2 +- tables.my.sql | 88 ++++++++++++++++++------------------- tables.pg.sql | 2 +- web/dbsys.inc | 2 +- web/lib/MRBS/DB.php | 3 +- web/lib/MRBS/DB_mysql.php | 1 + 7 files changed, 51 insertions(+), 49 deletions(-) commit e7fe986e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 30 14:58:43 2018 +0100 Added the flatpickr licence. LICENSE | 6 ++++++ web/js/flatpickr/LICENSE.md (new) | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+) commit 7f34496b7 Merge: d0fc52103 06d4e3638 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 30 14:49:59 2018 +0100 Merge with default commit 06d4e3638 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 30 14:49:19 2018 +0100 Added licensing information LICENSE (new) | 52 +++++++++++++++++++++++++++++++ web/jquery/ui/LICENSE.txt (new) | 43 +++++++++++++++++++++++++ 2 files changed, 95 insertions(+) commit d0fc52103 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 21 13:38:19 2018 +0000 Fixed the initial state of the bottom nav bar web/index.php | 12 +++++++----- web/js/index.js.php | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) commit 7e0d0602b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 21 12:48:14 2018 +0000 Made the bottom navigation bar only visible if the top one isn't. web/js/functions.js.php | 86 +++++++++++++++++++++++++++++++++++++ web/js/index.js.php (new) | 41 ++++++++++++++++++ 2 files changed, 127 insertions(+) commit 37b532439 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 21 12:18:22 2018 +0000 Fixed bug leading to JS error in the month view when resizing the window. web/js/resizable.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2ed1f8e7a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 21 11:37:12 2018 +0000 Fixed bug leading to JS error in the month view. web/js/resizable.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit deb225f0d Merge: 9b250d195 ebfc2b67c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 18 15:14:43 2018 +0000 Merge with default commit ebfc2b67c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 18 15:09:28 2018 +0000 Relaxed CSRF token checking, so that the token isn't checked for GET requests to read-only pages such as Search and Report. web/lib/MRBS/Form/Form.php | 2 +- web/report.php | 2 +- web/search.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 1046bfc33 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 18 14:56:48 2018 +0000 Fixed bug when resizing a booking on a day that's not today web/edit_entry_handler.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 9b250d195 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 18 14:43:00 2018 +0000 Changed variable names and fixed bug when resizing bookings on a day that's not today. web/edit_entry_handler.php | 9 ++++----- web/js/resizable.js.php | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) commit 9cc4799d0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 16 18:46:20 2018 +0000 Fixed bug preventing resizable bookings from working web/edit_entry_handler.php | 4 ++-- web/js/refresh.js.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 5da3c4839 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 16 18:32:28 2018 +0000 Got rid of using PHP $is_admin in the JS files as the caching of JS files means that it's not necessarily valid. Fixed a few miscellaneous bugs on the way. web/js.inc | 12 +-- web/js/admin.js.php | 9 +- web/js/edit_area.js.php | 5 +- web/js/edit_entry.js.php | 15 +-- web/js/multiple.js.php | 3 - web/js/report.js.php | 202 ++++++++++++++++++------------------- web/js/resizable.js.php | 36 +++---- 7 files changed, 130 insertions(+), 152 deletions(-) commit 73ff6bc75 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 16 17:12:31 2018 +0000 Improved security by passing isAdmin via a variable rather than a class. web/Themes/default/header.inc | 10 +--------- web/js.inc | 5 +++++ web/js/datepicker.js.php | 19 ++++--------------- 3 files changed, 10 insertions(+), 24 deletions(-) commit 2051b8476 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 16 16:34:59 2018 +0000 Changed the way that hidden days are handled in the datepickers. They are now greyed out and disabled if you are not an admin. If you are an admin they are greyed out and enabled. web/Themes/default/header.inc | 11 ++++-- web/edit_entry.php | 2 -- web/js/datepicker.js.php | 62 ++++++++++++++++++++------------- 3 files changed, 46 insertions(+), 29 deletions(-) commit 5fa904aed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 16 13:51:28 2018 +0000 Made the datepickers in edit_entry disable hidden days web/Themes/default/header.inc | 2 +- web/edit_entry.php | 2 ++ web/js/datepicker.js.php | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) commit f5654e67d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 16 13:43:30 2018 +0000 Added hidden days to the datepicker web/Themes/default/header.inc | 1 + web/js/datepicker.js.php | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) commit 57e87a0ca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 15 16:53:03 2018 +0000 Made the default setting for reports admins only web/mrbs_auth.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8f2b74b18 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 15 16:49:34 2018 +0000 Only show the search boix if the user is authorised to use it web/Themes/default/header.inc | 6 ++++++ 1 file changed, 6 insertions(+) commit 689c50adb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 15 16:36:51 2018 +0000 Fixed bug introduced during last change web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 72dca4ca9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 15 16:24:40 2018 +0000 Stopped repeating the current search string in the header input now that the form field is populated. web/Themes/default/header.inc | 20 +++++++------------- web/functions.inc | 6 +++--- web/search.php | 2 +- 3 files changed, 11 insertions(+), 17 deletions(-) commit 1d26c13f0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 15 16:13:46 2018 +0000 Got rid of Search menu entry - we just have the search box now web/Themes/default/header.inc | 5 ++--- web/css/mrbs.css.php | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) commit 1547b4f21 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 15 16:02:37 2018 +0000 Added a search submit button for non-JavaScript users web/Themes/default/header.inc | 5 +++++ web/css/mrbs.css.php | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) commit 16b395087 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 15 15:41:35 2018 +0000 Included the search form with the search results web/Themes/default/header.inc | 2 +- web/css/mrbs.css.php | 6 +++ web/lang/lang.ca | 1 - web/lang/lang.cs | 1 - web/lang/lang.da | 1 - web/lang/lang.de | 1 - web/lang/lang.el | 1 - web/lang/lang.en | 3 +- web/lang/lang.es | 1 - web/lang/lang.eu | 1 - web/lang/lang.fi | 1 - web/lang/lang.fr | 1 - web/lang/lang.he | 1 - web/lang/lang.hu | 1 - web/lang/lang.id | 1 - web/lang/lang.it | 1 - web/lang/lang.ja | 1 - web/lang/lang.ko | 1 - web/lang/lang.nb | 1 - web/lang/lang.nl | 1 - web/lang/lang.nn | 1 - web/lang/lang.no | 1 - web/lang/lang.pl | 1 - web/lang/lang.pt | 1 - web/lang/lang.pt-br | 1 - web/lang/lang.ro | 1 - web/lang/lang.ru | 1 - web/lang/lang.sk | 1 - web/lang/lang.sl | 1 - web/lang/lang.sr-latn-rs | 1 - web/lang/lang.sv | 1 - web/lang/lang.th | 1 - web/lang/lang.tr | 1 - web/lang/lang.zh-cn | 1 - web/lang/lang.zh-tw | 1 - web/search.php | 78 ++++++++++++++++----------------- 36 files changed, 45 insertions(+), 76 deletions(-) commit 273196800 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 15 14:41:10 2018 +0000 Made language aliases case insensitive web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 76198e05f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 14 18:17:01 2018 +0000 Fixed CSS problem affecting datatables controls web/css/mrbs.css.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit ff8a87adc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 14 18:03:43 2018 +0000 Fixed a couple of bugs introduced during recent changes web/lib/MRBS/System.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit bee15ccbe Merge: 4dcca8e38 516d1e5ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 14 17:46:02 2018 +0000 Merge with default commit 516d1e5ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 14 17:45:22 2018 +0000 Fixed bug introduced during the forms_rewrite branch preventing the creation of a first admin user. web/edit_users.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) commit 4dcca8e38 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 14 16:46:44 2018 +0000 Improved messages when first setting up MRBS users. web/lang/lang.en | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 3148d6e1d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 14 16:34:42 2018 +0000 Added a check to see if MRBS has just been installed. This is (a) more friendly than requiring administrators to know that they have to folow the User List link and (b) necessary now that the link only appears if you are logged in. web/index.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) commit 496c075ad Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 14 15:14:10 2018 +0000 Changed the header so that menu items are only listed if the user is authorised to use them. web/Themes/default/header.inc | 42 +++++++++++++-------------------- web/js/general.js.php | 2 +- 2 files changed, 18 insertions(+), 26 deletions(-) commit bbbc17cd5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 14 14:36:00 2018 +0000 Created the function get_page_level() so that menu entries can only be displayed if the user is able to access the target page. web/add.php | 2 +- web/admin.php | 2 +- web/ajax/check_slot.php | 2 +- web/ajax/del_entry.php | 2 +- web/ajax/minicalendar.php | 2 +- web/approve_entry_handler.php | 2 +- web/del.php | 2 +- web/del_entry.php | 2 +- web/edit_area.php | 2 +- web/edit_area_handler.php | 2 +- web/edit_entry.php | 2 +- web/edit_entry_handler.php | 4 +- web/edit_room.php | 2 +- web/edit_room_handler.php | 2 +- web/edit_users.php | 2 +- web/help.php | 2 +- web/import.php | 2 +- web/index.php | 2 +- web/mrbs_auth.inc | 168 +++++++++++++++++--------------- web/pending.php | 2 +- web/report.php | 2 +- web/search.php | 2 +- web/view_entry.php | 2 +- 23 files changed, 113 insertions(+), 101 deletions(-) commit 78ed62c10 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 13 16:26:18 2018 +0000 Fixed space at the bottom of the page on IE10 and IE11. web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6dc7c6866 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 13 16:19:11 2018 +0000 Fixed the color key table in IE10 by falling back from a flexbox to floated divs. web/css/mrbs.css.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) commit 275068b6b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 13 15:40:40 2018 +0000 Fixed the color key table in IE11 by falling back from a grid to a flexbox. web/css/mrbs.css.php | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) commit cbe424502 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 13 15:12:14 2018 +0000 Changed color_key from an id to a class web/css/mrbs.css.php | 4 ++-- web/index.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 4a08ef0ad Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 13 14:50:17 2018 +0000 Fixed bug in the CSS web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f054dba42 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 11 18:01:24 2018 +0000 Fixed bug web/language.inc | 1 + web/lib/MRBS/System.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) commit db39fc7c4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 11 17:38:53 2018 +0000 Changed method name and updated comments web/lib/Locale.php | 2 +- web/lib/MRBS/System.php | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) commit 5ae57e0f2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 11 16:14:14 2018 +0000 Fixed problem with sdetting locales on some operating systems web/language.inc | 6 +- web/lib/MRBS/System.php | 178 ++++++++++++++++++++++---------------- 2 files changed, 108 insertions(+), 76 deletions(-) commit 81e213b95 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 11 11:03:04 2018 +0000 Fixed timezone issues with flatpickr web/js/datepicker.js.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit ff3fde614 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 11 11:02:19 2018 +0000 Tweaked the CSS web/css/mrbs.css.php | 4 ++++ 1 file changed, 4 insertions(+) commit cd6824784 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 11 10:12:20 2018 +0000 Tidied up web/js/datepicker.js.php | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) commit 03d549da2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 10 19:23:13 2018 +0000 Fixed custom formatting of dates web/js/datepicker.js.php | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) commit d296cfd37 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 10 13:19:05 2018 +0000 Completed flatpickr date localisation web/js/datepicker.js.php | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) commit 328fb4ecf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 10 12:24:37 2018 +0000 Started localisation of flatpickr date format web/js/datepicker.js.php | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) commit e5287f781 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 10 11:02:03 2018 +0000 Added comment. web/language.inc | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) commit 443c2bde7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 10 11:01:23 2018 +0000 Made $disable_automatic_language_changing a boolean. Old style truthy and falsy config settings will still work. web/systemdefaults.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1d02c4aa8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 10 10:45:18 2018 +0000 Got rid of the $need_to_send_mail global, converting it into a function web/approve_entry_handler.php | 6 +++--- web/del_entry.php | 4 ++-- web/edit_entry.php | 7 ++++--- web/edit_entry_handler.php | 9 +++++---- web/functions_mail.inc | 13 +++++++++++++ web/language.inc | 8 +------- 6 files changed, 28 insertions(+), 19 deletions(-) commit 1b0e49965 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 10 10:28:21 2018 +0000 Restructured, getting rid of the $mail_vocab global and delaying setting it until a mail is actually being sent. web/language.inc | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) commit 417fc2761 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 10 10:05:26 2018 +0000 Restructured, for consistency web/language.inc | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) commit 133ce5eaf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 10 09:51:22 2018 +0000 Restructured: added a use statement. web/language.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) commit e9bd91405 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 10 09:46:38 2018 +0000 Fixed fatal error when running on systems without the intl extension. web/lib/Locale.php | 3 +++ 1 file changed, 3 insertions(+) commit e7da49106 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 9 15:51:36 2018 +0000 Got rid of $using_rtl global web/language.inc | 28 +++++++++++----------------- web/style.inc | 6 +++--- 2 files changed, 14 insertions(+), 20 deletions(-) commit e5386abaf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 9 15:27:20 2018 +0000 Made language aliasing work web/help.php | 2 +- web/language.inc | 99 +++++++++++++++++++++------------------------- 2 files changed, 47 insertions(+), 54 deletions(-) commit c3d87f61b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 8 18:14:32 2018 +0000 Updated comment web/systemdefaults.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 11e839ddf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 8 18:12:33 2018 +0000 Made sr-latn-rs work .../{lang.sr-rs-latin => lang.sr-latn-rs} | 0 web/language.inc | 2 +- web/lib/Locale.php | 40 +--- web/lib/MRBS/System.php | 168 ++++++++++++----- 4 files changed, 123 insertions(+), 87 deletions(-) commit 6760e7592 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 8 12:27:51 2018 +0000 Added a list of PHP extensions loaded to the details visible to admins. Useful for debugging. web/css/mrbs.css.php | 2 +- web/help.php | 10 +++++++++- web/lang/lang.en | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) commit 668d183e6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 8 11:54:08 2018 +0000 Provided backward compatibility for old style $override_locale settings. ($override_locale should now be a BCP 47 language tag, eg 'en-GB', but for backward compatibility we accept 'en_GB.utf-8' and 'eng'.) web/index.php | 1 - web/internalconfig.inc.php | 13 +++++++++++++ web/lib/MRBS/System.php | 33 +++++++++++++++++++++++++++++++++ web/systemdefaults.inc.php | 9 +++++---- 4 files changed, 51 insertions(+), 5 deletions(-) commit 3d0aa6255 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 7 14:06:00 2018 +0000 Restructured the language code, using the Locale class together with an emulation of the Locale class for those systems where the intl extension is not installed. Also moved a lot of code out into a new System class. web/Themes/default/header.inc | 4 +- web/functions.inc | 10 +- web/functions_mail.inc | 2 +- web/help.php | 2 +- web/js.inc | 5 - web/js/datatables.js.php | 5 +- web/language.inc | 1156 ++++++------------------------- web/lib/Locale.php | 296 +++++++- web/lib/MRBS/System.php (new) | 711 +++++++++++++++++++ 9 files changed, 1237 insertions(+), 954 deletions(-) commit 8a9c5abc7 Merge: e6d7258dd 93201eeed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 6 15:16:01 2018 +0000 Merge with default commit 93201eeed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 6 15:15:08 2018 +0000 Moved the advice on what to do about a missing iconv() function out of language.inc and into general error handling. web/functions_error.inc | 26 +++++++++++++++++++++++ web/internalconfig.inc.php | 1 + web/language.inc | 41 ------------------------------------ 3 files changed, 27 insertions(+), 41 deletions(-) commit 0da01f64a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 6 14:26:41 2018 +0000 Reverted debugging settings which had accidentally been committed during the forms_rewrite branch web/internalconfig.inc.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) commit e6d7258dd Merge: 18d85ee4a 83c2b5a12 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 5 11:50:39 2018 +0000 Merge with default commit 83c2b5a12 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 5 11:49:57 2018 +0000 Fixed bug in finding best language file web/language.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 18d85ee4a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 4 17:22:24 2018 +0000 Removed redundant datepicker code web/jquery/ui/i18n/datepicker-af.js (gone) | 37 --------- .../ui/i18n/datepicker-ar-DZ.js (gone) | 39 ---------- web/jquery/ui/i18n/datepicker-ar.js (gone) | 39 ---------- web/jquery/ui/i18n/datepicker-az.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-be.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-bg.js (gone) | 38 --------- web/jquery/ui/i18n/datepicker-bs.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-ca.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-cs.js (gone) | 37 --------- .../ui/i18n/datepicker-cy-GB.js (gone) | 45 ----------- web/jquery/ui/i18n/datepicker-da.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-de.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-el.js (gone) | 37 --------- .../ui/i18n/datepicker-en-AU.js (gone) | 37 --------- .../ui/i18n/datepicker-en-GB.js (gone) | 37 --------- .../ui/i18n/datepicker-en-IE.js (gone) | 38 --------- .../ui/i18n/datepicker-en-NZ.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-eo.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-es.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-et.js (gone) | 45 ----------- web/jquery/ui/i18n/datepicker-eu.js (gone) | 36 --------- web/jquery/ui/i18n/datepicker-fa.js (gone) | 73 ------------------ web/jquery/ui/i18n/datepicker-fi.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-fo.js (gone) | 45 ----------- .../ui/i18n/datepicker-fr-CA.js (gone) | 37 --------- .../ui/i18n/datepicker-fr-CH.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-fr.js (gone) | 39 ---------- web/jquery/ui/i18n/datepicker-gl.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-he.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-hi.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-hr.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-hu.js (gone) | 36 --------- web/jquery/ui/i18n/datepicker-hy.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-id.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-is.js (gone) | 45 ----------- .../ui/i18n/datepicker-it-CH.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-it.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-ja.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-ka.js (gone) | 48 ------------ web/jquery/ui/i18n/datepicker-kk.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-km.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-ko.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-ky.js (gone) | 38 --------- web/jquery/ui/i18n/datepicker-lb.js (gone) | 45 ----------- web/jquery/ui/i18n/datepicker-lt.js (gone) | 45 ----------- web/jquery/ui/i18n/datepicker-lv.js (gone) | 45 ----------- web/jquery/ui/i18n/datepicker-mk.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-ml.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-ms.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-nb.js (gone) | 49 ------------ .../ui/i18n/datepicker-nl-BE.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-nl.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-nn.js (gone) | 49 ------------ web/jquery/ui/i18n/datepicker-no.js (gone) | 50 ------------ web/jquery/ui/i18n/datepicker-pl.js (gone) | 37 --------- .../ui/i18n/datepicker-pt-BR.js (gone) | 45 ----------- web/jquery/ui/i18n/datepicker-pt.js (gone) | 44 ----------- web/jquery/ui/i18n/datepicker-rm.js (gone) | 61 --------------- web/jquery/ui/i18n/datepicker-ro.js (gone) | 40 ---------- web/jquery/ui/i18n/datepicker-ru.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-sk.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-sl.js (gone) | 38 --------- web/jquery/ui/i18n/datepicker-sq.js (gone) | 37 --------- .../ui/i18n/datepicker-sr-SR.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-sr.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-sv.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-ta.js (gone) | 53 ------------- web/jquery/ui/i18n/datepicker-th.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-tj.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-tr.js (gone) | 37 --------- web/jquery/ui/i18n/datepicker-uk.js (gone) | 38 --------- web/jquery/ui/i18n/datepicker-vi.js (gone) | 37 --------- .../ui/i18n/datepicker-zh-CN.js (gone) | 37 --------- .../ui/i18n/datepicker-zh-HK.js (gone) | 37 --------- .../ui/i18n/datepicker-zh-TW.js (gone) | 37 --------- 75 files changed, 2982 deletions(-) commit c508db978 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 4 17:18:37 2018 +0000 Week numbers are now used, if configured, on non-mobile devices. web/js/datepicker.js.php | 100 ++++++++----------------------------- 1 file changed, 22 insertions(+), 78 deletions(-) commit 419316255 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 4 14:48:56 2018 +0000 Fixed CSS for standard form datepickers web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0d922ad06 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 4 14:42:15 2018 +0000 Made selecting a date on the datepicker go to that date web/js/datepicker.js.php | 12 +++++++++--- web/js/edit_entry.js.php | 13 ++++++------- 2 files changed, 15 insertions(+), 10 deletions(-) commit 4f4aba97d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 4 14:22:03 2018 +0000 Fixed bug in language file selection web/js/datepicker.js.php | 7 ++++++- web/language.inc | 16 +++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) commit 3955af805 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 4 13:49:40 2018 +0000 Fixed non-standard flatpickr language codes web/js/datepicker.js.php | 1 + web/language.inc | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) commit 9401a33e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 4 12:28:38 2018 +0000 Added more language files web/js/flatpickr/l10n/ar.js (new) | 52 ++++++++++++++++ web/js/flatpickr/l10n/bg.js (new) | 65 ++++++++++++++++++++ web/js/flatpickr/l10n/bn.js (new) | 65 ++++++++++++++++++++ web/js/flatpickr/l10n/cat.js (new) | 83 +++++++++++++++++++++++++ web/js/flatpickr/l10n/cs.js (new) | 70 +++++++++++++++++++++ web/js/flatpickr/l10n/cy.js (new) | 92 ++++++++++++++++++++++++++++ web/js/flatpickr/l10n/da.js (new) | 71 +++++++++++++++++++++ web/js/flatpickr/l10n/eo.js (new) | 73 ++++++++++++++++++++++ web/js/flatpickr/l10n/es.js (new) | 69 +++++++++++++++++++++ web/js/flatpickr/l10n/et.js (new) | 73 ++++++++++++++++++++++ web/js/flatpickr/l10n/fa.js (new) | 68 ++++++++++++++++++++ web/js/flatpickr/l10n/fi.js (new) | 69 +++++++++++++++++++++ web/js/flatpickr/l10n/gr.js (new) | 74 ++++++++++++++++++++++ web/js/flatpickr/l10n/he.js (new) | 57 +++++++++++++++++ web/js/flatpickr/l10n/hi.js (new) | 65 ++++++++++++++++++++ web/js/flatpickr/l10n/hr.js (new) | 66 ++++++++++++++++++++ web/js/flatpickr/l10n/hu.js (new) | 72 ++++++++++++++++++++++ web/js/flatpickr/l10n/id.js (new) | 61 ++++++++++++++++++ web/js/flatpickr/l10n/it.js (new) | 71 +++++++++++++++++++++ web/js/flatpickr/l10n/ja.js (new) | 65 ++++++++++++++++++++ web/js/flatpickr/l10n/ko.js (new) | 68 ++++++++++++++++++++ web/js/flatpickr/l10n/lt.js (new) | 72 ++++++++++++++++++++++ web/js/flatpickr/l10n/lv.js (new) | 67 ++++++++++++++++++++ web/js/flatpickr/l10n/mk.js (new) | 68 ++++++++++++++++++++ web/js/flatpickr/l10n/mn.js (new) | 59 ++++++++++++++++++ web/js/flatpickr/l10n/ms.js (new) | 68 ++++++++++++++++++++ web/js/flatpickr/l10n/my.js (new) | 69 +++++++++++++++++++++ web/js/flatpickr/l10n/nl.js (new) | 75 +++++++++++++++++++++++ web/js/flatpickr/l10n/pa.js (new) | 65 ++++++++++++++++++++ web/js/flatpickr/l10n/pl.js (new) | 69 +++++++++++++++++++++ web/js/flatpickr/l10n/pt.js (new) | 66 ++++++++++++++++++++ web/js/flatpickr/l10n/ro.js (new) | 69 +++++++++++++++++++++ web/js/flatpickr/l10n/ru.js (new) | 69 +++++++++++++++++++++ web/js/flatpickr/l10n/si.js (new) | 65 ++++++++++++++++++++ web/js/flatpickr/l10n/sk.js (new) | 70 +++++++++++++++++++++ web/js/flatpickr/l10n/sl.js (new) | 70 +++++++++++++++++++++ web/js/flatpickr/l10n/sq.js (new) | 65 ++++++++++++++++++++ web/js/flatpickr/l10n/sr.js (new) | 68 ++++++++++++++++++++ web/js/flatpickr/l10n/sv.js (new) | 70 +++++++++++++++++++++ web/js/flatpickr/l10n/th.js (new) | 72 ++++++++++++++++++++++ web/js/flatpickr/l10n/tr.js (new) | 74 ++++++++++++++++++++++ web/js/flatpickr/l10n/uk.js (new) | 66 ++++++++++++++++++++ web/js/flatpickr/l10n/vn.js (new) | 66 ++++++++++++++++++++ 43 files changed, 2951 insertions(+) commit b773a2dff Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 4 12:04:11 2018 +0000 Made localisation work web/js.inc | 8 ++- web/js/datepicker.js.php | 9 +++- web/js/flatpickr/l10n/de.js (new) | 70 +++++++++++++++++++++++++ web/js/flatpickr/l10n/en.js (new) | 80 +++++++++++++++++++++++++++++ web/js/flatpickr/l10n/fr.js (new) | 75 +++++++++++++++++++++++++++ web/js/flatpickr/l10n/no.js (new) | 73 ++++++++++++++++++++++++++ web/js/flatpickr/l10n/zh.js (new) | 69 +++++++++++++++++++++++++ web/language.inc | 11 ++++ 8 files changed, 392 insertions(+), 3 deletions(-) commit a79aac4b8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 4 11:23:41 2018 +0000 Switched to using local files instead if a CDN web/js.inc | 3 ++- web/js/datepicker.js.php | 7 ++++++- web/js/flatpickr/css/flatpickr.min.css (new) | 13 +++++++++++++ web/js/flatpickr/flatpickr.min.js (new) | 2 ++ web/style.inc | 2 +- 5 files changed, 24 insertions(+), 3 deletions(-) commit 556a2dd8f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 4 10:28:07 2018 +0000 Fixed a few problems. Made flatpickr use native mobile datepickers. web/css/mrbs.css.php | 2 +- web/js/datepicker.js.php | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) commit a7a6c94a9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 4 09:11:29 2018 +0000 Started using flatpickr web/css/mrbs.css.php | 4 +++- web/js.inc | 1 + web/js/datepicker.js.php | 9 ++++++++- web/style.inc | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) commit d8b519872 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 4 07:14:07 2018 +0000 Removed constraint on ment items to be of equal width: it doesn't work well in languages where some are much longer than others. web/css/mrbs.css.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit a40b0218a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 3 18:13:46 2018 +0000 Fixed CSS on Search menu item following the previous change web/Themes/default/header.inc | 2 +- web/css/mrbs.css.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) commit 0ef389170 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 3 17:47:49 2018 +0000 Fixed HTML5 validation errors web/Themes/default/header.inc | 4 ++-- web/functions_table.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 3e51e88a0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 3 17:25:49 2018 +0000 Tweaked colours web/Themes/default/styling.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit fa77849c8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 3 17:08:42 2018 +0000 Tweaked highlight colour web/Themes/default/styling.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3b32de1d8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 3 12:01:47 2018 +0000 Tweaked CSS web/css/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit 052f9d794 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 3 11:57:15 2018 +0000 Tweaked CSS web/css/mrbs.css.php | 2 ++ 1 file changed, 2 insertions(+) commit 398b6bc0a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 3 11:37:55 2018 +0000 Fixed code for sessions that don't have a login function. (Just a temporary fix - the session code really needs to be rewritten) web/Themes/default/header.inc | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) commit c427804cb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 2 20:20:10 2018 +0000 Tweaked CSS web/css/mrbs.css.php | 4 ++++ 1 file changed, 4 insertions(+) commit bacdf6a98 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 2 17:57:28 2018 +0000 Tweaked CSS web/css/mrbs.css.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit a388c005b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 2 17:42:36 2018 +0000 Tweaked CSS web/css/mrbs.css.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) commit ea74cb9cb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 2 17:12:01 2018 +0000 Tweaked CSS web/css/mrbs.css.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit 7e3674a35 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 2 16:38:08 2018 +0000 Added outstanding approvals web/Themes/default/header.inc | 34 ++++++++++++++++----------------- web/css/mrbs.css.php | 12 +++++++++--- web/lang/lang.en | 2 +- 3 files changed, 26 insertions(+), 22 deletions(-) commit 8b66a8add Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 2 15:24:33 2018 +0000 Tweaked CSS web/css/mrbs.css.php | 1 + web/session/functions_session.inc | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) commit fa7fd6f5f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 2 15:06:08 2018 +0000 Tweaked CSS and changed order of menu items web/Themes/default/header.inc | 2 +- web/css/mrbs.css.php | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) commit 6cee6b630 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 2 14:48:09 2018 +0000 Tweaked CSS web/css/mrbs.css.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit df7909257 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 2 13:17:26 2018 +0000 Tweaked CSS web/css/mrbs.css.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit 46fdf054b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 2 12:55:33 2018 +0000 Tweaked CSS web/css/mrbs.css.php | 6 ++++++ 1 file changed, 6 insertions(+) commit 75aa94a8d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 2 12:44:56 2018 +0000 Tweaked CSS web/css/mrbs.css.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) commit 531b50be0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 2 12:31:42 2018 +0000 Tweaked CSS web/css/mrbs.css.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit 514950360 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 2 12:05:57 2018 +0000 More tweaking, fixing wrapping web/Themes/default/header.inc | 14 +++++++------- web/css/mrbs.css.php | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) commit 89559e162 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 2 11:55:47 2018 +0000 More styling of banner web/Themes/default/header.inc | 73 ++++++++++++++++++++------------- web/css/mrbs.css.php | 68 +++++++++--------------------- 2 files changed, 64 insertions(+), 77 deletions(-) commit 2d15baec3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 2 09:42:08 2018 +0000 Changed "User list" to "Users" web/lang/lang.el | 2 +- web/lang/lang.en | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit a20543d8d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 2 09:36:42 2018 +0000 Got rid of unknown user web/session/functions_session.inc | 7 ------- web/session/session_cookie.inc | 1 - web/session/session_http.inc | 1 - web/session/session_joomla.inc | 1 - web/session/session_php.inc | 1 - web/session/session_saml.inc | 1 - web/session/session_wordpress.inc | 1 - 7 files changed, 13 deletions(-) commit 8ffac73aa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 2 09:21:56 2018 +0000 Started redesign of header web/Themes/default/header.inc | 55 +++++++++++---------------- web/session/functions_session.inc | 11 ------ web/session/session_cookie.inc | 2 - web/session/session_http.inc | 2 - web/session/session_joomla.inc | 2 - web/session/session_php.inc | 2 - web/session/session_remote_user.inc | 2 - web/session/session_saml.inc | 2 - web/session/session_wordpress.inc | 2 - 9 files changed, 22 insertions(+), 58 deletions(-) commit 0c8bb9f5f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 2 08:45:16 2018 +0000 Restored the Goto datepicker web/Themes/default/header.inc | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) commit 16bd73f3f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 1 18:18:31 2018 +0000 Fixed duplicate ids of 'room_select' web/index.php | 1 - 1 file changed, 1 deletion(-) commit 96674717a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 1 18:16:06 2018 +0000 Fixed duplicate ids of 'area_select' web/index.php | 1 - 1 file changed, 1 deletion(-) commit 8f0c5f73b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 1 18:03:40 2018 +0000 Fixed duplicate ids of 'roomChangeForm' web/css/mrbs.css.php | 6 +++--- web/index.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) commit e8b3f9f7f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 1 17:58:41 2018 +0000 Fixed duplicate ids of 'areaChangeForm' web/admin.php | 2 +- web/css/mrbs-rtl.css.php | 2 +- web/css/mrbs.css.php | 8 ++++---- web/index.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) commit 02f048077 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 1 16:42:50 2018 +0000 Added comments UPGRADE | 3 ++- web/systemdefaults.inc.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) commit a55220392 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 1 16:36:52 2018 +0000 Rationalised the strftime formats a little web/index.php | 4 ++-- web/systemdefaults.inc.php | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) commit 6af31f202 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 1 16:24:06 2018 +0000 Added a date title for the week view web/index.php | 28 ++++++++++++++++++++++++++-- web/systemdefaults.inc.php | 4 ++++ 2 files changed, 30 insertions(+), 2 deletions(-) commit 9a0de5e57 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 1 15:12:42 2018 +0000 Removed redundant files web/day.php (gone) | 119 ------------- web/mincals.inc (gone) | 363 --------------------------------------- web/month.php (gone) | 161 ----------------- web/week.php (gone) | 107 ------------ 4 files changed, 750 deletions(-) commit 3491a7093 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 1 15:03:54 2018 +0000 Removed the debug code in the month view web/functions_table.inc | 31 ------------------------------- 1 file changed, 31 deletions(-) commit 3f26911fd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 1 15:00:22 2018 +0000 Added check for the existence of the room in the month view. web/functions_table.inc | 8 ++++++++ 1 file changed, 8 insertions(+) commit 4fbd4c79e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 1 14:38:23 2018 +0000 Removed $display_calendar_bottom setting UPGRADE | 10 ++++------ web/systemdefaults.inc.php | 4 ---- 2 files changed, 4 insertions(+), 10 deletions(-) commit ba22695d0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 1 14:10:14 2018 +0000 Recognised hidden days in the mini-calendar web/css/mrbs.css.php | 14 +++++--------- web/lib/MRBS/MiniCalendar.php | 26 +++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 12 deletions(-) commit 24667fda2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 28 17:46:26 2018 +0000 Tweaked colours web/Themes/default/styling.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 2ea75903e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 28 16:48:03 2018 +0000 Added styling for the current view web/Themes/default/styling.inc | 5 +++- web/css/mrbs.css.php | 7 +++++- web/lib/MRBS/MiniCalendar.php | 43 ++++++++++++++++++++++++++++++-- 3 files changed, 51 insertions(+), 4 deletions(-) commit cd8fd098a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 28 14:35:01 2018 +0000 Added styling for today web/css/mrbs.css.php | 1 + web/lib/MRBS/MiniCalendar.php | 26 +++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) commit 35615905a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 28 13:40:58 2018 +0000 Tweaked CSS web/css/mrbs.css.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit b3c34e11a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 28 10:19:31 2018 +0000 Tweaked CSS web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8b7ec082a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 28 10:15:07 2018 +0000 Re-implemented the colour key, using a CSS grid web/Themes/classic126/styling.inc | 2 +- web/Themes/default/styling.inc | 2 +- web/css/mrbs-print.css.php | 8 +---- web/css/mrbs.css.php | 22 +++++++------ web/functions.inc | 50 ----------------------------- web/index.php | 29 ++++++++++++++++- 6 files changed, 44 insertions(+), 69 deletions(-) commit 9b345e096 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 27 17:25:36 2018 +0000 Removed redundant CSS web/css/mrbs.css.php | 10 ---------- 1 file changed, 10 deletions(-) commit 606f684d5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 27 17:21:56 2018 +0000 Added navigation at the bottom as well as the top of the day/week/month table web/css/mrbs.css.php | 10 +++++++++- web/index.php | 5 ++++- 2 files changed, 13 insertions(+), 2 deletions(-) commit 9d10d888e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 27 17:07:35 2018 +0000 Renamed calendar.php as index.php web/css/mrbs-ie.css | 2 +- web/css/mrbs-rtl.css.php | 2 +- web/css/mrbs.css.php | 2 +- web/del_entry.php | 2 +- web/edit_entry_handler.php | 2 +- web/functions_table.inc | 16 ++++++++-------- web/{calendar.php => index.php} | 10 +++++----- web/lang/lang.ca | 2 +- web/lang/lang.cs | 2 +- web/lang/lang.da | 2 +- web/lang/lang.de | 2 +- web/lang/lang.el | 2 +- web/lang/lang.en | 2 +- web/lang/lang.es | 2 +- web/lang/lang.eu | 2 +- web/lang/lang.fi | 2 +- web/lang/lang.fr | 2 +- web/lang/lang.he | 2 +- web/lang/lang.hu | 2 +- web/lang/lang.id | 2 +- web/lang/lang.it | 2 +- web/lang/lang.ja | 2 +- web/lang/lang.ko | 2 +- web/lang/lang.nb | 2 +- web/lang/lang.nl | 2 +- web/lang/lang.nn | 2 +- web/lang/lang.no | 2 +- web/lang/lang.pl | 2 +- web/lang/lang.pt | 2 +- web/lang/lang.pt-br | 2 +- web/lang/lang.ro | 2 +- web/lang/lang.ru | 2 +- web/lang/lang.sk | 2 +- web/lang/lang.sl | 2 +- web/lang/lang.sr-rs-latin | 2 +- web/lang/lang.sv | 2 +- web/lang/lang.th | 2 +- web/lang/lang.tr | 2 +- web/lang/lang.zh-cn | 2 +- web/lang/lang.zh-tw | 2 +- web/lib/MRBS/MiniCalendar.php | 2 +- web/mrbs_auth.inc | 2 +- web/mrbs_sql.inc | 6 +++--- web/pending.php | 2 +- web/search.php | 2 +- web/view_entry.php | 2 +- 46 files changed, 59 insertions(+), 59 deletions(-) commit e6f77b006 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 27 16:48:48 2018 +0000 Removed index.php web/index.php (gone) | 18 ------------------ 1 file changed, 18 deletions(-) commit ee9b1db38 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 27 16:45:01 2018 +0000 Added an authorisation check to the minicalendar Ajax file web/ajax/minicalendar.php | 3 +++ web/mrbs_auth.inc | 1 + 2 files changed, 4 insertions(+) commit 9b06db539 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 27 16:39:00 2018 +0000 Renamed file web/ajax/{record_activity_ajax.php => record_activity.php} | 0 web/js/general.js.php | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) commit 271afc4ee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 27 16:29:21 2018 +0000 Moved file into the new ajax directory web/{ => ajax}/record_activity_ajax.php | 2 +- web/js/general.js.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 04ff6e7a3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 27 16:17:14 2018 +0000 Renamed file web/ajax/{del_entry_ajax.php => del_entry.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) commit c1a32c4ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 27 16:13:45 2018 +0000 Renamed file web/internalconfig.inc.php | 2 +- web/js/report.js.php | 2 +- web/mrbs_auth.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit c451458d5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 27 16:09:50 2018 +0000 Moved file into the new ajax directory web/{ => ajax}/del_entry_ajax.php | 4 ++-- web/js/report.js.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit d3922bbb5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 27 15:35:08 2018 +0000 Renamed file web/ajax/{check_slot_ajax.php => check_slot.php} | 0 web/js/edit_entry.js.php | 2 +- web/mrbs_auth.inc | 4 +++- 3 files changed, 4 insertions(+), 2 deletions(-) commit 2496ff4ac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 27 15:27:43 2018 +0000 Moved file into the new ajax directory web/{ => ajax}/check_slot_ajax.php | 4 ++-- web/js/edit_entry.js.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 0a60757cd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 27 15:03:09 2018 +0000 Added a limit to the number of mini-calendars that are held to stop the DOM becoming too large. When the limit is reached, if more calendars are added at one end of the list, then an equal number are removed from the other. web/Themes/default/header.inc | 4 +-- web/js/general.js.php | 52 +++++++++++++++++++++++++++++---- 2 files changed, 49 insertions(+), 7 deletions(-) commit d82a425f8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 27 13:42:41 2018 +0000 Updated comments web/js/general.js.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit f1e99772e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 27 13:40:24 2018 +0000 Made the Ajax fetches of new minicalendars capable of fetching multiple calendars at a time so that Ajax is better able to keep with the clicking rate. web/ajax/minicalendar.php | 23 +++++++++++++---------- web/js/general.js.php | 20 ++++++++++++-------- 2 files changed, 25 insertions(+), 18 deletions(-) commit 001b60c47 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 26 18:34:17 2018 +0000 Fixed problem with trailer.inc web/defaultincludes.inc | 1 - 1 file changed, 1 deletion(-) commit abdf2f6b4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 26 17:56:10 2018 +0000 Fixed bug that allowed the same month to be loaded twice, if a new Ajax request for that month was fired before the result of the old one arrived. web/js/general.js.php | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) commit 6eb1db150 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 26 17:45:23 2018 +0000 Fixed problem with new calendars not having click event listeners web/js/general.js.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) commit a1da5f787 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 26 17:23:42 2018 +0000 Started adding Ajax loading of mini-calendars web/ajax/minicalendar.php (new) | 42 ++++++++++++++++ web/js/general.js.php | 83 ++++++++++++++++++++++++++++++- web/lib/MRBS/MiniCalendar.php | 16 ++++-- 3 files changed, 135 insertions(+), 6 deletions(-) commit 4b7b165ba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 26 09:42:12 2018 +0000 Tweaked CSS web/css/mrbs.css.php | 7 +++++++ 1 file changed, 7 insertions(+) commit eed1018ac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 26 09:34:25 2018 +0000 Made the minicalendar Prev and Next arrows work using JavaScript (still to do - get more calendars in the background via Ajax) web/Themes/default/header.inc | 23 +++++++++++++++++++---- web/js/functions.js.php | 24 +++++++++++++++++++++++- web/js/general.js.php | 20 +++++++++++++++++++- web/lib/MRBS/MiniCalendar.php | 29 +++++++++++++++++++++++++---- 4 files changed, 86 insertions(+), 10 deletions(-) commit b5a83f9eb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 25 18:09:47 2018 +0000 Tweaked CSS web/Themes/default/header.inc | 34 -------------------------- web/css/mrbs.css.php | 42 ++++++++++++++++++++------------- 2 files changed, 26 insertions(+), 50 deletions(-) commit 5e5683f6b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 25 17:25:20 2018 +0000 Made mini-calendar arrow links work web/Themes/default/header.inc | 14 +++++++++++- web/lib/MRBS/MiniCalendar.php | 40 ++++++++++++++++++++++++--------- 2 files changed, 42 insertions(+), 12 deletions(-) commit 6397a9a98 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 25 16:27:34 2018 +0000 Added mincal to query string web/lib/MRBS/MiniCalendar.php | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) commit 2d19c817f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 25 15:51:46 2018 +0000 Tweaked CSS web/css/mrbs.css.php | 2 ++ 1 file changed, 2 insertions(+) commit f00e4e83f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 25 15:47:29 2018 +0000 Added mini calendar navigation arrows UPGRADE | 2 +- web/css/mrbs.css.php | 22 +++++++++++++++------- web/lib/MRBS/MiniCalendar.php | 30 ++++++++++-------------------- web/systemdefaults.inc.php | 32 ++++++++++++++++---------------- 4 files changed, 42 insertions(+), 44 deletions(-) commit b454f577a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 25 14:46:56 2018 +0000 Added links to mini-calendar dates web/lib/MRBS/MiniCalendar.php | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) commit e1d9584b7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 25 11:36:57 2018 +0000 Renamed config setting UPGRADE | 1 + web/functions_table.inc | 2 +- web/lib/MRBS/MiniCalendar.php | 2 +- web/systemdefaults.inc.php | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) commit 5eb99fb54 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 25 10:39:35 2018 +0000 Added a caption to the mini calendar UPGRADE | 7 +++--- web/lib/MRBS/MiniCalendar.php | 43 ++++++++++++++++++++++++--------- web/mincals.inc | 2 +- web/systemdefaults.inc.php | 30 +++++++++++------------ 4 files changed, 51 insertions(+), 31 deletions(-) commit 179b40b3c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 25 09:42:10 2018 +0000 Restructured web/lib/MRBS/MiniCalendar.php | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) commit a81697444 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 25 09:33:37 2018 +0000 Put the mini calendar code into a class web/Themes/default/header.inc | 96 +------------------- web/lib/MRBS/MiniCalendar.php (new) | 122 ++++++++++++++++++++++++++ 2 files changed, 124 insertions(+), 94 deletions(-) commit 31458fad5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 24 07:42:25 2018 +0000 Added day names web/Themes/default/header.inc | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) commit 5a789d744 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 24 07:30:02 2018 +0000 Started producing the calendar. No formatting or links yet. web/Themes/default/header.inc | 82 +++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) commit 5d220e71c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 23 12:30:16 2018 +0000 Made page refresh work web/js.inc | 7 ++++--- web/js/refresh.js.php | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) commit daad8cefe Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 23 11:37:14 2018 +0000 Removed references to day/week/month.php web/css/mrbs-ie.css | 2 +- web/css/mrbs-rtl.css.php | 2 +- web/css/mrbs.css.php | 2 +- web/lang/lang.ca | 22 ++++++++-------------- web/lang/lang.cs | 22 ++++++++-------------- web/lang/lang.da | 22 ++++++++-------------- web/lang/lang.de | 22 ++++++++-------------- web/lang/lang.el | 22 ++++++++-------------- web/lang/lang.en | 22 ++++++++-------------- web/lang/lang.es | 22 ++++++++-------------- web/lang/lang.eu | 22 ++++++++-------------- web/lang/lang.fi | 22 ++++++++-------------- web/lang/lang.fr | 22 ++++++++-------------- web/lang/lang.he | 22 ++++++++-------------- web/lang/lang.hu | 22 ++++++++-------------- web/lang/lang.id | 22 ++++++++-------------- web/lang/lang.it | 22 ++++++++-------------- web/lang/lang.ja | 22 ++++++++-------------- web/lang/lang.ko | 22 ++++++++-------------- web/lang/lang.nb | 22 ++++++++-------------- web/lang/lang.nl | 22 ++++++++-------------- web/lang/lang.nn | 22 ++++++++-------------- web/lang/lang.no | 22 ++++++++-------------- web/lang/lang.pl | 22 ++++++++-------------- web/lang/lang.pt | 22 ++++++++-------------- web/lang/lang.pt-br | 22 ++++++++-------------- web/lang/lang.ro | 22 ++++++++-------------- web/lang/lang.ru | 22 ++++++++-------------- web/lang/lang.sk | 22 ++++++++-------------- web/lang/lang.sl | 22 ++++++++-------------- web/lang/lang.sr-rs-latin | 22 ++++++++-------------- web/lang/lang.sv | 22 ++++++++-------------- web/lang/lang.th | 22 ++++++++-------------- web/lang/lang.tr | 23 ++++++++--------------- web/lang/lang.zh-cn | 22 ++++++++-------------- web/lang/lang.zh-tw | 22 ++++++++-------------- 36 files changed, 267 insertions(+), 466 deletions(-) commit 0e62fc2d5 Merge: cf4be8d06 cd620a7ff Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 23 10:37:57 2018 +0000 Merge with default commit cd620a7ff Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 23 10:21:26 2018 +0000 Changed 'require to 'require_once' for grab_globals.inc.php, as it should only be included once since it contains a function declaration. web/defaultincludes.inc | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) commit cf4be8d06 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 22 17:09:36 2018 +0000 Made the Goto datepicker work - just a temporary measure. web/Themes/default/header.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 08943b0bf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 22 17:04:31 2018 +0000 Removed references to day/week/month.php web/mrbs_auth.inc | 3 --- web/view_entry.php | 20 ++++++++------------ 2 files changed, 8 insertions(+), 15 deletions(-) commit b742acfdc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 22 16:46:14 2018 +0000 Removed references to day/week/month.php web/pending.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c626bc5be Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 22 16:44:04 2018 +0000 Removed references to day/week/month.php web/edit_entry_handler.php | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) commit 9500464b6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 22 16:15:54 2018 +0000 Removed references to day/week/month.php web/del_entry.php | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) commit 509045939 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 22 16:07:43 2018 +0000 Restructured web/Themes/default/header.inc | 39 +++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 16 deletions(-) commit 4c86b1abb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 22 15:47:08 2018 +0000 Restructured web/Themes/default/header.inc | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) commit 6ab266869 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 22 15:35:16 2018 +0000 Fixed reference to day.php web/pending.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) commit 98bca4770 Merge: 1c7cba57b 58a803b00 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 22 14:58:06 2018 +0000 Merge with default commit 58a803b00 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 22 14:57:18 2018 +0000 Added a date to the search results so that it's clear when the search started. web/css/mrbs.css.php | 3 --- web/lang/lang.en | 2 +- web/search.php | 16 ++++++++-------- web/systemdefaults.inc.php | 1 + 4 files changed, 10 insertions(+), 12 deletions(-) commit 7f6696b1d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 22 14:18:12 2018 +0000 Fixed problem with Search ignoring Search From date web/search.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) commit 1c7cba57b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 22 12:30:22 2018 +0000 Fixed html escaping of links web/calendar.php | 24 ++++++++++----------- web/functions_table.inc | 44 +++++++++++++++++++-------------------- web/index.php | 2 +- web/mrbs_sql.inc | 8 +++---- web/search.php | 4 ++-- 5 files changed, 41 insertions(+), 41 deletions(-) commit 044aeb812 Merge: 86e4b79d0 16c147f71 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 22 10:34:23 2018 +0000 Merge with default commit 16c147f71 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 22 10:33:36 2018 +0000 Fixed bug with Prev and Next links in Search results, resulting in a session expiry because no CSRF token was being passed. Only happens when JavaScript is disabled. web/css/mrbs.css.php | 12 ++++++-- web/search.php | 65 +++++++++++++++++++++--------------------- 2 files changed, 42 insertions(+), 35 deletions(-) commit 86e4b79d0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 21 14:18:32 2018 +0000 Added upgrade note UPGRADE | 14 ++++++++++++++ 1 file changed, 14 insertions(+) commit 106035596 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 21 12:17:48 2018 +0000 Fixed reference to day.php web/search.php | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) commit bad75b7b1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 21 11:58:20 2018 +0000 Changed links to day/week/month.php web/mrbs_sql.inc | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) commit f5a6e4c68 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 21 11:29:09 2018 +0000 Added $view as a parameter to print_header() and changed parameter order for consistency with other functions web/Themes/default/header.inc | 8 ++++---- web/admin.php | 2 +- web/approve_entry_handler.php | 2 +- web/calendar.php | 2 +- web/del.php | 4 ++-- web/del_entry.php | 2 +- web/edit_area.php | 2 +- web/edit_entry.php | 4 ++-- web/edit_entry_handler.php | 8 ++++---- web/edit_room.php | 2 +- web/functions.inc | 25 +++++++++++++++---------- web/help.php | 2 +- web/import.php | 2 +- web/mrbs_auth.inc | 8 ++++---- web/pending.php | 2 +- web/report.php | 2 +- web/search.php | 2 +- web/view_entry.php | 2 +- 18 files changed, 43 insertions(+), 38 deletions(-) commit fc48c68f6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 21 10:31:04 2018 +0000 Made $view a standard variable web/calendar.php | 1 - web/standard_vars.inc.php | 5 +++-- web/systemdefaults.inc.php | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) commit 129520c77 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 21 10:20:33 2018 +0000 Fixed bug: room name was not displayed if there was only one of them web/calendar.php | 146 ++++++++++++++++----------------------------- 1 file changed, 53 insertions(+), 93 deletions(-) commit df7df3de9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 21 09:58:04 2018 +0000 Made view buttons equal widths (again - the effect got lost in a previous commit) web/calendar.php | 2 ++ web/css/mrbs.css.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) commit 63b1dac50 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 20 17:34:46 2018 +0000 Tweaked CSS web/css/mrbs.css.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) commit 41eaeecf6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 20 17:10:39 2018 +0000 Added in date web/calendar.php | 39 +++++++++++++++++++++++++++++++++++++++ web/css/mrbs.css.php | 22 ++++++++++++---------- 2 files changed, 51 insertions(+), 10 deletions(-) commit 0e9750151 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 20 16:31:10 2018 +0000 Tweaked CSS web/css/mrbs.css.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit ad4d71893 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 20 16:24:51 2018 +0000 Started styling location nav web/calendar.php | 130 +++++++++++++++++++++++++++++++++++ web/css/mrbs-rtl.css.php | 4 +- web/css/mrbs.css.php | 9 ++- web/functions.inc | 135 ------------------------------------- 4 files changed, 138 insertions(+), 140 deletions(-) commit 38da326a0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 20 15:49:07 2018 +0000 Started styling navigation web/calendar.php | 2 +- web/css/mrbs.css.php | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) commit 62f402bf1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 20 14:39:28 2018 +0000 Made the arrow links work web/calendar.php | 69 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 65 insertions(+), 4 deletions(-) commit 836dee3c7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 20 13:28:22 2018 +0000 Added titles web/calendar.php | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) commit 363f5aa5b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 20 12:28:46 2018 +0000 Moved arrows into CSS to make customisation easier web/calendar.php | 11 ++++------- web/css/mrbs.css.php | 9 +++++++++ 2 files changed, 13 insertions(+), 7 deletions(-) commit 6ea24d004 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 20 12:05:49 2018 +0000 Started on forward and back arrows web/calendar.php | 23 +++++++++++++++++++++-- web/css/mrbs.css.php | 6 +++--- web/lang/lang.en | 1 + 3 files changed, 25 insertions(+), 5 deletions(-) commit 81b74eae2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 20 10:27:24 2018 +0000 Fixed links web/functions_table.inc | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) commit 3c84973a5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 20 10:04:20 2018 +0000 First go at month view web/calendar.php | 4 +- web/css/mrbs.css.php | 2 +- web/functions_table.inc | 382 ++++++++++++++++++++++++++++++++++++++ web/month.php | 373 ------------------------------------- 4 files changed, 385 insertions(+), 376 deletions(-) commit 0700928c2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 19 17:30:36 2018 +0000 Changed parameter order of week_table_inner_html() for consistency with other functions web/calendar.php | 2 +- web/functions_table.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit b75145aa5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 19 17:25:06 2018 +0000 Week view working web/functions.inc | 10 ++++--- web/functions_table.inc | 55 ++++++++++++++++++++++++++------------- 2 files changed, 43 insertions(+), 22 deletions(-) commit 7e39a98f1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 19 16:49:58 2018 +0000 Day view working web/functions_table.inc | 63 +++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 23 deletions(-) commit eb9eebc61 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 19 15:51:04 2018 +0000 Fixed links in day view labels web/functions_table.inc | 57 ++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 18 deletions(-) commit c0d3be9ec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 19 15:21:42 2018 +0000 Started getting day view working web/calendar.php | 31 +++++++++++++++++++++++++++++++ web/css/mrbs.css.php | 12 ++++++------ web/functions_table.inc | 2 +- 3 files changed, 38 insertions(+), 7 deletions(-) commit 01346b592 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 19 14:40:23 2018 +0000 Made view buttons equal width web/calendar.php | 2 +- web/css/mrbs.css.php | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) commit ec7098347 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 19 12:27:47 2018 +0000 Added styling for selected view button web/calendar.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 2e2e60c72 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 19 12:27:24 2018 +0000 Added styling for selected view button web/css/mrbs.css.php | 7 +++++++ 1 file changed, 7 insertions(+) commit b18540f49 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 18 17:42:41 2018 +0000 Started adding button styling web/css/mrbs.css.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit cd9829c88 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 18 17:26:15 2018 +0000 Added day/week/month navigation web/calendar.php | 29 ++++++++++++++++++++++++++++- web/functions_mail.inc | 4 ++-- web/functions_view.inc | 2 +- web/js/edit_entry.js.php | 2 +- web/lang/lang.cs | 4 ++-- web/lang/lang.de | 4 ++-- web/lang/lang.en | 5 +++-- web/lang/lang.es | 4 ++-- web/lang/lang.fi | 4 ++-- web/lang/lang.fr | 4 ++-- web/lang/lang.he | 4 ++-- web/lang/lang.hu | 4 ++-- web/lang/lang.id | 4 ++-- web/lang/lang.it | 4 ++-- web/lang/lang.ja | 4 ++-- web/lang/lang.nb | 4 ++-- web/lang/lang.nl | 4 ++-- web/lang/lang.nn | 4 ++-- web/lang/lang.no | 4 ++-- web/lang/lang.pt | 4 ++-- web/lang/lang.pt-br | 4 ++-- web/lang/lang.ro | 4 ++-- web/lang/lang.ru | 4 ++-- web/lang/lang.sk | 4 ++-- web/lang/lang.sr-rs-latin | 4 ++-- web/lang/lang.sv | 4 ++-- web/lang/lang.th | 4 ++-- web/lang/lang.tr | 6 +++--- web/lang/lang.zh-cn | 4 ++-- 29 files changed, 84 insertions(+), 56 deletions(-) commit aaba34248 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 18 16:50:32 2018 +0000 Restructured (and added missing file which should have been added earlier) web/calendar.php (new) | 55 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) commit 6b837db67 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 18 16:45:20 2018 +0000 Added a room select web/functions.inc | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) commit c8662c8df Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 18 16:30:35 2018 +0000 Added an area select web/functions.inc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) commit 8b2a5869a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 18 15:54:54 2018 +0000 Got rid of the trailer. Created a skeleton calendar.php page will be a multi-pupose day/week/month view. web/Themes/classic126/styling.inc | 2 - web/Themes/default/footer.inc | 8 +- web/Themes/default/styling.inc | 2 - web/admin.php | 3 +- web/css/mrbs-rtl.css.php | 10 -- web/css/mrbs.css.php | 63 +------- web/day.php | 3 +- web/defaultincludes.inc | 1 - web/del.php | 4 +- web/edit_area.php | 2 +- web/edit_entry.php | 3 +- web/edit_entry_handler.php | 3 +- web/edit_room.php | 2 +- web/edit_users.php | 5 +- web/functions.inc | 2 +- web/functions_error.inc | 2 +- web/help.php | 3 +- web/import.php | 3 +- web/index.php | 31 ++-- web/month.php | 4 +- web/mrbs_auth.inc | 1 + web/pending.php | 3 +- web/report.php | 3 +- web/search.php | 8 +- web/systemdefaults.inc.php | 12 +- web/trailer.inc (gone) | 222 ---------------------------- web/view_entry.php | 3 +- web/week.php | 3 +- 28 files changed, 42 insertions(+), 369 deletions(-) commit aa40fed1a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 18 14:25:21 2018 +0000 Opened a new branch for the development of navigation improvements commit e986bf942 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 15 16:34:53 2018 +0000 Added trimming of input fields on the Edit User form to remove accidental whitespace web/edit_users.php | 2 ++ 1 file changed, 2 insertions(+) commit e041becef Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 15 16:24:56 2018 +0000 Fixed a bug causing the warning about editing the last admin always to be shown. (This bug was introduced in the forms_rewrite branch and was not present in MRBS 1.7.1). web/edit_users.php | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) commit d2bd316f2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 14 14:08:50 2018 +0000 Fixed bug introduced in a recent restructuring of mrbs_auth.inc web/mrbs_auth.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 19c0ae1b7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 14 12:01:00 2018 +0000 Fixed problem with text inputs and textarea widths not being the same in some browsers, eg Firefox web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 31dd56877 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 14 10:18:41 2018 +0000 Updated the list of authentication types and session schemes. web/systemdefaults.inc.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) commit 0621bec98 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 14 09:59:46 2018 +0000 Added checks to make sure that the session scheme is set correctly when using joomla or wordpress authentication. web/auth/auth_joomla.inc | 7 +++++++ web/auth/auth_wordpress.inc | 7 +++++++ web/mrbs_auth.inc | 5 ++--- 3 files changed, 16 insertions(+), 3 deletions(-) commit 31d70f223 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 14 09:40:42 2018 +0000 Moved setting of the default session scheme to mrbs_auth.inc and changed the default from 'http' to 'php', except for the 'joomla', 'saml' and 'wordpress' auth types. web/auth/auth_auth_basic.inc | 4 +--- web/auth/auth_config.inc | 1 + web/auth/auth_crypt.inc | 2 -- web/auth/auth_ext.inc | 3 +-- web/auth/auth_imap.inc | 6 +----- web/auth/auth_ldap.inc | 5 ----- web/auth/auth_nis.inc | 6 +----- web/auth/auth_nw.inc | 6 +----- web/auth/auth_pop3.inc | 6 +----- web/auth/auth_smtp.inc | 6 +----- web/mrbs_auth.inc | 16 ++++++++++++++-- 11 files changed, 22 insertions(+), 39 deletions(-) commit a22f33bfb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 12 17:22:39 2018 +0000 Updated timezone definitions .../zoneinfo-outlook/Africa/Abidjan.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Accra.ics | 2 +- .../zoneinfo-outlook/Africa/Addis_Ababa.ics | 2 +- .../zoneinfo-outlook/Africa/Algiers.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Asmara.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Bamako.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Bangui.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Banjul.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Bissau.ics | 2 +- .../zoneinfo-outlook/Africa/Blantyre.ics | 2 +- .../zoneinfo-outlook/Africa/Brazzaville.ics | 2 +- .../zoneinfo-outlook/Africa/Bujumbura.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Cairo.ics | 2 +- .../zoneinfo-outlook/Africa/Casablanca.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Ceuta.ics | 2 +- .../zoneinfo-outlook/Africa/Conakry.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Dakar.ics | 2 +- .../Africa/Dar_es_Salaam.ics | 2 +- .../zoneinfo-outlook/Africa/Djibouti.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Douala.ics | 2 +- .../zoneinfo-outlook/Africa/El_Aaiun.ics | 2 +- .../zoneinfo-outlook/Africa/Freetown.ics | 2 +- .../zoneinfo-outlook/Africa/Gaborone.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Harare.ics | 2 +- .../zoneinfo-outlook/Africa/Johannesburg.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Juba.ics | 2 +- .../zoneinfo-outlook/Africa/Kampala.ics | 2 +- .../zoneinfo-outlook/Africa/Khartoum.ics | 8 +- web/tzurl/zoneinfo-outlook/Africa/Kigali.ics | 2 +- .../zoneinfo-outlook/Africa/Kinshasa.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Lagos.ics | 2 +- .../zoneinfo-outlook/Africa/Libreville.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Lome.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Luanda.ics | 2 +- .../zoneinfo-outlook/Africa/Lubumbashi.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Lusaka.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Malabo.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Maputo.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Maseru.ics | 2 +- .../zoneinfo-outlook/Africa/Mbabane.ics | 2 +- .../zoneinfo-outlook/Africa/Mogadishu.ics | 2 +- .../zoneinfo-outlook/Africa/Monrovia.ics | 2 +- .../zoneinfo-outlook/Africa/Nairobi.ics | 2 +- .../zoneinfo-outlook/Africa/Ndjamena.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Niamey.ics | 2 +- .../zoneinfo-outlook/Africa/Nouakchott.ics | 2 +- .../zoneinfo-outlook/Africa/Ouagadougou.ics | 2 +- .../zoneinfo-outlook/Africa/Porto-Novo.ics | 2 +- .../zoneinfo-outlook/Africa/Sao_Tome.ics | 8 +- .../zoneinfo-outlook/Africa/Tripoli.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Tunis.ics | 2 +- .../zoneinfo-outlook/Africa/Windhoek.ics | 16 +- web/tzurl/zoneinfo-outlook/America/Adak.ics | 2 +- .../zoneinfo-outlook/America/Anchorage.ics | 2 +- .../zoneinfo-outlook/America/Anguilla.ics | 2 +- .../zoneinfo-outlook/America/Antigua.ics | 2 +- .../zoneinfo-outlook/America/Araguaina.ics | 4 +- .../America/Argentina/Buenos_Aires.ics | 4 +- .../America/Argentina/Catamarca.ics | 4 +- .../America/Argentina/Cordoba.ics | 4 +- .../America/Argentina/Jujuy.ics | 4 +- .../America/Argentina/La_Rioja.ics | 4 +- .../America/Argentina/Mendoza.ics | 4 +- .../America/Argentina/Rio_Gallegos.ics | 4 +- .../America/Argentina/Salta.ics | 4 +- .../America/Argentina/San_Juan.ics | 4 +- .../America/Argentina/San_Luis.ics | 4 +- .../America/Argentina/Tucuman.ics | 4 +- .../America/Argentina/Ushuaia.ics | 4 +- web/tzurl/zoneinfo-outlook/America/Aruba.ics | 2 +- .../zoneinfo-outlook/America/Asuncion.ics | 6 +- .../zoneinfo-outlook/America/Atikokan.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Bahia.ics | 4 +- .../America/Bahia_Banderas.ics | 2 +- .../zoneinfo-outlook/America/Barbados.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Belem.ics | 4 +- .../zoneinfo-outlook/America/Belize.ics | 2 +- .../America/Blanc-Sablon.ics | 2 +- .../zoneinfo-outlook/America/Boa_Vista.ics | 4 +- .../zoneinfo-outlook/America/Bogota.ics | 4 +- web/tzurl/zoneinfo-outlook/America/Boise.ics | 2 +- .../America/Cambridge_Bay.ics | 2 +- .../America/Campo_Grande.ics | 10 +- .../zoneinfo-outlook/America/Cancun.ics | 2 +- .../zoneinfo-outlook/America/Caracas.ics | 8 +- .../zoneinfo-outlook/America/Cayenne.ics | 4 +- .../zoneinfo-outlook/America/Cayman.ics | 14 +- .../zoneinfo-outlook/America/Chicago.ics | 2 +- .../zoneinfo-outlook/America/Chihuahua.ics | 2 +- .../zoneinfo-outlook/America/Costa_Rica.ics | 2 +- .../zoneinfo-outlook/America/Creston.ics | 2 +- .../zoneinfo-outlook/America/Cuiaba.ics | 10 +- .../zoneinfo-outlook/America/Curacao.ics | 2 +- .../America/Danmarkshavn.ics | 2 +- .../zoneinfo-outlook/America/Dawson.ics | 2 +- .../America/Dawson_Creek.ics | 2 +- .../zoneinfo-outlook/America/Denver.ics | 2 +- .../zoneinfo-outlook/America/Detroit.ics | 2 +- .../zoneinfo-outlook/America/Dominica.ics | 2 +- .../zoneinfo-outlook/America/Edmonton.ics | 2 +- .../zoneinfo-outlook/America/Eirunepe.ics | 4 +- .../zoneinfo-outlook/America/El_Salvador.ics | 2 +- .../zoneinfo-outlook/America/Fort_Nelson.ics | 2 +- .../zoneinfo-outlook/America/Fortaleza.ics | 4 +- .../zoneinfo-outlook/America/Glace_Bay.ics | 2 +- .../zoneinfo-outlook/America/Godthab.ics | 6 +- .../zoneinfo-outlook/America/Goose_Bay.ics | 2 +- .../zoneinfo-outlook/America/Grand_Turk.ics | 16 +- .../zoneinfo-outlook/America/Grenada.ics | 2 +- .../zoneinfo-outlook/America/Guadeloupe.ics | 2 +- .../zoneinfo-outlook/America/Guatemala.ics | 2 +- .../zoneinfo-outlook/America/Guayaquil.ics | 4 +- .../zoneinfo-outlook/America/Guyana.ics | 4 +- .../zoneinfo-outlook/America/Halifax.ics | 2 +- .../zoneinfo-outlook/America/Havana.ics | 2 +- .../zoneinfo-outlook/America/Hermosillo.ics | 2 +- .../America/Indiana/Indianapolis.ics | 2 +- .../America/Indiana/Knox.ics | 2 +- .../America/Indiana/Marengo.ics | 2 +- .../America/Indiana/Petersburg.ics | 2 +- .../America/Indiana/Tell_City.ics | 2 +- .../America/Indiana/Vevay.ics | 2 +- .../America/Indiana/Vincennes.ics | 2 +- .../America/Indiana/Winamac.ics | 2 +- .../zoneinfo-outlook/America/Inuvik.ics | 2 +- .../zoneinfo-outlook/America/Iqaluit.ics | 2 +- .../zoneinfo-outlook/America/Juneau.ics | 2 +- .../America/Kentucky/Louisville.ics | 2 +- .../America/Kentucky/Monticello.ics | 2 +- .../zoneinfo-outlook/America/Kralendijk.ics | 2 +- .../zoneinfo-outlook/America/La_Paz.ics | 4 +- web/tzurl/zoneinfo-outlook/America/Lima.ics | 4 +- .../zoneinfo-outlook/America/Los_Angeles.ics | 2 +- .../America/Lower_Princes.ics | 2 +- .../zoneinfo-outlook/America/Maceio.ics | 4 +- .../zoneinfo-outlook/America/Managua.ics | 2 +- .../zoneinfo-outlook/America/Manaus.ics | 4 +- .../zoneinfo-outlook/America/Marigot.ics | 2 +- .../zoneinfo-outlook/America/Martinique.ics | 2 +- .../zoneinfo-outlook/America/Matamoros.ics | 2 +- .../zoneinfo-outlook/America/Mazatlan.ics | 2 +- .../zoneinfo-outlook/America/Menominee.ics | 2 +- .../zoneinfo-outlook/America/Merida.ics | 2 +- .../zoneinfo-outlook/America/Metlakatla.ics | 16 +- .../zoneinfo-outlook/America/Mexico_City.ics | 2 +- .../zoneinfo-outlook/America/Miquelon.ics | 6 +- .../zoneinfo-outlook/America/Moncton.ics | 2 +- .../zoneinfo-outlook/America/Monterrey.ics | 2 +- .../zoneinfo-outlook/America/Montevideo.ics | 4 +- .../zoneinfo-outlook/America/Montserrat.ics | 2 +- .../zoneinfo-outlook/America/Nassau.ics | 2 +- .../zoneinfo-outlook/America/New_York.ics | 2 +- .../zoneinfo-outlook/America/Nipigon.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Nome.ics | 2 +- .../zoneinfo-outlook/America/Noronha.ics | 4 +- .../zoneinfo-outlook/America/Ojinaga.ics | 2 +- .../zoneinfo-outlook/America/Panama.ics | 2 +- .../zoneinfo-outlook/America/Pangnirtung.ics | 2 +- .../zoneinfo-outlook/America/Paramaribo.ics | 4 +- .../zoneinfo-outlook/America/Phoenix.ics | 2 +- .../America/Port-au-Prince.ics | 2 +- .../America/Port_of_Spain.ics | 2 +- .../zoneinfo-outlook/America/Porto_Velho.ics | 4 +- .../zoneinfo-outlook/America/Puerto_Rico.ics | 2 +- .../America/Punta_Arenas.ics (new) | 15 ++ .../zoneinfo-outlook/America/Rainy_River.ics | 2 +- .../America/Rankin_Inlet.ics | 2 +- .../zoneinfo-outlook/America/Recife.ics | 4 +- .../zoneinfo-outlook/America/Regina.ics | 2 +- .../zoneinfo-outlook/America/Resolute.ics | 2 +- .../zoneinfo-outlook/America/Rio_Branco.ics | 4 +- .../America/Santa_Isabel.ics (gone) | 23 -- .../zoneinfo-outlook/America/Santarem.ics | 4 +- .../zoneinfo-outlook/America/Santiago.ics | 16 +- .../America/Santo_Domingo.ics | 2 +- .../zoneinfo-outlook/America/Sao_Paulo.ics | 10 +- .../America/Scoresbysund.ics | 6 +- web/tzurl/zoneinfo-outlook/America/Sitka.ics | 2 +- .../America/St_Barthelemy.ics | 2 +- .../zoneinfo-outlook/America/St_Johns.ics | 2 +- .../zoneinfo-outlook/America/St_Kitts.ics | 2 +- .../zoneinfo-outlook/America/St_Lucia.ics | 2 +- .../zoneinfo-outlook/America/St_Thomas.ics | 2 +- .../zoneinfo-outlook/America/St_Vincent.ics | 2 +- .../America/Swift_Current.ics | 2 +- .../zoneinfo-outlook/America/Tegucigalpa.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Thule.ics | 2 +- .../zoneinfo-outlook/America/Thunder_Bay.ics | 2 +- .../zoneinfo-outlook/America/Tijuana.ics | 2 +- .../zoneinfo-outlook/America/Toronto.ics | 2 +- .../zoneinfo-outlook/America/Tortola.ics | 2 +- .../zoneinfo-outlook/America/Vancouver.ics | 2 +- .../zoneinfo-outlook/America/Whitehorse.ics | 2 +- .../zoneinfo-outlook/America/Winnipeg.ics | 2 +- .../zoneinfo-outlook/America/Yakutat.ics | 2 +- .../zoneinfo-outlook/America/Yellowknife.ics | 2 +- .../zoneinfo-outlook/Antarctica/Casey.ics | 8 +- .../zoneinfo-outlook/Antarctica/Davis.ics | 4 +- .../Antarctica/DumontDUrville.ics | 4 +- .../Antarctica/Macquarie.ics | 4 +- .../zoneinfo-outlook/Antarctica/Mawson.ics | 4 +- .../zoneinfo-outlook/Antarctica/McMurdo.ics | 2 +- .../zoneinfo-outlook/Antarctica/Palmer.ics | 4 +- .../zoneinfo-outlook/Antarctica/Rothera.ics | 4 +- .../zoneinfo-outlook/Antarctica/Syowa.ics | 4 +- .../zoneinfo-outlook/Antarctica/Troll.ics | 6 +- .../zoneinfo-outlook/Antarctica/Vostok.ics | 4 +- .../zoneinfo-outlook/Arctic/Longyearbyen.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Aden.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Almaty.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Amman.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Anadyr.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Aqtau.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Aqtobe.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Ashgabat.ics | 4 +- .../zoneinfo-outlook/Asia/Atyrau.ics (new) | 15 ++ web/tzurl/zoneinfo-outlook/Asia/Baghdad.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Bahrain.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Baku.ics | 16 +- web/tzurl/zoneinfo-outlook/Asia/Bangkok.ics | 4 +- .../zoneinfo-outlook/Asia/Barnaul.ics (new) | 15 ++ web/tzurl/zoneinfo-outlook/Asia/Beirut.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Bishkek.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Brunei.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Chita.ics | 8 +- .../zoneinfo-outlook/Asia/Choibalsan.ics | 16 +- web/tzurl/zoneinfo-outlook/Asia/Colombo.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Damascus.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Dhaka.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Dili.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Dubai.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Dushanbe.ics | 4 +- .../Asia/Famagusta.ics (new) | 23 ++ web/tzurl/zoneinfo-outlook/Asia/Gaza.ics | 20 +- web/tzurl/zoneinfo-outlook/Asia/Hebron.ics | 20 +- .../zoneinfo-outlook/Asia/Ho_Chi_Minh.ics | 4 +- .../zoneinfo-outlook/Asia/Hong_Kong.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Hovd.ics | 16 +- web/tzurl/zoneinfo-outlook/Asia/Irkutsk.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Istanbul.ics | 16 +- web/tzurl/zoneinfo-outlook/Asia/Jakarta.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Jayapura.ics | 2 +- .../zoneinfo-outlook/Asia/Jerusalem.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Kabul.ics | 4 +- .../zoneinfo-outlook/Asia/Kamchatka.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Karachi.ics | 2 +- .../zoneinfo-outlook/Asia/Kashgar.ics (gone) | 15 -- .../zoneinfo-outlook/Asia/Kathmandu.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Khandyga.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Kolkata.ics | 2 +- .../zoneinfo-outlook/Asia/Krasnoyarsk.ics | 4 +- .../zoneinfo-outlook/Asia/Kuala_Lumpur.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Kuching.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Kuwait.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Macau.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Magadan.ics | 8 +- web/tzurl/zoneinfo-outlook/Asia/Makassar.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Manila.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Muscat.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Nicosia.ics | 2 +- .../zoneinfo-outlook/Asia/Novokuznetsk.ics | 4 +- .../zoneinfo-outlook/Asia/Novosibirsk.ics | 8 +- web/tzurl/zoneinfo-outlook/Asia/Omsk.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Oral.ics | 4 +- .../zoneinfo-outlook/Asia/Phnom_Penh.ics | 4 +- .../zoneinfo-outlook/Asia/Pontianak.ics | 2 +- .../zoneinfo-outlook/Asia/Pyongyang.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Qatar.ics | 4 +- .../zoneinfo-outlook/Asia/Qyzylorda.ics | 4 +- .../zoneinfo-outlook/Asia/Rangoon.ics (gone) | 15 -- web/tzurl/zoneinfo-outlook/Asia/Riyadh.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Sakhalin.ics | 8 +- .../zoneinfo-outlook/Asia/Samarkand.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Seoul.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Shanghai.ics | 2 +- .../zoneinfo-outlook/Asia/Singapore.ics | 4 +- .../zoneinfo-outlook/Asia/Srednekolymsk.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Taipei.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Tashkent.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Tbilisi.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Tehran.ics | 16 +- web/tzurl/zoneinfo-outlook/Asia/Thimphu.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Tokyo.ics | 2 +- .../zoneinfo-outlook/Asia/Tomsk.ics (new) | 15 ++ .../zoneinfo-outlook/Asia/Ulaanbaatar.ics | 16 +- web/tzurl/zoneinfo-outlook/Asia/Urumqi.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Ust-Nera.ics | 4 +- .../zoneinfo-outlook/Asia/Vientiane.ics | 4 +- .../zoneinfo-outlook/Asia/Vladivostok.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Yakutsk.ics | 4 +- .../zoneinfo-outlook/Asia/Yangon.ics (new) | 15 ++ .../zoneinfo-outlook/Asia/Yekaterinburg.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Yerevan.ics | 4 +- .../zoneinfo-outlook/Atlantic/Azores.ics | 6 +- .../zoneinfo-outlook/Atlantic/Bermuda.ics | 2 +- .../zoneinfo-outlook/Atlantic/Canary.ics | 2 +- .../zoneinfo-outlook/Atlantic/Cape_Verde.ics | 4 +- .../zoneinfo-outlook/Atlantic/Faroe.ics | 2 +- .../zoneinfo-outlook/Atlantic/Madeira.ics | 2 +- .../zoneinfo-outlook/Atlantic/Reykjavik.ics | 2 +- .../Atlantic/South_Georgia.ics | 4 +- .../zoneinfo-outlook/Atlantic/St_Helena.ics | 2 +- .../zoneinfo-outlook/Atlantic/Stanley.ics | 4 +- .../zoneinfo-outlook/Australia/Adelaide.ics | 2 +- .../zoneinfo-outlook/Australia/Currie.ics | 2 +- .../zoneinfo-outlook/Australia/Darwin.ics | 2 +- .../zoneinfo-outlook/Australia/Eucla.ics | 4 +- .../zoneinfo-outlook/Australia/Hobart.ics | 2 +- .../zoneinfo-outlook/Australia/Lindeman.ics | 2 +- .../zoneinfo-outlook/Australia/Lord_Howe.ics | 6 +- .../zoneinfo-outlook/Australia/Melbourne.ics | 2 +- .../zoneinfo-outlook/Australia/Perth.ics | 2 +- .../zoneinfo-outlook/Australia/Sydney.ics | 2 +- .../zoneinfo-outlook/Europe/Amsterdam.ics | 2 +- .../zoneinfo-outlook/Europe/Andorra.ics | 2 +- .../Europe/Astrakhan.ics (new) | 15 ++ web/tzurl/zoneinfo-outlook/Europe/Athens.ics | 2 +- .../zoneinfo-outlook/Europe/Belgrade.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Berlin.ics | 2 +- .../zoneinfo-outlook/Europe/Bratislava.ics | 2 +- .../zoneinfo-outlook/Europe/Brussels.ics | 2 +- .../zoneinfo-outlook/Europe/Bucharest.ics | 2 +- .../zoneinfo-outlook/Europe/Budapest.ics | 2 +- .../zoneinfo-outlook/Europe/Busingen.ics | 2 +- .../zoneinfo-outlook/Europe/Chisinau.ics | 2 +- .../zoneinfo-outlook/Europe/Copenhagen.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Dublin.ics | 2 +- .../zoneinfo-outlook/Europe/Gibraltar.ics | 2 +- .../zoneinfo-outlook/Europe/Guernsey.ics | 2 +- .../zoneinfo-outlook/Europe/Helsinki.ics | 2 +- .../zoneinfo-outlook/Europe/Isle_of_Man.ics | 2 +- .../zoneinfo-outlook/Europe/Istanbul.ics | 16 +- web/tzurl/zoneinfo-outlook/Europe/Jersey.ics | 2 +- .../zoneinfo-outlook/Europe/Kaliningrad.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Kiev.ics | 2 +- .../zoneinfo-outlook/Europe/Kirov.ics (new) | 15 ++ web/tzurl/zoneinfo-outlook/Europe/Lisbon.ics | 2 +- .../zoneinfo-outlook/Europe/Ljubljana.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/London.ics | 2 +- .../zoneinfo-outlook/Europe/Luxembourg.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Madrid.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Malta.ics | 2 +- .../zoneinfo-outlook/Europe/Mariehamn.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Minsk.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Monaco.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Moscow.ics | 2 +- .../zoneinfo-outlook/Europe/Nicosia.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Oslo.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Paris.ics | 2 +- .../zoneinfo-outlook/Europe/Podgorica.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Prague.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Riga.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Rome.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Samara.ics | 4 +- .../zoneinfo-outlook/Europe/San_Marino.ics | 2 +- .../zoneinfo-outlook/Europe/Sarajevo.ics | 2 +- .../Europe/Saratov.ics (new) | 15 ++ .../zoneinfo-outlook/Europe/Simferopol.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Skopje.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Sofia.ics | 2 +- .../zoneinfo-outlook/Europe/Stockholm.ics | 2 +- .../zoneinfo-outlook/Europe/Tallinn.ics | 2 +- .../Europe/Ulyanovsk.ics (new) | 15 ++ .../zoneinfo-outlook/Europe/Uzhgorod.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Vaduz.ics | 2 +- .../zoneinfo-outlook/Europe/Vatican.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Vienna.ics | 2 +- .../zoneinfo-outlook/Europe/Vilnius.ics | 2 +- .../zoneinfo-outlook/Europe/Volgograd.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Warsaw.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Zagreb.ics | 2 +- .../zoneinfo-outlook/Europe/Zaporozhye.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Zurich.ics | 2 +- .../zoneinfo-outlook/Indian/Antananarivo.ics | 2 +- web/tzurl/zoneinfo-outlook/Indian/Chagos.ics | 4 +- .../zoneinfo-outlook/Indian/Christmas.ics | 4 +- web/tzurl/zoneinfo-outlook/Indian/Cocos.ics | 4 +- web/tzurl/zoneinfo-outlook/Indian/Comoro.ics | 2 +- .../zoneinfo-outlook/Indian/Kerguelen.ics | 4 +- web/tzurl/zoneinfo-outlook/Indian/Mahe.ics | 4 +- .../zoneinfo-outlook/Indian/Maldives.ics | 4 +- .../zoneinfo-outlook/Indian/Mauritius.ics | 4 +- .../zoneinfo-outlook/Indian/Mayotte.ics | 2 +- .../zoneinfo-outlook/Indian/Reunion.ics | 4 +- web/tzurl/zoneinfo-outlook/Pacific/Apia.ics | 6 +- .../zoneinfo-outlook/Pacific/Auckland.ics | 2 +- .../Pacific/Bougainville.ics | 4 +- .../zoneinfo-outlook/Pacific/Chatham.ics | 6 +- web/tzurl/zoneinfo-outlook/Pacific/Chuuk.ics | 4 +- .../zoneinfo-outlook/Pacific/Easter.ics | 16 +- web/tzurl/zoneinfo-outlook/Pacific/Efate.ics | 4 +- .../zoneinfo-outlook/Pacific/Enderbury.ics | 4 +- .../zoneinfo-outlook/Pacific/Fakaofo.ics | 4 +- web/tzurl/zoneinfo-outlook/Pacific/Fiji.ics | 8 +- .../zoneinfo-outlook/Pacific/Funafuti.ics | 4 +- .../zoneinfo-outlook/Pacific/Galapagos.ics | 4 +- .../zoneinfo-outlook/Pacific/Gambier.ics | 4 +- .../zoneinfo-outlook/Pacific/Guadalcanal.ics | 4 +- web/tzurl/zoneinfo-outlook/Pacific/Guam.ics | 2 +- .../zoneinfo-outlook/Pacific/Honolulu.ics | 2 +- .../Pacific/Johnston.ics (gone) | 15 -- .../zoneinfo-outlook/Pacific/Kiritimati.ics | 4 +- .../zoneinfo-outlook/Pacific/Kosrae.ics | 4 +- .../zoneinfo-outlook/Pacific/Kwajalein.ics | 4 +- .../zoneinfo-outlook/Pacific/Majuro.ics | 4 +- .../zoneinfo-outlook/Pacific/Marquesas.ics | 4 +- .../zoneinfo-outlook/Pacific/Midway.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Nauru.ics | 4 +- web/tzurl/zoneinfo-outlook/Pacific/Niue.ics | 4 +- .../zoneinfo-outlook/Pacific/Norfolk.ics | 4 +- .../zoneinfo-outlook/Pacific/Noumea.ics | 4 +- .../zoneinfo-outlook/Pacific/Pago_Pago.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Palau.ics | 4 +- .../zoneinfo-outlook/Pacific/Pitcairn.ics | 4 +- .../zoneinfo-outlook/Pacific/Pohnpei.ics | 4 +- .../Pacific/Port_Moresby.ics | 4 +- .../zoneinfo-outlook/Pacific/Rarotonga.ics | 4 +- .../zoneinfo-outlook/Pacific/Saipan.ics | 2 +- .../zoneinfo-outlook/Pacific/Tahiti.ics | 4 +- .../zoneinfo-outlook/Pacific/Tarawa.ics | 4 +- .../zoneinfo-outlook/Pacific/Tongatapu.ics | 4 +- web/tzurl/zoneinfo-outlook/Pacific/Wake.ics | 4 +- .../zoneinfo-outlook/Pacific/Wallis.ics | 4 +- web/tzurl/zoneinfo/Africa/Abidjan.ics | 2 +- web/tzurl/zoneinfo/Africa/Accra.ics | 4 +- web/tzurl/zoneinfo/Africa/Addis_Ababa.ics | 6 +- web/tzurl/zoneinfo/Africa/Algiers.ics | 2 +- web/tzurl/zoneinfo/Africa/Asmara.ics | 6 +- web/tzurl/zoneinfo/Africa/Bamako.ics | 2 +- web/tzurl/zoneinfo/Africa/Bangui.ics | 2 +- web/tzurl/zoneinfo/Africa/Banjul.ics | 2 +- web/tzurl/zoneinfo/Africa/Bissau.ics | 4 +- web/tzurl/zoneinfo/Africa/Blantyre.ics | 2 +- web/tzurl/zoneinfo/Africa/Brazzaville.ics | 2 +- web/tzurl/zoneinfo/Africa/Bujumbura.ics | 2 +- web/tzurl/zoneinfo/Africa/Cairo.ics | 2 +- web/tzurl/zoneinfo/Africa/Casablanca.ics | 14 +- web/tzurl/zoneinfo/Africa/Ceuta.ics | 16 +- web/tzurl/zoneinfo/Africa/Conakry.ics | 2 +- web/tzurl/zoneinfo/Africa/Dakar.ics | 2 +- web/tzurl/zoneinfo/Africa/Dar_es_Salaam.ics | 6 +- web/tzurl/zoneinfo/Africa/Djibouti.ics | 6 +- web/tzurl/zoneinfo/Africa/Douala.ics | 2 +- web/tzurl/zoneinfo/Africa/El_Aaiun.ics | 16 +- web/tzurl/zoneinfo/Africa/Freetown.ics | 2 +- web/tzurl/zoneinfo/Africa/Gaborone.ics | 2 +- web/tzurl/zoneinfo/Africa/Harare.ics | 2 +- web/tzurl/zoneinfo/Africa/Johannesburg.ics | 2 +- web/tzurl/zoneinfo/Africa/Juba.ics | 4 +- web/tzurl/zoneinfo/Africa/Kampala.ics | 6 +- web/tzurl/zoneinfo/Africa/Khartoum.ics | 3 +- web/tzurl/zoneinfo/Africa/Kigali.ics | 2 +- web/tzurl/zoneinfo/Africa/Kinshasa.ics | 2 +- web/tzurl/zoneinfo/Africa/Lagos.ics | 2 +- web/tzurl/zoneinfo/Africa/Libreville.ics | 2 +- web/tzurl/zoneinfo/Africa/Lome.ics | 2 +- web/tzurl/zoneinfo/Africa/Luanda.ics | 2 +- web/tzurl/zoneinfo/Africa/Lubumbashi.ics | 2 +- web/tzurl/zoneinfo/Africa/Lusaka.ics | 2 +- web/tzurl/zoneinfo/Africa/Malabo.ics | 2 +- web/tzurl/zoneinfo/Africa/Maputo.ics | 2 +- web/tzurl/zoneinfo/Africa/Maseru.ics | 2 +- web/tzurl/zoneinfo/Africa/Mbabane.ics | 2 +- web/tzurl/zoneinfo/Africa/Mogadishu.ics | 6 +- web/tzurl/zoneinfo/Africa/Monrovia.ics | 8 +- web/tzurl/zoneinfo/Africa/Nairobi.ics | 6 +- web/tzurl/zoneinfo/Africa/Ndjamena.ics | 2 +- web/tzurl/zoneinfo/Africa/Niamey.ics | 2 +- web/tzurl/zoneinfo/Africa/Nouakchott.ics | 2 +- web/tzurl/zoneinfo/Africa/Ouagadougou.ics | 2 +- web/tzurl/zoneinfo/Africa/Porto-Novo.ics | 2 +- web/tzurl/zoneinfo/Africa/Sao_Tome.ics | 18 +- web/tzurl/zoneinfo/Africa/Tripoli.ics | 2 +- web/tzurl/zoneinfo/Africa/Tunis.ics | 2 +- web/tzurl/zoneinfo/Africa/Windhoek.ics | 81 +++++-- web/tzurl/zoneinfo/America/Adak.ics | 8 +- web/tzurl/zoneinfo/America/Anchorage.ics | 17 +- web/tzurl/zoneinfo/America/Anguilla.ics | 2 +- web/tzurl/zoneinfo/America/Antigua.ics | 2 +- web/tzurl/zoneinfo/America/Araguaina.ics | 10 +- .../America/Argentina/Buenos_Aires.ics | 18 +- .../zoneinfo/America/Argentina/Catamarca.ics | 30 +-- .../zoneinfo/America/Argentina/Cordoba.ics | 22 +- .../zoneinfo/America/Argentina/Jujuy.ics | 40 ++-- .../zoneinfo/America/Argentina/La_Rioja.ics | 28 +-- .../zoneinfo/America/Argentina/Mendoza.ics | 44 ++-- .../America/Argentina/Rio_Gallegos.ics | 26 +-- .../zoneinfo/America/Argentina/Salta.ics | 22 +- .../zoneinfo/America/Argentina/San_Juan.ics | 28 +-- .../zoneinfo/America/Argentina/San_Luis.ics | 55 ++--- .../zoneinfo/America/Argentina/Tucuman.ics | 30 +-- .../zoneinfo/America/Argentina/Ushuaia.ics | 26 +-- web/tzurl/zoneinfo/America/Aruba.ics | 4 +- web/tzurl/zoneinfo/America/Asuncion.ics | 16 +- web/tzurl/zoneinfo/America/Atikokan.ics | 2 +- web/tzurl/zoneinfo/America/Bahia.ics | 10 +- .../zoneinfo/America/Bahia_Banderas.ics | 2 +- web/tzurl/zoneinfo/America/Barbados.ics | 2 +- web/tzurl/zoneinfo/America/Belem.ics | 10 +- web/tzurl/zoneinfo/America/Belize.ics | 4 +- web/tzurl/zoneinfo/America/Blanc-Sablon.ics | 2 +- web/tzurl/zoneinfo/America/Boa_Vista.ics | 10 +- web/tzurl/zoneinfo/America/Bogota.ics | 8 +- web/tzurl/zoneinfo/America/Boise.ics | 2 +- web/tzurl/zoneinfo/America/Cambridge_Bay.ics | 2 +- web/tzurl/zoneinfo/America/Campo_Grande.ics | 32 ++- web/tzurl/zoneinfo/America/Cancun.ics | 2 +- web/tzurl/zoneinfo/America/Caracas.ics | 9 +- web/tzurl/zoneinfo/America/Cayenne.ics | 6 +- web/tzurl/zoneinfo/America/Cayman.ics | 35 +-- web/tzurl/zoneinfo/America/Chicago.ics | 2 +- web/tzurl/zoneinfo/America/Chihuahua.ics | 2 +- web/tzurl/zoneinfo/America/Costa_Rica.ics | 2 +- web/tzurl/zoneinfo/America/Creston.ics | 2 +- web/tzurl/zoneinfo/America/Cuiaba.ics | 30 ++- web/tzurl/zoneinfo/America/Curacao.ics | 4 +- web/tzurl/zoneinfo/America/Danmarkshavn.ics | 8 +- web/tzurl/zoneinfo/America/Dawson.ics | 2 +- web/tzurl/zoneinfo/America/Dawson_Creek.ics | 2 +- web/tzurl/zoneinfo/America/Denver.ics | 2 +- web/tzurl/zoneinfo/America/Detroit.ics | 4 +- web/tzurl/zoneinfo/America/Dominica.ics | 2 +- web/tzurl/zoneinfo/America/Edmonton.ics | 2 +- web/tzurl/zoneinfo/America/Eirunepe.ics | 12 +- web/tzurl/zoneinfo/America/El_Salvador.ics | 2 +- web/tzurl/zoneinfo/America/Fort_Nelson.ics | 2 +- web/tzurl/zoneinfo/America/Fortaleza.ics | 10 +- web/tzurl/zoneinfo/America/Glace_Bay.ics | 2 +- web/tzurl/zoneinfo/America/Godthab.ics | 12 +- web/tzurl/zoneinfo/America/Goose_Bay.ics | 2 +- web/tzurl/zoneinfo/America/Grand_Turk.ics | 23 +- web/tzurl/zoneinfo/America/Grenada.ics | 2 +- web/tzurl/zoneinfo/America/Guadeloupe.ics | 2 +- web/tzurl/zoneinfo/America/Guatemala.ics | 2 +- web/tzurl/zoneinfo/America/Guayaquil.ics | 18 +- web/tzurl/zoneinfo/America/Guyana.ics | 15 +- web/tzurl/zoneinfo/America/Halifax.ics | 2 +- web/tzurl/zoneinfo/America/Havana.ics | 2 +- web/tzurl/zoneinfo/America/Hermosillo.ics | 2 +- .../America/Indiana/Indianapolis.ics | 2 +- web/tzurl/zoneinfo/America/Indiana/Knox.ics | 2 +- .../zoneinfo/America/Indiana/Marengo.ics | 2 +- .../zoneinfo/America/Indiana/Petersburg.ics | 2 +- .../zoneinfo/America/Indiana/Tell_City.ics | 2 +- web/tzurl/zoneinfo/America/Indiana/Vevay.ics | 2 +- .../zoneinfo/America/Indiana/Vincennes.ics | 2 +- .../zoneinfo/America/Indiana/Winamac.ics | 2 +- web/tzurl/zoneinfo/America/Inuvik.ics | 2 +- web/tzurl/zoneinfo/America/Iqaluit.ics | 2 +- web/tzurl/zoneinfo/America/Juneau.ics | 6 +- .../zoneinfo/America/Kentucky/Louisville.ics | 2 +- .../zoneinfo/America/Kentucky/Monticello.ics | 2 +- web/tzurl/zoneinfo/America/Kralendijk.ics | 4 +- web/tzurl/zoneinfo/America/La_Paz.ics | 6 +- web/tzurl/zoneinfo/America/Lima.ics | 8 +- web/tzurl/zoneinfo/America/Los_Angeles.ics | 38 ++-- web/tzurl/zoneinfo/America/Lower_Princes.ics | 4 +- web/tzurl/zoneinfo/America/Maceio.ics | 10 +- web/tzurl/zoneinfo/America/Managua.ics | 2 +- web/tzurl/zoneinfo/America/Manaus.ics | 10 +- web/tzurl/zoneinfo/America/Marigot.ics | 2 +- web/tzurl/zoneinfo/America/Martinique.ics | 2 +- web/tzurl/zoneinfo/America/Matamoros.ics | 2 +- web/tzurl/zoneinfo/America/Mazatlan.ics | 2 +- web/tzurl/zoneinfo/America/Menominee.ics | 2 +- web/tzurl/zoneinfo/America/Merida.ics | 2 +- web/tzurl/zoneinfo/America/Metlakatla.ics | 20 +- web/tzurl/zoneinfo/America/Mexico_City.ics | 2 +- web/tzurl/zoneinfo/America/Miquelon.ics | 14 +- web/tzurl/zoneinfo/America/Moncton.ics | 2 +- web/tzurl/zoneinfo/America/Monterrey.ics | 2 +- web/tzurl/zoneinfo/America/Montevideo.ics | 29 ++- web/tzurl/zoneinfo/America/Montserrat.ics | 2 +- web/tzurl/zoneinfo/America/Nassau.ics | 2 +- web/tzurl/zoneinfo/America/New_York.ics | 2 +- web/tzurl/zoneinfo/America/Nipigon.ics | 2 +- web/tzurl/zoneinfo/America/Nome.ics | 8 +- web/tzurl/zoneinfo/America/Noronha.ics | 10 +- .../zoneinfo/America/North_Dakota/Beulah.ics | 2 +- .../zoneinfo/America/North_Dakota/Center.ics | 2 +- .../America/North_Dakota/New_Salem.ics | 2 +- web/tzurl/zoneinfo/America/Ojinaga.ics | 2 +- web/tzurl/zoneinfo/America/Panama.ics | 2 +- web/tzurl/zoneinfo/America/Pangnirtung.ics | 2 +- web/tzurl/zoneinfo/America/Paramaribo.ics | 13 +- web/tzurl/zoneinfo/America/Phoenix.ics | 2 +- .../zoneinfo/America/Port-au-Prince.ics | 14 +- web/tzurl/zoneinfo/America/Port_of_Spain.ics | 2 +- web/tzurl/zoneinfo/America/Porto_Velho.ics | 10 +- web/tzurl/zoneinfo/America/Puerto_Rico.ics | 2 +- .../zoneinfo/America/Punta_Arenas.ics (new) | 197 +++++++++++++++++ web/tzurl/zoneinfo/America/Rainy_River.ics | 2 +- web/tzurl/zoneinfo/America/Rankin_Inlet.ics | 2 +- web/tzurl/zoneinfo/America/Recife.ics | 10 +- web/tzurl/zoneinfo/America/Regina.ics | 2 +- web/tzurl/zoneinfo/America/Resolute.ics | 2 +- web/tzurl/zoneinfo/America/Rio_Branco.ics | 12 +- .../zoneinfo/America/Santa_Isabel.ics (gone) | 107 --------- web/tzurl/zoneinfo/America/Santarem.ics | 12 +- web/tzurl/zoneinfo/America/Santiago.ics | 39 ++-- web/tzurl/zoneinfo/America/Santo_Domingo.ics | 4 +- web/tzurl/zoneinfo/America/Sao_Paulo.ics | 34 ++- web/tzurl/zoneinfo/America/Scoresbysund.ics | 16 +- web/tzurl/zoneinfo/America/Sitka.ics | 6 +- web/tzurl/zoneinfo/America/St_Barthelemy.ics | 2 +- web/tzurl/zoneinfo/America/St_Johns.ics | 2 +- web/tzurl/zoneinfo/America/St_Kitts.ics | 2 +- web/tzurl/zoneinfo/America/St_Lucia.ics | 2 +- web/tzurl/zoneinfo/America/St_Thomas.ics | 2 +- web/tzurl/zoneinfo/America/St_Vincent.ics | 2 +- web/tzurl/zoneinfo/America/Swift_Current.ics | 2 +- web/tzurl/zoneinfo/America/Tegucigalpa.ics | 2 +- web/tzurl/zoneinfo/America/Thule.ics | 2 +- web/tzurl/zoneinfo/America/Thunder_Bay.ics | 2 +- web/tzurl/zoneinfo/America/Tijuana.ics | 16 +- web/tzurl/zoneinfo/America/Toronto.ics | 2 +- web/tzurl/zoneinfo/America/Tortola.ics | 2 +- web/tzurl/zoneinfo/America/Vancouver.ics | 2 +- web/tzurl/zoneinfo/America/Whitehorse.ics | 2 +- web/tzurl/zoneinfo/America/Winnipeg.ics | 2 +- web/tzurl/zoneinfo/America/Yakutat.ics | 6 +- web/tzurl/zoneinfo/America/Yellowknife.ics | 2 +- web/tzurl/zoneinfo/Antarctica/Casey.ics | 9 +- web/tzurl/zoneinfo/Antarctica/Davis.ics | 10 +- .../zoneinfo/Antarctica/DumontDUrville.ics | 14 +- web/tzurl/zoneinfo/Antarctica/Macquarie.ics | 6 +- web/tzurl/zoneinfo/Antarctica/Mawson.ics | 6 +- web/tzurl/zoneinfo/Antarctica/McMurdo.ics | 2 +- web/tzurl/zoneinfo/Antarctica/Palmer.ics | 80 +++---- web/tzurl/zoneinfo/Antarctica/Rothera.ics | 4 +- web/tzurl/zoneinfo/Antarctica/Syowa.ics | 4 +- web/tzurl/zoneinfo/Antarctica/Troll.ics | 8 +- web/tzurl/zoneinfo/Antarctica/Vostok.ics | 4 +- web/tzurl/zoneinfo/Arctic/Longyearbyen.ics | 2 +- web/tzurl/zoneinfo/Asia/Aden.ics | 4 +- web/tzurl/zoneinfo/Asia/Almaty.ics | 32 +-- web/tzurl/zoneinfo/Asia/Amman.ics | 2 +- web/tzurl/zoneinfo/Asia/Anadyr.ics | 26 +-- web/tzurl/zoneinfo/Asia/Aqtau.ics | 81 +++---- web/tzurl/zoneinfo/Asia/Aqtobe.ics | 84 +++---- web/tzurl/zoneinfo/Asia/Ashgabat.ics | 29 +-- web/tzurl/zoneinfo/Asia/Atyrau.ics (new) | 125 +++++++++++ web/tzurl/zoneinfo/Asia/Baghdad.ics | 8 +- web/tzurl/zoneinfo/Asia/Bahrain.ics | 6 +- web/tzurl/zoneinfo/Asia/Baku.ics | 101 +++++---- web/tzurl/zoneinfo/Asia/Bangkok.ics | 4 +- web/tzurl/zoneinfo/Asia/Barnaul.ics (new) | 124 +++++++++++ web/tzurl/zoneinfo/Asia/Beirut.ics | 2 +- web/tzurl/zoneinfo/Asia/Bishkek.ics | 18 +- web/tzurl/zoneinfo/Asia/Brunei.ics | 6 +- web/tzurl/zoneinfo/Asia/Chita.ics | 23 +- web/tzurl/zoneinfo/Asia/Choibalsan.ics | 38 ++-- web/tzurl/zoneinfo/Asia/Colombo.ics | 16 +- web/tzurl/zoneinfo/Asia/Damascus.ics | 2 +- web/tzurl/zoneinfo/Asia/Dhaka.ics | 19 +- web/tzurl/zoneinfo/Asia/Dili.ics | 23 +- web/tzurl/zoneinfo/Asia/Dubai.ics | 4 +- web/tzurl/zoneinfo/Asia/Dushanbe.ics | 14 +- web/tzurl/zoneinfo/Asia/Famagusta.ics (new) | 139 ++++++++++++ web/tzurl/zoneinfo/Asia/Gaza.ics | 91 ++++---- web/tzurl/zoneinfo/Asia/Hebron.ics | 93 ++++---- web/tzurl/zoneinfo/Asia/Ho_Chi_Minh.ics | 12 +- web/tzurl/zoneinfo/Asia/Hong_Kong.ics | 2 +- web/tzurl/zoneinfo/Asia/Hovd.ics | 28 +-- web/tzurl/zoneinfo/Asia/Irkutsk.ics | 20 +- web/tzurl/zoneinfo/Asia/Istanbul.ics | 60 ++--- web/tzurl/zoneinfo/Asia/Jakarta.ics | 14 +- web/tzurl/zoneinfo/Asia/Jayapura.ics | 6 +- web/tzurl/zoneinfo/Asia/Jerusalem.ics | 2 +- web/tzurl/zoneinfo/Asia/Kabul.ics | 6 +- web/tzurl/zoneinfo/Asia/Kamchatka.ics | 18 +- web/tzurl/zoneinfo/Asia/Karachi.ics | 18 +- web/tzurl/zoneinfo/Asia/Kashgar.ics (gone) | 54 ----- web/tzurl/zoneinfo/Asia/Kathmandu.ics | 6 +- web/tzurl/zoneinfo/Asia/Khandyga.ics | 34 ++- web/tzurl/zoneinfo/Asia/Kolkata.ics | 32 ++- web/tzurl/zoneinfo/Asia/Krasnoyarsk.ics | 20 +- web/tzurl/zoneinfo/Asia/Kuala_Lumpur.ics | 16 +- web/tzurl/zoneinfo/Asia/Kuching.ics | 21 +- web/tzurl/zoneinfo/Asia/Kuwait.ics | 4 +- web/tzurl/zoneinfo/Asia/Macau.ics | 15 +- web/tzurl/zoneinfo/Asia/Magadan.ics | 23 +- web/tzurl/zoneinfo/Asia/Makassar.ics | 6 +- web/tzurl/zoneinfo/Asia/Manila.ics | 10 +- web/tzurl/zoneinfo/Asia/Muscat.ics | 4 +- web/tzurl/zoneinfo/Asia/Nicosia.ics | 2 +- web/tzurl/zoneinfo/Asia/Novokuznetsk.ics | 47 +--- web/tzurl/zoneinfo/Asia/Novosibirsk.ics | 23 +- web/tzurl/zoneinfo/Asia/Omsk.ics | 20 +- web/tzurl/zoneinfo/Asia/Oral.ics | 90 +++----- web/tzurl/zoneinfo/Asia/Phnom_Penh.ics | 4 +- web/tzurl/zoneinfo/Asia/Pontianak.ics | 12 +- web/tzurl/zoneinfo/Asia/Pyongyang.ics | 11 +- web/tzurl/zoneinfo/Asia/Qatar.ics | 6 +- web/tzurl/zoneinfo/Asia/Qyzylorda.ics | 99 ++++----- web/tzurl/zoneinfo/Asia/Riyadh.ics | 4 +- web/tzurl/zoneinfo/Asia/Sakhalin.ics | 30 +-- web/tzurl/zoneinfo/Asia/Samarkand.ics | 29 +-- web/tzurl/zoneinfo/Asia/Seoul.ics | 11 +- web/tzurl/zoneinfo/Asia/Shanghai.ics | 2 +- web/tzurl/zoneinfo/Asia/Singapore.ics | 23 +- web/tzurl/zoneinfo/Asia/Srednekolymsk.ics | 28 +-- web/tzurl/zoneinfo/Asia/Taipei.ics | 4 +- web/tzurl/zoneinfo/Asia/Tashkent.ics | 23 +- web/tzurl/zoneinfo/Asia/Tbilisi.ics | 85 +++---- web/tzurl/zoneinfo/Asia/Tehran.ics | 34 ++- web/tzurl/zoneinfo/Asia/Thimphu.ics | 6 +- web/tzurl/zoneinfo/Asia/Tokyo.ics | 36 +-- web/tzurl/zoneinfo/Asia/Tomsk.ics (new) | 124 +++++++++++ web/tzurl/zoneinfo/Asia/Ulaanbaatar.ics | 28 +-- web/tzurl/zoneinfo/Asia/Urumqi.ics | 4 +- web/tzurl/zoneinfo/Asia/Ust-Nera.ics | 40 ++-- web/tzurl/zoneinfo/Asia/Vientiane.ics | 4 +- web/tzurl/zoneinfo/Asia/Vladivostok.ics | 20 +- web/tzurl/zoneinfo/Asia/Yakutsk.ics | 20 +- .../Asia/{Rangoon.ics => Yangon.ics} | 20 +- web/tzurl/zoneinfo/Asia/Yekaterinburg.ics | 86 +++---- web/tzurl/zoneinfo/Asia/Yerevan.ics | 105 ++++----- web/tzurl/zoneinfo/Atlantic/Azores.ics | 58 +++-- web/tzurl/zoneinfo/Atlantic/Bermuda.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Canary.ics | 4 +- web/tzurl/zoneinfo/Atlantic/Cape_Verde.ics | 10 +- web/tzurl/zoneinfo/Atlantic/Faroe.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Madeira.ics | 12 +- web/tzurl/zoneinfo/Atlantic/Reykjavik.ics | 8 +- .../zoneinfo/Atlantic/South_Georgia.ics | 4 +- web/tzurl/zoneinfo/Atlantic/St_Helena.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Stanley.ics | 24 +- web/tzurl/zoneinfo/Australia/Adelaide.ics | 2 +- web/tzurl/zoneinfo/Australia/Brisbane.ics | 2 +- web/tzurl/zoneinfo/Australia/Currie.ics | 2 +- web/tzurl/zoneinfo/Australia/Darwin.ics | 2 +- web/tzurl/zoneinfo/Australia/Eucla.ics | 10 +- web/tzurl/zoneinfo/Australia/Hobart.ics | 2 +- web/tzurl/zoneinfo/Australia/Lindeman.ics | 2 +- web/tzurl/zoneinfo/Australia/Lord_Howe.ics | 23 +- web/tzurl/zoneinfo/Australia/Melbourne.ics | 2 +- web/tzurl/zoneinfo/Australia/Perth.ics | 2 +- web/tzurl/zoneinfo/Australia/Sydney.ics | 2 +- web/tzurl/zoneinfo/Europe/Amsterdam.ics | 8 +- web/tzurl/zoneinfo/Europe/Andorra.ics | 2 +- .../zoneinfo/Europe/Astrakhan.ics (new) | 115 ++++++++++ web/tzurl/zoneinfo/Europe/Athens.ics | 2 +- web/tzurl/zoneinfo/Europe/Belgrade.ics | 2 +- web/tzurl/zoneinfo/Europe/Berlin.ics | 2 +- web/tzurl/zoneinfo/Europe/Bratislava.ics | 2 +- web/tzurl/zoneinfo/Europe/Brussels.ics | 2 +- web/tzurl/zoneinfo/Europe/Bucharest.ics | 2 +- web/tzurl/zoneinfo/Europe/Budapest.ics | 2 +- web/tzurl/zoneinfo/Europe/Busingen.ics | 2 +- web/tzurl/zoneinfo/Europe/Chisinau.ics | 20 +- web/tzurl/zoneinfo/Europe/Copenhagen.ics | 2 +- web/tzurl/zoneinfo/Europe/Dublin.ics | 6 +- web/tzurl/zoneinfo/Europe/Gibraltar.ics | 2 +- web/tzurl/zoneinfo/Europe/Guernsey.ics | 2 +- web/tzurl/zoneinfo/Europe/Helsinki.ics | 2 +- web/tzurl/zoneinfo/Europe/Isle_of_Man.ics | 2 +- web/tzurl/zoneinfo/Europe/Istanbul.ics | 60 ++--- web/tzurl/zoneinfo/Europe/Jersey.ics | 2 +- web/tzurl/zoneinfo/Europe/Kaliningrad.ics | 24 +- web/tzurl/zoneinfo/Europe/Kiev.ics | 2 +- web/tzurl/zoneinfo/Europe/Kirov.ics (new) | 114 ++++++++++ web/tzurl/zoneinfo/Europe/Lisbon.ics | 2 +- web/tzurl/zoneinfo/Europe/Ljubljana.ics | 2 +- web/tzurl/zoneinfo/Europe/London.ics | 2 +- web/tzurl/zoneinfo/Europe/Luxembourg.ics | 2 +- web/tzurl/zoneinfo/Europe/Madrid.ics | 106 ++++----- web/tzurl/zoneinfo/Europe/Malta.ics | 44 ++-- web/tzurl/zoneinfo/Europe/Mariehamn.ics | 2 +- web/tzurl/zoneinfo/Europe/Minsk.ics | 11 +- web/tzurl/zoneinfo/Europe/Monaco.ics | 2 +- web/tzurl/zoneinfo/Europe/Moscow.ics | 12 +- web/tzurl/zoneinfo/Europe/Nicosia.ics | 2 +- web/tzurl/zoneinfo/Europe/Oslo.ics | 2 +- web/tzurl/zoneinfo/Europe/Paris.ics | 2 +- web/tzurl/zoneinfo/Europe/Podgorica.ics | 2 +- web/tzurl/zoneinfo/Europe/Prague.ics | 2 +- web/tzurl/zoneinfo/Europe/Riga.ics | 2 +- web/tzurl/zoneinfo/Europe/Rome.ics | 55 ++--- web/tzurl/zoneinfo/Europe/Samara.ics | 118 ++++------ web/tzurl/zoneinfo/Europe/San_Marino.ics | 55 ++--- web/tzurl/zoneinfo/Europe/Sarajevo.ics | 2 +- web/tzurl/zoneinfo/Europe/Saratov.ics (new) | 115 ++++++++++ web/tzurl/zoneinfo/Europe/Simferopol.ics | 2 +- web/tzurl/zoneinfo/Europe/Skopje.ics | 2 +- web/tzurl/zoneinfo/Europe/Sofia.ics | 2 +- web/tzurl/zoneinfo/Europe/Stockholm.ics | 2 +- web/tzurl/zoneinfo/Europe/Tallinn.ics | 2 +- .../zoneinfo/Europe/Ulyanovsk.ics (new) | 135 +++++++++++ web/tzurl/zoneinfo/Europe/Uzhgorod.ics | 2 +- web/tzurl/zoneinfo/Europe/Vaduz.ics | 2 +- web/tzurl/zoneinfo/Europe/Vatican.ics | 55 ++--- web/tzurl/zoneinfo/Europe/Vienna.ics | 2 +- web/tzurl/zoneinfo/Europe/Vilnius.ics | 18 +- web/tzurl/zoneinfo/Europe/Volgograd.ics | 77 ++----- web/tzurl/zoneinfo/Europe/Warsaw.ics | 2 +- web/tzurl/zoneinfo/Europe/Zagreb.ics | 2 +- web/tzurl/zoneinfo/Europe/Zaporozhye.ics | 4 +- web/tzurl/zoneinfo/Europe/Zurich.ics | 2 +- web/tzurl/zoneinfo/Indian/Antananarivo.ics | 6 +- web/tzurl/zoneinfo/Indian/Chagos.ics | 6 +- web/tzurl/zoneinfo/Indian/Christmas.ics | 4 +- web/tzurl/zoneinfo/Indian/Cocos.ics | 4 +- web/tzurl/zoneinfo/Indian/Comoro.ics | 6 +- web/tzurl/zoneinfo/Indian/Kerguelen.ics | 4 +- web/tzurl/zoneinfo/Indian/Mahe.ics | 4 +- web/tzurl/zoneinfo/Indian/Maldives.ics | 4 +- web/tzurl/zoneinfo/Indian/Mauritius.ics | 8 +- web/tzurl/zoneinfo/Indian/Mayotte.ics | 6 +- web/tzurl/zoneinfo/Indian/Reunion.ics | 4 +- web/tzurl/zoneinfo/Pacific/Apia.ics | 20 +- web/tzurl/zoneinfo/Pacific/Auckland.ics | 2 +- web/tzurl/zoneinfo/Pacific/Bougainville.ics | 10 +- web/tzurl/zoneinfo/Pacific/Chatham.ics | 14 +- web/tzurl/zoneinfo/Pacific/Chuuk.ics | 4 +- web/tzurl/zoneinfo/Pacific/Easter.ics | 35 +-- web/tzurl/zoneinfo/Pacific/Efate.ics | 8 +- web/tzurl/zoneinfo/Pacific/Enderbury.ics | 8 +- web/tzurl/zoneinfo/Pacific/Fakaofo.ics | 6 +- web/tzurl/zoneinfo/Pacific/Fiji.ics | 14 +- web/tzurl/zoneinfo/Pacific/Funafuti.ics | 4 +- web/tzurl/zoneinfo/Pacific/Galapagos.ics | 14 +- web/tzurl/zoneinfo/Pacific/Gambier.ics | 4 +- web/tzurl/zoneinfo/Pacific/Guadalcanal.ics | 4 +- web/tzurl/zoneinfo/Pacific/Guam.ics | 2 +- web/tzurl/zoneinfo/Pacific/Honolulu.ics | 2 +- .../zoneinfo/Pacific/Johnston.ics (gone) | 39 ---- web/tzurl/zoneinfo/Pacific/Kiritimati.ics | 8 +- web/tzurl/zoneinfo/Pacific/Kosrae.ics | 8 +- web/tzurl/zoneinfo/Pacific/Kwajalein.ics | 8 +- web/tzurl/zoneinfo/Pacific/Majuro.ics | 6 +- web/tzurl/zoneinfo/Pacific/Marquesas.ics | 4 +- web/tzurl/zoneinfo/Pacific/Midway.ics | 22 +- web/tzurl/zoneinfo/Pacific/Nauru.ics | 10 +- web/tzurl/zoneinfo/Pacific/Niue.ics | 8 +- web/tzurl/zoneinfo/Pacific/Norfolk.ics | 12 +- web/tzurl/zoneinfo/Pacific/Noumea.ics | 8 +- web/tzurl/zoneinfo/Pacific/Pago_Pago.ics | 22 +- web/tzurl/zoneinfo/Pacific/Palau.ics | 4 +- web/tzurl/zoneinfo/Pacific/Pitcairn.ics | 6 +- web/tzurl/zoneinfo/Pacific/Pohnpei.ics | 4 +- web/tzurl/zoneinfo/Pacific/Port_Moresby.ics | 4 +- web/tzurl/zoneinfo/Pacific/Rarotonga.ics | 10 +- web/tzurl/zoneinfo/Pacific/Saipan.ics | 2 +- web/tzurl/zoneinfo/Pacific/Tahiti.ics | 4 +- web/tzurl/zoneinfo/Pacific/Tarawa.ics | 4 +- web/tzurl/zoneinfo/Pacific/Tongatapu.ics | 14 +- web/tzurl/zoneinfo/Pacific/Wake.ics | 4 +- web/tzurl/zoneinfo/Pacific/Wallis.ics | 4 +- 849 files changed, 4387 insertions(+), 3649 deletions(-) commit d8ea617aa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 12 15:20:58 2018 +0000 Upgraded to latest version of jQuery UI (1.12.1). Actually, we already had version 1.12.1, but this custom download removes support for jQuery 1.7.x, which makes the file slightly smaller. .../ui/css/jquery-ui.structure.min.css | 2 +- ...i-bg_diagonals-medium_20_d34d17_40x40.png | Bin 382 -> 382 bytes .../ui-bg_gloss-wave_45_817865_500x100.png | Bin 5891 -> 5891 bytes .../ui-bg_gloss-wave_60_fece2f_500x100.png | Bin 5849 -> 5849 bytes .../ui-bg_gloss-wave_70_ffdd57_500x100.png | Bin 5543 -> 5543 bytes .../ui-bg_gloss-wave_90_fff9e5_500x100.png | Bin 5389 -> 5389 bytes ...ui-bg_highlight-soft_100_feeebd_1x100.png | Bin 343 -> 343 bytes .../ui-bg_inset-soft_30_ffffff_1x100.png | Bin 203 -> 203 bytes .../ui/css/sunny/jquery-ui.theme.min.css | 2 +- web/jquery/ui/jquery-ui.js | 83 +---------------- web/jquery/ui/jquery-ui.min.js | 6 +- web/js.inc | 27 +++--- 12 files changed, 23 insertions(+), 97 deletions(-) commit 1c50d4f03 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 12 14:19:13 2018 +0000 Fixed JQuery Migrate warning about applying an offset to an element not conncted to the document. web/js/resizable.js.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 61e586559 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 12 12:49:18 2018 +0000 Replaced use of deprecated jQuery method .unbind() with .off() web/js/resizable.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 8194fd692 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 12 12:35:55 2018 +0000 Fixed bug causing the end time not to be shown when there is only one area. (This was a bug introduced in the forms_rewrite branch and is not present in MRBS 1.7.1). web/edit_entry.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 6d2192d51 Merge: 0f773a750 6189511eb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 11 11:50:31 2018 +0000 Merge with forms_rewrite commit 0f773a750 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Feb 11 10:50:49 2018 +0000 Added tag mrbs-1_7_1 for changeset 86d4c68952c8 commit 29305cc2b (tag: mrbs-1_7_1) Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Feb 11 10:49:59 2018 +0000 Updated ChangeLog and NEWS for MRBS 1.7.1 release. ChangeLog | 245 +++++++++++++++++++++++++++++++++++++++++++++++----- NEWS | 61 +++++++++++++ 2 files changed, 286 insertions(+), 20 deletions(-) commit 6189511eb Merge: f8975bc9c 8b2957bba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 11 10:48:55 2018 +0000 Merge with default commit df5a36291 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Feb 11 10:32:31 2018 +0000 Incremented version number for release web/version_num.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8b2957bba Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Feb 11 10:25:38 2018 +0000 Added authLdapGetName() function in auth_ldap.inc. This isn't used by MRBS currently, but people customising MRBS will be able to use it web/auth/auth_ldap.inc | 73 ++++++++++++++++++++++++++++++++++++ web/systemdefaults.inc.php | 4 ++ 2 files changed, 77 insertions(+) commit f8975bc9c Merge: c05bfd573 9cd125f92 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 10 08:57:46 2018 +0000 Merge with default commit 9cd125f92 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Feb 9 22:46:14 2018 +0000 Fixed CSS syntax error. web/css/mrbs-mail.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c05bfd573 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 31 12:43:21 2018 +0000 Restored ids to help CSS. See SF Support Requests #1429. web/report.php | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) commit f2a7df43d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 31 12:10:12 2018 +0000 Reverted merge web/report.php | 27 --------------------------- 1 file changed, 27 deletions(-) commit b0f9c9c29 Merge: 565a73cd8 ad015b0e6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 31 12:06:56 2018 +0000 Merge with default commit ad015b0e6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 31 11:56:25 2018 +0000 Added and id to custom field divs to make selection in CSS easier. See SF Support Requests #1429. web/report.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 565a73cd8 Merge: 61b7e6a3b ec98e7d38 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 29 16:29:58 2018 +0000 Merge with default commit ec98e7d38 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 29 16:29:10 2018 +0000 Made the field order on the view_entry page the same as that on the edit_entry page. See SF Support Requests #1426. web/functions_view.inc | 249 ++++++++++++++++++++++------------- web/systemdefaults.inc.php | 4 +- 2 files changed, 160 insertions(+), 93 deletions(-) commit 61b7e6a3b Merge: 3bd477c23 5dcc7f67f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 13 10:12:15 2018 +0000 Merge with default commit 5dcc7f67f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 13 10:08:39 2018 +0000 Improved mail debugging information, giving 'From', 'To', 'Cc' and 'Bcc' addresses. web/functions_mail.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 8ecea20d9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 13 08:26:30 2018 +0000 Reorganised mail settings. See SF Support Requests #1412 web/systemdefaults.inc.php | 50 +++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 23 deletions(-) commit 3bd477c23 Merge: 99a4656c7 056d62d32 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 11 18:56:49 2018 +0000 Merge with default commit 056d62d32 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 11 18:55:53 2018 +0000 Added the ability to restrict IMAP authentication to usernames from a certain domain, using the new config setting $auth['imap_php']['user_domain']. See SF Support Requests #1407. web/auth/auth_imap_php.inc | 16 ++++++++++++++++ web/systemdefaults.inc.php | 5 +++++ 2 files changed, 21 insertions(+) commit 99a4656c7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 9 17:44:32 2018 +0000 Removed redundant code web/js/edit_entry.js.php | 9 --------- 1 file changed, 9 deletions(-) commit 1ecd1878e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 9 17:41:09 2018 +0000 Fixed problem with conflict checking not happening web/js/edit_entry.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 364fd608f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 9 17:16:43 2018 +0000 Fixed problem with slot selectors not being updated when the datepickers change web/js/datepicker.js.php | 4 ++++ web/js/edit_entry.js.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) commit e6faf9be4 Merge: 5d7348d86 58c4e1237 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 8 18:02:45 2018 +0000 Merge with default commit 5d7348d86 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 7 18:23:14 2018 +0000 Put the new period name input in focus when Add Period is clicked web/js/edit_area.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 58c4e1237 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 7 18:20:01 2018 +0000 Put the new period name input in focus when Add Period is clicked web/js/edit_area_room.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b96ce68bd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 7 17:18:24 2018 +0000 Fixed layout problem with repeat type details web/css/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit 1ce68241c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 5 15:51:52 2018 +0000 Removed redundant variable web/js/edit_area.js.php | 1 - 1 file changed, 1 deletion(-) commit 9d0e2a400 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 5 14:37:05 2018 +0000 Fixed duplicate ID problem web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a8fd6fbba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 5 13:41:07 2018 +0000 Removed unnecessary semicolon web/js/general.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 73fd24088 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 5 13:33:58 2018 +0000 Fixed JSHint problem web/js/functions.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 65735e587 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 5 11:41:32 2018 +0000 Removed checks on the existence of json_encode(), as it always does exist in PHP >= 5.2.0 web/edit_entry_handler.php | 4 +- web/edit_users.php | 6 +- web/js/edit_entry.js.php | 570 ++++++++------- web/js/edit_users.js.php | 24 +- web/js/report.js.php | 33 +- web/js/resizable.js.php | 1299 +++++++++++++++++----------------- web/js/search.js.php | 70 +- web/report.php | 6 +- web/search.php | 6 +- 9 files changed, 990 insertions(+), 1028 deletions(-) commit a32d41574 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 5 10:20:33 2018 +0000 Renamed variables for consistency with the rest of MRBS web/mrbs_sql.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit dc9653b1e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 5 10:15:11 2018 +0000 Renamed variables for consistency with the rest of MRBS web/edit_entry_handler.php | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) commit 69f3d15e7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 5 09:51:04 2018 +0000 Removed redundant $year_range config variable UPGRADE | 7 +++++++ tables.my.sql | 2 +- tables.pg.sql | 2 +- web/dbsys.inc | 2 +- web/systemdefaults.inc.php | 4 ---- web/upgrade/54/mysql.sql (new) | 1 + web/upgrade/54/pgsql.sql (new) | 0 web/upgrade/54/post.inc (new) | 23 +++++++++++++++++++++++ 8 files changed, 34 insertions(+), 7 deletions(-) commit 672667084 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 5 08:55:26 2018 +0000 Removed old style datepicker code web/js/datepicker.js.php | 128 +------------------------------------ 1 file changed, 1 insertion(+), 127 deletions(-) commit c0cc0c27d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 4 18:47:33 2018 +0000 Fixed duplicate id problem web/admin.php | 2 +- web/css/mrbs-rtl.css.php | 2 +- web/css/mrbs.css.php | 7 +++++-- web/edit_room.php | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) commit 279ced2f3 Merge: 9904dc5bf 15c02b896 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 4 16:39:42 2018 +0000 Merge with default commit 15c02b896 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 4 16:38:56 2018 +0000 Fixed problem with textarea values not being displayed. web/view_entry.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 9904dc5bf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 4 16:21:14 2018 +0000 Fixed problem with textareas web/edit_entry.php | 9 ++++++++- web/edit_users.php | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) commit 8be49ea56 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 4 15:20:36 2018 +0000 Renamed variables web/mrbs_sql.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit a5fb4a553 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 4 12:29:54 2018 +0000 Converted Skip and Book button web/edit_entry_handler.php | 42 +++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 20 deletions(-) commit 4a80621bf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 4 11:29:26 2018 +0000 Converted back button web/edit_entry_handler.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) commit 4e9a23da1 Merge: 5cb165902 7b2741980 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 4 10:40:32 2018 +0000 Merge with default commit 7b2741980 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 4 10:39:34 2018 +0000 Fixed bug resulting in unwanted colons appearing after labels in dataTables (eg the Report output) web/css/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit 5cb165902 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 4 09:54:34 2018 +0000 Converted search form in header to use Form classes web/Themes/default/header.inc | 35 ++++++++++++++++++++++----------- web/css/mrbs.css.php | 10 +++++++++- 2 files changed, 32 insertions(+), 13 deletions(-) commit 229a53407 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 3 18:09:24 2018 +0000 Removed redundant code web/edit_users.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) commit e548b1207 Merge: 0104ce23d e9e008328 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 2 20:14:56 2018 +0000 Merge with default commit e9e008328 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 2 20:14:11 2018 +0000 Fixed bug where access was being denied if the Joomla username looked like an integer, eg "1234". See SF Bugs #401. web/lib/MRBS/JFactory.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) commit 0104ce23d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 2 14:52:49 2018 +0000 Turned the edit_user links into buttons (styled as links) web/css/mrbs.css.php | 11 +++++++++-- web/edit_users.php | 27 ++++++++++++++++++++++----- web/session/functions_session.inc | 3 ++- 3 files changed, 33 insertions(+), 8 deletions(-) commit 6013420fa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 1 19:07:02 2018 +0000 Removed redundant globals web/edit_users.php | 3 --- 1 file changed, 3 deletions(-) commit 6050679e9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 1 19:04:21 2018 +0000 Removed redundant code web/functions.inc | 1011 ------------------------------------------- 1 file changed, 1011 deletions(-) commit 8cad45b2a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 1 18:40:42 2018 +0000 Restructured web/edit_users.php | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) commit 42ed9b3a8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 1 18:18:16 2018 +0000 Removed old form web/edit_users.php | 65 -------------------------------------------- 1 file changed, 65 deletions(-) commit 1553f61be Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 1 18:14:47 2018 +0000 Added delete and back buttons web/edit_users.php | 46 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) commit ed844df37 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 1 17:21:56 2018 +0000 Removed old error messages web/edit_users.php | 42 ------------------------------------------ 1 file changed, 42 deletions(-) commit 066b59dae Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 1 17:18:29 2018 +0000 Added error messages web/edit_users.php | 56 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 8 deletions(-) commit 2e4fefc07 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 1 12:51:23 2018 +0000 Removed old code web/edit_users.php | 14 -------------- 1 file changed, 14 deletions(-) commit fca69de1c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 1 12:48:16 2018 +0000 Removed old code and CSS web/css/mrbs-ie-rtl.css | 4 ---- web/css/mrbs-ie.css | 4 ---- web/css/mrbs-rtl.css.php | 20 ----------------- web/css/mrbs.css.php | 46 +------------------------------------- web/edit_users.php | 5 ----- 5 files changed, 1 insertion(+), 78 deletions(-) commit 6b65d2a55 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 1 12:36:16 2018 +0000 Removed old code web/edit_users.php | 43 ------------------------------------------- 1 file changed, 43 deletions(-) commit 39547f489 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 1 12:31:09 2018 +0000 Removed old code web/edit_users.php | 38 -------------------------------------- 1 file changed, 38 deletions(-) commit 5eda90657 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 1 12:21:51 2018 +0000 Added submit button web/edit_users.php | 50 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) commit 734105286 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 1 11:26:36 2018 +0000 Added custom fields web/edit_entry.php | 12 +++--- web/edit_users.php | 93 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 5 deletions(-) commit 179e19bfe Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 31 22:25:31 2017 +0000 Updated comments web/edit_users.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) commit 934dad136 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 31 22:16:04 2017 +0000 Added email field web/edit_users.php | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) commit c7fc91bb7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 31 22:04:13 2017 +0000 Added a maxlength attribute for the name field web/edit_users.php | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) commit 5c9048cd2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 31 21:38:57 2017 +0000 Restructured web/edit_users.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit bd1762da8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 31 18:49:39 2017 +0000 Added level field web/edit_users.php | 93 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) commit fa959964a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 31 17:21:48 2017 +0000 Converted Add user button web/edit_users.php | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) commit 9495f49c5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 31 15:57:03 2017 +0000 Converted room select form web/functions.inc | 63 ++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 32 deletions(-) commit 09dd435bf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 31 15:19:31 2017 +0000 Converted the area select form to use the Forms classes web/functions.inc | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) commit f505e16ec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 31 12:24:28 2017 +0000 Removed form_general CSS web/css/mrbs-ie.css | 25 +------ web/css/mrbs-rtl.css.php | 46 +----------- web/css/mrbs.css.php | 148 ++++--------------------------------- 3 files changed, 16 insertions(+), 203 deletions(-) commit 944cc5baa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 31 10:11:50 2017 +0000 Completed conversion of import form web/import.php | 189 +++++++++++++---------------------------------- 1 file changed, 53 insertions(+), 136 deletions(-) commit 70c1c3a06 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 31 08:42:09 2017 +0000 Tweaked CSS web/css/mrbs.css.php | 4 ++++ web/import.php | 1 + 2 files changed, 5 insertions(+) commit 8b7238201 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 31 08:28:08 2017 +0000 Completed area and room settings web/css/mrbs.css.php | 2 +- web/import.php | 121 +++++++++++++++++ web/lib/MRBS/Form/ElementInputFile.php (new) | 14 ++ web/lib/MRBS/Form/FieldInputFile.php (new) | 15 ++ 4 files changed, 151 insertions(+), 1 deletion(-) commit f06566473 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 30 18:47:49 2017 +0000 Converted login form to standard class web/session/functions_session.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d74ecf3a2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 30 18:38:43 2017 +0000 Fixed CSS web/css/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit ba230381a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 30 18:30:47 2017 +0000 Converted db upgrade login form to standard class web/css/mrbs.css.php | 2 +- web/dbsys.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 813c75d1a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 30 17:21:17 2017 +0000 Fixed HTML5 validation errors web/edit_entry.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) commit 48e43688c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 30 17:10:45 2017 +0000 Fixed bug web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit aaf23c749 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 30 16:38:06 2017 +0000 Removed redundant code web/js.inc | 5 +---- web/js/refresh.js.php | 6 ++---- web/js/resizable.js.php | 5 +---- 3 files changed, 4 insertions(+), 12 deletions(-) commit c46d6f280 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 30 16:24:29 2017 +0000 Made resizable bookings work web/css/mrbs-ie.css | 1 - web/edit_entry.php | 3 +-- web/edit_entry_handler.php | 5 ++++- web/functions_table.inc | 2 +- web/js.inc | 3 ++- web/js/resizable.js.php | 23 ++++++----------------- 6 files changed, 14 insertions(+), 23 deletions(-) commit fc1efe51c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 30 11:34:07 2017 +0000 Fixed JavaScript and edit_entry_handler to match new form web/edit_entry.php | 6 ++++-- web/edit_entry_handler.php | 16 +++++++--------- web/js/edit_entry.js.php | 26 +++++++++++++------------- 3 files changed, 24 insertions(+), 24 deletions(-) commit 4fa077efc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 30 09:21:56 2017 +0000 Tweaked CSS web/css/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit d84024ec5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 30 09:14:22 2017 +0000 Removed redundant CSS web/css/mrbs-rtl.css.php | 8 ++------ web/css/mrbs.css.php | 27 --------------------------- 2 files changed, 2 insertions(+), 33 deletions(-) commit 0450d0fc3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 30 09:03:15 2017 +0000 Removed redundant code web/edit_entry.php | 188 ------------------------------------------- 1 file changed, 188 deletions(-) commit c85f36ae3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 30 08:49:12 2017 +0000 Removed old end date field web/edit_entry.php | 37 ------------------------------------- 1 file changed, 37 deletions(-) commit 26668e9f2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 30 08:11:48 2017 +0000 Fixed CSS web/css/mrbs.css.php | 19 ++++++++++--------- web/edit_entry.php | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) commit 3c90490a0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 29 18:16:38 2017 +0000 End date all there now, though the CSS needs fixing web/edit_entry.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) commit ee2cc4c4b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 29 15:45:09 2017 +0000 Restructured web/edit_entry.php | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) commit f1698cd45 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 29 15:33:51 2017 +0000 Removed old start date web/edit_entry.php | 44 +++++++++++--------------------------------- 1 file changed, 11 insertions(+), 33 deletions(-) commit 2f23118ee Merge: 90ec37fc3 a26187618 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 29 12:27:03 2017 +0000 Merge with default commit a26187618 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 29 11:36:40 2017 +0000 Improved internationalisation of some language tokens web/lang/lang.cs | 2 +- web/lang/lang.de | 4 ++-- web/lang/lang.en | 4 ++-- web/lang/lang.es | 4 ++-- web/lang/lang.fi | 2 +- web/lang/lang.id | 2 +- web/lang/lang.it | 4 ++-- web/lang/lang.ja | 2 +- web/lang/lang.pl | 4 ++-- web/lang/lang.ro | 4 ++-- web/lang/lang.sk | 2 +- web/lang/lang.sr-rs-latin | 2 +- web/lang/lang.sv | 4 ++-- web/lang/lang.zh-cn | 4 ++-- web/mrbs_sql.inc | 4 ++-- 15 files changed, 24 insertions(+), 24 deletions(-) commit 36d6f4d5d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 29 11:23:06 2017 +0000 Fixed another date formatting problem web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 508cb8086 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 29 11:17:19 2017 +0000 Fixed bug in formatting date for policy violations web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 90ec37fc3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 29 07:14:12 2017 +0000 Commit before changes web/css/mrbs-ie.css | 3 +- web/edit_entry.php | 112 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 98 insertions(+), 17 deletions(-) commit 71282c816 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 28 13:43:06 2017 +0000 Removed old full description field web/edit_entry.php | 31 ------------------------------- 1 file changed, 31 deletions(-) commit dcabe6edf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 28 13:35:09 2017 +0000 Removed old brief description field web/edit_entry.php | 24 ------------------------ 1 file changed, 24 deletions(-) commit edd3f672d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 28 13:27:57 2017 +0000 Removed old rooms field web/edit_entry.php | 85 -------------------------------------------- 1 file changed, 85 deletions(-) commit 14e31672a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 27 15:29:56 2017 +0000 Added conflicts tabs web/edit_entry.php | 39 -------------------------------------- web/js/edit_entry.js.php | 24 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 40 deletions(-) commit c35a7d6d1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 27 11:35:41 2017 +0000 Added policy and schedule checkmarks web/css/mrbs.css.php | 10 +++++----- web/edit_entry.php | 28 +++++++++++++++++++++++----- 2 files changed, 28 insertions(+), 10 deletions(-) commit 876cc70d4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 27 09:31:51 2017 +0000 Added submit buttons web/edit_entry.php | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) commit 7449c5eda Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 26 22:18:55 2017 +0000 Converted hidden inputs web/edit_entry.php | 52 ++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 28 deletions(-) commit 3bac5f667 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 26 22:03:00 2017 +0000 Removed old booking controls web/edit_entry.php | 19 ------------------- 1 file changed, 19 deletions(-) commit bffe489b1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 26 22:01:02 2017 +0000 Added booking controls web/edit_entry.php | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) commit 5fca024de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 26 21:37:53 2017 +0000 Removed repeat fieldset web/edit_entry.php | 85 ++------------------------------------------ 1 file changed, 3 insertions(+), 82 deletions(-) commit 87527201f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 26 18:58:30 2017 +0000 Got rid of old monthly repeat details web/edit_entry.php | 79 -------------------------------------------- 1 file changed, 79 deletions(-) commit 46e5ac395 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 26 18:46:11 2017 +0000 Removed old repeat end date web/edit_entry.php | 6 ------ 1 file changed, 6 deletions(-) commit 5e0a6daa2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 26 18:43:08 2017 +0000 Removed old skip past conflicts web/edit_entry.php | 10 ---------- 1 file changed, 10 deletions(-) commit 0ab7f82da Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 26 17:24:10 2017 +0000 Completed repeat fieldset web/edit_entry.php | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) commit c465fbe97 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 26 16:50:03 2017 +0000 Tweaked CSS web/css/mrbs.css.php | 8 ++++++++ 1 file changed, 8 insertions(+) commit 355859c00 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 26 16:11:40 2017 +0000 Improved layoutof repeat details web/css/mrbs.css.php | 16 ++++++++++------ web/edit_entry.php | 22 ++++++++++++++-------- web/js/general.js.php | 2 +- 3 files changed, 25 insertions(+), 15 deletions(-) commit a23887e87 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 26 14:49:58 2017 +0000 Commit before changes web/css/mrbs.css.php | 1 + web/edit_entry.php | 40 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 20 deletions(-) commit 8c8b1b0f7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 26 11:56:21 2017 +0000 Added repeat type details web/edit_entry.php | 154 ++++++++++++++++- web/lib/MRBS/Form/ElementInputRadio.php | 4 +- .../MRBS/Form/FieldInputCheckboxGroup.php | 4 +- 3 files changed, 155 insertions(+), 7 deletions(-) commit d17176870 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 24 21:55:57 2017 +0000 Added rep_day web/edit_entry.php | 52 ++++++++++++++++++++++++++++++++- web/lib/MRBS/Form/Element.php | 8 ++++- 2 files changed, 58 insertions(+), 2 deletions(-) commit 113083b3b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 24 17:32:45 2017 +0000 Added repeat type web/css/mrbs.css.php | 1 + web/edit_entry.php | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) commit 0ccf742bb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 24 17:05:32 2017 +0000 Started on repeats web/edit_entry.php | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) commit 65b2173a1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 24 16:39:19 2017 +0000 Deleted old style custom fields web/edit_entry.php | 60 +------------------------------------------- 1 file changed, 1 insertion(+), 59 deletions(-) commit 703ce3f0c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 24 16:30:29 2017 +0000 Deleted old style privacy status web/edit_entry.php | 28 ---------------------------- 1 file changed, 28 deletions(-) commit 76aac6c5e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 24 16:22:49 2017 +0000 Got rid of old style confirmation status web/css/mrbs-ie.css | 1 - web/edit_entry.php | 31 +------------------------------ 2 files changed, 1 insertion(+), 31 deletions(-) commit e9cd5d1c9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 24 15:37:30 2017 +0000 Got rid of old type field web/edit_entry.php | 39 --------------------------------------- 1 file changed, 39 deletions(-) commit 0428f6bec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 24 15:28:18 2017 +0000 Completed custom fields web/edit_entry.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) commit c1d9fa9a9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 24 14:59:11 2017 +0000 Added textarea custom fields web/edit_entry.php | 7 +++++++ 1 file changed, 7 insertions(+) commit 58b44e972 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 24 13:59:23 2017 +0000 Added boolean custom web/edit_entry.php | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) commit d1e30c886 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 24 11:53:56 2017 +0000 Added privacy status web/edit_entry.php | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) commit fd9d631a6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 24 11:37:58 2017 +0000 Added confirmation status web/edit_entry.php | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) commit 70180f6f9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 24 08:38:55 2017 +0000 Added type web/edit_entry.php | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) commit 5f291076e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 24 08:21:49 2017 +0000 Added rooms web/edit_entry.php | 266 +++++++++++++++++++++++++++++++- web/lib/MRBS/Form/Element.php | 2 +- 2 files changed, 266 insertions(+), 2 deletions(-) commit 91eb2fb9f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 23 08:22:42 2017 +0000 Added full description web/edit_entry.php | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) commit 07b983882 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 22 22:40:13 2017 +0000 Added brief description field web/edit_entry.php | 73 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 62 insertions(+), 11 deletions(-) commit 7c36a8d77 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 22 17:18:22 2017 +0000 Changed the way the $associative parameter works web/admin.php | 2 +- web/edit_area.php | 14 ++++----- web/edit_entry.php | 28 +++++++++++++++++- web/edit_room.php | 2 +- web/lib/MRBS/Form/Element.php | 26 +++++++++++++--- web/lib/MRBS/Form/ElementInputDatalist.php | 2 +- .../MRBS/Form/FieldInputCheckboxGroup.php | 2 +- web/lib/MRBS/Form/FieldInputDatalist.php | 2 +- web/lib/MRBS/Form/FieldInputRadioGroup.php | 2 +- web/lib/MRBS/Form/FieldSelect.php | 2 +- web/report.php | 2 +- 11 files changed, 64 insertions(+), 20 deletions(-) commit 579516919 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 22 11:24:54 2017 +0000 Commit before changes web/edit_entry.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) commit 9ddb6d4d0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 22 09:33:59 2017 +0000 Started on edit_entry web/css/mrbs.css.php | 5 ++++- web/edit_entry.php | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) commit 2ca8410f5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 21 23:32:27 2017 +0000 Removed redundant CSS web/css/mrbs-rtl.css.php | 2 +- web/css/mrbs.css.php | 37 +++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 19 deletions(-) commit 0f877a790 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 21 23:23:24 2017 +0000 Converted search form web/css/mrbs.css.php | 11 ++- .../MRBS/Form/ElementInputSearch.php (new) | 14 ++++ web/lib/MRBS/Form/FieldInputSearch.php (new) | 15 ++++ web/search.php | 67 +++++++++++------- 4 files changed, 81 insertions(+), 26 deletions(-) commit 346aafca0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 21 16:50:40 2017 +0000 Fixed widths of date and datepicker inputs to stop the layout moving around while the datepickers are being generated. web/css/mrbs.css.php | 29 ++++++++++++++++++----------- web/js/datepicker.js.php | 8 +++++++- 2 files changed, 25 insertions(+), 12 deletions(-) commit 474f4f63f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 21 15:51:46 2017 +0000 Made the goto datepicker submit on select. web/Themes/default/header.inc | 11 +++++++---- web/js/datepicker.js.php | 12 ++++++++++-- 2 files changed, 17 insertions(+), 6 deletions(-) commit 2066999fd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 21 11:49:06 2017 +0000 Made goto date selector send you to the correct page web/standard_vars.inc.php | 6 ++++++ 1 file changed, 6 insertions(+) commit f9dee5e0f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 20 23:12:23 2017 +0000 Fixed merge problem web/css/mrbs.css.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit cda22f2f6 Merge: c87559b1d 7ef3c4575 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 20 22:52:52 2017 +0000 Merge with default commit 7ef3c4575 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 20 22:39:12 2017 +0000 Removed "You are " text from "You are xxx" link. See SF Support Requests #1393 web/lang/lang.ca | 1 - web/lang/lang.cs | 1 - web/lang/lang.da | 1 - web/lang/lang.de | 1 - web/lang/lang.el | 1 - web/lang/lang.en | 1 - web/lang/lang.es | 1 - web/lang/lang.eu | 1 - web/lang/lang.fi | 1 - web/lang/lang.fr | 1 - web/lang/lang.he | 1 - web/lang/lang.hu | 1 - web/lang/lang.id | 1 - web/lang/lang.it | 1 - web/lang/lang.ja | 1 - web/lang/lang.ko | 1 - web/lang/lang.nb | 1 - web/lang/lang.nl | 1 - web/lang/lang.nn | 1 - web/lang/lang.no | 1 - web/lang/lang.pl | 1 - web/lang/lang.pt | 1 - web/lang/lang.pt-br | 1 - web/lang/lang.ro | 1 - web/lang/lang.ru | 1 - web/lang/lang.sk | 1 - web/lang/lang.sl | 1 - web/lang/lang.sr-rs-latin | 1 - web/lang/lang.sv | 1 - web/lang/lang.th | 1 - web/lang/lang.tr | 1 - web/lang/lang.zh-cn | 1 - web/lang/lang.zh-tw | 1 - web/session/functions_session.inc | 4 ++-- 34 files changed, 2 insertions(+), 35 deletions(-) commit 207a9b669 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 20 22:24:38 2017 +0000 Fixed bug resulting in a "session expired" message when the "You are xxx" link is clicked. See SF Support Requests #1393. web/css/mrbs.css.php | 9 +++++++++ web/session/functions_session.inc | 18 +++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) commit c87559b1d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 20 11:31:43 2017 +0000 Started converting the "Goto" date selector web/Themes/default/header.inc | 42 ++++++++++++++++++++------------- web/css/mrbs.css.php | 19 +++------------ web/functions.inc | 22 +++++++++++++++++ web/js/general.js.php | 2 -- web/report.php | 26 ++++---------------- 5 files changed, 55 insertions(+), 56 deletions(-) commit f92cecd20 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 19 22:40:21 2017 +0000 New datepickers basically working web/js/datepicker.js.php | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) commit 8b5263678 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 19 17:55:38 2017 +0000 Started on turning new date inputs into datepickers web/css/mrbs.css.php | 6 ++++++ web/js/datepicker.js.php | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+) commit 562e0d505 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 19 09:34:57 2017 +0000 Restructured defaukt datepicker settings so that the defaults are common for old and new style datepickers web/js/datepicker.js.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit deaec2afe Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 18 23:30:36 2017 +0000 Reports now working (though date inputs still need to be turned into datepickers) web/css/mrbs.css.php | 8 +++++++- web/report.php | 28 +++++++++++++++++++++------- 2 files changed, 28 insertions(+), 8 deletions(-) commit 4af0921b9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 18 20:00:38 2017 +0000 Removed redundant CSS web/css/mrbs.css.php | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) commit f1c45b8ec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 18 19:52:15 2017 +0000 Removed old form web/report.php | 380 ----------------------------------------------- 1 file changed, 380 deletions(-) commit 489dbc939 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 18 18:11:00 2017 +0000 Added submit button web/report.php | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) commit 3c851b05e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 18 17:50:54 2017 +0000 Added sumby field web/report.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) commit 972db1082 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 18 17:40:37 2017 +0000 Added sortby field web/report.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) commit e73de816c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 18 17:28:35 2017 +0000 Added output format web/report.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) commit 4ed78386a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 18 17:13:23 2017 +0000 Added output field web/report.php | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 9 deletions(-) commit 27d9c320f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 18 16:50:07 2017 +0000 Added presentation options shell web/report.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) commit 8ff035f96 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 18 15:02:03 2017 +0000 Added custom fields web/report.php | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) commit 63330f7f3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 18 12:56:05 2017 +0000 Added approval status web/report.php | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) commit f94a32585 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 18 12:44:07 2017 +0000 Added confirmation status web/report.php | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) commit d750964e8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 18 11:55:07 2017 +0000 Added privacy status web/report.php | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) commit 81e3b5c82 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 18 11:18:43 2017 +0000 Added created by web/report.php | 8 ++++++++ 1 file changed, 8 insertions(+) commit 9aab63e57 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 18 11:15:00 2017 +0000 Added full description web/report.php | 9 +++++++++ 1 file changed, 9 insertions(+) commit 35f0d1093 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 18 10:53:52 2017 +0000 Added brief description web/report.php | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) commit 58d186130 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 17 23:12:02 2017 +0000 Added type match field web/lib/MRBS/Form/Element.php | 16 +++++++++------ web/report.php | 36 +++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 6 deletions(-) commit 3e2de50de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 17 21:52:28 2017 +0000 Added Match room web/report.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) commit d2d28fd77 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 17 21:42:41 2017 +0000 Automatically associated a label with a control by using the name attibute as the id if no id is supplied web/lib/MRBS/Form/Field.php | 35 +++++++++++------- .../MRBS/Form/FieldInputCheckboxGroup.php | 1 + web/lib/MRBS/Form/FieldInputRadioGroup.php | 1 + 3 files changed, 23 insertions(+), 14 deletions(-) commit c484fc3f0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 17 17:29:47 2017 +0000 Changed behaviour so that attributes aren't output if they are null or an empty string. web/lib/MRBS/Form/Element.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 439603915 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 17 17:20:42 2017 +0000 Datalist now largely working web/lib/MRBS/Form/ElementDatalist.php | 41 +------------- .../MRBS/Form/ElementInputDatalist.php (new) | 53 ++++++++++++++++++ ...ldDatalist.php => FieldInputDatalist.php} | 4 +- web/report.php | 4 +- 4 files changed, 58 insertions(+), 44 deletions(-) commit 62ad65acb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 17 16:46:43 2017 +0000 Commit before changes web/lib/MRBS/Form/Element.php | 67 ++++++++++++++++-- web/lib/MRBS/Form/ElementDatalist.php | 39 ++++++++++ .../Form/ElementInputDatalist.php (gone) | 27 ------- web/lib/MRBS/Form/FieldDatalist.php (new) | 24 +++++++ .../MRBS/Form/FieldInputDatalist.php (gone) | 16 ----- web/report.php | 9 +-- 6 files changed, 131 insertions(+), 51 deletions(-) commit f6dfbf0d7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 17 12:00:03 2017 +0000 Commit before changes web/js/general.js.php | 8 +- web/lib/MRBS/Form/ElementDatalist.php (new) | 13 +++ .../MRBS/Form/ElementInputDatalist.php (new) | 27 ++++++ web/lib/MRBS/Form/ElementInputDate.php (new) | 14 +++ .../MRBS/Form/FieldInputDatalist.php (new) | 16 ++++ web/lib/MRBS/Form/FieldInputDate.php (new) | 15 +++ web/report.php | 90 +++++++++++++++++- 7 files changed, 180 insertions(+), 3 deletions(-) commit 45f269555 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 16 00:25:27 2017 +0000 Removed redundant file web/js/edit_area_room.js.php (gone) | 319 -------------------------- 1 file changed, 319 deletions(-) commit 9d1c3147f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 16 00:22:53 2017 +0000 Stopped end slot being calculated when no resolution is given web/js/edit_area.js.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit a0f61bb05 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 16 00:09:37 2017 +0000 Made resolution and default duration required web/edit_area.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) commit b488a4aed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 16 00:02:31 2017 +0000 Reverted previous change and made the the first and last slot times required web/edit_area.php | 14 ++++++++------ web/lib/MRBS/Form/ElementInputTime.php | 3 +-- 2 files changed, 9 insertions(+), 8 deletions(-) commit 3785611cc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 15 23:55:39 2017 +0000 Made all time inputs required web/lib/MRBS/Form/ElementInputTime.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit f5f1a2cc1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 15 23:45:39 2017 +0000 Made the regex pattern for the hh:mm format a constant web/edit_area_handler.php | 5 ++--- web/internalconfig.inc.php | 3 ++- web/js/edit_area.js.php | 2 +- web/js/general.js.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) commit 77f4c7319 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 15 23:06:04 2017 +0000 Added fallback for browsers that do not support the HTML5 time input. Also improved validation of the time input web/js/edit_area.js.php | 19 +++++++++++++++++++ web/js/general.js.php | 15 +++++++++++++++ 2 files changed, 34 insertions(+) commit a38e78c0e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 15 14:36:16 2017 +0000 Added server side checking of time formats web/edit_area_handler.php | 162 +++++++++++++++++++----------------- web/lang/lang.en | 1 + web/report.php | 20 ++++- 3 files changed, 107 insertions(+), 76 deletions(-) commit 35b681f4a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 15 10:27:12 2017 +0000 Fixed HTML5 validation error web/lib/MRBS/Form/ElementFieldset.php | 26 ++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) commit f3fcff75f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 14 20:53:46 2017 +0000 Removed redundant code web/css/mrbs-ie-rtl.css | 4 --- web/css/mrbs-rtl.css.php | 7 ++--- web/css/mrbs.css.php | 53 +++++++----------------------------- web/lang/lang.pl | 2 +- web/mrbs_auth.inc | 1 - web/systemdefaults.inc.php | 10 +++---- 6 files changed, 19 insertions(+), 58 deletions(-) commit f637c20ad Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 14 20:11:13 2017 +0000 Removed edit_area_room.php web/admin.php | 11 - web/edit_area_room.php (gone) | 1527 ------------------------------- 2 files changed, 1538 deletions(-) commit a437fe5c3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 14 20:03:45 2017 +0000 Edit room handler now working web/edit_area_handler.php | 9 --- web/edit_room_handler.php | 141 +++++++++++++++++++++++++++++++++++- web/functions.inc | 10 +++ 3 files changed, 148 insertions(+), 12 deletions(-) commit cdaa8afd2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 14 17:26:46 2017 +0000 Started the handler for edit_room.php web/edit_room_handler.php (new) | 68 +++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) commit d320dc980 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 14 17:10:22 2017 +0000 Added comment web/edit_room.php | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) commit eaced73f5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 14 17:06:39 2017 +0000 Fixed CSS for custom HTML web/css/mrbs.css.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 8872bdb51 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 14 16:36:09 2017 +0000 Removed commented out lines web/edit_room.php | 11 ----------- 1 file changed, 11 deletions(-) commit fadd472f1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 14 16:29:17 2017 +0000 Added the custom HTML display web/admin.php | 2 +- web/edit_room.php | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) commit 726c9bc41 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 14 16:17:04 2017 +0000 Added submit buttons and fixed problem with custom fields web/edit_room.php | 32 ++++++++++++++++++++++++++------ web/lib/MRBS/Form/Element.php | 7 +++++++ web/lib/MRBS/Form/Field.php | 7 +++++++ 3 files changed, 40 insertions(+), 6 deletions(-) commit 2d44bd727 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 14 15:49:47 2017 +0000 Added custom fields web/edit_room.php | 58 ++++++++++++++++++++++++++++++++- web/lib/MRBS/Form/Element.php | 10 ++++++ 2 files changed, 67 insertions(+), 1 deletion(-) commit 874d08a4f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 14 12:24:40 2017 +0000 Added the Custom HTML field web/edit_area.php | 22 ++++++++++++---------- web/edit_area_handler.php | 12 ++++++++++-- web/edit_room.php | 16 ++++++++++++++-- 3 files changed, 36 insertions(+), 14 deletions(-) commit b1a6ae320 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 14 11:38:49 2017 +0000 Changed forms on admin page to be standard class web/admin.php | 4 ++-- web/css/mrbs.css.php | 25 +++++++------------------ 2 files changed, 9 insertions(+), 20 deletions(-) commit f68f7d457 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 14 10:31:42 2017 +0000 Made the room and area names required fields web/admin.php | 2 ++ web/edit_area.php | 7 ++++--- web/edit_room.php | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) commit 62e88eeaa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 14 10:23:25 2017 +0000 Completed standard fields web/admin.php | 14 +++--- web/edit_area.php | 3 +- web/edit_room.php | 46 ++++++++++++++++++-- web/lang/lang.en | 2 +- web/lib/MRBS/Form/Element.php | 7 +-- web/lib/MRBS/Form/FieldInputRadioGroup.php | 4 +- web/session/functions_session.inc | 4 +- 7 files changed, 62 insertions(+), 18 deletions(-) commit 0d8cfe111 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 13 21:28:34 2017 +0000 Added more fields web/edit_room.php (new) | 135 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) commit fdc3244fb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 13 19:00:38 2017 +0000 Fixed problem with updating users table. See SF Support Requests #1390. convert_db_to_utf8.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7bc9f4454 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 13 18:57:11 2017 +0000 Fixed problem with converting users table. See SF Support requests #1390. convert_db_to_utf8.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cb02e7de1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 13 17:40:08 2017 +0000 Started on edit_room form web/css/mrbs.css.php | 6 +++--- web/edit_area.php | 2 +- web/lang/lang.ca | 4 +--- web/lang/lang.cs | 4 +--- web/lang/lang.da | 4 +--- web/lang/lang.de | 4 +--- web/lang/lang.el | 4 +--- web/lang/lang.en | 5 ++--- web/lang/lang.es | 4 +--- web/lang/lang.eu | 4 +--- web/lang/lang.fi | 4 +--- web/lang/lang.fr | 4 +--- web/lang/lang.he | 4 +--- web/lang/lang.hu | 4 +--- web/lang/lang.id | 4 +--- web/lang/lang.it | 4 +--- web/lang/lang.ja | 4 +--- web/lang/lang.ko | 4 +--- web/lang/lang.nb | 4 +--- web/lang/lang.nl | 4 +--- web/lang/lang.nn | 4 +--- web/lang/lang.no | 4 +--- web/lang/lang.pl | 2 -- web/lang/lang.pt | 4 +--- web/lang/lang.pt-br | 4 +--- web/lang/lang.ro | 4 +--- web/lang/lang.ru | 4 +--- web/lang/lang.sk | 4 +--- web/lang/lang.sl | 4 +--- web/lang/lang.sr-rs-latin | 4 +--- web/lang/lang.sv | 4 +--- web/lang/lang.th | 4 +--- web/lang/lang.tr | 4 +--- web/lang/lang.zh-cn | 4 +--- web/lang/lang.zh-tw | 4 +--- web/mrbs_auth.inc | 2 ++ 36 files changed, 39 insertions(+), 102 deletions(-) commit f9592028e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 13 11:40:21 2017 +0000 Added a new link to edit_room.php web/admin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 7a101d7ad Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 13 10:45:38 2017 +0000 Simplified code web/js/edit_area.js.php | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) commit eca0a0ae7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 13 10:14:31 2017 +0000 Removed redundant code web/js/edit_area.js.php | 14 -------------- 1 file changed, 14 deletions(-) commit ae95792d4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 13 08:56:31 2017 +0000 Fixed bug resulting in a function not found error. See SF Support Requests #1390. convert_db_to_utf8.php | 1 + 1 file changed, 1 insertion(+) commit 2794b5d24 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 12 21:31:11 2017 +0000 Added JavaScript for edit_area.php web/js/edit_area.js.php (new) | 283 ++++++++++++++++++++++++++++++++ 1 file changed, 283 insertions(+) commit 186f395f9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 12 01:06:28 2017 +0000 Fixed left hand column on resizing web/js/general.js.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit bfc5f066d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 12 00:10:16 2017 +0000 Tidied up code web/js/general.js.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit 1f87182f9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 12 00:04:03 2017 +0000 Made the left column in the standard form a constant width. web/js/general.js.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) commit 84d07d3b7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 11 20:56:48 2017 +0000 Added the handler for the edit_area form web/edit_area.php | 15 +- web/edit_area_handler.php (new) | 318 ++++++++++++++++++++++++++++++ web/mrbs_auth.inc | 1 + 3 files changed, 325 insertions(+), 9 deletions(-) commit 2d8cb5330 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 10 20:44:36 2017 +0000 Removed unnecessary function parameters web/edit_area.php | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) commit 448e0deeb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 10 20:35:06 2017 +0000 Added submit buttons web/edit_area.php | 24 +++++++++++++++++++++++- web/lib/MRBS/Form/Field.php | 9 +++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) commit e53aabec3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 10 18:07:48 2017 +0000 Changed default method parameters in line with recent change for boolean attributes web/lib/MRBS/Form/Field.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 0f2f47e99 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 10 18:02:23 2017 +0000 Added note as title web/edit_area.php | 1 + web/lib/MRBS/Form/Field.php | 9 +++++++++ 2 files changed, 10 insertions(+) commit b212d495f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 10 17:47:24 2017 +0000 Got rid of colon in label web/edit_area.php | 1 + web/lib/MRBS/Form/Field.php | 9 +++++++++ 2 files changed, 10 insertions(+) commit e837f78e8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 10 16:48:36 2017 +0000 Fixed CSS for multiline groups web/css/mrbs.css.php | 10 ++++++++++ web/edit_area.php | 1 + 2 files changed, 11 insertions(+) commit db7243339 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 10 12:26:47 2017 +0000 Changed use of setAttribute method for boolean attributes web/dbsys.inc | 2 +- web/edit_area.php | 6 +++--- web/lib/MRBS/Form/Element.php | 13 ++++++++++--- 3 files changed, 14 insertions(+), 7 deletions(-) commit eaaee9de1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 10 11:55:20 2017 +0000 Added an addClass() method web/edit_area.php | 1 + web/lib/MRBS/Form/Element.php | 18 ++++++++++++++++++ web/lib/MRBS/Form/Field.php | 9 +++++++++ 3 files changed, 28 insertions(+) commit e6ac05b29 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 10 11:02:36 2017 +0000 Added privacy display settings web/edit_area.php | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) commit 2a0aa660d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 10 10:27:52 2017 +0000 Added privacy settings web/edit_area.php | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) commit 6f57faa53 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 10 10:08:34 2017 +0000 Added approval settings web/edit_area.php | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) commit 8cde7953d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 9 22:03:20 2017 +0000 Made use of setChecked() method web/edit_area.php | 28 ++++++++++++++-------------- web/lib/MRBS/Form/Element.php | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) commit c7dad3629 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 9 21:46:15 2017 +0000 Added setChecked() method web/edit_area.php | 5 ++--- web/internalconfig.inc.php | 7 +++++-- web/lib/MRBS/Form/Element.php | 7 +++++++ web/lib/MRBS/Form/ElementInputCheckbox.php | 15 +++++++++++++++ web/lib/MRBS/Form/FieldInputCheckbox.php | 6 ++++++ 5 files changed, 35 insertions(+), 5 deletions(-) commit 234ed2b7a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 9 20:18:28 2017 +0000 Added confirmation settings fieldset web/edit_area.php | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) commit 3e47f59f7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 7 16:15:23 2017 +0000 Improved fix for SF Patches #62 web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 295168247 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 7 16:09:33 2017 +0000 Improved fix for SF Patches #62 web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f79ded80c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 27 10:22:50 2017 +0000 Simplified code web/edit_area.php | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) commit 86c76172e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 27 10:16:19 2017 +0000 Added max durations fieldset web/edit_area.php | 54 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) commit 715319032 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 27 09:54:54 2017 +0000 Simplified CSS web/css/mrbs.css.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 5cb132cc0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 27 09:45:44 2017 +0000 Tweaked CSS web/css/mrbs.css.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) commit 3f2ad46d5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 27 09:42:44 2017 +0000 Tweaked CSS web/css/mrbs.css.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 82722c776 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 26 21:11:45 2017 +0000 Tweaked CSS web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 025675cc6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 26 21:06:10 2017 +0000 Tweaked CSS web/css/mrbs.css.php | 10 +++++----- web/edit_area.php | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) commit 0882f306d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 26 18:34:17 2017 +0000 Fixed CSS web/css/mrbs.css.php | 22 +++++++++++++++++++--- web/edit_area.php | 15 +++++++++++---- 2 files changed, 30 insertions(+), 7 deletions(-) commit 059ea2c60 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 26 17:31:08 2017 +0000 Added maximum number fieldset web/css/mrbs.css.php | 7 +++++ web/edit_area.php | 67 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 1 deletion(-) commit 428cd65d1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 24 18:12:08 2017 +0000 Added booking creation and deletion fieldsets web/css/mrbs.css.php | 8 + web/edit_area.php | 153 ++++++++++++++++- web/lib/MRBS/Form/ElementInputNumber.php | 3 +- web/lib/MRBS/Form/Field.php | 9 + web/lib/MRBS/Form/FieldDiv.php (new) | 15 ++ .../MRBS/Form/FieldInputCheckbox.php (new) | 15 ++ web/lib/MRBS/Form/FieldInputNumber.php | 2 +- 7 files changed, 200 insertions(+), 5 deletions(-) commit 63300801f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 24 14:44:33 2017 +0000 Added booking policies note web/edit_area.php | 14 ++++++++++++++ web/lib/MRBS/Form/FieldSpan.php (new) | 15 +++++++++++++++ 2 files changed, 29 insertions(+) commit 43c889b71 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 24 14:30:26 2017 +0000 Added booking policies fieldset shell web/edit_area.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) commit ad09c9094 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 24 14:22:44 2017 +0000 Added periods fieldset to edit_area form web/admin.php | 10 +++++ web/edit_area.php | 52 ++++++++++++++++++++++- web/lib/MRBS/Form/FieldButton.php (new) | 15 +++++++ 3 files changed, 75 insertions(+), 2 deletions(-) commit 1a64fc83b Merge: f76e68b48 0e297e02d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 24 13:27:55 2017 +0000 Merge with default commit 0e297e02d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 23 09:19:58 2017 +0000 Improved error reporting when PHP sessions aren't working. See SF Support Requests #1364. web/init.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit 8b2452e85 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 21 17:59:37 2017 +0000 Updated PHPMailer to use latest code (5.2.5+) from the 5.2-stable branch. Note that MRBS cannot yet use PHPMailer Version 6.0+ because that requires PHP 5.5 or later. web/lib/PHPMailer/LICENSE | 42 +++-- web/lib/PHPMailer/VERSION | 2 +- web/lib/PHPMailer/class.phpmailer.php | 55 ++++--- web/lib/PHPMailer/class.pop3.php | 2 +- web/lib/PHPMailer/class.smtp.php | 139 ++++++++++------- .../language/phpmailer.lang-ba.php (new) | 26 +++ .../PHPMailer/language/phpmailer.lang-cs.php | 2 +- .../PHPMailer/language/phpmailer.lang-nb.php | 32 ++-- .../language/phpmailer.lang-pt_br.php | 3 +- .../language/phpmailer.lang-rs.php (new) | 26 +++ .../PHPMailer/language/phpmailer.lang-tr.php | 3 +- .../language/phpmailer.lang-zh_cn.php | 7 +- 12 files changed, 219 insertions(+), 120 deletions(-) commit 87efc7b63 Merge: 8637bd8ad 47aecdf72 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Nov 16 21:11:52 2017 +0000 Merge commit 8637bd8ad Merge: a03f4cf26 2dec8b346 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Nov 16 21:11:17 2017 +0000 Merge commit a03f4cf26 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Nov 16 20:59:44 2017 +0000 Added tag mrbs-1_7_0 for changeset 7e3d9a105985 commit c3b7c8a1f (tag: mrbs-1_7_0) Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Nov 16 20:59:32 2017 +0000 Fixed release date in NEWS NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 16214beea Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Nov 16 20:58:46 2017 +0000 Updated NEWS and VersionNum for release ChangeLog | 1651 ++++++++++++++++++++++++++++++++++++++++++++++++++- NEWS | 109 ++++ 2 files changed, 1738 insertions(+), 22 deletions(-) commit 329ee4573 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Nov 16 20:57:55 2017 +0000 Updated version number for release web/version_num.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f76e68b48 Merge: 7615084ab dcd2d77f2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 16 12:21:20 2017 +0000 Merge with default commit dcd2d77f2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 16 12:20:42 2017 +0000 Corrected the order of parameters supplied to hash_equals(). web/lib/MRBS/Form/Form.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) commit 7615084ab Merge: 186a65956 0116d57ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 16 11:41:00 2017 +0000 Merge with default commit 0116d57ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 16 11:39:09 2017 +0000 Fixed a problem with a CSRF attack warning being incorrectly generated if a user session has expired. Bug could be reproduced if usingh Joomla and the Joomla user session expires between the form being displayed and submitted. web/lib/MRBS/Form/Form.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) commit 6e2210d3e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 16 10:11:27 2017 +0000 Fixed problem with white screen being shown in the event of CSRF cookie tampering. (The white screen was caused by an infinite loop trying to generate the header). web/Themes/default/header.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit 186a65956 Merge: 795d13308 34de68393 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 15 15:52:04 2017 +0000 Merge with default commit 34de68393 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 15 15:51:24 2017 +0000 Tweaked CSS web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ee62866cb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 15 14:11:41 2017 +0000 Fixed bug when upgrading a database using Joomla authentication (headers already sent) web/dbsys.inc | 6 ++++++ 1 file changed, 6 insertions(+) commit ca9aa5391 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 15 14:02:35 2017 +0000 Fixed problem that meant that sessions were only being used when $auth['session'] was set to 'php'. web/init.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit af21fb661 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 15 11:21:48 2017 +0000 Added an upgrade step to warn site administrators that custom HTML is now disabled by default. tables.my.sql | 2 +- tables.pg.sql | 2 +- web/dbsys.inc | 4 ++-- web/upgrade/53/mysql.sql (new) | 1 + web/upgrade/53/pgsql.sql (new) | 0 web/upgrade/53/post.inc (new) | 36 ++++++++++++++++++++++++++++++++ 6 files changed, 41 insertions(+), 4 deletions(-) commit 795d13308 Merge: c10cc76cc 2b228dd7c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 14 18:21:45 2017 +0000 Merge with default commit 2b228dd7c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 14 18:15:43 2017 +0000 Added comment web/lib/MRBS/Form/Form.php | 5 +++++ 1 file changed, 5 insertions(+) commit f23fccb92 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 14 17:49:18 2017 +0000 Made tokens work with Joomla authentication web/lib/MRBS/Form/Form.php | 24 ++++++++++++++++++++++++ web/session/session_joomla.inc | 2 ++ 2 files changed, 26 insertions(+) commit 6699e49af Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 14 16:48:06 2017 +0000 Tweaked CSS some more web/css/mrbs.css.php | 7 ++++--- web/functions.inc | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) commit 9182058e1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 14 16:20:36 2017 +0000 Tweaked CSS web/css/mrbs.css.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit 0e735e9d0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 14 15:51:34 2017 +0000 Added meta tag to stop IE10 using compatibility mode. web/Themes/default/header.inc | 10 ++++++++++ 1 file changed, 10 insertions(+) commit 75412352d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 14 15:33:17 2017 +0000 Moved the title attribute to the button element so that it shows up in Firefox. web/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit fb8138f32 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 14 13:39:21 2017 +0000 Added files that should have been part of the last commit web/lib/MRBS/Form/ElementButton.php (new) | 13 +++++++++++++ web/lib/MRBS/Form/ElementImg.php (new) | 13 +++++++++++++ 2 files changed, 26 insertions(+) commit a02cb99b5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 14 11:44:42 2017 +0000 Replaced inputs with buttons as the formaction attribute does not seem to work in IE11 and below when the input is of type image. It only works with type submit. web/admin.php | 36 ++++++++++++++++++++---------------- web/css/mrbs.css.php | 13 ++++++++++++- 2 files changed, 32 insertions(+), 17 deletions(-) commit 41aabaa3b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 14 11:42:46 2017 +0000 Fixed bug leading to a blank screen when deleting an area. web/del.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit c10cc76cc Merge: 10642b548 0120e3155 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 11 09:56:50 2017 +0000 Merge with default commit 0120e3155 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 11 09:54:52 2017 +0000 Removed unwanted semicolon from query string web/day.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 47aecdf72 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 11 09:50:53 2017 +0000 Removed unwanted semicolon from query string web/day.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 119812297 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 11 08:17:11 2017 +0000 Changed release number UPGRADE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 76ee7e59b Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Nov 9 16:53:35 2017 +0000 Added extra error checking into CSRF cookie code path. web/lib/MRBS/Form/Form.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) commit 90a748ee5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 9 16:17:22 2017 +0000 Ported fix from main default branch. See SF Patches #62. web/edit_entry_handler.php | 4 ++++ 1 file changed, 4 insertions(+) commit e7f09365e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 9 16:04:14 2017 +0000 Fixed bug when using all day checkbox and the day stretches past midnight. See SF Patches #62. web/edit_entry_handler.php | 4 ++++ 1 file changed, 4 insertions(+) commit 10642b548 Merge: 9d19859d6 aa8a423de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 9 10:08:50 2017 +0000 Merge with default commit aa8a423de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 9 10:05:56 2017 +0000 Fixed a problem with token mismatches when opening another tab (and also when refreshing a page, eg the Report page when it has results). web/lib/MRBS/Form/Form.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) commit 33f0c9fc9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 8 15:58:36 2017 +0000 Added a note about custom HTML. UPGRADE | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit a3e7986f2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 8 15:53:13 2017 +0000 Removed comment about IE6 web/css/mrbs.css.php | 3 --- 1 file changed, 3 deletions(-) commit 44a157b9d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 8 15:36:27 2017 +0000 Removed CSS support for IE7 and IE8 web/css/mrbs-ie8.css (gone) | 23 --------- web/css/mrbs-ielte7.css.php (gone) | 76 ---------------------------- web/css/mrbs-ielte8.css (gone) | 64 ----------------------- web/style.inc | 12 +---- 4 files changed, 1 insertion(+), 174 deletions(-) commit af985e455 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 8 15:31:43 2017 +0000 Removed CSS support for IE6 and below web/css/mrbs-ielte6.css (gone) | 35 -------------------------------- web/style.inc | 3 --- 2 files changed, 38 deletions(-) commit 96ea4fda7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 8 15:28:19 2017 +0000 Added comment explaining why the HTML5 Shiv is still necessary web/js.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit a98a85980 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 8 15:21:32 2017 +0000 Removed JavaScript support for IE8 web/js.inc | 15 - web/js/admin.js.php | 8 +- web/js/resizable.js.php | 1329 ++++++++++++++++++------------------- 3 files changed, 660 insertions(+), 692 deletions(-) commit 1ac039ac1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 8 15:14:35 2017 +0000 Removed JavaScript support for IE7 web/js.inc | 14 --- web/js/pending.js.php | 196 +++++++++++++++++++--------------------- 2 files changed, 93 insertions(+), 117 deletions(-) commit b96c18def Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 8 15:11:12 2017 +0000 Removed JavaScript support for IE6 and below web/js.inc | 14 --- web/js/datatables.js.php | 237 ++++++++++++++++++------------------- web/js/general.js.php | 42 +++---- web/js/report.js.php | 21 ++-- web/js/search.js.php | 19 ++- 5 files changed, 150 insertions(+), 183 deletions(-) commit 596a28070 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 8 14:57:07 2017 +0000 Removed cell_click.js.php now that we are not supporting IE6 and below. web/js.inc | 8 +----- web/js/cell_click.js.php (gone) | 47 ------------------------------- 2 files changed, 1 insertion(+), 54 deletions(-) commit a2df56df1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 8 14:50:03 2017 +0000 Removed loading of old jQuery file now that support of IE8 has been removed. web/jquery/jquery-1.11.0.min.js (gone) | 4 ---- web/js.inc | 10 ---------- 2 files changed, 14 deletions(-) commit 636b72235 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 8 14:45:42 2017 +0000 Tweaked CSS web/css/mrbs.css.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit a064861b4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 8 14:42:59 2017 +0000 Added styling and internationalisation to the unsupported browser message. web/Themes/default/header.inc | 28 +++++++++++++++++++++------- web/css/mrbs.css.php | 6 +++--- web/lang/lang.en | 3 +++ 3 files changed, 27 insertions(+), 10 deletions(-) commit 508e0b7dd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 8 13:38:21 2017 +0000 Basic message in place for browsers that we don't support (IE9 and less) web/Themes/default/header.inc | 18 +++++++++++++----- web/css/mrbs.css.php | 12 ++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) commit a9b4456fc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 7 14:59:54 2017 +0000 Added a new config setting, $auth['allow_custom_html'], to determine whether or not custom HTML can be used for areas and rooms. By default it is set to false as it presents a potential security risk if admins are not trusted. web/admin.php | 12 ++++++++---- web/edit_area_room.php | 34 ++++++++++++++++++++-------------- web/systemdefaults.inc.php | 14 ++++++++++++++ 3 files changed, 42 insertions(+), 18 deletions(-) commit 009214c06 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 7 14:25:29 2017 +0000 Added CSRF token and checking and created the JavaScript function getCSRFToken() web/js/edit_entry.js.php | 2 +- web/js/functions.js.php | 6 ++++++ web/js/report.js.php | 2 +- web/js/resizable.js.php | 3 ++- web/js/search.js.php | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) commit 7e2ffe02e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 7 14:12:37 2017 +0000 Added CSRF token and checking web/del_entry_ajax.php | 6 ++++++ web/js/report.js.php | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) commit 6cc46f360 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 7 14:03:43 2017 +0000 Added CSRF token and checking web/check_slot_ajax.php | 6 ++++++ web/js/edit_entry.js.php | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) commit 6a690d035 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 7 11:46:38 2017 +0000 Completed addition of CSRF tokens to view_entry.php web/lib/MRBS/Form/Field.php | 17 +++++++++++++ web/view_entry.php | 47 +++++++++++++++++++++++++++-------- 2 files changed, 53 insertions(+), 11 deletions(-) commit 6bcfe824c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 7 11:03:03 2017 +0000 Added CSRF tokens and checking to view_entry.php (not yet complete - more to come). web/del_entry.php | 6 ++++++ web/edit_entry.php | 5 +++++ web/view_entry.php | 35 +++++++++++++++++------------------ 3 files changed, 28 insertions(+), 18 deletions(-) commit 40aad2265 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 7 09:46:25 2017 +0000 Used HTML5 autofocus attribute where possible instead of .focus() in the JavaScript. web/js/general.js.php | 11 +---------- web/js/search.js.php | 6 +----- web/search.php | 2 +- web/session/functions_session.inc | 4 +++- 4 files changed, 6 insertions(+), 17 deletions(-) commit ebb68874b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 7 09:25:05 2017 +0000 Simplified code, removing the need for a knowledge of the names of the data- attributes. web/js/search.js.php | 45 +++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 20 deletions(-) commit 673b62c89 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 3 20:03:37 2017 +0000 Added CSRF token and checking to search.php web/Themes/default/header.inc | 6 +++++- web/js/search.js.php | 24 ++++++++++++++---------- web/lib/MRBS/Form/Form.php | 2 +- web/search.php | 21 +++++++++++++++++++-- 4 files changed, 39 insertions(+), 14 deletions(-) commit b793223de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 3 07:40:42 2017 +0000 Added a comment explaining earlier fix. web/init.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit df39782c6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 3 06:28:11 2017 +0000 Fixed problem with fatal_error() being called too early if sessions don't work. web/defaultincludes.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 500a3e22f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 2 11:01:21 2017 +0000 Fixed bug when using sessions web/init.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) commit f40691311 Merge: bf06a2a83 adfb9d070 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Nov 1 21:09:09 2017 +0000 Merge commit bf06a2a83 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Nov 1 21:07:36 2017 +0000 Proof-of-concept for cookie fallback for CSRF prevention web/init.inc | 5 ++- web/lib/MRBS/Form/Form.php | 71 ++++++++++++++++++++++++++++++++++-- web/systemdefaults.inc.php | 3 ++ 3 files changed, 74 insertions(+), 5 deletions(-) commit adfb9d070 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 1 20:53:30 2017 +0000 Tweaked (updated to use the newer 'method' instead of the older 'type' setting in jQuery.ajax() web/js/report.js.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 2591f5da3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 1 20:33:22 2017 +0000 Added CRSF token and checking to report.php web/js/report.js.php | 19 +++++++++++-------- web/report.php | 11 ++++++++++- 2 files changed, 21 insertions(+), 9 deletions(-) commit 8722cb2a8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 31 15:40:41 2017 +0000 Added CSRF token and checking for pending.php web/approve_entry_handler.php | 4 ++ web/pending.php | 103 ++++++++++++++++++++++---------- web/view_entry.php | 8 +++ 3 files changed, 83 insertions(+), 32 deletions(-) commit f92d39962 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 31 14:53:45 2017 +0000 Added CSRF token and checking to import.php web/import.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) commit b653d1c40 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 31 14:45:58 2017 +0000 Added CSRF tokens to the area and room change selects. (No need really as they don't change any data, but it's good practice). web/functions.inc | 5 +++++ 1 file changed, 5 insertions(+) commit c715a6fb5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 31 14:38:49 2017 +0000 Added CSRF token and checking to edit_users web/edit_users.php | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) commit 669ebdba8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 31 14:07:04 2017 +0000 Added CSRF token and checking to edit_entry page and handler. web/edit_entry.php | 11 ++++++----- web/edit_entry_handler.php | 8 ++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) commit 988ceaf6a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 31 11:34:52 2017 +0000 Changed the db schema version back to normal (it had only been incremented for testing). web/dbsys.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 07ba1fc4c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 31 11:32:40 2017 +0000 Made the database username a required field web/dbsys.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 1ecac245d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 31 11:30:12 2017 +0000 Added token checking web/dbsys.inc | 3 +++ 1 file changed, 3 insertions(+) commit dc9bf0bcf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 31 11:19:57 2017 +0000 Added a token to the database upgrade form (token checking yet to come). Added an init.inc file to make sure that sessions are running before we reach the form. web/dbsys.inc | 59 +++++++++++++++++++---------- web/defaultincludes.inc | 3 +- web/functions.inc | 19 ++++++++++ web/init.inc (new) | 36 ++++++++++++++++++ web/lib/MRBS/Form/Form.php | 4 +- web/session/functions_session.inc | 19 ---------- web/session/session_php.inc | 31 --------------- 7 files changed, 99 insertions(+), 72 deletions(-) commit 128ee9e76 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 31 10:14:20 2017 +0000 Added CSRF tokens and checking to edit_area_room.php web/edit_area_room.php | 10 +++++++++- web/lib/MRBS/Form/Form.php | 10 ++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) commit 9d19859d6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 31 09:47:17 2017 +0000 Restored new edit_area.php file in forms_rewrite branch following the merge with default web/admin.php | 8 ++ web/edit_area.php (new) | 273 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 281 insertions(+) commit ef627d02a Merge: 04b339305 118e1aa78 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 31 09:44:38 2017 +0000 Merge with default commit 118e1aa78 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 31 09:43:42 2017 +0000 Removed new edit_area page web/admin.php | 8 -- web/edit_area.php (gone) | 273 ------------------------------------- 2 files changed, 281 deletions(-) commit 04b339305 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 31 09:38:22 2017 +0000 Reverted previous change web/edit_area.php (new) | 273 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 273 insertions(+) commit 8a160a5d0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 31 09:36:57 2017 +0000 Removed new file web/edit_area.php (gone) | 273 ------------------------------------- 1 file changed, 273 deletions(-) commit 75b240772 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 31 09:18:07 2017 +0000 Opened a new named branch for rewriting the MRBS forms code using the Form classes. commit f5e93cd71 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 30 18:41:02 2017 +0000 Tweaked layout web/css/mrbs.css.php | 4 ++++ web/lib/MRBS/Form/FieldTextarea.php | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) commit 4ecfa4790 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 30 18:28:38 2017 +0000 Tweaked CSS web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 893c17531 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 30 18:22:45 2017 +0000 Completed Times fieldset web/css/mrbs.css.php | 10 ++++-- web/edit_area.php | 17 +++++++++- web/lib/MRBS/Form/Element.php | 32 ++++++++++++++++++ .../MRBS/Form/ElementInputCheckbox.php (new) | 14 ++++++++ .../Form/FieldInputCheckboxGroup.php (new) | 25 ++++++++++++++ 5 files changed, 95 insertions(+), 3 deletions(-) commit a2e70c06c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 30 16:46:45 2017 +0000 Added fields in times fieldset web/css/mrbs.css.php | 8 +++- web/edit_area.php | 38 ++++++++++++++++++ .../MRBS/Form/ElementInputNumber.php (new) | 14 +++++++ web/lib/MRBS/Form/ElementInputTime.php (new) | 14 +++++++ web/lib/MRBS/Form/FieldInputNumber.php (new) | 15 +++++++ web/lib/MRBS/Form/FieldInputTime.php (new) | 15 +++++++ 6 files changed, 102 insertions(+), 2 deletions(-) commit 7d95e24b7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 30 12:34:46 2017 +0000 Started on Times fieldset web/edit_area.php | 40 ++++++++++++++++++++--- web/lib/MRBS/Form/Element.php | 34 ++++++++++++++++--- web/lib/MRBS/Form/ElementFieldset.php | 19 ++++++++--- web/lib/MRBS/Form/ElementSpan.php (new) | 13 ++++++++ 4 files changed, 93 insertions(+), 13 deletions(-) commit 575b1d339 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 29 06:33:19 2017 +0000 Tweaked CSS web/css/mrbs.css.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 2726dd922 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 28 18:32:16 2017 +0100 Completed general settings fieldset web/css/mrbs.css.php | 13 ++- web/edit_area.php | 82 +++++++++++++++++++ web/lib/MRBS/Form/ElementTextarea.php (new) | 13 +++ web/lib/MRBS/Form/Field.php | 9 ++ web/lib/MRBS/Form/FieldTextarea.php (new) | 15 ++++ 5 files changed, 131 insertions(+), 1 deletion(-) commit 659c0fe9e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 28 17:21:01 2017 +0100 Added a RadioGroup class. Added a bit more of the new edit_area form. Introduced the new 'standard' class for the form which will simplify the form CSS. web/admin.php | 2 +- web/css/mrbs.css.php | 53 +++++++++++- web/edit_area.php | 22 +++-- web/lib/MRBS/Form/Element.php | 81 ++++++++++++++---- web/lib/MRBS/Form/ElementDiv.php (new) | 13 +++ .../MRBS/Form/ElementInputRadio.php (new) | 14 +++ web/lib/MRBS/Form/Field.php | 4 +- .../MRBS/Form/FieldInputRadioGroup.php (new) | 25 ++++++ web/lib/MRBS/Form/FieldSelect.php | 4 +- 9 files changed, 185 insertions(+), 33 deletions(-) commit 5b647d61a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 27 17:00:49 2017 +0100 Decided to split edit_area_room.php into four different files: edit_area.php, edit_room.php and handlers for both. Started on edit_area.php and put a temporary second Edit button in admin.php for testing the new file. web/admin.php | 8 ++ web/edit_area.php (new) | 100 +++++++++++++++++++++++++ web/edit_area_room.php | 2 +- web/lang/lang.ca | 1 - web/lang/lang.cs | 1 - web/lang/lang.da | 1 - web/lang/lang.de | 1 - web/lang/lang.el | 1 - web/lang/lang.en | 1 - web/lang/lang.es | 1 - web/lang/lang.eu | 1 - web/lang/lang.fi | 1 - web/lang/lang.fr | 1 - web/lang/lang.he | 1 - web/lang/lang.hu | 1 - web/lang/lang.id | 1 - web/lang/lang.it | 1 - web/lang/lang.ja | 1 - web/lang/lang.ko | 1 - web/lang/lang.nb | 1 - web/lang/lang.nl | 1 - web/lang/lang.nn | 1 - web/lang/lang.no | 1 - web/lang/lang.pl | 1 - web/lang/lang.pt | 1 - web/lang/lang.pt-br | 1 - web/lang/lang.ro | 1 - web/lang/lang.ru | 1 - web/lang/lang.sk | 1 - web/lang/lang.sl | 1 - web/lang/lang.sr-rs-latin | 1 - web/lang/lang.sv | 1 - web/lang/lang.th | 1 - web/lang/lang.tr | 1 - web/lang/lang.zh-cn | 1 - web/lang/lang.zh-tw | 1 - web/lib/MRBS/Form/ElementP.php (new) | 13 ++++ web/mrbs_auth.inc | 1 + 38 files changed, 123 insertions(+), 34 deletions(-) commit 185002337 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 27 14:31:33 2017 +0100 Removed the token checking from the QueryName action (which just prints a login form). Otherwise you end up with false CSRF attack alerts if you just refresh the browser on the login page. web/session/session_cookie.inc | 7 +++---- web/session/session_joomla.inc | 7 +++---- web/session/session_php.inc | 7 +++---- web/session/session_wordpress.inc | 7 +++---- 4 files changed, 12 insertions(+), 16 deletions(-) commit f83c6cb13 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 27 14:24:53 2017 +0100 Made the order of the QueryName and SetName actions consistent web/session/session_cookie.inc | 22 +++++++++++----------- web/session/session_joomla.inc | 21 +++++++++++---------- web/session/session_php.inc | 21 +++++++++++---------- web/session/session_wordpress.inc | 4 ++-- 4 files changed, 35 insertions(+), 33 deletions(-) commit fba3e6cb3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 27 14:19:07 2017 +0100 Moved functions to the top for consistency with the rest of MRBS web/session/session_cookie.inc | 264 ++++++++++++++-------------- web/session/session_wordpress.inc | 147 ++++++++-------- 2 files changed, 207 insertions(+), 204 deletions(-) commit 791f7216a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 27 14:13:13 2017 +0100 Added token checking web/session/session_cookie.inc | 170 ++++++++++++++-------------- web/session/session_joomla.inc | 106 +++++++++-------- web/session/session_wordpress.inc | 108 +++++++++--------- 3 files changed, 201 insertions(+), 183 deletions(-) commit fa89dd88a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 27 14:00:31 2017 +0100 Moved functions to top for consistency with the rest of MRBS web/session/session_joomla.inc | 129 ++++++++++++++++--------------- 1 file changed, 65 insertions(+), 64 deletions(-) commit 64be968a3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 27 13:57:04 2017 +0100 Moved session initialisation code into a function. web/session/session_php.inc | 53 ++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 22 deletions(-) commit a199a4f19 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 27 13:52:49 2017 +0100 Added CSRF token checking web/session/session_php.inc | 255 +++++++++++++++++----------------- 1 file changed, 130 insertions(+), 125 deletions(-) commit b45e25642 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 27 12:59:18 2017 +0100 Converted the login button to use the Form classes web/session/functions_session.inc | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) commit 953abd483 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 27 12:45:24 2017 +0100 Simplified code by introducing the addHiddenInput() and addHiddenInputs() methods. web/admin.php | 68 ++++++++++------------------- web/del.php | 45 +++++-------------- web/lib/MRBS/Form/Form.php | 30 ++++++++++--- web/session/functions_session.inc | 34 +++------------ 4 files changed, 64 insertions(+), 113 deletions(-) commit d759bc04d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 27 10:17:49 2017 +0100 Converted logoff_button to use Form classes web/admin.php | 4 ++-- web/session/functions_session.inc | 36 +++++++++++++++++++---------- 2 files changed, 26 insertions(+), 14 deletions(-) commit 74e66a373 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 26 17:27:54 2017 +0100 Further simplified the CSS web/css/mrbs.css.php | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) commit 0e511df74 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 26 16:59:15 2017 +0100 Fixed a CSS problem introduced during the last change and further simplified the CSS. web/css/mrbs.css.php | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) commit 278ee4c6d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 26 16:23:09 2017 +0100 Simplified the markup and CSS a little web/css/mrbs-rtl.css.php | 2 +- web/css/mrbs.css.php | 25 +++++++++++++++++-------- web/session/functions_session.inc | 4 +--- 3 files changed, 19 insertions(+), 12 deletions(-) commit 174f79f95 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 26 15:32:47 2017 +0100 Converted the login form to use the Form classes web/lib/MRBS/Form/Element.php | 4 + .../MRBS/Form/ElementInputPassword.php (new) | 14 +++ web/lib/MRBS/Form/Field.php | 17 ++++ .../MRBS/Form/FieldInputPassword.php (new) | 15 +++ web/session/functions_session.inc | 94 ++++++++++++------ 5 files changed, 113 insertions(+), 31 deletions(-) commit 6ab6d8b60 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 25 18:49:35 2017 +0100 Corrected typo in comment. web/del.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 27588280d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 25 18:47:07 2017 +0100 Improved the usability of the delete room confirmation page by limiting the list of bookings to 20. web/del.php | 26 ++++++++++++++++++++++++-- web/functions.inc | 9 +++++++++ web/lang/lang.en | 1 + 3 files changed, 34 insertions(+), 2 deletions(-) commit 487e504a8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 25 17:10:09 2017 +0100 Changed the Yes/No confirmation links for deleting a room into forms and buttons (and therefore with a CSRF token). web/admin.php | 12 +-- web/css/mrbs.css.php | 24 +++-- web/del.php | 95 ++++++++++++++++-- ...mentSubmit.php => ElementInputSubmit.php} | 2 +- ...{FieldSubmit.php => FieldInputSubmit.php} | 4 +- 5 files changed, 113 insertions(+), 24 deletions(-) commit d3cbc856b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 25 15:19:49 2017 +0100 Made all form variables POST only web/add.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 947a9fa4a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 25 15:13:30 2017 +0100 Removed redundant attributes web/admin.php | 2 -- 1 file changed, 2 deletions(-) commit a20c11f79 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 25 15:06:17 2017 +0100 Converted the link to delete a room into a form. web/admin.php | 56 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 9 deletions(-) commit cbdb23c3e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 25 14:10:54 2017 +0100 Added the $post_only parameter to Form::check() in order to cater for pages that can be accessed by both GET and POST requests, eg admin.php. web/admin.php | 6 +++-- web/lib/MRBS/Form/Form.php | 43 +++++++++++++++++++++++------------- 2 files changed, 32 insertions(+), 17 deletions(-) commit 2dec8b346 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 25 11:53:50 2017 +0100 Fixed some bugs that occur when $periods is not set web/internalconfig.inc.php | 4 ++-- web/js/edit_area_room.js.php | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) commit c0ee738b1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 24 21:39:58 2017 +0100 Fixed bug introduced in recent changes web/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 79ab0409d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 24 17:21:30 2017 +0100 Tweaked comment web/lib/MRBS/Form/Form.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit d25a8c3f4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 24 17:16:57 2017 +0100 Added CSRF token checking to admin.php. (Not strictly necessary as admin.php can't do anything by itself, but it's good practice as somebody may change its behaviour in the future and forget to check the token). Also modified token checking so that it is only carried out on POST requests. Any other type of request should only be used for safe operations that don't modify data. web/admin.php | 8 +++++--- web/grab_globals.inc.php | 18 ++++++++++-------- web/lib/MRBS/Form/Form.php | 25 ++++++++++++++++--------- 3 files changed, 31 insertions(+), 20 deletions(-) commit 70f56a663 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 24 16:49:32 2017 +0100 Tweaked layout and comments web/admin.php | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) commit a9d25187f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 24 16:44:43 2017 +0100 Removed redundant code. web/admin.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 3e4b0d69d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 24 16:40:14 2017 +0100 Simplified code by using the 'formaction' attribute on buttons. web/admin.php | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) commit d2194c1a3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 24 16:16:28 2017 +0100 Fixed layout of area change form on admin.php when JavaScript is disabled. web/css/mrbs.css.php | 4 ++++ 1 file changed, 4 insertions(+) commit 8b75b085f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 24 15:28:41 2017 +0100 Upgraded the room_admin_email field to be an HTML 'email' input (ie with client side validation). web/admin.php | 12 +++++++----- web/lib/MRBS/Form/ElementInputEmail.php (new) | 14 ++++++++++++++ web/lib/MRBS/Form/FieldInputEmail.php (new) | 15 +++++++++++++++ 3 files changed, 36 insertions(+), 5 deletions(-) commit 19a0e3df8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 24 15:06:15 2017 +0100 Converted the Add Room form to use the Form classes web/admin.php | 108 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 72 insertions(+), 36 deletions(-) commit cdf16fad6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 24 14:37:19 2017 +0100 Removed some redundant code web/admin.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) commit 7abd85d68 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 24 14:34:55 2017 +0100 Renamed the function web/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 605c27a5a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 24 14:32:50 2017 +0100 Moved the area select form into a function web/admin.php | 158 +++++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 74 deletions(-) commit 9fffcba37 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 24 14:23:30 2017 +0100 Completed Select Fields and converted the area selector form to use the Form classes. web/admin.php | 141 +++++++---------- web/css/mrbs.css.php | 27 ++-- web/lib/MRBS/Form/Element.php | 82 +++++++++- ...mentHidden.php => ElementInputHidden.php} | 2 +- .../MRBS/Form/ElementInputImage.php (new) | 14 ++ ...{ElementText.php => ElementInputText.php} | 2 +- web/lib/MRBS/Form/ElementOptgroup.php (new) | 14 ++ web/lib/MRBS/Form/ElementOption.php (new) | 14 ++ web/lib/MRBS/Form/Field.php | 43 ++++- .../{FieldText.php => FieldInputText.php} | 4 +- web/lib/MRBS/Form/FieldSelect.php | 11 +- web/lib/MRBS/Form/FieldSubmit.php | 2 +- web/lib/MRBS/Form/Form.php | 2 +- 13 files changed, 245 insertions(+), 113 deletions(-) commit 7a2a880b6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 23 18:51:05 2017 +0100 Revamped Forms classes to simplify them and also make the constructor class signatures identical. Started on select elements. web/admin.php | 110 ++++++++++++++++---- web/css/mrbs-rtl.css.php | 2 +- web/css/mrbs.css.php | 20 +++- web/lib/MRBS/Form/Element.php | 44 +++++--- web/lib/MRBS/Form/ElementFieldset.php | 15 ++- web/lib/MRBS/Form/ElementHidden.php | 8 +- web/lib/MRBS/Form/ElementInput.php | 7 +- web/lib/MRBS/Form/ElementLabel.php | 7 +- web/lib/MRBS/Form/ElementLegend.php | 3 +- web/lib/MRBS/Form/ElementSelect.php (new) | 13 +++ web/lib/MRBS/Form/ElementSubmit.php | 3 +- web/lib/MRBS/Form/ElementText.php | 6 +- web/lib/MRBS/Form/Field.php | 29 +++++- web/lib/MRBS/Form/FieldSelect.php (new) | 15 +++ web/lib/MRBS/Form/FieldSubmit.php | 9 +- web/lib/MRBS/Form/FieldText.php | 18 +--- web/lib/MRBS/Form/Form.php | 5 +- 17 files changed, 225 insertions(+), 89 deletions(-) commit 7da8c582f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 22 08:10:05 2017 +0100 Made the CSRF token a POST variable. All forms will be POST forms. web/lib/MRBS/Form/Form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ea5592900 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 22 08:03:38 2017 +0100 Swapped the order of token and authorisation checking. Token checking is a simple check, whereas authorisation checking goes on to invite the user to log in. web/add.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit 4be4ebb53 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 21 19:15:09 2017 +0100 Restructured web/session/functions_session.inc | 19 +++++++++++++++++++ web/session/session_cookie.inc | 19 ------------------- web/session/session_php.inc | 11 +---------- 3 files changed, 20 insertions(+), 29 deletions(-) commit ffd5016ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 21 18:11:40 2017 +0100 Added logging off of the user, when possible, in the event of a CSRF token mismatch. web/lib/MRBS/Form/Form.php | 6 ++-- web/session/session_cookie.inc | 43 ++++++++++++++++++++--------- web/session/session_joomla.inc | 7 ++++- web/session/session_php.inc | 13 ++++++--- web/session/session_wordpress.inc | 7 ++++- 5 files changed, 55 insertions(+), 21 deletions(-) commit f1b6a3acd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 21 17:03:39 2017 +0100 Internationalised the token error message. web/lang/lang.en | 1 + web/lib/MRBS/Form/Form.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) commit 7604092ca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 21 16:53:10 2017 +0100 Added CSRF token checking web/add.php | 14 ++++++++--- web/lib/MRBS/Form/Form.php | 49 ++++++++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 6 deletions(-) commit c5f55761f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 20 19:24:37 2017 +0100 Made the token a static variable so that the same token is used for all forms on a page. web/lib/MRBS/Form/Form.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) commit 8b4a8e539 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 20 18:37:49 2017 +0100 Fixed various bugs web/lib/MRBS/Form/Element.php | 2 +- web/lib/MRBS/Form/ElementInput.php | 3 ++- web/lib/MRBS/Form/FieldText.php | 12 +++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) commit f4af23524 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 20 18:18:19 2017 +0100 Fixed HTML5 validation error. Made hidden inputs self-closing. web/lib/MRBS/Form/ElementHidden.php | 1 + 1 file changed, 1 insertion(+) commit edc656bc1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 20 18:11:08 2017 +0100 Trivial change web/lib/MRBS/Form/Form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit dc5eff8e5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 20 18:10:19 2017 +0100 Added a CSRF token (support for sessions only at the moment - will need to do do add cookie support later) web/lib/MRBS/Form/Form.php | 43 ++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) commit 2201bc0d7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 20 16:40:01 2017 +0100 Started implementing the Form classes and converted the add_area form on the admin page to use them. web/admin.php | 61 ++++++++---- web/lib/MRBS/Form/Element.php (new) | 96 +++++++++++++++++++ web/lib/MRBS/Form/ElementFieldset.php (new) | 18 ++++ web/lib/MRBS/Form/ElementHidden.php (new) | 15 +++ web/lib/MRBS/Form/ElementInput.php (new) | 14 +++ web/lib/MRBS/Form/ElementLabel.php (new) | 18 ++++ web/lib/MRBS/Form/ElementLegend.php (new) | 14 +++ web/lib/MRBS/Form/ElementSubmit.php (new) | 13 +++ web/lib/MRBS/Form/ElementText.php (new) | 14 +++ web/lib/MRBS/Form/Field.php (new) | 15 +++ web/lib/MRBS/Form/FieldSubmit.php (new) | 20 ++++ web/lib/MRBS/Form/FieldText.php (new) | 23 +++++ web/lib/MRBS/Form/Form.php (new) | 13 +++ 13 files changed, 315 insertions(+), 19 deletions(-) commit 350ac4001 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 18 15:35:30 2017 +0100 Added comment web/internalconfig.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2ad0f6284 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 18 15:29:46 2017 +0100 Set some ini settings, as a further defence against session fixation. web/internalconfig.inc.php | 5 +++++ 1 file changed, 5 insertions(+) commit c3b877efc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 18 14:58:00 2017 +0100 Regenerated the session id on login, as a defence against session fixation. web/session/session_php.inc | 3 +++ 1 file changed, 3 insertions(+) commit cf70facf5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 18 13:33:43 2017 +0100 Added missing escaping to datalist value web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b1ee14f28 Merge: d5bd04610 723ba7297 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 18 09:36:53 2017 +0100 Merge commit 723ba7297 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 17 16:42:30 2017 +0100 Fixed problem with resizable boiokings not working after the upgrade to JQuery 3 - caused by the fact that jQuery.fn.offset() now requires an element to be connected to a document. web/js/resizable.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit e70f5c334 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 17 16:34:07 2017 +0100 Tidied up capitalisation when calling genDateSelector() [not a bug, as function names are case insensitive] web/edit_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit f9455f532 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 17 16:28:46 2017 +0100 Replaced use of jQuery .bind (now deprecated) with .on web/js/edit_entry.js.php | 14 +++++++------- web/js/general.js.php | 2 +- web/js/resizable.js.php | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) commit c83f9e561 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 16 21:36:39 2017 +0100 Put in a proper fix for the NaN problem (see changeset 8c1f0f3677c8). The problem was caused by timing differences between document.ready and window.load. web/js/datepicker.js.php | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) commit d5bd04610 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 16 15:43:38 2017 +0100 Trivial change to test set-up. web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4b1492cc8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 16 15:18:32 2017 +0100 Trivial change to test commit emails web/lib/MRBS/DB_mysql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ed8bd5cbd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 16 15:07:28 2017 +0100 Very minor enhancement to error messages web/lib/MRBS/DB_mysql.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1baecd467 Merge: e8a3370b3 533ecf5ee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 16 09:52:14 2017 +0100 Merge commit e8a3370b3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 16 09:50:07 2017 +0100 Added yet more error checking. See SF Support Requests #1332. web/lib/MRBS/DB_mysql.php | 33 ++++++++++++++++++++++++++++++--- web/lib/MRBS/DB_pgsql.php | 3 +++ 2 files changed, 33 insertions(+), 3 deletions(-) commit 90ca0bc11 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 16 09:28:12 2017 +0100 Added error checking to mutex_unlock() web/lib/MRBS/DB_mysql.php | 45 +++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) commit 533ecf5ee Merge: c60137966 a76aa4d98 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Oct 14 23:35:16 2017 +0100 Merged with default commit c60137966 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Oct 14 23:33:37 2017 +0100 Converted a few files to UNIX line-endings, to match the rest of the files. web/Mail/mime.php | 3252 +++++++++++++-------------- web/Mail/mimePart.php | 2498 ++++++++++---------- web/auth/auth_joomla.inc | 134 +- web/auth/cms/joomla.inc | 40 +- web/auth/cms/wordpress.inc | 8 +- web/functions_error.inc | 252 +-- web/functions_table.inc | 2534 ++++++++++----------- web/lang/lang.sr-rs-latin | 1006 ++++----- web/lib/MRBS/DBException.php | 32 +- web/lib/MRBS/Exception.php | 20 +- web/lib/MRBS/JFactory.php | 114 +- web/lib/MRBS/JUser.php | 52 +- web/session/functions_session.inc | 256 +-- web/session/session_joomla.inc | 294 +-- web/session/session_wordpress.inc | 306 +-- web/upgrade/50/post.inc | 26 +- web/upgrade/51/post.inc | 32 +- 17 files changed, 5428 insertions(+), 5428 deletions(-) commit a76aa4d98 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 14 16:53:42 2017 +0100 Added more error reporting to mutex_lock() web/lib/MRBS/DB_mysql.php | 56 +++++++++++++++++++++++++------------ web/lib/MRBS/DB_pgsql.php | 19 ++++++------- 2 files changed, 47 insertions(+), 28 deletions(-) commit 916945403 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 14 16:40:19 2017 +0100 Removed redundant quotes web/mrbs_sql.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit cc0587d24 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 8 18:51:13 2017 +0100 Fixed bug introduced during the upgrade of jQuery UI causing the duration on the edit_entry form to be displayed as NaN. web/js/datepicker.js.php | 1 + 1 file changed, 1 insertion(+) commit 20395abe5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 8 10:41:34 2017 +0100 Switched to using .prop instead of .attr/.removeAttr for setting/clearing the disabled property (jQuery 3 change) web/js/datepicker.js.php | 2 +- web/js/edit_entry.js.php | 30 +++++++++++++++--------------- web/js/report.js.php | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) commit 104e53725 Merge: dcc5c1843 b977a83cc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 6 14:39:27 2017 +0100 Merge commit dcc5c1843 Merge: 5471fb2ae 67c58cc23 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 6 14:35:41 2017 +0100 Merge with jquery_update commit 67c58cc23 (origin/jquery_update) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 6 14:34:27 2017 +0100 Close jquery_update branch commit ec343f37e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 6 14:32:00 2017 +0100 Upgraded to jQuery 3.2.1 (missing file from last commit) web/js.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit eeb794dde Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 6 14:30:53 2017 +0100 Upgraded to jQuery 3.2.1 web/jquery/jquery-2.2.4.min.js (gone) | 4 - .../{jquery-2.2.4.js => jquery-3.2.1.js} | 3225 +++++++++------- web/jquery/jquery-3.2.1.min.js (new) | 4 + web/jquery/jquery-migrate-1.4.1.js (gone) | 752 ---- .../jquery-migrate-1.4.1.min.js (gone) | 2 - web/jquery/jquery-migrate-3.0.0.js (new) | 540 +++ web/jquery/jquery-migrate-3.0.0.min.js (new) | 2 + 7 files changed, 2378 insertions(+), 2151 deletions(-) commit f9a8cdb12 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 6 14:13:57 2017 +0100 Updated with latest jQuery UI datepicker i18n files. web/jquery/ui/i18n/datepicker-af.js | 42 +++++------ web/jquery/ui/i18n/datepicker-ar-DZ.js | 44 +++++------ web/jquery/ui/i18n/datepicker-ar.js | 43 +++++------ web/jquery/ui/i18n/datepicker-az.js | 42 +++++------ web/jquery/ui/i18n/datepicker-be.js | 42 +++++------ web/jquery/ui/i18n/datepicker-bg.js | 44 +++++------ web/jquery/ui/i18n/datepicker-bs.js | 42 +++++------ web/jquery/ui/i18n/datepicker-ca.js | 42 +++++------ web/jquery/ui/i18n/datepicker-cs.js | 42 +++++------ web/jquery/ui/i18n/datepicker-cy-GB.js | 50 ++++++------ web/jquery/ui/i18n/datepicker-da.js | 42 +++++------ web/jquery/ui/i18n/datepicker-de.js | 42 +++++------ web/jquery/ui/i18n/datepicker-el.js | 42 +++++------ web/jquery/ui/i18n/datepicker-en-AU.js | 42 +++++------ web/jquery/ui/i18n/datepicker-en-GB.js | 42 +++++------ web/jquery/ui/i18n/datepicker-en-NZ.js | 42 +++++------ web/jquery/ui/i18n/datepicker-eo.js | 42 +++++------ web/jquery/ui/i18n/datepicker-es.js | 42 +++++------ web/jquery/ui/i18n/datepicker-et.js | 50 ++++++------ web/jquery/ui/i18n/datepicker-eu.js | 42 +++++------ web/jquery/ui/i18n/datepicker-fa.js | 96 ++++++++++++------------ web/jquery/ui/i18n/datepicker-fi.js | 42 +++++------ web/jquery/ui/i18n/datepicker-fo.js | 50 ++++++------ web/jquery/ui/i18n/datepicker-fr-CA.js | 42 +++++------ web/jquery/ui/i18n/datepicker-fr-CH.js | 42 +++++------ web/jquery/ui/i18n/datepicker-fr.js | 42 +++++------ web/jquery/ui/i18n/datepicker-gl.js | 42 +++++------ web/jquery/ui/i18n/datepicker-he.js | 42 +++++------ web/jquery/ui/i18n/datepicker-hi.js | 42 +++++------ web/jquery/ui/i18n/datepicker-hr.js | 42 +++++------ web/jquery/ui/i18n/datepicker-hu.js | 42 +++++------ web/jquery/ui/i18n/datepicker-hy.js | 42 +++++------ web/jquery/ui/i18n/datepicker-id.js | 42 +++++------ web/jquery/ui/i18n/datepicker-is.js | 50 ++++++------ web/jquery/ui/i18n/datepicker-it-CH.js | 42 +++++------ web/jquery/ui/i18n/datepicker-it.js | 42 +++++------ web/jquery/ui/i18n/datepicker-ja.js | 42 +++++------ web/jquery/ui/i18n/datepicker-ka.js | 51 ++++++++----- web/jquery/ui/i18n/datepicker-kk.js | 42 +++++------ web/jquery/ui/i18n/datepicker-km.js | 42 +++++------ web/jquery/ui/i18n/datepicker-ko.js | 44 +++++------ web/jquery/ui/i18n/datepicker-ky.js | 42 +++++------ web/jquery/ui/i18n/datepicker-lb.js | 50 ++++++------ web/jquery/ui/i18n/datepicker-lt.js | 50 ++++++------ web/jquery/ui/i18n/datepicker-lv.js | 50 ++++++------ web/jquery/ui/i18n/datepicker-mk.js | 42 +++++------ web/jquery/ui/i18n/datepicker-ml.js | 42 +++++------ web/jquery/ui/i18n/datepicker-ms.js | 42 +++++------ web/jquery/ui/i18n/datepicker-nb.js | 51 ++++++++----- web/jquery/ui/i18n/datepicker-nl-BE.js | 42 +++++------ web/jquery/ui/i18n/datepicker-nl.js | 38 +++++----- web/jquery/ui/i18n/datepicker-nn.js | 51 ++++++++----- web/jquery/ui/i18n/datepicker-no.js | 51 ++++++++----- web/jquery/ui/i18n/datepicker-pl.js | 42 +++++------ web/jquery/ui/i18n/datepicker-pt-BR.js | 50 ++++++------ web/jquery/ui/i18n/datepicker-pt.js | 52 +++++++------ web/jquery/ui/i18n/datepicker-rm.js | 64 +++++++++++----- web/jquery/ui/i18n/datepicker-ro.js | 42 +++++------ web/jquery/ui/i18n/datepicker-ru.js | 42 +++++------ web/jquery/ui/i18n/datepicker-sk.js | 42 +++++------ web/jquery/ui/i18n/datepicker-sl.js | 42 +++++------ web/jquery/ui/i18n/datepicker-sq.js | 42 +++++------ web/jquery/ui/i18n/datepicker-sr-SR.js | 42 +++++------ web/jquery/ui/i18n/datepicker-sr.js | 42 +++++------ web/jquery/ui/i18n/datepicker-sv.js | 42 +++++------ web/jquery/ui/i18n/datepicker-ta.js | 58 ++++++++------ web/jquery/ui/i18n/datepicker-th.js | 42 +++++------ web/jquery/ui/i18n/datepicker-tj.js | 42 +++++------ web/jquery/ui/i18n/datepicker-tr.js | 42 +++++------ web/jquery/ui/i18n/datepicker-uk.js | 42 +++++------ web/jquery/ui/i18n/datepicker-vi.js | 42 +++++------ web/jquery/ui/i18n/datepicker-zh-CN.js | 42 +++++------ web/jquery/ui/i18n/datepicker-zh-HK.js | 42 +++++------ web/jquery/ui/i18n/datepicker-zh-TW.js | 42 +++++------ 74 files changed, 1741 insertions(+), 1572 deletions(-) commit 397a475d8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 6 13:40:33 2017 +0100 Upgraded to jQuery UI v1.12.1. See SF Bugs #392. web/jquery/ui/css/jquery-ui.structure.css | 350 +- .../ui/css/jquery-ui.structure.min.css | 6 +- ...i-bg_diagonals-medium_20_d34d17_40x40.png | Bin 382 -> 382 bytes .../ui-bg_flat_30_cccccc_40x100.png (gone) | Bin 220 -> 0 bytes .../ui-bg_flat_50_5c5c5c_40x100.png (gone) | Bin 230 -> 0 bytes .../ui-bg_gloss-wave_45_817865_500x100.png | Bin 5891 -> 5891 bytes .../ui-bg_gloss-wave_60_fece2f_500x100.png | Bin 5849 -> 5849 bytes .../ui-bg_gloss-wave_70_ffdd57_500x100.png | Bin 5543 -> 5543 bytes .../ui-bg_gloss-wave_90_fff9e5_500x100.png | Bin 5389 -> 5389 bytes ...ui-bg_highlight-soft_100_feeebd_1x100.png | Bin 343 -> 343 bytes .../ui-bg_inset-soft_30_ffffff_1x100.png | Bin 203 -> 203 bytes .../sunny/images/ui-icons_3d3d3d_256x240.png | Bin 6992 -> 6992 bytes .../sunny/images/ui-icons_bd7b00_256x240.png | Bin 4549 -> 4549 bytes .../sunny/images/ui-icons_d19405_256x240.png | Bin 4549 -> 4549 bytes .../sunny/images/ui-icons_eb990f_256x240.png | Bin 4549 -> 4549 bytes .../sunny/images/ui-icons_ed9f26_256x240.png | Bin 4549 -> 4549 bytes .../sunny/images/ui-icons_fadc7a_256x240.png | Bin 4549 -> 4549 bytes .../sunny/images/ui-icons_ffe180_256x240.png | Bin 4549 -> 4549 bytes web/jquery/ui/css/sunny/jquery-ui.theme.css | 101 +- .../ui/css/sunny/jquery-ui.theme.min.css | 6 +- web/jquery/ui/jquery-ui.js | 11582 ++++++++------- web/jquery/ui/jquery-ui.min.js | 16 +- 22 files changed, 6761 insertions(+), 5300 deletions(-) commit 106456a38 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 6 13:16:40 2017 +0100 Created a new named branch for updating jQuery and jQuery UI commit b977a83cc Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Sep 27 12:52:03 2017 +0100 Fixed a few typos in the SAML auth documentation AUTHENTICATION | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 4ea84b195 Author: Jørn Åne <hg@jornane.no> Date: Mon Sep 25 12:47:06 2017 +0200 Add SAML auth and session schemes AUTHENTICATION | 34 +++++++ web/auth/auth_saml.inc (new) | 87 ++++++++++++++++ web/session/session_saml.inc (new) | 146 +++++++++++++++++++++++++++ 3 files changed, 267 insertions(+) commit 5471fb2ae Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 20 17:31:04 2017 +0100 Removed redundant global statement web/auth/auth_db.inc | 2 -- 1 file changed, 2 deletions(-) commit a45ed8b8a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 20 17:28:40 2017 +0100 Fixed bug in password rehashing web/auth/auth_db.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit d27ffc7be Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 12 16:30:19 2017 +0100 Added some error handling in the event of an invalid user id web/edit_users.php | 9 +++++++++ 1 file changed, 9 insertions(+) commit a992898bf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 18 12:25:51 2017 +0100 Fixed problem with validation of multiple email addresses - see SF Support Requests #1290. [The problem only manifests itself with certain values of $patternselect, eg 'php', used in PHPMailer::validateAddress()] web/functions.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit 5c5c5ff0e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 14 18:33:45 2017 +0100 Updated link to Microsoft language codes web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 68a6e3b5e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 13 18:42:30 2017 +0100 Added a Romanian language trtanslation, thanks to Mihai Andreana. See SF Support requests 1285. web/lang/lang.ro (new) | 534 +++++++++++++++++++++++++++++++++++++++ web/language.inc | 2 + 2 files changed, 536 insertions(+) commit d5cc45c29 Merge: 138e33ad9 8931946f6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 12 20:47:16 2017 +0100 Merge commit 138e33ad9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 12 20:43:45 2017 +0100 Fixed theoretical bug web/del_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7639abeb6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 12 20:24:44 2017 +0100 Fixed a problem with buttons not appearing if the user is logged in with a username in a different case to the creator of the booking. web/view_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 8931946f6 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jun 23 17:39:12 2017 +0100 Corrected name of PostgreSQL trigger in the schema definition. tables.pg.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5f6f4cd7f Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jun 6 19:37:45 2017 +0100 Split the "CREATE LANGUAGE" section of the Postgresql db schema 52 upgrade into 3 SQL commands. web/upgrade/52/post.inc | 9 +++++++++ 1 file changed, 9 insertions(+) commit 397628cfb Merge: 057a0db94 3a5ae8d68 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 3 06:01:25 2017 +0100 Merge commit 057a0db94 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jun 3 05:58:49 2017 +0100 Added sorting by the real date on the timestamp column in the users table. web/edit_users.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) commit 3a5ae8d68 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jun 2 11:25:47 2017 +0100 Upgrade 52 improved to install plpgsql language, if required, before creating a plpgsql function. web/upgrade/52/post.inc | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) commit be104546a Merge: b0e9dac6e 55ba98c6a Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Jun 1 23:09:28 2017 +0100 Merged with default. commit b0e9dac6e Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Jun 1 23:08:27 2017 +0100 Added a timestamp column to the users table, and support for viewing it. Added function and triggers for updating the timestamp columns when using PostgreSQL. tables.my.sql | 3 ++- tables.pg.sql | 19 ++++++++++++++++--- web/dbsys.inc | 2 +- web/edit_users.php | 14 +++++++++++++- web/lang/lang.en | 1 + web/upgrade/52/mysql.sql (new) | 5 +++++ web/upgrade/52/pgsql.sql (new) | 10 ++++++++++ web/upgrade/52/post.inc (new) | 28 ++++++++++++++++++++++++++++ 8 files changed, 76 insertions(+), 6 deletions(-) commit 55ba98c6a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 31 06:17:20 2017 +0100 Added an error message which would have helped in debugging SF Support Requests #1238. web/edit_users.php | 2 ++ 1 file changed, 2 insertions(+) commit b1d4096bf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 31 06:11:44 2017 +0100 Made all calls to header() use the lowercase version of the function name,for consistency within MRBS and with the function declaration. web/del.php | 2 +- web/del_entry.php | 2 +- web/edit_area_room.php | 6 +++--- web/edit_users.php | 8 ++++---- web/session/session_http.inc | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) commit 723ddbd50 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue May 30 20:52:25 2017 +0100 Fixed bug causing ordinary users sometimes not to be able to change their own passwords. See SF Support Requests #1238. web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0b9d3f907 Merge: adb0a9ce0 d2c9c0585 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon May 15 17:47:08 2017 +0100 Merge commit d2c9c0585 Merge: 57ecb0ac7 57d89de87 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon May 15 17:35:25 2017 +0100 Merging periods_per_area branch back into the default branch commit 57d89de87 (origin/periods_per_area) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon May 15 17:33:39 2017 +0100 Closing periods_per_area branch commit adb0a9ce0 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Apr 25 19:25:56 2017 +0100 Added a little more description around $ldap_dn_search_dn config web/systemdefaults.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit e1dd26446 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 14 10:03:14 2017 +0100 Fixed a problem whereby when there was only one period name the delete symbol would appear briefly before being removed. web/css/mrbs.css.php | 1 + web/js/edit_area_room.js.php | 7 +++++++ 2 files changed, 8 insertions(+) commit 84a95de8e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 14 09:43:49 2017 +0100 Handled the exceptional error case when there are no periods defined. web/edit_area_room.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) commit 2ddcc2fec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 13 13:18:05 2017 +0100 Tweaked CSS web/css/mrbs.css.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit bc12a6f2c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 13 13:08:12 2017 +0100 Fixed checks for maximum duration web/edit_entry.php | 1 + web/js/edit_entry.js.php | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) commit b7a6fe5d7 Merge: d98d6cc7b 57ecb0ac7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 13 12:43:30 2017 +0100 Merge with default commit 57ecb0ac7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 13 12:38:10 2017 +0100 Fixed bug causing an error on the edit_entry page when using periods when the times settings fall within certain bounds. web/functions.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit d98d6cc7b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 13 11:29:18 2017 +0100 Commit of work to date web/edit_entry.php | 22 ++++++++++++---------- web/js/edit_entry.js.php | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) commit 1bd53d27b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 12 17:29:34 2017 +0100 Made period_time_string() consistent with period_date_string(). web/functions.inc | 10 +++++----- web/month.php | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) commit d303f6210 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 12 17:19:52 2017 +0100 Fixed durations web/functions.inc | 15 +++++---------- web/functions_view.inc | 12 ++++++------ web/mrbs_sql.inc | 9 ++++++++- web/report.php | 2 +- 4 files changed, 20 insertions(+), 18 deletions(-) commit 6b13f1273 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 12 12:40:19 2017 +0100 Started fixing the display of period names web/functions.inc | 22 +++++++++++++++------- web/functions_view.inc | 4 ++-- web/mrbs_sql.inc | 20 ++++++++++++++++++++ web/pending.php | 2 +- web/report.php | 4 ++-- web/search.php | 2 +- 6 files changed, 41 insertions(+), 13 deletions(-) commit d38f47a52 Merge: 0c434b9ac 7d041fa57 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 12 11:01:05 2017 +0100 Merge with default commit 7d041fa57 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 12 10:59:52 2017 +0100 Fixed a problem with null values in the periods column (and at the same time discovered that upgrade 50 had never been added). tables.my.sql | 2 +- tables.pg.sql | 2 +- web/dbsys.inc | 2 +- web/upgrade/50/mysql.sql (new) | 5 +++++ web/upgrade/50/pgsql.sql (new) | 4 ++++ web/upgrade/50/post.inc (new) | 13 +++++++++++++ web/upgrade/51/mysql.sql (new) | 1 + web/upgrade/51/pgsql.sql (new) | 0 web/upgrade/51/post.inc (new) | 16 ++++++++++++++++ 9 files changed, 42 insertions(+), 3 deletions(-) commit 47bbe6150 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 12 08:32:53 2017 +0100 Fixed creation of areas so that the correect default is used for periods, web/mrbs_sql.inc | 5 +++++ 1 file changed, 5 insertions(+) commit 0c434b9ac Merge: 0a8fc5d9c d9c847eb9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 12 08:05:21 2017 +0100 Merge with default commit d9c847eb9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 12 08:04:40 2017 +0100 Added handling for null values of periods web/functions.inc | 13 +++++++++---- web/internalconfig.inc.php | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) commit 0a8fc5d9c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 11 19:09:45 2017 +0100 Re-enabled the facility to have different period names in each area. web/edit_area_room.php | 2 -- 1 file changed, 2 deletions(-) commit 9f189b13a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 11 19:08:29 2017 +0100 Created a new branch for the development of a feature allowing period names to be set on an area basis. commit 4902b8543 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 11 19:06:56 2017 +0100 Disabled the facility to have different periods in each area web/edit_area_room.php | 2 ++ 1 file changed, 2 insertions(+) commit 208dec1d9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 11 18:45:50 2017 +0100 Made sure there's always at least one period. web/js/edit_area_room.js.php | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) commit 0015400c4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 11 18:26:40 2017 +0100 Made the cursor a pointer when you hover over the delete period symbol. web/css/mrbs.css.php | 4 ++++ 1 file changed, 4 insertions(+) commit 659722016 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 11 18:21:59 2017 +0100 Added the ability to add and remove period names in an area. web/areadefaults.inc.php | 27 +++++++++++++++++++++++++++ web/css/mrbs-ielte8.css | 7 ++++++- web/css/mrbs.css.php | 19 +++++++++++++++++++ web/edit_area_room.php | 11 +++++++++-- web/js/edit_area_room.js.php | 15 +++++++++++++++ web/lang/lang.en | 1 + web/systemdefaults.inc.php | 22 ---------------------- 7 files changed, 77 insertions(+), 25 deletions(-) commit 7440e701a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 11 16:02:59 2017 +0100 Added the ability to have different period names in each area. See SF Support Requests 1214. For the moment every area has to have the same number of periods. tables.my.sql | 3 ++- tables.pg.sql | 3 ++- web/dbsys.inc | 2 +- web/edit_area_room.php | 26 ++++++++++++++++++++++++++ web/functions.inc | 7 +++++-- web/js/edit_area_room.js.php | 2 ++ web/lang/lang.en | 1 + 7 files changed, 39 insertions(+), 5 deletions(-) commit abb1b20f8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 11 11:17:21 2017 +0100 Restructured web/edit_area_room.php | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) commit e7b717144 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 11 11:11:21 2017 +0100 Restructured web/edit_area_room.php | 272 ++++++++++++++++++++------------------- 1 file changed, 141 insertions(+), 131 deletions(-) commit 35b148ecb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 11 10:42:21 2017 +0100 Fixed problem with colon appearing when it shouldn't. web/edit_area_room.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c1b2f42a9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 7 16:49:01 2017 +0100 Removed colons which are now provided by CSS (they must have been missed the last time). web/lang/lang.eu | 32 ++++++++++++++++---------------- web/lang/lang.sv | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) commit bebe327a2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 7 09:23:05 2017 +0100 Removed colons which are now provided by CSS (they must have been missed the last time). web/lang/lang.ca | 2 +- web/lang/lang.es | 2 +- web/lang/lang.eu | 2 +- web/lang/lang.nb | 2 +- web/lang/lang.nn | 2 +- web/lang/lang.no | 2 +- web/lang/lang.sv | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) commit 8aa6680c4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 7 09:19:16 2017 +0100 Fixed syntax errors web/lang/lang.es | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 95b465290 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 7 09:10:16 2017 +0100 Updated Spanish language file. Thanks to JLMartin. See SF Feature Requests #355. web/lang/lang.es | 147 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 141 insertions(+), 6 deletions(-) commit f92ca1ff1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 5 23:09:31 2017 +0100 Fixed transaction problems. See SF Support Requests #977. web/edit_entry_handler.php | 10 ++++++++++ web/lib/MRBS/DB.php | 22 +++++++++++++++++++--- web/lib/MRBS/DB_mysql.php | 5 +---- web/lib/MRBS/DB_pgsql.php | 16 ++++++++++------ web/mrbs_sql.inc | 11 +---------- 5 files changed, 41 insertions(+), 23 deletions(-) commit ef94178aa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 5 22:25:56 2017 +0100 Altered transaction methods to use PDO transaction methods. web/lib/MRBS/DB.php | 9 +++------ web/lib/MRBS/DB_mysql.php | 14 ++++---------- web/lib/MRBS/DB_pgsql.php | 14 ++++---------- 3 files changed, 11 insertions(+), 26 deletions(-) commit 5d42ad1ca Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Apr 5 20:28:52 2017 +0100 Made the DB connection DSN more strictly correct. web/lib/MRBS/DB.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cb65335c2 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Apr 5 20:24:25 2017 +0100 Support setting $db_host to "" (or unset), to indicate you'd like MRBS to use the default Unix domain socket instead of TCP. See [bugs:#384]. On Linux at least, this works for both MySQL and PostgreSQL. web/lib/MRBS/DB.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) commit bfd9bcc75 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 30 20:44:30 2017 +0100 Renamed variables web/functions_table.inc | 40 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) commit 9b40811d8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 30 20:08:22 2017 +0100 Fixed (hopefully properly this time) bug causing a booking occupying a single slot at the end of the day not to show in the day and week views. See SF Support Requests 1207. web/functions_table.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 8b4352ec7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 30 20:02:20 2017 +0100 Reverted last change web/functions_table.inc | 2534 ++++++++++++++++++------------------- 1 file changed, 1267 insertions(+), 1267 deletions(-) commit dd007583b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 30 18:15:28 2017 +0100 Fixed bug causing a booking occupying a single slot at the end of the day not to show in the day and week views. See SF Support Requests 1207. web/functions_table.inc | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) commit 7b31ac5ef Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 30 10:55:47 2017 +0100 Reverted previous change as it didn't solve the problem. See SF Bugs #383. web/edit_entry_handler.php | 6 ------ 1 file changed, 6 deletions(-) commit 11697f1f1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 29 18:22:44 2017 +0100 Made the return URL an absolute instead of relative location. See SF Bugs #383. web/edit_entry_handler.php | 5 +++++ 1 file changed, 5 insertions(+) commit 3b13de263 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 28 17:24:39 2017 +0100 Rewrote the code for getting $returl - see SF Bugs #383 web/edit_entry_handler.php | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) commit c58c09332 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 21 10:28:36 2017 +0000 Improved word breaking slightly on webkit browsers. See SF Support Requests #951 and #1200. web/css/mrbs.css.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 142584c37 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 20 09:28:46 2017 +0000 Added comment. web/view_entry.php | 4 ++++ 1 file changed, 4 insertions(+) commit c912676ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 20 07:26:31 2017 +0000 Removed redundant line of code web/view_entry.php | 1 - 1 file changed, 1 deletion(-) commit bcd92ea47 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 19 22:07:25 2017 +0000 Restricted passing of ids parameter to del_entry_ajax to POST. web/del_entry_ajax.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 37e36cf31 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 19 20:57:04 2017 +0000 Made the note form variable POST-only for good measure web/del_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3717f2a2e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 19 20:51:35 2017 +0000 Restricted passing of id parameter to del_entry to POST. web/del_entry.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 22d194c69 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 19 20:36:58 2017 +0000 Fixed problem with extra colons web/view_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 691062e8e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 19 20:21:54 2017 +0000 Fixed bug introduced in recent changes. web/view_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit a9e7e7772 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 19 19:27:05 2017 +0000 Restructured and made the view_entry links line up. web/css/mrbs.css.php | 27 ++++++- web/view_entry.php | 179 +++++++++++++++++++++++++++-------------- 2 files changed, 141 insertions(+), 65 deletions(-) commit 36372f263 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 19 18:45:58 2017 +0000 Removed new lines from JavaScript confirm messages. Modern browsers can handle long lines. web/lang/lang.ca | 2 +- web/lang/lang.cs | 2 +- web/lang/lang.da | 2 +- web/lang/lang.de | 2 +- web/lang/lang.el | 2 +- web/lang/lang.en | 2 +- web/lang/lang.fi | 2 +- web/lang/lang.fr | 2 +- web/lang/lang.he | 2 +- web/lang/lang.hu | 2 +- web/lang/lang.id | 2 +- web/lang/lang.it | 2 +- web/lang/lang.nb | 2 +- web/lang/lang.nl | 2 +- web/lang/lang.nn | 2 +- web/lang/lang.no | 2 +- web/lang/lang.pl | 2 +- web/lang/lang.pt | 2 +- web/lang/lang.pt-br | 2 +- web/lang/lang.ru | 2 +- web/lang/lang.sk | 2 +- web/lang/lang.sl | 2 +- web/lang/lang.sr-rs-latin | 2 +- web/lang/lang.sv | 2 +- web/lang/lang.tr | 2 +- web/lang/lang.zh-cn | 2 +- web/lang/lang.zh-tw | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) commit a8b714e47 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 19 14:14:55 2017 +0000 Fixed problem with an extra colon on Remind Admin line web/css/mrbs-ielte8.css | 3 ++- web/css/mrbs.css.php | 3 ++- web/view_entry.php | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) commit 887a19a02 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 19 14:02:27 2017 +0000 Restructured web/view_entry.php | 73 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 58 insertions(+), 15 deletions(-) commit 786f8b09b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 19 12:05:13 2017 +0000 Fixed HTML5 validation error web/view_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit e8b97c43d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 19 11:58:47 2017 +0000 Restructured web/css/mrbs.css.php | 12 ++++++++++-- web/view_entry.php | 15 +++++++++------ 2 files changed, 19 insertions(+), 8 deletions(-) commit b61e2dc13 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Mar 18 09:05:57 2017 +0000 Disallow password changes from edit_users.php via GET. web/edit_users.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit f784508ac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 17 10:14:34 2017 +0000 Moved colons in trailer out of HTML and into CSS. web/css/mrbs-ielte8.css | 2 + web/css/mrbs.css.php | 98 ++++++++++++++++++++++++++++++--------- web/trailer.inc | 9 ++-- 3 files changed, 84 insertions(+), 25 deletions(-) commit 9176f7a47 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 17 09:50:05 2017 +0000 Fixed problem with double colon web/view_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit fea3c4a99 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 16 13:57:37 2017 +0000 Restructured web/js/general.js.php | 4 ++-- web/session/functions_session.inc | 18 +++++++++--------- web/session/session_cookie.inc | 24 ++++++++++++------------ web/session/session_joomla.inc | 20 ++++++++++---------- web/session/session_php.inc | 18 +++++++++--------- web/session/session_wordpress.inc | 20 ++++++++++---------- 6 files changed, 52 insertions(+), 52 deletions(-) commit 417dcb46b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 16 13:47:06 2017 +0000 Restricted passing of username and password to POST variables as a security measure. See SF Feature Requests #351. web/grab_globals.inc.php | 16 +++++++++++----- web/session/session_cookie.inc | 10 +++++----- web/session/session_joomla.inc | 10 +++++----- web/session/session_php.inc | 10 +++++----- web/session/session_wordpress.inc | 10 +++++----- 5 files changed, 31 insertions(+), 25 deletions(-) commit 6daa8c62b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 16 12:00:52 2017 +0000 Restructured code web/grab_globals.inc.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) commit b054b861e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 16 11:11:16 2017 +0000 Restructured code web/session/functions_session.inc | 9 ++++++++- web/session/session_cookie.inc | 8 ++++---- web/session/session_joomla.inc | 8 ++++---- web/session/session_php.inc | 8 ++++---- web/session/session_wordpress.inc | 6 +++--- 5 files changed, 23 insertions(+), 16 deletions(-) commit eb717ca10 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 16 10:49:36 2017 +0000 Changed access level for check_slot_ajax to match edit_entry. web/mrbs_auth.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 00e21a26d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 16 10:44:05 2017 +0000 Made the default access level 1 for the report, search and view_entry pages to prevent usernames being revealed. See SF Feature Requests #351. web/mrbs_auth.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit 2ceec94c2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 15 18:02:06 2017 +0000 Minor restructuring web/mincals.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 61d592f34 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 15 17:57:35 2017 +0000 Made $html a static variable so that the day names are calculated only once, instead of three times. web/mincals.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit 96bd6804f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 15 17:37:21 2017 +0000 Added a comment web/mincals.inc | 2 ++ 1 file changed, 2 insertions(+) commit 3d5c738b0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 15 17:33:25 2017 +0000 Restructured to improve readability. web/mincals.inc | 100 +++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 50 deletions(-) commit 16cf3f809 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 15 16:58:53 2017 +0000 Excluded seconds from the default representation of start and end time. See SF Bugs #381. web/systemdefaults.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 0d5c98b33 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 15 16:44:07 2017 +0000 Removed colon from row label header. See SF Feature Requests #349. web/functions_table.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 2f9b6c000 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 15 09:42:30 2017 +0000 Added new config variable $weekdays to define weekdays and weekends, allowing for the possibility that weekdays are not the same as woreking days. web/functions.inc | 11 ++--------- web/systemdefaults.inc.php | 3 +++ 2 files changed, 5 insertions(+), 9 deletions(-) commit d5f6541bf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 15 09:23:32 2017 +0000 Removed from blank cells. No longer necessary with today's browsers. web/mincals.inc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) commit 5e80b1c55 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 15 09:20:34 2017 +0000 Changed calculation of whether a day is a weeekend day to use $working_days, instead of Saturday and Sunday, to allow for locales, eg Saudi Arabia, where the weekend does not fall on Sat and Sun. web/functions.inc | 21 ++++++++++++++++++++- web/mincals.inc | 25 ++++++++++++------------- 2 files changed, 32 insertions(+), 14 deletions(-) commit b16844961 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Mar 15 00:03:42 2017 +0000 Added some CSS classes to the minicals. web/mincals.inc | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) commit c43f27931 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 14 16:46:01 2017 +0000 Amended translation. web/lang/lang.sv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b8367e89e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 14 15:47:05 2017 +0000 Added Swedish translations. Thanks to Lars Olsson. See SF Support Requests 1188. web/lang/lang.sv | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) commit fe057d714 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 14 15:45:46 2017 +0000 Removed whitespace web/lang/lang.en | 1 - 1 file changed, 1 deletion(-) commit b43d213ba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 13 15:44:20 2017 +0000 Fixed a bug with the display of entries starting at 0000 in the month view. See SF Support Requests #1186. web/mrbs_sql.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 7968944ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 11 18:37:03 2017 +0000 Eliminated the function mrbs_entity_decode() as it's unnecessary now that the PHP version is at least 5.3.3. web/functions.inc | 26 -------------------------- web/js/edit_entry.js.php | 10 +++++----- web/js/resizable.js.php | 4 ++-- web/report.php | 4 ++-- 4 files changed, 9 insertions(+), 35 deletions(-) commit 950dfa8be Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 11 18:21:43 2017 +0000 Set PHP's default charset web/language.inc | 2 ++ 1 file changed, 2 insertions(+) commit eaed97c97 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 11 11:54:20 2017 +0000 Fixed bug with production of a .csv report, introduced during a recent change. web/report.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 5392f1aa1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 11 11:40:09 2017 +0000 Changed the way that period names are defined so that they can now contain special chars and are put through htmlspecialchars() before being output to the browser. (Previously the site administrator had to encode special chars). web/edit_entry.php | 2 +- web/functions_mail.inc | 7 ++----- web/functions_table.inc | 6 +++--- web/js/functions.js.php | 16 ++++++++++++---- web/month.php | 4 ++-- web/mrbs_sql.inc | 2 +- web/pending.php | 2 +- web/search.php | 2 +- web/systemdefaults.inc.php | 10 ++++------ 9 files changed, 27 insertions(+), 24 deletions(-) commit e477abcf6 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Mar 11 11:00:30 2017 +0000 Added even more options for configuring PHPMailer TLS settings. web/functions_mail.inc | 9 +++++++++ web/systemdefaults.inc.php | 6 ++++++ 2 files changed, 15 insertions(+) commit 8f73e4c58 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Mar 11 10:03:49 2017 +0000 Added mode/coding hint and removed $Id$ from config.inc.php web/config.inc.php (mode +x) | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit 30f98a7b9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 11 09:13:05 2017 +0000 Removed the ' ' characters from the default period descriptions as they are unnecessary: CSS ensures that the descriptions don't wrap. web/systemdefaults.inc.php | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) commit f6eebf525 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 11 09:04:55 2017 +0000 Fixed problem of ' ' appearing in period description in slot selector. web/edit_entry.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) commit d9b4fd6de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 10 17:18:57 2017 +0000 Added the translation for "back". web/lang/lang.pt | 2 ++ 1 file changed, 2 insertions(+) commit bb807fff1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 10 15:58:23 2017 +0000 Moved colons out of .js files and into lang files. (Can't very easily produce colons using CSS content property because we're also using these strings in the title attribute for a tooltip). web/js/edit_entry.js.php | 6 +++--- web/lang/lang.en | 6 +++--- web/lang/lang.fr | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) commit ee99ec7f8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 10 13:00:46 2017 +0000 Updated Portuguese translation. Thanks to Paulo Resende. See SF Support Requests #1178. web/lang/lang.pt | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) commit 1093256b9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 10 10:03:49 2017 +0000 Added a comment web/js/edit_entry.js.php | 7 +++++++ 1 file changed, 7 insertions(+) commit 42cf0380b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 10 09:55:43 2017 +0000 Added a warning symbol on the edit_entry page instead of a green tick when an admin makes a booking that would normally violate one or more of the policy rules. See SF Support Requests 1171. web/css/mrbs-ielte8.css | 10 ++- web/css/mrbs.css.php | 25 ++++++-- web/edit_entry.php | 10 +-- web/edit_entry_handler.php | 6 +- web/import.php | 4 +- web/js/edit_entry.js.php | 23 +++++-- web/js/resizable.js.php | 4 +- web/lang/lang.en | 29 ++++----- web/mrbs_sql.inc | 114 ++++++++++++++++++++--------------- 9 files changed, 140 insertions(+), 85 deletions(-) commit 7844a941f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 9 13:12:59 2017 +0000 Moved checkmark and cross on booking form out of HTML and into CSS. web/css/mrbs-ielte8.css | 16 ++++++++++++++-- web/css/mrbs.css.php | 12 ++++++++++-- web/edit_entry.php | 7 ++----- web/js/edit_entry.js.php | 10 ++++------ 4 files changed, 30 insertions(+), 15 deletions(-) commit 9f5d076c6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 7 17:32:17 2017 +0000 Removed an unnecessary replacement of the colon at the end of the label, now that the colon is not part of the label but generated as a CSS pseudo-element. web/js/edit_entry.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 866806e9e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 7 17:27:39 2017 +0000 Stripped out HTML tags and entities from validation messages. See SF Bugs #380. web/js/edit_entry.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3dc3f2aaf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 6 16:55:29 2017 +0000 Made use of nbsp hex value in CSS consistent. web/css/mrbs-ielte8.css | 2 +- web/css/mrbs.css.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 4f2e97980 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 6 16:48:55 2017 +0000 Used pseudo-elements instead of pseudo-classes for before and after. web/css/mrbs-ielte8.css | 11 +++++++++++ web/css/mrbs.css.php | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) commit b3536f2fb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 6 16:24:41 2017 +0000 Removed the supplementary information in the 'fulldescription' text string. It didn't help and indeed was misleading as things like the type have their own form field. web/lang/lang.cs | 2 +- web/lang/lang.da | 2 +- web/lang/lang.de | 2 +- web/lang/lang.el | 2 +- web/lang/lang.en | 2 +- web/lang/lang.fi | 2 +- web/lang/lang.fr | 2 +- web/lang/lang.hu | 2 +- web/lang/lang.id | 2 +- web/lang/lang.it | 2 +- web/lang/lang.ja | 2 +- web/lang/lang.ko | 2 +- web/lang/lang.nl | 2 +- web/lang/lang.pl | 2 +- web/lang/lang.pt | 2 +- web/lang/lang.pt-br | 2 +- web/lang/lang.ru | 2 +- web/lang/lang.sk | 2 +- web/lang/lang.sl | 2 +- web/lang/lang.sr-rs-latin | 2 +- web/lang/lang.th | 2 +- web/lang/lang.tr | 2 +- web/lang/lang.zh-cn | 2 +- web/lang/lang.zh-tw | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) commit 875c5b1de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 6 16:02:57 2017 +0000 Moved colons out of HTML and into CSS web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ad815ff73 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 6 15:57:23 2017 +0000 Moved colons out of HTML and into CSS web/functions_view.inc | 2 +- web/lang/lang.fr | 66 ++++++++++++++++++++-------------------- web/view_entry.php | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) commit 58db94099 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 6 15:45:27 2017 +0000 Moved colons out of HTML and into CSS web/css/mrbs-ielte8.css | 8 +++++--- web/css/mrbs.css.php | 6 ++++-- web/help.php | 24 ++++++++++++------------ 3 files changed, 21 insertions(+), 17 deletions(-) commit 5d1529f88 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 6 15:10:24 2017 +0000 Added lang attributes to the Help pages. web/site_faq/site_faq.html | 3 +++ web/site_faq/site_faq_cs.html | 3 +++ web/site_faq/site_faq_de.html | 4 ++++ web/site_faq/site_faq_es.html | 4 ++++ web/site_faq/site_faq_fr.html | 4 ++++ web/site_faq/site_faq_it.html | 4 ++++ web/site_faq/site_faq_nl.html | 4 ++++ web/site_faq/site_faq_sv.html | 5 +++++ 8 files changed, 31 insertions(+) commit 306c63b2f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 6 14:54:24 2017 +0000 Added a language attribute to the <html> element and then adjusted the CSS for labels for French. web/Themes/default/header.inc | 2 +- web/css/mrbs-ielte8.css | 4 ++++ web/css/mrbs.css.php | 4 ++++ web/language.inc | 9 +++++++++ 4 files changed, 18 insertions(+), 1 deletion(-) commit 109e00b1b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 6 14:15:20 2017 +0000 Moved the colon after form labels out of HTML and into CSS so that it can easily be changed for languages that expect a different treatment (eg French). web/admin.php | 12 ++--- web/css/mrbs-ielte8.css | 11 +++++ web/css/mrbs.css.php | 8 ++++ web/edit_area_room.php | 70 ++++++++++++++--------------- web/edit_entry.php | 30 ++++++------- web/edit_users.php | 4 +- web/functions.inc | 6 +-- web/import.php | 14 +++--- web/js/edit_area_room.js.php | 2 +- web/report.php | 32 ++++++------- web/search.php | 4 +- web/session/functions_session.inc | 4 +- 12 files changed, 108 insertions(+), 89 deletions(-) commit 14331f38c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 5 16:46:28 2017 +0000 Made parameter order consistent with other functions. web/functions.inc | 4 ++-- web/search.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 472857823 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 5 16:41:47 2017 +0000 Restructured web/Themes/default/header.inc | 11 ++++++++--- web/functions.inc | 2 +- web/search.php | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) commit ed973568b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 5 16:30:28 2017 +0000 Restuctured code, changing calls to print_header(). web/admin.php | 2 +- web/approve_entry_handler.php | 2 +- web/day.php | 2 +- web/dbsys.inc | 2 +- web/del.php | 4 ++-- web/del_entry.php | 2 +- web/edit_area_room.php | 6 +++--- web/edit_entry.php | 4 ++-- web/edit_entry_handler.php | 8 ++++---- web/edit_users.php | 8 ++++---- web/functions.inc | 8 ++++---- web/help.php | 2 +- web/month.php | 2 +- web/mrbs_auth.inc | 24 ++++++++++-------------- web/pending.php | 2 +- web/report.php | 2 +- web/search.php | 2 +- web/session/session_cookie.inc | 8 ++++---- web/session/session_joomla.inc | 8 ++++---- web/session/session_php.inc | 8 ++++---- web/session/session_wordpress.inc | 8 ++++---- web/view_entry.php | 2 +- web/week.php | 2 +- 23 files changed, 57 insertions(+), 61 deletions(-) commit 2c2675c57 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 5 15:55:04 2017 +0000 Restructured web/Themes/default/header.inc | 28 +--------------------------- web/functions.inc | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 27 deletions(-) commit 07994292a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 5 15:43:01 2017 +0000 Eliminated $locale_warning global and moved reporting of locale setting problems to the error mechanism rather than the browser. web/Themes/default/header.inc | 7 ------- web/language.inc | 12 +++++------- 2 files changed, 5 insertions(+), 14 deletions(-) commit 5e5c002f5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 5 15:29:04 2017 +0000 Eliminated a global. web/Themes/default/header.inc | 4 ++-- web/functions.inc | 4 ++-- web/search.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) commit ea2f43f28 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 5 15:19:07 2017 +0000 Renamed variable web/session/functions_session.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 7d8b2780d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 5 12:27:46 2017 +0000 Removed "ExpiresActive Off" directive as it is no longer necessary given other fixes and could interfere with a site's caching policy. See SF Bugs #379. web/.htaccess-apache-2.4 | 6 ------ web/.htaccess-apache-pre-2.4 | 6 ------ 2 files changed, 12 deletions(-) commit b25e1abd9 Merge: 3cfc61cea afc831b37 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 4 11:37:03 2017 +0000 Merge commit 3cfc61cea Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 4 11:35:13 2017 +0000 Added some configuration information to the Help page (for admins only) web/css/mrbs.css.php | 33 ++++++++++++++++++++++++++++++--- web/help.php | 26 ++++++++++++++++++++------ web/lang/lang.en | 3 +++ 3 files changed, 53 insertions(+), 9 deletions(-) commit afc831b37 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Mar 4 10:40:02 2017 +0000 Added missing variable declaration. web/auth/auth_ldap.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8f879de7c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 4 10:00:51 2017 +0000 Restricted server details to admins, for security reasons web/help.php | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) commit da3c6543f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 4 09:50:03 2017 +0000 Added an explicit return. web/auth/auth_ldap.inc | 2 ++ 1 file changed, 2 insertions(+) commit 14c1cd79a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 4 08:46:18 2017 +0000 Eliminated use of $HTTP_REFERER, thus allowing the files to be cached. web/js/edit_users.js.php | 12 ++++++++---- web/js/report.js.php | 13 +++++++++---- web/js/search.js.php | 20 ++++++++++++-------- 3 files changed, 29 insertions(+), 16 deletions(-) commit 767f85a84 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 3 15:29:38 2017 +0000 Added Server Software information to the Help information, to help with determining the Apache version for choosing a .htaccess file - as well as being generally useful for support. web/functions.inc | 15 +++++++++++++++ web/help.php | 1 + web/lang/lang.en | 1 + 3 files changed, 17 insertions(+) commit fb28c400b Merge: e3446f364 9424ecd2b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 3 14:32:25 2017 +0000 Reintegrated login_with_email_address named branch. MRBS now supports login by username or email address, when the authentication type allows it. If login by email address is supported then it is also possible to login using just the local-part of the email address - but this feature has to be enabled by a config variable setting. commit 9424ecd2b (origin/login_with_email_address) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 3 14:28:26 2017 +0000 Close login_with_email_address branch commit ed1bbb97d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 2 15:26:01 2017 +0000 Added missing require statements. web/session/session_http.inc | 2 ++ web/session/session_remote_user.inc | 2 ++ 2 files changed, 4 insertions(+) commit 8d2a6ee84 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 2 12:33:39 2017 +0000 Moved the position of the user list link for consistency with the other session schemes. web/session/session_remote_user.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 740c4b2e5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 2 12:27:53 2017 +0000 Moved generation of user list link out into a function. web/session/functions_session.inc | 11 +++++++++++ web/session/session_cookie.inc | 7 ++----- web/session/session_http.inc | 7 ++----- web/session/session_joomla.inc | 7 ++----- web/session/session_php.inc | 7 ++----- web/session/session_remote_user.inc | 5 +---- web/session/session_wordpress.inc | 7 ++----- 7 files changed, 22 insertions(+), 29 deletions(-) commit 6020ab6aa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 2 12:15:46 2017 +0000 Moved generation of Unknown User link and Login button out into functions web/session/functions_session.inc | 23 +++++++++++++++++++++++ web/session/session_cookie.inc | 13 +++---------- web/session/session_http.inc | 14 ++++---------- web/session/session_joomla.inc | 14 ++++---------- web/session/session_php.inc | 15 +++++---------- web/session/session_wordpress.inc | 14 ++++---------- 6 files changed, 43 insertions(+), 50 deletions(-) commit 7901a08c5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 2 11:49:02 2017 +0000 Moved generation of the Logoff button out into a function. web/session/functions_session.inc | 18 ++++++++++++++++++ web/session/session_cookie.inc | 12 +----------- web/session/session_joomla.inc | 12 +----------- web/session/session_php.inc | 12 +----------- web/session/session_wordpress.inc | 12 +----------- 5 files changed, 22 insertions(+), 44 deletions(-) commit e41e79eed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 2 11:25:32 2017 +0000 Changed title text to reflect the fact that the "You are [username]" link no longer displays all the user's upcoming entries, but just those for the next 60 days (by default). web/lang/lang.en | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6a86e24d1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 2 11:21:04 2017 +0000 Moved the "You are [username]" link out into a function. web/Themes/default/header.inc | 2 +- web/session/functions_session.inc | 11 +++++++++++ web/session/session_cookie.inc | 16 +++------------- web/session/session_http.inc | 17 ++--------------- web/session/session_joomla.inc | 15 +++------------ web/session/session_php.inc | 15 +++------------ web/session/session_remote_user.inc | 22 ++++++---------------- web/session/session_wordpress.inc | 15 +++------------ 8 files changed, 32 insertions(+), 81 deletions(-) commit 0c7819886 Merge: c5e78ad4d e3446f364 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 2 10:09:19 2017 +0000 Merge with default commit e3446f364 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 2 09:33:34 2017 +0000 Fixed bug when using custom themes. See SF Support Requests #1170. web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 46ff631f5 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Mar 1 20:53:13 2017 +0000 Moved MRBS's .htaccess file into 2 separate example .htaccess files for different versions of Apache. The old .htaccess caused 500 errors with a stock Apache 2.4 configuration. INSTALL | 13 +++++++------ web/.htaccess-apache-2.4 (new) | 9 +++++++++ web/{.htaccess => .htaccess-apache-pre-2.4} | 0 3 files changed, 16 insertions(+), 6 deletions(-) commit a0e80ad0f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 1 18:16:52 2017 +0000 Capitalised "goto" button. See SF Support Requests 1167. web/lang/lang.en | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6143053ca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 1 18:07:03 2017 +0000 Restructured code so that when the HTTP headers are sent caching is disabled by default. For files that can be cached then the expiry date has to be set explicitly in http_headers(). This is to avoid problems with files being cached when they shouldn't be. web/Themes/default/header.inc | 7 ++++++- web/check_slot_ajax.php | 4 ++-- web/css/mrbs-ielte7.css.php | 5 ++--- web/css/mrbs-print.css.php | 5 ++--- web/css/mrbs-rtl.css.php | 5 ++--- web/css/mrbs.css.php | 4 ++-- web/edit_entry_handler.php | 2 +- web/edit_users.php | 3 +-- web/functions.inc | 19 +++++++++++-------- web/js/admin.js.php | 4 ++-- web/js/cell_click.js.php | 4 ++-- web/js/datatables.js.php | 4 ++-- web/js/datepicker.js.php | 4 ++-- web/js/edit_area_room.js.php | 4 ++-- web/js/edit_entry.js.php | 4 ++-- web/js/edit_users.js.php | 4 ++-- web/js/functions.js.php | 4 ++-- web/js/general.js.php | 4 ++-- web/js/multiple.js.php | 4 ++-- web/js/pending.js.php | 4 ++-- web/js/refresh.js.php | 4 ++-- web/js/report.js.php | 4 ++-- web/js/resizable.js.php | 4 ++-- web/js/search.js.php | 4 ++-- web/report.php | 11 ++++------- web/search.php | 3 +-- web/view_entry.php | 8 +++++--- 27 files changed, 69 insertions(+), 67 deletions(-) commit 444ed208f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 1 16:12:00 2017 +0000 Added headers to disable caching when sending application data, eg JSON or iCalendar. Although the PHP session scheme will normally add these headers when $auth['session'] is set to 'php', this won't happen in some other session schemes, eg 'cookie'. So MRBS explicitly adds the headers itself just to make sure. web/check_slot_ajax.php | 1 + web/edit_users.php | 1 + web/report.php | 3 +++ web/search.php | 1 + web/view_entry.php | 1 + 5 files changed, 7 insertions(+) commit 9bd7079fb Merge: bffe5c967 197c6defd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 1 15:13:07 2017 +0000 Merge with 1.6.1 commit bffe5c967 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 1 15:11:42 2017 +0000 Made sure that caching is disabled when it should be. See SF Bugs #379. web/.htaccess | 6 +++++ web/functions.inc | 55 +++++++++++++++++++++++++++------------------ 2 files changed, 39 insertions(+), 22 deletions(-) commit 197c6defd Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Feb 27 20:51:27 2017 +0000 Set the default value of $smtp_settings['secure'] to '', so that TLS will not be attempted without the SMTP server advertising TLS support. web/systemdefaults.inc.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 181ffc6f8 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Feb 26 20:02:58 2017 +0000 Added tag mrbs-1_6_1 for changeset f392e68914ab commit 3acbb9382 (tag: mrbs-1_6_1) Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Feb 26 20:02:36 2017 +0000 Updated ChangeLog and NEWS for release ChangeLog | 226 +++++++++++++++++++++++++++++++++++++++++++++++++++- NEWS | 17 ++++ 2 files changed, 242 insertions(+), 1 deletion(-) commit c5e78ad4d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 26 17:07:00 2017 +0000 Moved and renamed functions_logon.inc web/{functions_logon.inc => session/functions_session.inc} | 0 web/session/session_cookie.inc | 2 +- web/session/session_joomla.inc | 2 +- web/session/session_php.inc | 2 +- web/session/session_wordpress.inc | 1 + 5 files changed, 4 insertions(+), 3 deletions(-) commit 661a9a066 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Feb 26 15:24:00 2017 +0000 Updated version number for release web/version_num.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 210ac6d64 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 26 11:18:54 2017 +0000 Yet another fix to merge web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d184f38df Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 26 11:15:15 2017 +0000 Further fix to merge web/Themes/default/header.inc | 4 ++++ 1 file changed, 4 insertions(+) commit 15a56c3a3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 26 11:10:31 2017 +0000 Fixed merge web/Themes/default/header.inc | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) commit 004d77730 Merge: a10dbf8bc f9da21de4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 26 10:55:22 2017 +0000 Merge with default commit f9da21de4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 26 07:55:57 2017 +0000 Fixed the header height when there are error messages sent to the browser web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9f6d1cd16 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 26 07:37:57 2017 +0000 Made the "simple" banner work, used when there's a fatal error. web/Themes/default/header.inc | 56 ++++++++++++++++----------------- 1 file changed, 28 insertions(+), 28 deletions(-) commit ae9e8dd88 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 25 12:29:15 2017 +0000 Fixed header layout problem in IE11 and below when using a tall logo. See SF Support Requests #1158. web/Themes/default/header.inc | 5 ++++- web/css/mrbs.css.php | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) commit a10dbf8bc Merge: 1b31a6b92 634e72dde Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 23 20:35:21 2017 +0000 Merge with default commit 634e72dde Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 23 20:29:25 2017 +0000 Fixed bug causing incorrect status to be given on mails sent out when an entry is approved. See SF Bugs #320. web/approve_entry_handler.php | 2 ++ 1 file changed, 2 insertions(+) commit 1b31a6b92 Merge: 99a15d78c ec90c0bc0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 23 18:42:53 2017 +0000 Merge with default commit ec90c0bc0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 23 18:40:43 2017 +0000 Fixed checking of return value of getUserName() web/session/session_cookie.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 99a15d78c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 23 18:28:51 2017 +0000 Fixed checking of return value of getUserName() web/session/session_cookie.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit ba67e98b4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 23 18:22:25 2017 +0000 Removed redundant use of $url_base (it can't have been doing anything anyway as there were no global declarations) web/session/session_cookie.inc | 6 ++---- web/session/session_http.inc | 5 +---- web/session/session_joomla.inc | 6 ++---- web/session/session_php.inc | 5 +---- web/session/session_wordpress.inc | 6 ++---- 5 files changed, 8 insertions(+), 20 deletions(-) commit f32d5f644 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 22 17:32:11 2017 +0000 Removed redundant global declaration web/session/session_http.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0a9439703 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 22 17:30:38 2017 +0000 Restructured - got rid of $user_list_link global web/auth/auth_db.inc | 4 ---- web/session/session_cookie.inc | 6 +++--- web/session/session_http.inc | 8 ++++---- web/session/session_joomla.inc | 6 +++--- web/session/session_php.inc | 6 +++--- web/session/session_remote_user.inc | 11 +++++------ web/session/session_wordpress.inc | 6 +++--- 7 files changed, 21 insertions(+), 26 deletions(-) commit e2997e0d7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 22 17:12:05 2017 +0000 Renamed PrintLogonBox() web/Themes/default/header.inc | 4 ++-- web/session/session_cookie.inc | 2 +- web/session/session_http.inc | 2 +- web/session/session_joomla.inc | 2 +- web/session/session_php.inc | 2 +- web/session/session_remote_user.inc | 2 +- web/session/session_wordpress.inc | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) commit 8be70fa83 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 22 17:06:41 2017 +0000 Restructured web/Themes/default/header.inc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) commit aa26c34f8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 22 15:47:33 2017 +0000 Put the placeholder text in the label title, to help in cases when the text is longer than the input (as it is in some languages). web/functions_logon.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) commit dd28a60d8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 22 15:42:09 2017 +0000 Added session_cookie support for lon by email address web/session/session_cookie.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit d7505c1bc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 22 15:31:14 2017 +0000 Added PostgreSQL support for last change, and also fixed bug in MySQL implementation. web/lib/MRBS/DB_mysql.php | 1 + web/lib/MRBS/DB_pgsql.php | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) commit b42d713ba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 22 15:21:35 2017 +0000 Allowed users just to use the local-part of their email address when logging in, provided the authentication type supports it (only 'db' at the moment). Enabled by a config variable. web/auth/auth_db.inc | 24 +++- web/lib/MRBS/DB_mysql.php | 22 ++++ web/systemdefaults.inc.php | 219 ++++++++++++++++++----------------- 3 files changed, 155 insertions(+), 110 deletions(-) commit 4c30708e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 22 12:04:12 2017 +0000 Catered for the possibility of two users having the same password, with one having as username the email address of the other. web/auth/auth_auth_basic.inc | 8 ++- web/auth/auth_config.inc | 4 +- web/auth/auth_crypt.inc | 7 ++- web/auth/auth_db.inc | 83 +++++++++++++++++++++++--------- web/auth/auth_db_ext.inc | 14 +++--- web/auth/auth_ext.inc | 4 +- web/auth/auth_imap.inc | 4 +- web/auth/auth_imap_php.inc | 14 +++--- web/auth/auth_ldap.inc | 10 ++-- web/auth/auth_nis.inc | 4 +- web/auth/auth_none.inc | 4 +- web/auth/auth_nw.inc | 4 +- web/auth/auth_pop3.inc | 6 +-- web/auth/auth_smtp.inc | 9 ++-- web/auth/auth_wordpress.inc | 15 +++--- web/functions_logon.inc | 3 +- web/session/session_cookie.inc | 9 +--- web/session/session_http.inc | 2 +- web/session/session_php.inc | 22 +++------ 19 files changed, 122 insertions(+), 104 deletions(-) commit 6c66f6a39 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 21 20:10:06 2017 +0000 Moved printLoginForm() out web/auth/auth_wordpress.inc | 10 +++++++ web/session/session_wordpress.inc | 43 ----------------------------- 2 files changed, 10 insertions(+), 43 deletions(-) commit e81bc9e5f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 21 17:16:20 2017 +0000 Added translations. web/functions_logon.inc | 2 +- web/lang/lang.ca | 1 + web/lang/lang.cs | 1 + web/lang/lang.da | 1 + web/lang/lang.de | 1 + web/lang/lang.el | 1 + web/lang/lang.en | 1 - web/lang/lang.es | 1 + web/lang/lang.eu | 1 + web/lang/lang.fi | 1 + web/lang/lang.fr | 1 + web/lang/lang.he | 1 + web/lang/lang.hu | 1 + web/lang/lang.id | 1 + web/lang/lang.it | 1 + web/lang/lang.ja | 1 + web/lang/lang.ko | 1 + web/lang/lang.nb | 1 + web/lang/lang.nl | 2 ++ web/lang/lang.nn | 1 + web/lang/lang.no | 1 + web/lang/lang.pl | 1 + web/lang/lang.pt | 1 + web/lang/lang.pt-br | 1 + web/lang/lang.ru | 1 + web/lang/lang.sk | 1 + web/lang/lang.sl | 1 + web/lang/lang.sv | 1 + web/lang/lang.th | 1 + web/lang/lang.tr | 2 ++ web/lang/lang.zh-cn | 1 + web/lang/lang.zh-tw | 1 + 32 files changed, 33 insertions(+), 2 deletions(-) commit a53231e5a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 21 15:07:59 2017 +0000 Moved printLoginForm() out into a separate file and also made the cookie session scheme accept an email address instead of a username, when possible. web/functions_logon.inc (new) | 53 +++++++++++++++++++++++++++++ web/session/session_cookie.inc | 57 +++++++++----------------------- web/session/session_joomla.inc | 41 +---------------------- web/session/session_php.inc | 52 ++--------------------------- 4 files changed, 71 insertions(+), 132 deletions(-) commit b9cabbac0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 21 14:18:48 2017 +0000 Restructured web/session/session_joomla.inc | 32 +++++++++++++++++------------ web/session/session_wordpress.inc | 25 +++++++++++++--------- 2 files changed, 34 insertions(+), 23 deletions(-) commit 1024fe55b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 21 14:03:54 2017 +0000 Removed redundant global declarations web/session/session_cookie.inc | 4 ++-- web/session/session_php.inc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit 362ef2ba5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 21 11:52:32 2017 +0000 Fixed bug causing getUserName() to return '' instead of null in the case of a user not being logged in when using the cookie session scheme. web/session/session_cookie.inc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) commit d30509882 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 21 11:49:46 2017 +0000 Fixed bug to do with the booking day. Haven't worked out what the symptoms would be. web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 85c484872 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 21 11:45:42 2017 +0000 Restructured and fixed bug web/session/session_cookie.inc | 45 ++++++++++++++++---------------- 1 file changed, 23 insertions(+), 22 deletions(-) commit 653907859 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 21 11:45:05 2017 +0000 Fixed bug - have't worked out what the symptoms would be. web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 39bd4cc49 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 21 10:29:41 2017 +0000 Restructured - made $returl a parameter of printLoginForm() web/session/session_php.inc | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) commit b257fcde0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 21 10:07:44 2017 +0000 Restructured - made the login form action attribute value a parameter web/session/session_php.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 1f3a24402 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 21 09:44:36 2017 +0000 Started restructuring session code web/session/session_cookie.inc | 46 ++++++++++++++--------------- web/session/session_http.inc | 8 ++--- web/session/session_joomla.inc | 44 +++++++++++++-------------- web/session/session_php.inc | 44 +++++++++++++-------------- web/session/session_wordpress.inc | 44 +++++++++++++-------------- 5 files changed, 93 insertions(+), 93 deletions(-) commit 911ba355f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 20 16:29:39 2017 +0000 Added the ability to use an email address for logging in. (Only works at the moment for session=php and auth=db). web/auth/auth_db.inc | 60 +++++++++++++++++++++- web/css/mrbs.css.php | 2 +- web/lang/lang.en | 2 + web/session/session_php.inc | 96 ++++++++++++++++++++++------------- 4 files changed, 122 insertions(+), 38 deletions(-) commit b4899957c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 20 15:09:52 2017 +0000 Made authValidateUser() return a boolean instead of 0/1, for consistency web/auth/auth_auth_basic.inc | 14 +++++------ web/auth/auth_config.inc | 11 ++++----- web/auth/auth_crypt.inc | 14 +++++------ web/auth/auth_db.inc | 1 - web/auth/auth_db_ext.inc | 19 +++++++-------- web/auth/auth_ext.inc | 10 ++++---- web/auth/auth_imap.inc | 12 +++++----- web/auth/auth_ldap.inc | 44 +++++++++++++++++----------------- web/auth/auth_nis.inc | 12 +++++----- web/auth/auth_none.inc | 4 ++-- web/auth/auth_nw.inc | 12 +++++----- web/auth/auth_pop3.inc | 14 +++++------ web/auth/auth_smtp.inc | 10 ++++---- web/auth/auth_wordpress.inc | 5 ++-- 14 files changed, 89 insertions(+), 93 deletions(-) commit f588988b8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 20 14:23:59 2017 +0000 Restructured code web/auth/auth_db.inc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) commit af441f633 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 20 14:00:05 2017 +0000 Created new named branch for development of code allowing users to login with either their email address or username. web/auth/auth_db.inc | 122 +++++++++++++++++++++++++++-------------- 1 file changed, 80 insertions(+), 42 deletions(-) commit cf1255dfb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 15 16:29:19 2017 +0000 Tidied up escaping for consistency (makes no difference to the result). web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6f0d9d821 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 15 14:34:52 2017 +0000 Fixed a namespace problem. See SF Support Requests #1143. web/auth/auth_ldap.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit eaa34e010 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Feb 13 13:56:46 2017 +0000 Tweaked $admin_form_label_width in the CSS, to stop the new label in "Add Room" from wrapping in the English translation at least. web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f9f98d1d8 Merge: 9e26cf3a1 079aaa6d3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 13 13:25:12 2017 +0000 Merge commit 079aaa6d3 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Feb 13 13:22:34 2017 +0000 Added ability to specify the "Room admin email" on creating a room. See SF Support Requests [support-requests:#1137]. web/add.php | 3 ++- web/admin.php | 5 +++++ web/mrbs_sql.inc | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) commit 9e26cf3a1 Merge: f697c15d1 3762d9fdb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 13 13:22:18 2017 +0000 Merge commit 3762d9fdb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 13 13:19:51 2017 +0000 Added an unset() for $booking_types to make it clearer how they work - see SF Bugs #374 web/systemdefaults.inc.php | 1 + 1 file changed, 1 insertion(+) commit f697c15d1 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Feb 12 12:37:42 2017 +0000 Added extra .hginore rules for IDE files. .hgignore | 4 ++++ 1 file changed, 4 insertions(+) commit 4553081f9 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Feb 12 11:42:27 2017 +0000 Removed all occurrences of $Id$ in MRBS code, it doesn't work with Mercurial source control. AUTHENTICATION | 4 +--- README | 2 -- README.nwauth | 2 -- UPGRADE | 2 -- auth_ldap.pl | 2 -- auth_ldapsearch.pl | 2 -- badpw.pl | 2 -- convert_db_to_utf8.php | 2 -- crypt_passwd.pl | 2 -- grant.pg.sql | 1 - help_report.html | 2 -- purge.my.sql | 1 - purge.pg.sql | 1 - tables.my.sql | 2 -- tables.pg.sql | 1 - upgrade.my.sql | 1 - upgrade2.my.sql | 2 -- upgrade2.pg.sql | 2 -- upgrade3.my.sql | 2 -- web/Themes/classic126/styling.inc | 2 -- web/Themes/default/footer.inc | 2 -- web/Themes/default/header.inc | 2 -- web/Themes/default/styling.inc | 2 -- web/add.php | 2 -- web/admin.php | 2 -- web/approve_entry_handler.php | 2 -- web/areadefaults.inc.php | 2 -- web/auth/auth_auth_basic.inc | 3 +-- web/auth/auth_config.inc | 2 -- web/auth/auth_crypt.inc | 3 +-- web/auth/auth_db.inc | 2 -- web/auth/auth_ext.inc | 3 +-- web/auth/auth_imap.inc | 3 +-- web/auth/auth_imap_php.inc | 3 +-- web/auth/auth_ldap.inc | 2 -- web/auth/auth_nis.inc | 3 +-- web/auth/auth_none.inc | 3 +-- web/auth/auth_nw.inc | 2 -- web/auth/auth_pop3.inc | 3 +-- web/auth/auth_smtp.inc | 3 +-- web/check_slot_ajax.php | 2 -- web/css/mrbs-ie-rtl.css | 2 -- web/css/mrbs-ie.css | 2 -- web/css/mrbs-ie8.css | 2 -- web/css/mrbs-ielte6.css | 2 -- web/css/mrbs-ielte7.css.php | 2 -- web/css/mrbs-ielte8.css | 1 - web/css/mrbs-mail.css | 1 - web/css/mrbs-print.css.php | 2 -- web/css/mrbs-rtl.css.php | 2 -- web/css/mrbs.css.php | 2 -- web/day.php | 1 - web/dbsys.inc | 2 -- web/defaultincludes.inc | 2 -- web/del.php | 2 -- web/del_entry.php | 2 -- web/del_entry_ajax.php | 2 -- web/edit_area_room.php | 2 -- web/edit_entry.php | 2 -- web/edit_entry_handler.php | 2 -- web/edit_users.php | 5 ----- web/functions.inc | 2 -- web/functions_ical.inc | 2 -- web/functions_mail.inc | 4 ---- web/functions_table.inc | 2 -- web/functions_view.inc | 2 -- web/grab_globals.inc.php | 4 ---- web/help.php | 2 -- web/import.php | 2 -- web/index.php | 2 -- web/internalconfig.inc.php | 2 -- web/jquery/datatables/js/plugins.js | 1 - web/js.inc | 2 -- web/js/admin.js.php | 2 -- web/js/cell_click.js.php | 2 -- web/js/datatables.js.php | 2 -- web/js/datepicker.js.php | 2 -- web/js/edit_area_room.js.php | 2 -- web/js/edit_entry.js.php | 2 -- web/js/edit_users.js.php | 2 -- web/js/functions.js.php | 2 -- web/js/general.js.php | 2 -- web/js/multiple.js.php | 2 -- web/js/pending.js.php | 2 -- web/js/refresh.js.php | 2 -- web/js/report.js.php | 2 -- web/js/resizable.js.php | 2 -- web/js/search.js.php | 2 -- web/lang/lang.ca | 4 +--- web/lang/lang.cs | 1 - web/lang/lang.da | 2 -- web/lang/lang.de | 2 -- web/lang/lang.el | 2 -- web/lang/lang.en | 1 - web/lang/lang.es | 3 +-- web/lang/lang.eu | 2 -- web/lang/lang.fi | 2 -- web/lang/lang.fr | 1 - web/lang/lang.hu | 1 - web/lang/lang.id | 1 - web/lang/lang.it | 2 -- web/lang/lang.nb | 1 - web/lang/lang.nl | 2 -- web/lang/lang.nn | 1 - web/lang/lang.no | 1 - web/lang/lang.pl | 1 - web/lang/lang.pt | 2 -- web/lang/lang.pt-br | 2 -- web/lang/lang.ru | 1 - web/lang/lang.sl | 2 -- web/lang/lang.sr-rs-latin | 1 - web/lang/lang.sv | 1 - web/lang/lang.th | 1 - web/lang/lang.tr | 2 -- web/lang/lang.zh-tw | 2 -- web/language.inc | 2 -- web/lib/Locale.php | 2 -- web/lib/autoload.inc | 2 -- web/mincals.inc | 2 -- web/month.php | 2 -- web/mrbs_auth.inc | 2 -- web/mrbs_sql.inc | 2 -- web/pending.php | 2 -- web/record_activity_ajax.php | 2 -- web/report.php | 2 -- web/search.php | 2 -- web/session/session_cookie.inc | 6 ------ web/session/session_host.inc | 3 +-- web/session/session_http.inc | 6 ------ web/session/session_ip.inc | 3 +-- web/session/session_nt.inc | 3 +-- web/session/session_omni.inc | 3 +-- web/session/session_php.inc | 7 ------- web/session/session_remote_user.inc | 6 ------ web/site_faq/site_faq.html | 1 - web/site_faq/site_faq_cs.html | 1 - web/site_faq/site_faq_de.html | 1 - web/site_faq/site_faq_es.html | 1 - web/site_faq/site_faq_fr.html | 1 - web/site_faq/site_faq_it.html | 1 - web/site_faq/site_faq_nl.html | 1 - web/site_faq/site_faq_sv.html | 1 - web/standard_vars.inc.php | 2 -- web/style.inc | 2 -- web/systemdefaults.inc.php | 2 -- web/theme.inc | 2 -- web/trailer.inc | 2 -- web/upgrade.inc | 2 -- web/upgrade/1/mysql.sql | 1 - web/upgrade/1/pgsql.sql | 1 - web/upgrade/10/mysql.sql | 1 - web/upgrade/10/pgsql.sql | 1 - web/upgrade/11/mysql.sql | 1 - web/upgrade/11/pgsql.sql | 1 - web/upgrade/12/mysql.sql | 1 - web/upgrade/12/pgsql.sql | 1 - web/upgrade/13/mysql.sql | 4 +--- web/upgrade/13/pgsql.sql | 1 - web/upgrade/13/post.inc | 2 -- web/upgrade/14/mysql.sql | 2 -- web/upgrade/14/pgsql.sql | 1 - web/upgrade/15/mysql.sql | 2 +- web/upgrade/15/post.inc | 2 -- web/upgrade/16/mysql.sql | 1 - web/upgrade/16/pgsql.sql | 1 - web/upgrade/16/post.inc | 2 -- web/upgrade/17/mysql.sql | 4 +--- web/upgrade/17/pgsql.sql | 1 - web/upgrade/17/post.inc | 2 -- web/upgrade/18/mysql.sql | 2 -- web/upgrade/18/pgsql.sql | 2 -- web/upgrade/19/mysql.sql | 2 -- web/upgrade/19/pgsql.sql | 2 -- web/upgrade/2/mysql.sql | 4 +--- web/upgrade/2/pgsql.sql | 4 +--- web/upgrade/2/post.inc | 2 -- web/upgrade/20/mysql.sql | 2 -- web/upgrade/20/pgsql.sql | 1 - web/upgrade/21/mysql.sql | 2 +- web/upgrade/21/post.inc | 2 -- web/upgrade/22/mysql.sql | 2 -- web/upgrade/22/pgsql.sql | 2 -- web/upgrade/23/mysql.sql | 2 -- web/upgrade/23/pgsql.sql | 2 -- web/upgrade/24/mysql.sql | 2 -- web/upgrade/24/pgsql.sql | 2 -- web/upgrade/24/post.inc | 2 -- web/upgrade/25/mysql.sql | 2 -- web/upgrade/25/pgsql.sql | 2 -- web/upgrade/26/mysql.sql | 2 +- web/upgrade/26/post.inc | 1 - web/upgrade/27/mysql.sql | 2 -- web/upgrade/27/pgsql.sql | 2 -- web/upgrade/28/mysql.sql | 2 -- web/upgrade/28/pgsql.sql | 2 -- web/upgrade/29/mysql.sql | 2 -- web/upgrade/29/pgsql.sql | 2 -- web/upgrade/3/mysql.sql | 1 - web/upgrade/3/pgsql.sql | 1 - web/upgrade/30/mysql.sql | 2 -- web/upgrade/30/pgsql.sql | 2 -- web/upgrade/31/mysql.sql | 2 -- web/upgrade/31/pgsql.sql | 2 -- web/upgrade/32/mysql.sql | 2 -- web/upgrade/32/pgsql.sql | 2 -- web/upgrade/32/post.inc | 2 -- web/upgrade/33/mysql.sql | 2 -- web/upgrade/34/mysql.sql | 2 -- web/upgrade/34/pgsql.sql | 2 -- web/upgrade/34/post.inc | 2 -- web/upgrade/35/mysql.sql | 2 -- web/upgrade/36/mysql.sql | 2 -- web/upgrade/36/pgsql.sql | 2 -- web/upgrade/37/mysql.sql | 2 -- web/upgrade/38/mysql.sql | 2 -- web/upgrade/38/pgsql.sql | 2 -- web/upgrade/39/mysql.sql | 2 -- web/upgrade/4/mysql.sql | 4 +--- web/upgrade/4/pgsql.sql | 4 +--- web/upgrade/4/post.inc | 2 -- web/upgrade/40/mysql.sql | 2 -- web/upgrade/40/pgsql.sql | 2 -- web/upgrade/41/mysql.sql | 2 -- web/upgrade/41/pgsql.sql | 2 -- web/upgrade/42/mysql.sql | 2 -- web/upgrade/42/pgsql.sql | 2 -- web/upgrade/43/mysql.sql | 2 -- web/upgrade/43/pgsql.sql | 2 -- web/upgrade/43/post.inc | 2 -- web/upgrade/44/mysql.sql | 2 -- web/upgrade/44/pgsql.sql | 2 -- web/upgrade/45/mysql.sql | 2 -- web/upgrade/45/pgsql.sql | 2 -- web/upgrade/47/post.inc | 2 -- web/upgrade/49/mysql.sql | 2 -- web/upgrade/49/pgsql.sql | 2 -- web/upgrade/5/mysql.sql | 2 +- web/upgrade/5/post.inc | 2 -- web/upgrade/6/mysql.sql | 2 +- web/upgrade/6/post.inc | 2 -- web/upgrade/7/mysql.sql | 2 +- web/upgrade/7/post.inc | 2 -- web/upgrade/8/mysql.sql | 4 +--- web/upgrade/8/pgsql.sql | 2 -- web/upgrade/8/post.inc | 2 -- web/upgrade/9/mysql.sql | 1 - web/upgrade/9/pgsql.sql | 2 -- web/upgrade/local/1/mysql.sql | 2 -- web/upgrade/local/1/pgsql.sql | 2 -- web/version.inc | 2 -- web/view_entry.php | 2 -- web/week.php | 2 -- 252 files changed, 29 insertions(+), 483 deletions(-) commit c1c4cd9ed Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Feb 11 16:37:28 2017 +0000 Added tag mrbs-1_6_0 for changeset 04c083c470a1 commit a8866c2d9 (tag: mrbs-1_6_0) Merge: eb30a8dc4 5af5b868e Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Feb 11 16:36:52 2017 +0000 Merged changes from default branch commit eb30a8dc4 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Feb 11 16:35:48 2017 +0000 Added tag mrbs-1_6_0 for changeset e71136a26776 commit 8fae23090 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Feb 11 16:35:08 2017 +0000 Fixed permissions on NEWS NEWS (mode -x) | 0 1 file changed, 0 insertions(+), 0 deletions(-) commit 464d06a91 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Feb 11 16:34:15 2017 +0000 Updated ChangeLog and NEWS for 1.6.0 release ChangeLog | 2217 +++++++++++++++++++++++++++++++++++++++++++++- NEWS (mode +x) | 152 ++++ 2 files changed, 2368 insertions(+), 1 deletion(-) commit e8917a14f Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Feb 11 16:10:57 2017 +0000 Added MRBS 1.6.0 upgrade step to UPGRADE. UPGRADE | 11 +++++++++++ 1 file changed, 11 insertions(+) commit 5917dbc61 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Feb 11 15:59:12 2017 +0000 Updated version number in preparation for release web/version_num.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5af5b868e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 2 12:55:24 2017 +0000 Fixed bug introduced in recent commit web/functions.inc | 5 +++++ 1 file changed, 5 insertions(+) commit cf08fd3da Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 31 17:23:17 2017 +0000 Restructured code web/edit_area_room.php | 95 ++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 63 deletions(-) commit 13bed0416 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 31 16:51:23 2017 +0000 Restructured code web/css/mrbs.css.php | 6 +++- web/import.php | 69 ++++++++++++++++++++++-------------------- 2 files changed, 41 insertions(+), 34 deletions(-) commit 8b0241a6d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 31 15:52:10 2017 +0000 Added the ability to specify a default room if no LOCATION property is given when importing a VEVENT web/functions.inc | 71 ++++++++++++++++++++++++++++++++++++--------- web/import.php | 43 +++++++++++++++++++++++++-- web/lang/lang.en | 2 ++ web/mrbs_sql.inc | 30 +++++++++++++++++++ 4 files changed, 130 insertions(+), 16 deletions(-) commit 4d8bdf9c8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 30 17:24:45 2017 +0000 Added the ability to recocgnise type information in imported .ics files using the X-MRBS-TYPE property. web/import.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit 35e3baa6b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 30 17:04:40 2017 +0000 Added the booking type when exporting as a .ics file web/functions_ical.inc | 1 + 1 file changed, 1 insertion(+) commit 8484a7438 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 30 15:59:22 2017 +0000 Fixed bug preventing an event whose room name includes the area-room separator from being imported. web/import.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 7ec772bb5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 20 20:48:38 2017 +0000 Fixed bug that allowed the type colour to be shown even when the type was private. See SF bugs #372. web/Themes/classic126/styling.inc | 1 + web/Themes/default/styling.inc | 1 + web/css/mrbs.css.php | 34 +++++++++++++++++++----- web/functions_table.inc | 8 ++++-- web/month.php | 41 ++++++++++++----------------- 5 files changed, 53 insertions(+), 32 deletions(-) commit 7582713c3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 20 18:56:07 2017 +0000 Fixed bug causing bookings to be shown as private when they weren't. web/month.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 4b7d3fc88 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 20 18:03:03 2017 +0000 Restructured code to use new function get_end_last_slot(). web/month.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 66d198669 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jan 18 23:38:14 2017 +0000 Added a new option to disable "Opportunistic TLS" in PHPMailer. web/functions_mail.inc | 4 ++++ web/systemdefaults.inc.php | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) commit 1d8900d2c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 18 10:04:26 2017 +0000 Made sure that the default duration for new bookings doesn't exceed the maximum duration web/edit_entry.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) commit a8e071cc2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 17 10:46:36 2017 +0000 Fixed problem when the default duration takes a booking beyond the start day and multiday bookings are not allowed. web/edit_entry.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) commit 1b996dcde Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 17 10:41:52 2017 +0000 Fixed bug introduced in recent change. See SF Support Requests #1116. web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3e7ec8d49 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 10 15:44:55 2017 +0000 Fixed problem with default_duration not going past the end of a booking day. See SF Support Requests #116 web/edit_entry.php | 3 +- web/functions.inc | 69 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 2 deletions(-) commit a1eb86972 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 7 10:50:15 2017 +0000 Limited use of the error suppression operator when sending mail to just those cases where it is necessary, and even then MRBS will trigger an E_USER_NOTICE error. web/functions_mail.inc | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) commit 239a129cd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 1 08:07:19 2017 +0000 Fixed bug causing a fatal error in SMTP debug code web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7cbfceb39 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 29 16:33:33 2016 +0000 Upgraded PHPMailer to latest version (5.2.21) web/functions_mail.inc | 6 +- web/lib/PHPMailer/VERSION | 2 +- web/lib/PHPMailer/class.phpmailer.php | 695 ++++++++++++----- web/lib/PHPMailer/class.phpmaileroauth.php | 18 +- .../PHPMailer/class.phpmaileroauthgoogle.php | 9 +- web/lib/PHPMailer/class.pop3.php | 68 +- web/lib/PHPMailer/class.smtp.php | 141 +++- web/lib/PHPMailer/get_oauth_token.php | 226 ++++-- .../PHPMailer/language/phpmailer.lang-ar.php | 2 +- .../PHPMailer/language/phpmailer.lang-bg.php | 2 +- .../PHPMailer/language/phpmailer.lang-ca.php | 2 +- .../PHPMailer/language/phpmailer.lang-ch.php | 2 +- .../language/phpmailer.lang-cs.php (new) | 25 + .../language/phpmailer.lang-da.php (new) | 26 + .../PHPMailer/language/phpmailer.lang-de.php | 26 +- .../PHPMailer/language/phpmailer.lang-el.php | 2 +- .../PHPMailer/language/phpmailer.lang-es.php | 2 +- .../PHPMailer/language/phpmailer.lang-fi.php | 2 +- .../PHPMailer/language/phpmailer.lang-fo.php | 2 +- .../PHPMailer/language/phpmailer.lang-gl.php | 1 - .../PHPMailer/language/phpmailer.lang-he.php | 3 +- .../PHPMailer/language/phpmailer.lang-hr.php | 2 +- .../PHPMailer/language/phpmailer.lang-ja.php | 2 +- .../PHPMailer/language/phpmailer.lang-ka.php | 2 +- .../PHPMailer/language/phpmailer.lang-ko.php | 2 +- .../PHPMailer/language/phpmailer.lang-lt.php | 2 +- .../PHPMailer/language/phpmailer.lang-lv.php | 2 +- .../PHPMailer/language/phpmailer.lang-ms.php | 2 +- .../language/phpmailer.lang-nb.php (new) | 25 + .../PHPMailer/language/phpmailer.lang-nl.php | 2 +- .../PHPMailer/language/phpmailer.lang-pl.php | 2 +- .../PHPMailer/language/phpmailer.lang-pt.php | 2 +- .../language/phpmailer.lang-pt_br.php (new) | 28 + .../PHPMailer/language/phpmailer.lang-ro.php | 34 +- .../PHPMailer/language/phpmailer.lang-ru.php | 9 +- .../PHPMailer/language/phpmailer.lang-sl.php | 4 +- .../PHPMailer/language/phpmailer.lang-sr.php | 2 +- .../language/phpmailer.lang-sv.php (new) | 26 + .../PHPMailer/language/phpmailer.lang-vi.php | 2 +- .../language/phpmailer.lang-zh_cn.php | 2 +- 40 files changed, 1020 insertions(+), 394 deletions(-) commit 9e4813ec2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 29 16:31:16 2016 +0000 Fixed the custom error handler so that it doesn't report errors if the error suppression operator has been used. web/functions_error.inc | 8 ++++++++ 1 file changed, 8 insertions(+) commit bec065bbd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 13 10:39:37 2016 +0000 Moved the SQL query of the entry table until after the authorisation check for the page has been done, to avoid unnecessary database queries. web/day.php | 13 +++++++------ web/month.php | 13 +++++++------ web/week.php | 13 +++++++------ 3 files changed, 21 insertions(+), 18 deletions(-) commit e630836ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 9 17:08:46 2016 +0000 Improved error reporting when $mail_settings['from'] not set. web/functions_mail.inc | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) commit adda1c1ac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 9 16:26:45 2016 +0000 Got rid of the 'DS' (DIRECTORY_SEPARATOR) constant as it is unnecessary and causes clashes with Joomla. web/auth/cms/joomla.inc | 8 ++++---- web/internalconfig.inc.php | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) commit c61d4f18e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 5 10:10:46 2016 +0000 Simplified HTML web/css/mrbs.css.php | 2 +- web/mincals.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit f6ddc3c06 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 5 10:05:01 2016 +0000 Simplified CSS web/Themes/default/header.inc | 4 ++-- web/css/mrbs-print.css.php | 2 +- web/css/mrbs-rtl.css.php | 4 ++-- web/css/mrbs.css.php | 32 ++++++++++++++++---------------- 4 files changed, 21 insertions(+), 21 deletions(-) commit 08c61df83 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 5 09:58:05 2016 +0000 Simplified HTML web/css/mrbs-print.css.php | 2 +- web/day.php | 2 +- web/month.php | 2 +- web/week.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) commit b5b161f3a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 5 09:43:05 2016 +0000 Fixed CSS for Goto nav links for RTL languages web/css/mrbs-rtl.css.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) commit 9f80d4e9e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 5 08:47:54 2016 +0000 Simplified HTML for the Go to Day/Week/Month links. web/css/mrbs.css.php | 7 ++++--- web/day.php | 20 +++++++++----------- web/month.php | 25 ++++++++++--------------- web/week.php | 23 +++++++++-------------- 4 files changed, 32 insertions(+), 43 deletions(-) commit c303e8ec3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 4 18:16:32 2016 +0000 Removed whitespace that shouldn't be there web/day.php | 12 +++--------- web/month.php | 12 +++--------- web/week.php | 12 +++--------- 3 files changed, 9 insertions(+), 27 deletions(-) commit 4bcf3b0ca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 4 18:01:20 2016 +0000 Simplify CSS web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c045b1714 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 4 17:58:41 2016 +0000 Simplified CSS web/css/mrbs.css.php | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) commit 2166fd0ea Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 4 17:50:38 2016 +0000 Moved << and >> navigation symbols out of HTML and into CSS. web/css/mrbs.css.php | 8 ++++++++ web/day.php | 10 +++++++--- web/month.php | 18 +++++++++--------- web/week.php | 12 ++++++------ 4 files changed, 30 insertions(+), 18 deletions(-) commit dbe8934ae Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 4 16:55:54 2016 +0000 Removed unnecessary <div> web/day.php | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) commit b1ec9a161 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 4 16:50:52 2016 +0000 Reverted test code accidentally included in previous commit. web/day.php | 2 -- 1 file changed, 2 deletions(-) commit 23de6c34b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 4 16:48:44 2016 +0000 Fixed height of header when debugging with display_errors set to '1'. web/Themes/default/header.inc | 8 +++++++- web/css/mrbs.css.php | 6 +++++- web/day.php | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) commit 4df5fb218 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 4 10:41:03 2016 +0000 Added HTML5 Shiv version 3.7.3 so that HTML5 elelements such as <header> can be styled in IE8 and below. web/js.inc | 20 +- web/js/html5shiv.js (new) | 326 ++++++++++++++++++++++++++++++++ web/js/html5shiv.min.js (new) | 4 + 3 files changed, 349 insertions(+), 1 deletion(-) commit 95b7ec029 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 30 18:49:45 2016 +0000 Minor tweak to code layout web/edit_area_room.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3633f6c2f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 30 18:36:21 2016 +0000 Fixed fatal error when exporting an entry from the view_entry page web/view_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cd0ec5013 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 28 18:04:38 2016 +0000 Fixed problem with layout of header web/css/mrbs.css.php | 2 ++ 1 file changed, 2 insertions(+) commit 704ba7e17 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 16 08:13:26 2016 +0000 Fixed bug causing fatal error when trying to delete a series. web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit adfeb806f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 15 16:10:30 2016 +0000 Fixed comment. web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0ff129f72 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 12 07:14:59 2016 +0000 Simplified the CSS and got rid of the occasional 1px gap in the month view cells. All browsers nowadays (IE8+, Edge, Firefox, Opera, Chrome and Safari) seem to be able to handle sub-pixel rounding sensibly. web/css/mrbs.css.php | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) commit 178671d09 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 11 17:01:36 2016 +0000 Replaced '...' with the ellipsis HTML entity. web/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b7c0b63db Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 11 16:25:35 2016 +0000 Fixed problem with (a) right border of bookings not appearing when using the 'both' option for monthly listings and (b) listings wrapping when using 'slot' or 'description'. web/css/mrbs-print.css.php | 4 ++++ 1 file changed, 4 insertions(+) commit de1f53ec5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 11 16:15:18 2016 +0000 Moved the width for monthly bookings out from a style attribute to the CSS file web/css/mrbs.css.php | 37 +++++++++++++++++++++++++++++++++---- web/month.php | 6 +++--- 2 files changed, 36 insertions(+), 7 deletions(-) commit 96f1d857b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 11 15:34:46 2016 +0000 Changed the behaviour of the printed month view, getting rid of horizontal and vertical scrollbars. Instead, horizontal overflow is hidden and the table cell expands to accommodate vertical overflow. web/css/mrbs-print.css.php | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) commit b87fa0765 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 10 12:56:30 2016 +0000 Corrected comment web/css/mrbs-print.css.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit cb7a3d5d9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 10 12:46:14 2016 +0000 Fixed bug that gave a double border on printing. See SF Support Requests #1078. Also fixed another bug at the same time - there was no border around bookings in the month view on printing. web/css/mrbs-print.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b526fac3c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 9 12:07:21 2016 +0000 Reverted the previous change, because although it removes the double border it also removes the booking description web/css/mrbs-print.css.php | 5 ----- 1 file changed, 5 deletions(-) commit 600bcaa55 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 9 11:27:54 2016 +0000 Fixed problem of double border on some cells when printing the day and week views. See SF Support Requests #1078. web/css/mrbs-print.css.php | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) commit 94807d334 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 5 18:44:03 2016 +0000 Simplified code web/internalconfig.inc.php | 23 ++++------------------- web/report.php | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 33 deletions(-) commit d282ab988 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 5 18:15:48 2016 +0000 Tidied up code web/report.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit ac70c41f1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 5 18:02:42 2016 +0000 Changed report form so that for custom checkbox fields you can now select checked, unchecked or both. See SF Support Requests #1087 web/internalconfig.inc.php | 5 +++++ web/lang/lang.en | 2 ++ web/report.php | 13 +++++++++---- 3 files changed, 16 insertions(+), 4 deletions(-) commit 8ca2fa27b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 4 14:14:20 2016 +0000 Made the default setting for the "Do not send email" checkbox a configuration variable web/edit_entry.php | 4 +--- web/systemdefaults.inc.php | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) commit f9b19956a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 29 09:50:35 2016 +0100 Simplified code and added type hinting web/auth/auth_wordpress.inc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) commit 1a27bf3b8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 29 09:02:35 2016 +0100 Simplified code web/auth/auth_joomla.inc | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) commit 1f7e826a6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 28 12:41:10 2016 +0100 Added some error handling web/auth/cms/joomla.inc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) commit f6c5db678 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 28 11:38:44 2016 +0100 Moved joomla.inc and wordpress.inc out of main directory web/auth/auth_joomla.inc | 2 +- web/auth/auth_wordpress.inc | 2 +- web/{ => auth/cms}/joomla.inc | 0 web/{ => auth/cms}/wordpress.inc | 0 web/session/session_joomla.inc | 2 +- web/session/session_wordpress.inc | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) commit fdb4126c0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 28 11:29:39 2016 +0100 Updated for joomla authentication scheme AUTHENTICATION | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) commit 04c7c9450 Merge: 880767ec6 c665b0ff0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 28 11:14:23 2016 +0100 Merge with joomla commit 880767ec6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 28 11:12:56 2016 +0100 Updated details of WordPress authentication AUTHENTICATION | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) commit b845af710 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 28 11:11:07 2016 +0100 Added the config setting $auth['wordpress']['user_roles'] so it is possible to define which WordPress users can use MRBS, instead of just granting all logged in users access to MRBS. web/auth/auth_wordpress.inc | 48 +++++++++++++++++++++++++++-------- web/systemdefaults.inc.php | 18 +++++++++---- 2 files changed, 50 insertions(+), 16 deletions(-) commit 908ad877f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 28 10:41:30 2016 +0100 Simplified code web/auth/auth_wordpress.inc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) commit 2f8826d95 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 27 21:15:14 2016 +0100 Fixed problem of duplicate define() in WordPress authentication web/auth/auth_wordpress.inc | 3 +-- web/session/session_wordpress.inc | 3 +-- web/wordpress.inc (new) | 4 ++++ 3 files changed, 6 insertions(+), 4 deletions(-) commit c665b0ff0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 27 16:49:49 2016 +0100 First attempt at Joomla! authentication web/auth/auth_joomla.inc (new) | 75 +++++++++ web/internalconfig.inc.php | 7 +- web/joomla.inc (new) | 10 ++ web/lib/MRBS/JFactory.php (new) | 57 +++++++ web/lib/MRBS/JUser.php (new) | 26 +++ web/session/session_joomla.inc (new) | 210 +++++++++++++++++++++++++ web/systemdefaults.inc.php | 23 ++- 7 files changed, 403 insertions(+), 5 deletions(-) commit 0e9eb3e7f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 27 10:01:41 2016 +0100 Opened a new named branch for the development of Joomla authentication, based on the MRBS Joomla bridge by permission of Ocean. commit 12c65d9ae Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 22 10:28:53 2016 +0100 Set the MRBS server variables to null if they don't exist in order to avoid undefined variable errors later web/grab_globals.inc.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) commit 13d9d374b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 22 10:23:53 2016 +0100 Tidied up a couple more instances of HTTP_REFERER parsing web/js/edit_users.js.php | 5 +---- web/js/search.js.php | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) commit 6d3100555 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 22 09:41:10 2016 +0100 Fixed undefined offset notice error when there is no query string web/js/report.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 85332ee48 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 17:14:56 2016 +0100 Added some earlier checking for $timezone web/functions.inc | 2 ++ web/internalconfig.inc.php | 6 ++++++ 2 files changed, 8 insertions(+) commit 4ee3a8ff8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 16:35:24 2016 +0100 Fixed problem with simple header not being output in some circumstances. web/Themes/default/header.inc | 11 ++++++++- web/functions.inc | 40 ++++++++++++++++----------------- web/functions_error.inc | 10 ++++----- 3 files changed, 34 insertions(+), 27 deletions(-) commit a3f6d5d17 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 15:45:01 2016 +0100 Improved formatting of error messages web/functions_error.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4f02b64a3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 15:20:31 2016 +0100 Ensured that the timezone is set before trying to output an error message, otherwise further error messages are produced. web/functions_error.inc | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit 28d7713f9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 18 17:20:51 2016 +0100 Fixed a performance problem when clicking on an empty cell in the week view when using hidden days on a large table. web/js/resizable.js.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit e9b82bfec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 18 13:52:43 2016 +0100 Fixed bug that resulted in possibly wrong values for enable_periods and reminders_enabled being shown on the Edit Area form. web/edit_area_room.php | 2 +- web/functions.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit bd2009c18 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 17 09:26:25 2016 +0100 Removed redundant language tokens web/lang/lang.ca | 3 --- web/lang/lang.cs | 3 --- web/lang/lang.da | 3 --- web/lang/lang.de | 3 --- web/lang/lang.el | 3 --- web/lang/lang.en | 3 --- web/lang/lang.es | 3 --- web/lang/lang.eu | 3 --- web/lang/lang.fi | 3 --- web/lang/lang.fr | 3 --- web/lang/lang.he | 3 --- web/lang/lang.hu | 3 --- web/lang/lang.id | 3 --- web/lang/lang.it | 3 --- web/lang/lang.ja | 3 --- web/lang/lang.ko | 3 --- web/lang/lang.nb | 3 --- web/lang/lang.nl | 3 --- web/lang/lang.nn | 3 --- web/lang/lang.no | 3 --- web/lang/lang.pl | 3 --- web/lang/lang.pt | 3 --- web/lang/lang.pt-br | 3 --- web/lang/lang.ru | 3 --- web/lang/lang.sk | 3 --- web/lang/lang.sl | 3 --- web/lang/lang.sr-rs-latin | 3 --- web/lang/lang.sv | 3 --- web/lang/lang.th | 5 +---- web/lang/lang.tr | 2 -- web/lang/lang.zh-cn | 3 --- web/lang/lang.zh-tw | 3 --- 32 files changed, 1 insertion(+), 96 deletions(-) commit f04ec31a9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 17 09:15:36 2016 +0100 Removed redundant language tokens web/lang/lang.ca | 2 -- web/lang/lang.cs | 2 -- web/lang/lang.da | 2 -- web/lang/lang.de | 2 -- web/lang/lang.el | 2 -- web/lang/lang.en | 2 -- web/lang/lang.es | 2 -- web/lang/lang.eu | 2 -- web/lang/lang.fi | 2 -- web/lang/lang.fr | 2 -- web/lang/lang.he | 2 -- web/lang/lang.hu | 2 -- web/lang/lang.id | 2 -- web/lang/lang.it | 2 -- web/lang/lang.ja | 2 -- web/lang/lang.ko | 2 -- web/lang/lang.nb | 2 -- web/lang/lang.nl | 2 -- web/lang/lang.nn | 2 -- web/lang/lang.no | 2 -- web/lang/lang.pl | 2 -- web/lang/lang.pt | 2 -- web/lang/lang.pt-br | 2 -- web/lang/lang.ru | 2 -- web/lang/lang.sk | 2 -- web/lang/lang.sl | 2 -- web/lang/lang.sr-rs-latin | 2 -- web/lang/lang.sv | 2 -- web/lang/lang.th | 2 -- web/lang/lang.tr | 2 -- web/lang/lang.zh-cn | 2 -- web/lang/lang.zh-tw | 2 -- 32 files changed, 64 deletions(-) commit 1d82c7a51 Merge: 0de812acf 4b775754d Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Oct 12 21:59:47 2016 +0100 Merge commit 4b775754d Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Oct 12 21:56:55 2016 +0100 Removed unnecessary uses of $HTTP_SESSION_VARS and $HTTP_COOKIE_VARS. checklang.php | 6 ------ web/session/session_cookie.inc | 8 -------- web/session/session_php.inc | 31 +++++-------------------------- 3 files changed, 5 insertions(+), 40 deletions(-) commit 0de812acf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 12 16:14:11 2016 +0100 Turned email addresses in the users list into links. web/edit_users.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 68b873636 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 12 09:11:27 2016 +0100 Added some error checking to DB_pgsql::table_exists(). web/lib/MRBS/DB_pgsql.php | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) commit 1f6613b5a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 11 17:05:24 2016 +0100 Fixed bug in DB_pgsql::table_exists() which meant that it always returned true and thus broke the upgrade process, for example. web/lib/MRBS/DB_pgsql.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 46a4ddc1d Merge: 496313cdf b6857994b Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Oct 8 20:52:16 2016 +0100 Merged the 'pdo' branch, which changes MRBS to utilise PHP's PDO mechanism and use a DB class to perform all SQL. SQL statements are now parameterised, and not just escaped in MRBS code. commit b6857994b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 7 07:43:32 2016 +0100 Changed some 'require's into 'require_once's. web/upgrade/32/post.inc | 2 +- web/upgrade/34/post.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit f3b536b29 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 7 06:43:23 2016 +0100 Added comments web/functions.inc | 6 ++++++ 1 file changed, 6 insertions(+) commit 438900c57 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 6 23:13:01 2016 +0100 Added escaping of HTML output web/functions_error.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 1b5f79c41 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 6 22:56:08 2016 +0100 Fixed duplicate function declaration web/upgrade/24/post.inc | 34 ++++++++-------------------------- web/upgrade/47/post.inc | 37 ++++++++----------------------------- 2 files changed, 16 insertions(+), 55 deletions(-) commit 1dba1a493 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 6 17:39:22 2016 +0100 Fixed duplicate function declaration web/functions.inc | 14 ++++++++++++++ web/upgrade/24/post.inc | 12 ------------ web/upgrade/47/post.inc | 13 +------------ 3 files changed, 15 insertions(+), 24 deletions(-) commit 06adc4ec2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 6 17:26:00 2016 +0100 Made get_default_room() independent of database schema web/functions.inc | 53 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 13 deletions(-) commit 97b69cfd0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 6 17:07:28 2016 +0100 Further fix to get_area_settings() web/functions.inc | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) commit a208da3e7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 6 16:59:54 2016 +0100 Made get_area_settings work with all database schema versions web/Themes/default/header.inc | 7 +--- web/functions.inc | 72 ++++++++++++++++++++++++--------- 2 files changed, 56 insertions(+), 23 deletions(-) commit 8987f1a2d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 6 16:19:20 2016 +0100 Fixed regression introduced in changeset b212448e0d86 web/upgrade/6/post.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 088ce6230 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 6 16:08:47 2016 +0100 Fixed error in upgrade process web/Themes/default/header.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit f173f414e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 6 15:59:38 2016 +0100 Fixed undefined variable NOTICE error web/functions_error.inc | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) commit 8db40b1a8 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Oct 5 09:05:38 2016 +0100 Removed superfluous DBStatement->free() method README.sqlapi | 20 ++++---------------- web/lib/MRBS/DBStatement.php | 9 --------- 2 files changed, 4 insertions(+), 25 deletions(-) commit 3622151d8 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Oct 5 08:57:52 2016 +0100 Removed code duplication web/Themes/default/header.inc | 5 +---- web/mincals.inc | 10 ++++++---- web/mrbs_auth.inc | 6 ++++-- web/session/session_cookie.inc | 4 ++-- web/session/session_http.inc | 2 +- web/session/session_php.inc | 4 ++-- web/session/session_wordpress.inc | 4 ++-- 7 files changed, 18 insertions(+), 17 deletions(-) commit 3fb2e7966 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 5 08:21:32 2016 +0100 Added more missing JSON Content-Type headers web/check_slot_ajax.php | 1 + web/edit_entry_handler.php | 1 + web/report.php | 2 ++ web/search.php | 1 + 4 files changed, 5 insertions(+) commit a27b393e1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 5 08:11:25 2016 +0100 Fixed problem with page specific JavaScript not being loaded web/functions.inc | 7 ++++--- web/js.inc | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) commit c4aa1f9dc Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Oct 4 23:32:09 2016 +0100 Output JSON Content-Type in edit_users.php when appropriate web/edit_users.php | 1 + 1 file changed, 1 insertion(+) commit d5321b8ca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 4 21:09:59 2016 +0100 Got rid of some more unnecessary error checking web/mrbs_sql.inc | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) commit 36944f089 Merge: 744544f22 dd9002fcf Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Oct 4 18:56:47 2016 +0100 Merged commit 744544f22 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Oct 4 18:55:40 2016 +0100 Updated README.sqlapi for new DB class README.sqlapi | 254 ++++++++++++++++++++++++++---------------------- 1 file changed, 137 insertions(+), 117 deletions(-) commit dd9002fcf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 4 18:21:50 2016 +0100 Formatted the error output better for the browser by replacing spaces at the beginning of a line with non-breaking spaces web/functions_error.inc | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) commit 5641b4ac4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 4 16:28:22 2016 +0100 Removed second and third parameters from fatal_error() web/auth/auth_ldap.inc | 3 +-- web/dbsys.inc | 2 +- web/functions_error.inc | 4 ++-- web/mrbs_sql.inc | 2 +- web/session/session_php.inc | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) commit e0a9f5bd9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 4 16:18:52 2016 +0100 Revised error handling web/functions_error.inc | 62 +++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 35 deletions(-) commit 496313cdf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 3 17:30:09 2016 +0100 Eliminated use of deprecated jQuery.fn.load() web/js/refresh.js.php | 2 +- web/js/resizable.js.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit dca0baa44 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 3 17:21:55 2016 +0100 Upgraded to latest version of jQuery 2.x branch web/jquery/jquery-2.1.0.min.js (gone) | 4 - .../{jquery-2.1.0.js => jquery-2.2.4.js} | 5175 +++++++++------- web/jquery/jquery-2.2.4.min.js (new) | 4 + .../jquery-migrate-1.2.1.min.js (gone) | 2 - ...rate-1.2.1.js => jquery-migrate-1.4.1.js} | 341 +- web/jquery/jquery-migrate-1.4.1.min.js (new) | 2 + web/js.inc | 8 +- 7 files changed, 3235 insertions(+), 2301 deletions(-) commit c42cc9ace Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 3 15:43:11 2016 +0100 Added uncompressed version of jQuery for debugging web/jquery/jquery-2.1.0.js (new) | 9111 ++++++++++++++++++++++++++++ web/js.inc | 13 + 2 files changed, 9124 insertions(+) commit 018a936bc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 3 10:41:09 2016 +0100 Tidied up last commit. web/functions_error.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 076f15023 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 3 10:37:44 2016 +0100 Combined $_GET and $_POST data into a single message web/functions_error.inc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) commit df8cac15f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 17:54:37 2016 +0100 Slight changes to error output web/functions_error.inc | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) commit a1669c442 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 16:03:01 2016 +0100 Fixed HTML validation error web/Themes/default/header.inc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) commit 65e30c3b8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 15:55:26 2016 +0100 Removed the redundant $need_header parameter from fatal_error() - we always output a simpole header if a header hasn't already been output. web/auth/auth_ldap.inc | 3 +-- web/dbsys.inc | 2 +- web/edit_area_room.php | 8 ++++---- web/edit_entry.php | 7 +++---- web/edit_users.php | 2 +- web/functions.inc | 4 ++-- web/functions_error.inc | 7 +++---- web/functions_ical.inc | 2 +- web/mrbs_sql.inc | 16 ++++++++-------- web/session/session_cookie.inc | 12 ++++++------ web/session/session_php.inc | 2 +- web/upgrade/17/post.inc | 6 +++--- 12 files changed, 34 insertions(+), 37 deletions(-) commit 79092c038 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 15:39:12 2016 +0100 Always print the simple header on a fatal error web/functions_error.inc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) commit cdac990a0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 15:38:29 2016 +0100 Removed some JavaScript from the simple header web/Themes/default/header.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit 6bbb308f5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 15:29:57 2016 +0100 Made $done_header a static variable web/functions.inc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) commit 8f6a88501 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 15:23:25 2016 +0100 Simplified print_simple_header() web/Themes/default/header.inc | 21 ++++++++++++++------- web/functions.inc | 22 +--------------------- 2 files changed, 15 insertions(+), 28 deletions(-) commit 6fe6ff499 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 15:12:18 2016 +0100 Changed parameter order for consistency with other functions web/Themes/default/header.inc | 21 ++++++++++++++------- web/functions.inc | 4 ++-- 2 files changed, 16 insertions(+), 9 deletions(-) commit 5f20d05dc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 15:00:24 2016 +0100 Simplified web/Themes/default/header.inc | 5 +---- web/css/mrbs-print.css.php | 4 +++- 2 files changed, 4 insertions(+), 5 deletions(-) commit da7631d22 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 14:49:55 2016 +0100 Restructured web/Themes/default/header.inc | 34 +++++++++++++++++---------------- web/js.inc | 2 ++ 2 files changed, 20 insertions(+), 16 deletions(-) commit 80ef4eb63 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 14:38:30 2016 +0100 Simplified CSS and fixed banner CSS for RTL languages. web/css/mrbs-rtl.css.php | 6 +++++- web/css/mrbs.css.php | 11 +++++------ 2 files changed, 10 insertions(+), 7 deletions(-) commit 1f7cda042 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 14:27:28 2016 +0100 Removed redundandant CSS web/css/mrbs.css.php | 45 +++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 16 deletions(-) commit 8dcb8142a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 14:17:35 2016 +0100 Removed redundant globals web/Themes/default/header.inc | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) commit 548bce2f6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 14:09:55 2016 +0100 Changed header markup web/Themes/default/header.inc | 165 ++++++-------------------------- 1 file changed, 27 insertions(+), 138 deletions(-) commit ff2232f7a Merge: 705b9d5a9 bc57dcae2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 13:54:57 2016 +0100 Merge commit 705b9d5a9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 13:54:23 2016 +0100 Interim commit before merge web/Themes/default/header.inc | 184 ++++++++++++++++++++++++++++---- web/css/mrbs.css.php | 49 ++++++++- web/mrbs_sql.inc | 31 ++++++ 3 files changed, 242 insertions(+), 22 deletions(-) commit bc57dcae2 Merge: 502d07928 ad4034727 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Oct 2 10:24:19 2016 +0100 Merged latest changes on default branch commit ad4034727 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Oct 2 10:23:00 2016 +0100 A few improvements to checklang.php checklang.php | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) commit 502d07928 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Oct 2 09:46:57 2016 +0100 Updated German translations from Andrea Beranek web/lang/lang.de | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) commit c6ad35ea6 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Oct 2 09:46:57 2016 +0100 Updated German translations from Andrea Beranek web/lang/lang.de | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) commit 066066104 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Sep 30 22:41:03 2016 +0100 Removed DB::default_db() static method, and accidental change to internconfig.inc.php web/internalconfig.inc.php | 3 --- web/lib/MRBS/DB.php | 17 ----------------- 2 files changed, 20 deletions(-) commit fbfec402a Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Sep 30 22:39:29 2016 +0100 Removed the remainder of the sql_*() calls, and the wrapper functions web/Themes/default/header.inc | 2 +- web/dbsys.inc | 122 +-------------------- web/import.php | 8 +- web/internalconfig.inc.php | 3 + web/mrbs_sql.inc | 185 ++++++++++++++++---------------- web/upgrade/13/post.inc | 3 +- web/upgrade/15/post.inc | 6 +- web/upgrade/16/post.inc | 3 +- web/upgrade/17/post.inc | 20 ++-- web/upgrade/2/post.inc | 3 +- web/upgrade/21/post.inc | 6 +- web/upgrade/24/post.inc | 9 +- web/upgrade/32/post.inc | 8 +- web/upgrade/34/post.inc | 8 +- web/upgrade/4/post.inc | 3 +- web/upgrade/43/post.inc | 3 +- web/upgrade/47/post.inc | 10 +- web/upgrade/5/post.inc | 2 +- web/upgrade/6/post.inc | 9 +- web/upgrade/7/post.inc | 9 +- web/upgrade/8/post.inc | 4 +- 21 files changed, 159 insertions(+), 267 deletions(-) commit 67a0d682c Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Sep 30 22:08:01 2016 +0100 Removed sql_*() calls from everywhere but mrbs_sql.inc and the upgrade scripts convert_db_to_utf8.php | 6 +++--- web/admin.php | 22 ++++++++++----------- web/auth/auth_db.inc | 16 ++++++++-------- web/dbsys.inc | 27 ++++++++++++++++++++------ web/del.php | 22 ++++++++++----------- web/del_entry_ajax.php | 4 ++-- web/edit_area_room.php | 24 +++++++++++------------ web/edit_entry.php | 26 ++++++++++++------------- web/edit_entry_handler.php | 10 +++++----- web/edit_users.php | 37 +++++++++++++++++++----------------- web/functions.inc | 26 ++++++++++++------------- web/functions_error.inc | 2 +- web/functions_ical.inc | 26 ++++++++++++------------- web/functions_mail.inc | 6 +++--- web/functions_view.inc | 2 +- web/help.php | 2 +- web/pending.php | 8 ++++---- web/report.php | 34 ++++++++++++++++----------------- web/search.php | 24 +++++++++++------------ web/upgrade.inc | 4 ++-- web/view_entry.php | 8 ++++---- 21 files changed, 176 insertions(+), 160 deletions(-) commit d527cadcf Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Sep 30 08:00:02 2016 +0100 Corrected uses of in upgrade scripts web/upgrade/5/post.inc | 10 ++++++---- web/upgrade/6/post.inc | 3 +-- 2 files changed, 7 insertions(+), 6 deletions(-) commit dd19d7ecf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 18:09:42 2016 +0100 Added 'public' to function declarations for clarity web/lib/MRBS/DB.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 54a9fcb4b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 18:03:48 2016 +0100 Trivial whitespace removal web/lib/MRBS/DB.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3087d262c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 17:41:01 2016 +0100 Added in some more notes for those upgrading from earlier versions of MRBS web/lib/MRBS/DB.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) commit e687bd2a1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 17:14:33 2016 +0100 Tweaked exception messages web/lib/MRBS/DB.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 7e6a78f57 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 16:01:04 2016 +0100 Removed some more error checking now that we have exceptions. web/functions_table.inc | 5 ----- web/import.php | 11 ++--------- web/mrbs_sql.inc | 6 +----- web/report.php | 5 ----- 4 files changed, 3 insertions(+), 24 deletions(-) commit 4478e4491 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 15:40:32 2016 +0100 Removed some more error checking now that we have exceptions. web/auth/auth_db_ext.inc | 18 -------- web/lib/MRBS/DB.php | 17 +++---- web/lib/MRBS/DB_mysql.php | 89 ++++++++++++++++++------------------- web/lib/MRBS/DB_pgsql.php | 60 +++++++++++-------------- web/upgrade.inc | 7 --- 5 files changed, 75 insertions(+), 116 deletions(-) commit 8dc12f67a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 15:19:32 2016 +0100 Removed error checking from calls to DB::command() web/lib/MRBS/DB.php | 12 ------------ web/lib/MRBS/DB_mysql.php | 6 ------ web/lib/MRBS/DB_pgsql.php | 15 +++++++-------- 3 files changed, 7 insertions(+), 26 deletions(-) commit 0786e2bca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 14:23:51 2016 +0100 More conversion to exceptions web/lib/MRBS/DB.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit f0a32c209 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 14:20:44 2016 +0100 Switched to exceptions in db connection code web/dbsys.inc | 1 - web/lib/MRBS/DB.php | 20 ++++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) commit a07fae2cb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 12:55:39 2016 +0100 Made sql_command() throw an exception and removed error checking after calls to sql_command(). web/day.php | 6 ----- web/del.php | 23 ++++++++----------- web/edit_area_room.php | 23 +++++-------------- web/edit_users.php | 42 ++-------------------------------- web/functions_ical.inc | 20 ++++------------ web/lib/MRBS/DB.php | 5 ++-- web/mrbs_sql.inc | 48 +++++++++++---------------------------- web/upgrade.inc | 10 ++------ web/upgrade/13/post.inc | 9 +------- web/upgrade/15/post.inc | 7 +----- web/upgrade/16/post.inc | 6 +---- web/upgrade/17/post.inc | 26 ++++----------------- web/upgrade/2/post.inc | 8 +------ web/upgrade/21/post.inc | 7 +----- web/upgrade/24/post.inc | 10 ++++---- web/upgrade/32/post.inc | 6 +---- web/upgrade/34/post.inc | 6 +---- web/upgrade/4/post.inc | 9 +------- web/upgrade/43/post.inc | 9 +------- web/upgrade/47/post.inc | 10 ++++---- web/upgrade/5/post.inc | 10 +------- web/upgrade/6/post.inc | 22 ++++-------------- web/upgrade/7/post.inc | 21 ++++------------- web/upgrade/8/post.inc | 6 +---- 24 files changed, 73 insertions(+), 276 deletions(-) commit 90e61cd47 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 10:51:13 2016 +0100 Changed the error handling following a call to sql_query1() in edit_entry_handler.php as a fatal db error is no longer the right action. web/edit_entry_handler.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) commit f4e7ae66d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 10:14:41 2016 +0100 Made sql_query1() throw exceptions if it results in more than one row or column web/day.php | 5 +++++ web/lib/MRBS/DB.php | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) commit 50f43e962 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 09:49:01 2016 +0100 Fixed comments for sql_query1() web/lib/MRBS/DB.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit e5c87a841 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 09:45:56 2016 +0100 Added exception throwing to sql_query1() and removed some error checking of results web/Themes/default/header.inc | 4 ---- web/lib/MRBS/DB.php | 7 ++++--- web/search.php | 5 +---- 3 files changed, 5 insertions(+), 11 deletions(-) commit 005fdd1c4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 09:16:05 2016 +0100 Fix to ensure that the fatal error messages occur web/functions_error.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1f3f489da Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 28 20:45:18 2016 +0100 Got rid of error checking following sql_query() calls now that there's a default uncaught exception handler. web/admin.php | 13 ++--- web/auth/auth_db.inc | 7 +-- web/dbsys.inc | 4 ++ web/del.php | 8 +-- web/edit_entry.php | 102 +++++++++++++++++--------------------- web/functions.inc | 4 +- web/functions_error.inc | 4 +- web/functions_ical.inc | 16 ++---- web/lib/MRBS/DB.php | 17 ++++++- web/mrbs_sql.inc | 80 +++++------------------------- web/pending.php | 6 +-- web/report.php | 5 -- web/search.php | 5 -- web/upgrade/17/post.inc | 5 -- web/upgrade/32/post.inc | 6 --- web/upgrade/34/post.inc | 6 --- web/upgrade/6/post.inc | 9 +--- web/view_entry.php | 5 -- 18 files changed, 94 insertions(+), 208 deletions(-) commit f7b7bb6da Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 28 18:07:00 2016 +0100 Added SQL information web/functions_error.inc | 1 + web/lib/MRBS/DB.php | 11 +++++++++-- web/lib/MRBS/DBException.php (new) | 16 ++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) commit 37f38198b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 28 17:07:02 2016 +0100 Added uncaught exception handler web/defaultincludes.inc | 2 +- web/functions_error.inc | 102 +++++++++++++++++++++++++++-------- web/internalconfig.inc.php | 3 +- web/lang/lang.en | 1 + 4 files changed, 85 insertions(+), 23 deletions(-) commit 02d9c9d32 Merge: 0c10555bd 9681077f9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 28 14:09:22 2016 +0100 Merge commit 0c10555bd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 28 14:03:32 2016 +0100 Restructured web/defaultincludes.inc | 1 + web/functions.inc | 45 ------------------------------- web/functions_error.inc (new) | 48 +++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 45 deletions(-) commit 9681077f9 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Sep 27 21:41:22 2016 +0100 Removed executable permissions from a few files web/dbsys.inc (mode -x) | 0 web/lang/lang.it (mode -x) | 0 web/lib/MRBS/DB.php (mode -x) | 0 web/lib/MRBS/DBFactory.php (mode -x) | 0 web/lib/MRBS/DBStatement.php (mode -x) | 0 web/lib/MRBS/DB_mysql.php (mode -x) | 0 web/lib/MRBS/DB_pgsql.php (mode -x) | 0 web/session/session_cookie.inc (mode -x) | 0 web/upgrade.inc (mode -x) | 0 9 files changed, 0 insertions(+), 0 deletions(-) commit 5bbd58314 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 27 16:12:27 2016 +0100 Trivial formatting change web/del.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 481fb9b82 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 27 16:11:22 2016 +0100 Fixed problem with last but one merge web/del.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit cf94e47dc Merge: 105220bdb fade3c5e9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 27 16:07:53 2016 +0100 Merge with default commit fade3c5e9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 27 16:07:02 2016 +0100 Fixed problem with last change web/del.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 105220bdb Merge: e4d06f775 c83acc991 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 27 16:04:57 2016 +0100 Merged with latest changes from default branch commit c83acc991 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 27 15:56:18 2016 +0100 Added rollback to transaction web/del.php | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) commit 26dcbd2b0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 27 15:09:05 2016 +0100 Removed unnecessary transaction web/del_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit e4d06f775 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Sep 26 23:10:07 2016 +0100 Minor non-code changes in DB class web/lib/MRBS/DB.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit 4341fe7b1 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Sep 26 21:55:59 2016 +0100 Removed one more reference to mysqli web/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cdb8c51a3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 26 18:34:36 2016 +0100 Restored calls to mrbs_ignore_user_abort() around transactions. web/lib/MRBS/DB.php | 18 ++++++++++++++++++ web/lib/MRBS/DB_mysql.php | 2 ++ web/lib/MRBS/DB_pgsql.php | 2 ++ 3 files changed, 22 insertions(+) commit 58437640f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 26 17:41:56 2016 +0100 Tidied up error handling slightly web/lib/MRBS/DB.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) commit 34a4eddd7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 26 17:28:05 2016 +0100 Configured PDO to throw exceptions web/lib/MRBS/DB.php | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) commit 4bfe449d3 Merge: fbe26efdf c31b91a25 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 26 17:19:05 2016 +0100 Merged with latest changes from default branch commit c31b91a25 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 26 16:33:55 2016 +0100 Wrapped the edit procedure in a transaction. See SF Support Requests #1064 web/dbsys.inc | 28 ++++++++++++++++++++++++++-- web/edit_entry_handler.php | 20 +++++++++++++++++++- web/mrbs_sql.inc | 2 +- web/mysqli.inc | 5 +++++ 4 files changed, 51 insertions(+), 4 deletions(-) commit fbe26efdf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 26 13:50:26 2016 +0100 Trivial whitespace change web/mrbs_sql.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit db9e01459 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 26 13:48:00 2016 +0100 Paremeterised another query web/mrbs_sql.inc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) commit 2104ef8f1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 26 13:18:39 2016 +0100 Made the standard name for the MySQL driver 'mysql' instead of 'mysqli', though 'mysqli' will still be accepted. INSTALL | 2 +- README.sqlapi | 4 ++-- web/config.inc.php | 4 ++-- web/internalconfig.inc.php | 8 -------- web/systemdefaults.inc.php | 11 ++++++----- 5 files changed, 11 insertions(+), 18 deletions(-) commit 79fb84c37 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 26 13:05:13 2016 +0100 Threw an exception for an unsupported db driver web/lib/MRBS/DBFactory.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 84f81080d Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Sep 25 08:37:54 2016 +0100 On second thoughts, DBStatement doesn't extent PDOStatement, except notionally web/lib/MRBS/DBStatement.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 916b1c694 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Sep 25 08:27:55 2016 +0100 Took DB abstraction further, by building a DBStatement class convert_db_to_utf8.php | 26 +++---- web/auth/auth_db_ext.inc | 24 +++---- web/dbsys.inc | 24 +++---- web/lib/MRBS/DB.php | 85 ++--------------------- web/lib/MRBS/DBStatement.php (new +x) | 90 +++++++++++++++++++++++++ web/lib/MRBS/DB_mysql.php | 16 ++--- web/lib/MRBS/DB_pgsql.php | 6 +- 7 files changed, 142 insertions(+), 129 deletions(-) commit b38ebd614 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Sep 25 00:24:11 2016 +0100 Fixed mysql version of syntax_caseless_contains() web/lib/MRBS/DB_mysql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit fbe406161 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Sep 25 00:22:28 2016 +0100 Removed testing file web/dbtest.php (gone) | 21 --------------------- 1 file changed, 21 deletions(-) commit f168e51cb Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Sep 25 00:22:07 2016 +0100 Fixed a few bugs, including an odd one in search.php which only threw an error for pgsql web/edit_users.php | 2 +- web/lib/MRBS/DB.php | 2 +- web/search.php | 37 ++++++++++++++++++++++++------------- 3 files changed, 26 insertions(+), 15 deletions(-) commit 6f49e2ecf Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 24 23:33:08 2016 +0100 Fixed some bugs in the pgsql class, plus fixed sql_syntax_caseless_contains() web/dbsys.inc | 4 ++-- web/lib/MRBS/DB_pgsql.php | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) commit 55e18ef6e Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 24 22:45:40 2016 +0100 Base DB base class variables protected instead of private, so the subclasses can use them web/lib/MRBS/DB.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 86fd23a59 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 24 22:31:27 2016 +0100 Fixed sql_syntax_casesensitive_equals() wrapper and syntax error in upgrade 34 web/dbsys.inc | 4 ++-- web/upgrade/34/post.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 1fdabbb62 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 24 22:17:53 2016 +0100 Added missing 'use' statements in sub-classes web/lib/MRBS/DB_mysql.php | 3 +++ web/lib/MRBS/DB_pgsql.php | 3 +++ 2 files changed, 6 insertions(+) commit ca3711430 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 24 21:34:03 2016 +0100 Fixed call to DBFactory::create convert_db_to_utf8.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit c23f6d4b7 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 24 21:32:08 2016 +0100 Fixed db_ext auth scheme, and a syntax method in DB_mysql web/auth/auth_db_ext.inc | 15 ++++++++------- web/lib/MRBS/DB_mysql.php | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) commit 776a41fb2 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 24 21:18:52 2016 +0100 Converted convert_db_to_utf8.php to the DB class convert_db_to_utf8.php | 52 +++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 24 deletions(-) commit f41edc0d0 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 24 21:05:26 2016 +0100 Removed references to the sql_* wrappers in internal code web/auth/auth_db_ext.inc | 6 +++--- web/lib/MRBS/DB.php | 6 +++--- web/lib/MRBS/DB_mysql.php | 4 ++-- web/lib/MRBS/DB_pgsql.php | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) commit 0d6cec735 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 24 20:42:51 2016 +0100 Worked version using classes, with sql_*() wrappers in dbsys.inc web/auth/auth_db_ext.inc | 115 +++--- web/dbsys.inc (mode +x) | 729 ++---------------------------------- web/dbtest.php | 9 +- web/lib/MRBS/DB.php | 40 +- web/lib/MRBS/DB_mysql.php | 2 +- web/lib/MRBS/DB_pgsql.php | 2 +- web/mysqli.inc (gone) | 635 ------------------------------- web/pgsql.inc (gone) | 662 -------------------------------- web/upgrade.inc (mode +x) | 4 +- 9 files changed, 127 insertions(+), 2071 deletions(-) commit fe2dac0cb Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 24 12:11:27 2016 +0100 New DB classes, to replace mysqli.inc, pgsql.inc and most of dbsys.inc web/dbtest.php (new +x) | 28 +++ web/lib/MRBS/DB.php (new +x) | 257 ++++++++++++++++++++++ web/lib/MRBS/DBFactory.php (new +x) | 26 +++ web/lib/MRBS/DB_mysql.php (new +x) | 292 +++++++++++++++++++++++++ web/lib/MRBS/DB_pgsql.php (new +x) | 303 ++++++++++++++++++++++++++ 5 files changed, 906 insertions(+) commit 724d097ae Merge: d91a738c9 aea131d9b Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Sep 20 19:12:47 2016 +0100 Merged commit d91a738c9 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Sep 20 19:10:58 2016 +0100 Added 'password_hash' support to the 'db_ext' auth scheme, and also fixed a syntax error I introduced on the PDO branch. web/auth/auth_db_ext.inc | 13 +++++++++---- web/systemdefaults.inc.php | 4 +++- 2 files changed, 12 insertions(+), 5 deletions(-) commit aea131d9b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 20 16:10:48 2016 +0100 Removed debug code and switched to try ... catch. web/mysqli.inc | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) commit 92ee0cce1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 20 15:25:21 2016 +0100 Added some error handling for the case when PDO encounters old style MySQL passwords. web/mysqli.inc | 7 +++++++ 1 file changed, 7 insertions(+) commit c51afc0ec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 19 08:08:23 2016 +0100 Fixed problem with PDOException web/mysqli.inc | 2 +- web/pgsql.inc | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) commit 3abc49a4e Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Sep 18 10:07:05 2016 +0100 Corrected variable name in sql_pgsql_syntax_caseless_contains() web/pgsql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit df8514ee2 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Sep 18 10:05:15 2016 +0100 Modified sql_syntax_caseless_contains() to no longer perform escaping, and instead to modify the caller's SQL params array instead. Updated README.sqlapi a bit, still needs more work to describe the new parameterised calls. README.sqlapi | 8 ++++---- web/dbsys.inc | 8 ++++---- web/mysqli.inc | 18 ++++++++++++------ web/pgsql.inc | 12 ++++++++---- web/report.php | 8 ++++---- web/search.php | 10 +++++----- 6 files changed, 37 insertions(+), 27 deletions(-) commit ecf1f5d0e Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Sep 18 09:45:49 2016 +0100 Changed sql_syntax_casesensitive_equals() so you pass the SQL params array by reference for it to modify. Fixed varags usage in new parameterised SQL calls. NEWS (mode -x) | 0 web/auth/auth_db.inc | 13 ++++++----- web/auth/auth_db_ext.inc | 31 ++++++++++++++++++-------- web/dbsys.inc | 22 ++++++++++-------- web/edit_area_room.php | 8 +++++-- web/mysqli.inc | 8 ++++++- web/pgsql.inc (mode -x) | 8 ++++++- web/report.php | 5 ++--- web/systemdefaults.inc.php (mode -x) | 0 9 files changed, 64 insertions(+), 31 deletions(-) commit da956b661 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 17 19:01:33 2016 +0100 Fixed typo in mysqli.inc web/mysqli.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d19caa380 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 17 18:57:21 2016 +0100 Fixed a few things in mysqli abstraction, and removed TABs from pgsql.inc web/mysqli.inc | 19 +++++-------------- web/pgsql.inc | 18 +++++++++--------- 2 files changed, 14 insertions(+), 23 deletions(-) commit c5c96834b Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 17 18:41:48 2016 +0100 Parameterised admin.php web/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 66e5e344e Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 17 18:39:45 2016 +0100 Fixed SQL parameterisation in mrbsApproveEntry() web/mrbs_sql.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit c927b8ae1 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 17 18:31:25 2016 +0100 Paramaterised more SQL statements web/del.php | 14 +++++++------- web/edit_area_room.php | 4 ++-- web/edit_entry.php | 4 ++-- web/edit_entry_handler.php | 2 +- web/functions.inc | 22 +++++++++++----------- web/functions_mail.inc | 8 ++++---- web/mrbs_sql.inc | 22 +++++++++++++--------- web/upgrade.inc | 7 +++---- web/view_entry.php | 17 ++++++++++------- 9 files changed, 53 insertions(+), 47 deletions(-) commit f32d7c200 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 17 17:51:22 2016 +0100 Fixed by reference passing of SQL params web/report.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 0bf3d7d33 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 17 17:15:07 2016 +0100 Removed all remaining references to sql_escape() web/dbsys.inc | 22 ---------------------- web/functions_ical.inc | 30 +++++++++++++++--------------- web/import.php | 18 +++++++++--------- web/mysqli.inc | 9 --------- web/pgsql.inc | 9 --------- web/report.php | 24 ++++++++++++++++-------- web/upgrade/15/post.inc | 10 +++------- web/upgrade/21/post.inc | 10 +++------- web/upgrade/34/post.inc | 6 +++--- 9 files changed, 49 insertions(+), 89 deletions(-) commit d49f10a84 Merge: 3939178b2 d36184251 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 17 16:37:47 2016 +0100 Merge commit 3939178b2 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 17 16:32:29 2016 +0100 Minor change to UTF8 connection setup web/pgsql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d36184251 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 17 16:30:18 2016 +0100 Merged convert_db_to_utf8.php | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) commit c277e21c5 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 17 16:29:09 2016 +0100 Fixed incorrect use of sql_syntax_caseless_contains web/search.php | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) commit c305e7419 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 17 16:03:54 2016 +0100 pgsql abtraction updated to PDO web/pgsql.inc (mode +x) | 157 ++++++++++++++++++++------------------ 1 file changed, 84 insertions(+), 73 deletions(-) commit 7fc316b06 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 17 13:34:45 2016 +0100 Reverted accidental file changes web/config.inc.php | 80 +++++--------------------------------------- 1 file changed, 9 insertions(+), 71 deletions(-) commit a2dc23432 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 17 13:29:27 2016 +0100 Finished parameterisation of mrbs_sql.inc web/mrbs_sql.inc | 172 +++++++++++++++++++++++++-------------------- 1 file changed, 94 insertions(+), 78 deletions(-) commit 0e8e38aab Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 17 13:29:14 2016 +0100 Parameterised SQL in header web/Themes/default/header.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit 988408c10 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 17 12:57:14 2016 +0100 Parameterised SQL queries in edit_users.php web/config.inc.php | 80 +++++++++++++++++++++++++++++++++++++++----- web/edit_users.php | 42 ++++++++++++++--------- 2 files changed, 97 insertions(+), 25 deletions(-) commit 7f2e6037a Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 17 12:35:26 2016 +0100 More SQL statements parameterised web/auth/auth_db.inc | 16 ++-- web/auth/auth_db_ext.inc | 12 +-- web/dbsys.inc | 24 +++--- web/edit_area_room.php | 153 ++++++++++++++++++++++++------------- web/mrbs_sql.inc | 33 ++++---- web/mysqli.inc | 37 +++++---- web/pending.php | 7 +- web/search.php | 22 +++--- web/upgrade/5/post.inc | 4 +- web/upgrade/6/post.inc | 14 ++-- 10 files changed, 196 insertions(+), 126 deletions(-) commit ff00359b5 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 17 10:26:42 2016 +0100 PDO branch, mysqli abstraction converted to PDO, without any query parameterisation yet. web/mysqli.inc | 121 ++++++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 65 deletions(-) commit 0037e949c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 17 09:11:18 2016 +0100 Fixed comment (see SF Bugs #365) web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 99b977202 Merge: 76f6bd94b 1d72ff5e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 14 20:22:52 2016 +0100 Merge with namespace commit 1d72ff5e0 (origin/namespace) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 14 20:18:17 2016 +0100 Close namespace branch commit a51519d37 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 14 14:57:12 2016 +0100 Fixed problem when using MySQL web/mysqli.inc | 1 + 1 file changed, 1 insertion(+) commit 461f2bcae Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 14 14:45:06 2016 +0100 Fixed problem with WordPress authentication web/auth/auth_wordpress.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c949c76cb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 14 13:45:27 2016 +0100 Fixed bug when adding a new user web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b91768fea Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 14 13:41:36 2016 +0100 Fixed use of PasswordCompat web/auth/auth_db.inc | 4 ++-- web/edit_users.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 95eeaab3e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 14 13:31:15 2016 +0100 Fixed use of DateInterval class web/functions.inc | 2 +- web/report.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit 441749e1d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 14 13:25:31 2016 +0100 Fixed various bugs preventing mail being sent. web/functions.inc | 9 +++++---- web/functions_mail.inc | 8 ++++---- web/report.php | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) commit 01c7ad20c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 14 13:12:09 2016 +0100 Fixed bug with making bookings web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 83b488318 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 14 13:07:38 2016 +0100 Fixed exception throwing web/lib/MRBS/Exception.php (new) | 10 ++++++++++ 1 file changed, 10 insertions(+) commit ec836f386 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 14 12:44:57 2016 +0100 Added comment web/dbsys.inc | 3 +++ 1 file changed, 3 insertions(+) commit 54dd90b44 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 13 17:24:42 2016 +0100 First attempt web/Themes/classic126/styling.inc | 1 + web/Themes/default/footer.inc | 4 +- web/Themes/default/header.inc | 3 +- web/Themes/default/styling.inc | 1 + web/add.php | 1 + web/admin.php | 1 + web/approve_entry_handler.php | 2 + web/areadefaults.inc.php | 1 + web/auth/auth_auth_basic.inc | 1 + web/auth/auth_config.inc | 4 +- web/auth/auth_crypt.inc | 1 + web/auth/auth_db.inc | 2 + web/auth/auth_db_ext.inc | 2 + web/auth/auth_ext.inc | 1 + web/auth/auth_imap.inc | 1 + web/auth/auth_imap_php.inc | 1 + web/auth/auth_ldap.inc | 1 + web/auth/auth_nis.inc | 1 + web/auth/auth_none.inc | 1 + web/auth/auth_nw.inc | 1 + web/auth/auth_pop3.inc | 1 + web/auth/auth_smtp.inc | 1 + web/auth/auth_wordpress.inc | 1 + web/check_slot_ajax.php | 2 + web/config.inc.php | 1 + web/css/mrbs-ielte7.css.php | 3 +- web/css/mrbs-print.css.php | 1 + web/css/mrbs-rtl.css.php | 1 + web/css/mrbs.css.php | 1 + web/day.php | 4 +- web/dbsys.inc | 65 ++++++++++++++------------- web/defaultincludes.inc | 1 + web/del.php | 2 + web/del_entry.php | 2 + web/del_entry_ajax.php | 1 + web/edit_area_room.php | 2 + web/edit_entry.php | 2 + web/edit_entry_handler.php | 2 + web/edit_users.php | 2 + web/functions.inc | 2 + web/functions_ical.inc | 1 + web/functions_mail.inc | 2 + web/functions_table.inc | 1 + web/functions_view.inc | 1 + web/grab_globals.inc.php | 2 + web/help.php | 1 + web/import.php | 2 + web/index.php | 1 + web/internalconfig.inc.php | 1 + web/js.inc | 1 + web/js/admin.js.php | 1 + web/js/cell_click.js.php | 1 + web/js/datatables.js.php | 1 + web/js/datepicker.js.php | 1 + web/js/edit_area_room.js.php | 1 + web/js/edit_entry.js.php | 1 + web/js/edit_users.js.php | 1 + web/js/functions.js.php | 1 + web/js/general.js.php | 1 + web/js/multiple.js.php | 1 + web/js/pending.js.php | 1 + web/js/refresh.js.php | 1 + web/js/report.js.php | 1 + web/js/resizable.js.php | 1 + web/js/search.js.php | 1 + web/language.inc | 3 +- web/lib/Locale.php | 3 +- web/mincals.inc | 2 + web/month.php | 2 + web/mrbs_auth.inc | 2 + web/mrbs_sql.inc | 2 + web/mysqli.inc | 4 +- web/pending.php | 2 + web/pgsql.inc | 4 +- web/record_activity_ajax.php | 2 + web/report.php | 2 + web/search.php | 2 + web/session/session_cookie.inc | 2 + web/session/session_host.inc | 1 + web/session/session_http.inc | 4 +- web/session/session_ip.inc | 1 + web/session/session_nt.inc | 1 + web/session/session_omni.inc | 1 + web/session/session_php.inc | 2 + web/session/session_remote_user.inc | 2 + web/session/session_wordpress.inc | 1 + web/standard_vars.inc.php | 1 + web/style.inc | 1 + web/systemdefaults.inc.php | 1 + web/theme.inc | 1 + web/trailer.inc | 1 + web/upgrade.inc | 1 + web/upgrade/13/post.inc | 1 + web/upgrade/15/post.inc | 1 + web/upgrade/16/post.inc | 1 + web/upgrade/17/post.inc | 1 + web/upgrade/2/post.inc | 1 + web/upgrade/21/post.inc | 1 + web/upgrade/24/post.inc | 1 + web/upgrade/26/post.inc | 1 + web/upgrade/32/post.inc | 1 + web/upgrade/34/post.inc | 1 + web/upgrade/4/post.inc | 1 + web/upgrade/43/post.inc | 1 + web/upgrade/46/post.inc | 1 + web/upgrade/47/post.inc | 3 +- web/upgrade/48/post.inc | 1 + web/upgrade/5/post.inc | 1 + web/upgrade/6/post.inc | 1 + web/upgrade/7/post.inc | 1 + web/upgrade/8/post.inc | 1 + web/version.inc | 1 + web/version_num.inc | 1 + web/view_entry.php | 2 + web/week.php | 2 + 115 files changed, 189 insertions(+), 45 deletions(-) commit e011f8279 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 13 12:29:23 2016 +0100 New branch for adding namespacing commit 76f6bd94b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 13 12:22:48 2016 +0100 Trivial change to test commit web/lang/lang.en | 1 - 1 file changed, 1 deletion(-) commit a8a81491e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 13 09:39:43 2016 +0100 Removed redundant code now that we only support PHP 5.3.0 and greater web/auth/auth_ext.inc | 4 ---- web/escapeshellarg.inc (gone) | 14 -------------- 2 files changed, 18 deletions(-) commit a25dc379a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 27 15:30:58 2016 +0100 Simplified code web/month.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) commit 4e8751345 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 27 15:22:34 2016 +0100 Simplified code web/month.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) commit 696d2b25e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 27 15:17:01 2016 +0100 Simplified code web/month.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) commit 85ebd8661 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 27 15:11:51 2016 +0100 Restructured code web/month.php | 50 ++++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 19 deletions(-) commit ba307798d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 27 14:44:51 2016 +0100 Fixed bug whereby bookings for the last slot were not being displayed properly in the month view web/month.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit aa32bd133 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 27 14:38:38 2016 +0100 Simplified code web/month.php | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) commit 595298cf8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 27 14:31:03 2016 +0100 Got rid of some SQL from month.php web/month.php | 101 +++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 58 deletions(-) commit 9179a28aa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 27 14:17:40 2016 +0100 Removed redundant line of code web/month.php | 6 ------ 1 file changed, 6 deletions(-) commit 0264522df Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 27 14:13:01 2016 +0100 Added comment web/systemdefaults.inc.php | 2 ++ 1 file changed, 2 insertions(+) commit b6e99da76 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 27 14:10:51 2016 +0100 Restructured code web/month.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) commit ab9bfe86f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 27 12:39:13 2016 +0100 Changed refresh mechanism for month view to Ajax from meta refresh. web/js.inc | 15 +- web/month.php | 631 +++++++++++++++++++++++++----------------------- web/style.inc | 9 +- 3 files changed, 349 insertions(+), 306 deletions(-) commit b75fcfdf1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 27 11:30:49 2016 +0100 Fixed bug causing form validation to fail when using datalist inputs web/js/general.js.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) commit 800ea943f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 26 16:01:06 2016 +0100 Added comment web/js/functions.js.php | 6 ++++++ 1 file changed, 6 insertions(+) commit f371f89cc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 26 15:56:01 2016 +0100 Disabled page refresh if running over a metered network connection. web/js/functions.js.php | 31 +++++++++++++++++++++++++++++++ web/js/refresh.js.php | 4 +++- 2 files changed, 34 insertions(+), 1 deletion(-) commit ed9e08b58 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 25 12:01:13 2016 +0100 Changed German translation for rep_num_weeks. Thanks to Michael Hellwig. web/lang/lang.de | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 67a8716d5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 18 13:37:05 2016 +0100 Fixed bug preventing the username being set to '0' web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7f07e1ed4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 18 13:33:44 2016 +0100 Fixed bug preventing the password being set to '0' (not that you'd want to do that) web/edit_users.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit a1bbbb339 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 18 13:21:25 2016 +0100 Fixed bug causing password validation not to be performed. web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b6eb7facc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 17 16:48:35 2016 +0100 Fixed bug introduced in changeset ccbec44d3779 causing resized bookings to be set the to the default type. web/functions_table.inc | 2 +- web/js/resizable.js.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) commit 797ee9d0f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 17 15:02:10 2016 +0100 Made MRBS fall back to the default footer if none exists in the theme (as happens with the header). web/functions.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) commit abba3d382 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 15 17:12:32 2016 +0100 Allowed custom fields in the users table to be writable only by admins web/edit_users.php | 9 ++++++++- web/systemdefaults.inc.php | 7 +++++++ 2 files changed, 15 insertions(+), 1 deletion(-) commit 57ac9daf3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 14 12:05:55 2016 +0100 Fixed bug causing WordPress plugins not to recognise login errors web/session/session_wordpress.inc | 1 + 1 file changed, 1 insertion(+) commit c15abc3ec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 14 10:37:30 2016 +0100 replaced the value of the login Submit button with the WordPress text. web/session/session_wordpress.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 179e95f00 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 14 10:26:27 2016 +0100 Restructured code web/session/session_wordpress.inc | 64 +++++++++++++++-------------- 1 file changed, 33 insertions(+), 31 deletions(-) commit a0997ba70 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 14 10:05:18 2016 +0100 Removed redundant global declarations. web/session/session_php.inc | 2 +- web/session/session_wordpress.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 495c34399 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 14 10:00:15 2016 +0100 Replaced login form labels with WordPress text strings web/session/session_wordpress.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 28dfdb0e4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 10 21:37:22 2016 +0100 Added apply_filters() to login error message so that any plugin filters will be aaplied correctly. web/session/session_wordpress.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c63ad8ecc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 10 18:39:44 2016 +0100 Changed the login error message to be the standard WordPress merror message when using WordPress authentication. web/session/session_wordpress.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 23565363a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 4 15:54:30 2016 +0100 Changed the default admin role in the WordPress authentication scheme to be the WordPress 'Administrator' role. Also added documentation on changes necessary to the WordPress wp-config.php file to enable authentication cookies to be shared between MRBS and WordPress. AUTHENTICATION | 28 ++++++++++++++++++++++++++++ web/systemdefaults.inc.php | 23 +++++++++++++++++++---- 2 files changed, 47 insertions(+), 4 deletions(-) commit 15c63a6de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 4 15:50:51 2016 +0100 Changed setting of 'remember_me' to FALSE when logging on through MRBS using the WordPress authentication scheme. (Even so, the default WordPress behaviour is to remember for 2 days. Setting 'remember_me' extends it to 14.5 days). web/session/session_wordpress.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a0f2e9c89 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 2 14:33:26 2016 +0100 Fixed problem with slashing of $_GET and $_POST variables when using WordPress authentication. (See SF Support Requests #1034). web/defaultincludes.inc | 2 +- web/grab_globals.inc.php | 35 ++++++++++++++++++++++++++++++----- 2 files changed, 31 insertions(+), 6 deletions(-) commit 597700003 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 2 14:07:13 2016 +0100 Got rid of usage of $HTTP_GET_VARS, $HTTP_POST_VARS and $HTTP_SERVER_VARS (no longer necessary) web/grab_globals.inc.php | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) commit 2da3f5fd1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 28 14:58:46 2016 +0100 Added WordPress authentication (for WordPress installations running on the same server as MRBS). AUTHENTICATION | 370 +++++++++++----------- web/auth/auth_wordpress.inc (new) | 103 ++++++ web/internalconfig.inc.php | 3 +- web/session/session_wordpress.inc (new) | 217 +++++++++++++ web/systemdefaults.inc.php | 19 +- 5 files changed, 527 insertions(+), 185 deletions(-) commit c8e6f8c0c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 20 16:09:08 2016 +0100 Fixed some JSHint problems web/js/edit_entry.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 8cfd1b974 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 20 15:32:10 2016 +0100 Fixed potential problem with end time selector in edit_entry.php being blank when coming from the month view. See SF Support Requests #983. web/month.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cf74a25b6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 20 12:19:28 2016 +0100 Restored the close button to the policy/schedule results dialog. (It disappeared during the upgrade to later versions of jQuery UI). web/js/edit_entry.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7ded733bd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 20 11:44:02 2016 +0100 Reformatted code web/js/edit_entry.js.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit cea1b1852 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 20 11:07:46 2016 +0100 Fixed problem with Schedule and Policy tabs not appearing. See SF Bugs #362. web/js/edit_entry.js.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) commit 7db6f3f85 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 19 16:57:54 2016 +0100 Fixed problem with Bulk Delete on the report page. See SF Bugs #361. web/jquery/datatables/js/plugins.js | 48 --------------------------- web/js/report.js.php | 10 +++--- 2 files changed, 5 insertions(+), 53 deletions(-) commit 0725c0846 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 19 12:28:59 2016 +0100 Fixed problem with the endtime selector not having a selected value in the very rare case that the area's morningstarts or resolution is changed in between refreshes of the browser on the edit_entry page. See also SF Support Requests #983. web/edit_entry.php | 10 ++++++++++ 1 file changed, 10 insertions(+) commit bb51901b3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 14 13:38:43 2016 +0100 Added config options to allow users (or just admins) to specify that an email shouldn't be sent when making a booking. Useful if you are just making a minor change or are creating a whole lot of bookings at the beginning of a term or season. See SF Support requests #974. web/css/mrbs.css.php | 7 ++++++- web/edit_entry.php | 24 +++++++++++++++++++++++- web/edit_entry_handler.php | 14 +++++++++++++- web/lang/lang.en | 1 + web/systemdefaults.inc.php | 6 ++++++ 5 files changed, 49 insertions(+), 3 deletions(-) commit 5feee2877 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 13 16:27:16 2016 +0100 Added missing semicolon web/js/general.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a3760b9f9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 13 16:20:57 2016 +0100 Fixed problem with Chrome not showing datalist options (see SF bugs #360). web/functions.inc | 22 +++++++----- web/js/general.js.php | 77 +++++++++++++++++++++++++++++++---------- 2 files changed, 72 insertions(+), 27 deletions(-) commit 4130b3326 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 7 16:43:44 2016 +0100 Modified systemdefaults.inc.php to give info to site admins who do not want to use booking types web/systemdefaults.inc.php | 4 ++++ 1 file changed, 4 insertions(+) commit 83a200de1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 7 16:35:15 2016 +0100 Ignored type field in reports if there are fewer than two types web/report.php | 47 +++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) commit 1e62ecb14 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 7 16:12:06 2016 +0100 Removed type from email notifications if there are fewer than two booking types. web/functions_mail.inc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) commit 1114da815 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 7 16:01:54 2016 +0100 Removed type from view_entry if there are fewer than two booking types. web/functions_view.inc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) commit 430943a0c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 7 15:57:02 2016 +0100 Removed the type field from the booking form if there are fewer than two types. (The default type is used for the booking when writing to the database). web/edit_entry.php | 6 ++++++ web/edit_entry_handler.php | 4 ++++ 2 files changed, 10 insertions(+) commit 84420d086 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 6 18:38:22 2016 +0100 Modified show_colour_key() so that the colour key is not shown if there are fewer than two types. (See SF Support Requests #1019) web/functions.inc | 8 ++++++++ 1 file changed, 8 insertions(+) commit 78279211d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun May 29 14:22:00 2016 +0100 Fixed problem with week number link in mincals. See SF Bugs #357. web/mincals.inc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) commit e5cbc6d98 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun May 29 12:35:43 2016 +0100 Simplified code web/mincals.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 0549d154a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon May 9 07:15:04 2016 +0100 Fixed validation of email addresses to allow for addresses that include a display name web/functions_mail.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit dce2a05a4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 25 16:15:30 2016 +0100 Added '' as an option for $smtp_settings['secure']. See SF Support Requests #954. web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e0a447b9f Merge: 9aa65aa04 27d4598be Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 20 16:30:02 2016 +0100 Merge commit 9aa65aa04 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 20 16:28:44 2016 +0100 Fixed problem with long words in brief descriptions causing unequal width columns in the calendar views. See SF Support Requests #951. web/css/mrbs.css.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit 27d4598be Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Apr 13 16:53:06 2016 +0100 Added a little more debug into the LDAP auth code. web/auth/auth_ldap.inc | 2 ++ 1 file changed, 2 insertions(+) commit a76ee252b Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Apr 8 17:54:56 2016 +0100 Minor changes to LDAP debug to improve clarity web/auth/auth_ldap.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1c760472e Merge: 7b7b85bb9 7aa85bf13 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 5 13:09:32 2016 +0100 Merge commit 7aa85bf13 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 5 13:05:24 2016 +0100 Removed some debug code which had been accidentally committed web/functions_ical.inc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) commit 7b7b85bb9 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Mar 24 23:43:29 2016 +0000 Added Italian translation contributor's name web/lang/lang.it | 1 + 1 file changed, 1 insertion(+) commit 1d40d4b3f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 5 07:58:19 2016 +0000 When a field with $select_options or $datalist_options is being used in the report form, remove any options that have an empty key or value as they will be meaningless for the search. web/report.php | 5 +++++ 1 file changed, 5 insertions(+) commit 36c6bb725 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 3 17:27:30 2016 +0000 Added a datalist input to report inputs when the standard fields have select_options or datalist_options defined. See SF Support Requests #909 web/report.php | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) commit 27f4179e3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 3 17:07:46 2016 +0000 Fixed datalists so that empty strings aren't presented as options web/functions.inc | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) commit eef1b8000 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 3 16:59:22 2016 +0000 Restructured code web/report.php | 58 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 19 deletions(-) commit eac343699 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 3 16:03:56 2016 +0000 Restructured code web/report.php | 103 ++++++++++++++++++++++++++--------------------- 1 file changed, 56 insertions(+), 47 deletions(-) commit 253085c4e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 3 11:13:52 2016 +0000 Restructured code web/report.php | 117 ++++++++++++++++++++++++++--------------------- 1 file changed, 64 insertions(+), 53 deletions(-) commit 263b14564 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 2 14:19:23 2016 +0000 Removed disabling off error reporting for the connection to the dabase during a database upgrade. If the site admin wants errors to go to the browser, eg for debugging, then they should. web/dbsys.inc | 5 ----- 1 file changed, 5 deletions(-) commit 3f3709bbf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 1 09:42:00 2016 +0000 Replaced calls to file_exists() with is_readable() to cover the theoretical case when a file exists but doesn't have read permissions. web/edit_area_room.php | 2 +- web/functions.inc | 4 ++-- web/functions_ical.inc | 4 ++-- web/functions_mail.inc | 2 +- web/js.inc | 4 ++-- web/language.inc | 8 ++++---- web/lib/autoload.inc | 2 +- web/upgrade.inc | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) commit 4ba56bcea Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 1 09:24:35 2016 +0000 Fixed bug (academic only) causing persistent connections not to be used when running mysqli and PHP 5.3.0 web/mysqli.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 022186bdc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 27 18:51:59 2016 +0000 Changed the default character encoding for CSV files as the latest versions of Excel now seem to recognise UTF-8 automatically. web/systemdefaults.inc.php | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) commit 1ac92ff6f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 27 16:27:48 2016 +0000 Sorted by area sort_key where appropriate web/admin.php | 2 +- web/edit_entry.php | 2 +- web/functions.inc | 4 ++-- web/report.php | 11 +++-------- 4 files changed, 7 insertions(+), 12 deletions(-) commit 1808e996a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 27 15:12:41 2016 +0000 Sorted areas by sort_key web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit fe9e2fb3a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 27 13:36:28 2016 +0000 Allowed the area sort_key to be edited (but it still isn't used for sorting) web/edit_area_room.php | 10 ++++++++++ 1 file changed, 10 insertions(+) commit 5cbcbfe8c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 27 13:26:00 2016 +0000 Changed order of fields in form for better clarity web/edit_area_room.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) commit 19f5af02b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 27 13:20:42 2016 +0000 Added a sort key for the area table (doesn't do anything yet) tables.my.sql | 3 ++- tables.pg.sql | 3 ++- web/dbsys.inc | 2 +- web/mrbs_sql.inc | 3 ++- web/report.php | 4 ++-- web/upgrade/49/mysql.sql (new) | 10 ++++++++++ web/upgrade/49/pgsql.sql (new) | 10 ++++++++++ 7 files changed, 29 insertions(+), 6 deletions(-) commit 276338d12 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 19 17:26:06 2016 +0000 Restructured code web/edit_area_room.php | 13 +++++++++++-- web/functions_mail.inc | 11 ----------- 2 files changed, 11 insertions(+), 13 deletions(-) commit c80e3b0c4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 19 16:26:29 2016 +0000 Restructured code and fixed bug introduced in recent changes web/defaultincludes.inc | 1 + web/functions.inc | 2 -- web/functions_mail.inc | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) commit e9c058ca7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 19 16:08:50 2016 +0000 Fixed bug introduced in last change web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bdb24f1a6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 19 15:48:27 2016 +0000 Switched to using PHPMailer's email address validation web/functions.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 61ec7d1a6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 19 14:15:11 2016 +0000 Tweaked last change (changeset 2a31d5467ac8) web/functions.inc | 9 ++++++++- web/functions_mail.inc | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) commit d9b027c5b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 19 13:28:48 2016 +0000 Added some email address validation (see SF Support Requests #897) web/functions_mail.inc | 6 ++++++ 1 file changed, 6 insertions(+) commit 9c043d8ee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 19 13:26:41 2016 +0000 Xixed bug introduced in last change (changeset 9787b28ead03) web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ed4969cdc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 15 10:21:42 2016 +0000 Added room name to conflict details following suggestion on general mailing list. web/mrbs_sql.inc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) commit 27d96cd7e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 15 09:50:20 2016 +0000 Updated Polish translation. Thanks to Anonymous from SF Bugs #347. web/lang/lang.pl | 205 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 202 insertions(+), 3 deletions(-) commit 95438eb1e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 14 16:25:56 2016 +0000 Fixed bug when requesting More Info. See SF Bugs #347. web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0139d015e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 12 14:38:13 2016 +0000 Removed redundant global declarations. web/Themes/default/header.inc | 1 - 1 file changed, 1 deletion(-) commit 712613fd8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 12 14:30:40 2016 +0000 Fixed problem whereby the locale could not be set when automatic language changing was disabled and no override locale was set. See SF Support Requests #891. web/language.inc | 134 +++++++++++++++++++++++---------------------- 1 file changed, 69 insertions(+), 65 deletions(-) commit 6320d9f24 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 28 20:29:19 2016 +0000 Simplified code web/edit_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 3874c0d41 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 28 20:19:10 2016 +0000 Made the JavaScript code handling mandatory fields on the edit_entry page a little bit more generic. web/js/edit_entry.js.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) commit b421ecdf4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 28 09:46:48 2016 +0000 Added a comment web/edit_entry.php | 1 + 1 file changed, 1 insertion(+) commit 0efbdb558 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 28 09:34:43 2016 +0000 Allowed the type field to be mandatory (see SF Support Requests 876) web/edit_entry.php | 12 +++++++++--- web/functions_ical.inc | 7 +++++++ web/js/edit_entry.js.php | 4 +++- web/lang/lang.en | 1 + web/systemdefaults.inc.php | 9 ++++++--- 5 files changed, 26 insertions(+), 7 deletions(-) commit 4232a0bdb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 18 21:08:32 2016 +0000 Changed the behaviour of MRBS when making a repeat booking that results in just a single entry (for example a daily repeat starting and ending on the same day). Previously this was treated as a special case and converted into a single entry. However it seems more logical to treat it as a series with just one entry. This enables the repeat characteristics to be edited in the future. web/mrbs_sql.inc | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) commit ea961d35d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 18 20:54:54 2016 +0000 Fixed bug causing a booking to be made even if the specified repeat results in no bookings (eg a weekly repeat for Thursdays starting and ending on the same day, which isn't a Thursday) web/mrbs_sql.inc | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) commit 02a3b5f9a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 17 20:29:33 2016 +0000 Removed unnecessary trailing space from the result of get_rep_day_list() web/functions.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) commit 7c759a101 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 13 14:21:34 2016 +0000 Fixed bug in CSV reports when running on Windows (see SF Support Requests 860) web/language.inc | 2 +- web/report.php | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) commit f304ff81f Author: Markus Gilli <m.gi@gmx.ch> Date: Mon Jan 4 23:55:49 2016 +0100 allow to read user access level from external database AUTHENTICATION | 7 ++++++- web/auth/auth_db_ext.inc | 39 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) commit 2fc1e2d1f Author: Markus Gilli <m.gi@gmx.ch> Date: Mon Jan 4 22:56:41 2016 +0100 added sha256 authentication support for db_ext web/auth/auth_db_ext.inc | 7 +++++++ 1 file changed, 7 insertions(+) commit f81269bf2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 4 18:22:04 2016 +0000 Corrected an HTML5 validation error when using a display name containing spaces in $mrbs_admin_email web/help.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7ed057675 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 3 10:28:44 2016 +0000 Moved some SQL into mebs_sql.inc web/edit_area_room.php | 18 +++++++++--------- web/mrbs_sql.inc | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 10 deletions(-) commit bce22e8cd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 3 09:23:18 2016 +0000 Added comments web/mrbs_sql.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 825304d29 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 3 08:58:21 2016 +0000 Moved some SQL into mrbs_sql.inc web/edit_area_room.php | 32 ++++++++++++++++---------------- web/mrbs_sql.inc | 26 ++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 16 deletions(-) commit 1420a52c0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 30 10:37:47 2015 +0000 Fixed potential bug when getWritable() makes use of the $room parameter web/functions_table.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 21b9ebba0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 22 14:46:42 2015 +0000 Changed MRBS default behaviour to be *not* to use persistent database connections, as they can cause problems with transactions and locks. At the same time changed the config variable to be $db_persist instead of $db_nopersist. INSTALL | 17 +++++++++-------- README.sqlapi | 12 ++++++------ tables.my.sql | 2 +- tables.pg.sql | 2 +- web/config.inc.php | 9 +++++++-- web/dbsys.inc | 2 +- web/internalconfig.inc.php | 9 +++++++++ web/mysqli.inc | 8 ++------ web/pgsql.inc | 9 ++------- web/systemdefaults.inc.php | 9 +++++++-- web/upgrade/48/mysql.sql (new) | 1 + web/upgrade/48/pgsql.sql (new) | 0 web/upgrade/48/post.inc (new) | 15 +++++++++++++++ 13 files changed, 61 insertions(+), 34 deletions(-) commit a707cfae2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 19 16:19:15 2015 +0000 Restructured code web/mrbs_sql.inc | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) commit 8dded74c6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 19 16:05:15 2015 +0000 Fixed bug whereby the conflict checker wasn't firing when the repeat end date changed web/js/edit_entry.js.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) commit cde235bd6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 19 15:42:54 2015 +0000 Added some sql_free() calls for good measure and at the same time modified sql_free() to do nothing if the argument is not a resource (probably because it has already been freed) web/dbsys.inc | 9 ++++++++- web/mrbs_sql.inc | 8 ++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) commit 0083f9e63 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 19 15:23:51 2015 +0000 Moved some SQL into mrbs_sql.inc web/edit_entry.php | 48 +++++++++++++++++--------------------------- web/mrbs_sql.inc | 23 +++++++++++++++++++++ 2 files changed, 41 insertions(+), 30 deletions(-) commit a5fc27190 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 19 14:56:41 2015 +0000 Fixed issue with undefined variable web/edit_entry.php | 8 ++++++++ 1 file changed, 8 insertions(+) commit 3f47c564e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 19 10:15:30 2015 +0000 Fixed bug whereby the limit on the number of bookings isn't applied properly if an existing series is being modified and there is at least one single entry in the same interval. web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 21dd3511a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 18 17:54:24 2015 +0000 Removed some more SQL from functions_table.inc web/functions_table.inc | 21 +++++---------------- web/mrbs_sql.inc | 16 +++++++++------- 2 files changed, 14 insertions(+), 23 deletions(-) commit c82a5e48d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 18 16:42:13 2015 +0000 Fixed bug that caused MRBS to miss conflicts with single entries when modifying a series. See SF Bugs #338. web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 240816f1a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 18 14:33:50 2015 +0000 Fixed problem with day links in the wek view. See SF bugs #339 web/functions_table.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 290409a7b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 16 21:33:34 2015 +0000 Changed parameter name for consistency web/functions_table.inc | 52 +++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 26 deletions(-) commit 1492ae952 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 16 21:26:57 2015 +0000 Changed parameter names for consistency web/functions_table.inc | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) commit 3297d3701 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 16 21:22:03 2015 +0000 Removed unnecesary global web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 95fda8db0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 16 21:19:43 2015 +0000 Moved some SQL into mrbs_sql.inc web/functions_table.inc | 43 +++---------------------------- web/mrbs_sql.inc | 53 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 39 deletions(-) commit d37b9126a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 16 19:07:29 2015 +0000 Removed redundant globals web/functions_table.inc | 1 - 1 file changed, 1 deletion(-) commit 0880d6367 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 16 19:05:00 2015 +0000 Moved SQL into mrbs_sql.inc web/functions_table.inc | 44 +++++---------------------------------- 1 file changed, 5 insertions(+), 39 deletions(-) commit eb356a38e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 16 18:41:07 2015 +0000 Simplified web/functions_table.inc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) commit ce9c0fe50 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 16 18:24:55 2015 +0000 Simplified web/functions_table.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) commit 34e316689 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 16 18:20:31 2015 +0000 Simplified web/functions_table.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) commit 64a7db655 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 16 18:14:56 2015 +0000 Simplified web/functions_table.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit cfae3dce4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 16 18:10:10 2015 +0000 Simplified web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 032ecde2a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 16 18:05:16 2015 +0000 Renamed get_areas() to get_area_names() for consistency with get_rooms() web/edit_area_room.php | 2 +- web/functions.inc | 2 +- web/mrbs_sql.inc | 67 ++++++++++++++++++++-------------------- 3 files changed, 36 insertions(+), 35 deletions(-) commit 875dd4872 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 15 19:00:06 2015 +0000 Got rid of some more SQL web/functions_table.inc | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) commit 7ec6df0b9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 15 18:56:52 2015 +0000 Renamed parameter, for consistency web/functions_table.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit c8e15f17c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 15 18:52:55 2015 +0000 Restructured, moving some SQL into mrbs_sql.inc web/dbsys.inc | 27 +++++++++++++++ web/functions_table.inc | 70 ++++++++++++++------------------------- web/mrbs_sql.inc | 29 ++++++++++++++++ 3 files changed, 80 insertions(+), 46 deletions(-) commit ae8d110f9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 5 15:38:01 2015 +0000 Added quoting of the table name in a qualified identifier to sql_quote(). web/dbsys.inc | 2 ++ web/mysqli.inc | 22 ++++------------------ web/pgsql.inc | 34 ++++++++++++++++------------------ 3 files changed, 22 insertions(+), 36 deletions(-) commit d78a66658 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 4 13:24:16 2015 +0000 Fixed bug in reports: the case sensitivity of types was not being recognised (see SF Support Requests #776) web/mysqli.inc | 18 +++++++++++++++++- web/pgsql.inc | 18 +++++++++++++++++- web/report.php | 16 +++++----------- 3 files changed, 39 insertions(+), 13 deletions(-) commit f41b146c9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 24 17:11:59 2015 +0000 Moved SQL error handling into sql_query1() to avoid having to check for errors after every call. web/Themes/default/header.inc | 1 - web/auth/auth_db.inc | 27 ++-------------- web/edit_entry_handler.php | 1 - web/functions_mail.inc | 14 +++------ web/functions_table.inc | 8 +---- web/import.php | 56 +++++++++++---------------------- web/mrbs_sql.inc | 7 +---- web/mysqli.inc | 9 ++---- web/pgsql.inc | 11 +++---- web/search.php | 1 - 10 files changed, 32 insertions(+), 103 deletions(-) commit 3877d8fb3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 17 15:55:59 2015 +0000 Added a comment web/defaultincludes.inc | 2 ++ 1 file changed, 2 insertions(+) commit 54337d501 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 17 15:50:35 2015 +0000 Moved the PHP version check to happen earlier, otherwise MRBS will fail with obscure error messages if the PHP version is too low. See SF Bugs #337. web/defaultincludes.inc | 7 +++++++ web/internalconfig.inc.php | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) commit fd8f576da Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 14 16:57:15 2015 +0000 Fixed a problem with the end time not being selected on the booking form if the default duration is not an integral number of slots web/edit_entry.php | 10 ++++++++++ 1 file changed, 10 insertions(+) commit e69c05b09 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Nov 13 18:48:49 2015 +0000 Improved debugging in auth_ldap a bit, to show errors from the ldap extension. web/auth/auth_ldap.inc | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) commit 52c9cf83a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 9 11:19:44 2015 +0000 Added a check to make sure that custom field names don't contain spaces. (See SF Support Requests #816) web/mrbs_sql.inc | 10 ++++++++++ 1 file changed, 10 insertions(+) commit 18c4e594b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 9 10:43:55 2015 +0000 Fixed another problem with unquoted column names web/search.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 3f5605934 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 9 10:30:36 2015 +0000 Fixed bug with unquoted column names. See SF Support Requests #816. web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 974433401 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 6 16:53:57 2015 +0000 Expanded comments about changing the 'mrbs_' prefix. See SF bugs #336 tables.my.sql | 5 +++-- tables.pg.sql | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) commit 28613a1e6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 5 07:53:31 2015 +0000 Cached resiults in authGetUserLevel() in order to improve performance. See SF Bugs #335. web/auth/auth_ldap.inc | 57 +++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 15 deletions(-) commit 09aec8c06 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 4 10:41:15 2015 +0000 Added a return NULL statement to make it clear what's happening (no change to result) web/session/session_php.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit c780330f2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 26 12:11:04 2015 +0000 Updated the timezone definition files .../zoneinfo-outlook/Africa/Abidjan.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Accra.ics | 2 +- .../zoneinfo-outlook/Africa/Addis_Ababa.ics | 2 +- .../zoneinfo-outlook/Africa/Algiers.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Asmara.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Bamako.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Bangui.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Banjul.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Bissau.ics | 2 +- .../zoneinfo-outlook/Africa/Blantyre.ics | 2 +- .../zoneinfo-outlook/Africa/Brazzaville.ics | 2 +- .../zoneinfo-outlook/Africa/Bujumbura.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Cairo.ics | 14 +- .../zoneinfo-outlook/Africa/Casablanca.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Ceuta.ics | 2 +- .../zoneinfo-outlook/Africa/Conakry.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Dakar.ics | 2 +- .../Africa/Dar_es_Salaam.ics | 2 +- .../zoneinfo-outlook/Africa/Djibouti.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Douala.ics | 2 +- .../zoneinfo-outlook/Africa/El_Aaiun.ics | 2 +- .../zoneinfo-outlook/Africa/Freetown.ics | 2 +- .../zoneinfo-outlook/Africa/Gaborone.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Harare.ics | 2 +- .../zoneinfo-outlook/Africa/Johannesburg.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Juba.ics | 2 +- .../zoneinfo-outlook/Africa/Kampala.ics | 2 +- .../zoneinfo-outlook/Africa/Khartoum.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Kigali.ics | 2 +- .../zoneinfo-outlook/Africa/Kinshasa.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Lagos.ics | 2 +- .../zoneinfo-outlook/Africa/Libreville.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Lome.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Luanda.ics | 2 +- .../zoneinfo-outlook/Africa/Lubumbashi.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Lusaka.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Malabo.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Maputo.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Maseru.ics | 2 +- .../zoneinfo-outlook/Africa/Mbabane.ics | 2 +- .../zoneinfo-outlook/Africa/Mogadishu.ics | 2 +- .../zoneinfo-outlook/Africa/Monrovia.ics | 2 +- .../zoneinfo-outlook/Africa/Nairobi.ics | 2 +- .../zoneinfo-outlook/Africa/Ndjamena.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Niamey.ics | 2 +- .../zoneinfo-outlook/Africa/Nouakchott.ics | 2 +- .../zoneinfo-outlook/Africa/Ouagadougou.ics | 2 +- .../zoneinfo-outlook/Africa/Porto-Novo.ics | 2 +- .../zoneinfo-outlook/Africa/Sao_Tome.ics | 2 +- .../zoneinfo-outlook/Africa/Tripoli.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Tunis.ics | 2 +- .../zoneinfo-outlook/Africa/Windhoek.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Adak.ics | 6 +- .../zoneinfo-outlook/America/Anchorage.ics | 2 +- .../zoneinfo-outlook/America/Anguilla.ics | 2 +- .../zoneinfo-outlook/America/Antigua.ics | 2 +- .../zoneinfo-outlook/America/Araguaina.ics | 2 +- .../America/Argentina/Buenos_Aires.ics | 2 +- .../America/Argentina/Catamarca.ics | 2 +- .../America/Argentina/Cordoba.ics | 2 +- .../America/Argentina/Jujuy.ics | 2 +- .../America/Argentina/La_Rioja.ics | 2 +- .../America/Argentina/Mendoza.ics | 2 +- .../America/Argentina/Rio_Gallegos.ics | 2 +- .../America/Argentina/Salta.ics | 2 +- .../America/Argentina/San_Juan.ics | 2 +- .../America/Argentina/San_Luis.ics | 2 +- .../America/Argentina/Tucuman.ics | 2 +- .../America/Argentina/Ushuaia.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Aruba.ics | 2 +- .../zoneinfo-outlook/America/Asuncion.ics | 2 +- .../zoneinfo-outlook/America/Atikokan.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Bahia.ics | 2 +- .../America/Bahia_Banderas.ics | 2 +- .../zoneinfo-outlook/America/Barbados.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Belem.ics | 2 +- .../zoneinfo-outlook/America/Belize.ics | 2 +- .../America/Blanc-Sablon.ics | 2 +- .../zoneinfo-outlook/America/Boa_Vista.ics | 2 +- .../zoneinfo-outlook/America/Bogota.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Boise.ics | 2 +- .../America/Cambridge_Bay.ics | 2 +- .../America/Campo_Grande.ics | 2 +- .../zoneinfo-outlook/America/Cancun.ics | 16 +- .../zoneinfo-outlook/America/Caracas.ics | 2 +- .../zoneinfo-outlook/America/Cayenne.ics | 2 +- .../zoneinfo-outlook/America/Cayman.ics | 14 +- .../zoneinfo-outlook/America/Chicago.ics | 2 +- .../zoneinfo-outlook/America/Chihuahua.ics | 2 +- .../zoneinfo-outlook/America/Costa_Rica.ics | 2 +- .../zoneinfo-outlook/America/Creston.ics | 2 +- .../zoneinfo-outlook/America/Cuiaba.ics | 2 +- .../zoneinfo-outlook/America/Curacao.ics | 2 +- .../America/Danmarkshavn.ics | 2 +- .../zoneinfo-outlook/America/Dawson.ics | 2 +- .../America/Dawson_Creek.ics | 2 +- .../zoneinfo-outlook/America/Denver.ics | 2 +- .../zoneinfo-outlook/America/Detroit.ics | 2 +- .../zoneinfo-outlook/America/Dominica.ics | 2 +- .../zoneinfo-outlook/America/Edmonton.ics | 2 +- .../zoneinfo-outlook/America/Eirunepe.ics | 2 +- .../zoneinfo-outlook/America/El_Salvador.ics | 2 +- .../America/Fort_Nelson.ics (new) | 15 ++ .../zoneinfo-outlook/America/Fortaleza.ics | 2 +- .../zoneinfo-outlook/America/Glace_Bay.ics | 2 +- .../zoneinfo-outlook/America/Godthab.ics | 2 +- .../zoneinfo-outlook/America/Goose_Bay.ics | 2 +- .../zoneinfo-outlook/America/Grand_Turk.ics | 2 +- .../zoneinfo-outlook/America/Grenada.ics | 2 +- .../zoneinfo-outlook/America/Guadeloupe.ics | 2 +- .../zoneinfo-outlook/America/Guatemala.ics | 2 +- .../zoneinfo-outlook/America/Guayaquil.ics | 2 +- .../zoneinfo-outlook/America/Guyana.ics | 2 +- .../zoneinfo-outlook/America/Halifax.ics | 2 +- .../zoneinfo-outlook/America/Havana.ics | 2 +- .../zoneinfo-outlook/America/Hermosillo.ics | 2 +- .../America/Indiana/Indianapolis.ics | 2 +- .../America/Indiana/Knox.ics | 2 +- .../America/Indiana/Marengo.ics | 2 +- .../America/Indiana/Petersburg.ics | 2 +- .../America/Indiana/Tell_City.ics | 2 +- .../America/Indiana/Vevay.ics | 2 +- .../America/Indiana/Vincennes.ics | 2 +- .../America/Indiana/Winamac.ics | 2 +- .../zoneinfo-outlook/America/Inuvik.ics | 2 +- .../zoneinfo-outlook/America/Iqaluit.ics | 2 +- .../zoneinfo-outlook/America/Juneau.ics | 2 +- .../America/Kentucky/Louisville.ics | 2 +- .../America/Kentucky/Monticello.ics | 2 +- .../zoneinfo-outlook/America/Kralendijk.ics | 2 +- .../zoneinfo-outlook/America/La_Paz.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Lima.ics | 2 +- .../zoneinfo-outlook/America/Los_Angeles.ics | 2 +- .../America/Lower_Princes.ics | 2 +- .../zoneinfo-outlook/America/Maceio.ics | 2 +- .../zoneinfo-outlook/America/Managua.ics | 2 +- .../zoneinfo-outlook/America/Manaus.ics | 2 +- .../zoneinfo-outlook/America/Marigot.ics | 2 +- .../zoneinfo-outlook/America/Martinique.ics | 2 +- .../zoneinfo-outlook/America/Matamoros.ics | 2 +- .../zoneinfo-outlook/America/Mazatlan.ics | 2 +- .../zoneinfo-outlook/America/Menominee.ics | 2 +- .../zoneinfo-outlook/America/Merida.ics | 2 +- .../zoneinfo-outlook/America/Metlakatla.ics | 2 +- .../zoneinfo-outlook/America/Mexico_City.ics | 2 +- .../zoneinfo-outlook/America/Miquelon.ics | 2 +- .../zoneinfo-outlook/America/Moncton.ics | 2 +- .../zoneinfo-outlook/America/Monterrey.ics | 2 +- .../zoneinfo-outlook/America/Montevideo.ics | 14 +- .../America/Montreal.ics (gone) | 23 --- .../zoneinfo-outlook/America/Montserrat.ics | 2 +- .../zoneinfo-outlook/America/Nassau.ics | 2 +- .../zoneinfo-outlook/America/New_York.ics | 2 +- .../zoneinfo-outlook/America/Nipigon.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Nome.ics | 2 +- .../zoneinfo-outlook/America/Noronha.ics | 2 +- .../America/North_Dakota/Beulah.ics | 2 +- .../America/North_Dakota/Center.ics | 2 +- .../America/North_Dakota/New_Salem.ics | 2 +- .../zoneinfo-outlook/America/Ojinaga.ics | 2 +- .../zoneinfo-outlook/America/Panama.ics | 2 +- .../zoneinfo-outlook/America/Pangnirtung.ics | 2 +- .../zoneinfo-outlook/America/Paramaribo.ics | 2 +- .../zoneinfo-outlook/America/Phoenix.ics | 2 +- .../America/Port-au-Prince.ics | 2 +- .../America/Port_of_Spain.ics | 2 +- .../zoneinfo-outlook/America/Porto_Velho.ics | 2 +- .../zoneinfo-outlook/America/Puerto_Rico.ics | 2 +- .../zoneinfo-outlook/America/Rainy_River.ics | 2 +- .../America/Rankin_Inlet.ics | 2 +- .../zoneinfo-outlook/America/Recife.ics | 2 +- .../zoneinfo-outlook/America/Regina.ics | 2 +- .../zoneinfo-outlook/America/Resolute.ics | 2 +- .../zoneinfo-outlook/America/Rio_Branco.ics | 2 +- .../America/Santa_Isabel.ics | 2 +- .../zoneinfo-outlook/America/Santarem.ics | 2 +- .../zoneinfo-outlook/America/Santiago.ics | 14 +- .../America/Santo_Domingo.ics | 2 +- .../zoneinfo-outlook/America/Sao_Paulo.ics | 2 +- .../America/Scoresbysund.ics | 2 +- .../America/Shiprock.ics (gone) | 23 --- web/tzurl/zoneinfo-outlook/America/Sitka.ics | 2 +- .../America/St_Barthelemy.ics | 2 +- .../zoneinfo-outlook/America/St_Johns.ics | 2 +- .../zoneinfo-outlook/America/St_Kitts.ics | 2 +- .../zoneinfo-outlook/America/St_Lucia.ics | 2 +- .../zoneinfo-outlook/America/St_Thomas.ics | 2 +- .../zoneinfo-outlook/America/St_Vincent.ics | 2 +- .../America/Swift_Current.ics | 2 +- .../zoneinfo-outlook/America/Tegucigalpa.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Thule.ics | 2 +- .../zoneinfo-outlook/America/Thunder_Bay.ics | 2 +- .../zoneinfo-outlook/America/Tijuana.ics | 2 +- .../zoneinfo-outlook/America/Toronto.ics | 2 +- .../zoneinfo-outlook/America/Tortola.ics | 2 +- .../zoneinfo-outlook/America/Vancouver.ics | 2 +- .../zoneinfo-outlook/America/Whitehorse.ics | 2 +- .../zoneinfo-outlook/America/Winnipeg.ics | 2 +- .../zoneinfo-outlook/America/Yakutat.ics | 2 +- .../zoneinfo-outlook/America/Yellowknife.ics | 2 +- .../zoneinfo-outlook/Antarctica/Casey.ics | 2 +- .../zoneinfo-outlook/Antarctica/Davis.ics | 2 +- .../Antarctica/DumontDUrville.ics | 2 +- .../Antarctica/Macquarie.ics | 2 +- .../zoneinfo-outlook/Antarctica/Mawson.ics | 2 +- .../zoneinfo-outlook/Antarctica/McMurdo.ics | 2 +- .../zoneinfo-outlook/Antarctica/Palmer.ics | 14 +- .../zoneinfo-outlook/Antarctica/Rothera.ics | 2 +- .../Antarctica/South_Pole.ics (gone) | 23 --- .../zoneinfo-outlook/Antarctica/Syowa.ics | 2 +- .../zoneinfo-outlook/Antarctica/Troll.ics | 2 +- .../zoneinfo-outlook/Antarctica/Vostok.ics | 2 +- .../zoneinfo-outlook/Arctic/Longyearbyen.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Aden.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Almaty.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Amman.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Anadyr.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Aqtau.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Aqtobe.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Ashgabat.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Baghdad.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Bahrain.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Baku.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Bangkok.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Beirut.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Bishkek.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Brunei.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Chita.ics | 2 +- .../zoneinfo-outlook/Asia/Choibalsan.ics | 15 +- .../Asia/Chongqing.ics (gone) | 15 -- web/tzurl/zoneinfo-outlook/Asia/Colombo.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Damascus.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Dhaka.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Dili.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Dubai.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Dushanbe.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Gaza.ics | 20 +- .../zoneinfo-outlook/Asia/Harbin.ics (gone) | 15 -- web/tzurl/zoneinfo-outlook/Asia/Hebron.ics | 20 +- .../zoneinfo-outlook/Asia/Ho_Chi_Minh.ics | 2 +- .../zoneinfo-outlook/Asia/Hong_Kong.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Hovd.ics | 14 +- web/tzurl/zoneinfo-outlook/Asia/Irkutsk.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Istanbul.ics | 16 +- web/tzurl/zoneinfo-outlook/Asia/Jakarta.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Jayapura.ics | 2 +- .../zoneinfo-outlook/Asia/Jerusalem.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Kabul.ics | 2 +- .../zoneinfo-outlook/Asia/Kamchatka.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Karachi.ics | 2 +- .../zoneinfo-outlook/Asia/Kathmandu.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Khandyga.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Kolkata.ics | 2 +- .../zoneinfo-outlook/Asia/Krasnoyarsk.ics | 2 +- .../zoneinfo-outlook/Asia/Kuala_Lumpur.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Kuching.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Kuwait.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Macau.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Magadan.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Makassar.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Manila.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Muscat.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Nicosia.ics | 2 +- .../zoneinfo-outlook/Asia/Novokuznetsk.ics | 2 +- .../zoneinfo-outlook/Asia/Novosibirsk.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Omsk.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Oral.ics | 2 +- .../zoneinfo-outlook/Asia/Phnom_Penh.ics | 2 +- .../zoneinfo-outlook/Asia/Pontianak.ics | 2 +- .../zoneinfo-outlook/Asia/Pyongyang.ics | 6 +- web/tzurl/zoneinfo-outlook/Asia/Qatar.ics | 2 +- .../zoneinfo-outlook/Asia/Qyzylorda.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Rangoon.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Riyadh.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Sakhalin.ics | 2 +- .../zoneinfo-outlook/Asia/Samarkand.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Seoul.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Shanghai.ics | 2 +- .../zoneinfo-outlook/Asia/Singapore.ics | 2 +- .../zoneinfo-outlook/Asia/Srednekolymsk.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Taipei.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Tashkent.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Tbilisi.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Tehran.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Thimphu.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Tokyo.ics | 2 +- .../zoneinfo-outlook/Asia/Ulaanbaatar.ics | 14 +- web/tzurl/zoneinfo-outlook/Asia/Urumqi.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Ust-Nera.ics | 2 +- .../zoneinfo-outlook/Asia/Vientiane.ics | 2 +- .../zoneinfo-outlook/Asia/Vladivostok.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Yakutsk.ics | 2 +- .../zoneinfo-outlook/Asia/Yekaterinburg.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Yerevan.ics | 2 +- .../zoneinfo-outlook/Atlantic/Azores.ics | 2 +- .../zoneinfo-outlook/Atlantic/Bermuda.ics | 2 +- .../zoneinfo-outlook/Atlantic/Canary.ics | 2 +- .../zoneinfo-outlook/Atlantic/Cape_Verde.ics | 2 +- .../zoneinfo-outlook/Atlantic/Faroe.ics | 2 +- .../zoneinfo-outlook/Atlantic/Madeira.ics | 2 +- .../zoneinfo-outlook/Atlantic/Reykjavik.ics | 2 +- .../Atlantic/South_Georgia.ics | 2 +- .../zoneinfo-outlook/Atlantic/St_Helena.ics | 2 +- .../zoneinfo-outlook/Atlantic/Stanley.ics | 2 +- .../zoneinfo-outlook/Australia/Adelaide.ics | 2 +- .../zoneinfo-outlook/Australia/Brisbane.ics | 2 +- .../zoneinfo-outlook/Australia/Currie.ics | 2 +- .../zoneinfo-outlook/Australia/Darwin.ics | 2 +- .../zoneinfo-outlook/Australia/Eucla.ics | 2 +- .../zoneinfo-outlook/Australia/Hobart.ics | 2 +- .../zoneinfo-outlook/Australia/Lindeman.ics | 2 +- .../zoneinfo-outlook/Australia/Lord_Howe.ics | 2 +- .../zoneinfo-outlook/Australia/Melbourne.ics | 2 +- .../zoneinfo-outlook/Australia/Perth.ics | 2 +- .../zoneinfo-outlook/Australia/Sydney.ics | 2 +- .../zoneinfo-outlook/Europe/Amsterdam.ics | 2 +- .../zoneinfo-outlook/Europe/Andorra.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Athens.ics | 2 +- .../zoneinfo-outlook/Europe/Belgrade.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Berlin.ics | 2 +- .../zoneinfo-outlook/Europe/Bratislava.ics | 2 +- .../zoneinfo-outlook/Europe/Brussels.ics | 2 +- .../zoneinfo-outlook/Europe/Bucharest.ics | 2 +- .../zoneinfo-outlook/Europe/Budapest.ics | 2 +- .../zoneinfo-outlook/Europe/Busingen.ics | 2 +- .../zoneinfo-outlook/Europe/Chisinau.ics | 6 +- .../zoneinfo-outlook/Europe/Copenhagen.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Dublin.ics | 2 +- .../zoneinfo-outlook/Europe/Gibraltar.ics | 2 +- .../zoneinfo-outlook/Europe/Guernsey.ics | 2 +- .../zoneinfo-outlook/Europe/Helsinki.ics | 2 +- .../zoneinfo-outlook/Europe/Isle_of_Man.ics | 2 +- .../zoneinfo-outlook/Europe/Istanbul.ics | 16 +- web/tzurl/zoneinfo-outlook/Europe/Jersey.ics | 2 +- .../zoneinfo-outlook/Europe/Kaliningrad.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Kiev.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Lisbon.ics | 2 +- .../zoneinfo-outlook/Europe/Ljubljana.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/London.ics | 2 +- .../zoneinfo-outlook/Europe/Luxembourg.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Madrid.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Malta.ics | 2 +- .../zoneinfo-outlook/Europe/Mariehamn.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Minsk.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Monaco.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Moscow.ics | 2 +- .../zoneinfo-outlook/Europe/Nicosia.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Oslo.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Paris.ics | 2 +- .../zoneinfo-outlook/Europe/Podgorica.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Prague.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Riga.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Rome.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Samara.ics | 2 +- .../zoneinfo-outlook/Europe/San_Marino.ics | 2 +- .../zoneinfo-outlook/Europe/Sarajevo.ics | 2 +- .../zoneinfo-outlook/Europe/Simferopol.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Skopje.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Sofia.ics | 2 +- .../zoneinfo-outlook/Europe/Stockholm.ics | 2 +- .../zoneinfo-outlook/Europe/Tallinn.ics | 2 +- .../zoneinfo-outlook/Europe/Uzhgorod.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Vaduz.ics | 2 +- .../zoneinfo-outlook/Europe/Vatican.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Vienna.ics | 2 +- .../zoneinfo-outlook/Europe/Vilnius.ics | 2 +- .../zoneinfo-outlook/Europe/Volgograd.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Warsaw.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Zagreb.ics | 2 +- .../zoneinfo-outlook/Europe/Zaporozhye.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Zurich.ics | 2 +- .../zoneinfo-outlook/Indian/Antananarivo.ics | 2 +- web/tzurl/zoneinfo-outlook/Indian/Chagos.ics | 2 +- .../zoneinfo-outlook/Indian/Christmas.ics | 2 +- web/tzurl/zoneinfo-outlook/Indian/Cocos.ics | 2 +- web/tzurl/zoneinfo-outlook/Indian/Comoro.ics | 2 +- .../zoneinfo-outlook/Indian/Kerguelen.ics | 2 +- web/tzurl/zoneinfo-outlook/Indian/Mahe.ics | 2 +- .../zoneinfo-outlook/Indian/Maldives.ics | 2 +- .../zoneinfo-outlook/Indian/Mauritius.ics | 2 +- .../zoneinfo-outlook/Indian/Mayotte.ics | 2 +- .../zoneinfo-outlook/Indian/Reunion.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Apia.ics | 2 +- .../zoneinfo-outlook/Pacific/Auckland.ics | 2 +- .../Pacific/Bougainville.ics (new) | 15 ++ .../zoneinfo-outlook/Pacific/Chatham.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Chuuk.ics | 2 +- .../zoneinfo-outlook/Pacific/Easter.ics | 14 +- web/tzurl/zoneinfo-outlook/Pacific/Efate.ics | 2 +- .../zoneinfo-outlook/Pacific/Enderbury.ics | 2 +- .../zoneinfo-outlook/Pacific/Fakaofo.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Fiji.ics | 10 +- .../zoneinfo-outlook/Pacific/Funafuti.ics | 2 +- .../zoneinfo-outlook/Pacific/Galapagos.ics | 2 +- .../zoneinfo-outlook/Pacific/Gambier.ics | 2 +- .../zoneinfo-outlook/Pacific/Guadalcanal.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Guam.ics | 2 +- .../zoneinfo-outlook/Pacific/Honolulu.ics | 2 +- .../zoneinfo-outlook/Pacific/Johnston.ics | 2 +- .../zoneinfo-outlook/Pacific/Kiritimati.ics | 2 +- .../zoneinfo-outlook/Pacific/Kosrae.ics | 2 +- .../zoneinfo-outlook/Pacific/Majuro.ics | 2 +- .../zoneinfo-outlook/Pacific/Marquesas.ics | 2 +- .../zoneinfo-outlook/Pacific/Midway.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Nauru.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Niue.ics | 2 +- .../zoneinfo-outlook/Pacific/Norfolk.ics | 6 +- .../zoneinfo-outlook/Pacific/Noumea.ics | 2 +- .../zoneinfo-outlook/Pacific/Pago_Pago.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Palau.ics | 2 +- .../zoneinfo-outlook/Pacific/Pitcairn.ics | 2 +- .../zoneinfo-outlook/Pacific/Pohnpei.ics | 2 +- .../Pacific/Ponape.ics (gone) | 15 -- .../Pacific/Port_Moresby.ics | 2 +- .../zoneinfo-outlook/Pacific/Rarotonga.ics | 2 +- .../zoneinfo-outlook/Pacific/Saipan.ics | 2 +- .../zoneinfo-outlook/Pacific/Tahiti.ics | 2 +- .../zoneinfo-outlook/Pacific/Tarawa.ics | 2 +- .../zoneinfo-outlook/Pacific/Tongatapu.ics | 2 +- .../zoneinfo-outlook/Pacific/Truk.ics (gone) | 15 -- web/tzurl/zoneinfo-outlook/Pacific/Wake.ics | 2 +- .../zoneinfo-outlook/Pacific/Wallis.ics | 2 +- web/tzurl/zoneinfo/Africa/Abidjan.ics | 2 +- web/tzurl/zoneinfo/Africa/Accra.ics | 2 +- web/tzurl/zoneinfo/Africa/Addis_Ababa.ics | 32 +++- web/tzurl/zoneinfo/Africa/Algiers.ics | 2 +- web/tzurl/zoneinfo/Africa/Asmara.ics | 35 ++-- web/tzurl/zoneinfo/Africa/Bamako.ics | 2 +- web/tzurl/zoneinfo/Africa/Bangui.ics | 2 +- web/tzurl/zoneinfo/Africa/Banjul.ics | 2 +- web/tzurl/zoneinfo/Africa/Bissau.ics | 2 +- web/tzurl/zoneinfo/Africa/Blantyre.ics | 4 +- web/tzurl/zoneinfo/Africa/Brazzaville.ics | 2 +- web/tzurl/zoneinfo/Africa/Bujumbura.ics | 8 +- web/tzurl/zoneinfo/Africa/Cairo.ics | 41 +---- web/tzurl/zoneinfo/Africa/Casablanca.ics | 47 +++-- web/tzurl/zoneinfo/Africa/Ceuta.ics | 2 +- web/tzurl/zoneinfo/Africa/Conakry.ics | 2 +- web/tzurl/zoneinfo/Africa/Dakar.ics | 2 +- web/tzurl/zoneinfo/Africa/Dar_es_Salaam.ics | 23 ++- web/tzurl/zoneinfo/Africa/Djibouti.ics | 29 ++- web/tzurl/zoneinfo/Africa/Douala.ics | 2 +- web/tzurl/zoneinfo/Africa/El_Aaiun.ics | 47 +++-- web/tzurl/zoneinfo/Africa/Freetown.ics | 2 +- web/tzurl/zoneinfo/Africa/Gaborone.ics | 25 +-- web/tzurl/zoneinfo/Africa/Harare.ics | 4 +- web/tzurl/zoneinfo/Africa/Johannesburg.ics | 2 +- web/tzurl/zoneinfo/Africa/Juba.ics | 2 +- web/tzurl/zoneinfo/Africa/Kampala.ics | 12 +- web/tzurl/zoneinfo/Africa/Khartoum.ics | 2 +- web/tzurl/zoneinfo/Africa/Kigali.ics | 8 +- web/tzurl/zoneinfo/Africa/Kinshasa.ics | 2 +- web/tzurl/zoneinfo/Africa/Lagos.ics | 2 +- web/tzurl/zoneinfo/Africa/Libreville.ics | 2 +- web/tzurl/zoneinfo/Africa/Lome.ics | 2 +- web/tzurl/zoneinfo/Africa/Luanda.ics | 2 +- web/tzurl/zoneinfo/Africa/Lubumbashi.ics | 8 +- web/tzurl/zoneinfo/Africa/Lusaka.ics | 4 +- web/tzurl/zoneinfo/Africa/Malabo.ics | 2 +- web/tzurl/zoneinfo/Africa/Maputo.ics | 2 +- web/tzurl/zoneinfo/Africa/Maseru.ics | 17 +- web/tzurl/zoneinfo/Africa/Mbabane.ics | 27 ++- web/tzurl/zoneinfo/Africa/Mogadishu.ics | 23 ++- web/tzurl/zoneinfo/Africa/Monrovia.ics | 2 +- web/tzurl/zoneinfo/Africa/Nairobi.ics | 2 +- web/tzurl/zoneinfo/Africa/Ndjamena.ics | 2 +- web/tzurl/zoneinfo/Africa/Niamey.ics | 2 +- web/tzurl/zoneinfo/Africa/Nouakchott.ics | 2 +- web/tzurl/zoneinfo/Africa/Ouagadougou.ics | 2 +- web/tzurl/zoneinfo/Africa/Porto-Novo.ics | 2 +- web/tzurl/zoneinfo/Africa/Sao_Tome.ics | 2 +- web/tzurl/zoneinfo/Africa/Tripoli.ics | 2 +- web/tzurl/zoneinfo/Africa/Tunis.ics | 2 +- web/tzurl/zoneinfo/Africa/Windhoek.ics | 2 +- web/tzurl/zoneinfo/America/Adak.ics | 12 +- web/tzurl/zoneinfo/America/Anchorage.ics | 2 +- web/tzurl/zoneinfo/America/Anguilla.ics | 2 +- web/tzurl/zoneinfo/America/Antigua.ics | 15 +- web/tzurl/zoneinfo/America/Araguaina.ics | 2 +- .../America/Argentina/Buenos_Aires.ics | 2 +- .../zoneinfo/America/Argentina/Catamarca.ics | 2 +- .../zoneinfo/America/Argentina/Cordoba.ics | 2 +- .../zoneinfo/America/Argentina/Jujuy.ics | 2 +- .../zoneinfo/America/Argentina/La_Rioja.ics | 2 +- .../zoneinfo/America/Argentina/Mendoza.ics | 2 +- .../America/Argentina/Rio_Gallegos.ics | 2 +- .../zoneinfo/America/Argentina/Salta.ics | 2 +- .../zoneinfo/America/Argentina/San_Juan.ics | 2 +- .../zoneinfo/America/Argentina/San_Luis.ics | 2 +- .../zoneinfo/America/Argentina/Tucuman.ics | 2 +- .../zoneinfo/America/Argentina/Ushuaia.ics | 2 +- web/tzurl/zoneinfo/America/Aruba.ics | 2 +- web/tzurl/zoneinfo/America/Asuncion.ics | 2 +- web/tzurl/zoneinfo/America/Atikokan.ics | 2 +- web/tzurl/zoneinfo/America/Bahia.ics | 2 +- .../zoneinfo/America/Bahia_Banderas.ics | 2 +- web/tzurl/zoneinfo/America/Barbados.ics | 2 +- web/tzurl/zoneinfo/America/Belem.ics | 2 +- web/tzurl/zoneinfo/America/Belize.ics | 2 +- web/tzurl/zoneinfo/America/Blanc-Sablon.ics | 2 +- web/tzurl/zoneinfo/America/Boa_Vista.ics | 2 +- web/tzurl/zoneinfo/America/Bogota.ics | 2 +- web/tzurl/zoneinfo/America/Boise.ics | 2 +- web/tzurl/zoneinfo/America/Cambridge_Bay.ics | 2 +- web/tzurl/zoneinfo/America/Campo_Grande.ics | 8 +- web/tzurl/zoneinfo/America/Cancun.ics | 43 +++-- web/tzurl/zoneinfo/America/Caracas.ics | 2 +- web/tzurl/zoneinfo/America/Cayenne.ics | 2 +- web/tzurl/zoneinfo/America/Cayman.ics | 23 ++- web/tzurl/zoneinfo/America/Chicago.ics | 2 +- web/tzurl/zoneinfo/America/Chihuahua.ics | 2 +- web/tzurl/zoneinfo/America/Costa_Rica.ics | 2 +- web/tzurl/zoneinfo/America/Creston.ics | 2 +- web/tzurl/zoneinfo/America/Cuiaba.ics | 6 +- web/tzurl/zoneinfo/America/Curacao.ics | 2 +- web/tzurl/zoneinfo/America/Danmarkshavn.ics | 2 +- web/tzurl/zoneinfo/America/Dawson.ics | 2 +- web/tzurl/zoneinfo/America/Dawson_Creek.ics | 2 +- web/tzurl/zoneinfo/America/Denver.ics | 2 +- web/tzurl/zoneinfo/America/Detroit.ics | 2 +- web/tzurl/zoneinfo/America/Dominica.ics | 2 +- web/tzurl/zoneinfo/America/Edmonton.ics | 2 +- web/tzurl/zoneinfo/America/Eirunepe.ics | 2 +- web/tzurl/zoneinfo/America/El_Salvador.ics | 2 +- .../{Montreal.ics => Fort_Nelson.ics} | 161 +++++++---------- web/tzurl/zoneinfo/America/Fortaleza.ics | 2 +- web/tzurl/zoneinfo/America/Glace_Bay.ics | 2 +- web/tzurl/zoneinfo/America/Godthab.ics | 2 +- web/tzurl/zoneinfo/America/Goose_Bay.ics | 2 +- web/tzurl/zoneinfo/America/Grand_Turk.ics | 8 +- web/tzurl/zoneinfo/America/Grenada.ics | 2 +- web/tzurl/zoneinfo/America/Guadeloupe.ics | 2 +- web/tzurl/zoneinfo/America/Guatemala.ics | 2 +- web/tzurl/zoneinfo/America/Guayaquil.ics | 2 +- web/tzurl/zoneinfo/America/Guyana.ics | 2 +- web/tzurl/zoneinfo/America/Halifax.ics | 2 +- web/tzurl/zoneinfo/America/Havana.ics | 2 +- web/tzurl/zoneinfo/America/Hermosillo.ics | 2 +- .../America/Indiana/Indianapolis.ics | 2 +- web/tzurl/zoneinfo/America/Indiana/Knox.ics | 2 +- .../zoneinfo/America/Indiana/Marengo.ics | 2 +- .../zoneinfo/America/Indiana/Petersburg.ics | 2 +- .../zoneinfo/America/Indiana/Tell_City.ics | 2 +- web/tzurl/zoneinfo/America/Indiana/Vevay.ics | 2 +- .../zoneinfo/America/Indiana/Vincennes.ics | 2 +- .../zoneinfo/America/Indiana/Winamac.ics | 2 +- web/tzurl/zoneinfo/America/Inuvik.ics | 2 +- web/tzurl/zoneinfo/America/Iqaluit.ics | 2 +- web/tzurl/zoneinfo/America/Juneau.ics | 2 +- .../zoneinfo/America/Kentucky/Louisville.ics | 2 +- .../zoneinfo/America/Kentucky/Monticello.ics | 2 +- web/tzurl/zoneinfo/America/Kralendijk.ics | 2 +- web/tzurl/zoneinfo/America/La_Paz.ics | 2 +- web/tzurl/zoneinfo/America/Lima.ics | 2 +- web/tzurl/zoneinfo/America/Los_Angeles.ics | 2 +- web/tzurl/zoneinfo/America/Lower_Princes.ics | 2 +- web/tzurl/zoneinfo/America/Maceio.ics | 2 +- web/tzurl/zoneinfo/America/Managua.ics | 2 +- web/tzurl/zoneinfo/America/Manaus.ics | 2 +- web/tzurl/zoneinfo/America/Marigot.ics | 2 +- web/tzurl/zoneinfo/America/Martinique.ics | 2 +- web/tzurl/zoneinfo/America/Matamoros.ics | 2 +- web/tzurl/zoneinfo/America/Mazatlan.ics | 2 +- web/tzurl/zoneinfo/America/Menominee.ics | 2 +- web/tzurl/zoneinfo/America/Merida.ics | 2 +- web/tzurl/zoneinfo/America/Metlakatla.ics | 2 +- web/tzurl/zoneinfo/America/Mexico_City.ics | 2 +- web/tzurl/zoneinfo/America/Miquelon.ics | 2 +- web/tzurl/zoneinfo/America/Moncton.ics | 2 +- web/tzurl/zoneinfo/America/Monterrey.ics | 2 +- web/tzurl/zoneinfo/America/Montevideo.ics | 34 ++-- web/tzurl/zoneinfo/America/Montserrat.ics | 2 +- web/tzurl/zoneinfo/America/Nassau.ics | 2 +- web/tzurl/zoneinfo/America/New_York.ics | 2 +- web/tzurl/zoneinfo/America/Nipigon.ics | 2 +- web/tzurl/zoneinfo/America/Nome.ics | 2 +- web/tzurl/zoneinfo/America/Noronha.ics | 2 +- .../zoneinfo/America/North_Dakota/Beulah.ics | 2 +- .../zoneinfo/America/North_Dakota/Center.ics | 2 +- .../America/North_Dakota/New_Salem.ics | 2 +- web/tzurl/zoneinfo/America/Ojinaga.ics | 2 +- web/tzurl/zoneinfo/America/Panama.ics | 2 +- web/tzurl/zoneinfo/America/Pangnirtung.ics | 2 +- web/tzurl/zoneinfo/America/Paramaribo.ics | 2 +- web/tzurl/zoneinfo/America/Phoenix.ics | 2 +- .../zoneinfo/America/Port-au-Prince.ics | 2 +- web/tzurl/zoneinfo/America/Port_of_Spain.ics | 2 +- web/tzurl/zoneinfo/America/Porto_Velho.ics | 2 +- web/tzurl/zoneinfo/America/Puerto_Rico.ics | 2 +- web/tzurl/zoneinfo/America/Rainy_River.ics | 2 +- web/tzurl/zoneinfo/America/Rankin_Inlet.ics | 2 +- web/tzurl/zoneinfo/America/Recife.ics | 2 +- web/tzurl/zoneinfo/America/Regina.ics | 2 +- web/tzurl/zoneinfo/America/Resolute.ics | 2 +- web/tzurl/zoneinfo/America/Rio_Branco.ics | 2 +- web/tzurl/zoneinfo/America/Santa_Isabel.ics | 2 +- web/tzurl/zoneinfo/America/Santarem.ics | 2 +- web/tzurl/zoneinfo/America/Santiago.ics | 71 +++----- web/tzurl/zoneinfo/America/Santo_Domingo.ics | 2 +- web/tzurl/zoneinfo/America/Sao_Paulo.ics | 8 +- web/tzurl/zoneinfo/America/Scoresbysund.ics | 2 +- .../zoneinfo/America/Shiprock.ics (gone) | 159 ---------------- web/tzurl/zoneinfo/America/Sitka.ics | 2 +- web/tzurl/zoneinfo/America/St_Barthelemy.ics | 2 +- web/tzurl/zoneinfo/America/St_Johns.ics | 2 +- web/tzurl/zoneinfo/America/St_Kitts.ics | 2 +- web/tzurl/zoneinfo/America/St_Lucia.ics | 2 +- web/tzurl/zoneinfo/America/St_Thomas.ics | 2 +- web/tzurl/zoneinfo/America/St_Vincent.ics | 2 +- web/tzurl/zoneinfo/America/Swift_Current.ics | 2 +- web/tzurl/zoneinfo/America/Tegucigalpa.ics | 2 +- web/tzurl/zoneinfo/America/Thule.ics | 2 +- web/tzurl/zoneinfo/America/Thunder_Bay.ics | 2 +- web/tzurl/zoneinfo/America/Tijuana.ics | 2 +- web/tzurl/zoneinfo/America/Toronto.ics | 2 +- web/tzurl/zoneinfo/America/Tortola.ics | 2 +- web/tzurl/zoneinfo/America/Vancouver.ics | 2 +- web/tzurl/zoneinfo/America/Whitehorse.ics | 6 +- web/tzurl/zoneinfo/America/Winnipeg.ics | 2 +- web/tzurl/zoneinfo/America/Yakutat.ics | 2 +- web/tzurl/zoneinfo/America/Yellowknife.ics | 2 +- web/tzurl/zoneinfo/Antarctica/Casey.ics | 2 +- web/tzurl/zoneinfo/Antarctica/Davis.ics | 2 +- .../zoneinfo/Antarctica/DumontDUrville.ics | 2 +- web/tzurl/zoneinfo/Antarctica/Macquarie.ics | 2 +- web/tzurl/zoneinfo/Antarctica/Mawson.ics | 2 +- web/tzurl/zoneinfo/Antarctica/McMurdo.ics | 2 +- web/tzurl/zoneinfo/Antarctica/Palmer.ics | 33 ++-- web/tzurl/zoneinfo/Antarctica/Rothera.ics | 2 +- .../Antarctica/South_Pole.ics (gone) | 108 ----------- web/tzurl/zoneinfo/Antarctica/Syowa.ics | 2 +- web/tzurl/zoneinfo/Antarctica/Troll.ics | 2 +- web/tzurl/zoneinfo/Antarctica/Vostok.ics | 2 +- web/tzurl/zoneinfo/Arctic/Longyearbyen.ics | 2 +- web/tzurl/zoneinfo/Asia/Aden.ics | 8 +- web/tzurl/zoneinfo/Asia/Almaty.ics | 2 +- web/tzurl/zoneinfo/Asia/Amman.ics | 2 +- web/tzurl/zoneinfo/Asia/Anadyr.ics | 2 +- web/tzurl/zoneinfo/Asia/Aqtau.ics | 2 +- web/tzurl/zoneinfo/Asia/Aqtobe.ics | 2 +- web/tzurl/zoneinfo/Asia/Ashgabat.ics | 2 +- web/tzurl/zoneinfo/Asia/Baghdad.ics | 2 +- web/tzurl/zoneinfo/Asia/Bahrain.ics | 4 +- web/tzurl/zoneinfo/Asia/Baku.ics | 2 +- web/tzurl/zoneinfo/Asia/Bangkok.ics | 2 +- web/tzurl/zoneinfo/Asia/Beirut.ics | 2 +- web/tzurl/zoneinfo/Asia/Bishkek.ics | 2 +- web/tzurl/zoneinfo/Asia/Brunei.ics | 2 +- web/tzurl/zoneinfo/Asia/Chita.ics | 2 +- web/tzurl/zoneinfo/Asia/Choibalsan.ics | 17 +- web/tzurl/zoneinfo/Asia/Chongqing.ics (gone) | 47 ----- web/tzurl/zoneinfo/Asia/Colombo.ics | 2 +- web/tzurl/zoneinfo/Asia/Damascus.ics | 2 +- web/tzurl/zoneinfo/Asia/Dhaka.ics | 2 +- web/tzurl/zoneinfo/Asia/Dili.ics | 2 +- web/tzurl/zoneinfo/Asia/Dubai.ics | 2 +- web/tzurl/zoneinfo/Asia/Dushanbe.ics | 2 +- web/tzurl/zoneinfo/Asia/Gaza.ics | 24 ++- web/tzurl/zoneinfo/Asia/Harbin.ics (gone) | 62 ------- web/tzurl/zoneinfo/Asia/Hebron.ics | 24 ++- web/tzurl/zoneinfo/Asia/Ho_Chi_Minh.ics | 41 +++-- web/tzurl/zoneinfo/Asia/Hong_Kong.ics | 2 +- web/tzurl/zoneinfo/Asia/Hovd.ics | 16 +- web/tzurl/zoneinfo/Asia/Irkutsk.ics | 2 +- web/tzurl/zoneinfo/Asia/Istanbul.ics | 26 ++- web/tzurl/zoneinfo/Asia/Jakarta.ics | 2 +- web/tzurl/zoneinfo/Asia/Jayapura.ics | 2 +- web/tzurl/zoneinfo/Asia/Jerusalem.ics | 2 +- web/tzurl/zoneinfo/Asia/Kabul.ics | 2 +- web/tzurl/zoneinfo/Asia/Kamchatka.ics | 2 +- web/tzurl/zoneinfo/Asia/Karachi.ics | 2 +- web/tzurl/zoneinfo/Asia/Kathmandu.ics | 2 +- web/tzurl/zoneinfo/Asia/Khandyga.ics | 2 +- web/tzurl/zoneinfo/Asia/Kolkata.ics | 2 +- web/tzurl/zoneinfo/Asia/Krasnoyarsk.ics | 2 +- web/tzurl/zoneinfo/Asia/Kuala_Lumpur.ics | 2 +- web/tzurl/zoneinfo/Asia/Kuching.ics | 2 +- web/tzurl/zoneinfo/Asia/Kuwait.ics | 8 +- web/tzurl/zoneinfo/Asia/Macau.ics | 2 +- web/tzurl/zoneinfo/Asia/Magadan.ics | 2 +- web/tzurl/zoneinfo/Asia/Makassar.ics | 2 +- web/tzurl/zoneinfo/Asia/Manila.ics | 2 +- web/tzurl/zoneinfo/Asia/Muscat.ics | 4 +- web/tzurl/zoneinfo/Asia/Nicosia.ics | 2 +- web/tzurl/zoneinfo/Asia/Novokuznetsk.ics | 6 +- web/tzurl/zoneinfo/Asia/Novosibirsk.ics | 2 +- web/tzurl/zoneinfo/Asia/Omsk.ics | 2 +- web/tzurl/zoneinfo/Asia/Oral.ics | 2 +- web/tzurl/zoneinfo/Asia/Phnom_Penh.ics | 32 +--- web/tzurl/zoneinfo/Asia/Pontianak.ics | 2 +- web/tzurl/zoneinfo/Asia/Pyongyang.ics | 31 +--- web/tzurl/zoneinfo/Asia/Qatar.ics | 2 +- web/tzurl/zoneinfo/Asia/Qyzylorda.ics | 2 +- web/tzurl/zoneinfo/Asia/Rangoon.ics | 2 +- web/tzurl/zoneinfo/Asia/Riyadh.ics | 2 +- web/tzurl/zoneinfo/Asia/Sakhalin.ics | 2 +- web/tzurl/zoneinfo/Asia/Samarkand.ics | 2 +- web/tzurl/zoneinfo/Asia/Seoul.ics | 61 ++++--- web/tzurl/zoneinfo/Asia/Shanghai.ics | 2 +- web/tzurl/zoneinfo/Asia/Singapore.ics | 2 +- web/tzurl/zoneinfo/Asia/Srednekolymsk.ics | 2 +- web/tzurl/zoneinfo/Asia/Taipei.ics | 2 +- web/tzurl/zoneinfo/Asia/Tashkent.ics | 2 +- web/tzurl/zoneinfo/Asia/Tbilisi.ics | 2 +- web/tzurl/zoneinfo/Asia/Tehran.ics | 2 +- web/tzurl/zoneinfo/Asia/Thimphu.ics | 2 +- web/tzurl/zoneinfo/Asia/Tokyo.ics | 2 +- web/tzurl/zoneinfo/Asia/Ulaanbaatar.ics | 16 +- web/tzurl/zoneinfo/Asia/Urumqi.ics | 2 +- web/tzurl/zoneinfo/Asia/Ust-Nera.ics | 2 +- web/tzurl/zoneinfo/Asia/Vientiane.ics | 32 +--- web/tzurl/zoneinfo/Asia/Vladivostok.ics | 2 +- web/tzurl/zoneinfo/Asia/Yakutsk.ics | 2 +- web/tzurl/zoneinfo/Asia/Yekaterinburg.ics | 2 +- web/tzurl/zoneinfo/Asia/Yerevan.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Azores.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Bermuda.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Canary.ics | 9 +- web/tzurl/zoneinfo/Atlantic/Cape_Verde.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Faroe.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Madeira.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Reykjavik.ics | 17 +- .../zoneinfo/Atlantic/South_Georgia.ics | 2 +- web/tzurl/zoneinfo/Atlantic/St_Helena.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Stanley.ics | 2 +- web/tzurl/zoneinfo/Australia/Adelaide.ics | 2 +- web/tzurl/zoneinfo/Australia/Brisbane.ics | 2 +- web/tzurl/zoneinfo/Australia/Currie.ics | 2 +- web/tzurl/zoneinfo/Australia/Darwin.ics | 2 +- web/tzurl/zoneinfo/Australia/Eucla.ics | 2 +- web/tzurl/zoneinfo/Australia/Hobart.ics | 2 +- web/tzurl/zoneinfo/Australia/Lindeman.ics | 2 +- web/tzurl/zoneinfo/Australia/Lord_Howe.ics | 2 +- web/tzurl/zoneinfo/Australia/Melbourne.ics | 2 +- web/tzurl/zoneinfo/Australia/Perth.ics | 2 +- web/tzurl/zoneinfo/Australia/Sydney.ics | 2 +- web/tzurl/zoneinfo/Europe/Amsterdam.ics | 2 +- web/tzurl/zoneinfo/Europe/Andorra.ics | 2 +- web/tzurl/zoneinfo/Europe/Athens.ics | 2 +- web/tzurl/zoneinfo/Europe/Belgrade.ics | 2 +- web/tzurl/zoneinfo/Europe/Berlin.ics | 2 +- web/tzurl/zoneinfo/Europe/Bratislava.ics | 2 +- web/tzurl/zoneinfo/Europe/Brussels.ics | 2 +- web/tzurl/zoneinfo/Europe/Bucharest.ics | 2 +- web/tzurl/zoneinfo/Europe/Budapest.ics | 2 +- web/tzurl/zoneinfo/Europe/Busingen.ics | 2 +- web/tzurl/zoneinfo/Europe/Chisinau.ics | 6 +- web/tzurl/zoneinfo/Europe/Copenhagen.ics | 2 +- web/tzurl/zoneinfo/Europe/Dublin.ics | 2 +- web/tzurl/zoneinfo/Europe/Gibraltar.ics | 2 +- web/tzurl/zoneinfo/Europe/Guernsey.ics | 2 +- web/tzurl/zoneinfo/Europe/Helsinki.ics | 2 +- web/tzurl/zoneinfo/Europe/Isle_of_Man.ics | 2 +- web/tzurl/zoneinfo/Europe/Istanbul.ics | 26 ++- web/tzurl/zoneinfo/Europe/Jersey.ics | 2 +- web/tzurl/zoneinfo/Europe/Kaliningrad.ics | 2 +- web/tzurl/zoneinfo/Europe/Kiev.ics | 2 +- web/tzurl/zoneinfo/Europe/Lisbon.ics | 2 +- web/tzurl/zoneinfo/Europe/Ljubljana.ics | 2 +- web/tzurl/zoneinfo/Europe/London.ics | 2 +- web/tzurl/zoneinfo/Europe/Luxembourg.ics | 2 +- web/tzurl/zoneinfo/Europe/Madrid.ics | 2 +- web/tzurl/zoneinfo/Europe/Malta.ics | 2 +- web/tzurl/zoneinfo/Europe/Mariehamn.ics | 2 +- web/tzurl/zoneinfo/Europe/Minsk.ics | 3 +- web/tzurl/zoneinfo/Europe/Monaco.ics | 2 +- web/tzurl/zoneinfo/Europe/Moscow.ics | 2 +- web/tzurl/zoneinfo/Europe/Nicosia.ics | 2 +- web/tzurl/zoneinfo/Europe/Oslo.ics | 2 +- web/tzurl/zoneinfo/Europe/Paris.ics | 2 +- web/tzurl/zoneinfo/Europe/Podgorica.ics | 2 +- web/tzurl/zoneinfo/Europe/Prague.ics | 2 +- web/tzurl/zoneinfo/Europe/Riga.ics | 2 +- web/tzurl/zoneinfo/Europe/Rome.ics | 2 +- web/tzurl/zoneinfo/Europe/Samara.ics | 2 +- web/tzurl/zoneinfo/Europe/San_Marino.ics | 2 +- web/tzurl/zoneinfo/Europe/Sarajevo.ics | 2 +- web/tzurl/zoneinfo/Europe/Simferopol.ics | 9 +- web/tzurl/zoneinfo/Europe/Skopje.ics | 2 +- web/tzurl/zoneinfo/Europe/Sofia.ics | 9 +- web/tzurl/zoneinfo/Europe/Stockholm.ics | 2 +- web/tzurl/zoneinfo/Europe/Tallinn.ics | 5 +- web/tzurl/zoneinfo/Europe/Uzhgorod.ics | 2 +- web/tzurl/zoneinfo/Europe/Vaduz.ics | 2 +- web/tzurl/zoneinfo/Europe/Vatican.ics | 2 +- web/tzurl/zoneinfo/Europe/Vienna.ics | 2 +- web/tzurl/zoneinfo/Europe/Vilnius.ics | 2 +- web/tzurl/zoneinfo/Europe/Volgograd.ics | 6 +- web/tzurl/zoneinfo/Europe/Warsaw.ics | 2 +- web/tzurl/zoneinfo/Europe/Zagreb.ics | 2 +- web/tzurl/zoneinfo/Europe/Zaporozhye.ics | 2 +- web/tzurl/zoneinfo/Europe/Zurich.ics | 2 +- web/tzurl/zoneinfo/Indian/Antananarivo.ics | 33 ++-- web/tzurl/zoneinfo/Indian/Chagos.ics | 2 +- web/tzurl/zoneinfo/Indian/Christmas.ics | 2 +- web/tzurl/zoneinfo/Indian/Cocos.ics | 2 +- web/tzurl/zoneinfo/Indian/Comoro.ics | 29 ++- web/tzurl/zoneinfo/Indian/Kerguelen.ics | 2 +- web/tzurl/zoneinfo/Indian/Mahe.ics | 2 +- web/tzurl/zoneinfo/Indian/Maldives.ics | 2 +- web/tzurl/zoneinfo/Indian/Mauritius.ics | 2 +- web/tzurl/zoneinfo/Indian/Mayotte.ics | 29 ++- web/tzurl/zoneinfo/Indian/Reunion.ics | 2 +- web/tzurl/zoneinfo/Pacific/Apia.ics | 2 +- web/tzurl/zoneinfo/Pacific/Auckland.ics | 2 +- .../zoneinfo/Pacific/Bougainville.ics (new) | 44 +++++ web/tzurl/zoneinfo/Pacific/Chatham.ics | 2 +- web/tzurl/zoneinfo/Pacific/Chuuk.ics | 2 +- web/tzurl/zoneinfo/Pacific/Easter.ics | 90 ++++----- web/tzurl/zoneinfo/Pacific/Efate.ics | 2 +- web/tzurl/zoneinfo/Pacific/Enderbury.ics | 2 +- web/tzurl/zoneinfo/Pacific/Fakaofo.ics | 2 +- web/tzurl/zoneinfo/Pacific/Fiji.ics | 15 +- web/tzurl/zoneinfo/Pacific/Funafuti.ics | 2 +- web/tzurl/zoneinfo/Pacific/Galapagos.ics | 2 +- web/tzurl/zoneinfo/Pacific/Gambier.ics | 2 +- web/tzurl/zoneinfo/Pacific/Guadalcanal.ics | 2 +- web/tzurl/zoneinfo/Pacific/Guam.ics | 2 +- web/tzurl/zoneinfo/Pacific/Honolulu.ics | 2 +- web/tzurl/zoneinfo/Pacific/Johnston.ics | 2 +- web/tzurl/zoneinfo/Pacific/Kiritimati.ics | 2 +- web/tzurl/zoneinfo/Pacific/Kosrae.ics | 2 +- web/tzurl/zoneinfo/Pacific/Majuro.ics | 2 +- web/tzurl/zoneinfo/Pacific/Marquesas.ics | 2 +- web/tzurl/zoneinfo/Pacific/Midway.ics | 25 +-- web/tzurl/zoneinfo/Pacific/Nauru.ics | 2 +- web/tzurl/zoneinfo/Pacific/Niue.ics | 2 +- web/tzurl/zoneinfo/Pacific/Norfolk.ics | 23 ++- web/tzurl/zoneinfo/Pacific/Noumea.ics | 2 +- web/tzurl/zoneinfo/Pacific/Pago_Pago.ics | 2 +- web/tzurl/zoneinfo/Pacific/Palau.ics | 2 +- web/tzurl/zoneinfo/Pacific/Pitcairn.ics | 2 +- web/tzurl/zoneinfo/Pacific/Pohnpei.ics | 2 +- web/tzurl/zoneinfo/Pacific/Ponape.ics (gone) | 16 -- web/tzurl/zoneinfo/Pacific/Port_Moresby.ics | 2 +- web/tzurl/zoneinfo/Pacific/Rarotonga.ics | 2 +- web/tzurl/zoneinfo/Pacific/Saipan.ics | 19 +- web/tzurl/zoneinfo/Pacific/Tahiti.ics | 2 +- web/tzurl/zoneinfo/Pacific/Tarawa.ics | 2 +- web/tzurl/zoneinfo/Pacific/Tongatapu.ics | 2 +- web/tzurl/zoneinfo/Pacific/Truk.ics (gone) | 16 -- web/tzurl/zoneinfo/Pacific/Wake.ics | 2 +- web/tzurl/zoneinfo/Pacific/Wallis.ics | 2 +- 843 files changed, 1734 insertions(+), 2141 deletions(-) commit 35c088ae9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 26 08:06:13 2015 +0000 Changed the cache expiry time for timezone definitions from 4 weeks to 1 week in order to cater for short term changes such as the recent extension of DST in Turkey due to the elections. web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1e97148e5 Author: diego zuccato <diego.zuccato@unibo.it> Date: Fri Oct 23 14:00:45 2015 +0200 Slighttly refined some italian translations web/lang/lang.it | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 439dbebf4 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Oct 22 20:20:52 2015 +0100 Added tag mrbs-1_5_0 for changeset a0ac7ab52205 commit 49af61955 (tag: mrbs-1_5_0) Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Oct 22 20:20:36 2015 +0100 Updated NEWS and ChangeLog for release of MRBS 1.5.0 ChangeLog | 35404 ++++++++++++++++++++++----------------------- NEWS (mode +x) | 125 + 2 files changed, 17146 insertions(+), 18383 deletions(-) commit 38343f038 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 22 18:51:12 2015 +0100 Fixed bug with mail debug output web/functions_mail.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 81ccafb4a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 22 18:45:42 2015 +0100 Fixed problems with upgrade 17 when using PostgreSQL (datetime data type) web/upgrade/17/post.inc | 87 +++++++-------------------------------- 1 file changed, 15 insertions(+), 72 deletions(-) commit 215d33a54 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 22 18:44:42 2015 +0100 Added flushing of output to provide some feedback during long upgrades of large databases web/upgrade.inc | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) commit cb36ae3ec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 22 16:36:04 2015 +0100 Fixed problem with Upgrade 25 in PostgreSQL (datetime data type) web/upgrade/25/pgsql.sql | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit 2fbc79fdf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 22 16:21:38 2015 +0100 Fixed various problems with Upgrade 24 web/upgrade/24/post.inc | 114 +++++++++++--------------------------- 1 file changed, 32 insertions(+), 82 deletions(-) commit cebf2fd86 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 22 15:55:20 2015 +0100 Minor change to alert wording to cover upgrades beyond 1.4.6 web/upgrade/26/post.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 82470a7bf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 22 15:53:39 2015 +0100 Added a namespace statement to prevent a clash with upgrade 24 web/upgrade/47/post.inc | 2 ++ 1 file changed, 2 insertions(+) commit cddae2ff9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 22 14:55:08 2015 +0100 Fixed typo in comment web/upgrade/47/post.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e4bdcf909 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 22 12:36:07 2015 +0100 Added upgrade script to give an ical_uid to those entries that don't have one (see SF Bugs #334) tables.my.sql | 2 +- tables.pg.sql | 2 +- web/dbsys.inc | 2 +- web/upgrade/47/mysql.sql (new) | 1 + web/upgrade/47/pgsql.sql (new) | 0 web/upgrade/47/post.inc (new) | 182 +++++++++++++++++++++++++++++++ 6 files changed, 186 insertions(+), 3 deletions(-) commit 3f96f14e8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 21 17:03:13 2015 +0100 Fixed bug causing ical_uid not to be generated for a series when conflicts are skipped (see SF Bugs #334). Still need to provide a script to give existing entries an ical_uid. web/edit_entry_handler.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit 5e5f42685 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 21 13:55:55 2015 +0100 Fixed bug which caused bookings to be made for all day if any of the areas had a default duration of all day web/edit_entry.php | 17 +++++++++-------- web/functions.inc | 31 ++++++++++++++++++------------- 2 files changed, 27 insertions(+), 21 deletions(-) commit 79bcc0d4d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 21 11:34:52 2015 +0100 Minor change to upgrade alert message to cover upgrades post 1.5.0 web/upgrade/46/post.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b315e1bc4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 18 07:19:56 2015 +0100 Restructured mail debug code and made default output destination the error_log, for consistency with ldap debugging. web/functions_mail.inc | 30 +++++++++++++++++------------- web/systemdefaults.inc.php | 4 ++-- 2 files changed, 19 insertions(+), 15 deletions(-) commit 3466d8154 Merge: a0df2500d 24f6a1a96 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Oct 17 23:20:39 2015 +0100 Merged 'session_cookie_improvements' branch, which changes the session cookie to use authenticated data, instead of Blowfish encrypted data. commit 24f6a1a96 (origin/session_cookie_improvements) Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Oct 17 23:18:49 2015 +0100 Closed feature branch. commit 8a13f8614 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Oct 17 23:17:54 2015 +0100 Added check for existence of hash_hmac() function, in case the system's PHP has the hash functionality disabled. web/session/session_cookie.inc | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit a0df2500d Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Oct 17 23:05:28 2015 +0100 Italian translation updates, courtesy of Germano Massulo. web/lang/lang.it (mode +x) | 130 +++++++++++++++++++++++++++++++++-- 1 file changed, 125 insertions(+), 5 deletions(-) commit 8b619f0de Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Oct 17 21:41:22 2015 +0100 Corrected the distinction between the translation tokens 'private' and 'unavailable'. web/functions_ical.inc | 1 - web/functions_view.inc | 2 +- web/mrbs_sql.inc | 2 +- web/view_entry.php | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) commit c4b012e1c Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Oct 17 11:38:00 2015 +0100 Fixed mistake in upgrade alert message. web/upgrade/46/post.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 395d6d1cc Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Oct 17 11:37:02 2015 +0100 Fixed typo in configuration variable. web/session/session_cookie.inc | 4 ++-- web/systemdefaults.inc.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 171357394 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Oct 16 22:23:37 2015 +0100 Made check for token safer. web/session/session_cookie.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4cf4de716 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Oct 16 22:07:15 2015 +0100 Cookie session changes: - Made hash algorithm configurable, and changed default to sha512 - Fixed handling of logged-out user web/session/session_cookie.inc | 10 +++++----- web/systemdefaults.inc.php (mode +x) | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) commit bfc01b055 Merge: 16c3eb1ed dc5c5fe9e Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Oct 16 21:27:10 2015 +0100 Merged with default commit 3fbbca845 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Oct 16 21:23:02 2015 +0100 Revamped "cookie" session scheme. We no longer use Blowfish encryption, and instead just use hash_hmac(). web/Crypt/Blowfish.php (gone) | 318 -------------------- web/Crypt/Blowfish/CBC.php (gone) | 152 ---------- web/Crypt/Blowfish/DefaultKey.php (gone) | 319 --------------------- web/Crypt/Blowfish/ECB.php (gone) | 142 --------- web/Crypt/Blowfish/MCrypt.php (gone) | 179 ------------ web/Crypt/Blowfish/PHP.php (gone) | 273 ------------------ web/session/session_cookie.inc (mode +x) | 97 ++++--- 7 files changed, 65 insertions(+), 1415 deletions(-) commit dc5c5fe9e Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Oct 16 19:58:05 2015 +0100 Improved systemdefautls.inc.php comments about new LDAP filter options. web/systemdefaults.inc.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) commit 16c3eb1ed Merge: 6db98c1ed adbb1450e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 16 16:18:31 2015 +0100 Merge commit 6db98c1ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 16 16:16:50 2015 +0100 (1) Changed the mailing code so that when $mail_settings['disabled'] is set it carries on until the very last moment preparing to send mail - useful for getting the maximum amount of debug information (2) Flushed output when debug output is being sent to the browser (see SF Support Requests #799) web/functions_mail.inc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) commit adbb1450e Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Oct 14 20:39:58 2015 +0100 Added more flexible LDAP filtering support, as supplied by Steve Cleveland. Adds configuration variables $ldap_filter_base_dn and $ldap_filter_user_attr. web/auth/auth_ldap.inc | 38 ++++++++++++++++++++++++++++++------ web/systemdefaults.inc.php | 10 ++++++++-- 2 files changed, 40 insertions(+), 8 deletions(-) commit 769b87da5 Merge: e273206ed 91d13fb57 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Oct 14 20:29:49 2015 +0100 Merged with latest changes from 'default' commit e273206ed Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Oct 14 20:25:28 2015 +0100 Updated some documentation. Updated PostgreSQL SQL files. Removed sample/test data, and any mention of them in the documentation. INSTALL | 47 ++++++------------------ LANGUAGE | 16 +++----- README | 51 ++++++++++++-------------- README.sqlapi | 11 ++---- destroy.pg.sql | 8 +++- grant.pg.sql | 10 +++-- sample-data.sql (gone) | 26 ------------- testdata.php (gone) | 79 ---------------------------------------- 8 files changed, 58 insertions(+), 190 deletions(-) commit 91d13fb57 Merge: d8abaaaa0 ffcb14d9d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 14 20:24:10 2015 +0100 Merge commit ffcb14d9d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 14 20:18:40 2015 +0100 Fixed bug introduced in changeset 385f6b2ad044 (undefined variable $n_hidden_days) web/css/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit c6d945731 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Oct 10 08:44:19 2015 +0100 Updated version number for release. web/version_num.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d8abaaaa0 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Oct 9 20:53:55 2015 +0100 Added mention of the change of default auth scheme to UPGRADE. UPGRADE | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit 916d8aa2a Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Oct 9 20:51:12 2015 +0100 Changed default authentication scheme to 'db'. tables.my.sql | 2 +- tables.pg.sql | 2 +- web/dbsys.inc | 2 +- web/systemdefaults.inc.php | 6 +++--- web/upgrade/46/mysql.sql (new) | 1 + web/upgrade/46/pgsql.sql (new) | 0 web/upgrade/46/post.inc (new) | 18 ++++++++++++++++++ 7 files changed, 25 insertions(+), 6 deletions(-) commit c0b5f2078 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 8 22:22:48 2015 +0100 Partial fix to the problem of resizable bookings (SF Bugs #333) web/css/mrbs.css.php | 21 +------- web/functions_table.inc | 100 ++++++++++++++++++++++++++++---------- web/js/resizable.js.php | 2 +- 3 files changed, 77 insertions(+), 46 deletions(-) commit fada5a8e7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 6 17:33:12 2015 +0100 Improved robustness of get_best_lang_file() web/language.inc | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) commit 4e4a3e7ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 6 15:15:19 2015 +0100 Fixed potential bug when the datables/language directory has extra files in it web/language.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 21a57758d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 6 14:34:07 2015 +0100 Fixed problem with table sort direction arrows overlapping header text web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d6bf94b68 Merge: 327685999 503b22cee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 2 18:03:32 2015 +0100 Merge with datatables_update commit 503b22cee (origin/datatables_update) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 2 18:02:37 2015 +0100 Close datatables_update branch commit 327685999 Merge: fd0986069 286fd51ef Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 2 17:38:45 2015 +0100 Merge with datatables_update commit 286fd51ef Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 2 17:37:28 2015 +0100 Converted to new style DataTables web/js/search.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 083277361 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 2 17:30:19 2015 +0100 Converted to new style DataTables web/js/search.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1de68e78c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 2 17:13:23 2015 +0100 Got rid of JSHint warning web/js/datatables.js.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit a81518590 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 2 16:38:29 2015 +0100 Internationalised column visibility button text web/js/datatables.js.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) commit dd6807488 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 2 16:05:47 2015 +0100 Shifted the column visibility button over to the right hand side, where it used to be web/css/mrbs.css.php | 9 +++++++++ 1 file changed, 9 insertions(+) commit 40533d007 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 2 15:44:41 2015 +0100 Column visibility working with pending.php web/js/datatables.js.php | 36 ++++++++++++++++++++++-------------- web/js/pending.js.php | 12 ++++++++++-- 2 files changed, 32 insertions(+), 16 deletions(-) commit dae2b264b Merge: 0b4903ef7 fd0986069 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 2 15:05:29 2015 +0100 Merge with default commit fd0986069 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 2 11:59:16 2015 +0100 Changed some WARNING messages to NOTICE messages when there's no need for any action. web/internalconfig.inc.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) commit e9bbf101b Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Oct 2 11:38:14 2015 +0100 A few minor changes to support the removal of the 'mysql' DB abstraction, including support for the 'db_ext' auth scheme. web/auth/auth_db_ext.inc | 7 +++++++ web/config.inc.php | 3 +-- web/systemdefaults.inc.php | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) commit 22adaa610 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 2 10:16:46 2015 +0100 Removed 'mysql' $dbsys config option, now that it is being replaced by 'mysqli' web/internalconfig.inc.php | 8 + web/mysql.inc (gone) | 598 ----------------------------------- web/systemdefaults.inc.php | 3 +- 3 files changed, 9 insertions(+), 600 deletions(-) commit 737346968 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 2 09:27:20 2015 +0100 Took advantage of __DIR__ magic constant introduced in PHP 5.3.0 web/Crypt/Blowfish.php | 2 +- web/session/session_cookie.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 7f58416ff Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 2 09:22:18 2015 +0100 Fixed various problems with pathnames when being called from js/* files (ie one level down) web/Crypt/Blowfish.php | 7 ++++--- web/Crypt/Blowfish/CBC.php | 2 +- web/Crypt/Blowfish/ECB.php | 2 +- web/Crypt/Blowfish/MCrypt.php | 2 +- web/Crypt/Blowfish/PHP.php | 4 ++-- web/session/session_cookie.inc | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) commit adfe3ce8d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 1 17:19:16 2015 +0100 Fixed constructors to prevent Deprecated notices appearing in PHP7 web/Crypt/Blowfish.php | 2 +- web/Crypt/Blowfish/CBC.php | 2 +- web/Crypt/Blowfish/DefaultKey.php | 2 +- web/Crypt/Blowfish/ECB.php | 2 +- web/Crypt/Blowfish/MCrypt.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) commit faec5b287 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 1 17:09:16 2015 +0100 Updated to latest version of PEAR Blowfish package (though iit's not very recent (2008!) and so we should probably use something else in due course. web/Blowfish.php (gone) | 316 ----------- web/Crypt/Blowfish.php (new) | 317 +++++++++++ web/Crypt/Blowfish/CBC.php (new) | 152 +++++ web/{ => Crypt}/Blowfish/DefaultKey.php | 645 +++++++++++----------- web/Crypt/Blowfish/ECB.php (new) | 142 +++++ web/Crypt/Blowfish/MCrypt.php (new) | 179 ++++++ web/Crypt/Blowfish/PHP.php (new) | 273 +++++++++ web/session/session_cookie.inc | 2 +- 8 files changed, 1383 insertions(+), 643 deletions(-) commit e4ed6244d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 1 16:28:45 2015 +0100 Added some error handling to cover the case when a database has been migrated from a PHP system where crypt() works to one where it doesn't (Unlikely to hapen except during development testing). web/auth/auth_db.inc | 11 +++++++++++ 1 file changed, 11 insertions(+) commit 72aa17996 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 1 15:11:47 2015 +0100 Updated PEAR.php to latest version (1.10.0dev3) to avoid problems with PHP7 web/PEAR.php | 585 +++++++++++++++++++++++++++++-------------------- 1 file changed, 352 insertions(+), 233 deletions(-) commit 0b4903ef7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 1 15:05:58 2015 +0100 Committing changes to convert use of colVis to Buttons - only half way through .../css/buttons.dataTables.css (new) | 297 +++ .../css/buttons.dataTables.min.css (new) | 1 + .../css/dataTables.colVis.css (gone) | 185 -- .../css/dataTables.colVis.min.css (gone) | 1 - .../datatables/js/buttons.colVis.js (new) | 149 ++ .../js/buttons.colVis.min.js (new) | 4 + .../js/dataTables.buttons.js (new) | 1497 ++++++++++++++++ .../js/dataTables.buttons.min.js (new) | 32 + .../js/dataTables.colVis.js (gone) | 1123 ------------ .../js/dataTables.colVis.min.js (gone) | 24 - web/js.inc | 6 +- web/js/datatables.js.php | 38 +- web/js/pending.js.php | 2 +- web/style.inc | 4 +- 14 files changed, 2004 insertions(+), 1359 deletions(-) commit bccab81ca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 29 17:00:02 2015 +0100 Fixed bug causing English not to be used as a DataTable language web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e9c8dfe23 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 29 16:34:42 2015 +0100 Upgraded to ColVis 1.1.2 .../datatables/js/dataTables.colVis.js | 38 +++++++++++----- .../datatables/js/dataTables.colVis.min.js | 43 +++++++++--------- 2 files changed, 49 insertions(+), 32 deletions(-) commit f21a5f976 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 29 16:27:21 2015 +0100 Updated to FixedColumns 3.1.0 .../css/dataTables.fixedColumns.css (gone) | 24 ------------------ .../css/fixedColumns.dataTables.css (new) | 18 +++++++++++++ ...n.css => fixedColumns.dataTables.min.css} | 2 +- web/style.inc | 4 +-- 4 files changed, 21 insertions(+), 27 deletions(-) commit f86e45e77 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 29 16:09:00 2015 +0100 Updated to ColReorder 1.2.0 .../css/colReorder.dataTables.css (new) | 10 + ...min.css => colReorder.dataTables.min.css} | 0 .../css/dataTables.colReorder.css (gone) | 14 - .../datatables/js/dataTables.colReorder.js | 363 ++++++----------- .../js/dataTables.colReorder.min.js | 45 +- web/style.inc | 4 +- 6 files changed, 157 insertions(+), 279 deletions(-) commit a3f4f2932 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 29 15:55:13 2015 +0100 Updated language files to latest versions web/jquery/datatables/language/Czech.lang | 32 +++++++++------- web/jquery/datatables/language/French.lang | 4 +- web/jquery/datatables/language/Greek.lang | 29 ++++++++++----- web/jquery/datatables/language/Italian.lang | 2 +- web/jquery/datatables/language/Japanese.lang | 32 +++++++++------- web/jquery/datatables/language/Kyrgyz.lang | 24 +++++------- web/jquery/datatables/language/Latvian.lang | 35 ++++++++++-------- web/jquery/datatables/language/Russian.lang | 2 +- .../datatables/language/Welsh.lang (new) | 30 +++++++++++++++ web/language.inc | 3 +- 10 files changed, 123 insertions(+), 70 deletions(-) commit ca0eb1120 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 29 14:49:56 2015 +0100 Updated to DataTables 1.10.9 .../datatables/css/jquery.dataTables.css | 184 ++- .../datatables/css/jquery.dataTables.min.css | 2 +- .../datatables/js/jquery.dataTables.js | 1142 ++++++++++------ .../datatables/js/jquery.dataTables.min.js | 321 ++--- 4 files changed, 945 insertions(+), 704 deletions(-) commit 3d85da049 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 29 14:22:58 2015 +0100 Removed redundant variables web/js/datatables.js.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit 52cc4fcb0 Merge: 3f02d8e72 b297c7119 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 29 14:00:08 2015 +0100 Merged latest changes from default commit d6bf2eddc Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Sep 24 20:11:45 2015 +0100 Added ability to set path to 'qmail-inject' when using the qmail email backend. web/functions_mail.inc | 4 ++++ web/systemdefaults.inc.php | 7 +++++++ 2 files changed, 11 insertions(+) commit b297c7119 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 24 16:31:34 2015 +0100 Improved error handling when sending mail web/functions_mail.inc | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) commit 388db4aed Merge: 707952973 637cc64f7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 23 11:52:48 2015 +0100 Merge with phpmailer. MRBS now uses PHPMailer as its mail sending engine, removing problems running under PHP7. Qmail added to backend options. Debug output improved, with an option to output to the browser (default) or error_log commit 637cc64f7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 23 11:44:40 2015 +0100 Improved handling of mail debug output, adding an option to direct output to the browser of error_log. web/functions_mail.inc | 64 ++++++++++++++++++++---------------- web/systemdefaults.inc.php | 12 ++++--- 2 files changed, 42 insertions(+), 34 deletions(-) commit 043087b52 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 23 10:49:17 2015 +0100 Got rid of a magic number web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 478588f2c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 23 10:31:39 2015 +0100 Added support for qmail web/functions_mail.inc | 24 +++++++++++++++--------- web/systemdefaults.inc.php | 2 +- 2 files changed, 16 insertions(+), 10 deletions(-) commit 121d204a1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 22 21:33:23 2015 +0100 Fixed bug in debug output web/functions_mail.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1403f6f51 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 22 21:22:42 2015 +0100 Added comments web/functions_mail.inc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) commit d1418293d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 22 21:13:04 2015 +0100 Updated PEAR Mail_Mime package to version 1.10.0 web/Mail/mime.php | 3121 ++++++++++++++++++++------------------- web/Mail/mimePart.php | 2510 ++++++++++++++++--------------- 2 files changed, 2875 insertions(+), 2756 deletions(-) commit e6573b03e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 22 21:09:18 2015 +0100 Removed redundant code web/Mail/RFC822.php (gone) | 951 --------------------------------- web/Mail/mail.php (gone) | 168 ------ web/Mail/null.php (gone) | 84 --- web/Mail/sendmail.php (gone) | 171 ------ web/Mail/smtp.php (gone) | 444 --------------- 5 files changed, 1818 deletions(-) commit ac30a9a53 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 22 21:01:40 2015 +0100 Removed redundandant code web/functions_mail.inc | 45 ---------------------------------------- 1 file changed, 45 deletions(-) commit 7e8afd8c6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 22 19:21:15 2015 +0100 Seems to be working - needs tidying up and more testing web/functions_mail.inc | 75 ++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 42 deletions(-) commit 8cdea0597 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 22 14:54:38 2015 +0100 Created the phpmailer branch to switch from using the PEAR Mail package to PHPMailer. PEAR Mail is no longer supported and breaks under PHP7. web/functions_mail.inc | 94 +- web/lib/PHPMailer/LICENSE (new) | 504 +++ .../PHPMailer/PHPMailerAutoload.php (new) | 49 + web/lib/PHPMailer/VERSION (new) | 1 + web/lib/PHPMailer/class.phpmailer.php (new) | 3722 ++++++++++++++++ .../PHPMailer/class.phpmaileroauth.php (new) | 197 + .../class.phpmaileroauthgoogle.php (new) | 70 + web/lib/PHPMailer/class.pop3.php (new) | 397 ++ web/lib/PHPMailer/class.smtp.php (new) | 1176 +++++ web/lib/PHPMailer/get_oauth_token.php (new) | 64 + .../language/phpmailer.lang-am.php (new) | 26 + .../language/phpmailer.lang-ar.php (new) | 27 + .../language/phpmailer.lang-az.php (new) | 26 + .../language/phpmailer.lang-be.php (new) | 26 + .../language/phpmailer.lang-bg.php (new) | 26 + .../language/phpmailer.lang-br.php (new) | 27 + .../language/phpmailer.lang-ca.php (new) | 26 + .../language/phpmailer.lang-ch.php (new) | 26 + .../language/phpmailer.lang-cz.php (new) | 25 + .../language/phpmailer.lang-de.php (new) | 25 + .../language/phpmailer.lang-dk.php (new) | 26 + .../language/phpmailer.lang-el.php (new) | 25 + .../language/phpmailer.lang-eo.php (new) | 25 + .../language/phpmailer.lang-es.php (new) | 26 + .../language/phpmailer.lang-et.php (new) | 27 + .../language/phpmailer.lang-fa.php (new) | 27 + .../language/phpmailer.lang-fi.php (new) | 27 + .../language/phpmailer.lang-fo.php (new) | 26 + .../language/phpmailer.lang-fr.php (new) | 29 + .../language/phpmailer.lang-gl.php (new) | 27 + .../language/phpmailer.lang-he.php (new) | 25 + .../language/phpmailer.lang-hr.php (new) | 26 + .../language/phpmailer.lang-hu.php (new) | 26 + .../language/phpmailer.lang-id.php (new) | 26 + .../language/phpmailer.lang-it.php (new) | 27 + .../language/phpmailer.lang-ja.php (new) | 27 + .../language/phpmailer.lang-ka.php (new) | 26 + .../language/phpmailer.lang-ko.php (new) | 26 + .../language/phpmailer.lang-lt.php (new) | 26 + .../language/phpmailer.lang-lv.php (new) | 26 + .../language/phpmailer.lang-ms.php (new) | 26 + .../language/phpmailer.lang-nl.php (new) | 26 + .../language/phpmailer.lang-no.php (new) | 25 + .../language/phpmailer.lang-pl.php (new) | 26 + .../language/phpmailer.lang-pt.php (new) | 26 + .../language/phpmailer.lang-ro.php (new) | 26 + .../language/phpmailer.lang-ru.php (new) | 26 + .../language/phpmailer.lang-se.php (new) | 26 + .../language/phpmailer.lang-sk.php (new) | 26 + .../language/phpmailer.lang-sl.php (new) | 26 + .../language/phpmailer.lang-sr.php (new) | 26 + .../language/phpmailer.lang-tr.php (new) | 29 + .../language/phpmailer.lang-uk.php (new) | 27 + .../language/phpmailer.lang-vi.php (new) | 26 + .../language/phpmailer.lang-zh.php (new) | 28 + .../language/phpmailer.lang-zh_cn.php (new) | 27 + web/systemdefaults.inc.php | 1 + 57 files changed, 7480 insertions(+), 3 deletions(-) commit 707952973 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Sep 18 20:25:34 2015 +0100 Changed minimum required PHP version to 5.3.3, still supporting the standard PHP in RHEL/CentOS 6, but not Ubuntu Lucid's 5.3.2, but Lucid is out of support. web/internalconfig.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6fe33f877 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Sep 18 20:25:05 2015 +0100 Backed out changeset cd0f45f42fd9 web/config.inc.php | 11 ++--------- web/internalconfig.inc.php | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) commit bd49d429c Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Sep 18 20:23:07 2015 +0100 Changed minimum required PHP version to 5.3.3, still supporting the standard PHP in RHEL/CentOS 6, but not Ubuntu Lucid's 5.3.2, but Lucid is out of support. web/config.inc.php | 11 +++++++++-- web/internalconfig.inc.php | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) commit 9cef87be4 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Sep 18 17:52:31 2015 +0100 Tidied comments in versioning code a little. web/version.inc | 2 +- web/version_num.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 51e39f32e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 18 13:40:50 2015 +0100 Removed redundant global declarations web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6b7c1768c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 18 13:36:54 2015 +0100 Fixed problem generating Warning on Help page on systems where exec() has been disabled web/functions.inc | 8 ++++++++ web/version.inc | 11 +++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) commit 43656c625 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 18 12:51:35 2015 +0100 Fixed bug causing problem upgrading when using PostgreSQL with $db_schema defined web/upgrade/44/pgsql.sql | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 13a016f2c Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Sep 17 21:37:10 2015 +0100 Improved implementation of new password hashing added in [hg-code:a0b360]. We will now rehash md5 and, if required, password_hash format hashes on login. tables.my.sql | 3 +-- tables.pg.sql | 3 +-- web/auth/auth_db.inc | 46 ++++++++++++++++++++++++++------------ web/edit_users.php | 31 ++++++++----------------- web/lang/lang.en | 1 - web/upgrade/45/mysql.sql | 7 ++---- web/upgrade/45/pgsql.sql | 9 ++++---- 7 files changed, 49 insertions(+), 51 deletions(-) commit 73b94bec6 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Sep 16 22:04:55 2015 +0100 Added support for the 'db' auth scheme to store password hashs in PHP's 'password_hash' format. If the password_hash() function is functional (as determined by the password_compat library) new/changed passwords will be encrypted using password_hash(). Existing passwords in md5 format will continue to work, administrators can see the hash format a user's entry is using in the "User list". tables.my.sql | 5 +- tables.pg.sql | 5 +- web/auth/auth_db.inc | 38 ++- web/dbsys.inc | 2 +- web/defaultincludes.inc | 2 +- web/edit_users.php | 38 ++- web/lang/lang.en | 1 + web/password_compat/password.php (new) | 317 +++++++++++++++++++++++ web/upgrade/45/mysql.sql (new) | 9 + web/upgrade/45/pgsql.sql (new) | 9 + 10 files changed, 403 insertions(+), 23 deletions(-) commit 77ffd4941 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Sep 15 21:24:31 2015 +0100 auth_ldap: Added support for LDAP dereferencing behaviour, based on [patches:#56]. web/auth/auth_ldap.inc | 8 +++++++- web/systemdefaults.inc.php | 8 ++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) commit 5501885dc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 11 09:53:12 2015 +0100 Added more instructions on uprgading. See SF Support Requests #609 UPGRADE | 7 +++++++ 1 file changed, 7 insertions(+) commit 8d7d68810 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 8 11:22:27 2015 +0100 Fixed a bug with default_duration_all_day. See SF Support Requests #782 web/edit_entry.php | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) commit 12b06bc60 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 3 12:57:56 2015 +0100 Fixed a problem with absolute pathnames web/pending.php | 3 +-- web/view_entry.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) commit e2b117ee1 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu May 28 08:11:01 2015 +0100 Added an extra example 'unset' into systemdefaults.inc.php web/systemdefaults.inc.php | 1 + 1 file changed, 1 insertion(+) commit 3f02d8e72 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 14 16:46:22 2015 +0100 Restructured code web/js/report.js.php | 47 +++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 17 deletions(-) commit eb0111d85 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 14 16:35:43 2015 +0100 Restructured code web/js/report.js.php | 198 +++++++++++++++++++---------------------- 1 file changed, 93 insertions(+), 105 deletions(-) commit 1a80a514a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 14 16:31:11 2015 +0100 Removed redundant code web/js/report.js.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit 810bd98e4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 14 16:27:47 2015 +0100 Changed to new API web/js/report.js.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) commit 2a7dbe2bb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 14 16:15:10 2015 +0100 Fixed bug resulting from earlier change web/js/datatables.js.php | 2 +- web/js/edit_users.js.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 5294ad728 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 14 16:05:34 2015 +0100 Restructured code web/js/datatables.js.php | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) commit 2577f62e8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 14 15:49:58 2015 +0100 Restructured code web/js/datatables.js.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 2ec654ab3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 14 15:47:11 2015 +0100 Renamed variable web/js/datatables.js.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) commit 60d62368f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 14 15:44:06 2015 +0100 Converted to use new API web/js/datatables.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f62af0037 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 14 15:35:08 2015 +0100 Got rid of unused variable web/js/pending.js.php | 1 - 1 file changed, 1 deletion(-) commit 300d18dec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 14 15:31:19 2015 +0100 Switched to using new API for colReorder web/js/pending.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 34a2a2fd3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 14 15:27:31 2015 +0100 Got column visibility working web/js/pending.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit dc01ba41a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 14 15:23:41 2015 +0100 Restructured code web/js/pending.js.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) commit 8c5a07b57 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 14 15:18:31 2015 +0100 Restructured code, getting rid of a magic number web/js/pending.js.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) commit d86656dff Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 9 17:30:26 2015 +0100 Restructured code web/js/datatables.js.php | 1 + web/js/pending.js.php | 31 +++++++++++-------------------- web/pending.php | 3 ++- 3 files changed, 14 insertions(+), 21 deletions(-) commit 1ff767a04 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 9 16:36:25 2015 +0100 Switched from sTypes to types web/edit_users.php | 4 ++-- web/js/datatables.js.php | 16 ++++++++-------- web/js/edit_users.js.php | 4 ++-- web/js/pending.js.php | 6 ++++-- web/js/report.js.php | 4 ++-- web/js/search.js.php | 4 ++-- web/pending.php | 4 ++-- web/report.php | 16 ++++++++-------- web/search.php | 4 ++-- 9 files changed, 32 insertions(+), 30 deletions(-) commit f51485ccb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 9 12:36:39 2015 +0100 Fixed display of "Start time" column label web/css/mrbs.css.php | 3 +++ 1 file changed, 3 insertions(+) commit c27a7cd47 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 9 12:28:57 2015 +0100 Fixed problem with sort icons appearing in the first column when they shouldn't do web/js/pending.js.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) commit 0c9e58d5c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 9 11:58:58 2015 +0100 Fixed alignment of columns in main and sub-tables web/css/mrbs.css.php | 27 ++++++++++++++++++++++----- web/js/pending.js.php | 16 +++++++++------- 2 files changed, 31 insertions(+), 12 deletions(-) commit b75b4fed7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 8 16:35:01 2015 +0100 Updated to use new API web/js/pending.js.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) commit 22a083eeb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 8 16:25:14 2015 +0100 Restructured code web/js/pending.js.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit 6df2b726d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 8 16:21:03 2015 +0100 Fixed problem with formatting of pending table web/js/pending.js.php | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) commit 8b2198512 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 3 17:00:44 2015 +0100 Fixed comment web/systemdefaults.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 3db4a7578 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 3 16:31:10 2015 +0100 Fixed bug - 'ical' text string was not being passed through get_vocab() web/report.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d13693628 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 3 16:15:51 2015 +0100 Removed redundant option web/js/pending.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit b9b707a5a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 2 16:40:43 2015 +0100 Corrected typo in comment web/js/pending.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b9e4cec38 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 2 16:38:43 2015 +0100 Subtable closing works web/js/pending.js.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 01a157d50 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 2 16:24:39 2015 +0100 Subtable expansion working web/js/pending.js.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 873c42688 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 2 15:57:45 2015 +0100 Commit before more major restructuring of pending table web/js/pending.js.php | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) commit cb4540739 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 2 13:52:34 2015 +0100 Changed the way datatables is called so that it returns. Got rid of window resize handler because DataTables now does this for you. Moved creation of FixedColumns to be inline rather than in a callback. web/js/datatables.js.php | 98 ++++++++++---------------------------- web/js/edit_users.js.php | 4 +- web/js/pending.js.php | 2 - web/js/report.js.php | 2 - web/js/search.js.php | 4 +- 5 files changed, 26 insertions(+), 84 deletions(-) commit 0446eb98e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 2 09:41:55 2015 +0100 Updated to use new style internationalisation plugin .../datatables/language/Afrikaans.lang (new) | 30 ++++++ .../datatables/language/Albanian.lang (new) | 30 ++++++ .../language/{ar.txt => Arabic.lang} | 9 +- .../datatables/language/Armenian.lang (new) | 30 ++++++ .../language/Azerbaijan.lang (new) | 30 ++++++ .../datatables/language/Bangla.lang (new) | 24 +++++ .../datatables/language/Basque.lang (new) | 31 ++++++ .../language/Belarusian.lang (new) | 27 +++++ .../language/{bg.txt => Bulgarian.lang} | 9 +- .../language/{ca.txt => Catalan.lang} | 9 +- .../language/Chinese-traditional.lang (new) | 24 +++++ .../language/{zh.txt => Chinese.lang} | 16 ++- .../datatables/language/Croatian.lang (new) | 30 ++++++ .../language/{cs.txt => Czech.lang} | 9 +- .../language/{da.txt => Danish.lang} | 21 ++-- .../datatables/language/Dutch.lang (new) | 26 +++++ .../datatables/language/English.lang (new) | 30 ++++++ .../language/{et.txt => Estonian.lang} | 17 +++- .../datatables/language/Filipino.lang (new) | 24 +++++ .../language/{fi.txt => Finnish.lang} | 9 +- .../datatables/language/French.lang (new) | 29 ++++++ .../datatables/language/Galician.lang (new) | 31 ++++++ .../language/{ka.txt => Georgian.lang} | 9 +- .../datatables/language/German.lang (new) | 30 ++++++ .../language/{el.txt => Greek.lang} | 9 +- .../datatables/language/Gujarati.lang (new) | 30 ++++++ .../language/{he.txt => Hebrew.lang} | 9 +- .../language/{hi.txt => Hindi.lang} | 9 +- .../datatables/language/Hungarian.lang (new) | 30 ++++++ .../datatables/language/Icelandic.lang (new) | 30 ++++++ .../language/{id.txt => Indonesian.lang} | 7 ++ .../language/{gd-ie.txt => Irish.lang} | 9 +- .../datatables/language/Italian.lang (new) | 30 ++++++ .../datatables/language/Japanese.lang (new) | 24 +++++ .../datatables/language/Korean.lang (new) | 30 ++++++ .../datatables/language/Kyrgyz.lang (new) | 29 ++++++ .../language/{lv.txt => Latvian.lang} | 9 +- .../language/Lithuanian.lang (new) | 30 ++++++ .../language/Macedonian.lang (new) | 26 +++++ .../datatables/language/Malay.lang (new) | 30 ++++++ .../datatables/language/Mongolian.lang (new) | 30 ++++++ .../datatables/language/Nepali.lang (new) | 31 ++++++ .../language/{no.txt => Norwegian.lang} | 15 ++- .../language/{fa.txt => Persian.lang} | 9 +- .../datatables/language/Polish.lang (new) | 31 ++++++ .../language/Portuguese-Brasil.lang (new) | 30 ++++++ .../language/{pt-pt.txt => Portuguese.lang} | 11 ++- .../language/{ro.txt => Romanian.lang} | 11 ++- .../datatables/language/Russian.lang (new) | 30 ++++++ .../language/{sr.txt => Serbian.lang} | 9 +- .../datatables/language/Sinhala.lang (new) | 30 ++++++ .../datatables/language/Slovak.lang (new) | 30 ++++++ .../datatables/language/Slovenian.lang (new) | 30 ++++++ .../datatables/language/Spanish.lang (new) | 31 ++++++ .../datatables/language/Swahili.lang (new) | 30 ++++++ .../datatables/language/Swedish.lang (new) | 30 ++++++ .../datatables/language/Tamil.lang (new) | 30 ++++++ .../language/{th.txt => Thai.lang} | 9 +- .../language/{tr.txt => Turkish.lang} | 9 +- .../language/{uk.txt => Ukranian.lang} | 13 ++- .../language/{ur.txt => Urdu.lang} | 9 +- .../datatables/language/Uzbek.lang (new) | 29 ++++++ .../language/{vi.txt => Vietnamese.lang} | 9 +- web/jquery/datatables/language/de.txt (gone) | 17 ---- web/jquery/datatables/language/en.txt (gone) | 17 ---- web/jquery/datatables/language/es.txt (gone) | 17 ---- web/jquery/datatables/language/fr.txt (gone) | 17 ---- web/jquery/datatables/language/hr.txt (gone) | 17 ---- web/jquery/datatables/language/hu.txt (gone) | 17 ---- web/jquery/datatables/language/it.txt (gone) | 17 ---- web/jquery/datatables/language/lt.txt (gone) | 17 ---- web/jquery/datatables/language/nb.txt (gone) | 17 ---- web/jquery/datatables/language/nl.txt (gone) | 17 ---- web/jquery/datatables/language/nn.txt (gone) | 17 ---- web/jquery/datatables/language/pl.txt (gone) | 17 ---- .../datatables/language/pt-br.txt (gone) | 17 ---- web/jquery/datatables/language/pt.txt (gone) | 17 ---- web/jquery/datatables/language/ru.txt (gone) | 17 ---- web/jquery/datatables/language/sk.txt (gone) | 17 ---- web/jquery/datatables/language/sl.txt (gone) | 17 ---- web/jquery/datatables/language/sv.txt (gone) | 17 ---- web/js/datatables.js.php | 12 ++- web/language.inc | 92 ++++++++++++++++-- 83 files changed, 1425 insertions(+), 356 deletions(-) commit 72b65a988 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 1 13:08:12 2015 +0100 Converted search to new API web/js/search.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6926afcc3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 1 13:05:58 2015 +0100 Removed redundant comment web/js/report.js.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) commit 95b2348b4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 1 13:03:34 2015 +0100 Converted report to new API web/js/report.js.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) commit 8da48b3df Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 1 12:21:10 2015 +0100 Fixed JavaScript error when there are no fixed columns web/js/datatables.js.php | 31 +++++++++++++++++-------------- web/js/pending.js.php | 4 +--- 2 files changed, 18 insertions(+), 17 deletions(-) commit 88662718f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 1 11:27:10 2015 +0100 Improved on last fix web/js/datatables.js.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) commit 12cb68535 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 1 11:13:15 2015 +0100 Xixed problem with bottom row in Firefox when scrolling a fixed column table web/js/datatables.js.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit 0d53f5c5a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 1 10:46:42 2015 +0100 Fixed problem with fixed right hand columns web/css/mrbs.css.php | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) commit f422d3a61 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Mar 29 23:12:01 2015 +0100 Removed closing PHP tag in version_num.inc, it's against our standard web/version_num.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 5278c955d Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Mar 29 23:07:42 2015 +0100 Attempt to show hg version if we can run 'hg' to determine it web/version_num.inc (new) | 3 +++ 1 file changed, 3 insertions(+) commit 817f530b1 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Mar 29 23:07:19 2015 +0100 Attempt to show hg version if we can run 'hg' to determine it web/systemdefaults.inc.php | 6 ++++++ web/version.inc | 15 +++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) commit 3b3cb5f43 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 27 18:20:50 2015 +0000 Numerous changes - fixed right columns still not working web/js/admin.js.php | 21 ++++---- web/js/datatables.js.php | 100 +++++++++++++------------------------ web/js/edit_users.js.php | 2 +- 3 files changed, 45 insertions(+), 78 deletions(-) commit 6bb7d7c9c Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Mar 26 23:25:30 2015 +0000 Fixed a few comment typos. web/language.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit e3d75b293 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 26 16:08:18 2015 +0000 Converted to using ajax instead of sAjaxSource web/js/datatables.js.php | 6 +++--- web/js/edit_users.js.php | 2 +- web/js/report.js.php | 4 ++-- web/js/search.js.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) commit c1f4f4339 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 26 15:37:27 2015 +0000 More CSS tweaks and API updates web/css/mrbs.css.php | 9 +++++++++ web/js/datatables.js.php | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) commit f75ea6f9f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 26 15:15:44 2015 +0000 Moved more DataTables calls over to new API web/js/datatables.js.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) commit 14e14aaee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 26 14:58:06 2015 +0000 Removed bottom dark grey border web/css/mrbs.css.php | 4 ++++ 1 file changed, 4 insertions(+) commit 38f1898ea Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 26 14:44:32 2015 +0000 More CSS tweaks to get the DataTables right web/css/mrbs.css.php | 66 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 60 insertions(+), 6 deletions(-) commit 41924f3a4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 26 13:42:14 2015 +0000 Changed CSS to make DataTables work (they don't like border-collapse: collapse when scrollX is set to 100%) web/css/mrbs.css.php | 79 +++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 21 deletions(-) commit 12a9cf65f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 25 16:38:59 2015 +0000 More CSS tweaks web/css/mrbs.css.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit 3aeed1924 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 25 16:14:05 2015 +0000 More CSS tweaks web/css/mrbs.css.php | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) commit 1df32f36a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 25 15:54:43 2015 +0000 Tweaked CSS web/css/mrbs.css.php | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) commit 24b4df0d5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 25 15:33:10 2015 +0000 Removed redundant CSS files .../datatables/css/mrbs-page.css (gone) | 19 - .../datatables/css/mrbs-table.css (gone) | 571 ----------------- web/style.inc | 3 - 3 files changed, 593 deletions(-) commit b0c47c760 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 25 13:24:29 2015 +0000 Fixed yet another comment typo web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f61bd3c9f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 25 13:23:28 2015 +0000 Fixed another comment typo web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b0e6acff5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 25 13:10:33 2015 +0000 Fixed typo in comment web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9a52ec73c Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Mar 23 12:26:52 2015 +0000 Added .hgignore file. .hgignore (new) | 11 +++++++++++ 1 file changed, 11 insertions(+) commit d6717facc Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Mar 23 12:10:27 2015 +0000 Changed version specifier for Mercurial. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 182f295e7 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Mar 22 23:19:58 2015 +0000 Improved schema 41 upgrade to preserve mrbs_entry's 'timestamp' column contents. web/upgrade/41/mysql.sql | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) commit 9076e56d7 Author: convert-repo <devnull@localhost> Date: Sun Mar 22 20:01:35 2015 +0000 update tags commit 5c8bb05b5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 19 08:02:07 2015 +0000 Fixes to Indonesian language file. See SF Patches #44 web/lang/lang.id | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 7f41bf76c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 15 09:47:32 2015 +0000 Made error handling consistent by always using object oriented rather than procedural style web/mysqli.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 4d7c1dc44 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 15 09:38:00 2015 +0000 Added some error handling to sql_mysql_table_exists() and sql_mysqli_table_exists() web/mysql.inc | 8 +++++++- web/mysqli.inc | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) commit a347f4ed2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 15 09:26:07 2015 +0000 Fixed bugs in error reporting in sql_pgsql_table_exists() web/pgsql.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 8858cc3e2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 1 18:53:26 2015 +0000 Changed some options to use new API web/js/datatables.js.php | 19 ++++++++++--------- web/js/pending.js.php | 6 +++--- 2 files changed, 13 insertions(+), 12 deletions(-) commit 0b0e47205 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 1 18:05:15 2015 +0000 Converted to use new versions of DataTables web/js.inc | 41 ++++++++++++++++++-------------------- web/js/datatables.js.php | 2 +- web/style.inc | 10 ++++++++-- 3 files changed, 28 insertions(+), 25 deletions(-) commit e1a8597ff Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 1 14:43:32 2015 +0000 Updated to DataTables 1.10.5, ColVis 1.1.1, ColReorder 1.1.2 and FixedColumns 3.0.3 web/jquery/datatables/css/ColVis.css (gone) | 76 - .../datatables/css/ColVisAlt.css (gone) | 104 - ...Reorder.css => dataTables.colReorder.css} | 9 +- .../css/dataTables.colReorder.min.css (new) | 1 + .../css/dataTables.colVis.css (new) | 185 + .../css/dataTables.colVis.min.css (new) | 1 + .../css/dataTables.fixedColumns.css (new) | 24 + .../dataTables.fixedColumns.min.css (new) | 1 + .../css/jquery.dataTables.css (new) | 476 + .../css/jquery.dataTables.min.css (new) | 1 + .../datatables/js/ColReorder.min.js (gone) | 34 - .../datatables/js/ColVis.min.js (gone) | 33 - .../datatables/js/ColVis.mrbs.min.js (gone) | 33 - .../datatables/js/FixedColumns.min.js (gone) | 39 - .../js/FixedColumns.mrbs.js (gone) | 1207 -- .../js/dataTables.colReorder.js (new) | 1371 ++ .../js/dataTables.colReorder.min.js (new) | 26 + .../datatables/js/dataTables.colVis.js (new) | 1107 ++ .../js/dataTables.colVis.min.js (new) | 23 + .../js/dataTables.fixedColumns.js (new) | 1414 ++ .../js/dataTables.fixedColumns.min.js (new) | 30 + .../datatables/js/jquery.dataTables.js (new) | 14867 +++++++++++++++ .../datatables/js/jquery.dataTables.min.js | 309 +- 23 files changed, 19685 insertions(+), 1686 deletions(-) commit 837c6ef45 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 1 13:37:01 2015 +0000 Added latest images .../images/back_disabled.jpg (gone) | Bin 612 -> 0 bytes .../datatables/images/back_disabled.png (new) | Bin 0 -> 345 bytes .../datatables/images/back_enabled.jpg (gone) | Bin 807 -> 0 bytes .../datatables/images/back_enabled.png (new) | Bin 0 -> 453 bytes .../images/back_enabled_hover.png (new) | Bin 0 -> 450 bytes .../datatables/images/button.png (gone) | Bin 1161 -> 0 bytes .../images/forward_disabled.png (new) | Bin 0 -> 335 bytes .../images/forward_enabled.png (new) | Bin 0 -> 445 bytes .../images/forward_enabled_hover.png (new) | Bin 0 -> 444 bytes web/jquery/datatables/images/sort_asc.png | Bin 263 -> 160 bytes .../datatables/images/sort_asc_disabled.png | Bin 252 -> 148 bytes web/jquery/datatables/images/sort_both.png | Bin 282 -> 201 bytes web/jquery/datatables/images/sort_desc.png | Bin 260 -> 158 bytes .../datatables/images/sort_desc_disabled.png | Bin 251 -> 146 bytes 14 files changed, 0 insertions(+), 0 deletions(-) commit 57d33eb37 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 1 12:27:42 2015 +0000 A branch for updating to the latest version of DataTables, which includes significant API changes commit 3794d327a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 27 11:10:24 2015 +0000 Fixed bug causing the duration to be calculated incorrectly when the date is changed after the start time has been changed. web/js/edit_entry.js.php | 1 + 1 file changed, 1 insertion(+) commit 16bb88b27 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 25 16:33:34 2015 +0000 Removed redundant code now that the minimum PHP version is 5.3.0 web/language.inc | 6 ------ 1 file changed, 6 deletions(-) commit 3836a6b7b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 25 16:21:23 2015 +0000 Got rid of the $maxlength config variable and calculated it automatically tables.my.sql | 6 +----- tables.pg.sql | 6 +----- web/dbsys.inc | 26 ++++++++++++++++++++++---- web/edit_entry_handler.php | 2 +- web/internalconfig.inc.php | 23 +++++++++++++++++++++++ web/systemdefaults.inc.php | 12 ------------ 6 files changed, 48 insertions(+), 27 deletions(-) commit eddaa260f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 25 09:34:16 2015 +0000 Fixed bug that caused the end time selector on the edit_entry form to be wrong when using periods and trying to make a new booking for a slot that wasn't the first of the day. web/functions.inc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) commit ddc70915a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 7 10:39:32 2015 +0000 Added a stack trace to the fatal_error error log web/functions.inc | 3 +++ 1 file changed, 3 insertions(+) commit 865eef8db Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 3 15:41:40 2015 +0000 Added some UNIQUE constraints to the tables tables.my.sql | 15 ++++++++++----- tables.pg.sql | 22 ++++++++++++++++------ web/dbsys.inc | 2 +- web/upgrade/44/mysql.sql (new) | 18 ++++++++++++++++++ web/upgrade/44/pgsql.sql (new) | 18 ++++++++++++++++++ 5 files changed, 63 insertions(+), 12 deletions(-) commit f813bce61 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 29 18:05:06 2015 +0000 Added comment web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 404395e8f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 29 16:16:02 2015 +0000 Created utf8_strtolower() and utf8_strtoupper() functions to ensure that mb_strtolower() and mb_strtoupper() are called if possible in order to avoid possible problems such as the Turkish i/I problem. web/File/Passwd.php | 4 +-- web/File/Passwd/Authbasic.php | 8 ++--- web/File/Passwd/Smb.php | 22 ++++++------ web/File/Passwd/Unix.php | 4 +-- web/Mail.php | 2 +- web/Mail/mime.php | 4 +-- web/Mail/mimePart.php | 2 +- web/Net/SMTP.php | 2 +- web/auth/auth_config.inc | 4 +-- web/auth/auth_db.inc | 4 +-- web/auth/auth_db_ext.inc | 4 +-- web/auth/auth_ldap.inc | 8 ++--- web/edit_users.php | 2 +- web/functions.inc | 2 +- web/functions_ical.inc | 2 +- web/language.inc | 62 ++++++++++++++++++++++++++------- web/lib/Locale.php | 2 +- web/mysql.inc | 2 +- web/mysqli.inc | 2 +- web/pgsql.inc | 2 +- web/report.php | 6 ++-- web/search.php | 2 +- 22 files changed, 94 insertions(+), 58 deletions(-) commit 0cf345fdc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 28 17:33:32 2015 +0000 Renamed guoteIMAP() to get rid of an upper-case 'I' and so avoid possible problems in a Turkish locale web/auth/auth_imap.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 6754cd757 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 28 17:29:06 2015 +0000 Renamed getBookingsInSeries() to get rid of an upper-case 'I' and so avoid possible problems in a Turkish locale web/mrbs_sql.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 8675eaf70 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 28 17:25:31 2015 +0000 Renamed mrbsUpdateLastReminded() for consistency web/approve_entry_handler.php | 4 ++-- web/mrbs_sql.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit aea45d559 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 28 17:21:06 2015 +0000 Renamed mrbsUpdateMoreInfo() to get rid of an upper-case 'I' and so avoid possible problems in a Turkish locale web/approve_entry_handler.php | 2 +- web/mrbs_sql.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit d03859494 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 28 17:15:43 2015 +0000 Renamed mrbsGetBookingInfo() to get rid of an upper-case 'I' and so avoid possible problems in a Turkish locale web/approve_entry_handler.php | 4 ++-- web/del_entry.php | 4 ++-- web/edit_entry_handler.php | 2 +- web/mrbs_sql.inc | 8 ++++---- web/view_entry.php | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) commit 53b0c5271 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 28 16:59:38 2015 +0000 Renamed function to get rid of an upper-case 'I' and so avoid possible problems in a Turkish locale web/mrbs_sql.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit ca45fbef0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 28 16:46:27 2015 +0000 Renamed Calendar::getDaysInMonth() to avoid using a capital 'I' and possible problems when in a Turkish locale web/mincals.inc | 180 ++++++++++++++++++++++------------------------ 1 file changed, 87 insertions(+), 93 deletions(-) commit 40404875c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 28 16:15:13 2015 +0000 Renamed function to get rid of an upper-case 'I' and so avoid possible problems in a Turkish locale web/functions.inc | 8 ++++---- web/report.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) commit f657f12b9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 28 16:07:08 2015 +0000 Fixed bug that allowed '0' to be entered as a valid email address for a user web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1bdcd2975 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 28 15:52:56 2015 +0000 Simplified last code change web/functions.inc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) commit 5b420d1f4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 28 15:50:06 2015 +0000 Fixed "undefined method isValidInetAddress()" message when saving the edit_area form and using a Turkish locale [caused by the capital 'I' in the method name] web/functions.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 207159ac8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 28 13:24:21 2015 +0000 Updated import.php to cope with the new modified_by field web/import.php | 1 + 1 file changed, 1 insertion(+) commit 8d86af08b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 27 17:33:56 2015 +0000 Reverted previous change - internalconfig doesn't rely on anything in language.inc! web/defaultincludes.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit eaba54413 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 27 17:20:50 2015 +0000 Fixed problem with order of includes (internalconfig relies on functions in language.inc) web/defaultincludes.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5413de85e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 26 18:20:56 2015 +0000 Fixed bug preventing the booking date being changed when multi-day bookings are not allowed web/js/edit_entry.js.php | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) commit 874b435b5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 26 16:08:11 2015 +0000 Fixed theoretical bug web/js/edit_entry.js.php | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) commit 81b9a532a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 26 14:33:53 2015 +0000 Fixed bug causing the end date selector in the edit_entry form to be visible even when multiday booking is not allowed. (Bug introduced in Rev 2911). web/js/datepicker.js.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit 5e7615125 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 26 13:09:05 2015 +0000 Fixed bug which caused the end time selector to be blank in some circumstances when using max_duration web/js/edit_entry.js.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit dc26d9011 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 25 09:49:45 2015 +0000 Fixed bug causing invalid .ics files to be created when exporting bookings from view_entry or report. web/functions_mail.inc | 6 ------ web/language.inc | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) commit 6080b013a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 24 12:36:55 2015 +0000 Removed an unnecessary USER_NOTICE error. web/mrbs_sql.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit dcdeb6983 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 22 10:13:40 2015 +0000 Moved locale_lookup() out into a class web/language.inc | 59 ++------------------------------------ web/lib/Locale.php (new) | 57 ++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 57 deletions(-) commit d7eb662be Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 22 09:50:33 2015 +0000 Fixed bug in MRBS\DateTime::modify(). The seconds were not being set to zero as they should be if an hh:mm pattern is given as the modify string. web/lib/MRBS/DateTime.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) commit 6be9e0539 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 21 19:56:15 2015 +0000 Expanded comment. web/lib/MRBS/DateTime.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2ace3d586 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jan 21 19:52:21 2015 +0000 Updated trunk version to add "+trunk" to make it more obvious. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6952c7bab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 21 19:46:40 2015 +0000 Fixed warning message about a missing third parameter to Locale::lookup() when running on PHP 5.3.0 systems with the Intl extension installed. The documentation says that the third parameter is optional, so it's a probably a PHP bug that was fixed in later versions. web/language.inc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) commit 772231582 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 21 19:11:36 2015 +0000 Put in a workaround for the DateTime::modify() bug and moved the minimum PHP version back to 5.3.0. See SF Support Requests #667. INSTALL | 2 +- web/defaultincludes.inc | 1 + web/functions.inc | 8 ++-- web/internalconfig.inc.php | 3 +- web/lib/MRBS/DateTime.php (new) | 75 +++++++++++++++++++++++++++++++ web/lib/autoload.inc (new) | 17 +++++++ web/report.php | 7 ++- 7 files changed, 105 insertions(+), 8 deletions(-) commit 90ae8fb11 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 21 14:18:47 2015 +0000 Fixed bug that caused the number of periods in the Report Summary to be incorrectly calculated if the report start or end date happened to fall in the middle of a multi-day booking. web/report.php | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) commit 7b139b14a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 21 13:34:37 2015 +0000 Simplified code web/functions.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit a2a131536 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 21 12:56:18 2015 +0000 Updated minimum PHP version from 5.3.0 to 5.3.6 to avoid a bug in DateTime::modify(). See SF Support Requests #667 INSTALL | 2 +- web/internalconfig.inc.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) commit 30788bb15 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 21 09:34:29 2015 +0000 Removed redundant code web/report.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit 704eb1bb3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 21 08:58:13 2015 +0000 Updated minimum PHP version checking to 5.3.0 web/Themes/default/header.inc | 6 +----- web/defaultincludes.inc | 2 +- web/functions_table.inc | 1 - web/internalconfig.inc.php | 8 ++++++++ web/lang/lang.ca | 1 - web/lang/lang.cs | 1 - web/lang/lang.da | 1 - web/lang/lang.de | 1 - web/lang/lang.el | 1 - web/lang/lang.en | 1 - web/lang/lang.es | 1 - web/lang/lang.eu | 1 - web/lang/lang.fi | 1 - web/lang/lang.fr | 1 - web/lang/lang.he | 1 - web/lang/lang.hu | 1 - web/lang/lang.id | 1 - web/lang/lang.it | 1 - web/lang/lang.ja | 1 - web/lang/lang.ko | 1 - web/lang/lang.nb | 1 - web/lang/lang.nl | 1 - web/lang/lang.nn | 1 - web/lang/lang.no | 1 - web/lang/lang.pl | 1 - web/lang/lang.pt | 1 - web/lang/lang.pt-br | 1 - web/lang/lang.ru | 1 - web/lang/lang.sk | 1 - web/lang/lang.sl | 1 - web/lang/lang.sr-rs-latin | 1 - web/lang/lang.sv | 1 - web/lang/lang.th | 1 - web/lang/lang.tr | 2 -- web/lang/lang.zh-cn | 1 - web/lang/lang.zh-tw | 1 - 36 files changed, 10 insertions(+), 40 deletions(-) commit 90cf7b972 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 20 17:29:57 2015 +0000 Fixed bugs in calculation of periods in time slot selectors in edit_entry form web/js/edit_entry.js.php | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) commit 928006f0b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 20 16:50:33 2015 +0000 Converted get_duration() to use the new getPeriodInterval() function. web/functions.inc | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) commit bb3744110 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 20 16:09:46 2015 +0000 Fixed bug in calculation of periods in report summaries. See SF Support Requests #667 web/functions.inc | 44 ++++++++++++++++++++++++++++++++++++++++++++ web/report.php | 5 ++--- 2 files changed, 46 insertions(+), 3 deletions(-) commit 0840eb5dc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 20 11:27:28 2015 +0000 Fixed bug and now the max duration will change with the area on the edit_entry form. web/edit_entry.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) commit 0756e303f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 20 09:37:36 2015 +0000 Made max_duration a per-area setting tables.my.sql | 5 ++- tables.pg.sql | 21 +++------ web/areadefaults.inc.php | 8 ++++ web/dbsys.inc | 2 +- web/edit_area_room.php | 75 +++++++++++++++++++++++++++++++- web/functions.inc | 2 + web/internalconfig.inc.php | 5 ++- web/js/edit_area_room.js.php | 11 ++++- web/lang/lang.en | 2 + web/systemdefaults.inc.php | 5 --- web/upgrade/43/mysql.sql (new) | 8 ++++ web/upgrade/43/pgsql.sql (new) | 8 ++++ web/upgrade/43/post.inc (new) | 23 ++++++++++ 13 files changed, 149 insertions(+), 26 deletions(-) commit 22aff6275 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 19 12:31:21 2015 +0000 Added SQL to tidy up the database tables before the foreign keys are added, getting rid of any rows which do not refer to a valid row in the parent table. (Note that these rows are not visible anyway to MRBS users or admins and have probably been created by rows being deleted using a database admin tool rather than MRBS). web/upgrade/40/mysql.sql | 11 +++++++++++ web/upgrade/40/pgsql.sql | 11 +++++++++++ web/upgrade/41/mysql.sql | 15 +++++++++++++++ web/upgrade/41/pgsql.sql | 16 ++++++++++++++++ 4 files changed, 53 insertions(+) commit 3bc5efd91 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 18 16:57:30 2015 +0000 Fixed bugs in sql_mysql_table_exists() and sql_mysqli_table_exists() web/mysql.inc | 2 +- web/mysqli.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 5979a1576 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 18 16:41:06 2015 +0000 Added better error handling for the case when the MRBS tables have not been installed or cannot be accessed (possibly because of permission problems). web/dbsys.inc | 14 +++++++++----- web/lang/lang.en | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) commit 72802f6d6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 18 16:34:16 2015 +0000 Fixed bug in sql_pgsql_table_exists() web/pgsql.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit bf49f3261 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 18 13:13:22 2015 +0000 Fixed schema version number in table creation SQL tables.my.sql | 2 +- tables.pg.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit c4b2bdce6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 18 12:42:25 2015 +0000 Added another change to table creation SQL that was forgotten in the repeat_id_fk branch tables.pg.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit cdc56e06e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 18 12:25:25 2015 +0000 Added change to table creation SQL that was forgotten in the repeat_id_fk branch tables.pg.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 95a31dc0c Merge: 8d64d5bf6 a5017c064 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 18 12:12:04 2015 +0000 Reintegrated repeat_id_fk branch into the trunk. The trunk now has entry.repeat_id as a foreign key. commit a5017c064 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 18 12:05:57 2015 +0000 Updated table creation SQL tables.my.sql | 2 +- tables.pg.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 7129db19e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 18 11:55:43 2015 +0000 Added support for PostgreSQL web/upgrade/41/pgsql.sql (new) | 21 +++++++++++++++++++++ web/upgrade/42/pgsql.sql (new) | 10 ++++++++++ 2 files changed, 31 insertions(+) commit 6efd25328 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 18 11:26:08 2015 +0000 Tidied code web/functions_table.inc | 2 +- web/month.php | 2 +- web/mrbs_sql.inc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) commit 0d2186f5b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 18 11:17:16 2015 +0000 Implemented code changes to make repeat_id foreign keys work web/dbsys.inc | 2 +- web/mrbs_sql.inc | 67 +++++++++++++++++++++++--------- web/pending.php | 2 +- web/upgrade/42/mysql.sql (new) | 8 ++++ 4 files changed, 58 insertions(+), 21 deletions(-) commit 1ae81b489 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 17 17:15:27 2015 +0000 Created the foreign key. NOTES! MySQL only at this stage and the code hasn't yet been adapted so all sorts of things could go wrong! Do not use! tables.my.sql | 6 +++++- web/dbsys.inc | 2 +- web/upgrade/41/mysql.sql (new) | 19 +++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) commit c100e1211 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 17 16:10:45 2015 +0000 Branch for converting mrbs_entry.repeat_id to a foreign key commit 8d64d5bf6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 16 16:27:20 2015 +0000 Added some foreign keys. (Haven't yet added a foreign key for the repeat_id in the entry table because the entry table currently uses repeat_id=0 when there is no repeat. This will have to be changed because it will raise a foreign key constraint error, but there will probably need to be code changes made as well). tables.my.sql | 44 +++++++++++++++++++------------ tables.pg.sql | 45 +++++++++++++++++++------------- web/dbsys.inc | 2 +- web/upgrade/40/mysql.sql (new) | 21 +++++++++++++++ web/upgrade/40/pgsql.sql (new) | 21 +++++++++++++++ 5 files changed, 98 insertions(+), 35 deletions(-) commit 438ac3894 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 16 11:33:58 2015 +0000 Added the ability to add a title to a checkbox label web/functions.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit bfd0a6a6f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 15 09:34:48 2015 +0000 Fixed bug causing an HTML5 validation error when $auth['only_admin_can_select_multiroom'] = TRUE; web/edit_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit e9189a205 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 13 17:26:37 2015 +0000 Converted some language strings to use the new formatting web/lang/lang.en | 8 ++++---- web/mrbs_sql.inc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) commit 2fddd767a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 13 16:15:17 2015 +0000 Enhanced get_vocab() to allow sprintf() style formatting to give more flexibility on inserting parameters into language tags. [Maybe in the future we should switch to using the MessageFormatter class as it is more powerful. However the Intl extension isn't present in all PHP installations and so the class would have to be emulated]. web/functions_mail.inc | 8 -------- web/language.inc | 36 +++++++++++++++++++++++++++++------- 2 files changed, 29 insertions(+), 15 deletions(-) commit f20626c15 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 13 11:26:29 2015 +0000 Restructured code web/edit_area_room.php | 319 +++++++++++++++++++++------------------ 1 file changed, 171 insertions(+), 148 deletions(-) commit 010b361b1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 8 15:00:08 2015 +0000 Restructured code to provide an authGetUserEmail() function for each auth type web/auth/auth_auth_basic.inc | 13 ++++++++ web/auth/auth_config.inc | 13 ++++++++ web/auth/auth_crypt.inc | 13 ++++++++ web/auth/auth_db.inc | 34 ++++++++++++++++++++ web/auth/auth_db_ext.inc | 58 ++++++++++++++++++++++++++++++++++ web/auth/auth_ext.inc | 13 ++++++++ web/auth/auth_imap.inc | 14 ++++++++ web/auth/auth_imap_php.inc | 14 ++++++++ web/auth/auth_ldap.inc | 24 ++++++++++++++ web/auth/auth_nis.inc | 13 ++++++++ web/auth/auth_none.inc | 13 ++++++++ web/auth/auth_nw.inc | 13 ++++++++ web/auth/auth_pop3.inc | 12 +++++++ web/auth/auth_smtp.inc | 14 ++++++++ web/functions.inc | 17 ++++++++++ web/functions_mail.inc | 32 ++----------------- web/systemdefaults.inc.php | 1 + 17 files changed, 281 insertions(+), 30 deletions(-) commit 288722419 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 8 14:44:30 2015 +0000 Fixed typo in comment web/mrbs_auth.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d683411ee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 5 15:34:57 2015 +0000 Restructured code web/week.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit cfddab115 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 5 15:23:03 2015 +0000 Restructured code web/edit_area_room.php | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) commit a4cb8113f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 5 15:16:57 2015 +0000 Restructured code web/month.php | 7 +++-- web/mrbs_sql.inc | 73 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 3 deletions(-) commit b7be519f2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 4 17:41:33 2015 +0000 Restructured code web/functions.inc | 29 ++++++++++++++--------------- web/mrbs_sql.inc | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 15 deletions(-) commit 25da0acf8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 3 16:54:52 2015 +0000 Removed support for early versions of MySQL and PostgreSQL INSTALL | 4 +- tables.my.pre41.sql (gone) | 174 ----------------------------------- tables.pg.pre73.sql (gone) | 163 -------------------------------- 3 files changed, 1 insertion(+), 340 deletions(-) commit e67c3b37c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 3 11:08:58 2015 +0000 Converted all MySQL tables to use the InnoDB engine. (Although new installations require the InnoDB engine old installations might still be using MyISAM as there hasn't been an engine upgrade). web/dbsys.inc | 2 +- web/upgrade/39/mysql.sql (new) | 12 ++++++++++++ web/upgrade/39/pgsql.sql (new) | 0 3 files changed, 13 insertions(+), 1 deletion(-) commit b6d9877cb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 2 18:09:24 2015 +0000 Fixed bug introduced in Rev 2932 causing a JavaScript error on the login page web/js/edit_entry.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 8a5cc808b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 1 17:59:42 2015 +0000 Changed code so that the name field on the edit_entry form is only given focus if it is not disabled (otherwise a JavaScript error resulted) web/js/edit_entry.js.php | 62 +++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 31 deletions(-) commit ac068cb2e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 29 13:09:57 2014 +0000 Fixed bug causing resizing performance to get worse and worse the longer the browser has been open (a new resize listener was being created every time there was a table refresh). web/js/resizable.js.php | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) commit ebfed570f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 29 09:52:23 2014 +0000 Restructured code web/js/refresh.js.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit ab523924f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 28 19:18:25 2014 +0000 Updated tzurl files .../zoneinfo-outlook/Africa/Abidjan.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Accra.ics | 2 +- .../zoneinfo-outlook/Africa/Addis_Ababa.ics | 2 +- .../zoneinfo-outlook/Africa/Algiers.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Asmara.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Bamako.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Bangui.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Banjul.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Bissau.ics | 2 +- .../zoneinfo-outlook/Africa/Blantyre.ics | 2 +- .../zoneinfo-outlook/Africa/Brazzaville.ics | 2 +- .../zoneinfo-outlook/Africa/Bujumbura.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Cairo.ics | 14 +- .../zoneinfo-outlook/Africa/Casablanca.ics | 20 +-- web/tzurl/zoneinfo-outlook/Africa/Ceuta.ics | 2 +- .../zoneinfo-outlook/Africa/Conakry.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Dakar.ics | 2 +- .../Africa/Dar_es_Salaam.ics | 2 +- .../zoneinfo-outlook/Africa/Djibouti.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Douala.ics | 2 +- .../zoneinfo-outlook/Africa/El_Aaiun.ics | 14 +- .../zoneinfo-outlook/Africa/Freetown.ics | 2 +- .../zoneinfo-outlook/Africa/Gaborone.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Harare.ics | 2 +- .../zoneinfo-outlook/Africa/Johannesburg.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Juba.ics | 2 +- .../zoneinfo-outlook/Africa/Kampala.ics | 2 +- .../zoneinfo-outlook/Africa/Khartoum.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Kigali.ics | 2 +- .../zoneinfo-outlook/Africa/Kinshasa.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Lagos.ics | 2 +- .../zoneinfo-outlook/Africa/Libreville.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Lome.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Luanda.ics | 2 +- .../zoneinfo-outlook/Africa/Lubumbashi.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Lusaka.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Malabo.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Maputo.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Maseru.ics | 2 +- .../zoneinfo-outlook/Africa/Mbabane.ics | 2 +- .../zoneinfo-outlook/Africa/Mogadishu.ics | 2 +- .../zoneinfo-outlook/Africa/Monrovia.ics | 2 +- .../zoneinfo-outlook/Africa/Nairobi.ics | 2 +- .../zoneinfo-outlook/Africa/Ndjamena.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Niamey.ics | 2 +- .../zoneinfo-outlook/Africa/Nouakchott.ics | 2 +- .../zoneinfo-outlook/Africa/Ouagadougou.ics | 2 +- .../zoneinfo-outlook/Africa/Porto-Novo.ics | 2 +- .../zoneinfo-outlook/Africa/Sao_Tome.ics | 2 +- .../zoneinfo-outlook/Africa/Tripoli.ics | 16 +- web/tzurl/zoneinfo-outlook/Africa/Tunis.ics | 2 +- .../zoneinfo-outlook/Africa/Windhoek.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Adak.ics | 2 +- .../zoneinfo-outlook/America/Anchorage.ics | 2 +- .../zoneinfo-outlook/America/Anguilla.ics | 2 +- .../zoneinfo-outlook/America/Antigua.ics | 2 +- .../zoneinfo-outlook/America/Araguaina.ics | 12 +- .../America/Argentina/Buenos_Aires.ics | 2 +- .../America/Argentina/Catamarca.ics | 2 +- .../America/Argentina/Cordoba.ics | 2 +- .../America/Argentina/Jujuy.ics | 2 +- .../America/Argentina/La_Rioja.ics | 2 +- .../America/Argentina/Mendoza.ics | 2 +- .../America/Argentina/Rio_Gallegos.ics | 2 +- .../America/Argentina/Salta.ics | 2 +- .../America/Argentina/San_Juan.ics | 2 +- .../America/Argentina/San_Luis.ics | 8 +- .../America/Argentina/Tucuman.ics | 2 +- .../America/Argentina/Ushuaia.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Aruba.ics | 2 +- .../zoneinfo-outlook/America/Asuncion.ics | 16 +- .../zoneinfo-outlook/America/Atikokan.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Bahia.ics | 2 +- .../America/Bahia_Banderas.ics | 2 +- .../zoneinfo-outlook/America/Barbados.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Belem.ics | 2 +- .../zoneinfo-outlook/America/Belize.ics | 2 +- .../America/Blanc-Sablon.ics | 2 +- .../zoneinfo-outlook/America/Boa_Vista.ics | 2 +- .../zoneinfo-outlook/America/Bogota.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Boise.ics | 2 +- .../America/Cambridge_Bay.ics | 2 +- .../America/Campo_Grande.ics | 2 +- .../zoneinfo-outlook/America/Cancun.ics | 2 +- .../zoneinfo-outlook/America/Caracas.ics | 2 +- .../zoneinfo-outlook/America/Cayenne.ics | 2 +- .../zoneinfo-outlook/America/Cayman.ics | 2 +- .../zoneinfo-outlook/America/Chicago.ics | 2 +- .../zoneinfo-outlook/America/Chihuahua.ics | 2 +- .../zoneinfo-outlook/America/Costa_Rica.ics | 2 +- .../zoneinfo-outlook/America/Creston.ics | 2 +- .../zoneinfo-outlook/America/Cuiaba.ics | 2 +- .../zoneinfo-outlook/America/Curacao.ics | 2 +- .../America/Danmarkshavn.ics | 2 +- .../zoneinfo-outlook/America/Dawson.ics | 2 +- .../America/Dawson_Creek.ics | 2 +- .../zoneinfo-outlook/America/Denver.ics | 2 +- .../zoneinfo-outlook/America/Detroit.ics | 2 +- .../zoneinfo-outlook/America/Dominica.ics | 2 +- .../zoneinfo-outlook/America/Edmonton.ics | 2 +- .../zoneinfo-outlook/America/Eirunepe.ics | 8 +- .../zoneinfo-outlook/America/El_Salvador.ics | 2 +- .../zoneinfo-outlook/America/Fortaleza.ics | 2 +- .../zoneinfo-outlook/America/Glace_Bay.ics | 2 +- .../zoneinfo-outlook/America/Godthab.ics | 2 +- .../zoneinfo-outlook/America/Goose_Bay.ics | 2 +- .../zoneinfo-outlook/America/Grand_Turk.ics | 16 +- .../zoneinfo-outlook/America/Grenada.ics | 2 +- .../zoneinfo-outlook/America/Guadeloupe.ics | 2 +- .../zoneinfo-outlook/America/Guatemala.ics | 2 +- .../zoneinfo-outlook/America/Guayaquil.ics | 2 +- .../zoneinfo-outlook/America/Guyana.ics | 2 +- .../zoneinfo-outlook/America/Halifax.ics | 2 +- .../zoneinfo-outlook/America/Havana.ics | 2 +- .../zoneinfo-outlook/America/Hermosillo.ics | 2 +- .../America/Indiana/Indianapolis.ics | 2 +- .../America/Indiana/Knox.ics | 2 +- .../America/Indiana/Marengo.ics | 2 +- .../America/Indiana/Petersburg.ics | 2 +- .../America/Indiana/Tell_City.ics | 2 +- .../America/Indiana/Vevay.ics | 2 +- .../America/Indiana/Vincennes.ics | 2 +- .../America/Indiana/Winamac.ics | 2 +- .../zoneinfo-outlook/America/Inuvik.ics | 2 +- .../zoneinfo-outlook/America/Iqaluit.ics | 2 +- .../zoneinfo-outlook/America/Jamaica.ics | 2 +- .../zoneinfo-outlook/America/Juneau.ics | 2 +- .../America/Kentucky/Louisville.ics | 2 +- .../America/Kentucky/Monticello.ics | 2 +- .../zoneinfo-outlook/America/Kralendijk.ics | 2 +- .../zoneinfo-outlook/America/La_Paz.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Lima.ics | 2 +- .../zoneinfo-outlook/America/Los_Angeles.ics | 2 +- .../America/Lower_Princes.ics | 2 +- .../zoneinfo-outlook/America/Maceio.ics | 2 +- .../zoneinfo-outlook/America/Managua.ics | 2 +- .../zoneinfo-outlook/America/Manaus.ics | 2 +- .../zoneinfo-outlook/America/Marigot.ics | 2 +- .../zoneinfo-outlook/America/Martinique.ics | 2 +- .../zoneinfo-outlook/America/Matamoros.ics | 2 +- .../zoneinfo-outlook/America/Mazatlan.ics | 2 +- .../zoneinfo-outlook/America/Menominee.ics | 2 +- .../zoneinfo-outlook/America/Merida.ics | 2 +- .../zoneinfo-outlook/America/Metlakatla.ics | 4 +- .../zoneinfo-outlook/America/Mexico_City.ics | 2 +- .../zoneinfo-outlook/America/Miquelon.ics | 2 +- .../zoneinfo-outlook/America/Moncton.ics | 2 +- .../zoneinfo-outlook/America/Monterrey.ics | 2 +- .../zoneinfo-outlook/America/Montevideo.ics | 2 +- .../zoneinfo-outlook/America/Montreal.ics | 2 +- .../zoneinfo-outlook/America/Montserrat.ics | 2 +- .../zoneinfo-outlook/America/Nassau.ics | 2 +- .../zoneinfo-outlook/America/New_York.ics | 2 +- .../zoneinfo-outlook/America/Nipigon.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Nome.ics | 2 +- .../zoneinfo-outlook/America/Noronha.ics | 2 +- .../America/North_Dakota/Beulah.ics | 2 +- .../America/North_Dakota/Center.ics | 2 +- .../America/North_Dakota/New_Salem.ics | 2 +- .../zoneinfo-outlook/America/Ojinaga.ics | 2 +- .../zoneinfo-outlook/America/Panama.ics | 2 +- .../zoneinfo-outlook/America/Pangnirtung.ics | 2 +- .../zoneinfo-outlook/America/Paramaribo.ics | 2 +- .../zoneinfo-outlook/America/Phoenix.ics | 2 +- .../America/Port-au-Prince.ics | 14 +- .../America/Port_of_Spain.ics | 2 +- .../zoneinfo-outlook/America/Porto_Velho.ics | 2 +- .../zoneinfo-outlook/America/Puerto_Rico.ics | 2 +- .../zoneinfo-outlook/America/Rainy_River.ics | 2 +- .../America/Rankin_Inlet.ics | 2 +- .../zoneinfo-outlook/America/Recife.ics | 2 +- .../zoneinfo-outlook/America/Regina.ics | 2 +- .../zoneinfo-outlook/America/Resolute.ics | 2 +- .../zoneinfo-outlook/America/Rio_Branco.ics | 8 +- .../America/Santa_Isabel.ics | 2 +- .../zoneinfo-outlook/America/Santarem.ics | 2 +- .../zoneinfo-outlook/America/Santiago.ics | 10 +- .../America/Santo_Domingo.ics | 2 +- .../zoneinfo-outlook/America/Sao_Paulo.ics | 2 +- .../America/Scoresbysund.ics | 2 +- .../zoneinfo-outlook/America/Shiprock.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Sitka.ics | 2 +- .../America/St_Barthelemy.ics | 2 +- .../zoneinfo-outlook/America/St_Johns.ics | 2 +- .../zoneinfo-outlook/America/St_Kitts.ics | 2 +- .../zoneinfo-outlook/America/St_Lucia.ics | 2 +- .../zoneinfo-outlook/America/St_Thomas.ics | 2 +- .../zoneinfo-outlook/America/St_Vincent.ics | 2 +- .../America/Swift_Current.ics | 2 +- .../zoneinfo-outlook/America/Tegucigalpa.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Thule.ics | 2 +- .../zoneinfo-outlook/America/Thunder_Bay.ics | 2 +- .../zoneinfo-outlook/America/Tijuana.ics | 2 +- .../zoneinfo-outlook/America/Toronto.ics | 2 +- .../zoneinfo-outlook/America/Tortola.ics | 2 +- .../zoneinfo-outlook/America/Vancouver.ics | 2 +- .../zoneinfo-outlook/America/Whitehorse.ics | 2 +- .../zoneinfo-outlook/America/Winnipeg.ics | 2 +- .../zoneinfo-outlook/America/Yakutat.ics | 2 +- .../zoneinfo-outlook/America/Yellowknife.ics | 2 +- .../zoneinfo-outlook/Antarctica/Casey.ics | 4 +- .../zoneinfo-outlook/Antarctica/Davis.ics | 2 +- .../Antarctica/DumontDUrville.ics | 2 +- .../Antarctica/Macquarie.ics | 2 +- .../zoneinfo-outlook/Antarctica/Mawson.ics | 2 +- .../zoneinfo-outlook/Antarctica/McMurdo.ics | 2 +- .../zoneinfo-outlook/Antarctica/Palmer.ics | 10 +- .../zoneinfo-outlook/Antarctica/Rothera.ics | 2 +- .../Antarctica/South_Pole.ics | 2 +- .../zoneinfo-outlook/Antarctica/Syowa.ics | 2 +- .../Antarctica/Troll.ics (new) | 23 +++ .../zoneinfo-outlook/Antarctica/Vostok.ics | 2 +- .../zoneinfo-outlook/Arctic/Longyearbyen.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Aden.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Almaty.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Amman.ics | 16 +- web/tzurl/zoneinfo-outlook/Asia/Anadyr.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Aqtau.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Aqtobe.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Ashgabat.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Baghdad.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Bahrain.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Baku.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Bangkok.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Beirut.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Bishkek.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Brunei.ics | 2 +- .../zoneinfo-outlook/Asia/Chita.ics (new) | 15 ++ .../zoneinfo-outlook/Asia/Choibalsan.ics | 2 +- .../zoneinfo-outlook/Asia/Chongqing.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Colombo.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Damascus.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Dhaka.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Dili.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Dubai.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Dushanbe.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Gaza.ics | 14 +- web/tzurl/zoneinfo-outlook/Asia/Harbin.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Hebron.ics | 14 +- .../zoneinfo-outlook/Asia/Ho_Chi_Minh.ics | 2 +- .../zoneinfo-outlook/Asia/Hong_Kong.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Hovd.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Irkutsk.ics | 6 +- web/tzurl/zoneinfo-outlook/Asia/Istanbul.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Jakarta.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Jayapura.ics | 4 +- .../zoneinfo-outlook/Asia/Jerusalem.ics | 8 +- web/tzurl/zoneinfo-outlook/Asia/Kabul.ics | 2 +- .../zoneinfo-outlook/Asia/Kamchatka.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Karachi.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Kashgar.ics | 2 +- .../zoneinfo-outlook/Asia/Kathmandu.ics | 2 +- .../zoneinfo-outlook/Asia/Khandyga.ics (new) | 15 ++ web/tzurl/zoneinfo-outlook/Asia/Kolkata.ics | 2 +- .../zoneinfo-outlook/Asia/Krasnoyarsk.ics | 6 +- .../zoneinfo-outlook/Asia/Kuala_Lumpur.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Kuching.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Kuwait.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Macau.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Magadan.ics | 6 +- web/tzurl/zoneinfo-outlook/Asia/Makassar.ics | 4 +- web/tzurl/zoneinfo-outlook/Asia/Manila.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Muscat.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Nicosia.ics | 2 +- .../zoneinfo-outlook/Asia/Novokuznetsk.ics | 4 +- .../zoneinfo-outlook/Asia/Novosibirsk.ics | 6 +- web/tzurl/zoneinfo-outlook/Asia/Omsk.ics | 6 +- web/tzurl/zoneinfo-outlook/Asia/Oral.ics | 2 +- .../zoneinfo-outlook/Asia/Phnom_Penh.ics | 2 +- .../zoneinfo-outlook/Asia/Pontianak.ics | 4 +- .../zoneinfo-outlook/Asia/Pyongyang.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Qatar.ics | 2 +- .../zoneinfo-outlook/Asia/Qyzylorda.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Rangoon.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Riyadh.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Sakhalin.ics | 6 +- .../zoneinfo-outlook/Asia/Samarkand.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Seoul.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Shanghai.ics | 2 +- .../zoneinfo-outlook/Asia/Singapore.ics | 2 +- .../Asia/Srednekolymsk.ics (new) | 15 ++ web/tzurl/zoneinfo-outlook/Asia/Taipei.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Tashkent.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Tbilisi.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Tehran.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Thimphu.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Tokyo.ics | 2 +- .../zoneinfo-outlook/Asia/Ulaanbaatar.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Urumqi.ics | 8 +- .../zoneinfo-outlook/Asia/Ust-Nera.ics (new) | 15 ++ .../zoneinfo-outlook/Asia/Vientiane.ics | 2 +- .../zoneinfo-outlook/Asia/Vladivostok.ics | 6 +- web/tzurl/zoneinfo-outlook/Asia/Yakutsk.ics | 6 +- .../zoneinfo-outlook/Asia/Yekaterinburg.ics | 6 +- web/tzurl/zoneinfo-outlook/Asia/Yerevan.ics | 2 +- .../zoneinfo-outlook/Atlantic/Azores.ics | 2 +- .../zoneinfo-outlook/Atlantic/Bermuda.ics | 2 +- .../zoneinfo-outlook/Atlantic/Canary.ics | 2 +- .../zoneinfo-outlook/Atlantic/Cape_Verde.ics | 2 +- .../zoneinfo-outlook/Atlantic/Faroe.ics | 2 +- .../zoneinfo-outlook/Atlantic/Madeira.ics | 2 +- .../zoneinfo-outlook/Atlantic/Reykjavik.ics | 2 +- .../Atlantic/South_Georgia.ics | 2 +- .../zoneinfo-outlook/Atlantic/St_Helena.ics | 2 +- .../zoneinfo-outlook/Atlantic/Stanley.ics | 2 +- .../zoneinfo-outlook/Australia/Adelaide.ics | 6 +- .../zoneinfo-outlook/Australia/Brisbane.ics | 4 +- .../Australia/Broken_Hill.ics | 6 +- .../zoneinfo-outlook/Australia/Currie.ics | 6 +- .../zoneinfo-outlook/Australia/Darwin.ics | 4 +- .../zoneinfo-outlook/Australia/Eucla.ics | 4 +- .../zoneinfo-outlook/Australia/Hobart.ics | 6 +- .../zoneinfo-outlook/Australia/Lindeman.ics | 4 +- .../zoneinfo-outlook/Australia/Lord_Howe.ics | 4 +- .../zoneinfo-outlook/Australia/Melbourne.ics | 6 +- .../zoneinfo-outlook/Australia/Perth.ics | 4 +- .../zoneinfo-outlook/Australia/Sydney.ics | 6 +- .../zoneinfo-outlook/Europe/Amsterdam.ics | 2 +- .../zoneinfo-outlook/Europe/Andorra.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Athens.ics | 2 +- .../zoneinfo-outlook/Europe/Belgrade.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Berlin.ics | 2 +- .../zoneinfo-outlook/Europe/Bratislava.ics | 2 +- .../zoneinfo-outlook/Europe/Brussels.ics | 2 +- .../zoneinfo-outlook/Europe/Bucharest.ics | 2 +- .../zoneinfo-outlook/Europe/Budapest.ics | 2 +- .../Europe/Busingen.ics (new) | 23 +++ .../zoneinfo-outlook/Europe/Chisinau.ics | 2 +- .../zoneinfo-outlook/Europe/Copenhagen.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Dublin.ics | 2 +- .../zoneinfo-outlook/Europe/Gibraltar.ics | 2 +- .../zoneinfo-outlook/Europe/Guernsey.ics | 2 +- .../zoneinfo-outlook/Europe/Helsinki.ics | 2 +- .../zoneinfo-outlook/Europe/Isle_of_Man.ics | 2 +- .../zoneinfo-outlook/Europe/Istanbul.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Jersey.ics | 2 +- .../zoneinfo-outlook/Europe/Kaliningrad.ics | 8 +- web/tzurl/zoneinfo-outlook/Europe/Kiev.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Lisbon.ics | 2 +- .../zoneinfo-outlook/Europe/Ljubljana.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/London.ics | 2 +- .../zoneinfo-outlook/Europe/Luxembourg.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Madrid.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Malta.ics | 2 +- .../zoneinfo-outlook/Europe/Mariehamn.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Minsk.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Monaco.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Moscow.ics | 6 +- .../zoneinfo-outlook/Europe/Nicosia.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Oslo.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Paris.ics | 2 +- .../zoneinfo-outlook/Europe/Podgorica.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Prague.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Riga.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Rome.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Samara.ics | 2 +- .../zoneinfo-outlook/Europe/San_Marino.ics | 2 +- .../zoneinfo-outlook/Europe/Sarajevo.ics | 2 +- .../zoneinfo-outlook/Europe/Simferopol.ics | 16 +- web/tzurl/zoneinfo-outlook/Europe/Skopje.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Sofia.ics | 2 +- .../zoneinfo-outlook/Europe/Stockholm.ics | 2 +- .../zoneinfo-outlook/Europe/Tallinn.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Tirane.ics | 2 +- .../zoneinfo-outlook/Europe/Uzhgorod.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Vaduz.ics | 2 +- .../zoneinfo-outlook/Europe/Vatican.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Vienna.ics | 2 +- .../zoneinfo-outlook/Europe/Vilnius.ics | 2 +- .../zoneinfo-outlook/Europe/Volgograd.ics | 8 +- web/tzurl/zoneinfo-outlook/Europe/Warsaw.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Zagreb.ics | 2 +- .../zoneinfo-outlook/Europe/Zaporozhye.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Zurich.ics | 2 +- .../zoneinfo-outlook/Indian/Antananarivo.ics | 2 +- web/tzurl/zoneinfo-outlook/Indian/Chagos.ics | 2 +- .../zoneinfo-outlook/Indian/Christmas.ics | 2 +- web/tzurl/zoneinfo-outlook/Indian/Cocos.ics | 2 +- web/tzurl/zoneinfo-outlook/Indian/Comoro.ics | 2 +- .../zoneinfo-outlook/Indian/Kerguelen.ics | 2 +- web/tzurl/zoneinfo-outlook/Indian/Mahe.ics | 2 +- .../zoneinfo-outlook/Indian/Maldives.ics | 2 +- .../zoneinfo-outlook/Indian/Mauritius.ics | 2 +- .../zoneinfo-outlook/Indian/Mayotte.ics | 2 +- .../zoneinfo-outlook/Indian/Reunion.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Apia.ics | 4 +- .../zoneinfo-outlook/Pacific/Auckland.ics | 2 +- .../zoneinfo-outlook/Pacific/Chatham.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Chuuk.ics | 2 +- .../zoneinfo-outlook/Pacific/Easter.ics | 10 +- web/tzurl/zoneinfo-outlook/Pacific/Efate.ics | 2 +- .../zoneinfo-outlook/Pacific/Enderbury.ics | 2 +- .../zoneinfo-outlook/Pacific/Fakaofo.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Fiji.ics | 6 +- .../zoneinfo-outlook/Pacific/Funafuti.ics | 2 +- .../zoneinfo-outlook/Pacific/Galapagos.ics | 2 +- .../zoneinfo-outlook/Pacific/Gambier.ics | 2 +- .../zoneinfo-outlook/Pacific/Guadalcanal.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Guam.ics | 2 +- .../zoneinfo-outlook/Pacific/Honolulu.ics | 2 +- .../zoneinfo-outlook/Pacific/Johnston.ics | 2 +- .../zoneinfo-outlook/Pacific/Kiritimati.ics | 2 +- .../zoneinfo-outlook/Pacific/Kosrae.ics | 2 +- .../zoneinfo-outlook/Pacific/Kwajalein.ics | 2 +- .../zoneinfo-outlook/Pacific/Majuro.ics | 2 +- .../zoneinfo-outlook/Pacific/Marquesas.ics | 2 +- .../zoneinfo-outlook/Pacific/Midway.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Nauru.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Niue.ics | 2 +- .../zoneinfo-outlook/Pacific/Norfolk.ics | 2 +- .../zoneinfo-outlook/Pacific/Noumea.ics | 2 +- .../zoneinfo-outlook/Pacific/Pago_Pago.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Palau.ics | 2 +- .../zoneinfo-outlook/Pacific/Pitcairn.ics | 2 +- .../zoneinfo-outlook/Pacific/Pohnpei.ics | 2 +- .../zoneinfo-outlook/Pacific/Ponape.ics | 2 +- .../Pacific/Port_Moresby.ics | 2 +- .../zoneinfo-outlook/Pacific/Rarotonga.ics | 2 +- .../zoneinfo-outlook/Pacific/Saipan.ics | 2 +- .../zoneinfo-outlook/Pacific/Tahiti.ics | 2 +- .../zoneinfo-outlook/Pacific/Tarawa.ics | 2 +- .../zoneinfo-outlook/Pacific/Tongatapu.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Truk.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Wake.ics | 2 +- .../zoneinfo-outlook/Pacific/Wallis.ics | 2 +- web/tzurl/zoneinfo/Africa/Abidjan.ics | 2 +- web/tzurl/zoneinfo/Africa/Accra.ics | 38 ++++- web/tzurl/zoneinfo/Africa/Addis_Ababa.ics | 2 +- web/tzurl/zoneinfo/Africa/Algiers.ics | 2 +- web/tzurl/zoneinfo/Africa/Asmara.ics | 2 +- web/tzurl/zoneinfo/Africa/Bamako.ics | 18 +-- web/tzurl/zoneinfo/Africa/Bangui.ics | 8 +- web/tzurl/zoneinfo/Africa/Banjul.ics | 22 +-- web/tzurl/zoneinfo/Africa/Bissau.ics | 6 +- web/tzurl/zoneinfo/Africa/Blantyre.ics | 2 +- web/tzurl/zoneinfo/Africa/Brazzaville.ics | 8 +- web/tzurl/zoneinfo/Africa/Bujumbura.ics | 2 +- web/tzurl/zoneinfo/Africa/Cairo.ics | 81 +++++++--- web/tzurl/zoneinfo/Africa/Casablanca.ics | 70 ++++++-- web/tzurl/zoneinfo/Africa/Ceuta.ics | 2 +- web/tzurl/zoneinfo/Africa/Conakry.ics | 18 +-- web/tzurl/zoneinfo/Africa/Dakar.ics | 15 +- web/tzurl/zoneinfo/Africa/Dar_es_Salaam.ics | 2 +- web/tzurl/zoneinfo/Africa/Djibouti.ics | 2 +- web/tzurl/zoneinfo/Africa/Douala.ics | 8 +- web/tzurl/zoneinfo/Africa/El_Aaiun.ics | 94 ++++++++++- web/tzurl/zoneinfo/Africa/Freetown.ics | 74 +-------- web/tzurl/zoneinfo/Africa/Gaborone.ics | 13 +- web/tzurl/zoneinfo/Africa/Harare.ics | 2 +- web/tzurl/zoneinfo/Africa/Johannesburg.ics | 2 +- web/tzurl/zoneinfo/Africa/Juba.ics | 4 +- web/tzurl/zoneinfo/Africa/Kampala.ics | 2 +- web/tzurl/zoneinfo/Africa/Khartoum.ics | 2 +- web/tzurl/zoneinfo/Africa/Kigali.ics | 2 +- web/tzurl/zoneinfo/Africa/Kinshasa.ics | 8 +- web/tzurl/zoneinfo/Africa/Lagos.ics | 2 +- web/tzurl/zoneinfo/Africa/Libreville.ics | 8 +- web/tzurl/zoneinfo/Africa/Lome.ics | 8 +- web/tzurl/zoneinfo/Africa/Luanda.ics | 15 +- web/tzurl/zoneinfo/Africa/Lubumbashi.ics | 2 +- web/tzurl/zoneinfo/Africa/Lusaka.ics | 2 +- web/tzurl/zoneinfo/Africa/Malabo.ics | 15 +- web/tzurl/zoneinfo/Africa/Maputo.ics | 2 +- web/tzurl/zoneinfo/Africa/Maseru.ics | 2 +- web/tzurl/zoneinfo/Africa/Mbabane.ics | 2 +- web/tzurl/zoneinfo/Africa/Mogadishu.ics | 2 +- web/tzurl/zoneinfo/Africa/Monrovia.ics | 2 +- web/tzurl/zoneinfo/Africa/Nairobi.ics | 2 +- web/tzurl/zoneinfo/Africa/Ndjamena.ics | 2 +- web/tzurl/zoneinfo/Africa/Niamey.ics | 22 +-- web/tzurl/zoneinfo/Africa/Nouakchott.ics | 18 +-- web/tzurl/zoneinfo/Africa/Ouagadougou.ics | 4 +- web/tzurl/zoneinfo/Africa/Porto-Novo.ics | 15 +- web/tzurl/zoneinfo/Africa/Sao_Tome.ics | 11 +- web/tzurl/zoneinfo/Africa/Tripoli.ics | 20 +-- web/tzurl/zoneinfo/Africa/Tunis.ics | 2 +- web/tzurl/zoneinfo/Africa/Windhoek.ics | 2 +- web/tzurl/zoneinfo/America/Adak.ics | 2 +- web/tzurl/zoneinfo/America/Anchorage.ics | 2 +- web/tzurl/zoneinfo/America/Anguilla.ics | 4 +- web/tzurl/zoneinfo/America/Antigua.ics | 2 +- web/tzurl/zoneinfo/America/Araguaina.ics | 42 +---- .../America/Argentina/Buenos_Aires.ics | 2 +- .../zoneinfo/America/Argentina/Catamarca.ics | 2 +- .../zoneinfo/America/Argentina/Cordoba.ics | 2 +- .../zoneinfo/America/Argentina/Jujuy.ics | 2 +- .../zoneinfo/America/Argentina/La_Rioja.ics | 2 +- .../zoneinfo/America/Argentina/Mendoza.ics | 2 +- .../America/Argentina/Rio_Gallegos.ics | 2 +- .../zoneinfo/America/Argentina/Salta.ics | 2 +- .../zoneinfo/America/Argentina/San_Juan.ics | 2 +- .../zoneinfo/America/Argentina/San_Luis.ics | 4 +- .../zoneinfo/America/Argentina/Tucuman.ics | 2 +- .../zoneinfo/America/Argentina/Ushuaia.ics | 2 +- web/tzurl/zoneinfo/America/Aruba.ics | 4 +- web/tzurl/zoneinfo/America/Asuncion.ics | 19 ++- web/tzurl/zoneinfo/America/Atikokan.ics | 2 +- web/tzurl/zoneinfo/America/Bahia.ics | 2 +- .../zoneinfo/America/Bahia_Banderas.ics | 2 +- web/tzurl/zoneinfo/America/Barbados.ics | 8 +- web/tzurl/zoneinfo/America/Belem.ics | 2 +- web/tzurl/zoneinfo/America/Belize.ics | 2 +- web/tzurl/zoneinfo/America/Blanc-Sablon.ics | 2 +- web/tzurl/zoneinfo/America/Boa_Vista.ics | 2 +- web/tzurl/zoneinfo/America/Bogota.ics | 8 +- web/tzurl/zoneinfo/America/Boise.ics | 2 +- web/tzurl/zoneinfo/America/Cambridge_Bay.ics | 2 +- web/tzurl/zoneinfo/America/Campo_Grande.ics | 6 +- web/tzurl/zoneinfo/America/Cancun.ics | 2 +- web/tzurl/zoneinfo/America/Caracas.ics | 2 +- web/tzurl/zoneinfo/America/Cayenne.ics | 2 +- web/tzurl/zoneinfo/America/Cayman.ics | 6 +- web/tzurl/zoneinfo/America/Chicago.ics | 2 +- web/tzurl/zoneinfo/America/Chihuahua.ics | 2 +- web/tzurl/zoneinfo/America/Costa_Rica.ics | 8 +- web/tzurl/zoneinfo/America/Creston.ics | 2 +- web/tzurl/zoneinfo/America/Cuiaba.ics | 4 +- web/tzurl/zoneinfo/America/Curacao.ics | 4 +- web/tzurl/zoneinfo/America/Danmarkshavn.ics | 2 +- web/tzurl/zoneinfo/America/Dawson.ics | 2 +- web/tzurl/zoneinfo/America/Dawson_Creek.ics | 2 +- web/tzurl/zoneinfo/America/Denver.ics | 2 +- web/tzurl/zoneinfo/America/Detroit.ics | 2 +- web/tzurl/zoneinfo/America/Dominica.ics | 8 +- web/tzurl/zoneinfo/America/Edmonton.ics | 2 +- web/tzurl/zoneinfo/America/Eirunepe.ics | 3 +- web/tzurl/zoneinfo/America/El_Salvador.ics | 2 +- web/tzurl/zoneinfo/America/Fortaleza.ics | 2 +- web/tzurl/zoneinfo/America/Glace_Bay.ics | 2 +- web/tzurl/zoneinfo/America/Godthab.ics | 2 +- web/tzurl/zoneinfo/America/Goose_Bay.ics | 2 +- web/tzurl/zoneinfo/America/Grand_Turk.ics | 49 ++++-- web/tzurl/zoneinfo/America/Grenada.ics | 8 +- web/tzurl/zoneinfo/America/Guadeloupe.ics | 8 +- web/tzurl/zoneinfo/America/Guatemala.ics | 2 +- web/tzurl/zoneinfo/America/Guayaquil.ics | 2 +- web/tzurl/zoneinfo/America/Guyana.ics | 2 +- web/tzurl/zoneinfo/America/Halifax.ics | 2 +- web/tzurl/zoneinfo/America/Havana.ics | 4 +- web/tzurl/zoneinfo/America/Hermosillo.ics | 2 +- .../America/Indiana/Indianapolis.ics | 2 +- web/tzurl/zoneinfo/America/Indiana/Knox.ics | 2 +- .../zoneinfo/America/Indiana/Marengo.ics | 2 +- .../zoneinfo/America/Indiana/Petersburg.ics | 2 +- .../zoneinfo/America/Indiana/Tell_City.ics | 2 +- web/tzurl/zoneinfo/America/Indiana/Vevay.ics | 2 +- .../zoneinfo/America/Indiana/Vincennes.ics | 2 +- .../zoneinfo/America/Indiana/Winamac.ics | 2 +- web/tzurl/zoneinfo/America/Inuvik.ics | 2 +- web/tzurl/zoneinfo/America/Iqaluit.ics | 2 +- web/tzurl/zoneinfo/America/Jamaica.ics | 8 +- web/tzurl/zoneinfo/America/Juneau.ics | 2 +- .../zoneinfo/America/Kentucky/Louisville.ics | 2 +- .../zoneinfo/America/Kentucky/Monticello.ics | 2 +- web/tzurl/zoneinfo/America/Kralendijk.ics | 4 +- web/tzurl/zoneinfo/America/La_Paz.ics | 2 +- web/tzurl/zoneinfo/America/Lima.ics | 2 +- web/tzurl/zoneinfo/America/Los_Angeles.ics | 2 +- web/tzurl/zoneinfo/America/Lower_Princes.ics | 4 +- web/tzurl/zoneinfo/America/Maceio.ics | 2 +- web/tzurl/zoneinfo/America/Managua.ics | 2 +- web/tzurl/zoneinfo/America/Manaus.ics | 2 +- web/tzurl/zoneinfo/America/Marigot.ics | 8 +- web/tzurl/zoneinfo/America/Martinique.ics | 2 +- web/tzurl/zoneinfo/America/Matamoros.ics | 2 +- web/tzurl/zoneinfo/America/Mazatlan.ics | 2 +- web/tzurl/zoneinfo/America/Menominee.ics | 2 +- web/tzurl/zoneinfo/America/Merida.ics | 2 +- web/tzurl/zoneinfo/America/Metlakatla.ics | 10 +- web/tzurl/zoneinfo/America/Mexico_City.ics | 2 +- web/tzurl/zoneinfo/America/Miquelon.ics | 2 +- web/tzurl/zoneinfo/America/Moncton.ics | 2 +- web/tzurl/zoneinfo/America/Monterrey.ics | 2 +- web/tzurl/zoneinfo/America/Montevideo.ics | 2 +- web/tzurl/zoneinfo/America/Montreal.ics | 46 +++--- web/tzurl/zoneinfo/America/Montserrat.ics | 8 +- web/tzurl/zoneinfo/America/Nassau.ics | 4 +- web/tzurl/zoneinfo/America/New_York.ics | 2 +- web/tzurl/zoneinfo/America/Nipigon.ics | 2 +- web/tzurl/zoneinfo/America/Nome.ics | 2 +- web/tzurl/zoneinfo/America/Noronha.ics | 2 +- .../zoneinfo/America/North_Dakota/Beulah.ics | 2 +- .../zoneinfo/America/North_Dakota/Center.ics | 2 +- .../America/North_Dakota/New_Salem.ics | 2 +- web/tzurl/zoneinfo/America/Ojinaga.ics | 2 +- web/tzurl/zoneinfo/America/Panama.ics | 2 +- web/tzurl/zoneinfo/America/Pangnirtung.ics | 2 +- web/tzurl/zoneinfo/America/Paramaribo.ics | 2 +- web/tzurl/zoneinfo/America/Phoenix.ics | 2 +- .../zoneinfo/America/Port-au-Prince.ics | 18 ++- web/tzurl/zoneinfo/America/Port_of_Spain.ics | 2 +- web/tzurl/zoneinfo/America/Porto_Velho.ics | 2 +- web/tzurl/zoneinfo/America/Puerto_Rico.ics | 2 +- web/tzurl/zoneinfo/America/Rainy_River.ics | 2 +- web/tzurl/zoneinfo/America/Rankin_Inlet.ics | 2 +- web/tzurl/zoneinfo/America/Recife.ics | 2 +- web/tzurl/zoneinfo/America/Regina.ics | 2 +- web/tzurl/zoneinfo/America/Resolute.ics | 2 +- web/tzurl/zoneinfo/America/Rio_Branco.ics | 3 +- web/tzurl/zoneinfo/America/Santa_Isabel.ics | 2 +- web/tzurl/zoneinfo/America/Santarem.ics | 2 +- web/tzurl/zoneinfo/America/Santiago.ics | 12 +- web/tzurl/zoneinfo/America/Santo_Domingo.ics | 2 +- web/tzurl/zoneinfo/America/Sao_Paulo.ics | 6 +- web/tzurl/zoneinfo/America/Scoresbysund.ics | 2 +- web/tzurl/zoneinfo/America/Shiprock.ics | 2 +- web/tzurl/zoneinfo/America/Sitka.ics | 2 +- web/tzurl/zoneinfo/America/St_Barthelemy.ics | 8 +- web/tzurl/zoneinfo/America/St_Johns.ics | 2 +- web/tzurl/zoneinfo/America/St_Kitts.ics | 4 +- web/tzurl/zoneinfo/America/St_Lucia.ics | 15 +- web/tzurl/zoneinfo/America/St_Thomas.ics | 8 +- web/tzurl/zoneinfo/America/St_Vincent.ics | 15 +- web/tzurl/zoneinfo/America/Swift_Current.ics | 2 +- web/tzurl/zoneinfo/America/Tegucigalpa.ics | 2 +- web/tzurl/zoneinfo/America/Thule.ics | 2 +- web/tzurl/zoneinfo/America/Thunder_Bay.ics | 2 +- web/tzurl/zoneinfo/America/Tijuana.ics | 2 +- web/tzurl/zoneinfo/America/Toronto.ics | 2 +- web/tzurl/zoneinfo/America/Tortola.ics | 8 +- web/tzurl/zoneinfo/America/Vancouver.ics | 2 +- web/tzurl/zoneinfo/America/Whitehorse.ics | 2 +- web/tzurl/zoneinfo/America/Winnipeg.ics | 2 +- web/tzurl/zoneinfo/America/Yakutat.ics | 2 +- web/tzurl/zoneinfo/America/Yellowknife.ics | 2 +- web/tzurl/zoneinfo/Antarctica/Casey.ics | 6 +- web/tzurl/zoneinfo/Antarctica/Davis.ics | 2 +- .../zoneinfo/Antarctica/DumontDUrville.ics | 2 +- web/tzurl/zoneinfo/Antarctica/Macquarie.ics | 35 ++-- web/tzurl/zoneinfo/Antarctica/Mawson.ics | 2 +- web/tzurl/zoneinfo/Antarctica/McMurdo.ics | 66 +++++++- web/tzurl/zoneinfo/Antarctica/Palmer.ics | 12 +- web/tzurl/zoneinfo/Antarctica/Rothera.ics | 2 +- web/tzurl/zoneinfo/Antarctica/South_Pole.ics | 2 +- web/tzurl/zoneinfo/Antarctica/Syowa.ics | 2 +- .../zoneinfo/Antarctica/Troll.ics (new) | 30 ++++ web/tzurl/zoneinfo/Antarctica/Vostok.ics | 2 +- web/tzurl/zoneinfo/Arctic/Longyearbyen.ics | 2 +- web/tzurl/zoneinfo/Asia/Aden.ics | 4 +- web/tzurl/zoneinfo/Asia/Almaty.ics | 2 +- web/tzurl/zoneinfo/Asia/Amman.ics | 24 ++- web/tzurl/zoneinfo/Asia/Anadyr.ics | 2 +- web/tzurl/zoneinfo/Asia/Aqtau.ics | 2 +- web/tzurl/zoneinfo/Asia/Aqtobe.ics | 2 +- web/tzurl/zoneinfo/Asia/Ashgabat.ics | 2 +- web/tzurl/zoneinfo/Asia/Baghdad.ics | 2 +- web/tzurl/zoneinfo/Asia/Bahrain.ics | 2 +- web/tzurl/zoneinfo/Asia/Baku.ics | 2 +- web/tzurl/zoneinfo/Asia/Bangkok.ics | 2 +- web/tzurl/zoneinfo/Asia/Beirut.ics | 2 +- web/tzurl/zoneinfo/Asia/Bishkek.ics | 2 +- web/tzurl/zoneinfo/Asia/Brunei.ics | 2 +- web/tzurl/zoneinfo/Asia/Chita.ics (new) | 122 ++++++++++++++ web/tzurl/zoneinfo/Asia/Choibalsan.ics | 2 +- web/tzurl/zoneinfo/Asia/Chongqing.ics | 2 +- web/tzurl/zoneinfo/Asia/Colombo.ics | 2 +- web/tzurl/zoneinfo/Asia/Damascus.ics | 2 +- web/tzurl/zoneinfo/Asia/Dhaka.ics | 6 +- web/tzurl/zoneinfo/Asia/Dili.ics | 4 +- web/tzurl/zoneinfo/Asia/Dubai.ics | 2 +- web/tzurl/zoneinfo/Asia/Dushanbe.ics | 2 +- web/tzurl/zoneinfo/Asia/Gaza.ics | 30 +++- web/tzurl/zoneinfo/Asia/Harbin.ics | 2 +- web/tzurl/zoneinfo/Asia/Hebron.ics | 38 +++-- web/tzurl/zoneinfo/Asia/Ho_Chi_Minh.ics | 2 +- web/tzurl/zoneinfo/Asia/Hong_Kong.ics | 4 +- web/tzurl/zoneinfo/Asia/Hovd.ics | 2 +- web/tzurl/zoneinfo/Asia/Irkutsk.ics | 9 +- web/tzurl/zoneinfo/Asia/Istanbul.ics | 8 +- web/tzurl/zoneinfo/Asia/Jakarta.ics | 14 +- web/tzurl/zoneinfo/Asia/Jayapura.ics | 8 +- web/tzurl/zoneinfo/Asia/Jerusalem.ics | 35 +--- web/tzurl/zoneinfo/Asia/Kabul.ics | 2 +- web/tzurl/zoneinfo/Asia/Kamchatka.ics | 2 +- web/tzurl/zoneinfo/Asia/Karachi.ics | 2 +- web/tzurl/zoneinfo/Asia/Kashgar.ics | 2 +- web/tzurl/zoneinfo/Asia/Kathmandu.ics | 2 +- web/tzurl/zoneinfo/Asia/Khandyga.ics (new) | 142 +++++++++++++++++ web/tzurl/zoneinfo/Asia/Kolkata.ics | 2 +- web/tzurl/zoneinfo/Asia/Krasnoyarsk.ics | 5 +- web/tzurl/zoneinfo/Asia/Kuala_Lumpur.ics | 2 +- web/tzurl/zoneinfo/Asia/Kuching.ics | 2 +- web/tzurl/zoneinfo/Asia/Kuwait.ics | 2 +- web/tzurl/zoneinfo/Asia/Macau.ics | 2 +- web/tzurl/zoneinfo/Asia/Magadan.ics | 9 +- web/tzurl/zoneinfo/Asia/Makassar.ics | 6 +- web/tzurl/zoneinfo/Asia/Manila.ics | 2 +- web/tzurl/zoneinfo/Asia/Muscat.ics | 4 +- web/tzurl/zoneinfo/Asia/Nicosia.ics | 2 +- web/tzurl/zoneinfo/Asia/Novokuznetsk.ics | 9 +- web/tzurl/zoneinfo/Asia/Novosibirsk.ics | 3 +- web/tzurl/zoneinfo/Asia/Omsk.ics | 5 +- web/tzurl/zoneinfo/Asia/Oral.ics | 2 +- web/tzurl/zoneinfo/Asia/Phnom_Penh.ics | 2 +- web/tzurl/zoneinfo/Asia/Pontianak.ics | 14 +- web/tzurl/zoneinfo/Asia/Pyongyang.ics | 18 ++- web/tzurl/zoneinfo/Asia/Qatar.ics | 2 +- web/tzurl/zoneinfo/Asia/Qyzylorda.ics | 2 +- web/tzurl/zoneinfo/Asia/Rangoon.ics | 6 +- web/tzurl/zoneinfo/Asia/Riyadh.ics | 6 +- web/tzurl/zoneinfo/Asia/Sakhalin.ics | 9 +- web/tzurl/zoneinfo/Asia/Samarkand.ics | 4 +- web/tzurl/zoneinfo/Asia/Seoul.ics | 26 ++- web/tzurl/zoneinfo/Asia/Shanghai.ics | 8 +- web/tzurl/zoneinfo/Asia/Singapore.ics | 2 +- .../zoneinfo/Asia/Srednekolymsk.ics (new) | 122 ++++++++++++++ web/tzurl/zoneinfo/Asia/Taipei.ics | 66 ++++---- web/tzurl/zoneinfo/Asia/Tashkent.ics | 4 +- web/tzurl/zoneinfo/Asia/Tbilisi.ics | 8 +- web/tzurl/zoneinfo/Asia/Tehran.ics | 2 +- web/tzurl/zoneinfo/Asia/Thimphu.ics | 2 +- web/tzurl/zoneinfo/Asia/Tokyo.ics | 8 +- web/tzurl/zoneinfo/Asia/Ulaanbaatar.ics | 2 +- web/tzurl/zoneinfo/Asia/Urumqi.ics | 35 +--- web/tzurl/zoneinfo/Asia/Ust-Nera.ics (new) | 141 ++++++++++++++++ web/tzurl/zoneinfo/Asia/Vientiane.ics | 2 +- web/tzurl/zoneinfo/Asia/Vladivostok.ics | 9 +- web/tzurl/zoneinfo/Asia/Yakutsk.ics | 5 +- web/tzurl/zoneinfo/Asia/Yekaterinburg.ics | 12 +- web/tzurl/zoneinfo/Asia/Yerevan.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Azores.ics | 6 +- web/tzurl/zoneinfo/Atlantic/Bermuda.ics | 4 +- web/tzurl/zoneinfo/Atlantic/Canary.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Cape_Verde.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Faroe.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Madeira.ics | 6 +- web/tzurl/zoneinfo/Atlantic/Reykjavik.ics | 2 +- .../zoneinfo/Atlantic/South_Georgia.ics | 2 +- web/tzurl/zoneinfo/Atlantic/St_Helena.ics | 15 +- web/tzurl/zoneinfo/Atlantic/Stanley.ics | 2 +- web/tzurl/zoneinfo/Australia/Adelaide.ics | 16 +- web/tzurl/zoneinfo/Australia/Brisbane.ics | 10 +- web/tzurl/zoneinfo/Australia/Broken_Hill.ics | 20 +-- web/tzurl/zoneinfo/Australia/Currie.ics | 16 +- web/tzurl/zoneinfo/Australia/Darwin.ics | 10 +- web/tzurl/zoneinfo/Australia/Eucla.ics | 10 +- web/tzurl/zoneinfo/Australia/Hobart.ics | 16 +- web/tzurl/zoneinfo/Australia/Lindeman.ics | 10 +- web/tzurl/zoneinfo/Australia/Lord_Howe.ics | 10 +- web/tzurl/zoneinfo/Australia/Melbourne.ics | 14 +- web/tzurl/zoneinfo/Australia/Perth.ics | 10 +- web/tzurl/zoneinfo/Australia/Sydney.ics | 14 +- web/tzurl/zoneinfo/Europe/Amsterdam.ics | 2 +- web/tzurl/zoneinfo/Europe/Andorra.ics | 2 +- web/tzurl/zoneinfo/Europe/Athens.ics | 2 +- web/tzurl/zoneinfo/Europe/Belgrade.ics | 2 +- web/tzurl/zoneinfo/Europe/Berlin.ics | 2 +- web/tzurl/zoneinfo/Europe/Bratislava.ics | 2 +- web/tzurl/zoneinfo/Europe/Brussels.ics | 2 +- web/tzurl/zoneinfo/Europe/Bucharest.ics | 2 +- web/tzurl/zoneinfo/Europe/Budapest.ics | 12 +- web/tzurl/zoneinfo/Europe/Busingen.ics (new) | 75 +++++++++ web/tzurl/zoneinfo/Europe/Chisinau.ics | 2 +- web/tzurl/zoneinfo/Europe/Copenhagen.ics | 2 +- web/tzurl/zoneinfo/Europe/Dublin.ics | 2 +- web/tzurl/zoneinfo/Europe/Gibraltar.ics | 2 +- web/tzurl/zoneinfo/Europe/Guernsey.ics | 2 +- web/tzurl/zoneinfo/Europe/Helsinki.ics | 16 +- web/tzurl/zoneinfo/Europe/Isle_of_Man.ics | 2 +- web/tzurl/zoneinfo/Europe/Istanbul.ics | 8 +- web/tzurl/zoneinfo/Europe/Jersey.ics | 2 +- web/tzurl/zoneinfo/Europe/Kaliningrad.ics | 3 +- web/tzurl/zoneinfo/Europe/Kiev.ics | 34 ++-- web/tzurl/zoneinfo/Europe/Lisbon.ics | 8 +- web/tzurl/zoneinfo/Europe/Ljubljana.ics | 2 +- web/tzurl/zoneinfo/Europe/London.ics | 2 +- web/tzurl/zoneinfo/Europe/Luxembourg.ics | 2 +- web/tzurl/zoneinfo/Europe/Madrid.ics | 2 +- web/tzurl/zoneinfo/Europe/Malta.ics | 2 +- web/tzurl/zoneinfo/Europe/Mariehamn.ics | 16 +- web/tzurl/zoneinfo/Europe/Minsk.ics | 2 +- web/tzurl/zoneinfo/Europe/Monaco.ics | 2 +- web/tzurl/zoneinfo/Europe/Moscow.ics | 35 ++-- web/tzurl/zoneinfo/Europe/Nicosia.ics | 2 +- web/tzurl/zoneinfo/Europe/Oslo.ics | 2 +- web/tzurl/zoneinfo/Europe/Paris.ics | 2 +- web/tzurl/zoneinfo/Europe/Podgorica.ics | 2 +- web/tzurl/zoneinfo/Europe/Prague.ics | 2 +- web/tzurl/zoneinfo/Europe/Riga.ics | 16 +- web/tzurl/zoneinfo/Europe/Rome.ics | 2 +- web/tzurl/zoneinfo/Europe/Samara.ics | 12 +- web/tzurl/zoneinfo/Europe/San_Marino.ics | 2 +- web/tzurl/zoneinfo/Europe/Sarajevo.ics | 2 +- web/tzurl/zoneinfo/Europe/Simferopol.ics | 57 +++++-- web/tzurl/zoneinfo/Europe/Skopje.ics | 2 +- web/tzurl/zoneinfo/Europe/Sofia.ics | 2 +- web/tzurl/zoneinfo/Europe/Stockholm.ics | 2 +- web/tzurl/zoneinfo/Europe/Tallinn.ics | 2 +- web/tzurl/zoneinfo/Europe/Tirane.ics | 2 +- web/tzurl/zoneinfo/Europe/Uzhgorod.ics | 2 +- web/tzurl/zoneinfo/Europe/Vaduz.ics | 35 ++-- web/tzurl/zoneinfo/Europe/Vatican.ics | 2 +- web/tzurl/zoneinfo/Europe/Vienna.ics | 4 +- web/tzurl/zoneinfo/Europe/Vilnius.ics | 2 +- web/tzurl/zoneinfo/Europe/Volgograd.ics | 41 ++++- web/tzurl/zoneinfo/Europe/Warsaw.ics | 2 +- web/tzurl/zoneinfo/Europe/Zagreb.ics | 2 +- web/tzurl/zoneinfo/Europe/Zaporozhye.ics | 2 +- web/tzurl/zoneinfo/Europe/Zurich.ics | 10 +- web/tzurl/zoneinfo/Indian/Antananarivo.ics | 2 +- web/tzurl/zoneinfo/Indian/Chagos.ics | 2 +- web/tzurl/zoneinfo/Indian/Christmas.ics | 2 +- web/tzurl/zoneinfo/Indian/Cocos.ics | 2 +- web/tzurl/zoneinfo/Indian/Comoro.ics | 2 +- web/tzurl/zoneinfo/Indian/Kerguelen.ics | 2 +- web/tzurl/zoneinfo/Indian/Mahe.ics | 2 +- web/tzurl/zoneinfo/Indian/Maldives.ics | 2 +- web/tzurl/zoneinfo/Indian/Mauritius.ics | 2 +- web/tzurl/zoneinfo/Indian/Mayotte.ics | 2 +- web/tzurl/zoneinfo/Indian/Reunion.ics | 2 +- web/tzurl/zoneinfo/Pacific/Apia.ics | 16 +- web/tzurl/zoneinfo/Pacific/Auckland.ics | 2 +- web/tzurl/zoneinfo/Pacific/Chatham.ics | 13 +- web/tzurl/zoneinfo/Pacific/Chuuk.ics | 2 +- web/tzurl/zoneinfo/Pacific/Easter.ics | 12 +- web/tzurl/zoneinfo/Pacific/Efate.ics | 2 +- web/tzurl/zoneinfo/Pacific/Enderbury.ics | 2 +- web/tzurl/zoneinfo/Pacific/Fakaofo.ics | 2 +- web/tzurl/zoneinfo/Pacific/Fiji.ics | 10 +- web/tzurl/zoneinfo/Pacific/Funafuti.ics | 2 +- web/tzurl/zoneinfo/Pacific/Galapagos.ics | 2 +- web/tzurl/zoneinfo/Pacific/Gambier.ics | 2 +- web/tzurl/zoneinfo/Pacific/Guadalcanal.ics | 2 +- web/tzurl/zoneinfo/Pacific/Guam.ics | 2 +- web/tzurl/zoneinfo/Pacific/Honolulu.ics | 2 +- web/tzurl/zoneinfo/Pacific/Johnston.ics | 31 +++- web/tzurl/zoneinfo/Pacific/Kiritimati.ics | 2 +- web/tzurl/zoneinfo/Pacific/Kosrae.ics | 2 +- web/tzurl/zoneinfo/Pacific/Kwajalein.ics | 2 +- web/tzurl/zoneinfo/Pacific/Majuro.ics | 2 +- web/tzurl/zoneinfo/Pacific/Marquesas.ics | 2 +- web/tzurl/zoneinfo/Pacific/Midway.ics | 2 +- web/tzurl/zoneinfo/Pacific/Nauru.ics | 2 +- web/tzurl/zoneinfo/Pacific/Niue.ics | 2 +- web/tzurl/zoneinfo/Pacific/Norfolk.ics | 2 +- web/tzurl/zoneinfo/Pacific/Noumea.ics | 2 +- web/tzurl/zoneinfo/Pacific/Pago_Pago.ics | 13 +- web/tzurl/zoneinfo/Pacific/Palau.ics | 2 +- web/tzurl/zoneinfo/Pacific/Pitcairn.ics | 2 +- web/tzurl/zoneinfo/Pacific/Pohnpei.ics | 2 +- web/tzurl/zoneinfo/Pacific/Ponape.ics | 2 +- web/tzurl/zoneinfo/Pacific/Port_Moresby.ics | 2 +- web/tzurl/zoneinfo/Pacific/Rarotonga.ics | 2 +- web/tzurl/zoneinfo/Pacific/Saipan.ics | 2 +- web/tzurl/zoneinfo/Pacific/Tahiti.ics | 2 +- web/tzurl/zoneinfo/Pacific/Tarawa.ics | 2 +- web/tzurl/zoneinfo/Pacific/Tongatapu.ics | 2 +- web/tzurl/zoneinfo/Pacific/Truk.ics | 2 +- web/tzurl/zoneinfo/Pacific/Wake.ics | 2 +- web/tzurl/zoneinfo/Pacific/Wallis.ics | 2 +- 850 files changed, 2792 insertions(+), 1844 deletions(-) commit 5322b5c7c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 28 16:09:10 2014 +0000 Fixed bug with resizing bookings introduced by floating headers web/css/mrbs.css.php | 2 +- web/js/general.js.php | 4 ++-- web/js/resizable.js.php | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) commit f8c39babe Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 28 12:13:56 2014 +0000 Replaced throttle function and fixed a few associated bugs web/js/functions.js.php | 41 +++++++++++++++++++++++++++++---------- web/js/general.js.php | 16 ++++++--------- web/js/resizable.js.php | 18 ++++++----------- 3 files changed, 43 insertions(+), 32 deletions(-) commit 44b0be40c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 26 16:39:51 2014 +0000 Fixed empty cell selection so that if you drag over a floating header the selection is cancelled. web/js/resizable.js.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) commit 5b5383b4a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 24 10:10:44 2014 +0000 Made window resizing smoother web/js/functions.js.php | 11 +++++++++++ web/js/general.js.php | 10 ++++++++-- web/js/resizable.js.php | 14 ++++++++++---- 3 files changed, 29 insertions(+), 6 deletions(-) commit 5da9c3d73 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 23 22:06:13 2014 +0000 Tidied up code: removed unused variables and added a missing semicolon web/js/general.js.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit c8f01044a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 23 21:40:14 2014 +0000 Made floating headers work when resizing a booking web/js/resizable.js.php | 3 +++ 1 file changed, 3 insertions(+) commit 67ff3c4dc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 23 21:35:36 2014 +0000 Fixed problem with alignment of floating header columns in IE web/js/general.js.php | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) commit fde172af4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 23 16:46:30 2014 +0000 Fixed bug with horizontal scrolling of floating headers web/js/general.js.php | 5 +++++ 1 file changed, 5 insertions(+) commit 7990b4445 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 23 16:11:00 2014 +0000 Fixed bug causing floating header to be visible at the same time as the ordinary header in some circumstances when the window is resized. web/js/general.js.php | 1 + 1 file changed, 1 insertion(+) commit f38d887dc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 23 15:52:04 2014 +0000 Fixed bug causing bookings to appear over the floating header as the window is resized web/css/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit 61ee58273 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 23 15:42:02 2014 +0000 Floating headers now survive window resizing web/js/general.js.php | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) commit f9e05c4cc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 23 14:58:42 2014 +0000 Scrolling position now maintained after a table refresh web/js/refresh.js.php | 1 + 1 file changed, 1 insertion(+) commit 7de1e5f5a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 23 14:54:31 2014 +0000 Recreated floating headers after a table refresh. Still needs some work though as the scrolling position is lost. web/js.inc | 39 ---------------------------------- web/js/general.js.php | 46 +++++++++++++++++++++++++++++++++++++++++ web/js/refresh.js.php | 1 + 3 files changed, 47 insertions(+), 39 deletions(-) commit cee2ef673 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 23 13:12:48 2014 +0000 Fixed bug causing page refresh not to work if the user wasn't logged in web/mrbs_auth.inc | 4 ++++ 1 file changed, 4 insertions(+) commit 3b8ee004a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 23 12:25:34 2014 +0000 Fixed problem with floating headers with header and body columns not aligning properly. See SF Support Requests #559 web/js.inc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) commit d2a62bddd Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Dec 22 09:07:19 2014 +0000 Added floating headers to day and week view, as discussed in [support-requests:#559]. Could be made optional if desired. web/css/mrbs.css.php | 8 ++++++++ web/js.inc | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) commit 639cdd6a5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 21 17:53:32 2014 +0000 Stopped the header jumping around on page refresh as the datepicker is set up web/css/mrbs.css.php | 18 ++++++++++++++++++ web/js/general.js.php | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) commit 5e1ae44a1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 21 16:58:55 2014 +0000 Made the non-JavaScript date selectors hidden while the JavaScript date selectors are being prepared web/functions.inc | 4 ++-- web/js/datepicker.js.php | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) commit 4e86d401e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 20 18:41:16 2014 +0000 Fixed notice error web/upgrade/6/post.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit da8d9d92a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 20 12:23:08 2014 +0000 Restructured code web/functions.inc | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) commit cb739af1d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 19 16:08:21 2014 +0000 Fixed bug in checking number of slots when the booking day goes past midnight web/edit_area_room.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit 4c241dbec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 16 18:28:06 2014 +0000 Restructured code web/js/edit_area_room.js.php | 70 +++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 23 deletions(-) commit f07cb76af Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 16 09:39:17 2014 +0000 Made the 'modified_by' field private by default, to match 'create_by'. web/systemdefaults.inc.php | 1 + 1 file changed, 1 insertion(+) commit 3a2d45760 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 16 09:36:16 2014 +0000 Fixed some undefined index notice problems web/functions_view.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 2eaa0eaef Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 13 19:07:48 2014 +0000 Fixed typos in comment web/systemdefaults.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 0da07125e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 13 18:39:05 2014 +0000 Corrected inconsistent capitalisation web/lang/lang.en | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 056a9d194 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 11 13:41:16 2014 +0000 Fixed bug in langs_arsort() which arose when the locale was set to one in which the decimal separator was represented by a comma. In those circumstances the cast of a float to a string and back to a float again does not get you back to where you started. Langs_arsort() is in fact unnecessary as it is trying to preserve the original order in a sort when two languages have the same quality value. However in the unlikely event that a browser does specify two languages with the same quality value it presumably means that the order is unimportant. The function langs_arsort() has therefore been removed and replaced by calls to arsort() using the SORT_NUMERIC flag. See also SF Support Requests #649. web/language.inc | 42 ++---------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) commit 0bd97889d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 10 13:31:36 2014 +0000 Changed the handling of nb and nn languages so that explicit language files are provided for nn and nn rather than being mapped onto no. See also SF Support Requests #649. web/jquery/datatables/language/nb.txt (new) | 17 + web/jquery/datatables/language/nn.txt (new) | 17 + web/lang/lang.nb (new) | 426 ++++++++++++++++++ web/lang/lang.nn (new) | 426 ++++++++++++++++++ web/language.inc | 18 +- 5 files changed, 887 insertions(+), 17 deletions(-) commit 819fd3437 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 8 19:05:05 2014 +0000 Fixed potential bug in sql_mysql_mutex_lock() and sql_mysqli_mutex_lock() where an error from the GET_LOCK query, which would return NULL, would be falsely reported as a successful lock. web/mysql.inc | 36 +++++++++++++++++++++++------------- web/mysqli.inc | 40 +++++++++++++++++++++++++++------------- 2 files changed, 50 insertions(+), 26 deletions(-) commit 828e8037b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 8 16:35:48 2014 +0000 Improved error handling web/mysql.inc | 21 ++++++++++++++++++--- web/mysqli.inc | 21 ++++++++++++++++++--- web/pgsql.inc | 21 ++++++++++++++++++--- 3 files changed, 54 insertions(+), 9 deletions(-) commit b302adcc2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 8 16:16:13 2014 +0000 Added rollback of outstanding transactions to the shutdown function in an attempt to prevent duplicate bookings when using persistent database connections. See SF bugs #314 web/mysql.inc | 16 +++++++++++++--- web/mysqli.inc | 14 ++++++++++++-- web/pgsql.inc | 17 +++++++++++++++-- 3 files changed, 40 insertions(+), 7 deletions(-) commit 002d26ccc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 8 15:56:09 2014 +0000 Restructured code web/mysql.inc | 26 +++++++++++++++----------- web/mysqli.inc | 26 +++++++++++++++----------- web/pgsql.inc | 24 ++++++++++++++---------- 3 files changed, 44 insertions(+), 32 deletions(-) commit a9f196b7a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 28 12:12:04 2014 +0000 Restructured code to use the same method for choosing the datatables regional file as for datepicker web/js.inc | 4 +- web/js/datatables.js.php | 3 +- web/language.inc | 106 ++++++++++++------------------------- 3 files changed, 39 insertions(+), 74 deletions(-) commit bf6b2c3cf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 27 17:24:25 2014 +0000 Restructured code web/js.inc | 4 ++-- web/language.inc | 56 ++++++++++++++++++++++++++-------------------- 2 files changed, 34 insertions(+), 26 deletions(-) commit e1080e879 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 27 16:41:29 2014 +0000 Converted to using new style jQuery UI datepicker regional settings web/jquery/ui/i18n/datepicker-af.js (new) | 37 + web/jquery/ui/i18n/datepicker-ar-DZ.js (new) | 37 + web/jquery/ui/i18n/datepicker-ar.js (new) | 38 + web/jquery/ui/i18n/datepicker-az.js (new) | 37 + web/jquery/ui/i18n/datepicker-be.js (new) | 37 + web/jquery/ui/i18n/datepicker-bg.js (new) | 38 + web/jquery/ui/i18n/datepicker-bs.js (new) | 37 + web/jquery/ui/i18n/datepicker-ca.js (new) | 37 + web/jquery/ui/i18n/datepicker-cs.js (new) | 37 + web/jquery/ui/i18n/datepicker-cy-GB.js (new) | 37 + web/jquery/ui/i18n/datepicker-da.js (new) | 37 + web/jquery/ui/i18n/datepicker-de.js (new) | 37 + web/jquery/ui/i18n/datepicker-el.js (new) | 37 + web/jquery/ui/i18n/datepicker-en-AU.js (new) | 37 + web/jquery/ui/i18n/datepicker-en-GB.js (new) | 37 + web/jquery/ui/i18n/datepicker-en-IE.js (new) | 38 + web/jquery/ui/i18n/datepicker-en-NZ.js (new) | 37 + web/jquery/ui/i18n/datepicker-eo.js (new) | 37 + web/jquery/ui/i18n/datepicker-es.js (new) | 37 + web/jquery/ui/i18n/datepicker-et.js (new) | 37 + web/jquery/ui/i18n/datepicker-eu.js (new) | 36 + web/jquery/ui/i18n/datepicker-fa.js (new) | 73 + web/jquery/ui/i18n/datepicker-fi.js (new) | 37 + web/jquery/ui/i18n/datepicker-fo.js (new) | 37 + web/jquery/ui/i18n/datepicker-fr-CA.js (new) | 37 + web/jquery/ui/i18n/datepicker-fr-CH.js (new) | 37 + web/jquery/ui/i18n/datepicker-fr.js (new) | 39 + web/jquery/ui/i18n/datepicker-gl.js (new) | 37 + web/jquery/ui/i18n/datepicker-he.js (new) | 37 + web/jquery/ui/i18n/datepicker-hi.js (new) | 37 + web/jquery/ui/i18n/datepicker-hr.js (new) | 37 + web/jquery/ui/i18n/datepicker-hu.js (new) | 36 + web/jquery/ui/i18n/datepicker-hy.js (new) | 37 + web/jquery/ui/i18n/datepicker-id.js (new) | 37 + web/jquery/ui/i18n/datepicker-is.js (new) | 37 + web/jquery/ui/i18n/datepicker-it-CH.js (new) | 37 + web/jquery/ui/i18n/datepicker-it.js (new) | 37 + web/jquery/ui/i18n/datepicker-ja.js (new) | 37 + web/jquery/ui/i18n/datepicker-ka.js (new) | 35 + web/jquery/ui/i18n/datepicker-kk.js (new) | 37 + web/jquery/ui/i18n/datepicker-km.js (new) | 37 + web/jquery/ui/i18n/datepicker-ko.js (new) | 37 + web/jquery/ui/i18n/datepicker-ky.js (new) | 38 + web/jquery/ui/i18n/datepicker-lb.js (new) | 37 + web/jquery/ui/i18n/datepicker-lt.js (new) | 37 + web/jquery/ui/i18n/datepicker-lv.js (new) | 37 + web/jquery/ui/i18n/datepicker-mk.js (new) | 37 + web/jquery/ui/i18n/datepicker-ml.js (new) | 37 + web/jquery/ui/i18n/datepicker-ms.js (new) | 37 + web/jquery/ui/i18n/datepicker-nb.js (new) | 36 + web/jquery/ui/i18n/datepicker-nl-BE.js (new) | 37 + web/jquery/ui/i18n/datepicker-nl.js (new) | 37 + web/jquery/ui/i18n/datepicker-nn.js (new) | 36 + web/jquery/ui/i18n/datepicker-no.js (new) | 37 + web/jquery/ui/i18n/datepicker-pl.js (new) | 37 + web/jquery/ui/i18n/datepicker-pt-BR.js (new) | 37 + web/jquery/ui/i18n/datepicker-pt.js (new) | 36 + web/jquery/ui/i18n/datepicker-rm.js (new) | 35 + web/jquery/ui/i18n/datepicker-ro.js (new) | 40 + web/jquery/ui/i18n/datepicker-ru.js (new) | 37 + web/jquery/ui/i18n/datepicker-sk.js (new) | 37 + web/jquery/ui/i18n/datepicker-sl.js (new) | 38 + web/jquery/ui/i18n/datepicker-sq.js (new) | 37 + web/jquery/ui/i18n/datepicker-sr-SR.js (new) | 37 + web/jquery/ui/i18n/datepicker-sr.js (new) | 37 + web/jquery/ui/i18n/datepicker-sv.js (new) | 37 + web/jquery/ui/i18n/datepicker-ta.js (new) | 37 + web/jquery/ui/i18n/datepicker-th.js (new) | 37 + web/jquery/ui/i18n/datepicker-tj.js (new) | 37 + web/jquery/ui/i18n/datepicker-tr.js (new) | 37 + web/jquery/ui/i18n/datepicker-uk.js (new) | 38 + web/jquery/ui/i18n/datepicker-vi.js (new) | 37 + web/jquery/ui/i18n/datepicker-zh-CN.js (new) | 37 + web/jquery/ui/i18n/datepicker-zh-HK.js (new) | 37 + web/jquery/ui/i18n/datepicker-zh-TW.js (new) | 37 + web/jquery/ui/jquery-ui-i18n.MRBS.js (gone) | 62 - web/jquery/ui/jquery-ui-i18n.js (gone) | 1645 ---------------- web/js.inc | 10 +- web/js/datepicker.js.php | 76 +- web/language.inc | 125 ++ 80 files changed, 2946 insertions(+), 1785 deletions(-) commit 663071bb4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 27 11:19:20 2014 +0000 Removed the session_save_path writability test as it's not reliable. For example on Windows the session_save_path can fail the writability test but sessions still work. web/session/session_php.inc | 27 --------------------------- 1 file changed, 27 deletions(-) commit d551769d3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 26 14:48:33 2014 +0000 Upgraded jQuery UI to Release 1.11.12. Still need to convert to new style datepicker internationalisation, but the old style works for now. .../ui/css/jquery-ui.structure.css (new) | 596 + .../ui/css/jquery-ui.structure.min.css (new) | 5 + .../sunny/images/animated-overlay.gif (gone) | Bin 1738 -> 0 bytes ...i-bg_diagonals-medium_20_d34d17_40x40.png | Bin 382 -> 382 bytes .../images/ui-bg_flat_30_cccccc_40x100.png | Bin 220 -> 220 bytes .../images/ui-bg_flat_50_5c5c5c_40x100.png | Bin 230 -> 230 bytes .../ui-bg_gloss-wave_45_817865_500x100.png | Bin 5891 -> 5891 bytes .../ui-bg_gloss-wave_60_fece2f_500x100.png | Bin 5849 -> 5849 bytes .../ui-bg_gloss-wave_70_ffdd57_500x100.png | Bin 5543 -> 5543 bytes .../ui-bg_gloss-wave_90_fff9e5_500x100.png | Bin 5389 -> 5389 bytes ...ui-bg_highlight-soft_100_feeebd_1x100.png | Bin 343 -> 343 bytes .../ui-bg_inset-soft_30_ffffff_1x100.png | Bin 203 -> 203 bytes .../jquery-ui-1.10.4.custom.min.css (gone) | 7 - .../ui/css/sunny/jquery-ui.theme.css (new) | 410 + .../css/sunny/jquery-ui.theme.min.css (new) | 5 + .../ui/jquery-ui-1.10.4.custom.min.js (gone) | 7 - web/jquery/ui/jquery-ui.js (new) | 9258 ++++++++++++++++ web/jquery/ui/jquery-ui.min.js (new) | 10 + web/js.inc | 15 +- web/style.inc | 15 +- 20 files changed, 10312 insertions(+), 16 deletions(-) commit 3d400ce9c Merge: 23fca261f bc4a3b4bf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 25 16:39:17 2014 +0000 Re-integrated the create_policy branch back into the trunk. The book_ahead capabilities have been split into create_ahead and delete_ahead capabilities, allowing finer control of policies. It is now possible to distinguish between creating new bookings and editing or deleting existing bookings. (An edit requires a new booking to be created and the old one to be deleted). commit bc4a3b4bf (origin/create_policy) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 25 16:20:10 2014 +0000 Merged in latest changes from the trunk web/dbsys.inc | 16 ++++++++++++++ web/edit_entry_handler.php | 27 +++++++++++++++++------- web/functions.inc | 39 +++++++++++++++++++++++++++++++++++ web/functions_table.inc | 17 ++++++++------- web/import.php | 1 + web/session/session_php.inc | 10 ++++----- 6 files changed, 88 insertions(+), 22 deletions(-) commit 0c341e061 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 25 16:11:08 2014 +0000 Added checks for use of old book_ahead config variables and tidied up checks for previously discontinued config variables web/internalconfig.inc.php | 82 +++++++++++++++++++++++++++++++----- web/systemdefaults.inc.php | 3 -- 2 files changed, 72 insertions(+), 13 deletions(-) commit 23fca261f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 21 07:14:12 2014 +0000 Added comment web/session/session_php.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit bf6f98ca3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 20 07:28:57 2014 +0000 Fixed false warning given on session_save_path readable check. See SF bugs #316 web/session/session_php.inc | 5 ----- 1 file changed, 5 deletions(-) commit b8f055464 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 7 10:33:28 2014 +0000 Set ignore_user_abort for the duration of transactions and while locks are in place in an attempt to try and prevent problems with duplicate bookings being seen on sites running with persistent database connections (see SF Bugs 314). web/dbsys.inc | 16 ++++++++++++++++ web/functions.inc | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) commit 652103c41 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 6 17:32:17 2014 +0000 Fixed bug introduced in Rev 2882 that stopped resizable bookings working web/edit_entry_handler.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 5afbb4ea4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 6 14:53:24 2014 +0000 Added support of pattern attribute to datalist inputs (to stop just whitespace being entered for mandatory fields) web/functions.inc | 1 + 1 file changed, 1 insertion(+) commit c6c454bdf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 6 14:30:20 2014 +0000 Added server-side validation to check that mandatory standard fields (eg the full description) are present web/edit_entry_handler.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) commit 7b3ff7ea5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 6 14:18:03 2014 +0000 Fixed bug that allowed the booking name to consist of just whitespace by moving the trim() to before the server side validation. See also Rev 2881. web/edit_entry_handler.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) commit 521dc30b1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 5 18:20:22 2014 +0000 Fixed bug which caused the day and week views to be displayed incorrectly if the brief description was blank ('') - which of course shouldn't normally happen. (See thread on mailing list with subject "Day/week tables displaying incorrectly") web/functions_table.inc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) commit fd39aa5ad Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 5 13:36:00 2014 +0000 Added 'application/x-download' to the set of types that can be imported web/import.php | 1 + 1 file changed, 1 insertion(+) commit d9fe7c082 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 5 10:51:37 2014 +0000 Fixed undefined variable problem web/internalconfig.inc.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) commit 734ee65e2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 4 13:33:47 2014 +0000 Stopped MRBS sending an email when nothing has been deleted web/del_entry.php | 15 ++++++++------- web/mrbs_sql.inc | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) commit f379dd281 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 3 11:02:17 2014 +0000 First version of the separation of book_ahead into create_ahead and delete_ahead, allowing policies to distinguish between creating new bookings and editing or deleting existing ones. Still to do: test PostgreSQL; adjust draggable bookings code to recognise bookings that can't be edited; and add messages when you try and delete a booking that can't be (at the moment the booking is just silently not deleted) tables.my.pre41.sql | 14 ++- tables.my.sql | 14 ++- tables.pg.pre73.sql | 14 ++- tables.pg.sql | 14 ++- web/areadefaults.inc.php | 40 ++++-- web/css/mrbs.css.php | 21 +++- web/dbsys.inc | 2 +- web/edit_area_room.php | 207 ++++++++++++++++++++++--------- web/functions.inc | 9 +- web/internalconfig.inc.php | 83 ++++++++----- web/lang/lang.en | 9 +- web/mrbs_sql.inc | 162 +++++++++++++++++++----- web/upgrade/38/mysql.sql (new) | 31 +++++ web/upgrade/38/pgsql.sql (new) | 31 +++++ 14 files changed, 490 insertions(+), 161 deletions(-) commit c3850d6c9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 30 15:15:23 2014 +0000 Creation of a new branch to allow the book_ahead policies to split between the ability to create new bookings and the ability to edit or delete existing bookings. commit 99016be34 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 30 14:15:59 2014 +0000 Corrected typo in comment web/areadefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4f8160e00 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 28 10:25:41 2014 +0000 Ensured that the $timezone configuration variable is valid. See SF bugs #312 web/functions.inc | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) commit eff87ec6d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 26 07:48:53 2014 +0000 Changed the spacing between form inputs and labels to make it more obvious which label is associated with which input (see SF Support Requests #618) web/css/mrbs.css.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit eefa00c2d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 25 14:40:22 2014 +0000 Added DEFAULT CURRENT_TIMESTAMP and ON UPDATE CURRENT_TIMESTAMP clauses to the timestamp column definitions, just in case those aren't the default settings in the MySQL server. See SF Support Requests #605 tables.my.pre41.sql | 2 +- tables.my.sql | 6 +++--- tables.pg.pre73.sql | 2 +- tables.pg.sql | 2 +- web/dbsys.inc | 2 +- web/upgrade/37/mysql.sql (new) | 9 +++++++++ web/upgrade/37/pgsql.sql (new) | 0 7 files changed, 16 insertions(+), 7 deletions(-) commit 906d6ac78 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 23 15:21:33 2014 +0000 Changed error handling for mysqli connections to prevent potentially sensitive information appearing in the user's browser. web/mysqli.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit bd1e0d621 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 23 14:54:47 2014 +0000 Corrected typo in comment web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit aa2a89430 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 14 14:04:17 2014 +0000 Changed spelling of the Spanish version of the short name for August in the datepicker from 'ogo' to 'ago'. See SF Support Requests #625. (Upgrading to jQuery UI 1.11 will have to wait as the 1.11 file structure has been changed). web/jquery/ui/jquery-ui-i18n.MRBS.js | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) commit c22a327b5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 12 15:55:48 2014 +0000 Fixed bug which prevented exported reports being imported by some calendar apps, eg Outlook. See SF bugs #313 web/functions_ical.inc | 117 +++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 67 deletions(-) commit e73d3681a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 12 14:34:53 2014 +0000 Restructured code web/functions_ical.inc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) commit f3b61a59c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 12 14:29:56 2014 +0000 Removed redundant code web/functions_ical.inc | 10 ---------- 1 file changed, 10 deletions(-) commit 62384fd91 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 9 13:54:52 2014 +0000 Added some session error checking web/session/session_php.inc | 40 ++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) commit 55aaa3e11 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 9 12:57:57 2014 +0000 Changed comment. (The note about sub-domains was a red herring). web/functions.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit 860eff472 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 8 14:45:44 2014 +0000 Separated out the generation of the page name for form action into a separate function to make it easier to change. For example when using MRBS in a subdomain the full page name is required to ensure that POST data gets through. web/admin.php | 3 +-- web/dbsys.inc | 3 +-- web/edit_entry_handler.php | 2 +- web/edit_users.php | 15 +++++++-------- web/functions.inc | 12 ++++++++++++ web/import.php | 2 +- web/session/session_cookie.inc | 4 ++-- web/session/session_php.inc | 2 +- web/view_entry.php | 4 ++-- 9 files changed, 28 insertions(+), 19 deletions(-) commit 432b5708c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 29 14:45:51 2014 +0000 Fixed potential bug in CSV reports whereby characters other than a BOM could be stripped from the start of a row web/report.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) commit 1d4c54b47 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 28 15:10:03 2014 +0000 Changed code in csv_conv() to use iconv() if it exists when converting output for CSV files because it's faster. Also fixed a bug whereby if iconv() was being used it added a BOM when one wasn't needed because csv_conv() is only used to convert partial strings and not a complete file. See also SF Support Requests #585. web/report.php | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) commit 9c644a925 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 20 15:12:33 2014 +0000 Fixed (hopefully) a problem with newlines in fields in a CSV report. See SF Support Requests 585 web/language.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit bb3f1ad09 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 20 14:14:44 2014 +0000 Corrected typo in comment web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3f2f3efce Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 6 18:52:10 2014 +0000 Fixed error in comment web/month.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a87e9ff48 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 5 15:32:37 2014 +0000 Simplified code web/month.php | 106 ++++++++++++++++++------------------------------ 1 file changed, 39 insertions(+), 67 deletions(-) commit 3bb247f80 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 5 15:15:15 2014 +0000 Restructured code web/month.php | 181 ++++++++++++++++++++++++++---------------------- 1 file changed, 100 insertions(+), 81 deletions(-) commit 20c590850 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 5 14:19:01 2014 +0000 Simplified the display of periods in the month view when a booking is just one period long. See SF Support Requests #575 web/month.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit 918a98381 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 30 10:11:32 2014 +0000 Fixed bug causing triggering spurious policy violations when using periods and $max_duration is set. See SF Bugs #306 web/edit_entry.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit e9d0f3286 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 30 09:10:39 2014 +0000 Fixed spelling error in comment web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9879ed63d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 23 14:12:03 2014 +0000 Added Slovakian support. Thanks to Anonymous. See SF Patches #48. web/lang/lang.sk (new) | 507 +++++++++++++++++++++++++++++++++++++++ web/language.inc | 2 + 2 files changed, 509 insertions(+) commit b9ce997dd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 17 13:15:17 2014 +0000 Added support for importing zip, gzip and bzip2 files. web/import.php | 255 +++++++++++++++++++++++++++++++++++++++++---- web/lang/lang.en | 7 ++ 2 files changed, 242 insertions(+), 20 deletions(-) commit 06cc17cd5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 11 11:50:46 2014 +0000 Further improved performance importing large files by reducing memory usage. web/import.php | 128 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 97 insertions(+), 31 deletions(-) commit c9bd8369c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 6 12:19:14 2014 +0000 Improved performance (by reducing memory usage) web/import.php | 52 ++++++++++-------------------------------------- 1 file changed, 10 insertions(+), 42 deletions(-) commit b3bdebb2e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 2 09:40:28 2014 +0000 Added logging of SQL errors to fatal_error(). See SF Support Requests #560. web/functions.inc | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) commit 1b450ff4f Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Jun 26 10:56:30 2014 +0000 Updated zh-cn translation, provided by 'Tide' in [patches:#46]. web/lang/lang.zh-cn | 504 ++++++++++++++++++++++++++++++++---------- 1 file changed, 391 insertions(+), 113 deletions(-) commit cd2b7a359 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Jun 19 10:51:09 2014 +0000 Updated version post-release web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3e05d56aa (tag: mrbs-1_4_11) Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jun 18 19:42:39 2014 +0000 Updated ChangeLog and NEWS for release of 1.4.11 ChangeLog | 764 ++++++++++++++++++++++++++++++++++++++++++++++++++++ NEWS | 60 +++++ 2 files changed, 824 insertions(+) commit f005651a9 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jun 18 19:41:39 2014 +0000 Updated version for release of 1.4.11 web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 366dc5e76 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 28 15:53:09 2014 +0000 Fixed bug in export of an event: the description included the complete booking details instead of just the description. web/functions_ical.inc | 28 +++++++++------------------- web/functions_mail.inc | 4 ++-- 2 files changed, 11 insertions(+), 21 deletions(-) commit 7498a59fa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 28 15:20:47 2014 +0000 Made the default area and room consistent on import and export of an event. See SF Support Requests #541 web/functions_ical.inc | 5 +++-- web/import.php | 2 +- web/systemdefaults.inc.php | 10 ++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) commit 7e83eeb25 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 22 09:54:02 2014 +0000 Changed form action link to a relative path name from an absolute path name, which was causing problems on some sites with reverse proxy rules. See the bug report on the MRBS-general mailing list. web/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4964f5b8f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri May 9 11:29:36 2014 +0000 Fixed problem with resizing bookings in IE. See SF Bugs #293 and #300. web/css/mrbs.css.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit 950db726e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri May 9 09:38:31 2014 +0000 Fixed problem with colour key and trailer shifting downwards during a booking resize in IE. See SF Bugs #300 web/css/mrbs.css.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) commit 5a1c2e85c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 27 17:37:42 2014 +0000 Added nofollow to robots meta tag. See SF Bugs #298 web/style.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit fd40e9da5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 27 17:10:08 2014 +0000 Changed the ORGANIZER in an iCalendar event to be a new email address, defined as $mail_settings['organizer'] and not the creator. This is to avoid a problem in some mail systems, eg IBM Domino, where an iCalendar event notification email is silently discarded if the organizer's email address is the same as the recipient's web/functions_ical.inc | 29 +++++++++-------------------- web/systemdefaults.inc.php | 7 +++++++ 2 files changed, 16 insertions(+), 20 deletions(-) commit 9063b2cd3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 27 10:06:45 2014 +0000 Added a LAST-MODIFIED property to all VEVENTS web/functions_ical.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit 25a89782d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Apr 26 15:44:19 2014 +0000 Upgraded Mail_Mime package to Version 1.8.8 web/Mail/mime.php | 212 ++++++++++++++++++++++---------------- web/Mail/mimePart.php | 221 ++++++++++++++++++++++++---------------- 2 files changed, 259 insertions(+), 174 deletions(-) commit fab45ba80 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 2 17:17:40 2014 +0000 Added an alternative for the %e modifier for strftime() when running on Windows. See also SF Support Requests #521 web/language.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 273c9266c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 17 15:55:24 2014 +0000 Corrected typo in comment web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4ade9bbce Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 9 10:03:30 2014 +0000 Fixed a problem in the day and week views with resizable bookings not filling the whole time period when $clipped is set to FALSE. See SF Support Requests #503. web/js/resizable.js.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) commit 5c77825fd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 8 10:02:25 2014 +0000 Fixed bug in last change web/functions.inc | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) commit 1ba6fa997 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 8 09:09:44 2014 +0000 Made the first option of a radio button group the default value if no value is given, mirroring the way a <select> element works. web/edit_entry.php | 11 +---------- web/functions.inc | 24 +++++++++++++++++++----- 2 files changed, 20 insertions(+), 15 deletions(-) commit fce941038 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 7 11:10:15 2014 +0000 Converted a few substr() and strlen() calls to their utf8_ equivalents for good measure web/functions.inc | 2 +- web/functions_mail.inc | 2 +- web/language.inc | 2 +- web/mrbs_sql.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) commit f7b1fd4cd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 3 17:38:31 2014 +0000 Changed the operation for generate_radio_group() so that it operates in the same way as generate_select() and can take either a simple or an associative array. This enables custom fields to be presented as radio buttons instead of as <select> elements if desired. See SF Support Requests #489. web/edit_area_room.php | 31 +++++++++++++++------------ web/edit_entry.php | 25 ++++++++++++---------- web/functions.inc | 31 +++++++++++++++++++++------ web/report.php | 45 ++++++++++++++++++++++------------------ 4 files changed, 82 insertions(+), 50 deletions(-) commit 9ebbefae9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 25 16:13:17 2014 +0000 Fixed bug in utf8_substr() on 64 bit Linux systems caused by an underlying bug in mb_substr() web/language.inc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) commit 733d57293 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 24 13:44:05 2014 +0000 Added locale mappings for 'nb' ( => 'nb_NO') and 'nn' (=> 'nn_NO') web/language.inc | 2 ++ 1 file changed, 2 insertions(+) commit 3248b7e0a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 22 18:22:26 2014 +0000 Added escaping and unescaping of '\N' in property values (required by RFC 5545 Section 3.3.11) web/functions_ical.inc | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) commit c0f3b7dc0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 14 10:12:03 2014 +0000 Modified import.php so that it is tolerant of blank lines at the start of the file and also between components (eg VEVENTS). Strictly speaking these are not allowed according to RFC5545, but it does no harm to tolerate them. web/import.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) commit 8b584a1fc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 13 18:53:25 2014 +0000 Added an en-IE regional setting for the datepicker web/jquery/ui/jquery-ui-i18n.MRBS.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 7a0a1b0ad Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 13 11:34:04 2014 +0000 Fixed some errors in the Windows language map and expanded the Windows codepage map web/language.inc | 132 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 117 insertions(+), 15 deletions(-) commit f339446e5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 13 10:11:13 2014 +0000 Fixed problem with es-CO on Windows. See SF Support Requests 477. Also added support for the remaining Spanish variants. web/language.inc | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) commit 80369cfaa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 10 18:37:52 2014 +0000 Fixed bug causing dates in mail messages to be in the wrong language when the main MRBS language differs from the mail language. See SF Support Requests #474. web/functions_mail.inc | 28 +++++- web/language.inc | 186 +++++++++++++++++++++++---------------- 2 files changed, 133 insertions(+), 81 deletions(-) commit 1335758d1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 9 14:26:37 2014 +0000 Changed error level for missing id from E_USER_WARNING to E_USER_NOTICE (see SF Feature Requests 249) web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a8eb742ff Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 9 09:41:33 2014 +0000 Fixed problem with shaded selection sometimes not snapping to the edge of the slot when selecting a group of empty slots. Bug caused by the fact that .offset() in some browsers (eg Firefox) returns decimal values calculated from styling rather than integer pixel values from rendering. web/js/resizable.js.php | 69 ++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 23 deletions(-) commit eaf0b3e40 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 8 11:38:34 2014 +0000 Upgraded to jQuery UI Release 1.10.4 .../sunny/images/animated-overlay.gif (new) | Bin 0 -> 1738 bytes ...i-bg_diagonals-medium_20_d34d17_40x40.png | Bin 247 -> 382 bytes .../images/ui-bg_flat_30_cccccc_40x100.png | Bin 180 -> 220 bytes .../images/ui-bg_flat_50_5c5c5c_40x100.png | Bin 180 -> 230 bytes .../ui-bg_gloss-wave_45_817865_500x100.png | Bin 3971 -> 5891 bytes .../ui-bg_gloss-wave_60_fece2f_500x100.png | Bin 4075 -> 5849 bytes .../ui-bg_gloss-wave_70_ffdd57_500x100.png | Bin 3122 -> 5543 bytes .../ui-bg_gloss-wave_90_fff9e5_500x100.png | Bin 2720 -> 5389 bytes ...ui-bg_highlight-soft_100_feeebd_1x100.png | Bin 108 -> 343 bytes .../ui-bg_inset-soft_30_ffffff_1x100.png | Bin 100 -> 203 bytes .../sunny/images/ui-icons_3d3d3d_256x240.png | Bin 4369 -> 6992 bytes .../sunny/images/ui-icons_bd7b00_256x240.png | Bin 4369 -> 4549 bytes .../sunny/images/ui-icons_d19405_256x240.png | Bin 4369 -> 4549 bytes .../sunny/images/ui-icons_eb990f_256x240.png | Bin 5355 -> 4549 bytes .../sunny/images/ui-icons_ed9f26_256x240.png | Bin 5355 -> 4549 bytes .../sunny/images/ui-icons_fadc7a_256x240.png | Bin 4369 -> 4549 bytes .../sunny/images/ui-icons_ffe180_256x240.png | Bin 4369 -> 4549 bytes .../jquery-ui-1.10.4.custom.min.css (new) | 7 + .../jquery-ui-1.9.1.custom.min.css (gone) | 5 - .../ui/jquery-ui-1.10.4.custom.min.js (new) | 7 + .../ui/jquery-ui-1.9.1.custom.min.js (gone) | 6 - web/jquery/ui/jquery-ui-i18n.js | 330 ++++++++--------- web/js.inc | 2 +- web/style.inc | 2 +- 24 files changed, 166 insertions(+), 193 deletions(-) commit be1359d16 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 8 10:58:41 2014 +0000 Upgraded to jQuery 2.1.0, with a fallback to 1.11.0 for IE8 and below web/jquery/jquery-2.1.0.min.js (new) | 4 ++++ web/js.inc | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) commit 832d3931c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 8 10:28:04 2014 +0000 Upgraded to jQuery 1.11.0, fixing SF Bugs #293 in the process web/internalconfig.inc.php | 7 + web/jquery/jquery-1.11.0.min.js (new) | 4 + web/jquery/jquery-1.8.2.min.js (gone) | 2 - web/jquery/jquery-migrate-1.2.1.js (new) | 521 +++++++++++++++++ web/jquery/jquery-migrate-1.2.1.min.js (new) | 2 + web/js.inc | 20 +- 6 files changed, 553 insertions(+), 3 deletions(-) commit fbd48d39a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 29 14:47:22 2014 +0000 Simplified code web/grab_globals.inc.php | 175 ++++++++----------------------------- 1 file changed, 38 insertions(+), 137 deletions(-) commit 4edb5de77 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 29 09:06:06 2014 +0000 Added Bahasa Indonesian translation. Thanks to Gibransyah Fakhri. See SF Patches #44. web/lang/lang.id (new) | 506 +++++++++++++++++++++++++++++++++++++++ web/language.inc | 3 + 2 files changed, 509 insertions(+) commit 9ad8b0f9f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 29 08:49:48 2014 +0000 Updated comment on changing type colours web/systemdefaults.inc.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) commit f0df12d24 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 24 20:05:01 2014 +0000 Added missing commas. See SF Bugs #292 web/internalconfig.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 9733e75d7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 20 20:59:59 2014 +0000 Allowed datepickers to be edited manually. See SF Bugs #291 web/js/datepicker.js.php | 41 +++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 12 deletions(-) commit 73f362699 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 17 14:25:01 2014 +0000 Added 'modified_by' field so you can see who last modified an entry tables.my.pre41.sql | 4 +++- tables.my.sql | 4 +++- tables.pg.pre73.sql | 4 +++- tables.pg.sql | 4 +++- web/dbsys.inc | 3 +-- web/edit_entry_handler.php | 1 + web/functions_view.inc | 4 ++++ web/internalconfig.inc.php | 2 ++ web/lang/lang.en | 1 + web/lang/lang.it | 1 + web/mrbs_sql.inc | 1 + web/upgrade/36/mysql.sql (new) | 9 +++++++++ web/upgrade/36/pgsql.sql (new) | 9 +++++++++ 13 files changed, 41 insertions(+), 6 deletions(-) commit 4075f2d64 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 15 21:29:23 2014 +0000 Fixed upgrade.inc to work with multiple schemas web/upgrade.inc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) commit 10393ceb8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 15 20:50:50 2014 +0000 Fixed sql_pgsql_table_exists() when used with a database containing multiple schemas. web/pgsql.inc | 60 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 15 deletions(-) commit 72b7ec087 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 9 15:24:03 2014 +0000 Minor improvement on previous change. Qualified table names are now formed for all databases other than MySQL, rather than just for PostgreSQL. As most databases other than MySQL seem to support schemas this will mean that should support for other databases be added in the future the code is more likely to work. web/dbsys.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 7cf3ed7f6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 9 12:44:22 2014 +0000 Added the ability to specify a schema as a database config variable and thus the ability for MRBS to work with databases containing multiple schemas (only applicable to PostgreSQL). See SF Support Requests #431. web/config.inc.php | 4 ++++ web/dbsys.inc | 23 ++++++++++++++--------- web/pgsql.inc | 29 +++++++++++++++++++++++------ web/systemdefaults.inc.php | 4 ++++ 4 files changed, 45 insertions(+), 15 deletions(-) commit 61e8852ad Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 13 13:52:20 2013 +0000 Fixed a bug whereby the room id wasn't being passed through to approve_entry_handler.php. The bug doesn't manifest itself in standard MRBS but does if you're extending auth_book_admin() to make use of the room parameter. web/approve_entry_handler.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit 0949738dc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 10 10:40:26 2013 +0000 Fixed problem causing a warning about the timezone not having been set. The problem only manifests itself if the timezone hasn't been set by php.ini using date.timezone. Most php.ini files do this, but some don't. web/internalconfig.inc.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) commit 224a2a11d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 28 09:47:53 2013 +0000 Replicated changes from Rev 2793 and 2794 to the systemdefaults file and also extended to 'db_ext' settings web/systemdefaults.inc.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) commit 557b56754 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 28 09:20:49 2013 +0000 Improved comments in the config file. See SF Support Requests #423 web/config.inc.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit 9c9ef4714 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Nov 27 19:44:38 2013 +0000 Clarified $db_host setting when used with mysql/mysqli. web/config.inc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 019559154 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Nov 27 19:34:51 2013 +0000 Added an example of setting $db_port into config.inc.php. web/config.inc.php | 3 +++ 1 file changed, 3 insertions(+) commit 49131ed65 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 27 09:46:24 2013 +0000 Corrected error in comment web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5f418de09 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 27 09:35:28 2013 +0000 Implemented an earliest booking date using absolute dates, controlled by the new config variables $min_booking_date_enabled and $min_booking_date web/lang/lang.en | 1 + web/mrbs_sql.inc | 19 ++++++++++++++++++- web/systemdefaults.inc.php | 9 +++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) commit 3a66d3d5b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 26 09:25:57 2013 +0000 Removed redundant code web/month.php | 2 -- 1 file changed, 2 deletions(-) commit d0e88fee8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 26 09:24:04 2013 +0000 Improved error reporting in the week view when there are no rooms web/functions_table.inc | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) commit 53b5cd7ff Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Nov 25 20:36:10 2013 +0000 Added passing of $db_port to sql_connect() call in convert_db_to_utf8. See [support-requests:#365]. convert_db_to_utf8.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 4a3f5e849 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Nov 25 20:32:58 2013 +0000 Make sql_connect() take an optional port parameter. web/dbsys.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit e09bda30c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 25 18:30:43 2013 +0000 Fixed bug where $db_port was being ignored in the upgrade process. See SF Support Requests #365 web/dbsys.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b46a2fa24 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 21 11:23:33 2013 +0000 Fixed problem with alignment of room and area selects in the week and month views. Thanks to William Haller. web/css/mrbs.css.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) commit a5a520a65 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 21 10:48:22 2013 +0000 Removed closing PHP tags (?>) at the ends of files as they are unnecessary and can cause problems with unexpected output (eg see SF Bugs #288) convert_db_to_utf8.php | 1 - testdata.php | 1 - web/Blowfish.php | 1 - web/Blowfish/DefaultKey.php | 1 - web/File/Passwd.php | 2 +- web/File/Passwd/Authbasic.php | 1 - web/File/Passwd/Authdigest.php | 1 - web/File/Passwd/Common.php | 1 - web/File/Passwd/Custom.php | 1 - web/File/Passwd/Cvs.php | 1 - web/File/Passwd/Smb.php | 2 +- web/File/Passwd/Unix.php | 1 - web/PEAR.php | 2 +- web/Themes/classic126/styling.inc | 1 - web/Themes/default/header.inc | 2 +- web/Themes/default/styling.inc | 1 - web/add.php | 1 + web/admin.php | 2 +- web/approve_entry_handler.php | 1 - web/auth/auth_auth_basic.inc | 1 - web/auth/auth_config.inc | 1 - web/auth/auth_crypt.inc | 1 - web/auth/auth_db.inc | 1 - web/auth/auth_db_ext.inc | 1 - web/auth/auth_ext.inc | 1 - web/auth/auth_imap.inc | 1 - web/auth/auth_imap_php.inc | 1 - web/auth/auth_ldap.inc | 1 - web/auth/auth_nis.inc | 1 - web/auth/auth_none.inc | 1 - web/auth/auth_nw.inc | 1 - web/auth/auth_pop3.inc | 1 - web/auth/auth_smtp.inc | 1 - web/check_slot_ajax.php | 2 +- web/config.inc.php | 1 - web/day.php | 1 - web/defaultincludes.inc | 1 - web/del.php | 1 - web/del_entry.php | 2 +- web/del_entry_ajax.php | 2 +- web/edit_area_room.php | 2 +- web/edit_entry.php | 4 +++- web/edit_entry_handler.php | 2 +- web/edit_users.php | 1 - web/escapeshellarg.inc | 1 - web/functions.inc | 2 +- web/functions_ical.inc | 2 -- web/functions_mail.inc | 2 +- web/functions_view.inc | 1 - web/grab_globals.inc.php | 2 +- web/help.php | 2 +- web/import.php | 2 +- web/index.php | 1 - web/internalconfig.inc.php | 1 - web/js/refresh.js.php | 1 - web/lang/lang.ca | 1 - web/lang/lang.cs | 2 +- web/lang/lang.da | 1 - web/lang/lang.de | 2 +- web/lang/lang.el | 1 - web/lang/lang.en | 2 +- web/lang/lang.es | 2 +- web/lang/lang.eu | 1 - web/lang/lang.fi | 2 +- web/lang/lang.fr | 2 +- web/lang/lang.he | 1 - web/lang/lang.hu | 2 +- web/lang/lang.it | 1 - web/lang/lang.ja | 2 +- web/lang/lang.ko | 1 - web/lang/lang.nl | 1 - web/lang/lang.no | 1 - web/lang/lang.pt | 1 - web/lang/lang.pt-br | 1 - web/lang/lang.ru | 1 - web/lang/lang.sl | 2 -- web/lang/lang.sr-rs-latin | 4 ++-- web/lang/lang.sv | 2 +- web/lang/lang.th | 3 ++- web/lang/lang.tr | 1 - web/lang/lang.zh-cn | 1 - web/lang/lang.zh-tw | 1 - web/language.inc | 1 - web/mincals.inc | 2 +- web/month.php | 2 +- web/mrbs_auth.inc | 2 +- web/mrbs_sql.inc | 1 - web/mysql.inc | 1 - web/mysqli.inc | 1 - web/pending.php | 2 +- web/pgsql.inc | 1 - web/record_activity_ajax.php | 2 -- web/report.php | 2 +- web/search.php | 2 +- web/session/session_cookie.inc | 1 - web/session/session_host.inc | 1 - web/session/session_http.inc | 2 +- web/session/session_ip.inc | 1 - web/session/session_nt.inc | 1 - web/session/session_omni.inc | 1 - web/session/session_php.inc | 2 +- web/session/session_remote_user.inc | 1 - web/standard_vars.inc.php | 2 -- web/style.inc | 2 +- web/systemdefaults.inc.php | 1 - web/theme.inc | 1 - web/trailer.inc | 1 - web/upgrade.inc | 1 - web/upgrade/13/post.inc | 1 - web/upgrade/15/post.inc | 1 - web/upgrade/16/post.inc | 1 - web/upgrade/17/post.inc | 1 - web/upgrade/2/post.inc | 1 - web/upgrade/21/post.inc | 1 - web/upgrade/24/post.inc | 1 - web/upgrade/32/post.inc | 2 +- web/upgrade/34/post.inc | 1 - web/upgrade/4/post.inc | 1 - web/upgrade/5/post.inc | 1 - web/upgrade/6/post.inc | 1 - web/upgrade/7/post.inc | 1 - web/upgrade/8/post.inc | 1 - web/version.inc | 1 - web/view_entry.php | 2 +- web/week.php | 2 +- 125 files changed, 44 insertions(+), 129 deletions(-) commit 6964a4fee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 20 12:06:41 2013 +0000 Prevented output of headers when running reports in CLI mode. Thanks to William Haller. web/report.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit adde3bddf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 14 11:23:13 2013 +0000 Added Czech help file. Thanks to tachec. See https://sourceforge.net/p/mrbs/patches/43/. web/site_faq/site_faq_cs.html (new) | 199 ++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) commit d84761f75 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 13 10:13:13 2013 +0000 Updated Czech translation. See https://sourceforge.net/p/mrbs/patches/42/ web/lang/lang.cs | 216 +++++++++++++++++++++++++++++++++------------ 1 file changed, 161 insertions(+), 55 deletions(-) commit db55e7701 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 7 15:20:33 2013 +0000 Allowed use of non-standard port numbers when using 'db_ext' authentication web/auth/auth_db_ext.inc | 7 ++++++- web/systemdefaults.inc.php | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) commit f7dec297c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 7 15:09:36 2013 +0000 Removed debugging info when using $db_port with mysqli web/mysqli.inc | 1 - 1 file changed, 1 deletion(-) commit d215909d2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 7 15:02:14 2013 +0000 Fixed bug when using $db_port with mysql web/mysql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c06698e33 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 7 14:46:59 2013 +0000 Tidied up quoting of identifiers web/dbsys.inc | 5 +++-- web/mysql.inc | 7 ++++--- web/mysqli.inc | 7 ++++--- web/pgsql.inc | 7 ++++--- 4 files changed, 15 insertions(+), 11 deletions(-) commit c49bf02d8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 7 14:32:56 2013 +0000 Added quoting of table and column names when using 'db_ext' authentication web/auth/auth_db_ext.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit c73d3544a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 7 14:25:44 2013 +0000 Improved error reporting when using 'db_ext' authentication web/auth/auth_db_ext.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit 19e174820 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 7 13:52:41 2013 +0000 Changed default database system for 'db_ext' authentication from mysql to mysqli (mysql is deprecated from PHP 5.5) web/auth/auth_db_ext.inc | 2 +- web/systemdefaults.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit f5d9e1081 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 18 15:59:48 2013 +0000 Fixed checking of password length when using multibyte characters web/edit_users.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit 466fdb800 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 18 15:53:34 2013 +0000 Fixed truncation of room and area names when using multi-byte characters web/mrbs_sql.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit dbea881a9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 18 15:49:11 2013 +0000 Fixed truncation of multi-byte characters on the admin page web/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1531de824 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 18 15:38:50 2013 +0000 Fixed truncation of maxlength fields on the Add user form to cater for multi-byte characters web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0de521b29 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 18 15:35:13 2013 +0000 Added the ability to set a maxlength on textareas, including the Description field on the edit_entry form. web/edit_entry.php | 8 +++----- web/functions.inc | 4 +++- 2 files changed, 6 insertions(+), 6 deletions(-) commit aba98549e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 18 15:20:13 2013 +0000 Added comment web/edit_entry_handler.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 28dedba13 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 18 15:09:43 2013 +0000 Added the ability to set a maxlength attribute for custom fields on the edit_entry page (see SF Feature Requests #230). At the same time fixed handling of maxlength fields on the edit_entry page for multi-byte characters. web/edit_entry.php | 20 +++++++++++++------- web/edit_entry_handler.php | 28 ++++++++++++++++++++++++++-- web/systemdefaults.inc.php | 3 ++- 3 files changed, 41 insertions(+), 10 deletions(-) commit 22d5a2098 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 16 21:02:42 2013 +0000 Added some comments about the use of associative arrays for $select_options (see SF Bugs 282) web/systemdefaults.inc.php | 11 +++++++++++ 1 file changed, 11 insertions(+) commit db13c48e8 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Oct 2 20:15:27 2013 +0000 Added ability to specify the config variable $db_port, see [support-requests:#365]. web/mysql.inc | 23 ++++++++++++++++++----- web/mysqli.inc | 21 +++++++++++++++++---- web/pgsql.inc | 19 +++++++++++++++---- web/systemdefaults.inc.php | 3 +++ 4 files changed, 53 insertions(+), 13 deletions(-) commit c38af0bb0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 30 09:57:14 2013 +0000 Fixed bug when exporting an individual entry of a series. Thanks to Quique. See SF Patches #41 web/functions_ical.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit e72dd9577 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 21 13:37:24 2013 +0000 Fixed bug when exporting monthly repeats in ical format (see SF bugs #281) web/report.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 773f874cd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 13 13:21:45 2013 +0000 Removed redundant code web/view_entry.php | 3 --- 1 file changed, 3 deletions(-) commit 9c7e9bb91 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 13 13:12:37 2013 +0000 Fixed bug causing the approval buttons not to be displayed on the view_entry page in some circumstances (see SF Support Requests #356) web/view_entry.php | 3 +++ 1 file changed, 3 insertions(+) commit 26236569c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 12 14:22:59 2013 +0000 Added to French translation (see SF Patches #40) web/lang/lang.fr | 2 ++ 1 file changed, 2 insertions(+) commit 9ffaccdb6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 11 19:57:26 2013 +0000 Fixed bug whereby custom HTML for a room was not being saved (see SF Support requests #384) web/edit_area_room.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4cf860bd4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 6 08:17:40 2013 +0000 Fixed last change to allow remote URLs (see SF Support Requests #381) web/style.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c3ddc84e1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 5 13:41:57 2013 +0000 Replaced tab with spaces web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d0afe502d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 5 13:09:02 2013 +0000 Added ability to use custom CSS files. See SF Support requests #381. web/style.inc | 11 +++++++++-- web/systemdefaults.inc.php | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) commit 0611eefe6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 22 15:11:44 2013 +0000 Corrected confusing Dutch translation for "Repeat every". See SF Bugs 279 web/lang/lang.nl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ff08e643b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 21 08:54:59 2013 +0000 Fixed problem with use of indexOf() mdethod on arrays, which is not supported by IE8 and below. See SF Bugs #280. web/js/edit_entry.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6402b1ec0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 7 08:07:03 2013 +0000 Removed another undefined index problem web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cf2d62428 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 7 08:00:00 2013 +0000 Removed an undefined index problem web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cdaae3746 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 6 17:52:13 2013 +0000 Added support for Estonian in Windows web/language.inc | 3 +++ 1 file changed, 3 insertions(+) commit 051da3a0e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 6 17:31:55 2013 +0000 Added an Estonian locale mapping for Unix. See SF Bugs #277 web/language.inc | 1 + 1 file changed, 1 insertion(+) commit 496f4d4d9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 22 12:21:59 2013 +0000 Fixed problem with Strict error messages being generated when mail messages are sent using PHP versions < 5.4. See SF Support Requests #367 web/internalconfig.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 191aab2e7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 21 18:55:04 2013 +0000 Replaced use of deprecated jQuery .load() method web/js.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e4ce9e06f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 21 18:47:58 2013 +0000 Replaced use of deprecated jQuery .andSelf() method web/js/resizable.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ef9a4221b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 21 18:28:23 2013 +0000 Replaced use of deprecated jQuery .live() method web/js/pending.js.php | 90 +++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 44 deletions(-) commit 2688c644b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 21 10:58:25 2013 +0000 Implemented an inactivity time out that will log users out after a period of inactivity, set by the config variable $auth["session_php"]["inactivity_expire_time"]. Only implemented for the 'php' session scheme web/day.php | 13 ++-- web/edit_entry_handler.php | 8 ++- web/js/edit_entry.js.php | 89 ++++++++++++++-------------- web/js/general.js.php | 30 ++++++++++ web/js/refresh.js.php | 2 +- web/mrbs_auth.inc | 11 +++- web/record_activity_ajax.php (new) | 9 +++ web/session/session_php.inc | 23 ++++++- web/systemdefaults.inc.php | 11 +++- web/week.php | 11 ++-- 10 files changed, 148 insertions(+), 59 deletions(-) commit ab6aa0868 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 16 09:27:49 2013 +0000 Fixed undefined variable problem web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a9b5b542c Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jul 8 20:29:57 2013 +0000 Updated version number post-release. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9c397c515 (tag: mrbs-1_4_10) Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jul 8 20:26:43 2013 +0000 Updated version number for release. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4b86a4a24 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jul 8 20:13:47 2013 +0000 Updated NEWS and ChangeLog for release ChangeLog | 1945 ++++++++++++++++++++++++++++++++++++++++++++++++++- NEWS | 140 ++++ 2 files changed, 2069 insertions(+), 16 deletions(-) commit bb804cd06 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 10 16:47:16 2013 +0000 Fixed bug when using an SQL reserved word as a custom field name web/dbsys.inc | 10 ++++++++++ web/edit_area_room.php | 5 ++--- web/edit_users.php | 12 +++++------- web/mrbs_sql.inc | 5 ++--- web/mysql.inc | 6 ++++++ web/mysqli.inc | 6 ++++++ web/pgsql.inc | 6 ++++++ 7 files changed, 37 insertions(+), 13 deletions(-) commit 39a58b847 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 23 09:07:37 2013 +0000 Disabled E_STRICT errors (see SF Bugs #272) web/internalconfig.inc.php | 9 +++++++++ 1 file changed, 9 insertions(+) commit 9f7fd05eb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon May 20 13:27:44 2013 +0000 Fixed bug causing error messages when there are no mail recipients. Thanks to Tuomas. See SF Patches #37 web/functions_mail.inc | 6 ++++++ 1 file changed, 6 insertions(+) commit 0df6fec98 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon May 20 12:41:00 2013 +0000 Updated Finnish translation. Thanks to Tuomas. See SF Patches #38 web/lang/lang.fi | 295 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 250 insertions(+), 45 deletions(-) commit 3000dbac7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 14 09:38:35 2013 +0000 Fixed bug when approving bookings and using PostgreSQL (removed LIMIT clauses from UPDATE statements as they are not supported by PostgreSQL) web/mrbs_sql.inc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) commit c07d49da4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 12 16:36:31 2013 +0000 Made Export Series work with monthly repeats (it got broken when the new monthly repeat types were introduced) web/functions_ical.inc | 2 +- web/mrbs_sql.inc | 6 +++++- web/view_entry.php | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) commit dc6c9981c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 11 14:15:32 2013 +0000 Fixed typo in comment web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9a35d52e7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 10 18:04:14 2013 +0000 Fixed bug causing the "Goto" datepicker to be reset if it was open at the time the booking table was refreshed. web/js/refresh.js.php | 52 +- web/js/resizable.js.php | 1318 +++++++++++++++++++------------------ 2 files changed, 693 insertions(+), 677 deletions(-) commit fb0f57c8a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 7 16:35:52 2013 +0000 Added a Swedish site_faq. Thanks to Anders Henhammar. web/site_faq/site_faq_sv.html (new) | 90 +++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) commit 5bcbe63b2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 7 16:29:04 2013 +0000 Moved the site_faq files into their own directory web/help.php | 2 +- web/{ => site_faq}/site_faq.html | 0 web/{ => site_faq}/site_faq_de.html | 0 web/{ => site_faq}/site_faq_es.html | 0 web/{ => site_faq}/site_faq_fr.html | 0 web/{ => site_faq}/site_faq_it.html | 0 web/{ => site_faq}/site_faq_nl.html | 0 7 files changed, 1 insertion(+), 1 deletion(-) commit 03349b0c9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 7 16:13:27 2013 +0000 Updated Swedish translation. Thanks to Anders Henhammar. web/lang/lang.sv | 337 ++++++++++++++++++++++++++++++++------------- 1 file changed, 245 insertions(+), 92 deletions(-) commit 0e9b75a03 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 20 14:55:58 2013 +0000 Fixed incorrect quoting of id column, resulting in error messages when running under PostgreSQL. See SF bugs #266 web/view_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 65d193f4d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 15 19:04:09 2013 +0000 Fixed bug resulting in no end time options being offered if there is only one enabled area. web/js/edit_entry.js.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) commit 15fbfa1cb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 15 17:01:16 2013 +0000 Introduced constants for SECONDS_PER_DAY etc. web/edit_area_room.php | 7 +++---- web/edit_entry.php | 12 ++++++------ web/edit_entry_handler.php | 10 ++++++---- web/functions.inc | 30 ++++++++++++++---------------- web/functions_table.inc | 5 ++--- web/internalconfig.inc.php | 7 +++++++ web/js/edit_area_room.js.php | 2 +- web/js/edit_entry.js.php | 18 ++++++++++-------- web/mincals.inc | 4 ++-- web/mrbs_sql.inc | 5 ++--- web/report.php | 6 +++--- 11 files changed, 56 insertions(+), 50 deletions(-) commit 657f4eb13 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 15 14:41:24 2013 +0000 Fixed various issues with booking days spanning midnight, including a problem with checking the All Day checkbox (see SF Bugs #236 part (3)) web/edit_entry.php | 23 ++++++++++++++++------- web/edit_entry_handler.php | 3 ++- web/functions.inc | 17 +++++++++++------ web/functions_table.inc | 13 +++++++------ 4 files changed, 36 insertions(+), 20 deletions(-) commit ea3e289da Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 15 13:02:30 2013 +0000 Fixed some label problems on the report page. See SF Bugs #265 web/report.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 61a96a89c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 15 09:04:07 2013 +0000 Fixed bug causing slots to be described as "n days, 24 hours" instead of "n+1 days". See SF bugs #236 part (1). web/js/edit_entry.js.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) commit 579a971ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 15 08:31:05 2013 +0000 Fixed bug causing slots to be reported as 'n days, 0 minutes' instead of 'n days' web/js/edit_entry.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e33bb2192 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 14 11:28:37 2013 +0000 Fixed typo in comment web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 21876aa03 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 14 11:23:09 2013 +0000 Fixed last change properly web/edit_area_room.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit 78a755dc6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 14 10:51:14 2013 +0000 Fixed bug causing incorrect checking of resolution and number of slots when the booking day stretches past midnight. web/edit_area_room.php | 7 ++++--- web/internalconfig.inc.php | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) commit 40a1ff826 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 11 08:51:49 2013 +0000 Made sure that page refresh isn't restarted while we are in the middle of a drag selection when we pass over the handles for resizable bookings web/js/resizable.js.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) commit 4126aab1b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 11 07:30:40 2013 +0000 Improved performance of drag selection, especially with large tables web/js/resizable.js.php | 42 ++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 20 deletions(-) commit 133357397 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 10 19:06:42 2013 +0000 Restructured code web/js/refresh.js.php | 79 +++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 42 deletions(-) commit 422e28619 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 10 18:44:50 2013 +0000 Prevented page refresh when the mouse is hovering over a resize handler (ie the user is about to start a resize) web/js/refresh.js.php | 15 +++++++++----- web/js/resizable.js.php | 43 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 5 deletions(-) commit 18e61205b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 10 13:30:56 2013 +0000 Fixed a bug causing multiple timers to be fired when the page is hidden and then unhidden web/js/refresh.js.php | 46 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) commit 03a3051ab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 10 12:33:02 2013 +0000 Fixed bug causing interval timer to stop occasionally web/js/refresh.js.php | 13 +++++++------ web/js/resizable.js.php | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) commit 445c1a654 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 10 11:37:04 2013 +0000 Disabled page refreshing while resizing is in progress web/js.inc | 2 +- web/js/refresh.js.php | 138 ++++++++++++++++++++------------------ web/js/resizable.js.php | 19 ++++-- 3 files changed, 89 insertions(+), 70 deletions(-) commit 1b4ae0906 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Feb 9 07:18:29 2013 +0000 Fixed bug causing clicking outside the datepicker to result in date selection, rather than cancelling the datepicker. See SF Bugs #263 web/js/datepicker.js.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 8b8d86a0b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 8 15:04:33 2013 +0000 Fixed bug introduced in Rev 2671 preventing resizing of bookings in the week view. See SF bugs #262 web/js/resizable.js.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) commit da7aa3416 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 5 16:40:50 2013 +0000 Updated Italian translation. Provided by Diego Zuccato web/lang/lang.it | 229 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 192 insertions(+), 37 deletions(-) commit 03e561a50 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 5 16:39:21 2013 +0000 Tweaked formatting web/lang/lang.en | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 1a61a84dc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 5 15:45:25 2013 +0000 Fixed bug whereby the repeat entry row is not deleted if you do a bulk delete from the Report page of all the entries in a series (see SF bugs #260) web/del_entry_ajax.php | 19 ++++++++++++++++++- web/mrbs_sql.inc | 9 ++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) commit 7aa2e5d7a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 3 22:28:27 2013 +0000 Added comments web/js/edit_entry.js.php | 5 +++++ web/js/refresh.js.php | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) commit 7819164ce Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 3 14:11:30 2013 +0000 Fixed bug in last commit web/js/functions.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 70e4efdb2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 3 13:59:57 2013 +0000 Disabled Ajax conflict checking and day/week/month page refresh when the page is not visible (subject to browser support of page visibility) web/js/edit_entry.js.php | 74 ++++++++++++++++----- web/js/functions.js.php | 51 ++++++++++++++- web/js/refresh.js.php | 129 ++++++++++++++++++++++++++++--------- 3 files changed, 206 insertions(+), 48 deletions(-) commit e0bc4de56 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 1 21:05:42 2013 +0000 Added client and server side validation to check that at least one room is selected. (See SF Bugs #259) web/edit_entry.php | 1 + web/edit_entry_handler.php | 46 ++++++++++++++++-------------------- web/lang/lang.en | 1 + 3 files changed, 22 insertions(+), 26 deletions(-) commit 22c7503f0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 1 19:10:24 2013 +0000 Fixed bug where no room was selected on changing area. See SF bugs #259 web/edit_entry.php | 2 ++ web/edit_entry_handler.php | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) commit 7c8a4f24f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Feb 1 18:20:25 2013 +0000 Fixed bug causing time selectors not to work properly after the area has been changed. See SF bugs #258 web/js/edit_entry.js.php | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) commit 2c392214d Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Jan 31 20:23:08 2013 +0000 Fixed warnings/errors from require_once() calls in session_cookie.inc. web/session/session_cookie.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit f1234fb78 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 23 12:20:07 2013 +0000 Fixed typo web/lang/lang.da | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2bb74cefb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 23 12:17:14 2013 +0000 Updated Danish translation. Thanks to Søren O`Neill web/lang/lang.da | 127 +++++++++++++++++++++++---------------------- 1 file changed, 64 insertions(+), 63 deletions(-) commit cb4bb90c9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 12 18:05:45 2013 +0000 Fixed a bug causing Ajax conflict testing not to work after a failed HTML5 form validation event web/js/edit_entry.js.php | 8 ++++++++ 1 file changed, 8 insertions(+) commit 49292ab55 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 8 15:34:06 2013 +0000 Slightly cleaner version of the fix in Rev 2637 web/js/edit_entry.js.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) commit 3045d01fc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 8 15:00:01 2013 +0000 Fixed another typo. Thanks to Dieter Adriaenssens - see SF Patches #35 web/lang/lang.nl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e66778144 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 8 14:55:46 2013 +0000 Fixed bug preventing singular form of the duration units being shown web/js/edit_entry.js.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit e62f9ce99 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 8 14:34:10 2013 +0000 Fixed typo. Thanks to Dieter Adriaenssens - see SF Patches #35 web/lang/lang.nl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 825e4228e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 3 21:41:38 2013 +0000 Changed default $dbsys to 'mysqli' from 'mysql', which is now deprecated in PHP 5.5.0 web/config.inc.php | 2 +- web/systemdefaults.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit af14f53d0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 30 17:27:20 2012 +0000 Fixed some JSHint problems web/js/datatables.js.php | 4 ++-- web/js/edit_entry.js.php | 5 ++--- web/js/pending.js.php | 4 ++-- web/js/report.js.php | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) commit 1c66441e4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 19 16:36:00 2012 +0000 Updated timezone definitions .../zoneinfo-outlook/Africa/Abidjan.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Accra.ics | 2 +- .../zoneinfo-outlook/Africa/Addis_Ababa.ics | 2 +- .../zoneinfo-outlook/Africa/Algiers.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Asmara.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Bamako.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Bangui.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Banjul.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Bissau.ics | 2 +- .../zoneinfo-outlook/Africa/Blantyre.ics | 2 +- .../zoneinfo-outlook/Africa/Brazzaville.ics | 2 +- .../zoneinfo-outlook/Africa/Bujumbura.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Cairo.ics | 2 +- .../zoneinfo-outlook/Africa/Casablanca.ics | 14 +- web/tzurl/zoneinfo-outlook/Africa/Ceuta.ics | 2 +- .../zoneinfo-outlook/Africa/Conakry.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Dakar.ics | 2 +- .../Africa/Dar_es_Salaam.ics | 2 +- .../zoneinfo-outlook/Africa/Djibouti.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Douala.ics | 2 +- .../zoneinfo-outlook/Africa/El_Aaiun.ics | 2 +- .../zoneinfo-outlook/Africa/Freetown.ics | 2 +- .../zoneinfo-outlook/Africa/Gaborone.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Harare.ics | 2 +- .../zoneinfo-outlook/Africa/Johannesburg.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Juba.ics | 2 +- .../zoneinfo-outlook/Africa/Kampala.ics | 2 +- .../zoneinfo-outlook/Africa/Khartoum.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Kigali.ics | 2 +- .../zoneinfo-outlook/Africa/Kinshasa.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Lagos.ics | 2 +- .../zoneinfo-outlook/Africa/Libreville.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Lome.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Luanda.ics | 2 +- .../zoneinfo-outlook/Africa/Lubumbashi.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Lusaka.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Malabo.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Maputo.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Maseru.ics | 2 +- .../zoneinfo-outlook/Africa/Mbabane.ics | 2 +- .../zoneinfo-outlook/Africa/Mogadishu.ics | 2 +- .../zoneinfo-outlook/Africa/Monrovia.ics | 2 +- .../zoneinfo-outlook/Africa/Nairobi.ics | 2 +- .../zoneinfo-outlook/Africa/Ndjamena.ics | 2 +- web/tzurl/zoneinfo-outlook/Africa/Niamey.ics | 2 +- .../zoneinfo-outlook/Africa/Nouakchott.ics | 2 +- .../zoneinfo-outlook/Africa/Ouagadougou.ics | 2 +- .../zoneinfo-outlook/Africa/Porto-Novo.ics | 2 +- .../zoneinfo-outlook/Africa/Sao_Tome.ics | 2 +- .../zoneinfo-outlook/Africa/Tripoli.ics | 16 +- web/tzurl/zoneinfo-outlook/Africa/Tunis.ics | 2 +- .../zoneinfo-outlook/Africa/Windhoek.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Adak.ics | 2 +- .../zoneinfo-outlook/America/Anchorage.ics | 2 +- .../zoneinfo-outlook/America/Anguilla.ics | 2 +- .../zoneinfo-outlook/America/Antigua.ics | 2 +- .../zoneinfo-outlook/America/Araguaina.ics | 12 +- .../America/Argentina/Buenos_Aires.ics | 2 +- .../America/Argentina/Catamarca.ics | 2 +- .../America/Argentina/Cordoba.ics | 2 +- .../America/Argentina/Jujuy.ics | 2 +- .../America/Argentina/La_Rioja.ics | 2 +- .../America/Argentina/Mendoza.ics | 2 +- .../America/Argentina/Rio_Gallegos.ics | 2 +- .../America/Argentina/Salta.ics | 2 +- .../America/Argentina/San_Juan.ics | 2 +- .../America/Argentina/San_Luis.ics | 2 +- .../America/Argentina/Tucuman.ics | 2 +- .../America/Argentina/Ushuaia.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Aruba.ics | 2 +- .../zoneinfo-outlook/America/Asuncion.ics | 2 +- .../zoneinfo-outlook/America/Atikokan.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Bahia.ics | 2 +- .../America/Bahia_Banderas.ics | 2 +- .../zoneinfo-outlook/America/Barbados.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Belem.ics | 2 +- .../zoneinfo-outlook/America/Belize.ics | 2 +- .../America/Blanc-Sablon.ics | 2 +- .../zoneinfo-outlook/America/Boa_Vista.ics | 2 +- .../zoneinfo-outlook/America/Bogota.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Boise.ics | 2 +- .../America/Cambridge_Bay.ics | 2 +- .../America/Campo_Grande.ics | 2 +- .../zoneinfo-outlook/America/Cancun.ics | 2 +- .../zoneinfo-outlook/America/Caracas.ics | 2 +- .../zoneinfo-outlook/America/Cayenne.ics | 2 +- .../zoneinfo-outlook/America/Cayman.ics | 2 +- .../zoneinfo-outlook/America/Chicago.ics | 2 +- .../zoneinfo-outlook/America/Chihuahua.ics | 2 +- .../zoneinfo-outlook/America/Costa_Rica.ics | 2 +- .../America/Creston.ics (new) | 15 ++ .../zoneinfo-outlook/America/Cuiaba.ics | 2 +- .../zoneinfo-outlook/America/Curacao.ics | 2 +- .../America/Danmarkshavn.ics | 2 +- .../zoneinfo-outlook/America/Dawson.ics | 2 +- .../America/Dawson_Creek.ics | 2 +- .../zoneinfo-outlook/America/Denver.ics | 2 +- .../zoneinfo-outlook/America/Detroit.ics | 2 +- .../zoneinfo-outlook/America/Dominica.ics | 2 +- .../zoneinfo-outlook/America/Edmonton.ics | 2 +- .../zoneinfo-outlook/America/Eirunepe.ics | 2 +- .../zoneinfo-outlook/America/El_Salvador.ics | 2 +- .../zoneinfo-outlook/America/Fortaleza.ics | 2 +- .../zoneinfo-outlook/America/Glace_Bay.ics | 2 +- .../zoneinfo-outlook/America/Godthab.ics | 2 +- .../zoneinfo-outlook/America/Goose_Bay.ics | 18 +- .../zoneinfo-outlook/America/Grand_Turk.ics | 2 +- .../zoneinfo-outlook/America/Grenada.ics | 2 +- .../zoneinfo-outlook/America/Guadeloupe.ics | 2 +- .../zoneinfo-outlook/America/Guatemala.ics | 2 +- .../zoneinfo-outlook/America/Guayaquil.ics | 2 +- .../zoneinfo-outlook/America/Guyana.ics | 2 +- .../zoneinfo-outlook/America/Halifax.ics | 2 +- .../zoneinfo-outlook/America/Havana.ics | 6 +- .../zoneinfo-outlook/America/Hermosillo.ics | 2 +- .../America/Indiana/Indianapolis.ics | 2 +- .../America/Indiana/Knox.ics | 2 +- .../America/Indiana/Marengo.ics | 2 +- .../America/Indiana/Petersburg.ics | 2 +- .../America/Indiana/Tell_City.ics | 2 +- .../America/Indiana/Vevay.ics | 2 +- .../America/Indiana/Vincennes.ics | 2 +- .../America/Indiana/Winamac.ics | 2 +- .../zoneinfo-outlook/America/Inuvik.ics | 2 +- .../zoneinfo-outlook/America/Iqaluit.ics | 2 +- .../zoneinfo-outlook/America/Jamaica.ics | 2 +- .../zoneinfo-outlook/America/Juneau.ics | 2 +- .../America/Kentucky/Louisville.ics | 2 +- .../America/Kentucky/Monticello.ics | 2 +- .../zoneinfo-outlook/America/Kralendijk.ics | 2 +- .../zoneinfo-outlook/America/La_Paz.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Lima.ics | 2 +- .../zoneinfo-outlook/America/Los_Angeles.ics | 2 +- .../America/Lower_Princes.ics | 2 +- .../zoneinfo-outlook/America/Maceio.ics | 2 +- .../zoneinfo-outlook/America/Managua.ics | 2 +- .../zoneinfo-outlook/America/Manaus.ics | 2 +- .../zoneinfo-outlook/America/Marigot.ics | 2 +- .../zoneinfo-outlook/America/Martinique.ics | 2 +- .../zoneinfo-outlook/America/Matamoros.ics | 2 +- .../zoneinfo-outlook/America/Mazatlan.ics | 2 +- .../zoneinfo-outlook/America/Menominee.ics | 2 +- .../zoneinfo-outlook/America/Merida.ics | 2 +- .../zoneinfo-outlook/America/Metlakatla.ics | 2 +- .../zoneinfo-outlook/America/Mexico_City.ics | 2 +- .../zoneinfo-outlook/America/Miquelon.ics | 2 +- .../zoneinfo-outlook/America/Moncton.ics | 2 +- .../zoneinfo-outlook/America/Monterrey.ics | 2 +- .../zoneinfo-outlook/America/Montevideo.ics | 2 +- .../zoneinfo-outlook/America/Montreal.ics | 2 +- .../zoneinfo-outlook/America/Montserrat.ics | 2 +- .../zoneinfo-outlook/America/Nassau.ics | 2 +- .../zoneinfo-outlook/America/New_York.ics | 2 +- .../zoneinfo-outlook/America/Nipigon.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Nome.ics | 2 +- .../zoneinfo-outlook/America/Noronha.ics | 2 +- .../America/North_Dakota/Beulah.ics | 2 +- .../America/North_Dakota/Center.ics | 2 +- .../America/North_Dakota/New_Salem.ics | 2 +- .../zoneinfo-outlook/America/Ojinaga.ics | 2 +- .../zoneinfo-outlook/America/Panama.ics | 2 +- .../zoneinfo-outlook/America/Pangnirtung.ics | 2 +- .../zoneinfo-outlook/America/Paramaribo.ics | 2 +- .../zoneinfo-outlook/America/Phoenix.ics | 2 +- .../America/Port-au-Prince.ics | 2 +- .../America/Port_of_Spain.ics | 2 +- .../zoneinfo-outlook/America/Porto_Velho.ics | 2 +- .../zoneinfo-outlook/America/Puerto_Rico.ics | 2 +- .../zoneinfo-outlook/America/Rainy_River.ics | 2 +- .../America/Rankin_Inlet.ics | 2 +- .../zoneinfo-outlook/America/Recife.ics | 2 +- .../zoneinfo-outlook/America/Regina.ics | 2 +- .../zoneinfo-outlook/America/Resolute.ics | 12 +- .../zoneinfo-outlook/America/Rio_Branco.ics | 2 +- .../America/Santa_Isabel.ics | 2 +- .../zoneinfo-outlook/America/Santarem.ics | 2 +- .../zoneinfo-outlook/America/Santiago.ics | 2 +- .../America/Santo_Domingo.ics | 2 +- .../zoneinfo-outlook/America/Sao_Paulo.ics | 2 +- .../America/Scoresbysund.ics | 2 +- .../America/Shiprock.ics (new) | 23 +++ web/tzurl/zoneinfo-outlook/America/Sitka.ics | 2 +- .../America/St_Barthelemy.ics | 2 +- .../zoneinfo-outlook/America/St_Johns.ics | 18 +- .../zoneinfo-outlook/America/St_Kitts.ics | 2 +- .../zoneinfo-outlook/America/St_Lucia.ics | 2 +- .../zoneinfo-outlook/America/St_Thomas.ics | 2 +- .../zoneinfo-outlook/America/St_Vincent.ics | 2 +- .../America/Swift_Current.ics | 2 +- .../zoneinfo-outlook/America/Tegucigalpa.ics | 2 +- web/tzurl/zoneinfo-outlook/America/Thule.ics | 2 +- .../zoneinfo-outlook/America/Thunder_Bay.ics | 2 +- .../zoneinfo-outlook/America/Tijuana.ics | 2 +- .../zoneinfo-outlook/America/Toronto.ics | 2 +- .../zoneinfo-outlook/America/Tortola.ics | 2 +- .../zoneinfo-outlook/America/Vancouver.ics | 2 +- .../zoneinfo-outlook/America/Whitehorse.ics | 2 +- .../zoneinfo-outlook/America/Winnipeg.ics | 2 +- .../zoneinfo-outlook/America/Yakutat.ics | 2 +- .../zoneinfo-outlook/America/Yellowknife.ics | 2 +- .../zoneinfo-outlook/Antarctica/Casey.ics | 2 +- .../zoneinfo-outlook/Antarctica/Davis.ics | 2 +- .../Antarctica/DumontDUrville.ics | 2 +- .../Antarctica/Macquarie.ics | 2 +- .../zoneinfo-outlook/Antarctica/Mawson.ics | 2 +- .../zoneinfo-outlook/Antarctica/McMurdo.ics | 2 +- .../zoneinfo-outlook/Antarctica/Palmer.ics | 16 +- .../zoneinfo-outlook/Antarctica/Rothera.ics | 2 +- .../Antarctica/South_Pole.ics | 2 +- .../zoneinfo-outlook/Antarctica/Syowa.ics | 2 +- .../zoneinfo-outlook/Antarctica/Vostok.ics | 2 +- .../zoneinfo-outlook/Arctic/Longyearbyen.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Aden.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Almaty.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Amman.ics | 16 +- web/tzurl/zoneinfo-outlook/Asia/Anadyr.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Aqtau.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Aqtobe.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Ashgabat.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Baghdad.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Bahrain.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Baku.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Bangkok.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Beirut.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Bishkek.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Brunei.ics | 2 +- .../zoneinfo-outlook/Asia/Choibalsan.ics | 2 +- .../zoneinfo-outlook/Asia/Chongqing.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Colombo.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Damascus.ics | 6 +- web/tzurl/zoneinfo-outlook/Asia/Dhaka.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Dili.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Dubai.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Dushanbe.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Gaza.ics | 14 +- web/tzurl/zoneinfo-outlook/Asia/Harbin.ics | 2 +- .../zoneinfo-outlook/Asia/Hebron.ics (new) | 15 ++ .../zoneinfo-outlook/Asia/Ho_Chi_Minh.ics | 2 +- .../zoneinfo-outlook/Asia/Hong_Kong.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Hovd.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Irkutsk.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Istanbul.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Jakarta.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Jayapura.ics | 2 +- .../zoneinfo-outlook/Asia/Jerusalem.ics | 12 +- web/tzurl/zoneinfo-outlook/Asia/Kabul.ics | 2 +- .../zoneinfo-outlook/Asia/Kamchatka.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Karachi.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Kashgar.ics | 2 +- .../zoneinfo-outlook/Asia/Kathmandu.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Kolkata.ics | 2 +- .../zoneinfo-outlook/Asia/Krasnoyarsk.ics | 2 +- .../zoneinfo-outlook/Asia/Kuala_Lumpur.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Kuching.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Kuwait.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Macau.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Magadan.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Makassar.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Manila.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Muscat.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Nicosia.ics | 2 +- .../zoneinfo-outlook/Asia/Novokuznetsk.ics | 2 +- .../zoneinfo-outlook/Asia/Novosibirsk.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Omsk.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Oral.ics | 2 +- .../zoneinfo-outlook/Asia/Phnom_Penh.ics | 2 +- .../zoneinfo-outlook/Asia/Pontianak.ics | 2 +- .../zoneinfo-outlook/Asia/Pyongyang.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Qatar.ics | 2 +- .../zoneinfo-outlook/Asia/Qyzylorda.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Rangoon.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Riyadh.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Sakhalin.ics | 2 +- .../zoneinfo-outlook/Asia/Samarkand.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Seoul.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Shanghai.ics | 2 +- .../zoneinfo-outlook/Asia/Singapore.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Taipei.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Tashkent.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Tbilisi.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Tehran.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Thimphu.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Tokyo.ics | 2 +- .../zoneinfo-outlook/Asia/Ulaanbaatar.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Urumqi.ics | 2 +- .../zoneinfo-outlook/Asia/Vientiane.ics | 2 +- .../zoneinfo-outlook/Asia/Vladivostok.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Yakutsk.ics | 2 +- .../zoneinfo-outlook/Asia/Yekaterinburg.ics | 2 +- web/tzurl/zoneinfo-outlook/Asia/Yerevan.ics | 14 +- .../zoneinfo-outlook/Atlantic/Azores.ics | 2 +- .../zoneinfo-outlook/Atlantic/Bermuda.ics | 2 +- .../zoneinfo-outlook/Atlantic/Canary.ics | 2 +- .../zoneinfo-outlook/Atlantic/Cape_Verde.ics | 2 +- .../zoneinfo-outlook/Atlantic/Faroe.ics | 2 +- .../zoneinfo-outlook/Atlantic/Madeira.ics | 2 +- .../zoneinfo-outlook/Atlantic/Reykjavik.ics | 2 +- .../Atlantic/South_Georgia.ics | 2 +- .../zoneinfo-outlook/Atlantic/St_Helena.ics | 2 +- .../zoneinfo-outlook/Atlantic/Stanley.ics | 16 +- .../zoneinfo-outlook/Australia/Adelaide.ics | 2 +- .../zoneinfo-outlook/Australia/Brisbane.ics | 2 +- .../Australia/Broken_Hill.ics (new) | 23 +++ .../zoneinfo-outlook/Australia/Currie.ics | 2 +- .../zoneinfo-outlook/Australia/Darwin.ics | 2 +- .../zoneinfo-outlook/Australia/Eucla.ics | 2 +- .../zoneinfo-outlook/Australia/Hobart.ics | 2 +- .../zoneinfo-outlook/Australia/Lindeman.ics | 2 +- .../zoneinfo-outlook/Australia/Lord_Howe.ics | 2 +- .../zoneinfo-outlook/Australia/Melbourne.ics | 2 +- .../zoneinfo-outlook/Australia/Perth.ics | 2 +- .../zoneinfo-outlook/Australia/Sydney.ics | 2 +- .../zoneinfo-outlook/Europe/Amsterdam.ics | 2 +- .../zoneinfo-outlook/Europe/Andorra.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Athens.ics | 2 +- .../zoneinfo-outlook/Europe/Belgrade.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Berlin.ics | 2 +- .../zoneinfo-outlook/Europe/Bratislava.ics | 2 +- .../zoneinfo-outlook/Europe/Brussels.ics | 2 +- .../zoneinfo-outlook/Europe/Bucharest.ics | 2 +- .../zoneinfo-outlook/Europe/Budapest.ics | 2 +- .../zoneinfo-outlook/Europe/Chisinau.ics | 2 +- .../zoneinfo-outlook/Europe/Copenhagen.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Dublin.ics | 2 +- .../zoneinfo-outlook/Europe/Gibraltar.ics | 2 +- .../zoneinfo-outlook/Europe/Guernsey.ics | 2 +- .../zoneinfo-outlook/Europe/Helsinki.ics | 2 +- .../zoneinfo-outlook/Europe/Isle_of_Man.ics | 2 +- .../zoneinfo-outlook/Europe/Istanbul.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Jersey.ics | 2 +- .../zoneinfo-outlook/Europe/Kaliningrad.ics | 4 +- web/tzurl/zoneinfo-outlook/Europe/Kiev.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Lisbon.ics | 2 +- .../zoneinfo-outlook/Europe/Ljubljana.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/London.ics | 2 +- .../zoneinfo-outlook/Europe/Luxembourg.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Madrid.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Malta.ics | 2 +- .../zoneinfo-outlook/Europe/Mariehamn.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Minsk.ics | 16 +- web/tzurl/zoneinfo-outlook/Europe/Monaco.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Moscow.ics | 2 +- .../zoneinfo-outlook/Europe/Nicosia.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Oslo.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Paris.ics | 2 +- .../zoneinfo-outlook/Europe/Podgorica.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Prague.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Riga.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Rome.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Samara.ics | 2 +- .../zoneinfo-outlook/Europe/San_Marino.ics | 2 +- .../zoneinfo-outlook/Europe/Sarajevo.ics | 2 +- .../zoneinfo-outlook/Europe/Simferopol.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Skopje.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Sofia.ics | 2 +- .../zoneinfo-outlook/Europe/Stockholm.ics | 2 +- .../zoneinfo-outlook/Europe/Tallinn.ics | 2 +- .../zoneinfo-outlook/Europe/Tirane.ics (new) | 23 +++ .../zoneinfo-outlook/Europe/Uzhgorod.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Vaduz.ics | 2 +- .../zoneinfo-outlook/Europe/Vatican.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Vienna.ics | 2 +- .../zoneinfo-outlook/Europe/Vilnius.ics | 2 +- .../zoneinfo-outlook/Europe/Volgograd.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Warsaw.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Zagreb.ics | 2 +- .../zoneinfo-outlook/Europe/Zaporozhye.ics | 2 +- web/tzurl/zoneinfo-outlook/Europe/Zurich.ics | 2 +- .../zoneinfo-outlook/Indian/Antananarivo.ics | 2 +- web/tzurl/zoneinfo-outlook/Indian/Chagos.ics | 2 +- .../zoneinfo-outlook/Indian/Christmas.ics | 2 +- web/tzurl/zoneinfo-outlook/Indian/Cocos.ics | 2 +- web/tzurl/zoneinfo-outlook/Indian/Comoro.ics | 2 +- .../zoneinfo-outlook/Indian/Kerguelen.ics | 2 +- web/tzurl/zoneinfo-outlook/Indian/Mahe.ics | 2 +- .../zoneinfo-outlook/Indian/Maldives.ics | 2 +- .../zoneinfo-outlook/Indian/Mauritius.ics | 2 +- .../zoneinfo-outlook/Indian/Mayotte.ics | 2 +- .../zoneinfo-outlook/Indian/Reunion.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Apia.ics | 16 +- .../zoneinfo-outlook/Pacific/Auckland.ics | 2 +- .../zoneinfo-outlook/Pacific/Chatham.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Chuuk.ics | 2 +- .../zoneinfo-outlook/Pacific/Easter.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Efate.ics | 2 +- .../zoneinfo-outlook/Pacific/Enderbury.ics | 2 +- .../zoneinfo-outlook/Pacific/Fakaofo.ics | 6 +- web/tzurl/zoneinfo-outlook/Pacific/Fiji.ics | 14 +- .../zoneinfo-outlook/Pacific/Funafuti.ics | 2 +- .../zoneinfo-outlook/Pacific/Galapagos.ics | 2 +- .../zoneinfo-outlook/Pacific/Gambier.ics | 2 +- .../zoneinfo-outlook/Pacific/Guadalcanal.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Guam.ics | 2 +- .../zoneinfo-outlook/Pacific/Honolulu.ics | 2 +- .../zoneinfo-outlook/Pacific/Johnston.ics | 2 +- .../zoneinfo-outlook/Pacific/Kiritimati.ics | 2 +- .../zoneinfo-outlook/Pacific/Kosrae.ics | 2 +- .../zoneinfo-outlook/Pacific/Kwajalein.ics | 2 +- .../zoneinfo-outlook/Pacific/Majuro.ics | 2 +- .../zoneinfo-outlook/Pacific/Marquesas.ics | 2 +- .../zoneinfo-outlook/Pacific/Midway.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Nauru.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Niue.ics | 2 +- .../zoneinfo-outlook/Pacific/Norfolk.ics | 2 +- .../zoneinfo-outlook/Pacific/Noumea.ics | 2 +- .../zoneinfo-outlook/Pacific/Pago_Pago.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Palau.ics | 2 +- .../zoneinfo-outlook/Pacific/Pitcairn.ics | 2 +- .../zoneinfo-outlook/Pacific/Pohnpei.ics | 2 +- .../zoneinfo-outlook/Pacific/Ponape.ics | 2 +- .../Pacific/Port_Moresby.ics | 2 +- .../zoneinfo-outlook/Pacific/Rarotonga.ics | 2 +- .../zoneinfo-outlook/Pacific/Saipan.ics | 2 +- .../zoneinfo-outlook/Pacific/Tahiti.ics | 2 +- .../zoneinfo-outlook/Pacific/Tarawa.ics | 2 +- .../zoneinfo-outlook/Pacific/Tongatapu.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Truk.ics | 2 +- web/tzurl/zoneinfo-outlook/Pacific/Wake.ics | 2 +- .../zoneinfo-outlook/Pacific/Wallis.ics | 2 +- web/tzurl/zoneinfo/Africa/Abidjan.ics | 2 +- web/tzurl/zoneinfo/Africa/Accra.ics | 2 +- web/tzurl/zoneinfo/Africa/Addis_Ababa.ics | 2 +- web/tzurl/zoneinfo/Africa/Algiers.ics | 2 +- web/tzurl/zoneinfo/Africa/Asmara.ics | 2 +- web/tzurl/zoneinfo/Africa/Bamako.ics | 2 +- web/tzurl/zoneinfo/Africa/Bangui.ics | 2 +- web/tzurl/zoneinfo/Africa/Banjul.ics | 2 +- web/tzurl/zoneinfo/Africa/Bissau.ics | 2 +- web/tzurl/zoneinfo/Africa/Blantyre.ics | 2 +- web/tzurl/zoneinfo/Africa/Brazzaville.ics | 2 +- web/tzurl/zoneinfo/Africa/Bujumbura.ics | 2 +- web/tzurl/zoneinfo/Africa/Cairo.ics | 2 +- web/tzurl/zoneinfo/Africa/Casablanca.ics | 18 +- web/tzurl/zoneinfo/Africa/Ceuta.ics | 2 +- web/tzurl/zoneinfo/Africa/Conakry.ics | 2 +- web/tzurl/zoneinfo/Africa/Dakar.ics | 2 +- web/tzurl/zoneinfo/Africa/Dar_es_Salaam.ics | 2 +- web/tzurl/zoneinfo/Africa/Djibouti.ics | 2 +- web/tzurl/zoneinfo/Africa/Douala.ics | 2 +- web/tzurl/zoneinfo/Africa/El_Aaiun.ics | 2 +- web/tzurl/zoneinfo/Africa/Freetown.ics | 2 +- web/tzurl/zoneinfo/Africa/Gaborone.ics | 2 +- web/tzurl/zoneinfo/Africa/Harare.ics | 2 +- web/tzurl/zoneinfo/Africa/Johannesburg.ics | 2 +- web/tzurl/zoneinfo/Africa/Juba.ics | 2 +- web/tzurl/zoneinfo/Africa/Kampala.ics | 2 +- web/tzurl/zoneinfo/Africa/Khartoum.ics | 2 +- web/tzurl/zoneinfo/Africa/Kigali.ics | 2 +- web/tzurl/zoneinfo/Africa/Kinshasa.ics | 2 +- web/tzurl/zoneinfo/Africa/Lagos.ics | 2 +- web/tzurl/zoneinfo/Africa/Libreville.ics | 2 +- web/tzurl/zoneinfo/Africa/Lome.ics | 2 +- web/tzurl/zoneinfo/Africa/Luanda.ics | 2 +- web/tzurl/zoneinfo/Africa/Lubumbashi.ics | 2 +- web/tzurl/zoneinfo/Africa/Lusaka.ics | 2 +- web/tzurl/zoneinfo/Africa/Malabo.ics | 2 +- web/tzurl/zoneinfo/Africa/Maputo.ics | 2 +- web/tzurl/zoneinfo/Africa/Maseru.ics | 2 +- web/tzurl/zoneinfo/Africa/Mbabane.ics | 2 +- web/tzurl/zoneinfo/Africa/Mogadishu.ics | 2 +- web/tzurl/zoneinfo/Africa/Monrovia.ics | 2 +- web/tzurl/zoneinfo/Africa/Nairobi.ics | 2 +- web/tzurl/zoneinfo/Africa/Ndjamena.ics | 2 +- web/tzurl/zoneinfo/Africa/Niamey.ics | 2 +- web/tzurl/zoneinfo/Africa/Nouakchott.ics | 2 +- web/tzurl/zoneinfo/Africa/Ouagadougou.ics | 2 +- web/tzurl/zoneinfo/Africa/Porto-Novo.ics | 2 +- web/tzurl/zoneinfo/Africa/Sao_Tome.ics | 2 +- web/tzurl/zoneinfo/Africa/Tripoli.ics | 24 ++- web/tzurl/zoneinfo/Africa/Tunis.ics | 2 +- web/tzurl/zoneinfo/Africa/Windhoek.ics | 2 +- web/tzurl/zoneinfo/America/Adak.ics | 2 +- web/tzurl/zoneinfo/America/Anchorage.ics | 2 +- web/tzurl/zoneinfo/America/Anguilla.ics | 2 +- web/tzurl/zoneinfo/America/Antigua.ics | 2 +- web/tzurl/zoneinfo/America/Araguaina.ics | 41 ++++- .../America/Argentina/Buenos_Aires.ics | 2 +- .../zoneinfo/America/Argentina/Catamarca.ics | 2 +- .../zoneinfo/America/Argentina/Cordoba.ics | 2 +- .../zoneinfo/America/Argentina/Jujuy.ics | 2 +- .../zoneinfo/America/Argentina/La_Rioja.ics | 2 +- .../zoneinfo/America/Argentina/Mendoza.ics | 2 +- .../America/Argentina/Rio_Gallegos.ics | 2 +- .../zoneinfo/America/Argentina/Salta.ics | 2 +- .../zoneinfo/America/Argentina/San_Juan.ics | 2 +- .../zoneinfo/America/Argentina/San_Luis.ics | 2 +- .../zoneinfo/America/Argentina/Tucuman.ics | 2 +- .../zoneinfo/America/Argentina/Ushuaia.ics | 2 +- web/tzurl/zoneinfo/America/Aruba.ics | 2 +- web/tzurl/zoneinfo/America/Asuncion.ics | 2 +- web/tzurl/zoneinfo/America/Atikokan.ics | 6 +- web/tzurl/zoneinfo/America/Bahia.ics | 5 +- .../zoneinfo/America/Bahia_Banderas.ics | 2 +- web/tzurl/zoneinfo/America/Barbados.ics | 2 +- web/tzurl/zoneinfo/America/Belem.ics | 2 +- web/tzurl/zoneinfo/America/Belize.ics | 2 +- web/tzurl/zoneinfo/America/Blanc-Sablon.ics | 6 +- web/tzurl/zoneinfo/America/Boa_Vista.ics | 2 +- web/tzurl/zoneinfo/America/Bogota.ics | 2 +- web/tzurl/zoneinfo/America/Boise.ics | 2 +- web/tzurl/zoneinfo/America/Cambridge_Bay.ics | 2 +- web/tzurl/zoneinfo/America/Campo_Grande.ics | 12 +- web/tzurl/zoneinfo/America/Cancun.ics | 2 +- web/tzurl/zoneinfo/America/Caracas.ics | 2 +- web/tzurl/zoneinfo/America/Cayenne.ics | 2 +- web/tzurl/zoneinfo/America/Cayman.ics | 2 +- web/tzurl/zoneinfo/America/Chicago.ics | 2 +- web/tzurl/zoneinfo/America/Chihuahua.ics | 2 +- web/tzurl/zoneinfo/America/Costa_Rica.ics | 2 +- web/tzurl/zoneinfo/America/Creston.ics (new) | 30 ++++ web/tzurl/zoneinfo/America/Cuiaba.ics | 10 +- web/tzurl/zoneinfo/America/Curacao.ics | 2 +- web/tzurl/zoneinfo/America/Danmarkshavn.ics | 2 +- web/tzurl/zoneinfo/America/Dawson.ics | 2 +- web/tzurl/zoneinfo/America/Dawson_Creek.ics | 6 +- web/tzurl/zoneinfo/America/Denver.ics | 2 +- web/tzurl/zoneinfo/America/Detroit.ics | 2 +- web/tzurl/zoneinfo/America/Dominica.ics | 2 +- web/tzurl/zoneinfo/America/Edmonton.ics | 6 +- web/tzurl/zoneinfo/America/Eirunepe.ics | 2 +- web/tzurl/zoneinfo/America/El_Salvador.ics | 2 +- web/tzurl/zoneinfo/America/Fortaleza.ics | 2 +- web/tzurl/zoneinfo/America/Glace_Bay.ics | 6 +- web/tzurl/zoneinfo/America/Godthab.ics | 2 +- web/tzurl/zoneinfo/America/Goose_Bay.ics | 6 +- web/tzurl/zoneinfo/America/Grand_Turk.ics | 2 +- web/tzurl/zoneinfo/America/Grenada.ics | 2 +- web/tzurl/zoneinfo/America/Guadeloupe.ics | 2 +- web/tzurl/zoneinfo/America/Guatemala.ics | 2 +- web/tzurl/zoneinfo/America/Guayaquil.ics | 2 +- web/tzurl/zoneinfo/America/Guyana.ics | 2 +- web/tzurl/zoneinfo/America/Halifax.ics | 4 +- web/tzurl/zoneinfo/America/Havana.ics | 15 +- web/tzurl/zoneinfo/America/Hermosillo.ics | 2 +- .../America/Indiana/Indianapolis.ics | 2 +- web/tzurl/zoneinfo/America/Indiana/Knox.ics | 2 +- .../zoneinfo/America/Indiana/Marengo.ics | 2 +- .../zoneinfo/America/Indiana/Petersburg.ics | 2 +- .../zoneinfo/America/Indiana/Tell_City.ics | 2 +- web/tzurl/zoneinfo/America/Indiana/Vevay.ics | 2 +- .../zoneinfo/America/Indiana/Vincennes.ics | 2 +- .../zoneinfo/America/Indiana/Winamac.ics | 2 +- web/tzurl/zoneinfo/America/Inuvik.ics | 2 +- web/tzurl/zoneinfo/America/Iqaluit.ics | 2 +- web/tzurl/zoneinfo/America/Jamaica.ics | 2 +- web/tzurl/zoneinfo/America/Juneau.ics | 2 +- .../zoneinfo/America/Kentucky/Louisville.ics | 2 +- .../zoneinfo/America/Kentucky/Monticello.ics | 2 +- web/tzurl/zoneinfo/America/Kralendijk.ics | 2 +- web/tzurl/zoneinfo/America/La_Paz.ics | 2 +- web/tzurl/zoneinfo/America/Lima.ics | 2 +- web/tzurl/zoneinfo/America/Los_Angeles.ics | 2 +- web/tzurl/zoneinfo/America/Lower_Princes.ics | 2 +- web/tzurl/zoneinfo/America/Maceio.ics | 2 +- web/tzurl/zoneinfo/America/Managua.ics | 2 +- web/tzurl/zoneinfo/America/Manaus.ics | 2 +- web/tzurl/zoneinfo/America/Marigot.ics | 2 +- web/tzurl/zoneinfo/America/Martinique.ics | 2 +- web/tzurl/zoneinfo/America/Matamoros.ics | 2 +- web/tzurl/zoneinfo/America/Mazatlan.ics | 2 +- web/tzurl/zoneinfo/America/Menominee.ics | 2 +- web/tzurl/zoneinfo/America/Merida.ics | 2 +- web/tzurl/zoneinfo/America/Metlakatla.ics | 2 +- web/tzurl/zoneinfo/America/Mexico_City.ics | 2 +- web/tzurl/zoneinfo/America/Miquelon.ics | 2 +- web/tzurl/zoneinfo/America/Moncton.ics | 6 +- web/tzurl/zoneinfo/America/Monterrey.ics | 2 +- web/tzurl/zoneinfo/America/Montevideo.ics | 2 +- web/tzurl/zoneinfo/America/Montreal.ics | 4 +- web/tzurl/zoneinfo/America/Montserrat.ics | 2 +- web/tzurl/zoneinfo/America/Nassau.ics | 2 +- web/tzurl/zoneinfo/America/New_York.ics | 2 +- web/tzurl/zoneinfo/America/Nipigon.ics | 6 +- web/tzurl/zoneinfo/America/Nome.ics | 2 +- web/tzurl/zoneinfo/America/Noronha.ics | 2 +- .../zoneinfo/America/North_Dakota/Beulah.ics | 2 +- .../zoneinfo/America/North_Dakota/Center.ics | 2 +- .../America/North_Dakota/New_Salem.ics | 2 +- web/tzurl/zoneinfo/America/Ojinaga.ics | 2 +- web/tzurl/zoneinfo/America/Panama.ics | 2 +- web/tzurl/zoneinfo/America/Pangnirtung.ics | 2 +- web/tzurl/zoneinfo/America/Paramaribo.ics | 2 +- web/tzurl/zoneinfo/America/Phoenix.ics | 2 +- .../zoneinfo/America/Port-au-Prince.ics | 4 +- web/tzurl/zoneinfo/America/Port_of_Spain.ics | 2 +- web/tzurl/zoneinfo/America/Porto_Velho.ics | 2 +- web/tzurl/zoneinfo/America/Puerto_Rico.ics | 2 +- web/tzurl/zoneinfo/America/Rainy_River.ics | 6 +- web/tzurl/zoneinfo/America/Rankin_Inlet.ics | 2 +- web/tzurl/zoneinfo/America/Recife.ics | 2 +- web/tzurl/zoneinfo/America/Regina.ics | 6 +- web/tzurl/zoneinfo/America/Resolute.ics | 2 +- web/tzurl/zoneinfo/America/Rio_Branco.ics | 2 +- web/tzurl/zoneinfo/America/Santa_Isabel.ics | 2 +- web/tzurl/zoneinfo/America/Santarem.ics | 2 +- web/tzurl/zoneinfo/America/Santiago.ics | 8 +- web/tzurl/zoneinfo/America/Santo_Domingo.ics | 2 +- web/tzurl/zoneinfo/America/Sao_Paulo.ics | 12 +- web/tzurl/zoneinfo/America/Scoresbysund.ics | 2 +- .../zoneinfo/America/Shiprock.ics (new) | 159 +++++++++++++++++ web/tzurl/zoneinfo/America/Sitka.ics | 4 +- web/tzurl/zoneinfo/America/St_Barthelemy.ics | 2 +- web/tzurl/zoneinfo/America/St_Johns.ics | 4 +- web/tzurl/zoneinfo/America/St_Kitts.ics | 2 +- web/tzurl/zoneinfo/America/St_Lucia.ics | 2 +- web/tzurl/zoneinfo/America/St_Thomas.ics | 2 +- web/tzurl/zoneinfo/America/St_Vincent.ics | 2 +- web/tzurl/zoneinfo/America/Swift_Current.ics | 6 +- web/tzurl/zoneinfo/America/Tegucigalpa.ics | 2 +- web/tzurl/zoneinfo/America/Thule.ics | 2 +- web/tzurl/zoneinfo/America/Thunder_Bay.ics | 2 +- web/tzurl/zoneinfo/America/Tijuana.ics | 2 +- web/tzurl/zoneinfo/America/Toronto.ics | 6 +- web/tzurl/zoneinfo/America/Tortola.ics | 2 +- web/tzurl/zoneinfo/America/Vancouver.ics | 6 +- web/tzurl/zoneinfo/America/Whitehorse.ics | 2 +- web/tzurl/zoneinfo/America/Winnipeg.ics | 4 +- web/tzurl/zoneinfo/America/Yakutat.ics | 2 +- web/tzurl/zoneinfo/America/Yellowknife.ics | 2 +- web/tzurl/zoneinfo/Antarctica/Casey.ics | 4 +- web/tzurl/zoneinfo/Antarctica/Davis.ics | 4 +- .../zoneinfo/Antarctica/DumontDUrville.ics | 2 +- web/tzurl/zoneinfo/Antarctica/Macquarie.ics | 2 +- web/tzurl/zoneinfo/Antarctica/Mawson.ics | 2 +- web/tzurl/zoneinfo/Antarctica/McMurdo.ics | 2 +- web/tzurl/zoneinfo/Antarctica/Palmer.ics | 45 ++++- web/tzurl/zoneinfo/Antarctica/Rothera.ics | 2 +- web/tzurl/zoneinfo/Antarctica/South_Pole.ics | 2 +- web/tzurl/zoneinfo/Antarctica/Syowa.ics | 2 +- web/tzurl/zoneinfo/Antarctica/Vostok.ics | 2 +- web/tzurl/zoneinfo/Arctic/Longyearbyen.ics | 2 +- web/tzurl/zoneinfo/Asia/Aden.ics | 2 +- web/tzurl/zoneinfo/Asia/Almaty.ics | 2 +- web/tzurl/zoneinfo/Asia/Amman.ics | 42 ++++- web/tzurl/zoneinfo/Asia/Anadyr.ics | 2 +- web/tzurl/zoneinfo/Asia/Aqtau.ics | 2 +- web/tzurl/zoneinfo/Asia/Aqtobe.ics | 2 +- web/tzurl/zoneinfo/Asia/Ashgabat.ics | 2 +- web/tzurl/zoneinfo/Asia/Baghdad.ics | 2 +- web/tzurl/zoneinfo/Asia/Bahrain.ics | 2 +- web/tzurl/zoneinfo/Asia/Baku.ics | 2 +- web/tzurl/zoneinfo/Asia/Bangkok.ics | 2 +- web/tzurl/zoneinfo/Asia/Beirut.ics | 2 +- web/tzurl/zoneinfo/Asia/Bishkek.ics | 2 +- web/tzurl/zoneinfo/Asia/Brunei.ics | 2 +- web/tzurl/zoneinfo/Asia/Choibalsan.ics | 2 +- web/tzurl/zoneinfo/Asia/Chongqing.ics | 2 +- web/tzurl/zoneinfo/Asia/Colombo.ics | 2 +- web/tzurl/zoneinfo/Asia/Damascus.ics | 8 +- web/tzurl/zoneinfo/Asia/Dhaka.ics | 2 +- web/tzurl/zoneinfo/Asia/Dili.ics | 2 +- web/tzurl/zoneinfo/Asia/Dubai.ics | 2 +- web/tzurl/zoneinfo/Asia/Dushanbe.ics | 2 +- web/tzurl/zoneinfo/Asia/Gaza.ics | 24 +-- web/tzurl/zoneinfo/Asia/Harbin.ics | 2 +- web/tzurl/zoneinfo/Asia/Hebron.ics (new) | 156 ++++++++++++++++ web/tzurl/zoneinfo/Asia/Ho_Chi_Minh.ics | 2 +- web/tzurl/zoneinfo/Asia/Hong_Kong.ics | 2 +- web/tzurl/zoneinfo/Asia/Hovd.ics | 2 +- web/tzurl/zoneinfo/Asia/Irkutsk.ics | 2 +- web/tzurl/zoneinfo/Asia/Istanbul.ics | 2 +- web/tzurl/zoneinfo/Asia/Jakarta.ics | 2 +- web/tzurl/zoneinfo/Asia/Jayapura.ics | 2 +- web/tzurl/zoneinfo/Asia/Jerusalem.ics | 87 ++++----- web/tzurl/zoneinfo/Asia/Kabul.ics | 2 +- web/tzurl/zoneinfo/Asia/Kamchatka.ics | 2 +- web/tzurl/zoneinfo/Asia/Karachi.ics | 2 +- web/tzurl/zoneinfo/Asia/Kashgar.ics | 2 +- web/tzurl/zoneinfo/Asia/Kathmandu.ics | 2 +- web/tzurl/zoneinfo/Asia/Kolkata.ics | 2 +- web/tzurl/zoneinfo/Asia/Krasnoyarsk.ics | 2 +- web/tzurl/zoneinfo/Asia/Kuala_Lumpur.ics | 2 +- web/tzurl/zoneinfo/Asia/Kuching.ics | 2 +- web/tzurl/zoneinfo/Asia/Kuwait.ics | 2 +- web/tzurl/zoneinfo/Asia/Macau.ics | 2 +- web/tzurl/zoneinfo/Asia/Magadan.ics | 2 +- web/tzurl/zoneinfo/Asia/Makassar.ics | 2 +- web/tzurl/zoneinfo/Asia/Manila.ics | 2 +- web/tzurl/zoneinfo/Asia/Muscat.ics | 2 +- web/tzurl/zoneinfo/Asia/Nicosia.ics | 2 +- web/tzurl/zoneinfo/Asia/Novokuznetsk.ics | 2 +- web/tzurl/zoneinfo/Asia/Novosibirsk.ics | 2 +- web/tzurl/zoneinfo/Asia/Omsk.ics | 2 +- web/tzurl/zoneinfo/Asia/Oral.ics | 2 +- web/tzurl/zoneinfo/Asia/Phnom_Penh.ics | 2 +- web/tzurl/zoneinfo/Asia/Pontianak.ics | 2 +- web/tzurl/zoneinfo/Asia/Pyongyang.ics | 2 +- web/tzurl/zoneinfo/Asia/Qatar.ics | 2 +- web/tzurl/zoneinfo/Asia/Qyzylorda.ics | 2 +- web/tzurl/zoneinfo/Asia/Rangoon.ics | 2 +- web/tzurl/zoneinfo/Asia/Riyadh.ics | 2 +- web/tzurl/zoneinfo/Asia/Sakhalin.ics | 2 +- web/tzurl/zoneinfo/Asia/Samarkand.ics | 2 +- web/tzurl/zoneinfo/Asia/Seoul.ics | 2 +- web/tzurl/zoneinfo/Asia/Shanghai.ics | 2 +- web/tzurl/zoneinfo/Asia/Singapore.ics | 2 +- web/tzurl/zoneinfo/Asia/Taipei.ics | 2 +- web/tzurl/zoneinfo/Asia/Tashkent.ics | 2 +- web/tzurl/zoneinfo/Asia/Tbilisi.ics | 2 +- web/tzurl/zoneinfo/Asia/Tehran.ics | 2 +- web/tzurl/zoneinfo/Asia/Thimphu.ics | 2 +- web/tzurl/zoneinfo/Asia/Tokyo.ics | 2 +- web/tzurl/zoneinfo/Asia/Ulaanbaatar.ics | 2 +- web/tzurl/zoneinfo/Asia/Urumqi.ics | 2 +- web/tzurl/zoneinfo/Asia/Vientiane.ics | 2 +- web/tzurl/zoneinfo/Asia/Vladivostok.ics | 2 +- web/tzurl/zoneinfo/Asia/Yakutsk.ics | 2 +- web/tzurl/zoneinfo/Asia/Yekaterinburg.ics | 2 +- web/tzurl/zoneinfo/Asia/Yerevan.ics | 59 ++++-- web/tzurl/zoneinfo/Atlantic/Azores.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Bermuda.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Canary.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Cape_Verde.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Faroe.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Madeira.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Reykjavik.ics | 2 +- .../zoneinfo/Atlantic/South_Georgia.ics | 2 +- web/tzurl/zoneinfo/Atlantic/St_Helena.ics | 2 +- web/tzurl/zoneinfo/Atlantic/Stanley.ics | 32 ++-- web/tzurl/zoneinfo/Australia/Adelaide.ics | 2 +- web/tzurl/zoneinfo/Australia/Brisbane.ics | 2 +- .../zoneinfo/Australia/Broken_Hill.ics (new) | 151 ++++++++++++++++ web/tzurl/zoneinfo/Australia/Currie.ics | 2 +- web/tzurl/zoneinfo/Australia/Darwin.ics | 2 +- web/tzurl/zoneinfo/Australia/Eucla.ics | 2 +- web/tzurl/zoneinfo/Australia/Hobart.ics | 2 +- web/tzurl/zoneinfo/Australia/Lindeman.ics | 2 +- web/tzurl/zoneinfo/Australia/Lord_Howe.ics | 2 +- web/tzurl/zoneinfo/Australia/Melbourne.ics | 2 +- web/tzurl/zoneinfo/Australia/Perth.ics | 2 +- web/tzurl/zoneinfo/Australia/Sydney.ics | 2 +- web/tzurl/zoneinfo/Europe/Amsterdam.ics | 2 +- web/tzurl/zoneinfo/Europe/Andorra.ics | 2 +- web/tzurl/zoneinfo/Europe/Athens.ics | 2 +- web/tzurl/zoneinfo/Europe/Belgrade.ics | 2 +- web/tzurl/zoneinfo/Europe/Berlin.ics | 2 +- web/tzurl/zoneinfo/Europe/Bratislava.ics | 2 +- web/tzurl/zoneinfo/Europe/Brussels.ics | 2 +- web/tzurl/zoneinfo/Europe/Bucharest.ics | 2 +- web/tzurl/zoneinfo/Europe/Budapest.ics | 2 +- web/tzurl/zoneinfo/Europe/Chisinau.ics | 2 +- web/tzurl/zoneinfo/Europe/Copenhagen.ics | 2 +- web/tzurl/zoneinfo/Europe/Dublin.ics | 2 +- web/tzurl/zoneinfo/Europe/Gibraltar.ics | 2 +- web/tzurl/zoneinfo/Europe/Guernsey.ics | 2 +- web/tzurl/zoneinfo/Europe/Helsinki.ics | 2 +- web/tzurl/zoneinfo/Europe/Isle_of_Man.ics | 2 +- web/tzurl/zoneinfo/Europe/Istanbul.ics | 2 +- web/tzurl/zoneinfo/Europe/Jersey.ics | 2 +- web/tzurl/zoneinfo/Europe/Kaliningrad.ics | 4 +- web/tzurl/zoneinfo/Europe/Kiev.ics | 2 +- web/tzurl/zoneinfo/Europe/Lisbon.ics | 2 +- web/tzurl/zoneinfo/Europe/Ljubljana.ics | 2 +- web/tzurl/zoneinfo/Europe/London.ics | 2 +- web/tzurl/zoneinfo/Europe/Luxembourg.ics | 2 +- web/tzurl/zoneinfo/Europe/Madrid.ics | 2 +- web/tzurl/zoneinfo/Europe/Malta.ics | 2 +- web/tzurl/zoneinfo/Europe/Mariehamn.ics | 2 +- web/tzurl/zoneinfo/Europe/Minsk.ics | 56 ++++-- web/tzurl/zoneinfo/Europe/Monaco.ics | 2 +- web/tzurl/zoneinfo/Europe/Moscow.ics | 2 +- web/tzurl/zoneinfo/Europe/Nicosia.ics | 2 +- web/tzurl/zoneinfo/Europe/Oslo.ics | 2 +- web/tzurl/zoneinfo/Europe/Paris.ics | 2 +- web/tzurl/zoneinfo/Europe/Podgorica.ics | 2 +- web/tzurl/zoneinfo/Europe/Prague.ics | 2 +- web/tzurl/zoneinfo/Europe/Riga.ics | 2 +- web/tzurl/zoneinfo/Europe/Rome.ics | 2 +- web/tzurl/zoneinfo/Europe/Samara.ics | 2 +- web/tzurl/zoneinfo/Europe/San_Marino.ics | 2 +- web/tzurl/zoneinfo/Europe/Sarajevo.ics | 2 +- web/tzurl/zoneinfo/Europe/Simferopol.ics | 2 +- web/tzurl/zoneinfo/Europe/Skopje.ics | 2 +- web/tzurl/zoneinfo/Europe/Sofia.ics | 2 +- web/tzurl/zoneinfo/Europe/Stockholm.ics | 2 +- web/tzurl/zoneinfo/Europe/Tallinn.ics | 2 +- web/tzurl/zoneinfo/Europe/Tirane.ics (new) | 86 +++++++++ web/tzurl/zoneinfo/Europe/Uzhgorod.ics | 2 +- web/tzurl/zoneinfo/Europe/Vaduz.ics | 2 +- web/tzurl/zoneinfo/Europe/Vatican.ics | 2 +- web/tzurl/zoneinfo/Europe/Vienna.ics | 2 +- web/tzurl/zoneinfo/Europe/Vilnius.ics | 2 +- web/tzurl/zoneinfo/Europe/Volgograd.ics | 2 +- web/tzurl/zoneinfo/Europe/Warsaw.ics | 2 +- web/tzurl/zoneinfo/Europe/Zagreb.ics | 2 +- web/tzurl/zoneinfo/Europe/Zaporozhye.ics | 2 +- web/tzurl/zoneinfo/Europe/Zurich.ics | 2 +- web/tzurl/zoneinfo/Indian/Antananarivo.ics | 2 +- web/tzurl/zoneinfo/Indian/Chagos.ics | 2 +- web/tzurl/zoneinfo/Indian/Christmas.ics | 2 +- web/tzurl/zoneinfo/Indian/Cocos.ics | 2 +- web/tzurl/zoneinfo/Indian/Comoro.ics | 2 +- web/tzurl/zoneinfo/Indian/Kerguelen.ics | 2 +- web/tzurl/zoneinfo/Indian/Mahe.ics | 2 +- web/tzurl/zoneinfo/Indian/Maldives.ics | 2 +- web/tzurl/zoneinfo/Indian/Mauritius.ics | 2 +- web/tzurl/zoneinfo/Indian/Mayotte.ics | 2 +- web/tzurl/zoneinfo/Indian/Reunion.ics | 2 +- web/tzurl/zoneinfo/Pacific/Apia.ics | 23 ++- web/tzurl/zoneinfo/Pacific/Auckland.ics | 2 +- web/tzurl/zoneinfo/Pacific/Chatham.ics | 2 +- web/tzurl/zoneinfo/Pacific/Chuuk.ics | 2 +- web/tzurl/zoneinfo/Pacific/Easter.ics | 8 +- web/tzurl/zoneinfo/Pacific/Efate.ics | 2 +- web/tzurl/zoneinfo/Pacific/Enderbury.ics | 2 +- web/tzurl/zoneinfo/Pacific/Fakaofo.ics | 11 +- web/tzurl/zoneinfo/Pacific/Fiji.ics | 17 +- web/tzurl/zoneinfo/Pacific/Funafuti.ics | 2 +- web/tzurl/zoneinfo/Pacific/Galapagos.ics | 2 +- web/tzurl/zoneinfo/Pacific/Gambier.ics | 2 +- web/tzurl/zoneinfo/Pacific/Guadalcanal.ics | 2 +- web/tzurl/zoneinfo/Pacific/Guam.ics | 2 +- web/tzurl/zoneinfo/Pacific/Honolulu.ics | 2 +- web/tzurl/zoneinfo/Pacific/Johnston.ics | 2 +- web/tzurl/zoneinfo/Pacific/Kiritimati.ics | 2 +- web/tzurl/zoneinfo/Pacific/Kosrae.ics | 2 +- web/tzurl/zoneinfo/Pacific/Kwajalein.ics | 2 +- web/tzurl/zoneinfo/Pacific/Majuro.ics | 2 +- web/tzurl/zoneinfo/Pacific/Marquesas.ics | 2 +- web/tzurl/zoneinfo/Pacific/Midway.ics | 2 +- web/tzurl/zoneinfo/Pacific/Nauru.ics | 2 +- web/tzurl/zoneinfo/Pacific/Niue.ics | 2 +- web/tzurl/zoneinfo/Pacific/Norfolk.ics | 2 +- web/tzurl/zoneinfo/Pacific/Noumea.ics | 2 +- web/tzurl/zoneinfo/Pacific/Pago_Pago.ics | 2 +- web/tzurl/zoneinfo/Pacific/Palau.ics | 2 +- web/tzurl/zoneinfo/Pacific/Pitcairn.ics | 2 +- web/tzurl/zoneinfo/Pacific/Pohnpei.ics | 2 +- web/tzurl/zoneinfo/Pacific/Ponape.ics | 2 +- web/tzurl/zoneinfo/Pacific/Port_Moresby.ics | 2 +- web/tzurl/zoneinfo/Pacific/Rarotonga.ics | 2 +- web/tzurl/zoneinfo/Pacific/Saipan.ics | 2 +- web/tzurl/zoneinfo/Pacific/Tahiti.ics | 2 +- web/tzurl/zoneinfo/Pacific/Tarawa.ics | 2 +- web/tzurl/zoneinfo/Pacific/Tongatapu.ics | 2 +- web/tzurl/zoneinfo/Pacific/Truk.ics | 2 +- web/tzurl/zoneinfo/Pacific/Wake.ics | 2 +- web/tzurl/zoneinfo/Pacific/Wallis.ics | 2 +- 838 files changed, 2017 insertions(+), 1113 deletions(-) commit f4b62d0e3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 18 21:45:36 2012 +0000 Fixed some JSHint problems web/js/refresh.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 33cb00170 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 18 21:42:23 2012 +0000 Fixed some JSHint problems web/js/multiple.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 4ad5f7505 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 18 21:32:56 2012 +0000 Fixed some JSHint problems web/js/resizable.js.php | 161 ++++++++++++++++++++------------------ 1 file changed, 83 insertions(+), 78 deletions(-) commit a53f71806 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 18 10:55:55 2012 +0000 Restructured code web/functions.inc | 48 +++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 23 deletions(-) commit cb62a8be7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 18 10:38:11 2012 +0000 Moved JavaScript out of functions.inc and into datepicker.js.php web/functions.inc | 69 +++++--------------------------- web/js/datepicker.js.php | 82 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 60 deletions(-) commit d214ac1d0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 17 17:06:46 2012 +0000 Moved JavaScript out of edit_entry.php web/css/mrbs.css.php | 3 +- web/edit_entry.php | 462 +++++++++++---------------- web/js/edit_entry.js.php | 636 +++++++++++++++++++------------------ web/js/functions.js.php | 2 + 4 files changed, 527 insertions(+), 576 deletions(-) commit dc9f99a39 Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Sun Dec 16 14:12:44 2012 +0000 Make clipping of bookings in month view configurable via $clipped_month. web/css/mrbs.css.php | 5 ++++- web/systemdefaults.inc.php | 9 +++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) commit e9512f252 Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Sun Dec 16 14:11:26 2012 +0000 Followup r2590: Add room description as tooltip for room list in header (also in select mode) Newer browsers seem to support tooltips for select options - nice :) web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3331c6885 Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Sat Dec 15 08:52:22 2012 +0000 day view: Add space before () when showing capacity for room names web/functions_table.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 93218de6c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 14 22:22:23 2012 +0000 Tidied up the JavaScript, fixing some JSHint problems. web/js/edit_area_room.js.php | 39 +++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 10 deletions(-) commit 71127ba70 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 14 21:51:21 2012 +0000 Corrected an out of scope use of a variable web/js/edit_area_room.js.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 18523e052 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 14 21:46:26 2012 +0000 Corrected typo in comment web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 05548c319 Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Fri Dec 14 20:49:45 2012 +0000 Update german translation web/lang/lang.de | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) commit 9263db230 Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Fri Dec 14 20:48:28 2012 +0000 Add room description as tooltip for room list in header (only in list mode for now) web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1bd6bfe60 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 14 18:52:02 2012 +0000 Removed redundant parameter to report_row() web/report.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 83b248985 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 12 18:17:37 2012 +0000 Fixed problem with misleading email notifications (see SF Bugs 255) web/approve_entry_handler.php | 3 ++- web/functions_mail.inc | 32 +++++++++----------------------- web/mrbs_sql.inc | 9 ++++++++- 3 files changed, 19 insertions(+), 25 deletions(-) commit 01513aaa2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 12 13:50:19 2012 +0000 Made mrbsMakeBookings() return an array of start times booked. No functional change to MRBS. web/mrbs_sql.inc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) commit 5d531e4b5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 12 13:18:02 2012 +0000 Made mrbsApproveEntry() return an array of start times approved. No functional change to MRBS. web/approve_entry_handler.php | 5 ++-- web/mrbs_sql.inc | 50 +++++++++++++++++++++------------ 2 files changed, 35 insertions(+), 20 deletions(-) commit 295f26827 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 10 19:03:49 2012 +0000 Fixed a problem with display of labels in forms (caused by a recent change) web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 130a16923 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 10 11:02:31 2012 +0000 Restructured code web/edit_area_room.php | 58 +++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 33 deletions(-) commit e32c8021b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 10 10:38:47 2012 +0000 Restructured code web/edit_area_room.php | 134 ++++++++++++++++++++------------------- 1 file changed, 68 insertions(+), 66 deletions(-) commit b278e0894 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 10 10:36:52 2012 +0000 Changed capitalisation of one string web/lang/lang.fr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4b2f2ab02 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 9 19:27:44 2012 +0000 Removed redundant code web/edit_area_room.php | 2 -- 1 file changed, 2 deletions(-) commit 529d63a73 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 9 19:19:52 2012 +0000 Restructured code web/edit_area_room.php | 250 +++++++++++++++++++++------------------ 1 file changed, 134 insertions(+), 116 deletions(-) commit 83c2c3dcf Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Sun Dec 9 17:54:16 2012 +0000 Mark emails from mrbs as auto-generated, so that vacation mailers don't answer mrbs mails web/functions_mail.inc | 1 + 1 file changed, 1 insertion(+) commit 2d18a0699 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 9 17:35:27 2012 +0000 Improved the way the "start of last slot" field is displayed on load web/edit_area_room.php | 2 +- web/js/edit_area_room.js.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) commit 2af580aef Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 9 17:22:26 2012 +0000 Restructured code web/edit_area_room.php | 156 ++++++++++++++++++++------------------- web/functions.inc | 6 +- 2 files changed, 85 insertions(+), 77 deletions(-) commit 1202db1ca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 9 16:26:55 2012 +0000 Restructured code web/css/mrbs.css.php | 2 +- web/edit_area_room.php | 224 +++++++++++++++++---------------- web/js/edit_area_room.js.php | 47 +++---- 3 files changed, 131 insertions(+), 142 deletions(-) commit a05950f5d Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Sun Dec 9 09:48:44 2012 +0000 Translate approval status and confirmation status radio buttons in report.php web/report.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 18b22c46c Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Sun Dec 9 09:24:00 2012 +0000 Make checklang.php work with lang/ subdirectory checklang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 498460a35 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 8 18:37:53 2012 +0000 Restructured code web/edit_area_room.php | 134 +++++++++++++++++++++----------------- web/edit_entry.php | 2 + web/edit_users.php | 1 + web/functions.inc | 136 +++++++++++++++++++++++++-------------- 4 files changed, 164 insertions(+), 109 deletions(-) commit b36b2248c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 7 17:22:05 2012 +0000 Fixed bug causing incorrect email notifications to be issued when members of a series were deleted (see SF Bugs #247) web/del_entry.php | 10 +++++----- web/functions_mail.inc | 38 ++++++++++++++++++++++++-------------- web/mrbs_sql.inc | 17 +++++++++-------- 3 files changed, 38 insertions(+), 27 deletions(-) commit bb90fb62f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 7 16:45:18 2012 +0000 Fixed typo in comment web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 095dbea3e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 6 18:34:30 2012 +0000 Fixed more syntax errors web/upgrade/17/post.inc | 2 +- web/upgrade/24/post.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 37d0775a8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 6 18:00:41 2012 +0000 Fixed some syntax errors caused by some lines having been accidentally truncated web/upgrade/17/post.inc | 8 ++++---- web/upgrade/24/post.inc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) commit dd6e1d968 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 1 12:27:19 2012 +0000 Tweaked position of <input> elements in IE web/css/mrbs-ie.css | 1 + 1 file changed, 1 insertion(+) commit 91c577060 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 30 22:13:47 2012 +0000 Fixed bug causing an infinite loop if a negative day value is given in the query string. Thanks to Neil Carter. web/standard_vars.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit fec4c699f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 28 09:52:48 2012 +0000 Fixed bug resulting in button labels in the report form not being translated web/report.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit dd46390f4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 27 18:28:48 2012 +0000 Fixed major bug when editing an individual entry in a series that caused a new series to be created alongside the original series. web/edit_entry.php | 14 ++++++------ web/functions.inc | 53 ++++++++++++++++++++++++++++---------------- 2 files changed, 41 insertions(+), 26 deletions(-) commit 3e500b8e9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 27 18:13:38 2012 +0000 Fixed bug causing the wrong mode (periods/times) to be used in certain circumstances for reporting durations web/mrbs_sql.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit bc5b429d6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 27 15:23:55 2012 +0000 Added the ability to specify the "fifth" and "fifth last" weekdays of the month when making monthly recurring bookings. These are strict interpretations and will result in no bookings for months where there are only four of the specified day of of the week. (Using "last" or "first" will give you the fourth or fourth last weekday if there are only four weekdays in the month). web/edit_entry.php | 2 +- web/functions.inc | 14 ++++++++++++-- web/lang/lang.en | 2 ++ web/mrbs_sql.inc | 42 +++++++++++++++++++++++------------------- web/site_faq.html | 17 +++++++++++++++++ 5 files changed, 55 insertions(+), 22 deletions(-) commit 2a0708a57 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 7 07:01:42 2012 +0000 Added some HTML escaping web/help.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d0299240d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 6 19:06:15 2012 +0000 Eliminated need to use $langs as a global web/Themes/default/header.inc | 1 - web/help.php | 2 +- web/js/datepicker.js.php | 9 +-- web/language.inc | 101 ++++++++++++++++++++++---------- 4 files changed, 72 insertions(+), 41 deletions(-) commit b5c643c81 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 5 17:12:40 2012 +0000 Ensured that rooms in the room list are sorted by the room sort key web/admin.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit eeb8532f7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 5 16:51:11 2012 +0000 Fixed occurrences of != '' being used instead of !== ''. Causes bugs such as Confirmed as well as Tentative reports being shown in reports when only tentative have been requested. web/functions.inc | 4 ++-- web/functions_mail.inc | 4 ++-- web/language.inc | 2 +- web/report.php | 11 ++++++----- web/search.php | 2 +- web/session/session_cookie.inc | 2 +- web/session/session_http.inc | 2 +- web/session/session_php.inc | 6 +++--- 8 files changed, 17 insertions(+), 16 deletions(-) commit 6781eb2b6 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Nov 5 15:19:14 2012 +0000 Updated the Microsoft locale reference URLs in language.inc. web/language.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit ad3c070a2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 5 14:54:47 2012 +0000 Upgraded jQuery UI from Release 1.8.22 to 1.9.1 .../ui-bg_gloss-wave_60_fece2f_500x100.png | Bin 3512 -> 4075 bytes .../ui-bg_gloss-wave_90_fff9e5_500x100.png | Bin 2257 -> 2720 bytes .../sunny/images/ui-icons_3d3d3d_256x240.png | Bin 5355 -> 4369 bytes .../sunny/images/ui-icons_eb990f_256x240.png | Bin 4369 -> 5355 bytes .../sunny/images/ui-icons_ed9f26_256x240.png | Bin 4369 -> 5355 bytes .../sunny/jquery-ui-1.8.16.custom.css (gone) | 468 ----------------- .../jquery-ui-1.9.1.custom.min.css (new) | 5 + .../ui/jquery-ui-1.8.22.custom.min.js (gone) | 41 -- .../ui/jquery-ui-1.9.1.custom.min.js (new) | 6 + web/jquery/ui/jquery-ui-i18n.js | 413 ++++++++------- web/js.inc | 6 +- web/style.inc | 2 +- 12 files changed, 237 insertions(+), 704 deletions(-) commit 5dddd56f7 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Nov 5 14:51:30 2012 +0000 Fixed a syntax error in 2 upgrade post.inc files. Corrected the Windows locale specifier for "Serbian Latin" so you get Latin and not Cyrillic dates on a WAMP server. web/language.inc | 5 +++-- web/upgrade/17/post.inc | 2 +- web/upgrade/24/post.inc | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) commit e303015ea Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 5 14:33:23 2012 +0000 Upgraded jQuery from Release 1.7.2 to 1.8.2 web/jquery/jquery-1.7.2.min.js (gone) | 4 ---- web/jquery/jquery-1.8.2.min.js (new) | 2 ++ web/js.inc | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) commit 9365e098e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 5 14:22:52 2012 +0000 Restructured code to combine the extra MRBS datepicker regional settings into one file. Also made them refer to the standard settings where possible. .../ui/jquery-ui-datepicker-en-US.js (gone) | 24 ----------- .../ui/jquery-ui-datepicker-en.js (gone) | 24 ----------- ...query-ui-datepicker-sr-RS-LATIN.js (gone) | 24 ----------- web/jquery/ui/jquery-ui-i18n.MRBS.js (new) | 38 ++++++++++++++++++ web/js.inc | 15 ++----- 5 files changed, 41 insertions(+), 84 deletions(-) commit ff1a01bc3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 5 14:01:17 2012 +0000 Fixed bug in datepicker Serbian-Latin regional settings web/jquery/ui/jquery-ui-datepicker-sr-RS-LATIN.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 16e8fce15 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 5 10:47:16 2012 +0000 Added in datepicker support for Serbian Latin. Also tested the previous changes on Windows IIS. ...jquery-ui-datepicker-sr-RS-LATIN.js (new) | 24 ++++++++++++++++++ web/js.inc | 3 +++ web/js/datepicker.js.php | 6 +++++ web/language.inc | 4 +-- 4 files changed, 35 insertions(+), 2 deletions(-) commit e1c20c5ee Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Nov 5 00:05:28 2012 +0000 Removed incorrect/unnecessary locale map entries. Serbian (Latin) still not tested on Windows, AIX or MacOS X server platforms. web/language.inc | 2 -- 1 file changed, 2 deletions(-) commit 572e621c7 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Nov 4 23:57:49 2012 +0000 Added Serbian (Latin) support - translation provided by 'knjigor' on the Sourceforge tracker. Needed some additional mappings/code in language.inc to support the unusual locale. Not yet tested on a Windows server environment. web/lang/lang.sr-rs-latin (new) | 510 ++++++++++++++++++++++++++++++ web/language.inc | 55 +++- 2 files changed, 560 insertions(+), 5 deletions(-) commit b1beea89b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 2 11:32:52 2012 +0000 Fixed bug where <span>s used for sorting the HTML table were appearing in the CSV and iCalendar reports. web/report.php | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) commit 04384272a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 31 12:45:36 2012 +0000 Fixed bug causing a datalist not to be presented for custom fields on the Report page even when $datalist_options is set. web/report.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit 438d799ab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 31 09:00:47 2012 +0000 Fixed problem with French translation (a temporary fix - I think there has to be a more elegant way of dealing with the requirement in French for a non breaking space before colons etc.) web/lang/lang.en | 1 + web/lang/lang.fr | 1 + web/report.php | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) commit 46d8b0c87 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 30 21:04:19 2012 +0000 Fixed bug preventing bookings being edited web/edit_entry.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) commit 44bcdde4c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 30 16:37:32 2012 +0000 Fixed bug introduced in Rev 2538 preventing drag-editing of bookings web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 463cca0f4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 30 11:51:36 2012 +0000 Fixed some HTML5 validation issues web/functions.inc | 32 +++++++++++++++++++++++++++++++- web/systemdefaults.inc.php | 8 ++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) commit 9b3446804 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 30 11:50:56 2012 +0000 Prevented E_USER_NOTICE errors being reported during normal MRBS operation (E_NOTICE errors are already ignored) web/internalconfig.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 149325265 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 30 10:56:16 2012 +0000 Fixed some HTML5 validation issues web/edit_entry.php | 29 ++++++++++++++++------------- web/edit_users.php | 3 ++- web/functions.inc | 37 ++++++++++++++++++++++--------------- 3 files changed, 40 insertions(+), 29 deletions(-) commit 51f49f481 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 30 09:04:46 2012 +0000 Added a server side check for Opera so that autocomplete can be turned on for datalists, in case JavaScript is disabled. (Left the client side check in just in case the server isn't passing through the user agent string). web/functions.inc | 11 ++++++++++- web/grab_globals.inc.php | 10 ++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) commit 5b43705be Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 29 15:44:45 2012 +0000 Extended support of $datalist_options to the same fields as $select_options web/edit_entry.php | 57 +++++++++++++----------------------- web/edit_users.php | 7 +---- web/functions.inc | 45 ++++++++++++++++++++++++++-- web/report.php | 6 +++- web/systemdefaults.inc.php | 5 ++-- 5 files changed, 72 insertions(+), 48 deletions(-) commit ba14bfd6f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 29 12:07:23 2012 +0000 Restructured code, moving the user check inside mrbsCheckPolicy() web/mrbs_sql.inc | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) commit defff463a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 29 11:21:19 2012 +0000 Fixed undefined index problems web/edit_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit a8ccf5a16 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 29 11:16:19 2012 +0000 Fixed undefined index problems web/functions_view.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 54a134b9e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 29 11:07:51 2012 +0000 Fixed undefined variable problem web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4c69adf28 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 28 09:12:46 2012 +0000 Converted autocomplete fields to use HTML5 <datalist> elements if supported, otherwise to fall back to the jQuery UI Autocomplete widget. Added ability for users to define $datalist_options in the config file to force a field to be treated as a datalist (only supported for entry.name at the moment). web/edit_entry.php | 12 ++-- web/functions.inc | 120 +++++++++++++++++++++++++++++++++++ web/js.inc | 16 +++-- web/js/general.js.php | 92 +++++++++++++++++++++++++++ web/js/report.js.php | 90 -------------------------- web/report.php | 53 ++++++++++++---- web/systemdefaults.inc.php | 27 ++++++-- 7 files changed, 291 insertions(+), 119 deletions(-) commit 8fb5eeb4e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 27 14:19:33 2012 +0000 Added some missing hidden inputs web/functions.inc | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) commit 1758b0261 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 27 14:00:35 2012 +0000 Added some missing HTML escaping web/functions.inc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) commit be6a33d15 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 26 15:09:37 2012 +0000 Fixed undefined variable bug introduced during recent restructuring web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e14fafdd3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 26 12:52:28 2012 +0000 Added a config variable to allow the order of the fields in the Presentation Options section of the Report form to be changed. web/report.php | 121 ++++++++++++++++++++++------------- web/systemdefaults.inc.php | 5 ++ 2 files changed, 83 insertions(+), 43 deletions(-) commit 251ac302a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 26 08:18:29 2012 +0000 Added a config variable to allow the order of the fields in the Search Criteria section of the Report form to be changed. web/report.php | 326 +++++++++++++++++++++-------------- web/systemdefaults.inc.php | 6 + 2 files changed, 199 insertions(+), 133 deletions(-) commit 2df6d9aa1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 25 16:33:36 2012 +0000 Restructured code web/report.php | 136 +++++++++++++++++++++++++++-------------------- 1 file changed, 78 insertions(+), 58 deletions(-) commit c323039ad Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 25 16:17:57 2012 +0000 Restructured code web/report.php | 313 +++++++++++++++++++++++++---------------------- 1 file changed, 170 insertions(+), 143 deletions(-) commit 5ac9dedee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 25 15:29:16 2012 +0000 Restructured code web/report.php | 434 +++++++++++++++++++++-------------------------- 1 file changed, 195 insertions(+), 239 deletions(-) commit d6d6baaf6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 24 17:05:21 2012 +0000 Extended generate_checkbox() web/functions.inc | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) commit 9f0739434 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 24 12:44:18 2012 +0000 Extended generate_select() to allow multiple selection web/functions.inc | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) commit e0b351ee6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 24 12:00:36 2012 +0000 Restructured code web/edit_entry.php | 4 ++-- web/functions.inc | 29 +++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 4 deletions(-) commit a5d1d61ac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 24 11:45:49 2012 +0000 Moved some JavaScript out of edit_entry.php web/edit_entry.php | 252 ++++++++++++++++--------------------- web/js/edit_entry.js.php | 2 + 2 files changed, 112 insertions(+), 142 deletions(-) commit cbbc29f9b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 24 10:27:27 2012 +0000 Restructured code web/edit_entry.php | 50 ++++++++++++++++++++------------- web/functions.inc | 67 ++++++++++++++++++++++++++------------------ 2 files changed, 70 insertions(+), 47 deletions(-) commit 047fa52cb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 24 09:26:27 2012 +0000 Simplified code web/edit_entry.php | 21 +++++++---------- web/edit_entry_handler.php | 17 -------------- web/edit_users.php | 7 ++---- web/functions.inc | 45 ++++++++++++++++++++++-------------- web/internalconfig.inc.php | 2 -- 5 files changed, 38 insertions(+), 54 deletions(-) commit 597bb9b23 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 22 16:53:57 2012 +0000 Restructured code so that the search, users and pending tables are more resilient to changes in column order web/edit_users.php | 12 +++++++++++- web/js/edit_users.js.php | 5 +++-- web/js/pending.js.php | 4 ++-- web/js/search.js.php | 3 ++- web/pending.php | 3 ++- web/search.php | 3 ++- 6 files changed, 22 insertions(+), 8 deletions(-) commit def71e4cc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 22 16:06:34 2012 +0000 Restructured code web/js/datatables.js.php | 41 +++++++++++++++++++++++++++++++++++--- web/js/report.js.php | 29 +++++---------------------- 2 files changed, 43 insertions(+), 27 deletions(-) commit c01298956 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 22 15:19:54 2012 +0000 Restructured code to be more resilient to changes in report column order web/js/report.js.php | 28 ++++++++++++++++++++++++---- web/report.php | 9 +++++---- 2 files changed, 29 insertions(+), 8 deletions(-) commit 0a9df873f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 22 14:06:42 2012 +0000 Fixed problem with filtering and sorting of reports (column numbers off by one) web/js/report.js.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) commit 1c82fc829 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 22 13:38:21 2012 +0000 Fixed bug preventing bulk delete working web/js/report.js.php | 2 +- web/report.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) commit 4ff36a27f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 22 13:09:44 2012 +0000 Minor tweak to translation web/lang/lang.fr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 031d2a039 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 22 12:01:28 2012 +0000 Fixed last fix properly web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f363acb71 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 22 10:12:42 2012 +0000 Fixed formatting problem on Report page in some languages web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2c8cdc3d2 Merge: 3f150bdde 785110d9d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 19 15:17:37 2012 +0000 Reintegrated the improved_repeat_interface back into the trunk. MRBS now has a simplified interface for making repeat bookings and the range of monthly repeats has been expanded. It is now possible to have monthly repeats on the last, second last, third last and fourth last weekdays of the month. (Last was possible before, but only if the first member of the series happened to be on the fifth weekday of a month). commit 785110d9d (origin/improved_repeat_interface) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 19 15:02:09 2012 +0000 Updated the Help information now that the repeat interface has been simplified web/site_faq.html | 60 +++++++++--------------------------------- web/site_faq_de.html | 4 +-- web/site_faq_es.html | 4 +-- web/site_faq_fr.html | 4 +-- web/site_faq_it.html | 4 +-- web/site_faq_nl.html | 4 +-- 6 files changed, 22 insertions(+), 58 deletions(-) commit c9a9d6fce Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 19 14:19:11 2012 +0000 Fixed bug causing booking name to be erased when dragging a booking web/edit_entry_handler.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) commit ed33b6004 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 17 21:09:43 2012 +0000 Merged in latest changes from the trunk web/dbsys.inc | 2 +- web/mysql.inc | 2 +- web/mysqli.inc | 2 +- web/pgsql.inc | 2 +- web/upgrade.inc | 14 +++++++------- 5 files changed, 11 insertions(+), 11 deletions(-) commit 3f150bdde Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 17 21:04:25 2012 +0000 Fixed bug in upgrade procedure causing the upgrade to fail if the number of rows affected by a query was zero. web/upgrade.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit b5078f1dd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 17 20:59:06 2012 +0000 Fixed bugs in table upgrade web/upgrade/33/pgsql.sql | 4 ---- web/upgrade/34/post.inc | 2 +- web/upgrade/35/pgsql.sql | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) commit 9d0ff7b62 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 16 19:44:38 2012 +0000 Fixed IE8 formatting issue web/css/mrbs-ie8.css | 4 ---- web/css/mrbs.css.php | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) commit 94cd3fb85 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 16 09:32:19 2012 +0000 Converted the day of the month field into a <select> box in order to remove any need for field validation. web/edit_entry.php | 11 ++++++++--- web/edit_entry_handler.php | 11 +++++------ 2 files changed, 13 insertions(+), 9 deletions(-) commit bb7335ff6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 15 16:44:15 2012 +0000 Made email notifications work with newstyle monthly repeats web/functions_mail.inc | 44 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) commit fe636e924 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 15 16:21:29 2012 +0000 Made iCalendar mail notifications work with new monthly repeats web/functions_ical.inc | 50 +++++++++++++++--------------------- web/internalconfig.inc.php | 1 - web/lang/lang.de | 1 - web/lang/lang.en | 1 - web/lang/lang.ja | 1 - 5 files changed, 21 insertions(+), 33 deletions(-) commit 1f8024725 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 15 15:40:33 2012 +0000 Restructured code web/functions.inc | 16 ++++++++++++---- web/functions_view.inc | 4 +--- 2 files changed, 13 insertions(+), 7 deletions(-) commit 47d0931a7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 15 15:25:18 2012 +0000 Made monthly repeats display properly in view_entry.php web/edit_entry.php | 2 +- web/functions_view.inc | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) commit 53575b96c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 15 15:04:04 2012 +0000 Made edit_entry recognise existing monthly bookings web/edit_entry.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) commit ed68dc398 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 15 07:47:37 2012 +0000 Added capability of making monthly bookings on any of first/second/third/fourth/last/second last/third last/fourth last weekday. web/css/mrbs.css.php | 3 + web/edit_entry.php | 53 +++++++++++++- web/edit_entry_handler.php | 132 +++++++++++++++++++++-------------- web/functions.inc | 49 ++++++++++++- web/functions_ical.inc | 4 -- web/functions_mail.inc | 2 +- web/internalconfig.inc.php | 11 ++- web/lang/lang.en | 11 ++- web/mrbs_sql.inc | 106 +++++++++++----------------- 9 files changed, 240 insertions(+), 131 deletions(-) commit 9a774cb6b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 14 13:09:06 2012 +0000 Got rid of "Monthly, corresponding day" option in list of repeat types web/edit_entry.php | 2 +- web/lang/lang.ca | 1 - web/lang/lang.cs | 1 - web/lang/lang.da | 1 - web/lang/lang.de | 1 - web/lang/lang.el | 1 - web/lang/lang.en | 1 - web/lang/lang.es | 1 - web/lang/lang.eu | 1 - web/lang/lang.fi | 1 - web/lang/lang.fr | 1 - web/lang/lang.he | 1 - web/lang/lang.hu | 1 - web/lang/lang.it | 1 - web/lang/lang.ja | 1 - web/lang/lang.ko | 1 - web/lang/lang.nl | 1 - web/lang/lang.no | 1 - web/lang/lang.pl | 1 - web/lang/lang.pt | 1 - web/lang/lang.pt-br | 1 - web/lang/lang.ru | 1 - web/lang/lang.sl | 1 - web/lang/lang.sv | 1 - web/lang/lang.th | 1 - web/lang/lang.tr | 1 - web/lang/lang.zh-cn | 1 - web/lang/lang.zh-tw | 1 - 28 files changed, 1 insertion(+), 28 deletions(-) commit dfc881f1e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 14 12:28:51 2012 +0000 Upgraded database, converting monthly_sameday repeats into monthly repeats with a month_relative field (eg "2TU" or "-1SU"). tables.my.pre41.sql | 3 +- tables.my.sql | 3 +- tables.pg.pre73.sql | 5 +-- tables.pg.sql | 5 +-- web/dbsys.inc | 2 +- web/functions.inc | 16 +++++++++ web/upgrade/34/mysql.sql (new) | 15 +++++++++ web/upgrade/34/pgsql.sql (new) | 7 ++++ web/upgrade/34/post.inc (new) | 57 ++++++++++++++++++++++++++++++++ web/upgrade/35/mysql.sql (new) | 10 ++++++ web/upgrade/35/pgsql.sql (new) | 4 +++ 11 files changed, 120 insertions(+), 7 deletions(-) commit 780852358 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 14 11:53:34 2012 +0000 Fixed bug in PostgreSQL upgrade (missed out deletion) web/upgrade/33/pg.sql (gone) | 4 ---- 1 file changed, 4 deletions(-) commit f5b264bc1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 14 09:57:29 2012 +0000 Fixed bug in PostgreSQL upgrade web/upgrade/33/pgsql.sql (new) | 4 ++++ 1 file changed, 4 insertions(+) commit b322c2915 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 12 19:08:08 2012 +0000 Added some error handling web/mrbs_sql.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 604bf8885 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 12 17:19:00 2012 +0000 Made repeat entries return to the calendar view showing the first entry web/edit_entry_handler.php | 335 +++++++++++++++++++---------------- 1 file changed, 178 insertions(+), 157 deletions(-) commit 3989d5ce4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 12 16:20:02 2012 +0000 Made the start time correspond to the start time of the first entry for a series (fixed bug for weekly bookings) web/mrbs_sql.inc | 125 +++++++++++++++++++++++---------------------- 1 file changed, 64 insertions(+), 61 deletions(-) commit 2e2d1345c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 12 14:05:06 2012 +0000 Made the start time correspond to the start time of the first entry for a series web/edit_entry_handler.php | 58 ++++++++++++++++++++++-------------- web/mrbs_sql.inc | 2 ++ 2 files changed, 37 insertions(+), 23 deletions(-) commit 959ba4276 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 12 12:26:01 2012 +0000 Changed monthly repeats in anticipation of combining monthly and monthly_sameday repeats. tables.my.pre41.sql | 5 +- tables.my.sql | 5 +- tables.pg.pre73.sql | 3 +- tables.pg.sql | 3 +- web/css/mrbs.css.php | 5 +- web/dbsys.inc | 2 +- web/edit_entry.php | 55 ++++++++++++++++--- web/edit_entry_handler.php | 7 +++ web/functions.inc | 94 ++++++++++++++++++++++++++------ web/functions_ical.inc | 22 ++++++-- web/functions_mail.inc | 13 ++++- web/functions_view.inc | 22 +++++--- web/internalconfig.inc.php | 4 ++ web/js/edit_entry.js.php | 3 + web/lang/lang.en | 2 + web/mrbs_sql.inc | 80 +++++++++++++++++++-------- web/upgrade/32/mysql.sql (new) | 15 +++++ web/upgrade/32/pgsql.sql (new) | 7 +++ web/upgrade/32/post.inc (new) | 52 ++++++++++++++++++ web/upgrade/33/mysql.sql (new) | 10 ++++ web/upgrade/33/pg.sql (new) | 4 ++ 21 files changed, 342 insertions(+), 71 deletions(-) commit d28a976cc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 11 10:55:28 2012 +0000 Corrected comments web/dbsys.inc | 2 +- web/mysql.inc | 2 +- web/mysqli.inc | 2 +- web/pgsql.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) commit 3a261914d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 11 08:52:21 2012 +0000 Added some JavaScript so that only the repeat form details appropriate to the selected repeat type are shown web/css/mrbs.css.php | 15 ++++++++++++++- web/edit_entry.php | 5 ++++- web/functions.inc | 10 +++++++--- web/js/edit_entry.js.php | 20 ++++++++++++++++++++ web/systemdefaults.inc.php | 3 ++- 5 files changed, 47 insertions(+), 6 deletions(-) commit 544746d35 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 10 15:46:12 2012 +0000 Got rid of N_WEEKLY repeat types and converted all WEEKLY and N_WEEKLY repeats into WEEKLY repeats with the appropriate repeat frequency tables.my.pre41.sql | 2 +- tables.my.sql | 2 +- tables.pg.pre73.sql | 2 +- tables.pg.sql | 2 +- web/dbsys.inc | 2 +- web/edit_entry.php | 30 ++++++++---------------------- web/edit_entry_handler.php | 6 +++--- web/functions_ical.inc | 9 ++++----- web/functions_mail.inc | 21 ++++++++++----------- web/functions_view.inc | 11 +++++------ web/internalconfig.inc.php | 1 - web/js/edit_entry.js.php | 2 +- web/lang/lang.ca | 1 - web/lang/lang.cs | 1 - web/lang/lang.da | 1 - web/lang/lang.de | 1 - web/lang/lang.el | 1 - web/lang/lang.en | 3 +-- web/lang/lang.es | 1 - web/lang/lang.eu | 1 - web/lang/lang.fi | 1 - web/lang/lang.fr | 1 - web/lang/lang.he | 1 - web/lang/lang.hu | 1 - web/lang/lang.it | 1 - web/lang/lang.ja | 1 - web/lang/lang.ko | 1 - web/lang/lang.nl | 1 - web/lang/lang.no | 1 - web/lang/lang.pl | 1 - web/lang/lang.pt | 1 - web/lang/lang.pt-br | 1 - web/lang/lang.ru | 1 - web/lang/lang.sl | 1 - web/lang/lang.sv | 1 - web/lang/lang.th | 1 - web/lang/lang.tr | 1 - web/lang/lang.zh-cn | 1 - web/lang/lang.zh-tw | 1 - web/mrbs_sql.inc | 17 +++++++---------- web/upgrade/31/mysql.sql (new) | 19 +++++++++++++++++++ web/upgrade/31/pgsql.sql (new) | 12 ++++++++++++ 42 files changed, 75 insertions(+), 92 deletions(-) commit 617a3dda4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 10 13:01:59 2012 +0000 Removed the "for weekly or n-weekly" note, in anticipation of weekly and n-weekly being merged web/edit_entry.php | 2 +- web/lang/lang.ca | 1 - web/lang/lang.cs | 1 - web/lang/lang.da | 1 - web/lang/lang.de | 1 - web/lang/lang.el | 1 - web/lang/lang.en | 1 - web/lang/lang.es | 1 - web/lang/lang.eu | 1 - web/lang/lang.fi | 1 - web/lang/lang.fr | 1 - web/lang/lang.he | 1 - web/lang/lang.hu | 2 -- web/lang/lang.it | 2 -- web/lang/lang.ja | 1 - web/lang/lang.ko | 1 - web/lang/lang.nl | 1 - web/lang/lang.no | 1 - web/lang/lang.pl | 1 - web/lang/lang.pt | 1 - web/lang/lang.pt-br | 1 - web/lang/lang.ru | 1 - web/lang/lang.sl | 1 - web/lang/lang.sv | 1 - web/lang/lang.th | 1 - web/lang/lang.tr | 1 - web/lang/lang.zh-cn | 1 - web/lang/lang.zh-tw | 1 - 28 files changed, 1 insertion(+), 30 deletions(-) commit c564ce6c4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 10 12:50:29 2012 +0000 Removed HTML escaping from form labels which are trusted and allowed to contain HTML web/functions.inc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) commit 444891fe6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 9 17:49:44 2012 +0000 Restructured code web/edit_entry.php | 162 +++++++++++++++++++------------------------ 1 file changed, 73 insertions(+), 89 deletions(-) commit 531abd95d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 9 16:05:14 2012 +0000 Merged in latest changes from the trunk web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1737af704 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 9 16:01:59 2012 +0000 Fixed bug causing fault in formatting of month view web/css/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b34e29c32 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 9 15:29:51 2012 +0000 Made the repeat day correspond to the calendar day, not the booking day web/edit_entry.php | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) commit 56d3bf13d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 9 15:12:05 2012 +0000 Fixed bug causing wrong date to be shown in the end date datepicker if the starttime was less than the duration away from the end of the booking day web/edit_entry.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit 55e866efd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 9 14:25:11 2012 +0000 Fixed bug causing the rep_day not to be checked web/edit_entry.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) commit 740d30da9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 9 13:07:42 2012 +0000 Fixed bug causing a JavaScript error when not logged in web/js/edit_entry.js.php | 75 ++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 35 deletions(-) commit c0a972b8c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 5 17:20:16 2012 +0000 Added missing HTML escaping web/functions.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 3971a64ff Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 5 17:10:50 2012 +0000 Restructured code web/edit_entry.php | 40 ++++++++++----------- web/edit_entry_handler.php | 9 +++++ web/edit_users.php | 6 ++-- web/functions.inc | 68 ++++++++++++++++++++++++++++++++++++ web/internalconfig.inc.php | 2 ++ 5 files changed, 99 insertions(+), 26 deletions(-) commit f86f6c1fa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 5 15:24:01 2012 +0000 Restructured code web/css/mrbs.css.php | 2 +- web/edit_entry.php | 219 +++++++++++------------ web/edit_users.php | 88 +++++----- web/functions.inc | 326 ++++++++++++++++++++++++++++------- web/functions_view.inc | 2 +- web/internalconfig.inc.php | 2 +- web/lang/lang.ca | 1 - web/lang/lang.cs | 1 - web/lang/lang.da | 1 - web/lang/lang.de | 1 - web/lang/lang.el | 1 - web/lang/lang.en | 3 +- web/lang/lang.es | 1 - web/lang/lang.eu | 1 - web/lang/lang.fi | 1 - web/lang/lang.fr | 1 - web/lang/lang.he | 1 - web/lang/lang.hu | 1 - web/lang/lang.it | 1 - web/lang/lang.ja | 1 - web/lang/lang.ko | 1 - web/lang/lang.nl | 1 - web/lang/lang.no | 1 - web/lang/lang.pl | 1 - web/lang/lang.pt | 1 - web/lang/lang.pt-br | 1 - web/lang/lang.ru | 1 - web/lang/lang.sl | 1 - web/lang/lang.sv | 1 - web/lang/lang.th | 1 - web/lang/lang.tr | 1 - web/lang/lang.zh-cn | 1 - web/lang/lang.zh-tw | 1 - web/report.php | 12 +- 34 files changed, 420 insertions(+), 260 deletions(-) commit 34f5e37ba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 4 14:11:49 2012 +0000 Filled in a default rep_day for new bookings web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 948359cda Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 4 08:49:21 2012 +0000 Created a branch for the development of an improved interface for the repeat options on the edit_entry form commit 0d168247f Merge: cec4a44fc c617517ec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 4 08:44:23 2012 +0000 Reintegrated the flexible_day_end branch back into the trunk. MRBS now supports booking days that span midnight (if $eveningends is before $morningstarts then it is assumed to be on the following day). At the same time a number of problems to do with DST handling have been fixed, particularly the display of the transition hours and the operation of MRBS in timezones where the DST change is not 1 hour. Also the use of the deprecated $is_dst parameter to mktime() has been eliminated. commit cec4a44fc Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Oct 3 21:01:50 2012 +0000 Updated version number post-release web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 16874c5ba (tag: mrbs-1_4_9) Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Oct 3 20:05:11 2012 +0000 Updated NEWS and ChangeLog for release ChangeLog | 2051 +++++++++++++++++++++++++++++++++++++++++++++++++++ NEWS | 106 +++ 2 files changed, 2157 insertions(+) commit 15fe112c6 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Oct 3 20:03:53 2012 +0000 Updated version number for release web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c617517ec (origin/flexible_day_end) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 3 19:43:09 2012 +0000 Merged in latest changes from the trunk web/import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ac4723523 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 3 19:35:57 2012 +0000 Added an HTML5 accept attribute to limit files to iCalendar files web/import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2e55de016 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 3 14:39:01 2012 +0000 Eliminated the use of the deprecated $is_dst parameter to mktime() web/import.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit ea4019470 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 3 14:11:37 2012 +0000 Fixed bug causing invalid time slots not to be displayed properly when the booking day was contained within the DST transition times (eg 0100-0200) web/functions.inc | 14 +++++++++++++- web/functions_table.inc | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) commit 06206fe5d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 3 13:33:02 2012 +0000 Fixed bug whereby the All Day checkbox was being sown when max_duration was less than all day web/edit_entry.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) commit ab7baf47a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 3 12:53:23 2012 +0000 Eliminated unnecessary conflict checking web/js/edit_entry.js.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit b1533474a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 3 12:22:45 2012 +0000 Simplified code web/edit_entry.php | 4 ++-- web/js/edit_entry.js.php | 19 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) commit b6ec62e98 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 3 11:26:42 2012 +0000 Fixed bug causing the last slot to be omitted from the list of slots web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 98620bc86 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 3 11:20:58 2012 +0000 Simplified code web/edit_entry.php | 2 +- web/js/edit_entry.js.php | 32 +++++++++++++++++--------------- 2 files changed, 18 insertions(+), 16 deletions(-) commit 1b9f1a12c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 3 10:29:55 2012 +0000 Removed redundant code web/js/edit_entry.js.php | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) commit ff3a9b274 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 3 10:24:45 2012 +0000 Restructured code web/js/edit_entry.js.php | 194 +++++++++++++++++++++---------------- 1 file changed, 108 insertions(+), 86 deletions(-) commit 211d779bd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 2 19:57:23 2012 +0000 Updated comments to reflect the ability to have a booking day spanning midnight. web/areadefaults.inc.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) commit 8d5c3e61a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 2 16:51:17 2012 +0000 Fixed bug with creating bookings spanning midnight when multiday bookings are not allowed web/edit_entry_handler.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) commit 5b567d37e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 2 15:29:25 2012 +0000 Tidied code web/functions.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit b1d7d0665 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 2 15:24:53 2012 +0000 Added an asterisk to denote "following day" web/functions.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit db6f302d2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 2 15:09:29 2012 +0000 Switched to operating with booking days rather than calendar days on the edit_entry form web/edit_entry.php | 77 +++++++++++++++++++------------------- web/js/edit_entry.js.php | 2 + 2 files changed, 41 insertions(+), 38 deletions(-) commit 897e670e5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 2 09:32:47 2012 +0000 Fixed bug where the correct end slot options weren't generated when the booking day was 24 hours long and didn't start at midnight. web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a8c3aabe8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 27 16:46:06 2012 +0000 Simplified code web/js/edit_entry.js.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 6588b51e1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 27 16:37:57 2012 +0000 Made edit_entry recognise all day bookings web/js/edit_entry.js.php | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) commit de2b1fc5b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 27 15:57:47 2012 +0000 Fixed bug causing the wrong length booking to be made when All Day is checked and the booking day spans midnight web/edit_entry_handler.php | 37 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 19 deletions(-) commit f1829e126 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 27 15:24:40 2012 +0000 Fixed bug when ticking the All Day checkbox with different start and end dates web/js/edit_entry.js.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit f5f09a960 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 27 15:13:59 2012 +0000 Made the all day checkbox work if the booking day spans midnight web/js/edit_entry.js.php | 63 ++++++++++++++++++++++++++------------ 1 file changed, 44 insertions(+), 19 deletions(-) commit e23fd63e8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 26 16:31:53 2012 +0000 Disabled checking for invalid slot times when using periods web/functions_table.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 32e9324b9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 26 16:27:18 2012 +0000 Disabled checking for invalid slot times when using periods web/js/edit_entry.js.php | 58 ++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 27 deletions(-) commit b600ad95c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 26 16:10:21 2012 +0000 Merged in latest changes from trunk web/report.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 0741e79e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 26 15:57:44 2012 +0000 Fixed bug when trying to export a report to a .ics file when the status is not "all". See SF Bugs #246 web/report.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 4f488a05f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 26 15:41:26 2012 +0000 Removed invalid time slots (ie those that don't exist when the transition to DST takes place) from the edit_entry form time select fields web/check_slot_ajax.php (new) | 39 ++++++++++++ web/edit_entry.php | 6 +- web/functions.inc | 105 +++++++++++++++++++------------ web/js/datepicker.js.php | 25 +++----- web/js/edit_entry.js.php | 106 ++++++++++++++++++++++++-------- web/mrbs_auth.inc | 1 + 6 files changed, 197 insertions(+), 85 deletions(-) commit 64971fe63 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 25 11:06:12 2012 +0000 Fixed bug introduced in last change when running on PHP < 5.3.0 (all times would be invalid) web/edit_entry.php | 26 +++++++++++----------- web/functions.inc | 21 ++++++++++++------ web/functions_table.inc | 46 +++++++++++++++++++-------------------- 3 files changed, 50 insertions(+), 43 deletions(-) commit fe251d57a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 25 09:19:29 2012 +0000 Blanked out time slots that don't exist from the day and week views, ie the time slots that start in the missing hour when the clocks go forward on the transition to DST. web/Themes/classic126/styling.inc | 1 + web/Themes/default/styling.inc | 1 + web/css/mrbs.css.php | 1 + web/functions.inc | 90 +++++++++++++++++++++++++++++ web/functions_table.inc | 60 ++++++++++++++----- 5 files changed, 138 insertions(+), 15 deletions(-) commit a60e6dea3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 19 17:17:59 2012 +0000 Simplified code web/js/edit_entry.js.php | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) commit 3539c956e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 19 17:01:49 2012 +0000 Moved some JavaScript out of edit_entry.php into edit_entry.js.php. At the same time fixed some issues with ticking the All Day checkbox when the day spans midnight. (Still some issues left to fix though). web/edit_entry.php | 57 +----------------- web/js/edit_entry.js.php | 117 +++++++++++++++++++++++++++---------- 2 files changed, 88 insertions(+), 86 deletions(-) commit 8821c516f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 19 15:06:03 2012 +0000 Got rid of some JavaScript global variables web/edit_entry.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) commit fb7ea8c3d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 19 14:55:35 2012 +0000 Rewrote large parts of functions_table.inc to improve handling of display of bookings on DST transition days web/edit_entry.php | 6 +- web/functions.inc | 61 ++++++- web/functions_table.inc | 354 ++++++++++++++++---------------------- 3 files changed, 203 insertions(+), 218 deletions(-) commit 38a222ed6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 19 08:38:35 2012 +0000 Fixed display of time labels for the day that has the transition to DST web/functions_table.inc | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) commit 05f245295 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 18 14:16:25 2012 +0000 Fixed a problem with the display of bookings that end in the middle of a transition out of DST web/functions.inc | 15 +++++++++++++++ web/functions_table.inc | 17 +++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) commit 023fda7b3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 14 15:31:21 2012 +0000 Made MRBS come back to the day you started at when creating a booking from the day view that starts past midnight web/edit_entry_handler.php | 17 +++++++++++++++++ web/functions_table.inc | 12 +----------- 2 files changed, 18 insertions(+), 11 deletions(-) commit bfc56c7f7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 14 14:26:20 2012 +0000 Fixed a bug in the cross_dst() calculation when operating in a timezone that has a DST transition time that is not one hour. (Only known example is Lord Howe Island in Australia, but never mind!). web/functions.inc | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) commit d0ca1ee60 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 14 11:52:25 2012 +0000 Fixed the display of cross DST transition bookings in the day and week views web/functions_table.inc | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) commit cbfec248e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 14 09:27:12 2012 +0000 Fixed handling of cross DST bookings web/edit_entry_handler.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) commit 667866642 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 13 15:19:12 2012 +0000 Made the day and week views behave sensibly when the booking day includes a DST transition web/functions_table.inc | 73 +++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 38 deletions(-) commit 41a048b4d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 13 14:20:43 2012 +0000 Eliminated use of the deprecated $is_dst parameter to mktime() web/functions.inc | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) commit 634b43f5c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 13 14:03:07 2012 +0000 Simplified code web/edit_entry.php | 1 - web/edit_entry_handler.php | 5 ++-- web/functions.inc | 46 ++++++++++++++++++++++++++++++++++++ web/functions_table.inc | 46 ------------------------------------ 4 files changed, 48 insertions(+), 50 deletions(-) commit 7ce3fdd3c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 13 13:45:52 2012 +0000 Simplified code web/functions_table.inc | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) commit 20db818b5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 13 13:27:13 2012 +0000 Simplified code web/functions_table.inc | 44 +++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 20 deletions(-) commit ed3e52307 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 13 13:11:10 2012 +0000 Simplified code web/functions.inc | 4 ++-- web/functions_table.inc | 22 +++++++++++++--------- 2 files changed, 15 insertions(+), 11 deletions(-) commit 1f17acc39 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 13 12:16:50 2012 +0000 Fixed month view to cope with $eveningends < $morningstarts web/month.php | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) commit cae131357 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 13 12:06:27 2012 +0000 Made the month view consistent with the day and week views: it now only displays bookings in the booking day (ie between morning_starts and evening_ends). web/month.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit dfdef44e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 13 11:56:45 2012 +0000 Fixed column widths in week view web/functions_table.inc | 4 ++++ 1 file changed, 4 insertions(+) commit 47dacee18 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 13 08:18:30 2012 +0000 Fixed the edit_entry form to cope with $eveningends < $morningstarts web/edit_entry.php | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) commit 713317252 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 12 15:52:31 2012 +0000 Fixed links in blank cells in the day and week views so that the day is correct if the cell starts past midnight web/functions_table.inc | 50 ++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 11 deletions(-) commit 04838d08b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 12 15:14:25 2012 +0000 Fixed week view to cope with $eveningends < $morningstarts web/functions_table.inc | 74 +++++++++++++++++++++++++-------------- 1 file changed, 48 insertions(+), 26 deletions(-) commit eb0b2b90a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 12 13:57:33 2012 +0000 Simplified code web/functions_table.inc | 45 +++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 25 deletions(-) commit ff033a1ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 12 13:20:50 2012 +0000 Fixed day view to cope with $eveningends < $morningstarts web/functions_table.inc | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) commit afd5eb856 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 12 12:51:57 2012 +0000 Allowed $evening_ends to be any time before $morning_starts the next day in the edit_area form. Next step to changer the calendar views. web/edit_area_room.php | 2 +- web/internalconfig.inc.php | 5 ++--- web/js/edit_area_room.js.php | 37 ++++++++++++++++++++-------------- 3 files changed, 25 insertions(+), 19 deletions(-) commit daa9f3a99 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 12 09:47:04 2012 +0000 Merged with latest changes from the trunk web/auth/auth_db.inc | 17 +++++++++++++---- web/auth/auth_db_ext.inc | 10 ++++------ web/dbsys.inc | 3 +++ web/mysql.inc | 3 +++ web/mysqli.inc | 3 +++ web/pgsql.inc | 3 +++ 6 files changed, 29 insertions(+), 10 deletions(-) commit 90e7089e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 12 09:25:17 2012 +0000 Fixed a bug in 'db' and 'db_ext' authentication schemes when using MySQL whereby a login was validated successfully even if the username contained trailing spaces. This then caused problems subsequently when comparing the creator of a booking with the user. See SF Bugs #245. web/auth/auth_db.inc | 17 +++++++++++++---- web/auth/auth_db_ext.inc | 10 ++++------ web/dbsys.inc | 3 +++ web/mysql.inc | 3 +++ web/mysqli.inc | 3 +++ web/pgsql.inc | 3 +++ 6 files changed, 29 insertions(+), 10 deletions(-) commit 300464ac4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 11 15:48:25 2012 +0000 Merged with latest changes from the trunk web/edit_area_room.php | 129 +++---------------------------- web/js/edit_area_room.js.php | 137 +++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+), 119 deletions(-) commit cb4b13456 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 11 15:43:51 2012 +0000 Moved Javascript out of edit_area_room.php into edit_area_room.js.php web/edit_area_room.php | 129 +++---------------------------- web/js/edit_area_room.js.php | 137 +++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+), 119 deletions(-) commit c8809ca46 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 11 10:34:23 2012 +0000 Created a new branch for the development of a day end past midnight commit 3ee95e977 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 11 09:10:07 2012 +0000 Fixed bug which meant that the datatables strings were not being translated web/language.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit dfe5147e3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 9 13:56:24 2012 +0000 Moved some JavaScript out of edit_entry.php into edit_entry.js.php web/edit_entry.php | 73 ------------------------------------- web/js/edit_entry.js.php | 74 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 73 deletions(-) commit 5945cc6f5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 8 17:16:36 2012 +0000 Fixed sorting and styling of integer custom fields in edit_users.php web/css/mrbs.css.php | 2 ++ web/edit_users.php | 14 ++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) commit fd2e85a6d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 7 15:59:57 2012 +0000 Fixed problem with users being unable to login when MRBS is running on IIS web/session/session_php.inc | 3 +++ 1 file changed, 3 insertions(+) commit 4e9a682ff Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 6 07:30:03 2012 +0000 Tidied previous change (again) web/functions_ical.inc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) commit 7f01e8936 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 5 16:57:53 2012 +0000 Tidied up last change web/functions_ical.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 78dd2188b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 5 16:46:45 2012 +0000 Removed a theoretical bug web/functions_ical.inc | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) commit c12f15d29 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 5 15:57:39 2012 +0000 Made utf8_bytecount() PHP4-safe. See SF bugs 243. web/language.inc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) commit e6d21b6f6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 5 14:21:11 2012 +0000 Kept track of how many Ajax requests are outstanding on the server so that we don't swamp the server with requests if for some reason the server is taking a long time to process them. See SF Support Request 258. web/js/edit_entry.js.php | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) commit 33a0bd2af Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 5 13:15:28 2012 +0000 Improved error handling when updating VTIMEZONE definitions. Now if MRBS is unable to download a new definition from the web, as will happen on sites that do not have external internet access, the last_updated field is updated anyway so that MRBS does not attempt to retry for another 28 days (default setting). Previously it would retry every time edit_entry_handler.php was executed. See also SF Support Request 258. web/functions_ical.inc | 53 ++++++++++++++++++++++++++---------- web/systemdefaults.inc.php | 4 ++- 2 files changed, 42 insertions(+), 15 deletions(-) commit 8a666d5ab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 3 16:20:02 2012 +0000 Added some error checking to distinguish between GET_LOCK timing out and returning an error. web/mysql.inc | 10 +++++++++- web/mysqli.inc | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) commit dafdfd5ab Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Aug 15 19:54:44 2012 +0000 Corrected minor typo in a comment. web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4ffb4b67e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 14 20:16:16 2012 +0000 Moved some JavaScript out of the php file and into the js file web/edit_entry.php | 155 ----------------------------------- web/internalconfig.inc.php | 14 ++++ web/js/edit_entry.js.php | 147 +++++++++++++++++++++++++++++++++ 3 files changed, 161 insertions(+), 155 deletions(-) commit b2d311de9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 14 19:53:35 2012 +0000 Fixed undeclared variable problem web/js/report.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 08d470dc7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 14 19:50:13 2012 +0000 Fixed undeclared variable problem web/js/datatables.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit db4305335 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 14 19:46:27 2012 +0000 Minor simplification web/js/resizable.js.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) commit 66fbbfffa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 14 17:10:24 2012 +0000 Fixed problems found in strict mode web/js/resizable.js.php | 968 +++++++++++++++++++------------------- 1 file changed, 486 insertions(+), 482 deletions(-) commit dd4756237 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 14 15:57:56 2012 +0000 Fixed undeclared variable problem web/js/edit_entry.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9c9cbbac6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 14 15:53:50 2012 +0000 Added a $use_strict internal configuration option to put the JavaScript into strict mode. Useful for debugging. web/internalconfig.inc.php | 12 +++++++++++- web/js/admin.js.php | 5 +++++ web/js/cell_click.js.php | 4 ++++ web/js/datatables.js.php | 4 ++++ web/js/datepicker.js.php | 4 ++++ web/js/edit_area_room.js.php | 5 +++++ web/js/edit_entry.js.php | 5 +++++ web/js/edit_users.js.php | 5 +++++ web/js/functions.js.php | 5 +++++ web/js/general.js.php | 4 ++++ web/js/multiple.js.php | 5 +++++ web/js/pending.js.php | 5 +++++ web/js/refresh.js.php | 5 ++++- web/js/report.js.php | 5 +++++ web/js/resizable.js.php | 5 +++++ web/js/search.js.php | 5 +++++ 16 files changed, 81 insertions(+), 2 deletions(-) commit 6ea6da1f8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 14 15:02:50 2012 +0000 Added some missing radix parameters to parseInt() calls web/edit_area_room.php | 8 ++++---- web/js/report.js.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) commit 7d73c1cdf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 14 07:36:35 2012 +0000 Created new arrays and objects using literals instead of new Array()/Object() web/edit_entry.php | 6 +++--- web/js/edit_users.js.php | 2 +- web/js/pending.js.php | 4 ++-- web/js/report.js.php | 2 +- web/js/search.js.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) commit ba7ef72e8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 13 21:36:59 2012 +0000 Added some missing semi-colons web/js/admin.js.php | 2 +- web/js/cell_click.js.php | 2 +- web/js/edit_area_room.js.php | 2 +- web/js/edit_entry.js.php | 2 +- web/js/edit_users.js.php | 3 ++- web/js/general.js.php | 2 +- web/js/multiple.js.php | 2 +- web/js/pending.js.php | 2 +- web/js/refresh.js.php | 3 ++- web/js/report.js.php | 2 +- web/js/resizable.js.php | 3 ++- web/js/search.js.php | 3 ++- 12 files changed, 16 insertions(+), 12 deletions(-) commit 0f3d08538 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 13 21:14:51 2012 +0000 Added some missing radix parameters to parseInt() calls web/js/edit_entry.js.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 5df70ad96 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 13 20:56:47 2012 +0000 Fixed some minor JavaScript errors web/js/edit_entry.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit f4d9170b4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 13 20:47:43 2012 +0000 Switched to creating new arrays using array literals web/js/edit_entry.js.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) commit 0fda3ce01 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 12 19:48:31 2012 +0000 Fixed bug introduced in last revision where refreshing wasn't disabled if $refresh_rate equals zero web/js/refresh.js.php | 62 ++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 28 deletions(-) commit f04649bb1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 12 19:15:36 2012 +0000 Fixed HTML5 validation issue web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a5620ead7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 12 19:11:43 2012 +0000 Implemented page refresh in the day and week views using Ajax requests if possible instead of through a <meta> tag. More efficient as only the main table is sent instead of the whole page. web/day.php | 75 +++++++++++++++-------------------- web/functions_table.inc | 36 ++++++++++++++++- web/js.inc | 13 +++++- web/js/refresh.js.php (new) | 50 +++++++++++++++++++++++ web/js/resizable.js.php | 6 +++ web/style.inc | 11 +++-- web/week.php | 40 ++++++++++--------- 7 files changed, 166 insertions(+), 65 deletions(-) commit c673b6264 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 12 08:41:50 2012 +0000 Updated Czech translation. Thanks to Ondřej Kopka. See SF patches #22. web/lang/lang.cs | 349 +++++++++++++++++++++++++++++++++------------ 1 file changed, 260 insertions(+), 89 deletions(-) commit 43244ffa3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 12 07:54:55 2012 +0000 Updated Japanese translation. Thanks to Takanori Matsuura. See SF patches #33. web/lang/lang.ja | 310 +++++++++++++++++++++++++++++++++------------ 1 file changed, 231 insertions(+), 79 deletions(-) commit 52e5855f9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 10 14:47:00 2012 +0000 Changed error level from WARNING to NOTICE when an entry isn't found, as this will happen quite legitimately if somebody else has deleted or edited an entry while you were looking at it. web/mrbs_sql.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 016b3a0f4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 9 16:10:32 2012 +0000 Changed the behaviour of the report page so that if .csv or .ics output is selected and there are no matching records then an empty file is produced, rather than a browser message that there are no matching entries. web/report.php | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) commit 3186934b2 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Aug 1 21:06:31 2012 +0000 Upgrade fixes as suggested in [bugs:#224] web/upgrade/17/post.inc | 68 ++++++++++++++++++++++++++++++++++++++ web/upgrade/24/post.inc | 66 ++++++++++++++++++++++++++++++++++++ web/upgrade/25/mysql.sql | 6 +++- web/upgrade/25/pgsql.sql | 6 +++- 4 files changed, 144 insertions(+), 2 deletions(-) commit 9a2f30f20 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 26 17:51:13 2012 +0000 Ignored VALARM comnponents inside VEVENTS as MRBS does not yet do reminders web/import.php | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) commit 714a2a5b5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 26 14:48:33 2012 +0000 Fixed bug which meant that "Room-Area" order did not work web/import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 25921531f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 25 16:35:19 2012 +0000 Trivial change to comment to test commit notifications web/day.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 75949b0db Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 25 15:50:45 2012 +0000 Fixed some potential bugs web/js/edit_users.js.php | 2 +- web/js/report.js.php | 2 +- web/js/search.js.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit a03ae35cf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 25 15:35:16 2012 +0000 Fixed JavaScript error when using an auth type other than 'db' web/js/general.js.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) commit 15c8fc8cb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 25 14:28:54 2012 +0000 Upgraded to Release 1.8.22 of jQuery UI .../ui/jquery-ui-1.8.16.custom.min.js (gone) | 356 ------------- .../ui/jquery-ui-1.8.22.custom.min.js (new) | 41 ++ web/jquery/ui/jquery-ui-i18n.js | 443 +++++++++++++---- web/js.inc | 2 +- 4 files changed, 397 insertions(+), 445 deletions(-) commit 10bb28d6a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 25 14:06:59 2012 +0000 Upgraded to jQuery Release 1.7.2 web/jquery/jquery-1.6.4.min.js (gone) | 4 ---- web/jquery/jquery-1.7.2.min.js (new) | 4 ++++ web/js.inc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) commit 2ab5800ca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 25 10:12:11 2012 +0000 Corrected Thai translation. Thanks to Suthep. web/lang/lang.th | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit bf5df207b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 23 14:44:55 2012 +0000 Fixed bug giving incorrect previous repeat end date in email notification when a booking is changed from an individual booking to a series. web/functions_mail.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 03ec465c0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 23 14:15:44 2012 +0000 Added some positive visual feedback when bookings are altered by dragging the cell border web/js/resizable.js.php | 18 +++++++++++++++++- web/lang/lang.en | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) commit e6b9076e4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 22 16:15:17 2012 +0000 Fixed bug on pending page where only a maximum of 10 members of a series were being displayed web/js/pending.js.php | 1 + 1 file changed, 1 insertion(+) commit 58e4d40c5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 22 15:20:38 2012 +0000 Added some SQL error reporting web/Themes/default/header.inc | 5 +++++ 1 file changed, 5 insertions(+) commit 98447092a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 22 14:16:49 2012 +0000 Minor change to test commit notifications web/edit_users.php | 1 + 1 file changed, 1 insertion(+) commit 924c75844 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 22 14:02:39 2012 +0000 Fixed HTML5 validation errors Added missing trailer on Add User form web/edit_users.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) commit 6ef186571 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 22 12:53:40 2012 +0000 Fixed colons after labels on new user form web/edit_users.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit fe7ee32d1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 20 15:00:47 2012 +0000 Fixed bug introduced in last revision causing $auth['only_admin_can_see_other_users'] not to work web/edit_users.php | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) commit 4d612e261 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 20 14:29:27 2012 +0000 Made the users table use an Ajax data source for better performance with large numbers of users web/edit_users.php | 296 ++++++++++++--------- web/jquery/datatables/css/mrbs-table.css | 6 + web/js/edit_users.js.php | 16 +- web/js/general.js.php | 8 + web/session/session_cookie.inc | 2 +- web/session/session_http.inc | 2 +- web/session/session_php.inc | 2 +- web/session/session_remote_user.inc | 2 +- 8 files changed, 207 insertions(+), 127 deletions(-) commit 4d06cb79b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 20 11:31:37 2012 +0000 Added a new config setting, $max_booking_date, to prevent bookings after a certain date, eg the end of term. Thanks to a suggestion by Matthew Hilling. web/lang/lang.en | 1 + web/mrbs_sql.inc | 20 +++++++++++++++++++- web/systemdefaults.inc.php | 8 ++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) commit 1816f2cc5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 19 08:13:23 2012 +0000 Moved the HTTP header generation into a function web/Themes/default/header.inc | 7 +------ web/functions.inc | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 10 deletions(-) commit 470d426f5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 19 06:57:38 2012 +0000 Added an HTTP header to prevent IE going into Compatibility View web/Themes/default/header.inc | 6 +++++- web/functions.inc | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) commit 9e9bee3e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 18 13:08:45 2012 +0000 Fixed minor typo in comment web/js/datatables.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3e1f19665 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 18 10:54:42 2012 +0000 Fixed more problems to do with Search and Report introduced during the JavaScript restructuring. (Disabled caching of some files which need to be dynamically generated) web/add.php | 2 +- web/admin.php | 2 +- web/approve_entry_handler.php | 2 +- web/day.php | 2 +- web/del.php | 2 +- web/del_entry.php | 2 +- web/del_entry_ajax.php | 2 +- web/edit_area_room.php | 2 +- web/edit_entry.php | 2 +- web/edit_entry_handler.php | 2 +- web/edit_users.php | 2 +- web/help.php | 2 +- web/import.php | 2 +- web/index.php | 2 +- web/js/admin.js.php | 2 +- web/js/cell_click.js.php | 2 +- web/js/datatables.js.php | 2 +- web/js/datepicker.js.php | 2 +- web/js/edit_area_room.js.php | 2 +- web/js/edit_entry.js.php | 2 +- web/js/edit_users.js.php | 2 +- web/js/functions.js.php | 2 +- web/js/general.js.php | 2 +- web/js/multiple.js.php | 2 +- web/js/pending.js.php | 2 +- web/js/report.js.php | 4 ++-- web/js/resizable.js.php | 2 +- web/js/search.js.php | 4 ++-- web/month.php | 2 +- web/pending.php | 2 +- web/report.php | 2 +- web/search.php | 2 +- web/view_entry.php | 2 +- web/week.php | 2 +- 34 files changed, 36 insertions(+), 36 deletions(-) commit 19552352f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 18 09:52:16 2012 +0000 Fixed various problems to do with Search and Report introduced during the JavaScript restructuring web/defaultincludes.inc | 8 ++++++-- web/js.inc | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) commit a4b6002fc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 17 10:22:46 2012 +0000 Removed eol-style property from timezone definition files (see SF ID 3535135) commit 8852d5bc2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 17 08:10:59 2012 +0000 Disabled Ajax conflict checking on the edit entry form if the user hasn't logged in. web/js/edit_entry.js.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit cafc2002b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 13 16:19:06 2012 +0000 Fixed bug (introduced during JavaScript restructuring) causing the units on the time slots on the edit_entry form not to be translated. web/language.inc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) commit 54e96ea7a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 13 14:08:22 2012 +0000 Fixed bug preventing resizable bookings from working when there's only one time slot or period in the day. web/day.php | 2 +- web/functions.inc | 6 ++++++ web/js/resizable.js.php | 10 ++++------ web/week.php | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) commit e1f82d94d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 12 20:07:58 2012 +0000 Fixed bug to do with .ics attachment name introduced during recent restructuring web/systemdefaults.inc.php | 4 ++++ 1 file changed, 4 insertions(+) commit 533c9d5f0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 11 17:52:10 2012 +0000 Fixed bug in summary table header when only using a single mode (periods/times) web/report.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) commit 2b941eb33 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 11 17:36:25 2012 +0000 Added comment web/systemdefaults.inc.php | 2 ++ 1 file changed, 2 insertions(+) commit 64a83ee3a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 11 16:53:05 2012 +0000 Fixed bug when producing reports using custom fields and a mandatory field which is a select box web/report.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit b7f51e999 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 11 16:42:08 2012 +0000 Restructured code to make it easier to add other output formats web/report.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 91f02f670 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 11 16:14:02 2012 +0000 Fixed bug - not sure what the manifestation would have been web/report.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5766b7527 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 11 15:28:46 2012 +0000 Restructured code web/css/mrbs.css.php | 1 + web/js/report.js.php | 14 ++ web/report.php | 329 +++++++++++++++++++---------------------- 3 files changed, 168 insertions(+), 176 deletions(-) commit 07a3ae845 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 10 14:59:56 2012 +0000 Removed the need for the error suppression operator when calculating the summary table, thus simplifying debugging by allowing development using error_reporting(-1). web/report.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) commit b7be14fdb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 10 14:41:23 2012 +0000 Restructured code web/report.php | 55 ++++++++++++++++++------------------------------ 1 file changed, 21 insertions(+), 34 deletions(-) commit 9f8db2b5a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 10 08:37:11 2012 +0000 Restructured code web/report.php | 522 ++++++++++++++++++++++++----------------------- 1 file changed, 265 insertions(+), 257 deletions(-) commit 08510936b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 9 09:44:24 2012 +0000 Restructured code slightly web/report.php | 25 ++++++++++++++++--------- web/systemdefaults.inc.php | 10 +++------- 2 files changed, 19 insertions(+), 16 deletions(-) commit b183d3910 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 8 15:45:14 2012 +0000 Simplified presentation of output options on report form. web/functions.inc | 24 ++++ web/internalconfig.inc.php | 37 ++++++ web/js/report.js.php | 25 +++- web/lang/lang.ca | 4 - web/lang/lang.cs | 4 - web/lang/lang.da | 4 - web/lang/lang.de | 8 +- web/lang/lang.el | 4 - web/lang/lang.en | 14 +-- web/lang/lang.es | 8 +- web/lang/lang.eu | 4 - web/lang/lang.fi | 4 - web/lang/lang.fr | 8 +- web/lang/lang.he | 8 +- web/lang/lang.hu | 8 +- web/lang/lang.it | 4 - web/lang/lang.ja | 6 - web/lang/lang.ko | 3 - web/lang/lang.nl | 6 - web/lang/lang.no | 8 +- web/lang/lang.pl | 4 - web/lang/lang.pt | 6 - web/lang/lang.pt-br | 6 - web/lang/lang.ru | 8 +- web/lang/lang.sl | 4 - web/lang/lang.sv | 6 - web/lang/lang.th | 8 +- web/lang/lang.tr | 10 +- web/lang/lang.zh-cn | 4 - web/lang/lang.zh-tw | 4 - web/report.php | 219 ++++++++++++++--------------------- 31 files changed, 187 insertions(+), 283 deletions(-) commit d329f810f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 6 15:53:05 2012 +0000 Fixed bug introduced during JavaScript reorganisation causing browser language settings not to be respected by the datepickers. web/js/datepicker.js.php | 117 ++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 68 deletions(-) commit d2bc22ed9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 6 15:10:10 2012 +0000 Made the Search box in the header an HTML5 "required" input to prevent users entering an empty search string web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e2c25ab22 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 6 15:06:33 2012 +0000 Moved JavaScript out of header.inc and into a separate directory web/Themes/default/header.inc | 3163 +------------------------- web/js.inc (new) | 193 ++ web/js/admin.js.php (new) | 46 + web/js/cell_click.js.php (new) | 44 + web/js/datatables.js.php (new) | 237 ++ web/js/datepicker.js.php (new) | 161 ++ web/js/edit_area_room.js.php (new) | 84 + web/js/edit_entry.js.php (new) | 839 +++++++ web/js/edit_users.js.php (new) | 27 + web/js/functions.js.php (new) | 27 + web/js/general.js.php (new) | 65 + web/js/multiple.js.php (new) | 43 + web/js/pending.js.php (new) | 145 ++ web/js/report.js.php (new) | 286 +++ web/js/resizable.js.php (new) | 1178 ++++++++++ web/js/search.js.php (new) | 64 + 16 files changed, 3443 insertions(+), 3159 deletions(-) commit 6e2008cec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 6 14:14:59 2012 +0000 Added a couple of extra headers to expires_header() to encourage caching web/functions.inc | 4 ++++ 1 file changed, 4 insertions(+) commit e1d0cc330 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 5 15:40:32 2012 +0000 Fixed bug causing resizable bookings not to work properly when using periods web/edit_entry_handler.php | 5 +++++ 1 file changed, 5 insertions(+) commit eb1abbbfe Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 5 09:15:40 2012 +0000 Made the search string an HTML5 'required' field web/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 03a1a7bd0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 5 09:12:26 2012 +0000 Fixed bug causing the wrong results to be returned if you happen to search for the text that is associated with the '' option in a mandatory custom field that uses a select box. web/report.php | 3 ++- web/search.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) commit dc97328ba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 2 11:12:56 2012 +0000 Moved css files into a separate directory web/{ => css}/mrbs-ie-rtl.css | 0 web/{ => css}/mrbs-ie.css | 0 web/{ => css}/mrbs-ie8.css | 0 web/{ => css}/mrbs-ielte6.css | 0 web/{ => css}/mrbs-ielte7.css.php | 8 ++++---- web/{ => css}/mrbs-ielte8.css | 0 web/{ => css}/mrbs-mail.css | 0 web/{ => css}/mrbs-print.css.php | 8 ++++---- web/{ => css}/mrbs-rtl.css.php | 8 ++++---- web/{ => css}/mrbs.css.php | 8 ++++---- web/functions_mail.inc | 2 +- web/style.inc | 18 +++++++++--------- 12 files changed, 26 insertions(+), 26 deletions(-) commit 63b64c8e6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 2 10:15:14 2012 +0000 Moved auth files into a separate directory web/{ => auth}/auth_auth_basic.inc | 0 web/{ => auth}/auth_config.inc | 0 web/{ => auth}/auth_crypt.inc | 0 web/{ => auth}/auth_db.inc | 0 web/{ => auth}/auth_db_ext.inc | 0 web/{ => auth}/auth_ext.inc | 0 web/{ => auth}/auth_imap.inc | 0 web/{ => auth}/auth_imap_php.inc | 0 web/{ => auth}/auth_ldap.inc | 0 web/{ => auth}/auth_nis.inc | 0 web/{ => auth}/auth_none.inc | 0 web/{ => auth}/auth_nw.inc | 0 web/{ => auth}/auth_pop3.inc | 0 web/{ => auth}/auth_smtp.inc | 0 web/mrbs_auth.inc | 2 +- 15 files changed, 1 insertion(+), 1 deletion(-) commit 15f136e76 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 2 09:37:47 2012 +0000 Moved session files into a separate directory web/mrbs_auth.inc | 2 +- web/{ => session}/session_cookie.inc | 0 web/{ => session}/session_host.inc | 0 web/{ => session}/session_http.inc | 0 web/{ => session}/session_ip.inc | 0 web/{ => session}/session_nt.inc | 0 web/{ => session}/session_omni.inc | 0 web/{ => session}/session_php.inc | 0 web/{ => session}/session_remote_user.inc | 0 9 files changed, 1 insertion(+), 1 deletion(-) commit d90be7073 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 2 09:11:25 2012 +0000 Updated Thai translation. Thanks to Suthep web/lang/lang.th | 66 +++++++++++++++++++++++++++++++--------------- 1 file changed, 45 insertions(+), 21 deletions(-) commit 3b6e8ae04 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 29 15:38:51 2012 +0000 Added some resilience to get_vocab() so that if a vocab string does not exist for a tag then the tag itself is returned. web/language.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 3dd9c826e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 29 15:28:11 2012 +0000 Removed redundant line of code web/language.inc | 2 -- 1 file changed, 2 deletions(-) commit b21071099 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 29 15:24:17 2012 +0000 Added an array of substitute languages, for example to substitute 'no' for 'nb-NO'. This can be useful when a translation for the default accept-language sent by a browser does not exist, but an adequate substitute does. For example, IE9 in a default Norwegian Windows installation sends 'nb-NO'. web/language.inc | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) commit a10e89566 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 29 14:02:27 2012 +0000 Updated Norwegian translation. Thanks to Thomas Haukland. web/lang/lang.no | 229 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 207 insertions(+), 22 deletions(-) commit 1c52ece17 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 28 16:42:53 2012 +0000 Moved lang files to a new lang directory web/{ => lang}/lang.ca | 0 web/{ => lang}/lang.cs | 0 web/{ => lang}/lang.da | 0 web/{ => lang}/lang.de | 0 web/{ => lang}/lang.el | 0 web/{ => lang}/lang.en | 0 web/{ => lang}/lang.es | 0 web/{ => lang}/lang.eu | 0 web/{ => lang}/lang.fi | 0 web/{ => lang}/lang.fr | 0 web/{ => lang}/lang.he | 0 web/{ => lang}/lang.hu | 0 web/{ => lang}/lang.it | 0 web/{ => lang}/lang.ja | 0 web/{ => lang}/lang.ko | 0 web/{ => lang}/lang.nl | 0 web/{ => lang}/lang.no | 0 web/{ => lang}/lang.pl | 0 web/{ => lang}/lang.pt | 0 web/{ => lang}/lang.pt-br | 0 web/{ => lang}/lang.ru | 0 web/{ => lang}/lang.sl | 0 web/{ => lang}/lang.sv | 0 web/{ => lang}/lang.th | 0 web/{ => lang}/lang.tr | 0 web/{ => lang}/lang.zh-cn | 0 web/{ => lang}/lang.zh-tw | 0 web/language.inc | 4 ++-- 28 files changed, 2 insertions(+), 2 deletions(-) commit 3902ec177 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 25 16:22:16 2012 +0000 Fixed bug causing the wrong custom validation message to be used by the browser when validating form fields web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3fddf6795 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 25 15:47:27 2012 +0000 - Fixed bug preventing the display of the brief description when editing an existing booking - Fixed bug relating to mandatory integer fields web/edit_entry.php | 18 ++++++++++++++---- web/functions.inc | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) commit bb9ada770 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 21 15:54:26 2012 +0000 Removed unnecessary default value for rep_num_weeks (was only in there for HTML5 validation, but empty value strings are now stripped out of the HTML) web/edit_entry.php | 1 - 1 file changed, 1 deletion(-) commit 9c71e42ea Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 21 15:24:36 2012 +0000 Used the HTML5 "number" type and "step" attribute for integer custom fields. web/edit_entry.php | 4 ++++ web/functions.inc | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) commit a90635470 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 21 14:24:16 2012 +0000 Made use of HTML5 form element attributes (eg "required") so that client-side form validation can be done by the browser where possible, instead of by JavaScript. web/Themes/default/header.inc | 46 ++-- web/edit_area_room.php | 4 +- web/edit_entry.php | 363 +++++++++++++++++++++----------- web/edit_entry_handler.php | 2 + web/edit_users.php | 4 +- web/functions.inc | 29 +-- web/lang.ca | 2 - web/lang.cs | 2 - web/lang.da | 2 - web/lang.de | 2 - web/lang.el | 2 - web/lang.en | 2 - web/lang.es | 2 - web/lang.eu | 2 - web/lang.fi | 2 - web/lang.fr | 2 - web/lang.he | 2 - web/lang.hu | 2 - web/lang.it | 2 - web/lang.ja | 2 - web/lang.ko | 2 - web/lang.nl | 2 - web/lang.no | 2 - web/lang.pl | 2 - web/lang.pt | 2 - web/lang.pt-br | 2 - web/lang.ru | 2 - web/lang.sl | 2 - web/lang.sv | 2 - web/lang.th | 4 +- web/lang.tr | 2 - web/lang.zh-cn | 2 - web/lang.zh-tw | 2 - web/mrbs.css.php | 2 +- web/search.php | 2 +- web/systemdefaults.inc.php | 8 + 36 files changed, 303 insertions(+), 213 deletions(-) commit 710185ce3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 14 14:10:05 2012 +0000 Added Hungarian translation. Thanks to Gergely Kiss. web/lang.hu (new) | 442 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 442 insertions(+) commit 3594aa196 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 24 19:54:18 2012 +0000 Fixed bug where the max bookings per period limit was being supposedly breached when editing an existing entry web/mrbs_sql.inc | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) commit c36183673 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 23 09:17:11 2012 +0000 Extended maximum number of bookings per day/week/month/etc so that they can be used per area as well as system wide. Note that you can set a setting per system as well as setting per area enabling you to set policies of the sort "Max 2 bookings per week in this area and max 5 bookings per week across the system". Note also that setting 0 bookings per period for an area is a way of stopping ordinary users from making bookings in a particular area. tables.my.pre41.sql | 12 ++++- tables.my.sql | 12 ++++- tables.pg.pre73.sql | 12 ++++- tables.pg.sql | 12 ++++- web/Themes/default/header.inc | 36 +++++--------- web/areadefaults.inc.php | 20 ++++++++ web/dbsys.inc | 2 +- web/edit_area_room.php | 80 +++++++++++++++++++++++++++--- web/functions.inc | 18 +++++++ web/internalconfig.inc.php | 18 +++++++ web/lang.en | 13 +++++ web/mrbs.css.php | 8 ++- web/mrbs_sql.inc | 84 +++++++++++++++++++++++--------- web/upgrade/30/mysql.sql (new) | 15 ++++++ web/upgrade/30/pgsql.sql (new) | 15 ++++++ 15 files changed, 296 insertions(+), 61 deletions(-) commit ad450e3b6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue May 8 16:07:58 2012 +0000 Added Portuguese Brazilian translation - thanks to Gleise S. O. Teixeira web/lang.pt-br (new) | 389 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 389 insertions(+) commit 30d794901 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 24 20:50:24 2012 +0000 Fixed bug that caused the ticks and crosses on the edit_entry page not to appear properly in some browsers (eg Chrome and IE8) on some systems. See SF ID 3521106. web/Themes/classic126/styling.inc | 2 +- web/Themes/default/styling.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 5895bafde Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 17 18:34:36 2012 +0000 Added support for setting limits on the maximum number of bookings that can be made per week, month, year and for any time in the future (day is already there). These are global settings, ie they count the total number of bookings over the whole system. Coming soon (?) the ability to set these limits on a per-area basis, as well as globally. web/functions.inc | 11 +++ web/functions_table.inc | 2 +- web/lang.en | 6 +- web/mrbs_sql.inc | 152 ++++++++++++++++++++++++----------- web/systemdefaults.inc.php | 26 ++++-- 5 files changed, 142 insertions(+), 55 deletions(-) commit 2a7b2e850 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 17 12:11:35 2012 +0000 Added a maximum limit on the total number of bookings that can be made for a day across all areas web/lang.en | 1 + web/mrbs_sql.inc | 65 ++++++++++++++++++++++++++++++++++-- web/systemdefaults.inc.php | 6 ++++ 3 files changed, 69 insertions(+), 3 deletions(-) commit 05ec1058c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 16 16:37:48 2012 +0000 Restructured code ahead of implementing max number of bookings web/mrbs_sql.inc | 64 ++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 36 deletions(-) commit fce66e40f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 10 17:42:56 2012 +0000 Added a missing global declaration to generate_trailer() web/trailer.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 923e69592 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Apr 10 14:24:28 2012 +0000 * Another tweak for include order, trailer.inc is now after language.inc, as it uses functions from language.inc. web/defaultincludes.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 90bc3fcb2 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Apr 10 14:22:06 2012 +0000 * Moved 'require_once' of trailer.inc earlier, so it can be used earlier. web/defaultincludes.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b7f23a651 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Apr 10 10:32:08 2012 +0000 * Fixed infinite loop in mrbs_default_timezone_set() when $timezone configuratation variable wasn't set. * Added missing 'global' definition in generate_trailer(). web/functions.inc | 4 ++-- web/trailer.inc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit 0ae3f8676 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Apr 10 09:58:31 2012 +0000 * Added a UTF-8 to UTF-16 (little-endian) conversion routine into language.inc, so you don't need iconv just to get UTF-16 CSV output. Made outputting a BOM the default, as it should never hurt, and some applications (Excel 2007 on Windows at least) don't understand UTF-16LE without a BOM. * Made trailer.inc more modular, you now call the function output_trailer() if you want to finish an MRBS page, instead of including trailer.inc. If you want the trailer somewhere else, the function generate_trailer() returns the trailer as a string. web/admin.php | 3 +- web/day.php | 3 +- web/defaultincludes.inc | 1 + web/del.php | 4 +- web/edit_area_room.php | 3 +- web/edit_entry.php | 4 +- web/edit_entry_handler.php | 2 +- web/edit_users.php | 2 +- web/functions.inc | 2 +- web/help.php | 2 +- web/import.php | 2 +- web/language.inc | 69 ++++++- web/month.php | 4 +- web/pending.php | 2 +- web/report.php | 12 +- web/search.php | 8 +- web/systemdefaults.inc.php | 11 +- web/trailer.inc | 343 ++++++++++++++++++----------------- web/view_entry.php | 2 +- web/week.php | 4 +- 20 files changed, 285 insertions(+), 198 deletions(-) commit 76725e30a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 9 14:52:58 2012 +0000 Fixed undefined variable problems in lang files web/language.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit bedfa9f1a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 8 18:30:50 2012 +0000 Removed resizable handles from print view web/mrbs-print.css.php | 1 + 1 file changed, 1 insertion(+) commit d81afe074 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 8 18:18:00 2012 +0000 Removed use of error control operator to make development debugging easier web/functions.inc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) commit fbcfa9f3e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 8 18:08:25 2012 +0000 Changed font colour for row and column labels in the calendar view when printing to make them show up better in Google Chrome web/Themes/default/styling.inc | 4 ++++ web/mrbs-print.css.php | 3 +++ 2 files changed, 7 insertions(+) commit 6d79439ec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 8 16:49:41 2012 +0000 Fixed bug causing an entry of '0' in a mandatory custom field to be rejected. web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7642d4a84 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 8 16:16:07 2012 +0000 Fixed performance issue when using LDAP authentication and HTTP sessions. Thanks to dwpoon. See SF ID: 3515309 web/session_http.inc | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) commit 4614ea662 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 4 15:57:55 2012 +0000 Fixed bug where resized bookings jump by one hour on the DST start and end days. Thanks to Henry S. Thompson web/edit_entry_handler.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) commit c080a57d0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 4 15:35:28 2012 +0000 Fixed bug which meant that the correct timezone wasn't necessarily being used when dragging a booking. web/edit_entry_handler.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) commit 0f1eef626 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Mar 26 14:28:34 2012 +0000 * Fixed sql_escape() usage so that the correct escape routine is used for the database system in use for 'db_ext' auth scheme. web/auth_db_ext.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 657dc1d00 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 26 09:25:53 2012 +0000 Changed SQL escaping from addslashes() to PHP escape functions. (addslashes() should not be used with PostgreSQL). Thanks to Henry S. Thompson. web/Themes/default/header.inc | 2 +- web/auth_db.inc | 6 +++--- web/auth_db_ext.inc | 2 +- web/dbsys.inc | 22 ++++++++++++++++++++++ web/edit_area_room.php | 20 ++++++++++---------- web/edit_users.php | 6 +++--- web/functions_ical.inc | 12 ++++++------ web/functions_mail.inc | 2 +- web/import.php | 8 ++++---- web/mrbs_sql.inc | 18 +++++++++--------- web/mysql.inc | 20 ++++++++++++++++++-- web/mysqli.inc | 20 ++++++++++++++++++-- web/pending.php | 2 +- web/pgsql.inc | 20 ++++++++++++++++++-- web/report.php | 10 +++++----- web/search.php | 6 +++--- web/upgrade/15/post.inc | 2 +- web/upgrade/21/post.inc | 2 +- web/upgrade/6/post.inc | 2 +- 19 files changed, 126 insertions(+), 56 deletions(-) commit b29c3a025 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 12 18:18:24 2012 +0000 Updated comments for entry types following the introduction of $vocab_override web/systemdefaults.inc.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) commit 892a06eb0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 9 12:56:08 2012 +0000 Optimised code web/language.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit d216fb21a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 9 12:38:04 2012 +0000 Tidied the code web/language.inc | 49 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 25 deletions(-) commit afc786ed7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 9 12:14:11 2012 +0000 Introduced the $vocab_override config variable, allowing MRBS text strings to be customised without editing the lang files, thus making it easier to upgrade when new versions of MRBS are released. Thanks to dwpoon. See SF ID 3499943 INSTALL | 20 ++++++++++++++------ UPGRADE | 8 ++++++++ web/edit_area_room.php | 12 +++++++----- web/edit_entry.php | 12 ++++++------ web/language.inc | 30 +++++++++++++++++++++++------- web/systemdefaults.inc.php | 13 +++++++++++++ 6 files changed, 71 insertions(+), 24 deletions(-) commit 50672a610 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 15 17:30:05 2012 +0000 Updated German translation. Thanks to JWiemann. web/lang.de | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) commit edb97f2b2 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Feb 3 12:27:00 2012 +0000 * Updated Turkish translation from Ahmet YILDIZ web/lang.tr | 206 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 197 insertions(+), 9 deletions(-) commit e3d9e1cfd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 29 18:08:46 2012 +0000 Added some comments and internationalised some text strings web/functions_ical.inc | 1 + web/import.php | 8 +++- web/lang.en | 86 ++++++++++++++++++++-------------------- 3 files changed, 51 insertions(+), 44 deletions(-) commit 5693e036a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 29 17:47:35 2012 +0000 Improved error handling web/import.php | 35 ++++++++++++++++++----------------- web/mrbs.css.php | 2 +- 2 files changed, 19 insertions(+), 18 deletions(-) commit f826c828a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 28 12:52:50 2012 +0000 Tweaked comment web/import.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit ec15bb1d7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 28 12:49:09 2012 +0000 Improved error handling for LOCATION property web/import.php | 16 +++++++++++++++- web/lang.en | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) commit 3550b1bd3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 27 21:48:05 2012 +0000 Tweaked title notes web/lang.en | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit c79f9e083 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 27 21:37:22 2012 +0000 Added some title notes to the import form web/import.php | 7 +++-- web/lang.en | 76 +++++++++++++++++++++++++----------------------- 2 files changed, 44 insertions(+), 39 deletions(-) commit 7fef2e835 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 27 19:32:52 2012 +0000 Fixed styling of import form web/import.php | 7 ++++++- web/lang.en | 2 ++ web/mrbs.css.php | 12 +++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) commit 2a8ba37df Merge: 781767a88 0a33ce2c1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 27 18:27:26 2012 +0000 Reintegrated ics_import branch. import.php is a utility (not linked to from the rest of MRBS) that can be used to import .ics files into MRBS. Still some tidying up to be done. commit 0a33ce2c1 (origin/ics_import) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 27 18:15:54 2012 +0000 Merged in latest changes from trunk web/Themes/default/header.inc | 1 - 1 file changed, 1 deletion(-) commit e46216527 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 27 18:08:32 2012 +0000 - added handling for the ORGANIZER property - fixed bug in export feature (fix should have gone into the trunk, but will re-integrate soon) web/functions_ical.inc | 56 ++++++++++++++++++++++++++++++++++++++++ web/functions_mail.inc | 1 + web/import.php | 13 ++++++++-- web/view_entry.php | 26 ++++++++++++++----- 4 files changed, 87 insertions(+), 9 deletions(-) commit 989106296 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 27 15:57:34 2012 +0000 Added improving parsing of iCalendar lines to ignore delimiters inside quoted strings. Thanks to John Beranek. web/functions_ical.inc | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) commit b7a4ff0e0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 27 12:03:29 2012 +0000 Fixed bug where reports could use periods when they should have used times (fix should maybe have gone into the trunk?) web/functions.inc | 11 +++++------ web/functions_view.inc | 2 +- web/mrbs_sql.inc | 4 ++-- web/report.php | 8 ++++---- 4 files changed, 12 insertions(+), 13 deletions(-) commit 3abcdb4bb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 27 11:15:03 2012 +0000 Fixed bug causing property parameters not to be recognised properly web/functions_ical.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit dd045d0ac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 27 10:34:05 2012 +0000 - supplied a name if SUMMARY is missing (a SUMMARY is optional in RFC 5545 but mandatory in MRBS) - supplied a UID if missing (it's mandatory in RFC 5545 but we'll be tolerant) web/import.php | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) commit fb7d3a27b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 27 10:00:08 2012 +0000 - Fixed bug so that valid files ending in CRLF are accepted - Improved handling of badly formed .ics files web/import.php | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) commit 90b7d7111 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 26 17:37:04 2012 +0000 Got rid of the "Test" feature - it was never going to work. web/import.php | 161 +++++++++++++++++++---------------------------- web/lang.en | 1 - 2 files changed, 63 insertions(+), 99 deletions(-) commit 0fe01302a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 26 15:41:05 2012 +0000 Initial attempt at import utility. Still lots of tidying up to do web/Themes/default/header.inc | 4 +- web/edit_entry_handler.php | 2 +- web/functions_ical.inc | 33 ++++---- web/import.php | 142 ++++++++++++++++++++++++++------ web/lang.en | 13 +++ web/mrbs_sql.inc | 10 ++- 6 files changed, 158 insertions(+), 46 deletions(-) commit 781767a88 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 26 14:37:24 2012 +0000 Switched to using relative rather than absolute pathnames when using an Ajax source for DataTables in Search and Report, preventing a bug resulting in a 301 code as a result of a cross-domain request when a page is being served as https web/Themes/default/header.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit e2a963010 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 23 18:28:01 2012 +0000 Restructured edit_entry_handler.php moving the core booking code out into a function web/edit_entry_handler.php | 409 ++++++----------------------------- web/functions_mail.inc | 12 +- web/mrbs_sql.inc | 300 ++++++++++++++++++++++++- 3 files changed, 374 insertions(+), 347 deletions(-) commit a725823d1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 23 14:35:01 2012 +0000 Committing code before making some changes to edit_entry_handler.php. All that happens at the moment is that areas and rooms are created if necessary, but no bookings are made. web/add.php | 100 +--------- web/functions.inc | 16 ++ web/functions_ical.inc | 286 +++++++++++++++++++++++++- web/import.php (new) | 420 +++++++++++++++++++++++++++++++++++++++ web/lang.en | 25 +++ web/mrbs_auth.inc | 1 + web/mrbs_sql.inc | 136 +++++++++++++ 7 files changed, 886 insertions(+), 98 deletions(-) commit d34be7370 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 19 13:50:50 2012 +0000 Created a branch for the development of a facility to import .ics files commit 6483d3d5d Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jan 17 19:34:40 2012 +0000 * A fix for auth_ldap configuration variable handling, as supplied by Kevan Carstensen on the mailing list. web/auth_ldap.inc | 4 ++++ 1 file changed, 4 insertions(+) commit df6ef0404 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 12 15:56:14 2012 +0000 Fixed bug which meant that the default action on hitting Enter on forms with two submit buttons was not necessarily to save the form. web/Themes/default/header.inc | 23 +++++++++++++++++++++++ web/edit_area_room.php | 4 ++-- web/edit_entry.php | 2 +- web/edit_users.php | 2 +- 4 files changed, 27 insertions(+), 4 deletions(-) commit 313da6558 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 12 11:37:26 2012 +0000 Fixed JavaScript error when there are no rooms defined in an area in the day and week views web/Themes/default/header.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 7d9738ea1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 11 18:36:20 2012 +0000 Fixed minor styling issue web/edit_entry.php | 2 +- web/mrbs.css.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 9e6386871 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 11 18:33:28 2012 +0000 Fixed a problem where the "All Day" label was not associated with the All Day checkbox web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit df6d822e5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 11 18:15:20 2012 +0000 Changed the way max_book_ahead works so that it tests the end time of a proposed booking rather than the start time. This is to prevent users abusing the system by using a very long duration to book the slot they want. web/lang.en | 2 +- web/mrbs_sql.inc | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) commit 9e6c0a81f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 11 17:49:16 2012 +0000 Following on from Rev 2240, applied the same fix to the datatables initialisation so that the correct (expected) language is also used for datatables. web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 442b8bf19 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 11 17:29:55 2012 +0000 Fixed JavaScript error produced if you have a mandatory textarea field. Thanks to Neil Brown. See SF ID 3472380 web/edit_entry.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit e4ff3ccba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 11 11:48:20 2012 +0000 Fixed minor problem which caused the browser's language preferences to be interpreted slightly unexpectedly, even if possibly strictly correctly, when two or more languages had the same qualifier. The languages' preference order expected by the user, from the list of languages in the browser options, would be reversed. The problem could be demonstrated for example by setting the following order of preference in Firefox: en-gb, en, th, he, de, fr-fr, fr, ru, sv, pt, no, en-us, it, ko. MRBS would put th before en - strictly speaking correct as they were both presented with a qualifier of 0.9, but not what the user would be expecting. web/language.inc | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) commit 6fad0c74c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 10 19:32:43 2012 +0000 Added Thai language support. Contributed by Suthep. web/lang.th (new) | 403 ++++++++++++++++++++++++++++++++++++++++++++ web/language.inc | 3 + 2 files changed, 406 insertions(+) commit 4c93254be Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 6 10:36:23 2012 +0000 Fix for bug which prevented resizable bookings or clicking on empty cells working in the week view when using $hidden_days web/Themes/default/header.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 28b78d0e5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 5 19:35:07 2012 +0000 Removed redundant global declaration web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c3527ff41 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 5 13:17:53 2012 +0000 Made resizable bookings and drag-select for new bookings work when the table direction is right to left (as it is in Hebrew) web/Themes/default/header.inc | 107 ++++++++++++++++++++++++-------- 1 file changed, 82 insertions(+), 25 deletions(-) commit b7324ad37 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 4 22:34:39 2012 +0000 Added in Hebrew language support, contributed by Michal Kastro (see SF ID 3469334). For the moment I have disabled resizable bookings and drag-selection for new bookings when using Hebrew, as the existing JavaScript code assumes a left to right model. I'll have to come back and fix this sometime. web/Themes/default/header.inc | 7 +- web/lang.he (new) | 421 ++++++++++++++++++++++++++++++++ web/language.inc | 9 +- web/mrbs-ie-rtl.css (new) | 20 ++ web/mrbs-rtl.css.php (new) | 236 ++++++++++++++++++ web/style.inc | 25 +- 6 files changed, 710 insertions(+), 8 deletions(-) commit 7bfc75a56 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 4 18:51:03 2012 +0000 Fixed bug where clicking on the "+" symbol didn't take you to the edit_entry form. web/Themes/default/header.inc | 5 +++++ 1 file changed, 5 insertions(+) commit 25b88b2ee Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Jan 1 22:39:32 2012 +0000 * Updated version number post-release. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f8bc095f4 (tag: mrbs-1_4_8) Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Jan 1 21:47:32 2012 +0000 * Updated ChangeLog and NEWS for 1.4.8 release. ChangeLog | 4060 +++++++++++++++++++++++++++++++++++++++++++++++++++ NEWS | 150 ++ 2 files changed, 4210 insertions(+) commit eb9a3b720 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Jan 1 16:16:08 2012 +0000 * Updated version number to 1.4.8. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2931c6e57 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 1 13:00:48 2012 +0000 Limited the timezones presented in the timezone drop-down box on the Edit Area page to those that have a corresponding VTIMEZONE definition web/edit_area_room.php | 41 +++++++++++++++++++++++------------- web/functions_ical.inc | 13 ++++++------ web/internalconfig.inc.php | 8 +++++++ web/systemdefaults.inc.php | 4 ++++ 4 files changed, 44 insertions(+), 22 deletions(-) commit 4ef4eb534 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 31 13:41:12 2011 +0000 Eliminated undefined index messages web/edit_entry_handler.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 0e29b2151 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 31 13:35:15 2011 +0000 Eliminated undefined variable message web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7490fd9d4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 31 13:24:49 2011 +0000 Preserved the disabled state of the All Day checkbox when switching between areas web/Themes/default/header.inc | 5 +++-- web/edit_entry.php | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) commit 0344755d5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 31 11:32:08 2011 +0000 Fixed two bugs: (1) Undefined index error if a mandatory field is defined in the config file but doesn't exist in the database (2) MRBS not picking up mandatory integer fields when JavaScript is disabled web/edit_entry_handler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 93fd34afe Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 31 11:06:23 2011 +0000 Fixed problem with spurious error message being triggered web/auth_db.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit d1b10e345 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 31 10:45:20 2011 +0000 Fixed another instance of date() being called before the timezone had been set, resulting in PHP warning web/functions.inc | 3 +++ 1 file changed, 3 insertions(+) commit 3771bca36 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 30 10:28:57 2011 +0000 Removed redundant global declaration web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7c6b63cb8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 30 10:22:47 2011 +0000 Added comment web/functions.inc | 2 ++ 1 file changed, 2 insertions(+) commit 83dcae840 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 30 10:06:32 2011 +0000 Made MRBS more resilient to NULL values for resolution in the area table web/edit_entry.php | 2 ++ web/functions.inc | 73 +++++++++++++++++++++++++++++--------------- 2 files changed, 50 insertions(+), 25 deletions(-) commit a3c35bcf8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 29 18:25:41 2011 +0000 Eliminated undefined index error web/edit_area_room.php | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) commit d14c12584 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 29 17:14:25 2011 +0000 Added support for displaying the week number in the month view if $view_week_number is set web/month.php | 12 ++++++++++-- web/mrbs.css.php | 9 ++++++--- web/systemdefaults.inc.php | 3 ++- 3 files changed, 18 insertions(+), 6 deletions(-) commit 10bc60339 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 29 15:32:47 2011 +0000 Added the ability to display the mini calendars at the bottom, if $display_calendars_bottom is set to true. Based on a patch from Daniel Yule. web/day.php | 23 +++++++++++++---------- web/mincals.inc | 2 +- web/month.php | 19 ++++++++++++------- web/mrbs.css.php | 4 ++-- web/systemdefaults.inc.php | 4 ++++ web/week.php | 17 ++++++++++------- 6 files changed, 42 insertions(+), 27 deletions(-) commit 3c1e2743c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 28 21:50:07 2011 +0000 Fixed bug in last commit: the all_day checkbox would not be displayed if the user was an admin web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d9955df98 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 28 21:41:49 2011 +0000 Ensured that the “all day” check box only appears if the maximum booking duration allows that length of booking. Based on a patch from Daniel Yule web/Themes/default/header.inc | 17 ++++--- web/edit_entry.php | 82 ++++++++++++++++++++++----------- web/internalconfig.inc.php | 1 + 3 files changed, 67 insertions(+), 33 deletions(-) commit fef948478 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 28 21:22:35 2011 +0000 Fixed another instance of date() being called before the timezone had been set, resulting in PHP warning web/Themes/default/header.inc | 3 +++ web/functions.inc | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) commit fb59ee08d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 28 17:12:49 2011 +0000 Fixed bug where date() was being called before the timezone had been set, resulting in PHP warning web/standard_vars.inc.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) commit c91989068 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 24 09:27:00 2011 +0000 Made $timezone a per-area setting. Based on input from Chris Thompson. tables.my.pre41.sql | 3 +- tables.my.sql | 3 +- tables.pg.pre73.sql | 3 +- tables.pg.sql | 3 +- web/config.inc.php | 4 ++ web/dbsys.inc | 2 +- web/edit_area_room.php | 72 ++++++++++++++++++++++++++++++++ web/functions.inc | 57 ++++++++++++++++++------- web/functions_ical.inc | 2 +- web/internalconfig.inc.php | 1 + web/systemdefaults.inc.php | 6 ++- web/upgrade/29/mysql.sql (new) | 6 +++ web/upgrade/29/pgsql.sql (new) | 7 ++++ 13 files changed, 147 insertions(+), 22 deletions(-) commit 0fbdb8bba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 21 22:44:17 2011 +0000 Fixed bug which prevented owner buttons appearing web/view_entry.php | 2 ++ 1 file changed, 2 insertions(+) commit 6c7408f3b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 21 22:18:04 2011 +0000 Fixed the Ajax checking so that it can cope with array fields consisting of multiple inputs, which will arise when the rooms field is disabled, eg <input type="hidden" name="rooms[]" value="1"> <input type="hidden" name="rooms[]" value="2"> etc. web/Themes/default/header.inc | 50 ++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 22 deletions(-) commit 081a0a098 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 21 17:07:21 2011 +0000 Fixed HTML error when using disabled rooms field web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ab6ad460c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 21 16:53:15 2011 +0000 Fixed HTML validation errors web/session_cookie.inc | 1 + web/session_php.inc | 1 + 2 files changed, 2 insertions(+) commit 32a1b6a17 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 21 16:20:51 2011 +0000 Removed explanation of how to use the All Day checkbox if it's disabled web/edit_entry.php | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) commit e07981517 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 21 15:39:11 2011 +0000 - Removed the $room_names variable, which as far as I can see was introduced in MRBS 1.2.1 but has never been used for anything and was causing undefined variable errors now that it's inside a function (or rather the index $i was undefined) - Added an optional $disabled parameter (defaulting to FALSE) to the create_field_entry_*() functions to allow the field to be disabled web/edit_entry.php | 134 +++++++++++++++++++++++++++++-------------- 1 file changed, 91 insertions(+), 43 deletions(-) commit a94f17bf1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 20 15:59:11 2011 +0000 Removed some HTML whitespace and replaced some tabs by spaces web/edit_entry.php | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) commit c05911c27 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 20 15:50:25 2011 +0000 Replaced some tabs by spaces web/Themes/default/header.inc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) commit 7b7f073de Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Dec 17 20:05:28 2011 +0000 * Added option to auth_ldap to disable client referrals. Provided by Daniel Yule. web/auth_ldap.inc | 11 +++++++++-- web/systemdefaults.inc.php | 4 ++++ 2 files changed, 13 insertions(+), 2 deletions(-) commit 82feb9768 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 16 19:02:05 2011 +0000 Updated French translation web/lang.fr | 116 +++++++++++++++++++++++++++++--------------------- 1 file changed, 67 insertions(+), 49 deletions(-) commit 2d63d14e5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 16 18:06:43 2011 +0000 Escaped JavaScript strings web/edit_entry.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) commit c0e182a26 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 16 16:24:26 2011 +0000 Ensured that if a new booking is selected and the default duration takes the booking past the end of the booking day, then the default end time is the end of the booking day (rather than the start time + resolution, as at present) web/edit_entry.php | 3 +++ 1 file changed, 3 insertions(+) commit 4b7b690fb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 8 22:03:04 2011 +0000 Tweaked formatting of ColVis menu web/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit d97ca5309 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 8 20:35:07 2011 +0000 Fixed bug which prevented localised text strings appearing in the Column Visibility menu in Report web/Themes/default/header.inc | 4 ++-- web/mrbs.css.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) commit 0f7d870c7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 8 20:09:22 2011 +0000 Updated French translation web/lang.fr | 4 ++++ 1 file changed, 4 insertions(+) commit 0c42ff0f5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 7 16:50:28 2011 +0000 Fixed some unescaped JavaScript strings web/Themes/default/header.inc | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) commit c694712fd Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Wed Nov 23 20:56:43 2011 +0000 Remove non-breaking space in display of custom fields - was escaped later and displayed literally web/functions_view.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f6148e9ec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 23 17:42:04 2011 +0000 Fixed JavaScript error when $max_duration_enabled is false. Thanks to Henry Thompson. web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 570530b5d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 23 10:19:07 2011 +0000 Fixed undefined variable notice web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ab87ee379 Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Wed Nov 23 06:40:37 2011 +0000 hide DataTable buttons in print web/mrbs-print.css.php | 6 ++++++ 1 file changed, 6 insertions(+) commit 53c08b1f3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 23 06:38:57 2011 +0000 Reverted last change web/edit_entry.php | 1 - 1 file changed, 1 deletion(-) commit 88218f3d2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 23 04:46:27 2011 +0000 Fixed undefined variable notice web/edit_entry.php | 1 + 1 file changed, 1 insertion(+) commit 2966e3969 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 23 04:36:12 2011 +0000 Took account of days in calculating the duration when maximum duration is enabled web/Themes/default/header.inc | 44 +++++++++++++++++++++++++++++---- web/edit_entry.php | 5 ++++ web/mrbs.css.php | 2 ++ 3 files changed, 46 insertions(+), 5 deletions(-) commit eaa5d5123 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 22 23:14:43 2011 +0000 Restricted the options available in the end time selector to those permitted if a maximum duration has been specified web/Themes/default/header.inc | 26 ++++++++++++++++++++++++-- web/edit_entry.php | 5 +++++ 2 files changed, 29 insertions(+), 2 deletions(-) commit ac58f324f Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Tue Nov 22 20:49:39 2011 +0000 Make it possible to reorder fields in edit_entry (useful for custom fields) web/edit_entry.php | 71 ++++++++++++++++++++++++++++++------ web/systemdefaults.inc.php | 16 +++++++- 2 files changed, 74 insertions(+), 13 deletions(-) commit 7cbbd4074 Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Tue Nov 22 20:46:29 2011 +0000 edit_entry: move creation of form elements into function (except options for repeat), so they can later be reordered. HTML output is the same (except some whitespace) web/edit_entry.php | 763 +++++++++++++++++++++++-------------------- 1 file changed, 403 insertions(+), 360 deletions(-) commit 3ba8c4a8d Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Tue Nov 22 19:10:52 2011 +0000 Spelling fixes web/Themes/default/header.inc | 4 ++-- web/edit_entry.php | 2 +- web/edit_entry_handler.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) commit 77a8c5cb1 Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Tue Nov 22 19:08:27 2011 +0000 Corrections to German language file web/lang.de | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) commit 0d7ae75a2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 21 19:58:31 2011 +0000 Simplified code web/Themes/default/header.inc | 40 ++++++++++++++------------------- 1 file changed, 17 insertions(+), 23 deletions(-) commit e41b594c3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 21 05:13:37 2011 +0000 Fixed bug which was causing the table for the wrong day to be displayed after dragging the last day of a multi-day booking in the week view web/Themes/default/header.inc | 6 +++++- web/edit_entry_handler.php | 13 ++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) commit eff45c7b6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 21 04:47:22 2011 +0000 Stopped multiday bookings being dragged by non-admins if $auth['only_admin_can_book_multiday'] is set. web/Themes/default/header.inc | 13 +++++++++++++ 1 file changed, 13 insertions(+) commit 1b4e19a1a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 21 03:41:22 2011 +0000 Disabled dragging on multi-day bookings except for extending the start and end times web/Themes/default/header.inc | 81 +++++++++++++++++++++++++++++---- web/functions_table.inc | 68 +++++++++++++++++++++------ 2 files changed, 127 insertions(+), 22 deletions(-) commit 31fa7f77f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 19 04:02:59 2011 +0000 Fixed bug whereby dragging multi-day bookings in the week view wasn't working properly. web/Themes/default/header.inc | 38 ++++++++++++++++++++++----------- web/edit_entry_handler.php | 15 +++++++++++++ 2 files changed, 41 insertions(+), 12 deletions(-) commit 01c0ccfe4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Nov 12 07:19:15 2011 +0000 Fixed bug with time format being incorrectly displayed in the week view web/functions_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 21af94f8f Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Sat Nov 12 06:45:50 2011 +0000 edit_entry: make ajax calls send rep_day[] correctly, so that weekly repeats are properly checked Before this change, rep_day[] was not correctly set, which led to edit_entry_handler assuming that weekly repeats all were on a sunday (only on ajax requests, the normal booking worked correctly) This change affects two things: - the correct name is now checked when deciding if the input has an array type - multiple checkbox entries with the same name are merged. There are probably better/more elegant ways to do this (suggestions welcome). web/Themes/default/header.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) commit 2984834e3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 3 16:36:49 2011 +0000 Fixed bug causing the reminder intervals for bookings that need to be approved to be ignored web/view_entry.php | 7 +++++++ 1 file changed, 7 insertions(+) commit 490887468 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 3 16:18:30 2011 +0000 Fixed formatting of buttons on view_entry page web/jquery/datatables/css/mrbs-table.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bf7501b4b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 3 16:10:39 2011 +0000 Eliminated undefined variable notices web/edit_entry.php | 4 ++++ 1 file changed, 4 insertions(+) commit 346d3754f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 3 14:54:13 2011 +0000 Eliminated uninitialized string offset notices web/language.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 77d8620c9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 3 14:41:20 2011 +0000 Eliminated undefined index errors web/functions_mail.inc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) commit 934841e62 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 3 14:21:37 2011 +0000 Eliminated an undefined index notice web/mrbs_sql.inc | 155 +++++++++++++++++++++++---------------------- 1 file changed, 79 insertions(+), 76 deletions(-) commit 46d687f32 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 3 14:02:27 2011 +0000 Moved the new default datatables options into the existing default options object. Set the default display length at 25 rows. web/Themes/default/header.inc | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) commit 7991576ca Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Wed Nov 2 21:56:38 2011 +0000 Add default tableOptions object for datatables, so it is easier to add options to all datatables at once. web/Themes/default/header.inc | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) commit 4aaa1630e Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Wed Nov 2 21:54:43 2011 +0000 mrbsCheckFree(): Remove space in date view, so the braces are symmetric web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d310ce453 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 2 17:56:09 2011 +0000 Removed a few undefined index errors web/edit_users.php | 3 ++- web/functions_mail.inc | 3 ++- web/functions_view.inc | 3 ++- web/search.php | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) commit 29e95668b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 2 16:01:58 2011 +0000 Fixed bug - incorrect room id being used in authorisation check (no impact on standard MRBS, but will affect sites where $auth_book_admin() has been modified to use the room id) web/view_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5fbe4c6cc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 2 15:31:40 2011 +0000 Fixed a bug introduced in Rev 2162 which stopped the Report datatable displaying the first column properly. web/Themes/default/header.inc | 6 ++++++ 1 file changed, 6 insertions(+) commit 774cb2435 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 2 15:22:38 2011 +0000 Fixed a problem whereby "foreign" characters in CSV reports opened by Microsoft Excel did not display properly. This is actually an Excel problem, rather than an MRBS problem, but there is now a circumvention in MRBS. CSV reports are now output by default in UTF-16 rather than UTF-8 which means that Excel 2010 on Windows and Excel 2011 on Mac, and probably some earlier versions as well, now open CSV reports properly. This requires the iconv module to be installed. If this is not possible, then CSV reports can be made to open correctly on Excel 2010 for Windows (but not Excel 2011 for Mac) by using UTF-8 and outputting a BOM. Two new config variables are introduced: $csv_charset (default 'utf-16') and $csv_bom (default FALSE). (CSV reports can always be made to open correctly in Excel by renaming the file from a .csv to a .txt file. Then when the file is opened an import dialogue appears which allows the user to choose the character set). web/language.inc | 34 +++++++++++++++++++++++++++++++++- web/report.php | 25 ++++++++++++++++++++++++- web/systemdefaults.inc.php | 13 +++++++++++++ 3 files changed, 70 insertions(+), 2 deletions(-) commit 222847065 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 2 10:45:58 2011 +0000 Fixed some undefined variable errors web/report.php | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) commit bd166f926 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 2 10:26:36 2011 +0000 Fixed minor bug in the generation of autocomplete options for custom fields that have $select_options defined (extra blank options were being generated) web/Themes/default/header.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 40b2a70da Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 2 10:00:46 2011 +0000 Got rid of an undefined variable message web/dbsys.inc | 4 ++++ 1 file changed, 4 insertions(+) commit b8562cbe4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 2 09:53:01 2011 +0000 Got rid of some undefined index notices web/edit_entry.php | 6 +++--- web/edit_users.php | 11 +++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) commit 830046592 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 2 09:34:14 2011 +0000 Fixed bug causing JavaScript error in day and week views, and hence draggable bookings not to work. (The fix in Rev 2154 did not work!) web/defaultincludes.inc | 1 + 1 file changed, 1 insertion(+) commit 1d9d4804c Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Nov 1 23:33:26 2011 +0000 * Added more description into systemdefaults.inc.php for the $booking_types array. web/systemdefaults.inc.php | 3 +++ 1 file changed, 3 insertions(+) commit 9e9a57970 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Nov 1 23:27:49 2011 +0000 * Removed the code that had to exist in config.inc.php in a particular place. Booking entry types are now configured by the simple array $booking_types, which contains elements like "E" and "I". The entry types are now localised in the translation files as "type.X" where X is the booking type. config.inc.php no longer needs to include language.inc, and the $typel configuration array has been removed. web/config.inc.php | 39 ------------------------------------ web/defaultincludes.inc | 1 + web/edit_entry.php | 4 ++-- web/functions.inc | 9 +++++---- web/functions_mail.inc | 6 +++--- web/functions_view.inc | 5 +++-- web/lang.ca | 6 ++++-- web/lang.cs | 6 ++++-- web/lang.da | 6 ++++-- web/lang.de | 6 ++++-- web/lang.el | 6 ++++-- web/lang.en | 6 ++++-- web/lang.es | 6 ++++-- web/lang.eu | 8 +++++--- web/lang.fi | 6 ++++-- web/lang.fr | 6 ++++-- web/lang.it | 6 ++++-- web/lang.ja | 6 ++++-- web/lang.ko | 6 ++++-- web/lang.nl | 6 ++++-- web/lang.no | 6 ++++-- web/lang.pl | 6 ++++-- web/lang.pt | 6 ++++-- web/lang.ru | 6 ++++-- web/lang.sl | 6 ++++-- web/lang.sv | 6 ++++-- web/lang.tr | 6 ++++-- web/lang.zh-cn | 6 ++++-- web/lang.zh-tw | 6 ++++-- web/language.inc | 7 +++++++ web/report.php | 11 +++++----- web/systemdefaults.inc.php | 33 +++++++++--------------------- 32 files changed, 130 insertions(+), 125 deletions(-) commit 451f65552 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 1 17:44:59 2011 +0000 Fixed, or at least ameliorated, a problem that can occur on Windows servers where the dates can randomly change language, due to other scripts running in a different thread in the same process calling setlocale(). web/language.inc | 154 ++++++++++++++++++++++++++++++--------------- 1 file changed, 102 insertions(+), 52 deletions(-) commit 0a8571d70 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 1 15:37:49 2011 +0000 Fixed bug which meant that the day, week and month views were displayed in the wrong locale (bug introduced in Revs 2150 and 2151) web/day.php | 2 +- web/functions_table.inc | 2 -- web/month.php | 2 +- web/week.php | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) commit e466e3640 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 31 07:34:14 2011 +0000 Restricted the requirement for the iconv module to those cases when it is really needed, ie when the server is running AIX or Windows. web/language.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 5102cb594 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 31 07:23:48 2011 +0000 Got rid of the $mail_charset config variable. All emails now sent as UTF-8. web/functions_mail.inc | 81 ++++++++---------------------------- web/internalconfig.inc.php | 1 + web/systemdefaults.inc.php | 6 +-- 3 files changed, 20 insertions(+), 68 deletions(-) commit 7faa34b86 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 25 10:20:40 2011 +0000 Fixed bug causing JavaScript syntax error if you have to login to see the month view web/month.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ef6fd063c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 25 10:18:20 2011 +0000 Fixed bug causing JavaScript syntax error if you have to login to see the day or week views web/day.php | 2 +- web/week.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 0db7b9eef Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 25 09:47:01 2011 +0000 Made $auth['only_admin_can_book'] apply to deletions as well web/mrbs_auth.inc | 2 +- web/systemdefaults.inc.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit 6f5158148 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 25 09:35:32 2011 +0000 Fixed bug. $auth['only_admin_can_book'] does not work as required if $auth['deny_public_access'] is set. web/mrbs_auth.inc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) commit 2427acdcd Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Mon Oct 24 21:17:02 2011 +0000 Set PARTSTAT=NEEDS-ACTION in ical output I got some bug reports from Outlook 2010 users that bookings that they received via mrbs mails were automatically imported into their calender, without any user action. Apparently this change fixes it. Google Calender and Outlook 2003 also set this field, even though the relevant RFC says that NEEDS-ACTION is the default value and can be omitted. web/functions_ical.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit e342ed6a3 Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Mon Oct 24 21:14:44 2011 +0000 Correctly encode subject in delete notification mails web/functions_mail.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 0e3791f1c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 24 10:22:23 2011 +0000 Removed section of commented out code web/edit_users.php | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) commit fc23cc8d3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 24 08:26:46 2011 +0000 Fixed bug in CSV report output: a <span> was appearing in the duration field. web/report.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) commit bf57d3fac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 24 07:09:40 2011 +0000 Slightly better version of fix in Rev 2141 web/Themes/default/header.inc | 23 +---------------------- web/edit_entry.php | 9 ++++----- 2 files changed, 5 insertions(+), 27 deletions(-) commit 6dd796d62 Merge: f403e8c68 85ca4de54 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 23 18:47:56 2011 +0000 Reintegrated the draggable bookings branch. MRBS now supports (except for IE8 and below) (a) the selection of new bookings by dragging over empty cells on the day and week views and (b) the adjustment of existing bookings by dragging their sides or corners. commit 85ca4de54 (origin/draggable_bookings) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 23 17:24:18 2011 +0000 Fixed bug causing the all day checkbox to be checked if an existing booking was being edited in area where the default duration is all day. web/Themes/default/header.inc | 17 +++++++++++------ web/edit_entry.php | 20 ++++++++++++-------- 2 files changed, 23 insertions(+), 14 deletions(-) commit 9ae2e7afa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 23 15:41:19 2011 +0000 * Allowed individual members of a series to be dragged along the time axis * Added highlighting of row labels when dragging an existing booking web/Themes/default/header.inc | 89 ++++++++++++++++++++++----------- web/functions_table.inc | 11 ++-- web/mrbs.css.php | 3 +- 3 files changed, 69 insertions(+), 34 deletions(-) commit bf71ece0c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 21:10:42 2011 +0000 Added highlighting of the row labels when you are drag-selecting a new booking to make it easier to see what you've selected web/Themes/default/header.inc | 80 ++++++++++++++++++++++++++------- web/mrbs.css.php | 4 ++ 2 files changed, 68 insertions(+), 16 deletions(-) commit 3520cee36 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 17:28:00 2011 +0000 Fixed bug which meant that if a selection was cancelled by releasing outside the table that same selection could not be made again web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e12dde6ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 16:30:09 2011 +0000 Fixed HTML5 validation error web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1470f96b5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 16:19:03 2011 +0000 Fixed bug where clicking on the 1px wide boundary between cells resulted in a 404 error web/Themes/default/header.inc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) commit d44d6981f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 15:31:16 2011 +0000 Fixed HTML5 validation errors web/edit_area_room.php | 4 ++-- web/edit_entry.php | 4 ++-- web/edit_users.php | 2 +- web/mrbs.css.php | 1 - web/pending.php | 8 ++------ web/report.php | 4 ++-- web/search.php | 2 +- 7 files changed, 10 insertions(+), 15 deletions(-) commit af88d9e86 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 14:55:26 2011 +0000 Fixed HTML5 validation errors web/admin.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 6cbec4989 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 14:48:18 2011 +0000 Restored colour key to month view web/month.php | 1 + 1 file changed, 1 insertion(+) commit 48b574f42 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 14:38:49 2011 +0000 Fixed overlap checking algorithm to check for the case where one rectangles is inside another web/Themes/default/header.inc | 11 +++++++++++ 1 file changed, 11 insertions(+) commit c559344b2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 14:19:55 2011 +0000 Constrained drag selection of new cells to just that - new cells: you can't select a booked cell web/Themes/default/header.inc | 119 ++++++++++++++++++-------------- 1 file changed, 68 insertions(+), 51 deletions(-) commit 4e0ea2fd0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 14:00:13 2011 +0000 Prevented dragging of new rooms to create repeats or multi-room bookings if not allowed web/Themes/default/header.inc | 48 ++++++++++++++++++++++++++++++--- web/edit_entry.php | 31 ++++++++++++--------- 2 files changed, 63 insertions(+), 16 deletions(-) commit c8773bebc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 12:56:07 2011 +0000 Restructured code web/Themes/default/header.inc | 66 +++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 23 deletions(-) commit d4d807fce Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 10:51:30 2011 +0000 Fixed typo, improving performance web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 63763ba66 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 10:46:08 2011 +0000 Stopped non-admins dragging existing bookings across multiple rooms when they're not allowed to web/Themes/default/header.inc | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) commit add61accf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 10:17:49 2011 +0000 Improved look and feel by not removing the selection box if you're jumping to edit_entry web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0df252e5b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 10:10:01 2011 +0000 Fixed bug which caused All Day to be checked when you were using a drag selection in an area where the default duration is All Day. web/Themes/default/header.inc | 10 +++++++--- web/edit_entry.php | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) commit cccfbf06f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 09:45:06 2011 +0000 Got rid of JavaScript error on the edit_entry page when you switch to an area with no rooms web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 715b83e31 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 09:33:47 2011 +0000 Fixed bug when doing a "traditional click" - the room was not being selected web/edit_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 3272be1b2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 09:14:39 2011 +0000 Made a single click without dragging (more than a few pixels) behave in the traditional fashion - ie it goes to the edit_entry page and you get the default duration etc. web/Themes/default/header.inc | 26 ++++++++++++++++++++++++-- web/edit_entry.php | 19 +++++++++++-------- 2 files changed, 35 insertions(+), 10 deletions(-) commit 3efc5bbf4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 20 08:01:20 2011 +0000 Provided the ability to cancel a click on a new booking by moving outside the table web/Themes/default/header.inc | 44 ++++++++++++++++++++++++++++++--- web/mrbs.css.php | 6 ++++- 2 files changed, 46 insertions(+), 4 deletions(-) commit 3028ab3c8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 19 22:12:02 2011 +0000 Removed the box highlighting just before going to edit_entry, so that it's not there if you go back web/Themes/default/header.inc | 1 + 1 file changed, 1 insertion(+) commit a1eeda003 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 19 22:02:05 2011 +0000 Fixed bug when selecting just a single cell in the week view web/Themes/default/header.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 186ee78a3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 19 21:38:14 2011 +0000 First attempt at draggable new bookings web/Themes/default/header.inc | 411 +++++++++++++++++++------------- web/edit_entry.php | 69 +++++- web/mrbs.css.php | 6 + 3 files changed, 317 insertions(+), 169 deletions(-) commit 5e44888d5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 19 12:59:14 2011 +0000 Fixed HTML5 validation warnings web/site_faq.html | 2 +- web/site_faq_de.html | 2 +- web/site_faq_es.html | 2 +- web/site_faq_fr.html | 2 +- web/site_faq_it.html | 2 +- web/site_faq_nl.html | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) commit a93a89070 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 19 11:32:48 2011 +0000 Simplified code web/Themes/default/header.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit c59b6f0c1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 19 11:25:17 2011 +0000 Resizable bookings now cope with multiple bookings being maximised/minimised web/Themes/default/header.inc | 13 ++++++++++--- web/day.php | 1 - web/functions_table.inc | 1 + web/week.php | 1 - 4 files changed, 11 insertions(+), 5 deletions(-) commit 471e9656d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 19 10:34:38 2011 +0000 Sorted out last problem, and also resizable bookings now cope with window resizes. web/Themes/default/header.inc | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) commit 9f862f79c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 19 10:01:58 2011 +0000 Disabled last change - it broke the resizing web/Themes/default/header.inc | 162 +++++++++++++++++++------------- 1 file changed, 97 insertions(+), 65 deletions(-) commit 119366b1e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 19 08:42:13 2011 +0000 Reimplemented controls for multiple bookings using jQuery web/Themes/default/header.inc | 1089 ++++++++++++++++--------------- web/functions_table.inc | 14 +- 2 files changed, 560 insertions(+), 543 deletions(-) commit c029151a2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 18 09:43:49 2011 +0000 Merged in latest changes from the trunk web/Themes/default/header.inc | 6 ++++-- web/edit_area_room.php | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) commit f403e8c68 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 18 09:33:31 2011 +0000 Fixed bug where the Ajax advance booking checking on the edit_entry form wasn't picking up start and end times properly. web/Themes/default/header.inc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) commit 65c9651b1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 18 09:22:58 2011 +0000 Preserved timetohighlight marker if set web/Themes/default/header.inc | 9 +++++++++ web/edit_entry_handler.php | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) commit 4bbb793fa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 18 09:05:42 2011 +0000 Prevented the width of resizable bookings being reduced to zero web/Themes/default/header.inc | 57 ++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 16 deletions(-) commit e4327b85c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 18 00:28:06 2011 +0000 Fixed bug when switching to an area with no rooms web/day.php | 1 - 1 file changed, 1 deletion(-) commit 5e37b9232 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 18 00:24:43 2011 +0000 Restored resizable bookings in the day view web/Themes/default/header.inc | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) commit bb7eab8a1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 18 00:11:59 2011 +0000 Fixed bug causing resized bookings to be one period too long when in periods mode web/Themes/default/header.inc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) commit 6068a9591 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 17 23:48:39 2011 +0000 Added in alerts in case the resized booking is invalid (due to conflicts with bookings made by somebody else in the meantime, or else policy violations) web/Themes/default/header.inc | 76 +++++++++++++++++++++------------ web/edit_entry_handler.php | 5 +-- 2 files changed, 50 insertions(+), 31 deletions(-) commit 65c839666 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 17 21:18:06 2011 +0000 Reset booking slot in case if failure web/Themes/default/header.inc | 4 ++++ 1 file changed, 4 insertions(+) commit 56f12390d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 17 20:55:34 2011 +0000 Prevented non-admins from dragging across days in the week view, and thereby trying to create repeat bookings, when $auth['only_admin_can_book_repeat'] is set. web/Themes/default/header.inc | 50 ++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 10 deletions(-) commit 8de7a48c6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 17 20:24:29 2011 +0000 Made the E-W handles a bit easier to grab when there's a single slot booking web/mrbs.css.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit fee4a3edd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 17 18:55:53 2011 +0000 Fixed bug which meant that bookings were sometimes out by one slot when resizing with $times_along_top set to TRUE. web/Themes/default/header.inc | 6 ++++++ web/functions_table.inc | 8 ++++++++ web/mrbs.css.php | 9 ++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) commit 46d8d3f85 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 16 19:51:27 2011 +0000 Made the transition to the new table smoother when a booking is resized. The Ajax result now returns the new table HTML. Resizable bookings now working in the day and week views. Still some problems to sort out including (a) resizable doesn't seem to work in Opera (b) need to stop non-admins creating repeats in the week view when they're not allowed to and (c) need to handle the case when the resized booking fails due t conflicts (schedule or policy). web/Themes/default/header.inc | 47 +- web/day.php | 362 +-------- web/edit_entry_handler.php | 30 +- web/functions.inc | 580 +------------- web/functions_table.inc (new) | 1285 +++++++++++++++++++++++++++++++ web/week.php | 375 +-------- 6 files changed, 1358 insertions(+), 1321 deletions(-) commit d1399006e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 15 10:33:58 2011 +0000 Stopped series members being resized web/functions.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit e026878fe Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 15 10:28:05 2011 +0000 Restored E-W movements web/Themes/default/header.inc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) commit 8198ad833 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 15 10:11:49 2011 +0000 Better fix for spurious overlaps web/Themes/default/header.inc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) commit 3562d02ce Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 15 09:56:33 2011 +0000 Fixed problem with spurious overlaps web/Themes/default/header.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 0a5b6f891 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 15 09:14:26 2011 +0000 Fixed display issue with cells being too wide sometimes web/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c2ad7a811 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 15 08:42:30 2011 +0000 First attempt at resizable bookings on the day view. Still some wrinkles web/Themes/default/header.inc | 80 ++++++++++++++++++++++++-- web/edit_entry_handler.php | 99 +++++++++++++++++++++++++++------ web/functions.inc | 11 +--- 3 files changed, 159 insertions(+), 31 deletions(-) commit 476a12ab1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 14 14:15:59 2011 +0000 Added a check to see if the booking has been changed web/Themes/default/header.inc | 54 +++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 13 deletions(-) commit cb241d83f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 14 13:54:45 2011 +0000 Implemented function to get parameters for the new booking web/Themes/default/header.inc | 40 ++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) commit 00b17f53f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 14 13:04:39 2011 +0000 Restructured code web/Themes/default/header.inc | 82 +++++++++++++++++++++++++-------- 1 file changed, 62 insertions(+), 20 deletions(-) commit 2e6b62eb4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 14 11:00:37 2011 +0000 Added data attributes to row and column label cells in the day and week views web/day.php | 24 ++++++++++++++++-------- web/functions.inc | 26 +++++++++++++++++++++----- web/week.php | 30 +++++++++++++++++++----------- 3 files changed, 56 insertions(+), 24 deletions(-) commit 3bceec453 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 14 09:01:30 2011 +0000 Switched doctype to HTML5, so that we can use the data- attribute to pass data to JavaScript (amongst other reasons) web/Themes/default/header.inc | 12 ++++++++++++ web/internalconfig.inc.php | 2 +- web/mincals.inc | 2 +- web/session_cookie.inc | 4 ++-- web/session_http.inc | 4 ++-- web/session_php.inc | 4 ++-- web/session_remote_user.inc | 2 +- web/style.inc | 3 --- 8 files changed, 21 insertions(+), 12 deletions(-) commit 117763b48 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 13 21:05:46 2011 +0000 Restricted those bookings which are resizable to those which the user is allowed to edit. web/Themes/default/header.inc | 5 ++--- web/functions.inc | 25 ++++++++++++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) commit 1d5cd7144 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 13 18:29:25 2011 +0000 Fixed bug preventing bookings from being shortened web/Themes/default/header.inc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) commit f1488fa2a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 13 16:39:20 2011 +0000 Disabled resizable bookings for IE8 and below as the resizing doesn't seem to work properly. May come back to it later. web/Themes/default/header.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) commit 3326e309a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 13 13:28:21 2011 +0000 changed width() and height() to outerWidth() and outerHeight() - more instances web/Themes/default/header.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) commit 33a9e1329 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 13 13:23:40 2011 +0000 changed width() and height() to outerWidth() and outerHeight() web/Themes/default/header.inc | 45 +++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 19 deletions(-) commit ca22c0e8c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 13 12:59:31 2011 +0000 Minor change to code web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2cfbdeb8c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 13 09:42:13 2011 +0000 Testing whether a resized cell overlaps an existing booking now works. web/Themes/default/header.inc | 75 +++++++++++++++------------------ 1 file changed, 34 insertions(+), 41 deletions(-) commit 95ec1ad49 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 13 08:40:14 2011 +0000 Added in containment web/Themes/default/header.inc | 169 +++++++++++++++++++++++++++----- web/mrbs.css.php | 1 - 2 files changed, 145 insertions(+), 25 deletions(-) commit 57c83df67 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 12 10:26:00 2011 +0000 Removed commented out code web/Themes/default/header.inc | 1 - 1 file changed, 1 deletion(-) commit 7c6c5c73f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 12 10:21:10 2011 +0000 Allowed bookings to be resized. Still need to stop them overlapping existing bookings and they are not yet linked up to the backend (no change is made to the database on resize) web/Themes/default/header.inc | 210 ++++++++++++++++++++++++++++++++ web/mrbs.css.php | 25 +++- 2 files changed, 233 insertions(+), 2 deletions(-) commit 1f1a44d02 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 12 08:34:45 2011 +0000 Added an error suppression operator on the call to getimagesize() in case the logo is a remote URL and allow_url_fopen is set to false in php.ini. Thanks to dwpoon. See SF ID 3420435 web/Themes/default/header.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit b6e5991e8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 11 07:30:08 2011 +0000 Changed alt text on logo. Thanks to dwpoon. See SF ID 3420435. web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8d87eecbc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 10 14:01:37 2011 +0000 Fixed HTML validation error web/edit_area_room.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0ccf8cd72 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 10 13:50:54 2011 +0000 Created a new branch for the development of draggable bookings commit 95111588f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 10 13:45:39 2011 +0000 Updated German translation. Thanks to Jörg Wiemann. See SF ID 3418914 web/lang.de | 65 +++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 30 deletions(-) commit 27d716567 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 10 09:24:45 2011 +0000 Updated installation instructions for a PostgreSQL database to create a database with UTF8 encoding. See SF ID: 3413080. INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 479920643 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 7 15:34:20 2011 +0000 Allowed the highlight line in the day and week views to be toggled on and off (previously once a line had been highlighted you could not get rid of it) web/day.php | 11 ++++++++--- web/functions.inc | 8 ++++---- web/week.php | 11 ++++++++--- 3 files changed, 20 insertions(+), 10 deletions(-) commit ba9eff82d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 7 15:06:30 2011 +0000 Simplified code web/day.php | 7 +++---- web/functions.inc | 13 +++++-------- web/week.php | 5 ++--- 3 files changed, 10 insertions(+), 15 deletions(-) commit 095720ddc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 7 14:56:33 2011 +0000 Fixed comment to reflect last change web/mrbs.css.php | 18 ------------------ 1 file changed, 18 deletions(-) commit 34f82aa87 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 7 14:53:10 2011 +0000 Simplified the markup in the day and week views web/Themes/default/header.inc | 9 ++++++--- web/day.php | 17 +++++++---------- web/functions.inc | 4 ++-- web/mrbs-print.css.php | 2 +- web/mrbs.css.php | 24 +++++++----------------- web/week.php | 17 +++++++---------- 6 files changed, 30 insertions(+), 43 deletions(-) commit 87957d2ff Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 7 12:25:46 2011 +0000 Restored highlighting of the cell in the month view when you hover over it (got lost in the last revision) web/Themes/default/header.inc | 16 +++++++++++----- web/mrbs.css.php | 4 ++-- 2 files changed, 13 insertions(+), 7 deletions(-) commit e4fed7127 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 7 10:43:10 2011 +0000 Improved the performance of the day/week/month views, especially the day view in IE with large tables (many rooms and many periods/time slots). xbLib.js is now redundant and has been removed (jQuery is the new cross browser library) and the config variables $highlight_method and $javascript_cursor are also now redundant. See also SF ID 3419007. web/Themes/classic126/styling.inc | 2 - web/Themes/default/header.inc | 26 +- web/Themes/default/styling.inc | 2 - web/day.php | 18 - web/functions.inc | 35 +- web/internalconfig.inc.php | 5 + web/month.php | 47 +- web/mrbs.css.php | 54 +- web/style.inc | 5 - web/systemdefaults.inc.php | 12 - web/week.php | 20 - web/xbLib.js (gone) | 798 ---------------------------- 12 files changed, 54 insertions(+), 970 deletions(-) commit 4de687107 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 4 10:18:01 2011 +0000 Added Russian translation supplied by Capitan Nemo web/lang.ru (new) | 415 ++++++++++++++++++++++++++++++++++++++++++++ web/language.inc | 3 + 2 files changed, 418 insertions(+) commit 06206ecf3 Merge: 2b4344f61 ec3f96cd8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 3 13:01:55 2011 +0000 Reintegrated the datatables branch back into the trunk. The report results, search results, users list, rooms list and pending list are now sortable, searchable tables. In addition admins can do bulk deletes of the entries returned in a report. commit ec3f96cd8 (origin/datatables) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 3 10:57:10 2011 +0000 Disabled the fixed right hand column (for the delete button) in the rooms table when running IE8 or below because it doesn't seem to work properly web/Themes/default/header.inc | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) commit dede877af Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 3 10:16:27 2011 +0000 Fixed bug with display of zebra stripes in room table in IE7 web/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 080947945 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 3 09:59:51 2011 +0000 Fixed bug with resizing windows in report.php web/Themes/default/header.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit d2c91342a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 3 09:49:24 2011 +0000 Fix to stop some SCRIPT87 errors which were still getting through when windows were resized in IE7/8 web/jquery/datatables/js/FixedColumns.mrbs.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit 25eeb5bbb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 3 09:23:30 2011 +0000 Fixed bug where tables were not being resized when the window size was increased web/Themes/default/header.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 97ef879e4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 3 09:10:56 2011 +0000 Minor change to comment web/jquery/datatables/js/FixedColumns.mrbs.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) commit f11d0d4a4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 3 09:02:49 2011 +0000 Fixed problems with resizing windows in IE7/8 web/Themes/default/header.inc | 22 +- .../datatables/js/FixedColumns.mrbs.js (new) | 1203 ++++++++++++++++ 2 files changed, 1223 insertions(+), 2 deletions(-) commit 2ef299c85 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 17:53:31 2011 +0000 Minor code formatting change web/Themes/default/header.inc | 1 + 1 file changed, 1 insertion(+) commit 2bf40dc2d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 17:24:00 2011 +0000 Made datatables work for IE7 and IE8 web/Themes/default/header.inc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) commit 04ef6d62e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 17:03:03 2011 +0000 Made window resizing a bit smoother web/Themes/default/header.inc | 65 +++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 27 deletions(-) commit 9cec9d6da Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 16:38:32 2011 +0000 Fixed zebra stripes for IE7/8 web/jquery/datatables/css/mrbs-table.css | 25 ++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) commit d56cc0e3d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 11:34:11 2011 +0000 Stopped a datatable being formed if the table doesn't exist web/Themes/default/header.inc | 5 +++++ 1 file changed, 5 insertions(+) commit b81d2ec70 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 11:08:26 2011 +0000 Fixed bug causing buttons to spill over more than one line when there are long column titles in the "Show/Hide Columns" collection. web/jquery/datatables/js/ColVis.mrbs.min.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0afa29e81 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 11:05:05 2011 +0000 Moved to an MRBS version of ColVis, so that we can fix a bug (in a moment) and keep track of it. The bug and fix have been reported in the DataTables forum and hopefully will be included in a future DataTables release. web/Themes/default/header.inc | 12 ++++++- .../datatables/js/ColVis.mrbs.min.js (new) | 33 ++++++++++++++++++ web/style.inc | 10 +++--- 3 files changed, 50 insertions(+), 5 deletions(-) commit 98e14abf4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 09:51:51 2011 +0000 Upgraded to latest (9th Aug 2011, 19:42 nightly) build of ColVis web/jquery/datatables/js/ColVis.min.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) commit 87c790a8b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 2 09:42:05 2011 +0000 Separated out the changes to standard datatables CSS into the mrbs file so that upgrades to datatables can be applied easily web/jquery/datatables/css/ColVis.css | 14 ++++---------- web/mrbs.css.php | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 10 deletions(-) commit 85de150b7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 1 09:03:26 2011 +0000 Merged in latest changes from the trunk web/Themes/default/header.inc | 1 + 1 file changed, 1 insertion(+) commit 2b4344f61 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 1 09:00:19 2011 +0000 Fixed bug causing the Ajax booking check to be performed on form submit web/Themes/default/header.inc | 1 + 1 file changed, 1 insertion(+) commit d7ed3d0e1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 30 16:06:17 2011 +0000 Merged in latest changes from the trunk web/edit_area_room.php | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) commit 56db50691 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 30 16:03:05 2011 +0000 Stopped ordinary users seeing the disabled/enabled status of a room (there's no point - we only show them enabled rooms anyway) web/edit_area_room.php | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) commit 42c1ea4ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 30 15:57:26 2011 +0000 Merged in latest changes from the trunk web/edit_area_room.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 263d32e09 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 30 15:51:53 2011 +0000 Fixed bug whereby the room disabled/enabled buttons were not disabled for ordinary users (though as there was no Save button they weren't able to change the status) web/edit_area_room.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 34248dc1a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 30 15:40:55 2011 +0000 Disabled column reordering completely because there are a number of situations where it is not currently supported by DataTables and it's confusing for the user having it sometimes enabled and sometimes not. Can be re-enabled at a future release of DataTables. web/Themes/default/header.inc | 13 +++++++++++++ 1 file changed, 13 insertions(+) commit 1f1a28abb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 30 15:26:54 2011 +0000 Stopped the right hand column of the rooms table from being fixed when not an admin web/Themes/default/header.inc | 52 ++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 13 deletions(-) commit 9295db543 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 30 14:53:18 2011 +0000 Fixed the right hand column of the rooms table web/Themes/default/header.inc | 67 ++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 23 deletions(-) commit 01752912e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 30 14:21:02 2011 +0000 Added a tooltip title to the room name in the rooms table. Also removed the Edit column as it's redundant (you can edit a room by clicking on the room name). web/Themes/default/header.inc | 34 +--------------------- web/admin.php | 50 ++++++++++++++++----------------- 2 files changed, 25 insertions(+), 59 deletions(-) commit 6e87d1363 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 30 14:02:58 2011 +0000 Added a title tooltip to the name column in the Search table. Tidied up datatables code. web/Themes/default/header.inc | 53 +++++++++++++++++---------------- web/search.php | 3 +- 2 files changed, 29 insertions(+), 27 deletions(-) commit 3d08f006b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 30 13:06:50 2011 +0000 Restructured code to avoid warning messages in JavaScript console about reinitialising ColReorder when the window is resized web/Themes/default/header.inc | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) commit 5d6d36dc9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 30 10:13:33 2011 +0000 Saved the language strings to prevent Ajax calls to re-fetch the language strings on window resize web/Themes/default/header.inc | 6 ++++++ 1 file changed, 6 insertions(+) commit 90117050d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 30 09:54:25 2011 +0000 Improved behaviour of datatables on window resize. Still some glitches. web/Themes/default/header.inc | 48 +++++++++++----------- web/jquery/datatables/css/mrbs-table.css | 3 ++ 2 files changed, 28 insertions(+), 23 deletions(-) commit b45ce518b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 22:55:57 2011 +0000 Tidied code web/Themes/default/header.inc | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) commit 997246ad1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 21:08:45 2011 +0000 Revamped users table to improve column sizing web/Themes/default/header.inc | 85 ++++++++++++++++----------------- web/edit_users.php | 55 +++++++++++++-------- 2 files changed, 77 insertions(+), 63 deletions(-) commit 08e056739 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 19:58:10 2011 +0000 Added the text of the fixed column as a title tooltip web/Themes/default/header.inc | 8 +++++++- web/report.php | 10 +++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) commit 61d5b9f02 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 19:31:01 2011 +0000 Changed report form method back from post to get, as that stopped the correct parameters being passed in the Ajax call web/report.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c829299be Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 19:09:09 2011 +0000 Fixed bug to do with sorting columns introduced in Rev 2028 Improved sizing of fixed column width web/Themes/default/header.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit e1a2e8c92 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 16:49:23 2011 +0000 Separated the "area - room" in the report table into two columns web/Themes/default/header.inc | 12 ++++++------ web/report.php | 13 ++++++++----- 2 files changed, 14 insertions(+), 11 deletions(-) commit bf968baae Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 16:30:42 2011 +0000 Merged in latest changes from the trunk web/functions.inc | 8 ++++++++ web/internalconfig.inc.php | 3 +++ 2 files changed, 11 insertions(+) commit baddb1525 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 16:27:45 2011 +0000 Added a sanity check to check that 'private_override' is one of the three valid values in case the database has somehow got messed up web/functions.inc | 8 ++++++++ web/internalconfig.inc.php | 3 +++ 2 files changed, 11 insertions(+) commit aaa092cb9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 16:06:43 2011 +0000 Tweaked styling web/Themes/default/header.inc | 2 ++ web/mrbs.css.php | 16 ++++++++++------ web/trailer.inc | 5 +++-- 3 files changed, 15 insertions(+), 8 deletions(-) commit 8d0ca1400 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 29 13:43:53 2011 +0000 Fixed problem with Hide/Show buttons not displaying properly in some browsers (eg Firefox) on the Rooms table web/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b7bd5fd35 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 28 13:20:39 2011 +0000 Merged in latest changes from the trunk web/Themes/default/header.inc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) commit 536043b55 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 28 13:17:18 2011 +0000 Fixed bug preventing the schedule/policy details dialog from being re-opened if it had previously been closed web/Themes/default/header.inc | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) commit 92d56b96a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 28 12:38:13 2011 +0000 Made the correct tab be selected on launch of the schedule/policy check results dialog web/Themes/default/header.inc | 1 + 1 file changed, 1 insertion(+) commit d9a0cfee0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 28 12:22:18 2011 +0000 Merged in latest changes from the trunk web/Themes/default/header.inc | 66 ++++++++- web/edit_entry.php | 18 +++ .../ui-bg_gloss-wave_60_fece2f_500x100.png | Bin 4075 -> 3512 bytes .../ui-bg_gloss-wave_70_ffdd57_500x100.png | Bin 3830 -> 3122 bytes .../sunny/images/ui-icons_3d3d3d_256x240.png | Bin 4369 -> 5355 bytes .../ui/css/sunny/jquery-ui-1.8.16.custom.css | 58 ++++++++ web/jquery/ui/jquery-ui-1.8.16.custom.min.js | 124 +++++++++++++++++ web/lang.en | 2 + web/mrbs.css.php | 7 +- web/style.inc | 4 +- 10 files changed, 275 insertions(+), 4 deletions(-) commit 8f1b64fb6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 28 12:17:20 2011 +0000 Added a tabbed dialog that can be displayed to give more details of schedule and policy checks on the edit_entry page. This has the advantage that it contains clickable links to conflicting bookings, which the tooltips cannot. web/Themes/default/header.inc | 66 ++++++++- web/edit_entry.php | 18 +++ .../ui-bg_gloss-wave_60_fece2f_500x100.png | Bin 4075 -> 3512 bytes .../ui-bg_gloss-wave_70_ffdd57_500x100.png | Bin 3830 -> 3122 bytes .../sunny/images/ui-icons_3d3d3d_256x240.png | Bin 4369 -> 5355 bytes .../ui/css/sunny/jquery-ui-1.8.16.custom.css | 58 ++++++++ web/jquery/ui/jquery-ui-1.8.16.custom.min.js | 124 +++++++++++++++++ web/lang.en | 2 + web/mrbs.css.php | 7 +- web/style.inc | 4 +- 10 files changed, 275 insertions(+), 4 deletions(-) commit f097d8587 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 27 11:22:15 2011 +0000 Merged in latest changes from the trunk web/day.php | 5 ----- web/del_entry.php | 7 +------ web/edit_entry.php | 6 +----- web/month.php | 6 ------ web/week.php | 5 ----- 5 files changed, 2 insertions(+), 27 deletions(-) commit 8b807b676 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 27 11:17:53 2011 +0000 Tidied up the use of default values for form parameters, using the optional third parameter to get_form_var() web/day.php | 5 ----- web/del_entry.php | 7 +------ web/edit_entry.php | 6 +----- web/month.php | 6 ------ web/week.php | 5 ----- 5 files changed, 2 insertions(+), 27 deletions(-) commit bd04481dd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 27 10:56:19 2011 +0000 Merged in latest changes from the trunk help_report.html (new) | 292 ++++++++++++++++++++++++++++++++ web/Themes/default/header.inc | 6 +- web/functions.inc | 38 +++++ web/grab_globals.inc.php | 43 ++++- web/language.inc | 28 ++- web/report.php | 179 ++++++++------------ web/session_cookie.inc | 4 +- web/session_http.inc | 4 +- web/session_php.inc | 4 +- web/session_remote_user.inc | 4 +- web/systemdefaults.inc.php | 9 + 11 files changed, 479 insertions(+), 132 deletions(-) commit 118a6e5dc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 27 09:42:47 2011 +0000 Added the ability to run report.php from the command line (useful for example for setting up reports as cron jobs). Provided a manual page at help_report.html. The ability to run from the command line is disabled by default in systemdefaults.inc.php and has to be deliberately enabled. Added an optional third parameter to get_form_var() which is the default value help_report.html (new) | 292 ++++++++++++++++++++++++++++++++++ web/functions.inc | 38 +++++ web/grab_globals.inc.php | 43 ++++- web/language.inc | 28 +++- web/report.php | 179 ++++++++------------- web/session_cookie.inc | 4 +- web/session_http.inc | 4 +- web/session_php.inc | 4 +- web/session_remote_user.inc | 4 +- web/systemdefaults.inc.php | 9 ++ 10 files changed, 473 insertions(+), 132 deletions(-) commit 4d84e0126 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 26 10:07:29 2011 +0000 Merged in latest changes from the trunk web/report.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) commit ec388107c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 26 10:02:16 2011 +0000 Changed the report from method from "get" to "post" to make it possible to accommodate complicated search criteria, especially with many custom fields web/report.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 01f700892 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 26 09:57:13 2011 +0000 Added an explicit Phase variable to the Report form, rather than relying on the areamatch variable to determine whether one is in Phase 1 or Phase 2. This makes it easier to adapt the Report page to being run from the CLI (eg for producing reports from a cron job). web/report.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit a8b848851 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 25 06:26:56 2011 +0000 Merged in latest changes from the trunk web/Themes/default/header.inc | 295 ++++++++++++++++++-------------- web/edit_entry.php | 2 +- web/edit_entry_handler.php | 18 +- 3 files changed, 176 insertions(+), 139 deletions(-) commit a8843cc9f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 25 06:21:48 2011 +0000 Stopped MRBS sending an Ajax request to check for booking conflicts if the Back or Save buttons have just been pressed. web/Themes/default/header.inc | 196 ++++++++++++++++++++------------ web/edit_entry.php | 2 +- 2 files changed, 122 insertions(+), 76 deletions(-) commit 99c24a780 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 25 06:20:36 2011 +0000 Fixed bug causing Back button on the edit_entry page to go to the wrong page web/edit_entry_handler.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) commit dd4df976a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 24 10:25:59 2011 +0000 Fixed bug introduced in Rev 1998 and at the same time restructured code so that it does not need to know the names of the form fields. web/Themes/default/header.inc | 145 +++++++++++++++----------------- 1 file changed, 66 insertions(+), 79 deletions(-) commit fe51d5bbb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 23 16:46:35 2011 +0000 Merged in latest changes from the trunk .../zoneinfo-outlook/Africa/Juba.ics (new) | 15 ++++ .../zoneinfo-outlook/America/Metlakatla.ics | 14 +--- .../zoneinfo-outlook/Europe/Kaliningrad.ics | 4 +- .../zoneinfo-outlook/Pacific/Ponape.ics | 8 +-- web/tzurl/zoneinfo-outlook/Pacific/Truk.ics | 10 +-- web/tzurl/zoneinfo/Africa/Dar_es_Salaam.ics | 6 +- web/tzurl/zoneinfo/Africa/Juba.ics (new) | 67 +++++++++++++++++ web/tzurl/zoneinfo/Africa/Kampala.ics | 6 +- web/tzurl/zoneinfo/Africa/Nairobi.ics | 6 +- web/tzurl/zoneinfo/America/Goose_Bay.ics | 34 ++++++--- web/tzurl/zoneinfo/America/Metlakatla.ics | 68 +----------------- web/tzurl/zoneinfo/America/Resolute.ics | 17 ++--- web/tzurl/zoneinfo/America/St_Johns.ics | 34 ++++++--- web/tzurl/zoneinfo/Europe/Kaliningrad.ics | 4 +- web/tzurl/zoneinfo/Pacific/Apia.ics | 17 ++++- web/tzurl/zoneinfo/Pacific/Ponape.ics | 8 +-- web/tzurl/zoneinfo/Pacific/Truk.ics | 10 +-- 17 files changed, 192 insertions(+), 136 deletions(-) commit 9e1f86db3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 23 16:41:37 2011 +0000 Upgraded to jQuery Version 1.6.4 web/Themes/default/header.inc | 2 +- web/jquery/jquery-1.6.2.min.js (gone) | 18 ------------------ web/jquery/jquery-1.6.4.min.js (new) | 4 ++++ 3 files changed, 5 insertions(+), 19 deletions(-) commit c449cc48b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 23 16:35:04 2011 +0000 Updated timezone files with Sep 12 2011 versions .../zoneinfo-outlook/Africa/Juba.ics (new) | 15 ++++ .../zoneinfo-outlook/America/Metlakatla.ics | 14 +--- .../zoneinfo-outlook/Europe/Kaliningrad.ics | 4 +- .../zoneinfo-outlook/Pacific/Ponape.ics | 8 +-- web/tzurl/zoneinfo-outlook/Pacific/Truk.ics | 10 +-- web/tzurl/zoneinfo/Africa/Dar_es_Salaam.ics | 6 +- web/tzurl/zoneinfo/Africa/Juba.ics (new) | 67 +++++++++++++++++ web/tzurl/zoneinfo/Africa/Kampala.ics | 6 +- web/tzurl/zoneinfo/Africa/Nairobi.ics | 6 +- web/tzurl/zoneinfo/America/Goose_Bay.ics | 34 ++++++--- web/tzurl/zoneinfo/America/Metlakatla.ics | 68 +----------------- web/tzurl/zoneinfo/America/Resolute.ics | 17 ++--- web/tzurl/zoneinfo/America/St_Johns.ics | 34 ++++++--- web/tzurl/zoneinfo/Europe/Kaliningrad.ics | 4 +- web/tzurl/zoneinfo/Pacific/Apia.ics | 17 ++++- web/tzurl/zoneinfo/Pacific/Ponape.ics | 8 +-- web/tzurl/zoneinfo/Pacific/Truk.ics | 10 +-- 17 files changed, 192 insertions(+), 136 deletions(-) commit 02286fec4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 23 13:58:26 2011 +0000 Merged in latest changes from the trunk web/edit_users.php | 10 ++++++++++ 1 file changed, 10 insertions(+) commit df2749f5d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 23 13:55:33 2011 +0000 Removed HTML escaping of room column names because they are trusted and some of them deliberately contain HTML entities (eg ) web/admin.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit e6a60d792 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 23 13:47:12 2011 +0000 Added a Back button to the Add/Edit users form web/edit_users.php | 10 ++++++++++ 1 file changed, 10 insertions(+) commit 30638c6c3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 23 11:18:22 2011 +0000 Merged in latest changes from the trunk web/Themes/default/header.inc | 42 +++++++++++++++++++++------------ web/pgsql.inc | 4 +++- 2 files changed, 30 insertions(+), 16 deletions(-) commit 5bee1a34b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 23 11:13:39 2011 +0000 Set PostgreSQL client encoding to UTF8. Thanks to Andreas Lange for the patch (SF ID 3413080) web/pgsql.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 19aff8838 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 23 10:51:51 2011 +0000 Fixed bug resulting in a JavaScript error if you try and go to the edit_entry page when not logged in and the default duration is All Day web/Themes/default/header.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit 729d2aa5b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 23 10:43:45 2011 +0000 Fixed bug resulting in a JavaScript error on the edit_entry page if some form inputs are absent (eg if $auth['only_admin_can_book_repeat'] is set) web/Themes/default/header.inc | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) commit 752aaf023 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 22 16:51:18 2011 +0000 Merged in latest changes from the trunk AUTHENTICATION | 7 +- web/auth_ldap.inc | 290 ++++++++++++++++++++++++----------- web/functions.inc | 20 ++- web/systemdefaults.inc.php | 58 +++++-- 4 files changed, 266 insertions(+), 109 deletions(-) commit ca0981885 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Sep 22 14:41:57 2011 +0000 Revamped the LDAP authentication scheme somewhat. You can now specify most of the configuration parameters as arrays, so that you can have multiple servers or multiple base DNs that are configured in different ways. Additionally, you can now determine whether a user is an administrator by defining LDAP configuration parameters: $ldap_group_member_attrib and $ldap_admin_group_dn. See systemdefaults.inc.php for details. AUTHENTICATION | 7 +- web/auth_ldap.inc | 290 ++++++++++++++++++++++++----------- web/functions.inc | 20 ++- web/systemdefaults.inc.php | 58 +++++-- 4 files changed, 266 insertions(+), 109 deletions(-) commit cd8a7208b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 22 09:56:45 2011 +0000 Merged in latest changes from the trunk web/Themes/default/header.inc | 28 ++++++++++++++++++++++------ web/functions.inc | 29 ++++++----------------------- web/systemdefaults.inc.php | 4 ++++ 3 files changed, 32 insertions(+), 29 deletions(-) commit fedd01b08 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 22 09:28:37 2011 +0000 Added a timer so that a potential booking on the edit_entry form can be periodically rechecked for validity, in case someone else makes or releases a booking while the page is open. Can be disabled and the interval set by means of a config variable. Default enabled, 10 second interval. web/Themes/default/header.inc | 20 ++++++++++++++++++-- web/systemdefaults.inc.php | 4 ++++ 2 files changed, 22 insertions(+), 2 deletions(-) commit 2609afcae Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 22 09:04:50 2011 +0000 Decoded HTML entities in Ajax tooltip messages on the edit_entry page web/Themes/default/header.inc | 8 ++++---- web/functions.inc | 29 ++++++----------------------- 2 files changed, 10 insertions(+), 27 deletions(-) commit 5de4bd004 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 22 08:38:29 2011 +0000 Removed call to htmlspecialchars() on table header strings, because the vocab strings are trusted and may contain HTML entities deliberately. web/report.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit ac56ea990 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 22 08:17:28 2011 +0000 Merged in latest changes from the trunk web/Themes/default/header.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit a9273537f Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Thu Sep 22 07:32:22 2011 +0000 Correctly handle multiple selected rooms in Ajax calls val() already returns an array on multi-select boxes, so we can simply use that. web/Themes/default/header.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit 55f354b50 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 20:35:07 2011 +0000 Merged in latest changes from the trunk web/site_faq_de.html | 135 ++++++++++++++++---------------- web/site_faq_es.html | 157 +++++++++++++++++++------------------- web/site_faq_fr.html | 169 +++++++++++++++++++++-------------------- web/site_faq_it.html | 75 +++++++++--------- web/site_faq_nl.html | 3 +- 5 files changed, 272 insertions(+), 267 deletions(-) commit e4372b116 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 20:29:44 2011 +0000 Converted to UTF-8 web/site_faq_de.html | 135 +++++++++++++++++++++-------------------- web/site_faq_nl.html | 3 +- 2 files changed, 70 insertions(+), 68 deletions(-) commit 3a184825d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 20:15:57 2011 +0000 Converted to UTF-8 web/site_faq_it.html | 75 +++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 37 deletions(-) commit c1f01d616 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 20:08:42 2011 +0000 Converted to UTF-8 web/site_faq_es.html | 157 +++++++++++++++++++++-------------------- 1 file changed, 79 insertions(+), 78 deletions(-) commit 5a906237e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 19:23:16 2011 +0000 Converted to UTF-8 web/site_faq_fr.html | 169 +++++++++++++++++++++-------------------- 1 file changed, 85 insertions(+), 84 deletions(-) commit 93fcabb44 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 17:19:39 2011 +0000 Fixed formatting of Show/hide columns web/jquery/datatables/css/ColVis.css | 14 ++++++++++---- web/jquery/datatables/js/ColVis.min.js | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) commit d271e3054 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 16:43:51 2011 +0000 Made the Rights column in the users table sort by user level code rather than string web/Themes/default/header.inc | 4 ++++ web/edit_users.php | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) commit fc6c005d1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 16:25:10 2011 +0000 Widened room table web/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bb2fe1890 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 16:12:41 2011 +0000 Removed the id column from the report table web/Themes/default/header.inc | 13 ++++++------- web/mrbs.css.php | 5 ----- web/report.php | 12 +----------- 3 files changed, 7 insertions(+), 23 deletions(-) commit ebefb727e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 15:57:24 2011 +0000 Made the duration column in the report table properly sortable web/Themes/default/header.inc | 4 ++-- web/report.php | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) commit 4eee0af70 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 15:44:39 2011 +0000 Sorted out the styling of sub tables ion the pending table when DataTables are not operational (probably when JavaScript is disabled) web/jquery/datatables/css/mrbs-table.css | 4 ++-- web/mrbs.css.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit b76606a37 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 15:28:40 2011 +0000 Added zebra stripes to tables that haven't been converted into DataTables - probably because JavaScript is disabled. (Only works on browsers supporting the :nth-child selector). web/jquery/datatables/css/mrbs-table.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit 255a3bfec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 15:16:25 2011 +0000 Performance optimisation web/search.php | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) commit b01b66b13 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 14:58:20 2011 +0000 Made the start time column in the pending table properly sortable web/Themes/default/header.inc | 12 +++++++++--- web/pending.php | 8 +++++++- 2 files changed, 16 insertions(+), 4 deletions(-) commit b39a31778 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 14:39:02 2011 +0000 Prevented column reordering being used when there's an Ajax data source. (This is a limitation in the current release of DataTables because if a column is reordered DataTables doesn't realise that the data is still coming in the original order. May be fixed in a future release). web/Themes/default/header.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit 91aa6b93c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 14:05:51 2011 +0000 Made search results into a datatable web/Themes/default/header.inc | 91 ++++++++-- web/mrbs.css.php | 36 +--- web/search.php | 308 ++++++++++++++++++++------------ 3 files changed, 276 insertions(+), 159 deletions(-) commit 9390bf0fb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 09:20:38 2011 +0000 Removed redundant "View" language token web/lang.ca | 1 - web/lang.cs | 1 - web/lang.da | 1 - web/lang.de | 1 - web/lang.el | 1 - web/lang.en | 1 - web/lang.es | 1 - web/lang.eu | 1 - web/lang.fi | 1 - web/lang.fr | 1 - web/lang.it | 1 - web/lang.ja | 1 - web/lang.ko | 1 - web/lang.nl | 1 - web/lang.no | 1 - web/lang.pl | 1 - web/lang.pt | 1 - web/lang.sl | 1 - web/lang.sv | 1 - web/lang.tr | 1 - web/lang.zh-cn | 1 - web/lang.zh-tw | 1 - 22 files changed, 22 deletions(-) commit 17df97758 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 09:08:08 2011 +0000 Removed the "View" column by making the booking description link to view_entry web/search.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) commit cd83f5d95 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 08:41:56 2011 +0000 Merged in latest changes from the trunk web/edit_entry_handler.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) commit db102051f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 08:34:36 2011 +0000 Moved the de-duplication of rules and conflicts to before the Ajax output web/edit_entry_handler.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) commit abe9122ff Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 21 08:25:33 2011 +0000 Corrected typo in last change (array_merged) web/edit_entry_handler.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 7a861cfb9 Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Wed Sep 21 06:13:41 2011 +0000 edit_entry_handler: use array_merge instead of operator+ for array union operator+ discards any members of the second array when their key is already found in the first array. In contrast, array_merge renumbers numeric arrays. The old behaviour led to some conflicts not being displayed. web/edit_entry_handler.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit f7e877429 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 20 20:45:24 2011 +0000 Merged in latest changes from the trunk web/Themes/default/header.inc | 50 ++++++++-------- web/auth_config.inc | 2 +- web/site_faq_de.html | 102 ++++++++++++++++---------------- 3 files changed, 77 insertions(+), 77 deletions(-) commit 5afd3664c Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Tue Sep 20 20:11:14 2011 +0000 Clean up umlauts in german faq web/site_faq_de.html | 102 ++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 51 deletions(-) commit 28ceb89ad Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Tue Sep 20 20:09:14 2011 +0000 Generate shorter JavaScript for the checkValidBooking() function web/Themes/default/header.inc | 48 +++++++++++++++------------------ 1 file changed, 22 insertions(+), 26 deletions(-) commit 9f1f3b0c3 Author: Thomas Bleher <tbleher@users.sourceforge.net> Date: Tue Sep 20 20:05:20 2011 +0000 Correctly handle the radio buttons in the ajax code for edit_entry This is needed at least on Firefox so radio buttons are read correctly. web/Themes/default/header.inc | 4 ++++ 1 file changed, 4 insertions(+) commit 64df0ee21 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 20 19:09:39 2011 +0000 Made the pending table an ordinary table rather than a datatable when running IE7. web/Themes/default/header.inc | 23 ++++++++++++++++++++++- web/mrbs-ielte7.css.php | 4 +--- web/mrbs.css.php | 1 + 3 files changed, 24 insertions(+), 4 deletions(-) commit 35a0fe15b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 20 16:03:05 2011 +0000 Tweak to formatting of report table in IE7 web/mrbs-ielte7.css.php | 1 + 1 file changed, 1 insertion(+) commit b48be5c9b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 20 15:41:30 2011 +0000 Made the "Last updated" column in the report table properly sortable web/Themes/default/header.inc | 6 +++--- web/report.php | 13 +++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) commit 907c7b8d0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 20 15:19:06 2011 +0000 Made start and end times in the report table sort and filter properly web/Themes/default/header.inc | 5 ++++- web/jquery/datatables/js/plugins.js | 29 +++++++++++++++++++++++++-- web/report.php | 12 +++++------ 3 files changed, 37 insertions(+), 9 deletions(-) commit bfa01b489 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 20 14:18:13 2011 +0000 Simplified the way in which IE6 is tested for web/Themes/default/header.inc | 40 +++++++++++++-------------------- 1 file changed, 16 insertions(+), 24 deletions(-) commit badf6275c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 20 14:06:01 2011 +0000 Simplified the way in which JavaScript override styles are applied web/mrbs-ielte6.css | 4 ++-- web/mrbs-js-overrides.css.php (gone) | 33 -------------------------- web/mrbs-js-overrides.js (gone) | 10 -------- web/mrbs.css.php | 18 ++++++++++++++ web/style.inc | 6 +---- 5 files changed, 21 insertions(+), 50 deletions(-) commit 90f397eaa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 20 12:27:06 2011 +0000 The non-JavaScript datatable is now hidden while the datatable is being prepared web/Themes/default/header.inc | 24 ++++++++++++++++------ web/admin.php | 2 +- web/edit_users.php | 2 +- web/jquery/datatables/css/mrbs-table.css | 3 +++ web/pending.php | 2 +- web/report.php | 2 +- 6 files changed, 25 insertions(+), 10 deletions(-) commit e92bd33da Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 20 10:57:05 2011 +0000 Made the datatables resize when the browser window is resized web/Themes/default/header.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit fc7c196a6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 20 10:45:53 2011 +0000 Tweaked formatting of datatables web/Themes/default/header.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit cf28865e5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 20 10:31:41 2011 +0000 Upgraded to 1.8.3dev (16 Sep 2011) version of dataTables .../datatables/js/jquery.dataTables.min.js | 24 ++++++++++-------- 1 file changed, 13 insertions(+), 11 deletions(-) commit 2221886dc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 16 16:38:37 2011 +0000 Formatting tweaks to pending table (still some problems with IE7) web/Themes/default/header.inc | 23 +++++++++++----------- web/jquery/datatables/css/mrbs-table.css | 2 +- web/mrbs-ielte7.css.php | 2 +- web/mrbs.css.php | 4 ++-- 4 files changed, 16 insertions(+), 15 deletions(-) commit ae6ae7390 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 15 17:06:59 2011 +0000 Turned off table enhancement for IE6 web/Themes/default/header.inc | 196 ++++++++++++++++---------------- 1 file changed, 99 insertions(+), 97 deletions(-) commit 6191f2b32 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 15 16:54:21 2011 +0000 First attempt at converting the pending list to a datatable. Still some formatting problems. web/Themes/default/header.inc | 170 ++++++----- web/jquery/datatables/css/ColVis.css | 75 +++-- web/jquery/datatables/css/mrbs-table.css | 21 +- web/jquery/datatables/js/ColReorder.min.js | 41 +-- web/jquery/datatables/js/ColVis.min.js | 12 +- .../datatables/js/jquery.dataTables.min.js | 264 ++++++++--------- web/mrbs-ielte7.css.php | 9 + web/mrbs.css.php | 18 +- web/pending.php | 100 ++++--- 9 files changed, 390 insertions(+), 320 deletions(-) commit 7e36bb449 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 13 08:09:37 2011 +0000 Corrected typo in comment that could lead to confusion web/auth_config.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit aaffef77c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 12 14:53:38 2011 +0000 Merged in latest changes from trunk web/edit_entry_handler.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) commit 598042885 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 12 14:50:18 2011 +0000 Pending table partially turned into a datatable. Commit prior to a merge web/Themes/default/header.inc | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) commit 895f040d5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 12 14:49:20 2011 +0000 Fixed bug where Ajax policy checking was not working if "All day" was checked web/edit_entry_handler.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) commit 0885c03fa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 9 10:31:06 2011 +0000 Merged in latest changes from trunk web/functions_view.inc | 2 -- 1 file changed, 2 deletions(-) commit 78f37e402 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 9 10:28:10 2011 +0000 Fixed bug causing disabled rooms to be displayed incorrectly in view_entry.php web/functions_view.inc | 2 -- 1 file changed, 2 deletions(-) commit 9df0d2a80 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 8 23:08:03 2011 +0000 Merged in latest changes from trunk web/Themes/default/header.inc | 8 ++++++-- web/edit_entry.php | 18 +++++++++--------- web/edit_entry_handler.php | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) commit 30172aee4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 8 23:04:10 2011 +0000 Tidied code web/edit_entry.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) commit aef8b02d6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 8 23:03:38 2011 +0000 Fixed bug whereby the Ajax policy checking wasn't working properly after a change of area web/Themes/default/header.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit cc3e8b1f3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 8 21:14:51 2011 +0000 Fixed bug which prevented the edit_entry form being submitted when using Chrome web/edit_entry.php | 2 +- web/edit_entry_handler.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit bc4838753 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 8 18:26:47 2011 +0000 Merged in latest changes from trunk web/mrbs.css.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 6fd88c626 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 8 18:22:13 2011 +0000 Minor tweak to styling web/mrbs.css.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 7e284c3f5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 8 18:05:32 2011 +0000 Merged in latest changes from trunk web/Themes/default/header.inc | 167 ++++++++++++++++++++++++++++++++ web/edit_entry.php | 8 ++ web/edit_entry_handler.php | 124 ++++++++++++++---------- web/lang.en | 2 + web/mrbs.css.php | 5 + web/mrbs_sql.inc | 13 +-- web/report.php | 38 +++++--- 7 files changed, 289 insertions(+), 68 deletions(-) commit 29a40e687 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 8 18:00:20 2011 +0000 Added an Ajax capability to the edit_entry form so that a booking is checked for scheduling and policy conflicts as the booking parameters are changed. [ Only available for PHP versions >= 5.2.0 as it relies on json_encode() ] web/Themes/default/header.inc | 167 ++++++++++++++++++++++++++++++++ web/edit_entry.php | 8 ++ web/edit_entry_handler.php | 124 ++++++++++++++---------- web/lang.en | 2 + web/mrbs.css.php | 5 + web/mrbs_sql.inc | 13 +-- 6 files changed, 264 insertions(+), 55 deletions(-) commit 597fe2d58 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 8 08:55:56 2011 +0000 Removed the privacy radio buttons from the Report form when the user is not logged in as they're then redundant because only the "user" will only be able to see public bookings. Thanks to a suggestion from Jörg Wiemann in SF Tracker ID: 3405402 web/report.php | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) commit 353fe7208 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 8 08:28:49 2011 +0000 Updated German translation. Thanks to Jörg Wiemann. See SF Tracker ID: 3405729 web/lang.de | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) commit 14c5222c4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 7 09:16:34 2011 +0000 Merged in latest changes from trunk web/edit_entry.php | 3 +-- web/functions_mail.inc | 20 ++++++++++++++------ web/lang.en | 5 +++-- 3 files changed, 18 insertions(+), 10 deletions(-) commit 12f813c88 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 7 09:13:31 2011 +0000 Improved the message in email notifications for a list of deleted repeat bookings web/functions_mail.inc | 13 ++++++++++--- web/lang.en | 5 +++-- 2 files changed, 13 insertions(+), 5 deletions(-) commit 201eeab52 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 7 08:42:58 2011 +0000 Fixed bug whereby email notifications would not be sent if MRBS failed to find an address for those on the "To" line but there addresses on the "Cc" line. web/functions_mail.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit 1db0e44c4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 6 15:02:08 2011 +0000 Moved comment web/edit_entry.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 160dc7642 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 6 14:34:22 2011 +0000 Merged in latest changes from trunk web/Themes/default/header.inc | 12 ++++++++---- web/edit_entry.php | 34 +++++++++++++++++++++++---------- 2 files changed, 32 insertions(+), 14 deletions(-) commit 0ff150b67 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 6 14:30:53 2011 +0000 Added an optional $disabled parameter to genSlotSelector() web/Themes/default/header.inc | 12 ++++++++---- web/edit_entry.php | 34 +++++++++++++++++++++++---------- 2 files changed, 32 insertions(+), 14 deletions(-) commit e26269255 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 6 13:07:42 2011 +0000 Merged in latest changes from trunk web/functions.inc | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) commit 0f7a6a7dd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 6 13:04:55 2011 +0000 Added an optional $disabled parameter to genDateSelector() web/functions.inc | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) commit 3e486bd84 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 6 10:51:48 2011 +0000 Merged in latest changes from trunk web/edit_entry.php | 20 ++++++++--- web/edit_entry_handler.php | 22 ++++++++---- web/functions_ical.inc | 4 +-- web/functions_mail.inc | 69 +++++++++++++++++++++++++++++------- web/lang.en | 3 +- web/mrbs-ielte6.css | 1 + web/mrbs.css.php | 6 ++-- web/mrbs_sql.inc | 6 ++-- 8 files changed, 99 insertions(+), 32 deletions(-) commit 0fd09bf4f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 5 18:12:46 2011 +0000 Minor code change - no change to MRBS function. web/functions_mail.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 68df9cb77 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 5 18:03:17 2011 +0000 Added a list of dates of repeat bookings to email notifications. web/edit_entry_handler.php | 14 ++++---- web/functions_ical.inc | 4 +-- web/functions_mail.inc | 70 ++++++++++++++++++++++++++++-------- web/lang.en | 3 +- web/mrbs_sql.inc | 6 ++-- 5 files changed, 70 insertions(+), 27 deletions(-) commit 7ad1ac040 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 5 15:57:24 2011 +0000 Added a Back button to the edit_entry page web/edit_entry.php | 20 +++++++++++++++----- web/edit_entry_handler.php | 10 +++++++++- web/mrbs-ielte6.css | 1 + web/mrbs.css.php | 6 ++++-- 4 files changed, 29 insertions(+), 8 deletions(-) commit 09acf760d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 2 13:32:48 2011 +0000 Merged in latest changes from trunk web/edit_entry_handler.php | 5 +++-- web/functions_mail.inc | 7 +++++++ web/systemdefaults.inc.php | 3 +++ 3 files changed, 13 insertions(+), 2 deletions(-) commit 3bb3dfdb3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 2 13:21:16 2011 +0000 Fixed bug where the "Skip and Book" button was being shown if there was a conflict for a non-repeating booking. web/edit_entry_handler.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 8e34a10d5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 2 13:10:54 2011 +0000 Added a config setting to disable email sending, overriding any other settings. Useful for testing MRBS without having to worry about sending mail to people not expecting it. web/functions_mail.inc | 7 +++++++ web/systemdefaults.inc.php | 3 +++ 2 files changed, 10 insertions(+) commit 04abcc74e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 1 14:18:50 2011 +0000 Introduced a new config variable, $min_user_viewing_level, to allow discrimination between the right to view other users' details and the right to edit others' details. web/edit_users.php | 2 +- web/systemdefaults.inc.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) commit 97d80d101 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 1 08:42:16 2011 +0000 Merged in latest changes from trunk web/edit_entry.php | 28 ++++++++++++++-------------- web/edit_entry_handler.php | 20 ++++++++++++++++---- 2 files changed, 30 insertions(+), 18 deletions(-) commit 5cf441a1b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 1 07:35:12 2011 +0000 Added comment web/edit_entry_handler.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) commit b18321369 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 31 22:50:58 2011 +0000 Fix, following previous fixes, to stop Sunday being selected by default as a repeat day. web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a93dd5dcd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 31 22:31:44 2011 +0000 Tidied code following last fix to make the use of $rep_day consistent. (Should be no change to functionality) web/edit_entry.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) commit 66f4d3346 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 31 22:05:09 2011 +0000 Fixed bug in skipping bookings when making weekly repeat bookings (bookings were made for the wrong day of the week). Thanks to John O'Donnell for spotting the problem. web/edit_entry.php | 2 +- web/edit_entry_handler.php | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) commit b956f0e96 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 31 14:25:47 2011 +0000 Merged in latest changes from trunk web/Themes/default/header.inc | 2 +- ...i-bg_diagonals-medium_20_d34d17_40x40.png | Bin 199 -> 247 bytes .../ui-bg_gloss-wave_60_fece2f_500x100.png | Bin 3512 -> 4075 bytes .../sunny/images/ui-icons_d19405_256x240.png | Bin 5355 -> 4369 bytes ...ustom.css => jquery-ui-1.8.16.custom.css} | 27 +- .../ui/jquery-ui-1.8.11.custom.min.js (gone) | 230 ---------------- .../ui/jquery-ui-1.8.16.custom.min.js (new) | 232 +++++++++++++++++ web/jquery/ui/jquery-ui-i18n.js | 68 ++--- web/style.inc | 2 +- 9 files changed, 279 insertions(+), 282 deletions(-) commit 0bce36090 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 31 14:21:11 2011 +0000 Upgraded jQuery UI from version 1.8.11 to 1.8.16 web/Themes/default/header.inc | 2 +- ...i-bg_diagonals-medium_20_d34d17_40x40.png | Bin 199 -> 247 bytes .../ui-bg_gloss-wave_60_fece2f_500x100.png | Bin 3512 -> 4075 bytes .../sunny/images/ui-icons_d19405_256x240.png | Bin 5355 -> 4369 bytes ...ustom.css => jquery-ui-1.8.16.custom.css} | 27 +- .../ui/jquery-ui-1.8.11.custom.min.js (gone) | 230 ---------------- .../ui/jquery-ui-1.8.16.custom.min.js (new) | 232 +++++++++++++++++ web/jquery/ui/jquery-ui-i18n.js | 68 ++--- web/style.inc | 2 +- 9 files changed, 279 insertions(+), 282 deletions(-) commit 288885e1d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 31 09:37:29 2011 +0000 Merged in latest changes from trunk web/auth_ldap.inc | 2 +- web/edit_entry.php | 9 ++ web/edit_entry_handler.php | 175 ++++++++++++++++++++++++++--------- web/functions.inc | 74 +++++++-------- web/functions_ical.inc | 30 ++++++ web/functions_mail.inc | 34 ++++++- web/lang.en | 6 +- web/mrbs-mail.css | 3 +- web/mrbs.css.php | 7 +- web/mrbs_sql.inc | 60 +++++++++--- web/report.php | 4 +- web/systemdefaults.inc.php | 5 + 12 files changed, 312 insertions(+), 97 deletions(-) commit bca5ae118 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 31 09:28:11 2011 +0000 Added comment web/report.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit b631cd994 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 31 08:59:18 2011 +0000 Added a "Skip and book" button to the page listing conflicting entries if you try and make a repeat booking where some of the entries have conflicts. web/edit_entry_handler.php | 149 +++++++++++++++++++++++++---------- web/lang.en | 4 +- web/mrbs.css.php | 7 +- 3 files changed, 117 insertions(+), 43 deletions(-) commit ab146b974 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 30 10:23:54 2011 +0000 Added the list of skipped bookings to ordinary email notifications. web/functions_mail.inc | 34 +++++++++++++++++++++++++++++++++- web/lang.en | 1 + web/mrbs-mail.css | 3 ++- 3 files changed, 36 insertions(+), 2 deletions(-) commit 658899ef8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 30 09:07:08 2011 +0000 Restructured code web/approve_entry_handler.php | 3 +-- web/edit_entry_handler.php | 15 ++++++++++----- web/functions_ical.inc | 9 ++------- web/functions_mail.inc | 6 ++---- web/mrbs_sql.inc | 26 ++++++++++++++++++-------- 5 files changed, 33 insertions(+), 26 deletions(-) commit 7f4a6d78e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 29 18:22:01 2011 +0000 Added comment web/functions_ical.inc | 1 + 1 file changed, 1 insertion(+) commit 4177877c7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 29 18:15:19 2011 +0000 Added list of skipped bookings to iCal notifications. (Still to come - adding them to ordinary email notifications) web/approve_entry_handler.php | 3 ++- web/edit_entry_handler.php | 2 +- web/functions_ical.inc | 34 +++++++++++++++++++++++++++++++++ web/functions_mail.inc | 6 ++++-- 4 files changed, 41 insertions(+), 4 deletions(-) commit 7507e55c4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 29 12:04:28 2011 +0000 Added an option on the booking form to skip past conflicting bookings when making repeat bookings. (To come: an option on the error page to skip past conflicting bookings if you've forgotten to check the box on the booking form) web/edit_entry.php | 9 +++++++ web/edit_entry_handler.php | 25 +++++++++++++++--- web/lang.en | 1 + web/mrbs_sql.inc | 50 ++++++++++++++++++++++++++++-------- web/systemdefaults.inc.php | 5 ++++ 5 files changed, 75 insertions(+), 15 deletions(-) commit 729ad07a6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 29 09:47:37 2011 +0000 Replaced some tabs by spaces web/auth_ldap.inc | 2 +- web/functions.inc | 74 ++++++++++++++++++++++----------------------- 2 files changed, 38 insertions(+), 38 deletions(-) commit d45a7fa86 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 29 09:23:32 2011 +0000 Fixed bug which meant that the time boxes on edit_entry didn't work properly web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b1a8f8635 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 28 19:27:20 2011 +0000 Merged in latest changes from trunk web/functions.inc | 6 +++--- web/mrbs_sql.inc | 8 +++++++- web/systemdefaults.inc.php | 4 ++++ 3 files changed, 14 insertions(+), 4 deletions(-) commit ddeefa57b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 28 19:11:34 2011 +0000 Made the date range for the date selectors a config variable (default +/- 5 years as at present) web/functions.inc | 6 +++--- web/systemdefaults.inc.php | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) commit 1ac56dac3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 28 07:48:02 2011 +0000 Various fixes to formatting, including fixes for problems in IE7/8 and Webkit web/Themes/default/header.inc | 33 ++++++++++++++-------- web/jquery/datatables/css/mrbs-table.css | 3 ++ web/mrbs.css.php | 12 +++++--- web/report.php | 9 ++++++ 4 files changed, 41 insertions(+), 16 deletions(-) commit 2b7af04a4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 27 17:50:36 2011 +0000 Fixed HTML validation error web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bb97fbfa9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 27 17:32:53 2011 +0000 Moved the Ajax batch size into internalconfig web/Themes/default/header.inc | 2 +- web/internalconfig.inc.php | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) commit 235d49635 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 27 17:16:01 2011 +0000 Restructured code web/report.php | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) commit ae9de32f3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 27 16:55:56 2011 +0000 Fixed CSV output which had got broken by the DataTables changes web/report.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit a82aafaeb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 27 16:25:10 2011 +0000 Tweaked formatting adding more space between the Report and Summary web/mrbs.css.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit b16b2a224 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 27 16:13:02 2011 +0000 Fixed bug which resulted in invalid Ajax data when the Summary table is also selected web/report.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit f1b8f122f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 27 15:42:16 2011 +0000 Implemented bulk deletion ability from the Report page. Only enabled if (a) you are the highest level admin and (b) the config variable $auth['show_bulk_delete'] is true. By default the config setting is false, so site admins will need to enable it if they want the bulk deletion feature. web/Themes/default/header.inc | 147 +++++++++++++++++--- web/del_entry_ajax.php (new) | 55 ++++++++ web/jquery/datatables/js/plugins.js (new) | 52 +++++++ web/lang.en | 6 + web/mrbs.css.php | 4 + web/mrbs_auth.inc | 1 + web/report.php | 41 ++++-- web/systemdefaults.inc.php | 3 + 8 files changed, 277 insertions(+), 32 deletions(-) commit 20e5de961 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 26 08:23:14 2011 +0000 Fixed infinite loop bug web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 20192686f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 25 16:53:13 2011 +0000 Minor tweak to code web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f0cae95de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 25 14:39:18 2011 +0000 Enabled deferred rendering for further performance improvement web/Themes/default/header.inc | 1 + 1 file changed, 1 insertion(+) commit 9a454dfdf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 25 14:30:09 2011 +0000 Switched to using an Ajax data source in the Report table for improved performance web/Themes/default/header.inc | 26 +++++++- web/jquery/datatables/css/mrbs-table.css | 2 +- web/report.php | 69 ++++++++++++++++++---- 3 files changed, 80 insertions(+), 17 deletions(-) commit 5828a0309 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 25 11:00:22 2011 +0000 Switched to using "full numbers" instead of "two button" pagination web/Themes/default/header.inc | 3 +++ web/jquery/datatables/css/mrbs-table.css | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) commit ee2d37dd2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 25 09:50:30 2011 +0000 Added a "Processing" message web/Themes/default/header.inc | 1 + web/jquery/datatables/css/mrbs-table.css | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) commit 7398e5486 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 25 08:21:23 2011 +0000 Tweaked layout web/jquery/datatables/css/mrbs-table.css | 4 ---- 1 file changed, 4 deletions(-) commit 6f4cb9bfa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 24 14:56:54 2011 +0000 Tidied up layout web/Themes/default/header.inc | 1 + web/jquery/datatables/css/mrbs-table.css | 11 +++++++++-- web/mrbs.css.php | 1 + web/report.php | 7 +++++-- 4 files changed, 16 insertions(+), 4 deletions(-) commit 36729e248 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 24 10:21:44 2011 +0000 Fixed the start and end time columns so that they sort properly web/jquery/datatables/css/mrbs-table.css | 330 +++++++++++---------- web/report.php | 22 +- 2 files changed, 187 insertions(+), 165 deletions(-) commit 6759f414a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 24 09:52:34 2011 +0000 Turned the report table into a DataTable. Still lots of rough edges. web/Themes/default/header.inc | 26 +++++++++++++++++++++++++- web/report.php | 2 +- 2 files changed, 26 insertions(+), 2 deletions(-) commit 67d05a28d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 24 09:28:52 2011 +0000 - restructured report so that the output is in the form of a table. Only very basic at this stage; not yet a DataTable - removed the "Display" option from the form as it is now superfluous. Start time, end time and duration will all be displayed as columns in the table and the column visibility feature will allow users to remove any columns they don't want. web/Themes/classic126/styling.inc | 3 +- web/Themes/default/styling.inc | 3 +- web/lang.ca | 3 - web/lang.cs | 3 - web/lang.da | 3 - web/lang.de | 3 - web/lang.el | 3 - web/lang.en | 3 - web/lang.es | 3 - web/lang.eu | 3 - web/lang.fi | 3 - web/lang.fr | 3 - web/lang.it | 3 - web/lang.ja | 3 - web/lang.ko | 3 - web/lang.nl | 3 - web/lang.no | 3 - web/lang.pl | 3 - web/lang.pt | 3 - web/lang.sl | 3 - web/lang.sv | 3 - web/lang.tr | 3 - web/lang.zh-cn | 3 - web/lang.zh-tw | 3 - web/mrbs.css.php | 12 - web/report.php | 407 ++++++++-------------------- 26 files changed, 119 insertions(+), 372 deletions(-) commit 83aaf7acd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 23 10:39:00 2011 +0000 Got rid of the now redundant freeze_panes CSS web/mrbs.css.php | 9 --------- 1 file changed, 9 deletions(-) commit d1e08b778 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 23 10:36:20 2011 +0000 Turned the rooms table into a DataTable web/Themes/default/header.inc | 38 ++++++++++++- web/admin.php | 98 +++++++++++++-------------------- 2 files changed, 76 insertions(+), 60 deletions(-) commit 563ad06e6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 22 16:50:23 2011 +0000 Restructured code web/Themes/default/header.inc | 122 ++++++++++++++++++++------------ 1 file changed, 76 insertions(+), 46 deletions(-) commit d84d2f6bc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 19 16:09:19 2011 +0000 Added state saving web/Themes/default/header.inc | 1 + 1 file changed, 1 insertion(+) commit 4891e8bdd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 19 16:03:43 2011 +0000 Made IE6 tables ordinary tables, rather than DataTables. Although DataTables can be made to work with IE6, it's too much effort ... web/Themes/default/header.inc | 80 ++++++++++++++++++++------------- 1 file changed, 49 insertions(+), 31 deletions(-) commit 52aa24d60 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 19 15:38:22 2011 +0000 Fixed left hand two columns web/Themes/default/header.inc | 22 +- web/edit_users.php | 2 +- web/jquery/datatables/css/ColVis.css | 5 +- web/jquery/datatables/css/mrbs-table.css | 378 ++++++++--------- .../datatables/js/FixedColumns.min.js (new) | 39 ++ web/mrbs.css.php | 2 +- 6 files changed, 235 insertions(+), 213 deletions(-) commit f5a9b516b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 19 13:33:03 2011 +0000 Tidied up CSS web/Themes/default/header.inc | 6 +- web/edit_users.php | 171 --------------------- web/jquery/datatables/css/ColVis.css | 1 + web/jquery/datatables/css/mrbs-table.css | 6 +- web/mrbs-ielte7.css.php | 9 -- web/mrbs.css.php | 2 +- 6 files changed, 10 insertions(+), 185 deletions(-) commit ce453e3e3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 18 17:57:49 2011 +0000 Fixed bug whereby defaults wouldn't be set if there was no language file web/Themes/default/header.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit f91cb55cf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 18 17:29:40 2011 +0000 - Internationalised ColVis text strings - Added a "Restore" option web/Themes/default/header.inc | 9 +++++---- web/lang.en | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-) commit 0768272d5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 18 17:09:04 2011 +0000 Tweaked formatting of Show/Hide columns web/jquery/datatables/css/ColVis.css | 72 ++++++++++++-------------- 1 file changed, 33 insertions(+), 39 deletions(-) commit 4e19f620e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 18 16:42:54 2011 +0000 Fixed known bug in ColVis (sSize is ignored) web/jquery/datatables/js/ColVis.min.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a4175dc83 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 18 16:38:41 2011 +0000 Added column visibility web/Themes/default/header.inc | 5 +- web/jquery/datatables/css/ColVis.css (new) | 87 ++++++++++++++ .../datatables/css/ColVisAlt.css (new) | 104 +++++++++++++++++ web/jquery/datatables/css/mrbs-table.css | 5 +- .../datatables/images/button.png (new) | Bin 0 -> 1161 bytes web/jquery/datatables/js/ColVis.min.js (new) | 30 +++++ web/style.inc | 1 + 7 files changed, 229 insertions(+), 3 deletions(-) commit bfe908ffb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 18 15:27:09 2011 +0000 Changed intial ordering of columns so that it goes "Action - Name - Rights" and not "Action - Rights - Name" web/Themes/default/header.inc | 11 +++++++++++ 1 file changed, 11 insertions(+) commit cfa418319 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 17 17:00:08 2011 +0000 Added column reordering web/Themes/default/header.inc | 2 + .../datatables/css/ColReorder.css (new) | 21 +++++++++++ .../datatables/images/insert.png (new) | Bin 0 -> 1885 bytes .../datatables/js/ColReorder.min.js (new) | 33 +++++++++++++++++ web/style.inc | 1 + 5 files changed, 57 insertions(+) commit d00b1a88f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 17 16:29:27 2011 +0000 First cut at a DataTables version of the users list web/Themes/default/header.inc | 39 +- web/edit_users.php | 124 ++++ .../datatables/css/mrbs-page.css (new) | 19 + .../datatables/css/mrbs-table.css (new) | 560 +++++++++++++++++ .../images/Sorting icons.psd (new) | Bin 0 -> 27490 bytes .../images/back_disabled.jpg (new) | Bin 0 -> 612 bytes .../datatables/images/back_enabled.jpg (new) | Bin 0 -> 807 bytes .../datatables/images/favicon.ico (new) | Bin 0 -> 894 bytes .../images/forward_disabled.jpg (new) | Bin 0 -> 635 bytes .../images/forward_enabled.jpg (new) | Bin 0 -> 852 bytes .../datatables/images/sort_asc.png (new) | Bin 0 -> 263 bytes .../images/sort_asc_disabled.png (new) | Bin 0 -> 252 bytes .../datatables/images/sort_both.png (new) | Bin 0 -> 282 bytes .../datatables/images/sort_desc.png (new) | Bin 0 -> 260 bytes .../images/sort_desc_disabled.png (new) | Bin 0 -> 251 bytes .../js/jquery.dataTables.min.js (new) | 151 +++++ web/jquery/datatables/language/ar.txt (new) | 17 + web/jquery/datatables/language/bg.txt (new) | 17 + web/jquery/datatables/language/ca.txt (new) | 17 + web/jquery/datatables/language/cs.txt (new) | 17 + web/jquery/datatables/language/da.txt (new) | 17 + web/jquery/datatables/language/de.txt (new) | 17 + web/jquery/datatables/language/el.txt (new) | 17 + web/jquery/datatables/language/en.txt (new) | 17 + web/jquery/datatables/language/es.txt (new) | 17 + web/jquery/datatables/language/et.txt (new) | 16 + web/jquery/datatables/language/fa.txt (new) | 17 + web/jquery/datatables/language/fi.txt (new) | 17 + web/jquery/datatables/language/fr.txt (new) | 17 + .../datatables/language/gd-ie.txt (new) | 17 + web/jquery/datatables/language/he.txt (new) | 17 + web/jquery/datatables/language/hi.txt (new) | 17 + web/jquery/datatables/language/hr.txt (new) | 17 + web/jquery/datatables/language/hu.txt (new) | 17 + web/jquery/datatables/language/id.txt (new) | 17 + web/jquery/datatables/language/it.txt (new) | 17 + web/jquery/datatables/language/ka.txt (new) | 16 + web/jquery/datatables/language/lt.txt (new) | 17 + web/jquery/datatables/language/lv.txt (new) | 17 + web/jquery/datatables/language/nl.txt (new) | 17 + web/jquery/datatables/language/no.txt (new) | 17 + web/jquery/datatables/language/pl.txt (new) | 17 + .../datatables/language/pt-br.txt (new) | 17 + .../datatables/language/pt-pt.txt (new) | 17 + web/jquery/datatables/language/pt.txt (new) | 17 + web/jquery/datatables/language/ro.txt (new) | 17 + web/jquery/datatables/language/ru.txt (new) | 17 + web/jquery/datatables/language/sk.txt (new) | 17 + web/jquery/datatables/language/sl.txt (new) | 17 + web/jquery/datatables/language/sr.txt (new) | 17 + web/jquery/datatables/language/sv.txt (new) | 17 + web/jquery/datatables/language/th.txt (new) | 17 + web/jquery/datatables/language/tr.txt (new) | 17 + web/jquery/datatables/language/uk.txt (new) | 17 + web/jquery/datatables/language/ur.txt (new) | 17 + web/jquery/datatables/language/vi.txt (new) | 17 + web/jquery/datatables/language/zh.txt (new) | 17 + web/language.inc | 73 +++ web/mrbs-ielte7.css.php | 9 + web/mrbs.css.php | 2 +- web/style.inc | 3 + 61 files changed, 1673 insertions(+), 2 deletions(-) commit ccba7c8f8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 15 17:59:19 2011 +0000 Improved error reporting web/mrbs_sql.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit 066b5917a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 15 08:42:34 2011 +0000 Upgraded to jQuery version 1.6.2 web/Themes/default/header.inc | 2 +- web/jquery/jquery-1.5.2.min.js (gone) | 16 ---------------- web/jquery/jquery-1.6.2.min.js (new) | 18 ++++++++++++++++++ 3 files changed, 19 insertions(+), 17 deletions(-) commit 4baf34142 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 15 08:25:13 2011 +0000 Created a datatables branch for enhancing MRBS tables such as user lists, search results, report results, pending booking lists and area and room lists. Will allow tables to be searched and filtered, paged, sorted, columns to be reordered, etc. commit 02eec9411 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 7 17:27:39 2011 +0000 Added checking of the web for more up to date versions of the VTIMEZONE components used in iCalendar notifications. (Useful if countries change their timezone or DST rules). Also added caching of the latest version in the database. Web checking will timeout if there is no connection, and it can also be disabled completely. tables.my.pre41.sql | 13 +- tables.my.sql | 13 +- tables.pg.pre73.sql | 11 +- tables.pg.sql | 13 +- web/config.inc.php | 4 + web/dbsys.inc | 3 +- web/functions_ical.inc | 239 ++++++++++++++++++++++++++++--- web/systemdefaults.inc.php | 22 ++- web/upgrade/28/mysql.sql (new) | 12 ++ web/upgrade/28/pgsql.sql (new) | 10 ++ 10 files changed, 316 insertions(+), 24 deletions(-) commit 15faf94c2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 5 10:56:25 2011 +0000 Minor tweaks to language strings. See SF 3386679. web/lang.en | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) commit 5450f2cbe Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 4 14:08:08 2011 +0000 Corrected a minor error in JavaScript. Thanks to Guenter Böhm. web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 92c322a3a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 4 11:18:11 2011 +0000 Added database error checking and handling to sql_*_field_info() web/mysql.inc | 11 ++++++++--- web/mysqli.inc | 11 ++++++++--- web/pgsql.inc | 11 ++++++++--- 3 files changed, 24 insertions(+), 9 deletions(-) commit 95a4266ff Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 3 16:34:02 2011 +0000 Changed eol-style from native to CRLF, as it's important in RFC 5545 that lines are terminated by CRLF. .../zoneinfo-outlook/Africa/Abidjan.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Accra.ics | 30 +- .../zoneinfo-outlook/Africa/Addis_Ababa.ics | 30 +- .../zoneinfo-outlook/Africa/Algiers.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Asmara.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Bamako.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Bangui.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Banjul.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Bissau.ics | 30 +- .../zoneinfo-outlook/Africa/Blantyre.ics | 30 +- .../zoneinfo-outlook/Africa/Brazzaville.ics | 30 +- .../zoneinfo-outlook/Africa/Bujumbura.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Cairo.ics | 30 +- .../zoneinfo-outlook/Africa/Casablanca.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Ceuta.ics | 46 +- .../zoneinfo-outlook/Africa/Conakry.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Dakar.ics | 30 +- .../Africa/Dar_es_Salaam.ics | 30 +- .../zoneinfo-outlook/Africa/Djibouti.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Douala.ics | 30 +- .../zoneinfo-outlook/Africa/El_Aaiun.ics | 30 +- .../zoneinfo-outlook/Africa/Freetown.ics | 30 +- .../zoneinfo-outlook/Africa/Gaborone.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Harare.ics | 30 +- .../zoneinfo-outlook/Africa/Johannesburg.ics | 30 +- .../zoneinfo-outlook/Africa/Kampala.ics | 30 +- .../zoneinfo-outlook/Africa/Khartoum.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Kigali.ics | 30 +- .../zoneinfo-outlook/Africa/Kinshasa.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Lagos.ics | 30 +- .../zoneinfo-outlook/Africa/Libreville.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Lome.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Luanda.ics | 30 +- .../zoneinfo-outlook/Africa/Lubumbashi.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Lusaka.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Malabo.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Maputo.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Maseru.ics | 30 +- .../zoneinfo-outlook/Africa/Mbabane.ics | 30 +- .../zoneinfo-outlook/Africa/Mogadishu.ics | 30 +- .../zoneinfo-outlook/Africa/Monrovia.ics | 30 +- .../zoneinfo-outlook/Africa/Nairobi.ics | 30 +- .../zoneinfo-outlook/Africa/Ndjamena.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Niamey.ics | 30 +- .../zoneinfo-outlook/Africa/Nouakchott.ics | 30 +- .../zoneinfo-outlook/Africa/Ouagadougou.ics | 30 +- .../zoneinfo-outlook/Africa/Porto-Novo.ics | 30 +- .../zoneinfo-outlook/Africa/Sao_Tome.ics | 30 +- .../zoneinfo-outlook/Africa/Tripoli.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Tunis.ics | 30 +- .../zoneinfo-outlook/Africa/Windhoek.ics | 46 +- web/tzurl/zoneinfo-outlook/America/Adak.ics | 46 +- .../zoneinfo-outlook/America/Anchorage.ics | 46 +- .../zoneinfo-outlook/America/Anguilla.ics | 30 +- .../zoneinfo-outlook/America/Antigua.ics | 30 +- .../zoneinfo-outlook/America/Araguaina.ics | 30 +- .../America/Argentina/Buenos_Aires.ics | 30 +- .../America/Argentina/Catamarca.ics | 30 +- .../America/Argentina/Cordoba.ics | 30 +- .../America/Argentina/Jujuy.ics | 30 +- .../America/Argentina/La_Rioja.ics | 30 +- .../America/Argentina/Mendoza.ics | 30 +- .../America/Argentina/Rio_Gallegos.ics | 30 +- .../America/Argentina/Salta.ics | 30 +- .../America/Argentina/San_Juan.ics | 30 +- .../America/Argentina/San_Luis.ics | 30 +- .../America/Argentina/Tucuman.ics | 30 +- .../America/Argentina/Ushuaia.ics | 30 +- web/tzurl/zoneinfo-outlook/America/Aruba.ics | 30 +- .../zoneinfo-outlook/America/Asuncion.ics | 46 +- .../zoneinfo-outlook/America/Atikokan.ics | 30 +- web/tzurl/zoneinfo-outlook/America/Bahia.ics | 30 +- .../America/Bahia_Banderas.ics | 46 +- .../zoneinfo-outlook/America/Barbados.ics | 30 +- web/tzurl/zoneinfo-outlook/America/Belem.ics | 30 +- .../zoneinfo-outlook/America/Belize.ics | 30 +- .../America/Blanc-Sablon.ics | 30 +- .../zoneinfo-outlook/America/Boa_Vista.ics | 30 +- .../zoneinfo-outlook/America/Bogota.ics | 30 +- web/tzurl/zoneinfo-outlook/America/Boise.ics | 46 +- .../America/Cambridge_Bay.ics | 46 +- .../America/Campo_Grande.ics | 46 +- .../zoneinfo-outlook/America/Cancun.ics | 46 +- .../zoneinfo-outlook/America/Caracas.ics | 30 +- .../zoneinfo-outlook/America/Cayenne.ics | 30 +- .../zoneinfo-outlook/America/Cayman.ics | 30 +- .../zoneinfo-outlook/America/Chicago.ics | 46 +- .../zoneinfo-outlook/America/Chihuahua.ics | 46 +- .../zoneinfo-outlook/America/Costa_Rica.ics | 30 +- .../zoneinfo-outlook/America/Cuiaba.ics | 46 +- .../zoneinfo-outlook/America/Curacao.ics | 30 +- .../America/Danmarkshavn.ics | 30 +- .../zoneinfo-outlook/America/Dawson.ics | 46 +- .../America/Dawson_Creek.ics | 30 +- .../zoneinfo-outlook/America/Denver.ics | 46 +- .../zoneinfo-outlook/America/Detroit.ics | 46 +- .../zoneinfo-outlook/America/Dominica.ics | 30 +- .../zoneinfo-outlook/America/Edmonton.ics | 46 +- .../zoneinfo-outlook/America/Eirunepe.ics | 30 +- .../zoneinfo-outlook/America/El_Salvador.ics | 30 +- .../zoneinfo-outlook/America/Fortaleza.ics | 30 +- .../zoneinfo-outlook/America/Glace_Bay.ics | 46 +- .../zoneinfo-outlook/America/Godthab.ics | 46 +- .../zoneinfo-outlook/America/Goose_Bay.ics | 46 +- .../zoneinfo-outlook/America/Grand_Turk.ics | 46 +- .../zoneinfo-outlook/America/Grenada.ics | 30 +- .../zoneinfo-outlook/America/Guadeloupe.ics | 30 +- .../zoneinfo-outlook/America/Guatemala.ics | 30 +- .../zoneinfo-outlook/America/Guayaquil.ics | 30 +- .../zoneinfo-outlook/America/Guyana.ics | 30 +- .../zoneinfo-outlook/America/Halifax.ics | 46 +- .../zoneinfo-outlook/America/Havana.ics | 46 +- .../zoneinfo-outlook/America/Hermosillo.ics | 30 +- .../America/Indiana/Indianapolis.ics | 46 +- .../America/Indiana/Knox.ics | 46 +- .../America/Indiana/Marengo.ics | 46 +- .../America/Indiana/Petersburg.ics | 46 +- .../America/Indiana/Tell_City.ics | 46 +- .../America/Indiana/Vevay.ics | 46 +- .../America/Indiana/Vincennes.ics | 46 +- .../America/Indiana/Winamac.ics | 46 +- .../zoneinfo-outlook/America/Inuvik.ics | 46 +- .../zoneinfo-outlook/America/Iqaluit.ics | 46 +- .../zoneinfo-outlook/America/Jamaica.ics | 30 +- .../zoneinfo-outlook/America/Juneau.ics | 46 +- .../America/Kentucky/Louisville.ics | 46 +- .../America/Kentucky/Monticello.ics | 46 +- .../zoneinfo-outlook/America/Kralendijk.ics | 30 +- .../zoneinfo-outlook/America/La_Paz.ics | 30 +- web/tzurl/zoneinfo-outlook/America/Lima.ics | 30 +- .../zoneinfo-outlook/America/Los_Angeles.ics | 46 +- .../America/Lower_Princes.ics | 30 +- .../zoneinfo-outlook/America/Maceio.ics | 30 +- .../zoneinfo-outlook/America/Managua.ics | 30 +- .../zoneinfo-outlook/America/Manaus.ics | 30 +- .../zoneinfo-outlook/America/Marigot.ics | 30 +- .../zoneinfo-outlook/America/Martinique.ics | 30 +- .../zoneinfo-outlook/America/Matamoros.ics | 46 +- .../zoneinfo-outlook/America/Mazatlan.ics | 46 +- .../zoneinfo-outlook/America/Menominee.ics | 46 +- .../zoneinfo-outlook/America/Merida.ics | 46 +- .../zoneinfo-outlook/America/Metlakatla.ics | 46 +- .../zoneinfo-outlook/America/Mexico_City.ics | 46 +- .../zoneinfo-outlook/America/Miquelon.ics | 46 +- .../zoneinfo-outlook/America/Moncton.ics | 46 +- .../zoneinfo-outlook/America/Monterrey.ics | 46 +- .../zoneinfo-outlook/America/Montevideo.ics | 46 +- .../zoneinfo-outlook/America/Montreal.ics | 46 +- .../zoneinfo-outlook/America/Montserrat.ics | 30 +- .../zoneinfo-outlook/America/Nassau.ics | 46 +- .../zoneinfo-outlook/America/New_York.ics | 46 +- .../zoneinfo-outlook/America/Nipigon.ics | 46 +- web/tzurl/zoneinfo-outlook/America/Nome.ics | 46 +- .../zoneinfo-outlook/America/Noronha.ics | 30 +- .../America/North_Dakota/Beulah.ics | 46 +- .../America/North_Dakota/Center.ics | 46 +- .../America/North_Dakota/New_Salem.ics | 46 +- .../zoneinfo-outlook/America/Ojinaga.ics | 46 +- .../zoneinfo-outlook/America/Panama.ics | 30 +- .../zoneinfo-outlook/America/Pangnirtung.ics | 46 +- .../zoneinfo-outlook/America/Paramaribo.ics | 30 +- .../zoneinfo-outlook/America/Phoenix.ics | 30 +- .../America/Port-au-Prince.ics | 30 +- .../America/Port_of_Spain.ics | 30 +- .../zoneinfo-outlook/America/Porto_Velho.ics | 30 +- .../zoneinfo-outlook/America/Puerto_Rico.ics | 30 +- .../zoneinfo-outlook/America/Rainy_River.ics | 46 +- .../America/Rankin_Inlet.ics | 46 +- .../zoneinfo-outlook/America/Recife.ics | 30 +- .../zoneinfo-outlook/America/Regina.ics | 30 +- .../zoneinfo-outlook/America/Resolute.ics | 46 +- .../zoneinfo-outlook/America/Rio_Branco.ics | 30 +- .../America/Santa_Isabel.ics | 46 +- .../zoneinfo-outlook/America/Santarem.ics | 30 +- .../zoneinfo-outlook/America/Santiago.ics | 46 +- .../America/Santo_Domingo.ics | 30 +- .../zoneinfo-outlook/America/Sao_Paulo.ics | 46 +- .../America/Scoresbysund.ics | 46 +- web/tzurl/zoneinfo-outlook/America/Sitka.ics | 46 +- .../America/St_Barthelemy.ics | 30 +- .../zoneinfo-outlook/America/St_Johns.ics | 46 +- .../zoneinfo-outlook/America/St_Kitts.ics | 30 +- .../zoneinfo-outlook/America/St_Lucia.ics | 30 +- .../zoneinfo-outlook/America/St_Thomas.ics | 30 +- .../zoneinfo-outlook/America/St_Vincent.ics | 30 +- .../America/Swift_Current.ics | 30 +- .../zoneinfo-outlook/America/Tegucigalpa.ics | 30 +- web/tzurl/zoneinfo-outlook/America/Thule.ics | 46 +- .../zoneinfo-outlook/America/Thunder_Bay.ics | 46 +- .../zoneinfo-outlook/America/Tijuana.ics | 46 +- .../zoneinfo-outlook/America/Toronto.ics | 46 +- .../zoneinfo-outlook/America/Tortola.ics | 30 +- .../zoneinfo-outlook/America/Vancouver.ics | 46 +- .../zoneinfo-outlook/America/Whitehorse.ics | 46 +- .../zoneinfo-outlook/America/Winnipeg.ics | 46 +- .../zoneinfo-outlook/America/Yakutat.ics | 46 +- .../zoneinfo-outlook/America/Yellowknife.ics | 46 +- .../zoneinfo-outlook/Antarctica/Casey.ics | 30 +- .../zoneinfo-outlook/Antarctica/Davis.ics | 30 +- .../Antarctica/DumontDUrville.ics | 30 +- .../Antarctica/Macquarie.ics | 30 +- .../zoneinfo-outlook/Antarctica/Mawson.ics | 30 +- .../zoneinfo-outlook/Antarctica/McMurdo.ics | 46 +- .../zoneinfo-outlook/Antarctica/Palmer.ics | 46 +- .../zoneinfo-outlook/Antarctica/Rothera.ics | 30 +- .../Antarctica/South_Pole.ics | 46 +- .../zoneinfo-outlook/Antarctica/Syowa.ics | 30 +- .../zoneinfo-outlook/Antarctica/Vostok.ics | 30 +- .../zoneinfo-outlook/Arctic/Longyearbyen.ics | 46 +- web/tzurl/zoneinfo-outlook/Asia/Aden.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Almaty.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Amman.ics | 46 +- web/tzurl/zoneinfo-outlook/Asia/Anadyr.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Aqtau.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Aqtobe.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Ashgabat.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Baghdad.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Bahrain.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Baku.ics | 46 +- web/tzurl/zoneinfo-outlook/Asia/Bangkok.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Beirut.ics | 46 +- web/tzurl/zoneinfo-outlook/Asia/Bishkek.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Brunei.ics | 30 +- .../zoneinfo-outlook/Asia/Choibalsan.ics | 28 +- .../zoneinfo-outlook/Asia/Chongqing.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Colombo.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Damascus.ics | 46 +- web/tzurl/zoneinfo-outlook/Asia/Dhaka.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Dili.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Dubai.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Dushanbe.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Gaza.ics | 46 +- web/tzurl/zoneinfo-outlook/Asia/Harbin.ics | 30 +- .../zoneinfo-outlook/Asia/Ho_Chi_Minh.ics | 30 +- .../zoneinfo-outlook/Asia/Hong_Kong.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Hovd.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Irkutsk.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Istanbul.ics | 46 +- web/tzurl/zoneinfo-outlook/Asia/Jakarta.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Jayapura.ics | 30 +- .../zoneinfo-outlook/Asia/Jerusalem.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Kabul.ics | 30 +- .../zoneinfo-outlook/Asia/Kamchatka.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Karachi.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Kashgar.ics | 30 +- .../zoneinfo-outlook/Asia/Kathmandu.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Kolkata.ics | 30 +- .../zoneinfo-outlook/Asia/Krasnoyarsk.ics | 30 +- .../zoneinfo-outlook/Asia/Kuala_Lumpur.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Kuching.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Kuwait.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Macau.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Magadan.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Makassar.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Manila.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Muscat.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Nicosia.ics | 46 +- .../zoneinfo-outlook/Asia/Novokuznetsk.ics | 30 +- .../zoneinfo-outlook/Asia/Novosibirsk.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Omsk.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Oral.ics | 30 +- .../zoneinfo-outlook/Asia/Phnom_Penh.ics | 30 +- .../zoneinfo-outlook/Asia/Pontianak.ics | 30 +- .../zoneinfo-outlook/Asia/Pyongyang.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Qatar.ics | 30 +- .../zoneinfo-outlook/Asia/Qyzylorda.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Rangoon.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Riyadh.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Sakhalin.ics | 30 +- .../zoneinfo-outlook/Asia/Samarkand.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Seoul.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Shanghai.ics | 30 +- .../zoneinfo-outlook/Asia/Singapore.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Taipei.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Tashkent.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Tbilisi.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Tehran.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Thimphu.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Tokyo.ics | 30 +- .../zoneinfo-outlook/Asia/Ulaanbaatar.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Urumqi.ics | 30 +- .../zoneinfo-outlook/Asia/Vientiane.ics | 30 +- .../zoneinfo-outlook/Asia/Vladivostok.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Yakutsk.ics | 30 +- .../zoneinfo-outlook/Asia/Yekaterinburg.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Yerevan.ics | 46 +- .../zoneinfo-outlook/Atlantic/Azores.ics | 46 +- .../zoneinfo-outlook/Atlantic/Bermuda.ics | 46 +- .../zoneinfo-outlook/Atlantic/Canary.ics | 46 +- .../zoneinfo-outlook/Atlantic/Cape_Verde.ics | 30 +- .../zoneinfo-outlook/Atlantic/Faroe.ics | 46 +- .../zoneinfo-outlook/Atlantic/Madeira.ics | 46 +- .../zoneinfo-outlook/Atlantic/Reykjavik.ics | 30 +- .../Atlantic/South_Georgia.ics | 30 +- .../zoneinfo-outlook/Atlantic/St_Helena.ics | 30 +- .../zoneinfo-outlook/Atlantic/Stanley.ics | 46 +- .../zoneinfo-outlook/Australia/Adelaide.ics | 46 +- .../zoneinfo-outlook/Australia/Brisbane.ics | 30 +- .../zoneinfo-outlook/Australia/Currie.ics | 46 +- .../zoneinfo-outlook/Australia/Darwin.ics | 30 +- .../zoneinfo-outlook/Australia/Eucla.ics | 30 +- .../zoneinfo-outlook/Australia/Hobart.ics | 46 +- .../zoneinfo-outlook/Australia/Lindeman.ics | 30 +- .../zoneinfo-outlook/Australia/Lord_Howe.ics | 46 +- .../zoneinfo-outlook/Australia/Melbourne.ics | 46 +- .../zoneinfo-outlook/Australia/Perth.ics | 30 +- .../zoneinfo-outlook/Australia/Sydney.ics | 46 +- .../zoneinfo-outlook/Europe/Amsterdam.ics | 46 +- .../zoneinfo-outlook/Europe/Andorra.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Athens.ics | 46 +- .../zoneinfo-outlook/Europe/Belgrade.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Berlin.ics | 46 +- .../zoneinfo-outlook/Europe/Bratislava.ics | 46 +- .../zoneinfo-outlook/Europe/Brussels.ics | 46 +- .../zoneinfo-outlook/Europe/Bucharest.ics | 46 +- .../zoneinfo-outlook/Europe/Budapest.ics | 46 +- .../zoneinfo-outlook/Europe/Chisinau.ics | 46 +- .../zoneinfo-outlook/Europe/Copenhagen.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Dublin.ics | 46 +- .../zoneinfo-outlook/Europe/Gibraltar.ics | 46 +- .../zoneinfo-outlook/Europe/Guernsey.ics | 46 +- .../zoneinfo-outlook/Europe/Helsinki.ics | 46 +- .../zoneinfo-outlook/Europe/Isle_of_Man.ics | 46 +- .../zoneinfo-outlook/Europe/Istanbul.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Jersey.ics | 46 +- .../zoneinfo-outlook/Europe/Kaliningrad.ics | 30 +- web/tzurl/zoneinfo-outlook/Europe/Kiev.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Lisbon.ics | 46 +- .../zoneinfo-outlook/Europe/Ljubljana.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/London.ics | 46 +- .../zoneinfo-outlook/Europe/Luxembourg.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Madrid.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Malta.ics | 46 +- .../zoneinfo-outlook/Europe/Mariehamn.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Minsk.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Monaco.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Moscow.ics | 30 +- .../zoneinfo-outlook/Europe/Nicosia.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Oslo.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Paris.ics | 46 +- .../zoneinfo-outlook/Europe/Podgorica.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Prague.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Riga.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Rome.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Samara.ics | 30 +- .../zoneinfo-outlook/Europe/San_Marino.ics | 46 +- .../zoneinfo-outlook/Europe/Sarajevo.ics | 46 +- .../zoneinfo-outlook/Europe/Simferopol.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Skopje.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Sofia.ics | 46 +- .../zoneinfo-outlook/Europe/Stockholm.ics | 46 +- .../zoneinfo-outlook/Europe/Tallinn.ics | 46 +- .../zoneinfo-outlook/Europe/Uzhgorod.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Vaduz.ics | 46 +- .../zoneinfo-outlook/Europe/Vatican.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Vienna.ics | 46 +- .../zoneinfo-outlook/Europe/Vilnius.ics | 46 +- .../zoneinfo-outlook/Europe/Volgograd.ics | 30 +- web/tzurl/zoneinfo-outlook/Europe/Warsaw.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Zagreb.ics | 46 +- .../zoneinfo-outlook/Europe/Zaporozhye.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Zurich.ics | 46 +- .../zoneinfo-outlook/Indian/Antananarivo.ics | 30 +- web/tzurl/zoneinfo-outlook/Indian/Chagos.ics | 30 +- .../zoneinfo-outlook/Indian/Christmas.ics | 30 +- web/tzurl/zoneinfo-outlook/Indian/Cocos.ics | 30 +- web/tzurl/zoneinfo-outlook/Indian/Comoro.ics | 30 +- .../zoneinfo-outlook/Indian/Kerguelen.ics | 30 +- web/tzurl/zoneinfo-outlook/Indian/Mahe.ics | 30 +- .../zoneinfo-outlook/Indian/Maldives.ics | 30 +- .../zoneinfo-outlook/Indian/Mauritius.ics | 30 +- .../zoneinfo-outlook/Indian/Mayotte.ics | 30 +- .../zoneinfo-outlook/Indian/Reunion.ics | 30 +- web/tzurl/zoneinfo-outlook/Pacific/Apia.ics | 30 +- .../zoneinfo-outlook/Pacific/Auckland.ics | 46 +- .../zoneinfo-outlook/Pacific/Chatham.ics | 46 +- web/tzurl/zoneinfo-outlook/Pacific/Chuuk.ics | 30 +- .../zoneinfo-outlook/Pacific/Easter.ics | 46 +- web/tzurl/zoneinfo-outlook/Pacific/Efate.ics | 30 +- .../zoneinfo-outlook/Pacific/Enderbury.ics | 30 +- .../zoneinfo-outlook/Pacific/Fakaofo.ics | 30 +- web/tzurl/zoneinfo-outlook/Pacific/Fiji.ics | 30 +- .../zoneinfo-outlook/Pacific/Funafuti.ics | 30 +- .../zoneinfo-outlook/Pacific/Galapagos.ics | 30 +- .../zoneinfo-outlook/Pacific/Gambier.ics | 30 +- .../zoneinfo-outlook/Pacific/Guadalcanal.ics | 30 +- web/tzurl/zoneinfo-outlook/Pacific/Guam.ics | 30 +- .../zoneinfo-outlook/Pacific/Honolulu.ics | 30 +- .../zoneinfo-outlook/Pacific/Johnston.ics | 30 +- .../zoneinfo-outlook/Pacific/Kiritimati.ics | 30 +- .../zoneinfo-outlook/Pacific/Kosrae.ics | 30 +- .../zoneinfo-outlook/Pacific/Kwajalein.ics | 30 +- .../zoneinfo-outlook/Pacific/Majuro.ics | 30 +- .../zoneinfo-outlook/Pacific/Marquesas.ics | 30 +- .../zoneinfo-outlook/Pacific/Midway.ics | 30 +- web/tzurl/zoneinfo-outlook/Pacific/Nauru.ics | 30 +- web/tzurl/zoneinfo-outlook/Pacific/Niue.ics | 30 +- .../zoneinfo-outlook/Pacific/Norfolk.ics | 30 +- .../zoneinfo-outlook/Pacific/Noumea.ics | 30 +- .../zoneinfo-outlook/Pacific/Pago_Pago.ics | 30 +- web/tzurl/zoneinfo-outlook/Pacific/Palau.ics | 30 +- .../zoneinfo-outlook/Pacific/Pitcairn.ics | 30 +- .../zoneinfo-outlook/Pacific/Pohnpei.ics | 30 +- .../zoneinfo-outlook/Pacific/Ponape.ics | 30 +- .../Pacific/Port_Moresby.ics | 30 +- .../zoneinfo-outlook/Pacific/Rarotonga.ics | 30 +- .../zoneinfo-outlook/Pacific/Saipan.ics | 30 +- .../zoneinfo-outlook/Pacific/Tahiti.ics | 30 +- .../zoneinfo-outlook/Pacific/Tarawa.ics | 30 +- .../zoneinfo-outlook/Pacific/Tongatapu.ics | 30 +- web/tzurl/zoneinfo-outlook/Pacific/Truk.ics | 30 +- web/tzurl/zoneinfo-outlook/Pacific/Wake.ics | 30 +- .../zoneinfo-outlook/Pacific/Wallis.ics | 30 +- web/tzurl/zoneinfo/Africa/Abidjan.ics | 32 +- web/tzurl/zoneinfo/Africa/Accra.ics | 84 +-- web/tzurl/zoneinfo/Africa/Addis_Ababa.ics | 46 +- web/tzurl/zoneinfo/Africa/Algiers.ics | 182 +++--- web/tzurl/zoneinfo/Africa/Asmara.ics | 60 +- web/tzurl/zoneinfo/Africa/Bamako.ics | 60 +- web/tzurl/zoneinfo/Africa/Bangui.ics | 32 +- web/tzurl/zoneinfo/Africa/Banjul.ics | 60 +- web/tzurl/zoneinfo/Africa/Bissau.ics | 46 +- web/tzurl/zoneinfo/Africa/Blantyre.ics | 32 +- web/tzurl/zoneinfo/Africa/Brazzaville.ics | 32 +- web/tzurl/zoneinfo/Africa/Bujumbura.ics | 32 +- web/tzurl/zoneinfo/Africa/Cairo.ics | 300 ++++----- web/tzurl/zoneinfo/Africa/Casablanca.ics | 120 ++-- web/tzurl/zoneinfo/Africa/Ceuta.ics | 200 +++--- web/tzurl/zoneinfo/Africa/Conakry.ics | 60 +- web/tzurl/zoneinfo/Africa/Dakar.ics | 46 +- web/tzurl/zoneinfo/Africa/Dar_es_Salaam.ics | 60 +- web/tzurl/zoneinfo/Africa/Djibouti.ics | 32 +- web/tzurl/zoneinfo/Africa/Douala.ics | 32 +- web/tzurl/zoneinfo/Africa/El_Aaiun.ics | 46 +- web/tzurl/zoneinfo/Africa/Freetown.ics | 164 ++--- web/tzurl/zoneinfo/Africa/Gaborone.ics | 60 +- web/tzurl/zoneinfo/Africa/Harare.ics | 32 +- web/tzurl/zoneinfo/Africa/Johannesburg.ics | 78 +-- web/tzurl/zoneinfo/Africa/Kampala.ics | 74 +-- web/tzurl/zoneinfo/Africa/Khartoum.ics | 134 ++-- web/tzurl/zoneinfo/Africa/Kigali.ics | 32 +- web/tzurl/zoneinfo/Africa/Kinshasa.ics | 32 +- web/tzurl/zoneinfo/Africa/Lagos.ics | 32 +- web/tzurl/zoneinfo/Africa/Libreville.ics | 32 +- web/tzurl/zoneinfo/Africa/Lome.ics | 32 +- web/tzurl/zoneinfo/Africa/Luanda.ics | 46 +- web/tzurl/zoneinfo/Africa/Lubumbashi.ics | 32 +- web/tzurl/zoneinfo/Africa/Lusaka.ics | 32 +- web/tzurl/zoneinfo/Africa/Malabo.ics | 46 +- web/tzurl/zoneinfo/Africa/Maputo.ics | 32 +- web/tzurl/zoneinfo/Africa/Maseru.ics | 60 +- web/tzurl/zoneinfo/Africa/Mbabane.ics | 32 +- web/tzurl/zoneinfo/Africa/Mogadishu.ics | 60 +- web/tzurl/zoneinfo/Africa/Monrovia.ics | 60 +- web/tzurl/zoneinfo/Africa/Nairobi.ics | 74 +-- web/tzurl/zoneinfo/Africa/Ndjamena.ics | 60 +- web/tzurl/zoneinfo/Africa/Niamey.ics | 60 +- web/tzurl/zoneinfo/Africa/Nouakchott.ics | 60 +- web/tzurl/zoneinfo/Africa/Ouagadougou.ics | 32 +- web/tzurl/zoneinfo/Africa/Porto-Novo.ics | 46 +- web/tzurl/zoneinfo/Africa/Sao_Tome.ics | 46 +- web/tzurl/zoneinfo/Africa/Tripoli.ics | 136 ++--- web/tzurl/zoneinfo/Africa/Tunis.ics | 134 ++-- web/tzurl/zoneinfo/Africa/Windhoek.ics | 130 ++-- web/tzurl/zoneinfo/America/Adak.ics | 374 ++++++------ web/tzurl/zoneinfo/America/Anchorage.ics | 374 ++++++------ web/tzurl/zoneinfo/America/Anguilla.ics | 32 +- web/tzurl/zoneinfo/America/Antigua.ics | 46 +- web/tzurl/zoneinfo/America/Araguaina.ics | 170 +++--- .../America/Argentina/Buenos_Aires.ics | 248 ++++---- .../zoneinfo/America/Argentina/Catamarca.ics | 286 ++++----- .../zoneinfo/America/Argentina/Cordoba.ics | 272 ++++----- .../zoneinfo/America/Argentina/Jujuy.ics | 308 +++++----- .../zoneinfo/America/Argentina/La_Rioja.ics | 276 ++++----- .../zoneinfo/America/Argentina/Mendoza.ics | 298 ++++----- .../America/Argentina/Rio_Gallegos.ics | 262 ++++---- .../zoneinfo/America/Argentina/Salta.ics | 270 ++++----- .../zoneinfo/America/Argentina/San_Juan.ics | 276 ++++----- .../zoneinfo/America/Argentina/San_Luis.ics | 322 +++++----- .../zoneinfo/America/Argentina/Tucuman.ics | 288 ++++----- .../zoneinfo/America/Argentina/Ushuaia.ics | 262 ++++---- web/tzurl/zoneinfo/America/Aruba.ics | 46 +- web/tzurl/zoneinfo/America/Asuncion.ics | 266 ++++---- web/tzurl/zoneinfo/America/Atikokan.ics | 104 ++-- web/tzurl/zoneinfo/America/Bahia.ics | 186 +++--- .../zoneinfo/America/Bahia_Banderas.ics | 206 +++---- web/tzurl/zoneinfo/America/Barbados.ics | 86 +-- web/tzurl/zoneinfo/America/Belem.ics | 126 ++-- web/tzurl/zoneinfo/America/Belize.ics | 188 +++--- web/tzurl/zoneinfo/America/Blanc-Sablon.ics | 104 ++-- web/tzurl/zoneinfo/America/Boa_Vista.ics | 136 ++--- web/tzurl/zoneinfo/America/Bogota.ics | 74 +-- web/tzurl/zoneinfo/America/Boise.ics | 334 +++++----- web/tzurl/zoneinfo/America/Cambridge_Bay.ics | 312 +++++----- web/tzurl/zoneinfo/America/Campo_Grande.ics | 290 ++++----- web/tzurl/zoneinfo/America/Cancun.ics | 160 ++--- web/tzurl/zoneinfo/America/Caracas.ics | 74 +-- web/tzurl/zoneinfo/America/Cayenne.ics | 46 +- web/tzurl/zoneinfo/America/Cayman.ics | 46 +- web/tzurl/zoneinfo/America/Chicago.ics | 486 +++++++-------- web/tzurl/zoneinfo/America/Chihuahua.ics | 182 +++--- web/tzurl/zoneinfo/America/Costa_Rica.ics | 86 +-- web/tzurl/zoneinfo/America/Cuiaba.ics | 290 ++++----- web/tzurl/zoneinfo/America/Curacao.ics | 46 +- web/tzurl/zoneinfo/America/Danmarkshavn.ics | 134 ++-- web/tzurl/zoneinfo/America/Dawson.ics | 308 +++++----- web/tzurl/zoneinfo/America/Dawson_Creek.ics | 220 +++---- web/tzurl/zoneinfo/America/Denver.ics | 318 +++++----- web/tzurl/zoneinfo/America/Detroit.ics | 292 ++++----- web/tzurl/zoneinfo/America/Dominica.ics | 32 +- web/tzurl/zoneinfo/America/Edmonton.ics | 304 +++++----- web/tzurl/zoneinfo/America/Eirunepe.ics | 148 ++--- web/tzurl/zoneinfo/America/El_Salvador.ics | 64 +- web/tzurl/zoneinfo/America/Fortaleza.ics | 152 ++--- web/tzurl/zoneinfo/America/Glace_Bay.ics | 282 ++++----- web/tzurl/zoneinfo/America/Godthab.ics | 118 ++-- web/tzurl/zoneinfo/America/Goose_Bay.ics | 518 ++++++++-------- web/tzurl/zoneinfo/America/Grand_Turk.ics | 210 +++---- web/tzurl/zoneinfo/America/Grenada.ics | 32 +- web/tzurl/zoneinfo/America/Guadeloupe.ics | 32 +- web/tzurl/zoneinfo/America/Guatemala.ics | 72 +-- web/tzurl/zoneinfo/America/Guayaquil.ics | 46 +- web/tzurl/zoneinfo/America/Guyana.ics | 74 +-- web/tzurl/zoneinfo/America/Halifax.ics | 458 +++++++------- web/tzurl/zoneinfo/America/Havana.ics | 290 ++++----- web/tzurl/zoneinfo/America/Hermosillo.ics | 134 ++-- .../America/Indiana/Indianapolis.ics | 252 ++++---- web/tzurl/zoneinfo/America/Indiana/Knox.ics | 340 +++++------ .../zoneinfo/America/Indiana/Marengo.ics | 268 ++++---- .../zoneinfo/America/Indiana/Petersburg.ics | 268 ++++---- .../zoneinfo/America/Indiana/Tell_City.ics | 262 ++++---- web/tzurl/zoneinfo/America/Indiana/Vevay.ics | 198 +++--- .../zoneinfo/America/Indiana/Vincennes.ics | 266 ++++---- .../zoneinfo/America/Indiana/Winamac.ics | 288 ++++----- web/tzurl/zoneinfo/America/Inuvik.ics | 246 ++++---- web/tzurl/zoneinfo/America/Iqaluit.ics | 272 ++++----- web/tzurl/zoneinfo/America/Jamaica.ics | 124 ++-- web/tzurl/zoneinfo/America/Juneau.ics | 360 +++++------ .../zoneinfo/America/Kentucky/Louisville.ics | 412 ++++++------- .../zoneinfo/America/Kentucky/Monticello.ics | 330 +++++----- web/tzurl/zoneinfo/America/Kralendijk.ics | 46 +- web/tzurl/zoneinfo/America/La_Paz.ics | 60 +- web/tzurl/zoneinfo/America/Lima.ics | 98 +-- web/tzurl/zoneinfo/America/Los_Angeles.ics | 370 ++++++------ web/tzurl/zoneinfo/America/Lower_Princes.ics | 46 +- web/tzurl/zoneinfo/America/Maceio.ics | 160 ++--- web/tzurl/zoneinfo/America/Managua.ics | 110 ++-- web/tzurl/zoneinfo/America/Manaus.ics | 134 ++-- web/tzurl/zoneinfo/America/Marigot.ics | 32 +- web/tzurl/zoneinfo/America/Martinique.ics | 74 +-- web/tzurl/zoneinfo/America/Matamoros.ics | 162 ++--- web/tzurl/zoneinfo/America/Mazatlan.ics | 160 ++--- web/tzurl/zoneinfo/America/Menominee.ics | 306 +++++----- web/tzurl/zoneinfo/America/Merida.ics | 124 ++-- web/tzurl/zoneinfo/America/Metlakatla.ics | 322 +++++----- web/tzurl/zoneinfo/America/Mexico_City.ics | 184 +++--- web/tzurl/zoneinfo/America/Miquelon.ics | 192 +++--- web/tzurl/zoneinfo/America/Moncton.ics | 432 ++++++------- web/tzurl/zoneinfo/America/Monterrey.ics | 128 ++-- web/tzurl/zoneinfo/America/Montevideo.ics | 304 +++++----- web/tzurl/zoneinfo/America/Montreal.ics | 468 +++++++------- web/tzurl/zoneinfo/America/Montserrat.ics | 32 +- web/tzurl/zoneinfo/America/Nassau.ics | 270 ++++----- web/tzurl/zoneinfo/America/New_York.ics | 474 +++++++-------- web/tzurl/zoneinfo/America/Nipigon.ics | 252 ++++---- web/tzurl/zoneinfo/America/Nome.ics | 374 ++++++------ web/tzurl/zoneinfo/America/Noronha.ics | 152 ++--- .../zoneinfo/America/North_Dakota/Beulah.ics | 310 +++++----- .../zoneinfo/America/North_Dakota/Center.ics | 318 +++++----- .../America/North_Dakota/New_Salem.ics | 318 +++++----- web/tzurl/zoneinfo/America/Ojinaga.ics | 228 +++---- web/tzurl/zoneinfo/America/Panama.ics | 46 +- web/tzurl/zoneinfo/America/Pangnirtung.ics | 322 +++++----- web/tzurl/zoneinfo/America/Paramaribo.ics | 88 +-- web/tzurl/zoneinfo/America/Phoenix.ics | 104 ++-- .../zoneinfo/America/Port-au-Prince.ics | 138 ++--- web/tzurl/zoneinfo/America/Port_of_Spain.ics | 32 +- web/tzurl/zoneinfo/America/Porto_Velho.ics | 126 ++-- web/tzurl/zoneinfo/America/Puerto_Rico.ics | 88 +-- web/tzurl/zoneinfo/America/Rainy_River.ics | 252 ++++---- web/tzurl/zoneinfo/America/Rankin_Inlet.ics | 244 ++++---- web/tzurl/zoneinfo/America/Recife.ics | 152 ++--- web/tzurl/zoneinfo/America/Regina.ics | 196 +++--- web/tzurl/zoneinfo/America/Resolute.ics | 244 ++++---- web/tzurl/zoneinfo/America/Rio_Branco.ics | 140 ++--- web/tzurl/zoneinfo/America/Santa_Isabel.ics | 214 +++---- web/tzurl/zoneinfo/America/Santarem.ics | 140 ++--- web/tzurl/zoneinfo/America/Santiago.ics | 420 ++++++------- web/tzurl/zoneinfo/America/Santo_Domingo.ics | 136 ++--- web/tzurl/zoneinfo/America/Sao_Paulo.ics | 304 +++++----- web/tzurl/zoneinfo/America/Scoresbysund.ics | 144 ++--- web/tzurl/zoneinfo/America/Sitka.ics | 348 +++++------ web/tzurl/zoneinfo/America/St_Barthelemy.ics | 32 +- web/tzurl/zoneinfo/America/St_Johns.ics | 538 ++++++++--------- web/tzurl/zoneinfo/America/St_Kitts.ics | 32 +- web/tzurl/zoneinfo/America/St_Lucia.ics | 46 +- web/tzurl/zoneinfo/America/St_Thomas.ics | 32 +- web/tzurl/zoneinfo/America/St_Vincent.ics | 46 +- web/tzurl/zoneinfo/America/Swift_Current.ics | 150 ++--- web/tzurl/zoneinfo/America/Tegucigalpa.ics | 68 +-- web/tzurl/zoneinfo/America/Thule.ics | 148 ++--- web/tzurl/zoneinfo/America/Thunder_Bay.ics | 292 ++++----- web/tzurl/zoneinfo/America/Tijuana.ics | 330 +++++----- web/tzurl/zoneinfo/America/Toronto.ics | 466 +++++++------- web/tzurl/zoneinfo/America/Tortola.ics | 32 +- web/tzurl/zoneinfo/America/Vancouver.ics | 376 ++++++------ web/tzurl/zoneinfo/America/Whitehorse.ics | 308 +++++----- web/tzurl/zoneinfo/America/Winnipeg.ics | 368 +++++------ web/tzurl/zoneinfo/America/Yakutat.ics | 336 +++++----- web/tzurl/zoneinfo/America/Yellowknife.ics | 264 ++++---- web/tzurl/zoneinfo/Antarctica/Casey.ics | 60 +- web/tzurl/zoneinfo/Antarctica/Davis.ics | 76 +-- .../zoneinfo/Antarctica/DumontDUrville.ics | 60 +- web/tzurl/zoneinfo/Antarctica/Macquarie.ics | 284 ++++----- web/tzurl/zoneinfo/Antarctica/Mawson.ics | 46 +- web/tzurl/zoneinfo/Antarctica/McMurdo.ics | 216 +++---- web/tzurl/zoneinfo/Antarctica/Palmer.ics | 238 ++++---- web/tzurl/zoneinfo/Antarctica/Rothera.ics | 32 +- web/tzurl/zoneinfo/Antarctica/South_Pole.ics | 216 +++---- web/tzurl/zoneinfo/Antarctica/Syowa.ics | 32 +- web/tzurl/zoneinfo/Antarctica/Vostok.ics | 32 +- web/tzurl/zoneinfo/Arctic/Longyearbyen.ics | 180 +++--- web/tzurl/zoneinfo/Asia/Aden.ics | 32 +- web/tzurl/zoneinfo/Asia/Almaty.ics | 180 +++--- web/tzurl/zoneinfo/Asia/Amman.ics | 184 +++--- web/tzurl/zoneinfo/Asia/Anadyr.ics | 266 ++++---- web/tzurl/zoneinfo/Asia/Aqtau.ics | 288 ++++----- web/tzurl/zoneinfo/Asia/Aqtobe.ics | 240 ++++---- web/tzurl/zoneinfo/Asia/Ashgabat.ics | 166 ++--- web/tzurl/zoneinfo/Asia/Baghdad.ics | 174 +++--- web/tzurl/zoneinfo/Asia/Bahrain.ics | 46 +- web/tzurl/zoneinfo/Asia/Baku.ics | 240 ++++---- web/tzurl/zoneinfo/Asia/Bangkok.ics | 46 +- web/tzurl/zoneinfo/Asia/Beirut.ics | 196 +++--- web/tzurl/zoneinfo/Asia/Bishkek.ics | 218 +++---- web/tzurl/zoneinfo/Asia/Brunei.ics | 46 +- web/tzurl/zoneinfo/Asia/Choibalsan.ics | 182 +++--- web/tzurl/zoneinfo/Asia/Chongqing.ics | 94 +-- web/tzurl/zoneinfo/Asia/Colombo.ics | 130 ++-- web/tzurl/zoneinfo/Asia/Damascus.ics | 270 ++++----- web/tzurl/zoneinfo/Asia/Dhaka.ics | 132 ++-- web/tzurl/zoneinfo/Asia/Dili.ics | 88 +-- web/tzurl/zoneinfo/Asia/Dubai.ics | 32 +- web/tzurl/zoneinfo/Asia/Dushanbe.ics | 138 ++--- web/tzurl/zoneinfo/Asia/Gaza.ics | 314 +++++----- web/tzurl/zoneinfo/Asia/Harbin.ics | 124 ++-- web/tzurl/zoneinfo/Asia/Ho_Chi_Minh.ics | 74 +-- web/tzurl/zoneinfo/Asia/Hong_Kong.ics | 218 +++---- web/tzurl/zoneinfo/Asia/Hovd.ics | 158 ++--- web/tzurl/zoneinfo/Asia/Irkutsk.ics | 244 ++++---- web/tzurl/zoneinfo/Asia/Istanbul.ics | 388 ++++++------ web/tzurl/zoneinfo/Asia/Jakarta.ics | 130 ++-- web/tzurl/zoneinfo/Asia/Jayapura.ics | 60 +- web/tzurl/zoneinfo/Asia/Jerusalem.ics | 376 ++++++------ web/tzurl/zoneinfo/Asia/Kabul.ics | 46 +- web/tzurl/zoneinfo/Asia/Kamchatka.ics | 218 +++---- web/tzurl/zoneinfo/Asia/Karachi.ics | 124 ++-- web/tzurl/zoneinfo/Asia/Kashgar.ics | 108 ++-- web/tzurl/zoneinfo/Asia/Kathmandu.ics | 46 +- web/tzurl/zoneinfo/Asia/Kolkata.ics | 76 +-- web/tzurl/zoneinfo/Asia/Krasnoyarsk.ics | 230 +++---- web/tzurl/zoneinfo/Asia/Kuala_Lumpur.ics | 130 ++-- web/tzurl/zoneinfo/Asia/Kuching.ics | 140 ++--- web/tzurl/zoneinfo/Asia/Kuwait.ics | 32 +- web/tzurl/zoneinfo/Asia/Macau.ics | 150 ++--- web/tzurl/zoneinfo/Asia/Magadan.ics | 230 +++---- web/tzurl/zoneinfo/Asia/Makassar.ics | 74 +-- web/tzurl/zoneinfo/Asia/Manila.ics | 98 +-- web/tzurl/zoneinfo/Asia/Muscat.ics | 32 +- web/tzurl/zoneinfo/Asia/Nicosia.ics | 192 +++--- web/tzurl/zoneinfo/Asia/Novokuznetsk.ics | 254 ++++---- web/tzurl/zoneinfo/Asia/Novosibirsk.ics | 244 ++++---- web/tzurl/zoneinfo/Asia/Omsk.ics | 230 +++---- web/tzurl/zoneinfo/Asia/Oral.ics | 288 ++++----- web/tzurl/zoneinfo/Asia/Phnom_Penh.ics | 74 +-- web/tzurl/zoneinfo/Asia/Pontianak.ics | 130 ++-- web/tzurl/zoneinfo/Asia/Pyongyang.ics | 90 +-- web/tzurl/zoneinfo/Asia/Qatar.ics | 46 +- web/tzurl/zoneinfo/Asia/Qyzylorda.ics | 266 ++++---- web/tzurl/zoneinfo/Asia/Rangoon.ics | 74 +-- web/tzurl/zoneinfo/Asia/Riyadh.ics | 32 +- web/tzurl/zoneinfo/Asia/Sakhalin.ics | 256 ++++---- web/tzurl/zoneinfo/Asia/Samarkand.ics | 178 +++--- web/tzurl/zoneinfo/Asia/Seoul.ics | 140 ++--- web/tzurl/zoneinfo/Asia/Shanghai.ics | 102 ++-- web/tzurl/zoneinfo/Asia/Singapore.ics | 144 ++--- web/tzurl/zoneinfo/Asia/Taipei.ics | 136 ++--- web/tzurl/zoneinfo/Asia/Tashkent.ics | 166 ++--- web/tzurl/zoneinfo/Asia/Tbilisi.ics | 320 +++++----- web/tzurl/zoneinfo/Asia/Tehran.ics | 314 +++++----- web/tzurl/zoneinfo/Asia/Thimphu.ics | 46 +- web/tzurl/zoneinfo/Asia/Tokyo.ics | 100 +-- web/tzurl/zoneinfo/Asia/Ulaanbaatar.ics | 158 ++--- web/tzurl/zoneinfo/Asia/Urumqi.ics | 94 +-- web/tzurl/zoneinfo/Asia/Vientiane.ics | 74 +-- web/tzurl/zoneinfo/Asia/Vladivostok.ics | 230 +++---- web/tzurl/zoneinfo/Asia/Yakutsk.ics | 230 +++---- web/tzurl/zoneinfo/Asia/Yekaterinburg.ics | 266 ++++---- web/tzurl/zoneinfo/Asia/Yerevan.ics | 222 +++---- web/tzurl/zoneinfo/Atlantic/Azores.ics | 448 +++++++------- web/tzurl/zoneinfo/Atlantic/Bermuda.ics | 230 +++---- web/tzurl/zoneinfo/Atlantic/Canary.ics | 146 ++--- web/tzurl/zoneinfo/Atlantic/Cape_Verde.ics | 74 +-- web/tzurl/zoneinfo/Atlantic/Faroe.ics | 116 ++-- web/tzurl/zoneinfo/Atlantic/Madeira.ics | 404 ++++++------- web/tzurl/zoneinfo/Atlantic/Reykjavik.ics | 208 +++---- .../zoneinfo/Atlantic/South_Georgia.ics | 32 +- web/tzurl/zoneinfo/Atlantic/St_Helena.ics | 46 +- web/tzurl/zoneinfo/Atlantic/Stanley.ics | 262 ++++---- web/tzurl/zoneinfo/Australia/Adelaide.ics | 274 ++++----- web/tzurl/zoneinfo/Australia/Brisbane.ics | 102 ++-- web/tzurl/zoneinfo/Australia/Currie.ics | 260 ++++---- web/tzurl/zoneinfo/Australia/Darwin.ics | 86 +-- web/tzurl/zoneinfo/Australia/Eucla.ics | 106 ++-- web/tzurl/zoneinfo/Australia/Hobart.ics | 276 ++++----- web/tzurl/zoneinfo/Australia/Lindeman.ics | 112 ++-- web/tzurl/zoneinfo/Australia/Lord_Howe.ics | 228 +++---- web/tzurl/zoneinfo/Australia/Melbourne.ics | 260 ++++---- web/tzurl/zoneinfo/Australia/Perth.ics | 106 ++-- web/tzurl/zoneinfo/Australia/Sydney.ics | 260 ++++---- web/tzurl/zoneinfo/Europe/Amsterdam.ics | 330 +++++----- web/tzurl/zoneinfo/Europe/Andorra.ics | 108 ++-- web/tzurl/zoneinfo/Europe/Athens.ics | 234 +++---- web/tzurl/zoneinfo/Europe/Belgrade.ics | 142 ++--- web/tzurl/zoneinfo/Europe/Berlin.ics | 210 +++---- web/tzurl/zoneinfo/Europe/Bratislava.ics | 194 +++--- web/tzurl/zoneinfo/Europe/Brussels.ics | 330 +++++----- web/tzurl/zoneinfo/Europe/Bucharest.ics | 220 +++---- web/tzurl/zoneinfo/Europe/Budapest.ics | 206 +++---- web/tzurl/zoneinfo/Europe/Chisinau.ics | 324 +++++----- web/tzurl/zoneinfo/Europe/Copenhagen.ics | 178 +++--- web/tzurl/zoneinfo/Europe/Dublin.ics | 404 ++++++------- web/tzurl/zoneinfo/Europe/Gibraltar.ics | 344 +++++------ web/tzurl/zoneinfo/Europe/Guernsey.ics | 418 ++++++------- web/tzurl/zoneinfo/Europe/Helsinki.ics | 150 ++--- web/tzurl/zoneinfo/Europe/Isle_of_Man.ics | 418 ++++++------- web/tzurl/zoneinfo/Europe/Istanbul.ics | 388 ++++++------ web/tzurl/zoneinfo/Europe/Jersey.ics | 418 ++++++------- web/tzurl/zoneinfo/Europe/Kaliningrad.ics | 330 +++++----- web/tzurl/zoneinfo/Europe/Kiev.ics | 276 ++++----- web/tzurl/zoneinfo/Europe/Lisbon.ics | 456 +++++++------- web/tzurl/zoneinfo/Europe/Ljubljana.ics | 142 ++--- web/tzurl/zoneinfo/Europe/London.ics | 418 ++++++------- web/tzurl/zoneinfo/Europe/Luxembourg.ics | 312 +++++----- web/tzurl/zoneinfo/Europe/Madrid.ics | 274 ++++----- web/tzurl/zoneinfo/Europe/Malta.ics | 236 ++++---- web/tzurl/zoneinfo/Europe/Mariehamn.ics | 150 ++--- web/tzurl/zoneinfo/Europe/Minsk.ics | 260 ++++---- web/tzurl/zoneinfo/Europe/Monaco.ics | 328 +++++----- web/tzurl/zoneinfo/Europe/Moscow.ics | 364 +++++------ web/tzurl/zoneinfo/Europe/Nicosia.ics | 192 +++--- web/tzurl/zoneinfo/Europe/Oslo.ics | 180 +++--- web/tzurl/zoneinfo/Europe/Paris.ics | 338 +++++------ web/tzurl/zoneinfo/Europe/Podgorica.ics | 142 ++--- web/tzurl/zoneinfo/Europe/Prague.ics | 194 +++--- web/tzurl/zoneinfo/Europe/Riga.ics | 336 +++++----- web/tzurl/zoneinfo/Europe/Rome.ics | 264 ++++---- web/tzurl/zoneinfo/Europe/Samara.ics | 316 +++++----- web/tzurl/zoneinfo/Europe/San_Marino.ics | 264 ++++---- web/tzurl/zoneinfo/Europe/Sarajevo.ics | 142 ++--- web/tzurl/zoneinfo/Europe/Simferopol.ics | 302 ++++----- web/tzurl/zoneinfo/Europe/Skopje.ics | 142 ++--- web/tzurl/zoneinfo/Europe/Sofia.ics | 262 ++++---- web/tzurl/zoneinfo/Europe/Stockholm.ics | 150 ++--- web/tzurl/zoneinfo/Europe/Tallinn.ics | 322 +++++----- web/tzurl/zoneinfo/Europe/Uzhgorod.ics | 294 ++++----- web/tzurl/zoneinfo/Europe/Vaduz.ics | 116 ++-- web/tzurl/zoneinfo/Europe/Vatican.ics | 264 ++++---- web/tzurl/zoneinfo/Europe/Vienna.ics | 180 +++--- web/tzurl/zoneinfo/Europe/Vilnius.ics | 342 +++++------ web/tzurl/zoneinfo/Europe/Volgograd.ics | 266 ++++---- web/tzurl/zoneinfo/Europe/Warsaw.ics | 306 +++++----- web/tzurl/zoneinfo/Europe/Zagreb.ics | 142 ++--- web/tzurl/zoneinfo/Europe/Zaporozhye.ics | 278 ++++----- web/tzurl/zoneinfo/Europe/Zurich.ics | 150 ++--- web/tzurl/zoneinfo/Indian/Antananarivo.ics | 60 +- web/tzurl/zoneinfo/Indian/Chagos.ics | 46 +- web/tzurl/zoneinfo/Indian/Christmas.ics | 32 +- web/tzurl/zoneinfo/Indian/Cocos.ics | 32 +- web/tzurl/zoneinfo/Indian/Comoro.ics | 32 +- web/tzurl/zoneinfo/Indian/Kerguelen.ics | 32 +- web/tzurl/zoneinfo/Indian/Mahe.ics | 32 +- web/tzurl/zoneinfo/Indian/Maldives.ics | 46 +- web/tzurl/zoneinfo/Indian/Mauritius.ics | 64 +- web/tzurl/zoneinfo/Indian/Mayotte.ics | 32 +- web/tzurl/zoneinfo/Indian/Reunion.ics | 32 +- web/tzurl/zoneinfo/Pacific/Apia.ics | 88 +-- web/tzurl/zoneinfo/Pacific/Auckland.ics | 332 +++++----- web/tzurl/zoneinfo/Pacific/Chatham.ics | 216 +++---- web/tzurl/zoneinfo/Pacific/Chuuk.ics | 32 +- web/tzurl/zoneinfo/Pacific/Easter.ics | 342 +++++------ web/tzurl/zoneinfo/Pacific/Efate.ics | 96 +-- web/tzurl/zoneinfo/Pacific/Enderbury.ics | 60 +- web/tzurl/zoneinfo/Pacific/Fakaofo.ics | 32 +- web/tzurl/zoneinfo/Pacific/Fiji.ics | 72 +-- web/tzurl/zoneinfo/Pacific/Funafuti.ics | 32 +- web/tzurl/zoneinfo/Pacific/Galapagos.ics | 46 +- web/tzurl/zoneinfo/Pacific/Gambier.ics | 32 +- web/tzurl/zoneinfo/Pacific/Guadalcanal.ics | 32 +- web/tzurl/zoneinfo/Pacific/Guam.ics | 60 +- web/tzurl/zoneinfo/Pacific/Honolulu.ics | 78 +-- web/tzurl/zoneinfo/Pacific/Johnston.ics | 32 +- web/tzurl/zoneinfo/Pacific/Kiritimati.ics | 60 +- web/tzurl/zoneinfo/Pacific/Kosrae.ics | 60 +- web/tzurl/zoneinfo/Pacific/Kwajalein.ics | 60 +- web/tzurl/zoneinfo/Pacific/Majuro.ics | 46 +- web/tzurl/zoneinfo/Pacific/Marquesas.ics | 32 +- web/tzurl/zoneinfo/Pacific/Midway.ics | 88 +-- web/tzurl/zoneinfo/Pacific/Nauru.ics | 74 +-- web/tzurl/zoneinfo/Pacific/Niue.ics | 60 +- web/tzurl/zoneinfo/Pacific/Norfolk.ics | 46 +- web/tzurl/zoneinfo/Pacific/Noumea.ics | 68 +-- web/tzurl/zoneinfo/Pacific/Pago_Pago.ics | 88 +-- web/tzurl/zoneinfo/Pacific/Palau.ics | 32 +- web/tzurl/zoneinfo/Pacific/Pitcairn.ics | 46 +- web/tzurl/zoneinfo/Pacific/Pohnpei.ics | 32 +- web/tzurl/zoneinfo/Pacific/Ponape.ics | 32 +- web/tzurl/zoneinfo/Pacific/Port_Moresby.ics | 46 +- web/tzurl/zoneinfo/Pacific/Rarotonga.ics | 120 ++-- web/tzurl/zoneinfo/Pacific/Saipan.ics | 74 +-- web/tzurl/zoneinfo/Pacific/Tahiti.ics | 32 +- web/tzurl/zoneinfo/Pacific/Tarawa.ics | 32 +- web/tzurl/zoneinfo/Pacific/Tongatapu.ics | 96 +-- web/tzurl/zoneinfo/Pacific/Truk.ics | 32 +- web/tzurl/zoneinfo/Pacific/Wake.ics | 32 +- web/tzurl/zoneinfo/Pacific/Wallis.ics | 32 +- 826 files changed, 42327 insertions(+), 42327 deletions(-) commit dd325fce4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 3 16:11:19 2011 +0000 Added the property eol-style: native .../zoneinfo-outlook/Africa/Abidjan.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Accra.ics | 30 +- .../zoneinfo-outlook/Africa/Addis_Ababa.ics | 30 +- .../zoneinfo-outlook/Africa/Algiers.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Asmara.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Bamako.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Bangui.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Banjul.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Bissau.ics | 30 +- .../zoneinfo-outlook/Africa/Blantyre.ics | 30 +- .../zoneinfo-outlook/Africa/Brazzaville.ics | 30 +- .../zoneinfo-outlook/Africa/Bujumbura.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Cairo.ics | 30 +- .../zoneinfo-outlook/Africa/Casablanca.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Ceuta.ics | 46 +- .../zoneinfo-outlook/Africa/Conakry.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Dakar.ics | 30 +- .../Africa/Dar_es_Salaam.ics | 30 +- .../zoneinfo-outlook/Africa/Djibouti.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Douala.ics | 30 +- .../zoneinfo-outlook/Africa/El_Aaiun.ics | 30 +- .../zoneinfo-outlook/Africa/Freetown.ics | 30 +- .../zoneinfo-outlook/Africa/Gaborone.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Harare.ics | 30 +- .../zoneinfo-outlook/Africa/Johannesburg.ics | 30 +- .../zoneinfo-outlook/Africa/Kampala.ics | 30 +- .../zoneinfo-outlook/Africa/Khartoum.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Kigali.ics | 30 +- .../zoneinfo-outlook/Africa/Kinshasa.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Lagos.ics | 30 +- .../zoneinfo-outlook/Africa/Libreville.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Lome.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Luanda.ics | 30 +- .../zoneinfo-outlook/Africa/Lubumbashi.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Lusaka.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Malabo.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Maputo.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Maseru.ics | 30 +- .../zoneinfo-outlook/Africa/Mbabane.ics | 30 +- .../zoneinfo-outlook/Africa/Mogadishu.ics | 30 +- .../zoneinfo-outlook/Africa/Monrovia.ics | 30 +- .../zoneinfo-outlook/Africa/Nairobi.ics | 30 +- .../zoneinfo-outlook/Africa/Ndjamena.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Niamey.ics | 30 +- .../zoneinfo-outlook/Africa/Nouakchott.ics | 30 +- .../zoneinfo-outlook/Africa/Ouagadougou.ics | 30 +- .../zoneinfo-outlook/Africa/Porto-Novo.ics | 30 +- .../zoneinfo-outlook/Africa/Sao_Tome.ics | 30 +- .../zoneinfo-outlook/Africa/Tripoli.ics | 30 +- web/tzurl/zoneinfo-outlook/Africa/Tunis.ics | 30 +- .../zoneinfo-outlook/Africa/Windhoek.ics | 46 +- web/tzurl/zoneinfo-outlook/America/Adak.ics | 46 +- .../zoneinfo-outlook/America/Anchorage.ics | 46 +- .../zoneinfo-outlook/America/Anguilla.ics | 30 +- .../zoneinfo-outlook/America/Antigua.ics | 30 +- .../zoneinfo-outlook/America/Araguaina.ics | 30 +- .../America/Argentina/Buenos_Aires.ics | 30 +- .../America/Argentina/Catamarca.ics | 30 +- .../America/Argentina/Cordoba.ics | 30 +- .../America/Argentina/Jujuy.ics | 30 +- .../America/Argentina/La_Rioja.ics | 30 +- .../America/Argentina/Mendoza.ics | 30 +- .../America/Argentina/Rio_Gallegos.ics | 30 +- .../America/Argentina/Salta.ics | 30 +- .../America/Argentina/San_Juan.ics | 30 +- .../America/Argentina/San_Luis.ics | 30 +- .../America/Argentina/Tucuman.ics | 30 +- .../America/Argentina/Ushuaia.ics | 30 +- web/tzurl/zoneinfo-outlook/America/Aruba.ics | 30 +- .../zoneinfo-outlook/America/Asuncion.ics | 46 +- .../zoneinfo-outlook/America/Atikokan.ics | 30 +- web/tzurl/zoneinfo-outlook/America/Bahia.ics | 30 +- .../America/Bahia_Banderas.ics | 46 +- .../zoneinfo-outlook/America/Barbados.ics | 30 +- web/tzurl/zoneinfo-outlook/America/Belem.ics | 30 +- .../zoneinfo-outlook/America/Belize.ics | 30 +- .../America/Blanc-Sablon.ics | 30 +- .../zoneinfo-outlook/America/Boa_Vista.ics | 30 +- .../zoneinfo-outlook/America/Bogota.ics | 30 +- web/tzurl/zoneinfo-outlook/America/Boise.ics | 46 +- .../America/Cambridge_Bay.ics | 46 +- .../America/Campo_Grande.ics | 46 +- .../zoneinfo-outlook/America/Cancun.ics | 46 +- .../zoneinfo-outlook/America/Caracas.ics | 30 +- .../zoneinfo-outlook/America/Cayenne.ics | 30 +- .../zoneinfo-outlook/America/Cayman.ics | 30 +- .../zoneinfo-outlook/America/Chicago.ics | 46 +- .../zoneinfo-outlook/America/Chihuahua.ics | 46 +- .../zoneinfo-outlook/America/Costa_Rica.ics | 30 +- .../zoneinfo-outlook/America/Cuiaba.ics | 46 +- .../zoneinfo-outlook/America/Curacao.ics | 30 +- .../America/Danmarkshavn.ics | 30 +- .../zoneinfo-outlook/America/Dawson.ics | 46 +- .../America/Dawson_Creek.ics | 30 +- .../zoneinfo-outlook/America/Denver.ics | 46 +- .../zoneinfo-outlook/America/Detroit.ics | 46 +- .../zoneinfo-outlook/America/Dominica.ics | 30 +- .../zoneinfo-outlook/America/Edmonton.ics | 46 +- .../zoneinfo-outlook/America/Eirunepe.ics | 30 +- .../zoneinfo-outlook/America/El_Salvador.ics | 30 +- .../zoneinfo-outlook/America/Fortaleza.ics | 30 +- .../zoneinfo-outlook/America/Glace_Bay.ics | 46 +- .../zoneinfo-outlook/America/Godthab.ics | 46 +- .../zoneinfo-outlook/America/Goose_Bay.ics | 46 +- .../zoneinfo-outlook/America/Grand_Turk.ics | 46 +- .../zoneinfo-outlook/America/Grenada.ics | 30 +- .../zoneinfo-outlook/America/Guadeloupe.ics | 30 +- .../zoneinfo-outlook/America/Guatemala.ics | 30 +- .../zoneinfo-outlook/America/Guayaquil.ics | 30 +- .../zoneinfo-outlook/America/Guyana.ics | 30 +- .../zoneinfo-outlook/America/Halifax.ics | 46 +- .../zoneinfo-outlook/America/Havana.ics | 46 +- .../zoneinfo-outlook/America/Hermosillo.ics | 30 +- .../America/Indiana/Indianapolis.ics | 46 +- .../America/Indiana/Knox.ics | 46 +- .../America/Indiana/Marengo.ics | 46 +- .../America/Indiana/Petersburg.ics | 46 +- .../America/Indiana/Tell_City.ics | 46 +- .../America/Indiana/Vevay.ics | 46 +- .../America/Indiana/Vincennes.ics | 46 +- .../America/Indiana/Winamac.ics | 46 +- .../zoneinfo-outlook/America/Inuvik.ics | 46 +- .../zoneinfo-outlook/America/Iqaluit.ics | 46 +- .../zoneinfo-outlook/America/Jamaica.ics | 30 +- .../zoneinfo-outlook/America/Juneau.ics | 46 +- .../America/Kentucky/Louisville.ics | 46 +- .../America/Kentucky/Monticello.ics | 46 +- .../zoneinfo-outlook/America/Kralendijk.ics | 30 +- .../zoneinfo-outlook/America/La_Paz.ics | 30 +- web/tzurl/zoneinfo-outlook/America/Lima.ics | 30 +- .../zoneinfo-outlook/America/Los_Angeles.ics | 46 +- .../America/Lower_Princes.ics | 30 +- .../zoneinfo-outlook/America/Maceio.ics | 30 +- .../zoneinfo-outlook/America/Managua.ics | 30 +- .../zoneinfo-outlook/America/Manaus.ics | 30 +- .../zoneinfo-outlook/America/Marigot.ics | 30 +- .../zoneinfo-outlook/America/Martinique.ics | 30 +- .../zoneinfo-outlook/America/Matamoros.ics | 46 +- .../zoneinfo-outlook/America/Mazatlan.ics | 46 +- .../zoneinfo-outlook/America/Menominee.ics | 46 +- .../zoneinfo-outlook/America/Merida.ics | 46 +- .../zoneinfo-outlook/America/Metlakatla.ics | 46 +- .../zoneinfo-outlook/America/Mexico_City.ics | 46 +- .../zoneinfo-outlook/America/Miquelon.ics | 46 +- .../zoneinfo-outlook/America/Moncton.ics | 46 +- .../zoneinfo-outlook/America/Monterrey.ics | 46 +- .../zoneinfo-outlook/America/Montevideo.ics | 46 +- .../zoneinfo-outlook/America/Montreal.ics | 46 +- .../zoneinfo-outlook/America/Montserrat.ics | 30 +- .../zoneinfo-outlook/America/Nassau.ics | 46 +- .../zoneinfo-outlook/America/New_York.ics | 46 +- .../zoneinfo-outlook/America/Nipigon.ics | 46 +- web/tzurl/zoneinfo-outlook/America/Nome.ics | 46 +- .../zoneinfo-outlook/America/Noronha.ics | 30 +- .../America/North_Dakota/Beulah.ics | 46 +- .../America/North_Dakota/Center.ics | 46 +- .../America/North_Dakota/New_Salem.ics | 46 +- .../zoneinfo-outlook/America/Ojinaga.ics | 46 +- .../zoneinfo-outlook/America/Panama.ics | 30 +- .../zoneinfo-outlook/America/Pangnirtung.ics | 46 +- .../zoneinfo-outlook/America/Paramaribo.ics | 30 +- .../zoneinfo-outlook/America/Phoenix.ics | 30 +- .../America/Port-au-Prince.ics | 30 +- .../America/Port_of_Spain.ics | 30 +- .../zoneinfo-outlook/America/Porto_Velho.ics | 30 +- .../zoneinfo-outlook/America/Puerto_Rico.ics | 30 +- .../zoneinfo-outlook/America/Rainy_River.ics | 46 +- .../America/Rankin_Inlet.ics | 46 +- .../zoneinfo-outlook/America/Recife.ics | 30 +- .../zoneinfo-outlook/America/Regina.ics | 30 +- .../zoneinfo-outlook/America/Resolute.ics | 46 +- .../zoneinfo-outlook/America/Rio_Branco.ics | 30 +- .../America/Santa_Isabel.ics | 46 +- .../zoneinfo-outlook/America/Santarem.ics | 30 +- .../zoneinfo-outlook/America/Santiago.ics | 46 +- .../America/Santo_Domingo.ics | 30 +- .../zoneinfo-outlook/America/Sao_Paulo.ics | 46 +- .../America/Scoresbysund.ics | 46 +- web/tzurl/zoneinfo-outlook/America/Sitka.ics | 46 +- .../America/St_Barthelemy.ics | 30 +- .../zoneinfo-outlook/America/St_Johns.ics | 46 +- .../zoneinfo-outlook/America/St_Kitts.ics | 30 +- .../zoneinfo-outlook/America/St_Lucia.ics | 30 +- .../zoneinfo-outlook/America/St_Thomas.ics | 30 +- .../zoneinfo-outlook/America/St_Vincent.ics | 30 +- .../America/Swift_Current.ics | 30 +- .../zoneinfo-outlook/America/Tegucigalpa.ics | 30 +- web/tzurl/zoneinfo-outlook/America/Thule.ics | 46 +- .../zoneinfo-outlook/America/Thunder_Bay.ics | 46 +- .../zoneinfo-outlook/America/Tijuana.ics | 46 +- .../zoneinfo-outlook/America/Toronto.ics | 46 +- .../zoneinfo-outlook/America/Tortola.ics | 30 +- .../zoneinfo-outlook/America/Vancouver.ics | 46 +- .../zoneinfo-outlook/America/Whitehorse.ics | 46 +- .../zoneinfo-outlook/America/Winnipeg.ics | 46 +- .../zoneinfo-outlook/America/Yakutat.ics | 46 +- .../zoneinfo-outlook/America/Yellowknife.ics | 46 +- .../zoneinfo-outlook/Antarctica/Casey.ics | 30 +- .../zoneinfo-outlook/Antarctica/Davis.ics | 30 +- .../Antarctica/DumontDUrville.ics | 30 +- .../Antarctica/Macquarie.ics | 30 +- .../zoneinfo-outlook/Antarctica/Mawson.ics | 30 +- .../zoneinfo-outlook/Antarctica/McMurdo.ics | 46 +- .../zoneinfo-outlook/Antarctica/Palmer.ics | 46 +- .../zoneinfo-outlook/Antarctica/Rothera.ics | 30 +- .../Antarctica/South_Pole.ics | 46 +- .../zoneinfo-outlook/Antarctica/Syowa.ics | 30 +- .../zoneinfo-outlook/Antarctica/Vostok.ics | 30 +- .../zoneinfo-outlook/Arctic/Longyearbyen.ics | 46 +- web/tzurl/zoneinfo-outlook/Asia/Aden.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Almaty.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Amman.ics | 46 +- web/tzurl/zoneinfo-outlook/Asia/Anadyr.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Aqtau.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Aqtobe.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Ashgabat.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Baghdad.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Bahrain.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Baku.ics | 46 +- web/tzurl/zoneinfo-outlook/Asia/Bangkok.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Beirut.ics | 46 +- web/tzurl/zoneinfo-outlook/Asia/Bishkek.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Brunei.ics | 30 +- .../zoneinfo-outlook/Asia/Choibalsan.ics | 28 +- .../zoneinfo-outlook/Asia/Chongqing.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Colombo.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Damascus.ics | 46 +- web/tzurl/zoneinfo-outlook/Asia/Dhaka.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Dili.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Dubai.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Dushanbe.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Gaza.ics | 46 +- web/tzurl/zoneinfo-outlook/Asia/Harbin.ics | 30 +- .../zoneinfo-outlook/Asia/Ho_Chi_Minh.ics | 30 +- .../zoneinfo-outlook/Asia/Hong_Kong.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Hovd.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Irkutsk.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Istanbul.ics | 46 +- web/tzurl/zoneinfo-outlook/Asia/Jakarta.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Jayapura.ics | 30 +- .../zoneinfo-outlook/Asia/Jerusalem.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Kabul.ics | 30 +- .../zoneinfo-outlook/Asia/Kamchatka.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Karachi.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Kashgar.ics | 30 +- .../zoneinfo-outlook/Asia/Kathmandu.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Kolkata.ics | 30 +- .../zoneinfo-outlook/Asia/Krasnoyarsk.ics | 30 +- .../zoneinfo-outlook/Asia/Kuala_Lumpur.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Kuching.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Kuwait.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Macau.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Magadan.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Makassar.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Manila.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Muscat.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Nicosia.ics | 46 +- .../zoneinfo-outlook/Asia/Novokuznetsk.ics | 30 +- .../zoneinfo-outlook/Asia/Novosibirsk.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Omsk.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Oral.ics | 30 +- .../zoneinfo-outlook/Asia/Phnom_Penh.ics | 30 +- .../zoneinfo-outlook/Asia/Pontianak.ics | 30 +- .../zoneinfo-outlook/Asia/Pyongyang.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Qatar.ics | 30 +- .../zoneinfo-outlook/Asia/Qyzylorda.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Rangoon.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Riyadh.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Sakhalin.ics | 30 +- .../zoneinfo-outlook/Asia/Samarkand.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Seoul.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Shanghai.ics | 30 +- .../zoneinfo-outlook/Asia/Singapore.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Taipei.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Tashkent.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Tbilisi.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Tehran.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Thimphu.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Tokyo.ics | 30 +- .../zoneinfo-outlook/Asia/Ulaanbaatar.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Urumqi.ics | 30 +- .../zoneinfo-outlook/Asia/Vientiane.ics | 30 +- .../zoneinfo-outlook/Asia/Vladivostok.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Yakutsk.ics | 30 +- .../zoneinfo-outlook/Asia/Yekaterinburg.ics | 30 +- web/tzurl/zoneinfo-outlook/Asia/Yerevan.ics | 46 +- .../zoneinfo-outlook/Atlantic/Azores.ics | 46 +- .../zoneinfo-outlook/Atlantic/Bermuda.ics | 46 +- .../zoneinfo-outlook/Atlantic/Canary.ics | 46 +- .../zoneinfo-outlook/Atlantic/Cape_Verde.ics | 30 +- .../zoneinfo-outlook/Atlantic/Faroe.ics | 46 +- .../zoneinfo-outlook/Atlantic/Madeira.ics | 46 +- .../zoneinfo-outlook/Atlantic/Reykjavik.ics | 30 +- .../Atlantic/South_Georgia.ics | 30 +- .../zoneinfo-outlook/Atlantic/St_Helena.ics | 30 +- .../zoneinfo-outlook/Atlantic/Stanley.ics | 46 +- .../zoneinfo-outlook/Australia/Adelaide.ics | 46 +- .../zoneinfo-outlook/Australia/Brisbane.ics | 30 +- .../zoneinfo-outlook/Australia/Currie.ics | 46 +- .../zoneinfo-outlook/Australia/Darwin.ics | 30 +- .../zoneinfo-outlook/Australia/Eucla.ics | 30 +- .../zoneinfo-outlook/Australia/Hobart.ics | 46 +- .../zoneinfo-outlook/Australia/Lindeman.ics | 30 +- .../zoneinfo-outlook/Australia/Lord_Howe.ics | 46 +- .../zoneinfo-outlook/Australia/Melbourne.ics | 46 +- .../zoneinfo-outlook/Australia/Perth.ics | 30 +- .../zoneinfo-outlook/Australia/Sydney.ics | 46 +- .../zoneinfo-outlook/Europe/Amsterdam.ics | 46 +- .../zoneinfo-outlook/Europe/Andorra.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Athens.ics | 46 +- .../zoneinfo-outlook/Europe/Belgrade.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Berlin.ics | 46 +- .../zoneinfo-outlook/Europe/Bratislava.ics | 46 +- .../zoneinfo-outlook/Europe/Brussels.ics | 46 +- .../zoneinfo-outlook/Europe/Bucharest.ics | 46 +- .../zoneinfo-outlook/Europe/Budapest.ics | 46 +- .../zoneinfo-outlook/Europe/Chisinau.ics | 46 +- .../zoneinfo-outlook/Europe/Copenhagen.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Dublin.ics | 46 +- .../zoneinfo-outlook/Europe/Gibraltar.ics | 46 +- .../zoneinfo-outlook/Europe/Guernsey.ics | 46 +- .../zoneinfo-outlook/Europe/Helsinki.ics | 46 +- .../zoneinfo-outlook/Europe/Isle_of_Man.ics | 46 +- .../zoneinfo-outlook/Europe/Istanbul.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Jersey.ics | 46 +- .../zoneinfo-outlook/Europe/Kaliningrad.ics | 30 +- web/tzurl/zoneinfo-outlook/Europe/Kiev.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Lisbon.ics | 46 +- .../zoneinfo-outlook/Europe/Ljubljana.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/London.ics | 46 +- .../zoneinfo-outlook/Europe/Luxembourg.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Madrid.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Malta.ics | 46 +- .../zoneinfo-outlook/Europe/Mariehamn.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Minsk.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Monaco.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Moscow.ics | 30 +- .../zoneinfo-outlook/Europe/Nicosia.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Oslo.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Paris.ics | 46 +- .../zoneinfo-outlook/Europe/Podgorica.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Prague.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Riga.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Rome.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Samara.ics | 30 +- .../zoneinfo-outlook/Europe/San_Marino.ics | 46 +- .../zoneinfo-outlook/Europe/Sarajevo.ics | 46 +- .../zoneinfo-outlook/Europe/Simferopol.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Skopje.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Sofia.ics | 46 +- .../zoneinfo-outlook/Europe/Stockholm.ics | 46 +- .../zoneinfo-outlook/Europe/Tallinn.ics | 46 +- .../zoneinfo-outlook/Europe/Uzhgorod.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Vaduz.ics | 46 +- .../zoneinfo-outlook/Europe/Vatican.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Vienna.ics | 46 +- .../zoneinfo-outlook/Europe/Vilnius.ics | 46 +- .../zoneinfo-outlook/Europe/Volgograd.ics | 30 +- web/tzurl/zoneinfo-outlook/Europe/Warsaw.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Zagreb.ics | 46 +- .../zoneinfo-outlook/Europe/Zaporozhye.ics | 46 +- web/tzurl/zoneinfo-outlook/Europe/Zurich.ics | 46 +- .../zoneinfo-outlook/Indian/Antananarivo.ics | 30 +- web/tzurl/zoneinfo-outlook/Indian/Chagos.ics | 30 +- .../zoneinfo-outlook/Indian/Christmas.ics | 30 +- web/tzurl/zoneinfo-outlook/Indian/Cocos.ics | 30 +- web/tzurl/zoneinfo-outlook/Indian/Comoro.ics | 30 +- .../zoneinfo-outlook/Indian/Kerguelen.ics | 30 +- web/tzurl/zoneinfo-outlook/Indian/Mahe.ics | 30 +- .../zoneinfo-outlook/Indian/Maldives.ics | 30 +- .../zoneinfo-outlook/Indian/Mauritius.ics | 30 +- .../zoneinfo-outlook/Indian/Mayotte.ics | 30 +- .../zoneinfo-outlook/Indian/Reunion.ics | 30 +- web/tzurl/zoneinfo-outlook/Pacific/Apia.ics | 30 +- .../zoneinfo-outlook/Pacific/Auckland.ics | 46 +- .../zoneinfo-outlook/Pacific/Chatham.ics | 46 +- web/tzurl/zoneinfo-outlook/Pacific/Chuuk.ics | 30 +- .../zoneinfo-outlook/Pacific/Easter.ics | 46 +- web/tzurl/zoneinfo-outlook/Pacific/Efate.ics | 30 +- .../zoneinfo-outlook/Pacific/Enderbury.ics | 30 +- .../zoneinfo-outlook/Pacific/Fakaofo.ics | 30 +- web/tzurl/zoneinfo-outlook/Pacific/Fiji.ics | 30 +- .../zoneinfo-outlook/Pacific/Funafuti.ics | 30 +- .../zoneinfo-outlook/Pacific/Galapagos.ics | 30 +- .../zoneinfo-outlook/Pacific/Gambier.ics | 30 +- .../zoneinfo-outlook/Pacific/Guadalcanal.ics | 30 +- web/tzurl/zoneinfo-outlook/Pacific/Guam.ics | 30 +- .../zoneinfo-outlook/Pacific/Honolulu.ics | 30 +- .../zoneinfo-outlook/Pacific/Johnston.ics | 30 +- .../zoneinfo-outlook/Pacific/Kiritimati.ics | 30 +- .../zoneinfo-outlook/Pacific/Kosrae.ics | 30 +- .../zoneinfo-outlook/Pacific/Kwajalein.ics | 30 +- .../zoneinfo-outlook/Pacific/Majuro.ics | 30 +- .../zoneinfo-outlook/Pacific/Marquesas.ics | 30 +- .../zoneinfo-outlook/Pacific/Midway.ics | 30 +- web/tzurl/zoneinfo-outlook/Pacific/Nauru.ics | 30 +- web/tzurl/zoneinfo-outlook/Pacific/Niue.ics | 30 +- .../zoneinfo-outlook/Pacific/Norfolk.ics | 30 +- .../zoneinfo-outlook/Pacific/Noumea.ics | 30 +- .../zoneinfo-outlook/Pacific/Pago_Pago.ics | 30 +- web/tzurl/zoneinfo-outlook/Pacific/Palau.ics | 30 +- .../zoneinfo-outlook/Pacific/Pitcairn.ics | 30 +- .../zoneinfo-outlook/Pacific/Pohnpei.ics | 30 +- .../zoneinfo-outlook/Pacific/Ponape.ics | 30 +- .../Pacific/Port_Moresby.ics | 30 +- .../zoneinfo-outlook/Pacific/Rarotonga.ics | 30 +- .../zoneinfo-outlook/Pacific/Saipan.ics | 30 +- .../zoneinfo-outlook/Pacific/Tahiti.ics | 30 +- .../zoneinfo-outlook/Pacific/Tarawa.ics | 30 +- .../zoneinfo-outlook/Pacific/Tongatapu.ics | 30 +- web/tzurl/zoneinfo-outlook/Pacific/Truk.ics | 30 +- web/tzurl/zoneinfo-outlook/Pacific/Wake.ics | 30 +- .../zoneinfo-outlook/Pacific/Wallis.ics | 30 +- web/tzurl/zoneinfo/Africa/Abidjan.ics | 32 +- web/tzurl/zoneinfo/Africa/Accra.ics | 84 +-- web/tzurl/zoneinfo/Africa/Addis_Ababa.ics | 46 +- web/tzurl/zoneinfo/Africa/Algiers.ics | 182 +++--- web/tzurl/zoneinfo/Africa/Asmara.ics | 60 +- web/tzurl/zoneinfo/Africa/Bamako.ics | 60 +- web/tzurl/zoneinfo/Africa/Bangui.ics | 32 +- web/tzurl/zoneinfo/Africa/Banjul.ics | 60 +- web/tzurl/zoneinfo/Africa/Bissau.ics | 46 +- web/tzurl/zoneinfo/Africa/Blantyre.ics | 32 +- web/tzurl/zoneinfo/Africa/Brazzaville.ics | 32 +- web/tzurl/zoneinfo/Africa/Bujumbura.ics | 32 +- web/tzurl/zoneinfo/Africa/Cairo.ics | 300 ++++----- web/tzurl/zoneinfo/Africa/Casablanca.ics | 120 ++-- web/tzurl/zoneinfo/Africa/Ceuta.ics | 200 +++--- web/tzurl/zoneinfo/Africa/Conakry.ics | 60 +- web/tzurl/zoneinfo/Africa/Dakar.ics | 46 +- web/tzurl/zoneinfo/Africa/Dar_es_Salaam.ics | 60 +- web/tzurl/zoneinfo/Africa/Djibouti.ics | 32 +- web/tzurl/zoneinfo/Africa/Douala.ics | 32 +- web/tzurl/zoneinfo/Africa/El_Aaiun.ics | 46 +- web/tzurl/zoneinfo/Africa/Freetown.ics | 164 ++--- web/tzurl/zoneinfo/Africa/Gaborone.ics | 60 +- web/tzurl/zoneinfo/Africa/Harare.ics | 32 +- web/tzurl/zoneinfo/Africa/Johannesburg.ics | 78 +-- web/tzurl/zoneinfo/Africa/Kampala.ics | 74 +-- web/tzurl/zoneinfo/Africa/Khartoum.ics | 134 ++-- web/tzurl/zoneinfo/Africa/Kigali.ics | 32 +- web/tzurl/zoneinfo/Africa/Kinshasa.ics | 32 +- web/tzurl/zoneinfo/Africa/Lagos.ics | 32 +- web/tzurl/zoneinfo/Africa/Libreville.ics | 32 +- web/tzurl/zoneinfo/Africa/Lome.ics | 32 +- web/tzurl/zoneinfo/Africa/Luanda.ics | 46 +- web/tzurl/zoneinfo/Africa/Lubumbashi.ics | 32 +- web/tzurl/zoneinfo/Africa/Lusaka.ics | 32 +- web/tzurl/zoneinfo/Africa/Malabo.ics | 46 +- web/tzurl/zoneinfo/Africa/Maputo.ics | 32 +- web/tzurl/zoneinfo/Africa/Maseru.ics | 60 +- web/tzurl/zoneinfo/Africa/Mbabane.ics | 32 +- web/tzurl/zoneinfo/Africa/Mogadishu.ics | 60 +- web/tzurl/zoneinfo/Africa/Monrovia.ics | 60 +- web/tzurl/zoneinfo/Africa/Nairobi.ics | 74 +-- web/tzurl/zoneinfo/Africa/Ndjamena.ics | 60 +- web/tzurl/zoneinfo/Africa/Niamey.ics | 60 +- web/tzurl/zoneinfo/Africa/Nouakchott.ics | 60 +- web/tzurl/zoneinfo/Africa/Ouagadougou.ics | 32 +- web/tzurl/zoneinfo/Africa/Porto-Novo.ics | 46 +- web/tzurl/zoneinfo/Africa/Sao_Tome.ics | 46 +- web/tzurl/zoneinfo/Africa/Tripoli.ics | 136 ++--- web/tzurl/zoneinfo/Africa/Tunis.ics | 134 ++-- web/tzurl/zoneinfo/Africa/Windhoek.ics | 130 ++-- web/tzurl/zoneinfo/America/Adak.ics | 374 ++++++------ web/tzurl/zoneinfo/America/Anchorage.ics | 374 ++++++------ web/tzurl/zoneinfo/America/Anguilla.ics | 32 +- web/tzurl/zoneinfo/America/Antigua.ics | 46 +- web/tzurl/zoneinfo/America/Araguaina.ics | 170 +++--- .../America/Argentina/Buenos_Aires.ics | 248 ++++---- .../zoneinfo/America/Argentina/Catamarca.ics | 286 ++++----- .../zoneinfo/America/Argentina/Cordoba.ics | 272 ++++----- .../zoneinfo/America/Argentina/Jujuy.ics | 308 +++++----- .../zoneinfo/America/Argentina/La_Rioja.ics | 276 ++++----- .../zoneinfo/America/Argentina/Mendoza.ics | 298 ++++----- .../America/Argentina/Rio_Gallegos.ics | 262 ++++---- .../zoneinfo/America/Argentina/Salta.ics | 270 ++++----- .../zoneinfo/America/Argentina/San_Juan.ics | 276 ++++----- .../zoneinfo/America/Argentina/San_Luis.ics | 322 +++++----- .../zoneinfo/America/Argentina/Tucuman.ics | 288 ++++----- .../zoneinfo/America/Argentina/Ushuaia.ics | 262 ++++---- web/tzurl/zoneinfo/America/Aruba.ics | 46 +- web/tzurl/zoneinfo/America/Asuncion.ics | 266 ++++---- web/tzurl/zoneinfo/America/Atikokan.ics | 104 ++-- web/tzurl/zoneinfo/America/Bahia.ics | 186 +++--- .../zoneinfo/America/Bahia_Banderas.ics | 206 +++---- web/tzurl/zoneinfo/America/Barbados.ics | 86 +-- web/tzurl/zoneinfo/America/Belem.ics | 126 ++-- web/tzurl/zoneinfo/America/Belize.ics | 188 +++--- web/tzurl/zoneinfo/America/Blanc-Sablon.ics | 104 ++-- web/tzurl/zoneinfo/America/Boa_Vista.ics | 136 ++--- web/tzurl/zoneinfo/America/Bogota.ics | 74 +-- web/tzurl/zoneinfo/America/Boise.ics | 334 +++++----- web/tzurl/zoneinfo/America/Cambridge_Bay.ics | 312 +++++----- web/tzurl/zoneinfo/America/Campo_Grande.ics | 290 ++++----- web/tzurl/zoneinfo/America/Cancun.ics | 160 ++--- web/tzurl/zoneinfo/America/Caracas.ics | 74 +-- web/tzurl/zoneinfo/America/Cayenne.ics | 46 +- web/tzurl/zoneinfo/America/Cayman.ics | 46 +- web/tzurl/zoneinfo/America/Chicago.ics | 486 +++++++-------- web/tzurl/zoneinfo/America/Chihuahua.ics | 182 +++--- web/tzurl/zoneinfo/America/Costa_Rica.ics | 86 +-- web/tzurl/zoneinfo/America/Cuiaba.ics | 290 ++++----- web/tzurl/zoneinfo/America/Curacao.ics | 46 +- web/tzurl/zoneinfo/America/Danmarkshavn.ics | 134 ++-- web/tzurl/zoneinfo/America/Dawson.ics | 308 +++++----- web/tzurl/zoneinfo/America/Dawson_Creek.ics | 220 +++---- web/tzurl/zoneinfo/America/Denver.ics | 318 +++++----- web/tzurl/zoneinfo/America/Detroit.ics | 292 ++++----- web/tzurl/zoneinfo/America/Dominica.ics | 32 +- web/tzurl/zoneinfo/America/Edmonton.ics | 304 +++++----- web/tzurl/zoneinfo/America/Eirunepe.ics | 148 ++--- web/tzurl/zoneinfo/America/El_Salvador.ics | 64 +- web/tzurl/zoneinfo/America/Fortaleza.ics | 152 ++--- web/tzurl/zoneinfo/America/Glace_Bay.ics | 282 ++++----- web/tzurl/zoneinfo/America/Godthab.ics | 118 ++-- web/tzurl/zoneinfo/America/Goose_Bay.ics | 518 ++++++++-------- web/tzurl/zoneinfo/America/Grand_Turk.ics | 210 +++---- web/tzurl/zoneinfo/America/Grenada.ics | 32 +- web/tzurl/zoneinfo/America/Guadeloupe.ics | 32 +- web/tzurl/zoneinfo/America/Guatemala.ics | 72 +-- web/tzurl/zoneinfo/America/Guayaquil.ics | 46 +- web/tzurl/zoneinfo/America/Guyana.ics | 74 +-- web/tzurl/zoneinfo/America/Halifax.ics | 458 +++++++------- web/tzurl/zoneinfo/America/Havana.ics | 290 ++++----- web/tzurl/zoneinfo/America/Hermosillo.ics | 134 ++-- .../America/Indiana/Indianapolis.ics | 252 ++++---- web/tzurl/zoneinfo/America/Indiana/Knox.ics | 340 +++++------ .../zoneinfo/America/Indiana/Marengo.ics | 268 ++++---- .../zoneinfo/America/Indiana/Petersburg.ics | 268 ++++---- .../zoneinfo/America/Indiana/Tell_City.ics | 262 ++++---- web/tzurl/zoneinfo/America/Indiana/Vevay.ics | 198 +++--- .../zoneinfo/America/Indiana/Vincennes.ics | 266 ++++---- .../zoneinfo/America/Indiana/Winamac.ics | 288 ++++----- web/tzurl/zoneinfo/America/Inuvik.ics | 246 ++++---- web/tzurl/zoneinfo/America/Iqaluit.ics | 272 ++++----- web/tzurl/zoneinfo/America/Jamaica.ics | 124 ++-- web/tzurl/zoneinfo/America/Juneau.ics | 360 +++++------ .../zoneinfo/America/Kentucky/Louisville.ics | 412 ++++++------- .../zoneinfo/America/Kentucky/Monticello.ics | 330 +++++----- web/tzurl/zoneinfo/America/Kralendijk.ics | 46 +- web/tzurl/zoneinfo/America/La_Paz.ics | 60 +- web/tzurl/zoneinfo/America/Lima.ics | 98 +-- web/tzurl/zoneinfo/America/Los_Angeles.ics | 370 ++++++------ web/tzurl/zoneinfo/America/Lower_Princes.ics | 46 +- web/tzurl/zoneinfo/America/Maceio.ics | 160 ++--- web/tzurl/zoneinfo/America/Managua.ics | 110 ++-- web/tzurl/zoneinfo/America/Manaus.ics | 134 ++-- web/tzurl/zoneinfo/America/Marigot.ics | 32 +- web/tzurl/zoneinfo/America/Martinique.ics | 74 +-- web/tzurl/zoneinfo/America/Matamoros.ics | 162 ++--- web/tzurl/zoneinfo/America/Mazatlan.ics | 160 ++--- web/tzurl/zoneinfo/America/Menominee.ics | 306 +++++----- web/tzurl/zoneinfo/America/Merida.ics | 124 ++-- web/tzurl/zoneinfo/America/Metlakatla.ics | 322 +++++----- web/tzurl/zoneinfo/America/Mexico_City.ics | 184 +++--- web/tzurl/zoneinfo/America/Miquelon.ics | 192 +++--- web/tzurl/zoneinfo/America/Moncton.ics | 432 ++++++------- web/tzurl/zoneinfo/America/Monterrey.ics | 128 ++-- web/tzurl/zoneinfo/America/Montevideo.ics | 304 +++++----- web/tzurl/zoneinfo/America/Montreal.ics | 468 +++++++------- web/tzurl/zoneinfo/America/Montserrat.ics | 32 +- web/tzurl/zoneinfo/America/Nassau.ics | 270 ++++----- web/tzurl/zoneinfo/America/New_York.ics | 474 +++++++-------- web/tzurl/zoneinfo/America/Nipigon.ics | 252 ++++---- web/tzurl/zoneinfo/America/Nome.ics | 374 ++++++------ web/tzurl/zoneinfo/America/Noronha.ics | 152 ++--- .../zoneinfo/America/North_Dakota/Beulah.ics | 310 +++++----- .../zoneinfo/America/North_Dakota/Center.ics | 318 +++++----- .../America/North_Dakota/New_Salem.ics | 318 +++++----- web/tzurl/zoneinfo/America/Ojinaga.ics | 228 +++---- web/tzurl/zoneinfo/America/Panama.ics | 46 +- web/tzurl/zoneinfo/America/Pangnirtung.ics | 322 +++++----- web/tzurl/zoneinfo/America/Paramaribo.ics | 88 +-- web/tzurl/zoneinfo/America/Phoenix.ics | 104 ++-- .../zoneinfo/America/Port-au-Prince.ics | 138 ++--- web/tzurl/zoneinfo/America/Port_of_Spain.ics | 32 +- web/tzurl/zoneinfo/America/Porto_Velho.ics | 126 ++-- web/tzurl/zoneinfo/America/Puerto_Rico.ics | 88 +-- web/tzurl/zoneinfo/America/Rainy_River.ics | 252 ++++---- web/tzurl/zoneinfo/America/Rankin_Inlet.ics | 244 ++++---- web/tzurl/zoneinfo/America/Recife.ics | 152 ++--- web/tzurl/zoneinfo/America/Regina.ics | 196 +++--- web/tzurl/zoneinfo/America/Resolute.ics | 244 ++++---- web/tzurl/zoneinfo/America/Rio_Branco.ics | 140 ++--- web/tzurl/zoneinfo/America/Santa_Isabel.ics | 214 +++---- web/tzurl/zoneinfo/America/Santarem.ics | 140 ++--- web/tzurl/zoneinfo/America/Santiago.ics | 420 ++++++------- web/tzurl/zoneinfo/America/Santo_Domingo.ics | 136 ++--- web/tzurl/zoneinfo/America/Sao_Paulo.ics | 304 +++++----- web/tzurl/zoneinfo/America/Scoresbysund.ics | 144 ++--- web/tzurl/zoneinfo/America/Sitka.ics | 348 +++++------ web/tzurl/zoneinfo/America/St_Barthelemy.ics | 32 +- web/tzurl/zoneinfo/America/St_Johns.ics | 538 ++++++++--------- web/tzurl/zoneinfo/America/St_Kitts.ics | 32 +- web/tzurl/zoneinfo/America/St_Lucia.ics | 46 +- web/tzurl/zoneinfo/America/St_Thomas.ics | 32 +- web/tzurl/zoneinfo/America/St_Vincent.ics | 46 +- web/tzurl/zoneinfo/America/Swift_Current.ics | 150 ++--- web/tzurl/zoneinfo/America/Tegucigalpa.ics | 68 +-- web/tzurl/zoneinfo/America/Thule.ics | 148 ++--- web/tzurl/zoneinfo/America/Thunder_Bay.ics | 292 ++++----- web/tzurl/zoneinfo/America/Tijuana.ics | 330 +++++----- web/tzurl/zoneinfo/America/Toronto.ics | 466 +++++++------- web/tzurl/zoneinfo/America/Tortola.ics | 32 +- web/tzurl/zoneinfo/America/Vancouver.ics | 376 ++++++------ web/tzurl/zoneinfo/America/Whitehorse.ics | 308 +++++----- web/tzurl/zoneinfo/America/Winnipeg.ics | 368 +++++------ web/tzurl/zoneinfo/America/Yakutat.ics | 336 +++++----- web/tzurl/zoneinfo/America/Yellowknife.ics | 264 ++++---- web/tzurl/zoneinfo/Antarctica/Casey.ics | 60 +- web/tzurl/zoneinfo/Antarctica/Davis.ics | 76 +-- .../zoneinfo/Antarctica/DumontDUrville.ics | 60 +- web/tzurl/zoneinfo/Antarctica/Macquarie.ics | 284 ++++----- web/tzurl/zoneinfo/Antarctica/Mawson.ics | 46 +- web/tzurl/zoneinfo/Antarctica/McMurdo.ics | 216 +++---- web/tzurl/zoneinfo/Antarctica/Palmer.ics | 238 ++++---- web/tzurl/zoneinfo/Antarctica/Rothera.ics | 32 +- web/tzurl/zoneinfo/Antarctica/South_Pole.ics | 216 +++---- web/tzurl/zoneinfo/Antarctica/Syowa.ics | 32 +- web/tzurl/zoneinfo/Antarctica/Vostok.ics | 32 +- web/tzurl/zoneinfo/Arctic/Longyearbyen.ics | 180 +++--- web/tzurl/zoneinfo/Asia/Aden.ics | 32 +- web/tzurl/zoneinfo/Asia/Almaty.ics | 180 +++--- web/tzurl/zoneinfo/Asia/Amman.ics | 184 +++--- web/tzurl/zoneinfo/Asia/Anadyr.ics | 266 ++++---- web/tzurl/zoneinfo/Asia/Aqtau.ics | 288 ++++----- web/tzurl/zoneinfo/Asia/Aqtobe.ics | 240 ++++---- web/tzurl/zoneinfo/Asia/Ashgabat.ics | 166 ++--- web/tzurl/zoneinfo/Asia/Baghdad.ics | 174 +++--- web/tzurl/zoneinfo/Asia/Bahrain.ics | 46 +- web/tzurl/zoneinfo/Asia/Baku.ics | 240 ++++---- web/tzurl/zoneinfo/Asia/Bangkok.ics | 46 +- web/tzurl/zoneinfo/Asia/Beirut.ics | 196 +++--- web/tzurl/zoneinfo/Asia/Bishkek.ics | 218 +++---- web/tzurl/zoneinfo/Asia/Brunei.ics | 46 +- web/tzurl/zoneinfo/Asia/Choibalsan.ics | 182 +++--- web/tzurl/zoneinfo/Asia/Chongqing.ics | 94 +-- web/tzurl/zoneinfo/Asia/Colombo.ics | 130 ++-- web/tzurl/zoneinfo/Asia/Damascus.ics | 270 ++++----- web/tzurl/zoneinfo/Asia/Dhaka.ics | 132 ++-- web/tzurl/zoneinfo/Asia/Dili.ics | 88 +-- web/tzurl/zoneinfo/Asia/Dubai.ics | 32 +- web/tzurl/zoneinfo/Asia/Dushanbe.ics | 138 ++--- web/tzurl/zoneinfo/Asia/Gaza.ics | 314 +++++----- web/tzurl/zoneinfo/Asia/Harbin.ics | 124 ++-- web/tzurl/zoneinfo/Asia/Ho_Chi_Minh.ics | 74 +-- web/tzurl/zoneinfo/Asia/Hong_Kong.ics | 218 +++---- web/tzurl/zoneinfo/Asia/Hovd.ics | 158 ++--- web/tzurl/zoneinfo/Asia/Irkutsk.ics | 244 ++++---- web/tzurl/zoneinfo/Asia/Istanbul.ics | 388 ++++++------ web/tzurl/zoneinfo/Asia/Jakarta.ics | 130 ++-- web/tzurl/zoneinfo/Asia/Jayapura.ics | 60 +- web/tzurl/zoneinfo/Asia/Jerusalem.ics | 376 ++++++------ web/tzurl/zoneinfo/Asia/Kabul.ics | 46 +- web/tzurl/zoneinfo/Asia/Kamchatka.ics | 218 +++---- web/tzurl/zoneinfo/Asia/Karachi.ics | 124 ++-- web/tzurl/zoneinfo/Asia/Kashgar.ics | 108 ++-- web/tzurl/zoneinfo/Asia/Kathmandu.ics | 46 +- web/tzurl/zoneinfo/Asia/Kolkata.ics | 76 +-- web/tzurl/zoneinfo/Asia/Krasnoyarsk.ics | 230 +++---- web/tzurl/zoneinfo/Asia/Kuala_Lumpur.ics | 130 ++-- web/tzurl/zoneinfo/Asia/Kuching.ics | 140 ++--- web/tzurl/zoneinfo/Asia/Kuwait.ics | 32 +- web/tzurl/zoneinfo/Asia/Macau.ics | 150 ++--- web/tzurl/zoneinfo/Asia/Magadan.ics | 230 +++---- web/tzurl/zoneinfo/Asia/Makassar.ics | 74 +-- web/tzurl/zoneinfo/Asia/Manila.ics | 98 +-- web/tzurl/zoneinfo/Asia/Muscat.ics | 32 +- web/tzurl/zoneinfo/Asia/Nicosia.ics | 192 +++--- web/tzurl/zoneinfo/Asia/Novokuznetsk.ics | 254 ++++---- web/tzurl/zoneinfo/Asia/Novosibirsk.ics | 244 ++++---- web/tzurl/zoneinfo/Asia/Omsk.ics | 230 +++---- web/tzurl/zoneinfo/Asia/Oral.ics | 288 ++++----- web/tzurl/zoneinfo/Asia/Phnom_Penh.ics | 74 +-- web/tzurl/zoneinfo/Asia/Pontianak.ics | 130 ++-- web/tzurl/zoneinfo/Asia/Pyongyang.ics | 90 +-- web/tzurl/zoneinfo/Asia/Qatar.ics | 46 +- web/tzurl/zoneinfo/Asia/Qyzylorda.ics | 266 ++++---- web/tzurl/zoneinfo/Asia/Rangoon.ics | 74 +-- web/tzurl/zoneinfo/Asia/Riyadh.ics | 32 +- web/tzurl/zoneinfo/Asia/Sakhalin.ics | 256 ++++---- web/tzurl/zoneinfo/Asia/Samarkand.ics | 178 +++--- web/tzurl/zoneinfo/Asia/Seoul.ics | 140 ++--- web/tzurl/zoneinfo/Asia/Shanghai.ics | 102 ++-- web/tzurl/zoneinfo/Asia/Singapore.ics | 144 ++--- web/tzurl/zoneinfo/Asia/Taipei.ics | 136 ++--- web/tzurl/zoneinfo/Asia/Tashkent.ics | 166 ++--- web/tzurl/zoneinfo/Asia/Tbilisi.ics | 320 +++++----- web/tzurl/zoneinfo/Asia/Tehran.ics | 314 +++++----- web/tzurl/zoneinfo/Asia/Thimphu.ics | 46 +- web/tzurl/zoneinfo/Asia/Tokyo.ics | 100 +-- web/tzurl/zoneinfo/Asia/Ulaanbaatar.ics | 158 ++--- web/tzurl/zoneinfo/Asia/Urumqi.ics | 94 +-- web/tzurl/zoneinfo/Asia/Vientiane.ics | 74 +-- web/tzurl/zoneinfo/Asia/Vladivostok.ics | 230 +++---- web/tzurl/zoneinfo/Asia/Yakutsk.ics | 230 +++---- web/tzurl/zoneinfo/Asia/Yekaterinburg.ics | 266 ++++---- web/tzurl/zoneinfo/Asia/Yerevan.ics | 222 +++---- web/tzurl/zoneinfo/Atlantic/Azores.ics | 448 +++++++------- web/tzurl/zoneinfo/Atlantic/Bermuda.ics | 230 +++---- web/tzurl/zoneinfo/Atlantic/Canary.ics | 146 ++--- web/tzurl/zoneinfo/Atlantic/Cape_Verde.ics | 74 +-- web/tzurl/zoneinfo/Atlantic/Faroe.ics | 116 ++-- web/tzurl/zoneinfo/Atlantic/Madeira.ics | 404 ++++++------- web/tzurl/zoneinfo/Atlantic/Reykjavik.ics | 208 +++---- .../zoneinfo/Atlantic/South_Georgia.ics | 32 +- web/tzurl/zoneinfo/Atlantic/St_Helena.ics | 46 +- web/tzurl/zoneinfo/Atlantic/Stanley.ics | 262 ++++---- web/tzurl/zoneinfo/Australia/Adelaide.ics | 274 ++++----- web/tzurl/zoneinfo/Australia/Brisbane.ics | 102 ++-- web/tzurl/zoneinfo/Australia/Currie.ics | 260 ++++---- web/tzurl/zoneinfo/Australia/Darwin.ics | 86 +-- web/tzurl/zoneinfo/Australia/Eucla.ics | 106 ++-- web/tzurl/zoneinfo/Australia/Hobart.ics | 276 ++++----- web/tzurl/zoneinfo/Australia/Lindeman.ics | 112 ++-- web/tzurl/zoneinfo/Australia/Lord_Howe.ics | 228 +++---- web/tzurl/zoneinfo/Australia/Melbourne.ics | 260 ++++---- web/tzurl/zoneinfo/Australia/Perth.ics | 106 ++-- web/tzurl/zoneinfo/Australia/Sydney.ics | 260 ++++---- web/tzurl/zoneinfo/Europe/Amsterdam.ics | 330 +++++----- web/tzurl/zoneinfo/Europe/Andorra.ics | 108 ++-- web/tzurl/zoneinfo/Europe/Athens.ics | 234 +++---- web/tzurl/zoneinfo/Europe/Belgrade.ics | 142 ++--- web/tzurl/zoneinfo/Europe/Berlin.ics | 210 +++---- web/tzurl/zoneinfo/Europe/Bratislava.ics | 194 +++--- web/tzurl/zoneinfo/Europe/Brussels.ics | 330 +++++----- web/tzurl/zoneinfo/Europe/Bucharest.ics | 220 +++---- web/tzurl/zoneinfo/Europe/Budapest.ics | 206 +++---- web/tzurl/zoneinfo/Europe/Chisinau.ics | 324 +++++----- web/tzurl/zoneinfo/Europe/Copenhagen.ics | 178 +++--- web/tzurl/zoneinfo/Europe/Dublin.ics | 404 ++++++------- web/tzurl/zoneinfo/Europe/Gibraltar.ics | 344 +++++------ web/tzurl/zoneinfo/Europe/Guernsey.ics | 418 ++++++------- web/tzurl/zoneinfo/Europe/Helsinki.ics | 150 ++--- web/tzurl/zoneinfo/Europe/Isle_of_Man.ics | 418 ++++++------- web/tzurl/zoneinfo/Europe/Istanbul.ics | 388 ++++++------ web/tzurl/zoneinfo/Europe/Jersey.ics | 418 ++++++------- web/tzurl/zoneinfo/Europe/Kaliningrad.ics | 330 +++++----- web/tzurl/zoneinfo/Europe/Kiev.ics | 276 ++++----- web/tzurl/zoneinfo/Europe/Lisbon.ics | 456 +++++++------- web/tzurl/zoneinfo/Europe/Ljubljana.ics | 142 ++--- web/tzurl/zoneinfo/Europe/London.ics | 418 ++++++------- web/tzurl/zoneinfo/Europe/Luxembourg.ics | 312 +++++----- web/tzurl/zoneinfo/Europe/Madrid.ics | 274 ++++----- web/tzurl/zoneinfo/Europe/Malta.ics | 236 ++++---- web/tzurl/zoneinfo/Europe/Mariehamn.ics | 150 ++--- web/tzurl/zoneinfo/Europe/Minsk.ics | 260 ++++---- web/tzurl/zoneinfo/Europe/Monaco.ics | 328 +++++----- web/tzurl/zoneinfo/Europe/Moscow.ics | 364 +++++------ web/tzurl/zoneinfo/Europe/Nicosia.ics | 192 +++--- web/tzurl/zoneinfo/Europe/Oslo.ics | 180 +++--- web/tzurl/zoneinfo/Europe/Paris.ics | 338 +++++------ web/tzurl/zoneinfo/Europe/Podgorica.ics | 142 ++--- web/tzurl/zoneinfo/Europe/Prague.ics | 194 +++--- web/tzurl/zoneinfo/Europe/Riga.ics | 336 +++++----- web/tzurl/zoneinfo/Europe/Rome.ics | 264 ++++---- web/tzurl/zoneinfo/Europe/Samara.ics | 316 +++++----- web/tzurl/zoneinfo/Europe/San_Marino.ics | 264 ++++---- web/tzurl/zoneinfo/Europe/Sarajevo.ics | 142 ++--- web/tzurl/zoneinfo/Europe/Simferopol.ics | 302 ++++----- web/tzurl/zoneinfo/Europe/Skopje.ics | 142 ++--- web/tzurl/zoneinfo/Europe/Sofia.ics | 262 ++++---- web/tzurl/zoneinfo/Europe/Stockholm.ics | 150 ++--- web/tzurl/zoneinfo/Europe/Tallinn.ics | 322 +++++----- web/tzurl/zoneinfo/Europe/Uzhgorod.ics | 294 ++++----- web/tzurl/zoneinfo/Europe/Vaduz.ics | 116 ++-- web/tzurl/zoneinfo/Europe/Vatican.ics | 264 ++++---- web/tzurl/zoneinfo/Europe/Vienna.ics | 180 +++--- web/tzurl/zoneinfo/Europe/Vilnius.ics | 342 +++++------ web/tzurl/zoneinfo/Europe/Volgograd.ics | 266 ++++---- web/tzurl/zoneinfo/Europe/Warsaw.ics | 306 +++++----- web/tzurl/zoneinfo/Europe/Zagreb.ics | 142 ++--- web/tzurl/zoneinfo/Europe/Zaporozhye.ics | 278 ++++----- web/tzurl/zoneinfo/Europe/Zurich.ics | 150 ++--- web/tzurl/zoneinfo/Indian/Antananarivo.ics | 60 +- web/tzurl/zoneinfo/Indian/Chagos.ics | 46 +- web/tzurl/zoneinfo/Indian/Christmas.ics | 32 +- web/tzurl/zoneinfo/Indian/Cocos.ics | 32 +- web/tzurl/zoneinfo/Indian/Comoro.ics | 32 +- web/tzurl/zoneinfo/Indian/Kerguelen.ics | 32 +- web/tzurl/zoneinfo/Indian/Mahe.ics | 32 +- web/tzurl/zoneinfo/Indian/Maldives.ics | 46 +- web/tzurl/zoneinfo/Indian/Mauritius.ics | 64 +- web/tzurl/zoneinfo/Indian/Mayotte.ics | 32 +- web/tzurl/zoneinfo/Indian/Reunion.ics | 32 +- web/tzurl/zoneinfo/Pacific/Apia.ics | 88 +-- web/tzurl/zoneinfo/Pacific/Auckland.ics | 332 +++++----- web/tzurl/zoneinfo/Pacific/Chatham.ics | 216 +++---- web/tzurl/zoneinfo/Pacific/Chuuk.ics | 32 +- web/tzurl/zoneinfo/Pacific/Easter.ics | 342 +++++------ web/tzurl/zoneinfo/Pacific/Efate.ics | 96 +-- web/tzurl/zoneinfo/Pacific/Enderbury.ics | 60 +- web/tzurl/zoneinfo/Pacific/Fakaofo.ics | 32 +- web/tzurl/zoneinfo/Pacific/Fiji.ics | 72 +-- web/tzurl/zoneinfo/Pacific/Funafuti.ics | 32 +- web/tzurl/zoneinfo/Pacific/Galapagos.ics | 46 +- web/tzurl/zoneinfo/Pacific/Gambier.ics | 32 +- web/tzurl/zoneinfo/Pacific/Guadalcanal.ics | 32 +- web/tzurl/zoneinfo/Pacific/Guam.ics | 60 +- web/tzurl/zoneinfo/Pacific/Honolulu.ics | 78 +-- web/tzurl/zoneinfo/Pacific/Johnston.ics | 32 +- web/tzurl/zoneinfo/Pacific/Kiritimati.ics | 60 +- web/tzurl/zoneinfo/Pacific/Kosrae.ics | 60 +- web/tzurl/zoneinfo/Pacific/Kwajalein.ics | 60 +- web/tzurl/zoneinfo/Pacific/Majuro.ics | 46 +- web/tzurl/zoneinfo/Pacific/Marquesas.ics | 32 +- web/tzurl/zoneinfo/Pacific/Midway.ics | 88 +-- web/tzurl/zoneinfo/Pacific/Nauru.ics | 74 +-- web/tzurl/zoneinfo/Pacific/Niue.ics | 60 +- web/tzurl/zoneinfo/Pacific/Norfolk.ics | 46 +- web/tzurl/zoneinfo/Pacific/Noumea.ics | 68 +-- web/tzurl/zoneinfo/Pacific/Pago_Pago.ics | 88 +-- web/tzurl/zoneinfo/Pacific/Palau.ics | 32 +- web/tzurl/zoneinfo/Pacific/Pitcairn.ics | 46 +- web/tzurl/zoneinfo/Pacific/Pohnpei.ics | 32 +- web/tzurl/zoneinfo/Pacific/Ponape.ics | 32 +- web/tzurl/zoneinfo/Pacific/Port_Moresby.ics | 46 +- web/tzurl/zoneinfo/Pacific/Rarotonga.ics | 120 ++-- web/tzurl/zoneinfo/Pacific/Saipan.ics | 74 +-- web/tzurl/zoneinfo/Pacific/Tahiti.ics | 32 +- web/tzurl/zoneinfo/Pacific/Tarawa.ics | 32 +- web/tzurl/zoneinfo/Pacific/Tongatapu.ics | 96 +-- web/tzurl/zoneinfo/Pacific/Truk.ics | 32 +- web/tzurl/zoneinfo/Pacific/Wake.ics | 32 +- web/tzurl/zoneinfo/Pacific/Wallis.ics | 32 +- 826 files changed, 42327 insertions(+), 42327 deletions(-) commit 3c5978ea9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 3 15:39:59 2011 +0000 Fixed a problem whereby iCalendar notifications of repeating events would be imported into the calendar by some applications (eg Exchange 2007) interpreting the UTC time as a local time. The problem was caused by a difference between RFC 2445, against which older applications were written, and the newer RFC 5545. See also SF tracker 3324122. This solution does not yet check for updated VTIMEZONE definitions, but should be sufficient in the majority of cases. web/functions_ical.inc | 98 ++++-- .../Africa/Abidjan.ics (new) | 15 + .../zoneinfo-outlook/Africa/Accra.ics (new) | 15 + .../Africa/Addis_Ababa.ics (new) | 15 + .../Africa/Algiers.ics (new) | 15 + .../zoneinfo-outlook/Africa/Asmara.ics (new) | 15 + .../zoneinfo-outlook/Africa/Bamako.ics (new) | 15 + .../zoneinfo-outlook/Africa/Bangui.ics (new) | 15 + .../zoneinfo-outlook/Africa/Banjul.ics (new) | 15 + .../zoneinfo-outlook/Africa/Bissau.ics (new) | 15 + .../Africa/Blantyre.ics (new) | 15 + .../Africa/Brazzaville.ics (new) | 15 + .../Africa/Bujumbura.ics (new) | 15 + .../zoneinfo-outlook/Africa/Cairo.ics (new) | 15 + .../Africa/Casablanca.ics (new) | 15 + .../zoneinfo-outlook/Africa/Ceuta.ics (new) | 23 ++ .../Africa/Conakry.ics (new) | 15 + .../zoneinfo-outlook/Africa/Dakar.ics (new) | 15 + .../Africa/Dar_es_Salaam.ics (new) | 15 + .../Africa/Djibouti.ics (new) | 15 + .../zoneinfo-outlook/Africa/Douala.ics (new) | 15 + .../Africa/El_Aaiun.ics (new) | 15 + .../Africa/Freetown.ics (new) | 15 + .../Africa/Gaborone.ics (new) | 15 + .../zoneinfo-outlook/Africa/Harare.ics (new) | 15 + .../Africa/Johannesburg.ics (new) | 15 + .../Africa/Kampala.ics (new) | 15 + .../Africa/Khartoum.ics (new) | 15 + .../zoneinfo-outlook/Africa/Kigali.ics (new) | 15 + .../Africa/Kinshasa.ics (new) | 15 + .../zoneinfo-outlook/Africa/Lagos.ics (new) | 15 + .../Africa/Libreville.ics (new) | 15 + .../zoneinfo-outlook/Africa/Lome.ics (new) | 15 + .../zoneinfo-outlook/Africa/Luanda.ics (new) | 15 + .../Africa/Lubumbashi.ics (new) | 15 + .../zoneinfo-outlook/Africa/Lusaka.ics (new) | 15 + .../zoneinfo-outlook/Africa/Malabo.ics (new) | 15 + .../zoneinfo-outlook/Africa/Maputo.ics (new) | 15 + .../zoneinfo-outlook/Africa/Maseru.ics (new) | 15 + .../Africa/Mbabane.ics (new) | 15 + .../Africa/Mogadishu.ics (new) | 15 + .../Africa/Monrovia.ics (new) | 15 + .../Africa/Nairobi.ics (new) | 15 + .../Africa/Ndjamena.ics (new) | 15 + .../zoneinfo-outlook/Africa/Niamey.ics (new) | 15 + .../Africa/Nouakchott.ics (new) | 15 + .../Africa/Ouagadougou.ics (new) | 15 + .../Africa/Porto-Novo.ics (new) | 15 + .../Africa/Sao_Tome.ics (new) | 15 + .../Africa/Tripoli.ics (new) | 15 + .../zoneinfo-outlook/Africa/Tunis.ics (new) | 15 + .../Africa/Windhoek.ics (new) | 23 ++ .../zoneinfo-outlook/America/Adak.ics (new) | 23 ++ .../America/Anchorage.ics (new) | 23 ++ .../America/Anguilla.ics (new) | 15 + .../America/Antigua.ics (new) | 15 + .../America/Araguaina.ics (new) | 15 + .../America/Argentina/Buenos_Aires.ics (new) | 15 + .../America/Argentina/Catamarca.ics (new) | 15 + .../America/Argentina/Cordoba.ics (new) | 15 + .../America/Argentina/Jujuy.ics (new) | 15 + .../America/Argentina/La_Rioja.ics (new) | 15 + .../America/Argentina/Mendoza.ics (new) | 15 + .../America/Argentina/Rio_Gallegos.ics (new) | 15 + .../America/Argentina/Salta.ics (new) | 15 + .../America/Argentina/San_Juan.ics (new) | 15 + .../America/Argentina/San_Luis.ics (new) | 15 + .../America/Argentina/Tucuman.ics (new) | 15 + .../America/Argentina/Ushuaia.ics (new) | 15 + .../zoneinfo-outlook/America/Aruba.ics (new) | 15 + .../America/Asuncion.ics (new) | 23 ++ .../America/Atikokan.ics (new) | 15 + .../zoneinfo-outlook/America/Bahia.ics (new) | 15 + .../America/Bahia_Banderas.ics (new) | 23 ++ .../America/Barbados.ics (new) | 15 + .../zoneinfo-outlook/America/Belem.ics (new) | 15 + .../America/Belize.ics (new) | 15 + .../America/Blanc-Sablon.ics (new) | 15 + .../America/Boa_Vista.ics (new) | 15 + .../America/Bogota.ics (new) | 15 + .../zoneinfo-outlook/America/Boise.ics (new) | 23 ++ .../America/Cambridge_Bay.ics (new) | 23 ++ .../America/Campo_Grande.ics (new) | 23 ++ .../America/Cancun.ics (new) | 23 ++ .../America/Caracas.ics (new) | 15 + .../America/Cayenne.ics (new) | 15 + .../America/Cayman.ics (new) | 15 + .../America/Chicago.ics (new) | 23 ++ .../America/Chihuahua.ics (new) | 23 ++ .../America/Costa_Rica.ics (new) | 15 + .../America/Cuiaba.ics (new) | 23 ++ .../America/Curacao.ics (new) | 15 + .../America/Danmarkshavn.ics (new) | 15 + .../America/Dawson.ics (new) | 23 ++ .../America/Dawson_Creek.ics (new) | 15 + .../America/Denver.ics (new) | 23 ++ .../America/Detroit.ics (new) | 23 ++ .../America/Dominica.ics (new) | 15 + .../America/Edmonton.ics (new) | 23 ++ .../America/Eirunepe.ics (new) | 15 + .../America/El_Salvador.ics (new) | 15 + .../America/Fortaleza.ics (new) | 15 + .../America/Glace_Bay.ics (new) | 23 ++ .../America/Godthab.ics (new) | 23 ++ .../America/Goose_Bay.ics (new) | 23 ++ .../America/Grand_Turk.ics (new) | 23 ++ .../America/Grenada.ics (new) | 15 + .../America/Guadeloupe.ics (new) | 15 + .../America/Guatemala.ics (new) | 15 + .../America/Guayaquil.ics (new) | 15 + .../America/Guyana.ics (new) | 15 + .../America/Halifax.ics (new) | 23 ++ .../America/Havana.ics (new) | 23 ++ .../America/Hermosillo.ics (new) | 15 + .../America/Indiana/Indianapolis.ics (new) | 23 ++ .../America/Indiana/Knox.ics (new) | 23 ++ .../America/Indiana/Marengo.ics (new) | 23 ++ .../America/Indiana/Petersburg.ics (new) | 23 ++ .../America/Indiana/Tell_City.ics (new) | 23 ++ .../America/Indiana/Vevay.ics (new) | 23 ++ .../America/Indiana/Vincennes.ics (new) | 23 ++ .../America/Indiana/Winamac.ics (new) | 23 ++ .../America/Inuvik.ics (new) | 23 ++ .../America/Iqaluit.ics (new) | 23 ++ .../America/Jamaica.ics (new) | 15 + .../America/Juneau.ics (new) | 23 ++ .../America/Kentucky/Louisville.ics (new) | 23 ++ .../America/Kentucky/Monticello.ics (new) | 23 ++ .../America/Kralendijk.ics (new) | 15 + .../America/La_Paz.ics (new) | 15 + .../zoneinfo-outlook/America/Lima.ics (new) | 15 + .../America/Los_Angeles.ics (new) | 23 ++ .../America/Lower_Princes.ics (new) | 15 + .../America/Maceio.ics (new) | 15 + .../America/Managua.ics (new) | 15 + .../America/Manaus.ics (new) | 15 + .../America/Marigot.ics (new) | 15 + .../America/Martinique.ics (new) | 15 + .../America/Matamoros.ics (new) | 23 ++ .../America/Mazatlan.ics (new) | 23 ++ .../America/Menominee.ics (new) | 23 ++ .../America/Merida.ics (new) | 23 ++ .../America/Metlakatla.ics (new) | 23 ++ .../America/Mexico_City.ics (new) | 23 ++ .../America/Miquelon.ics (new) | 23 ++ .../America/Moncton.ics (new) | 23 ++ .../America/Monterrey.ics (new) | 23 ++ .../America/Montevideo.ics (new) | 23 ++ .../America/Montreal.ics (new) | 23 ++ .../America/Montserrat.ics (new) | 15 + .../America/Nassau.ics (new) | 23 ++ .../America/New_York.ics (new) | 23 ++ .../America/Nipigon.ics (new) | 23 ++ .../zoneinfo-outlook/America/Nome.ics (new) | 23 ++ .../America/Noronha.ics (new) | 15 + .../America/North_Dakota/Beulah.ics (new) | 23 ++ .../America/North_Dakota/Center.ics (new) | 23 ++ .../America/North_Dakota/New_Salem.ics (new) | 23 ++ .../America/Ojinaga.ics (new) | 23 ++ .../America/Panama.ics (new) | 15 + .../America/Pangnirtung.ics (new) | 23 ++ .../America/Paramaribo.ics (new) | 15 + .../America/Phoenix.ics (new) | 15 + .../America/Port-au-Prince.ics (new) | 15 + .../America/Port_of_Spain.ics (new) | 15 + .../America/Porto_Velho.ics (new) | 15 + .../America/Puerto_Rico.ics (new) | 15 + .../America/Rainy_River.ics (new) | 23 ++ .../America/Rankin_Inlet.ics (new) | 23 ++ .../America/Recife.ics (new) | 15 + .../America/Regina.ics (new) | 15 + .../America/Resolute.ics (new) | 23 ++ .../America/Rio_Branco.ics (new) | 15 + .../America/Santa_Isabel.ics (new) | 23 ++ .../America/Santarem.ics (new) | 15 + .../America/Santiago.ics (new) | 23 ++ .../America/Santo_Domingo.ics (new) | 15 + .../America/Sao_Paulo.ics (new) | 23 ++ .../America/Scoresbysund.ics (new) | 23 ++ .../zoneinfo-outlook/America/Sitka.ics (new) | 23 ++ .../America/St_Barthelemy.ics (new) | 15 + .../America/St_Johns.ics (new) | 23 ++ .../America/St_Kitts.ics (new) | 15 + .../America/St_Lucia.ics (new) | 15 + .../America/St_Thomas.ics (new) | 15 + .../America/St_Vincent.ics (new) | 15 + .../America/Swift_Current.ics (new) | 15 + .../America/Tegucigalpa.ics (new) | 15 + .../zoneinfo-outlook/America/Thule.ics (new) | 23 ++ .../America/Thunder_Bay.ics (new) | 23 ++ .../America/Tijuana.ics (new) | 23 ++ .../America/Toronto.ics (new) | 23 ++ .../America/Tortola.ics (new) | 15 + .../America/Vancouver.ics (new) | 23 ++ .../America/Whitehorse.ics (new) | 23 ++ .../America/Winnipeg.ics (new) | 23 ++ .../America/Yakutat.ics (new) | 23 ++ .../America/Yellowknife.ics (new) | 23 ++ .../Antarctica/Casey.ics (new) | 15 + .../Antarctica/Davis.ics (new) | 15 + .../Antarctica/DumontDUrville.ics (new) | 15 + .../Antarctica/Macquarie.ics (new) | 15 + .../Antarctica/Mawson.ics (new) | 15 + .../Antarctica/McMurdo.ics (new) | 23 ++ .../Antarctica/Palmer.ics (new) | 23 ++ .../Antarctica/Rothera.ics (new) | 15 + .../Antarctica/South_Pole.ics (new) | 23 ++ .../Antarctica/Syowa.ics (new) | 15 + .../Antarctica/Vostok.ics (new) | 15 + .../Arctic/Longyearbyen.ics (new) | 23 ++ .../zoneinfo-outlook/Asia/Aden.ics (new) | 15 + .../zoneinfo-outlook/Asia/Almaty.ics (new) | 15 + .../zoneinfo-outlook/Asia/Amman.ics (new) | 23 ++ .../zoneinfo-outlook/Asia/Anadyr.ics (new) | 15 + .../zoneinfo-outlook/Asia/Aqtau.ics (new) | 15 + .../zoneinfo-outlook/Asia/Aqtobe.ics (new) | 15 + .../zoneinfo-outlook/Asia/Ashgabat.ics (new) | 15 + .../zoneinfo-outlook/Asia/Baghdad.ics (new) | 15 + .../zoneinfo-outlook/Asia/Bahrain.ics (new) | 15 + .../zoneinfo-outlook/Asia/Baku.ics (new) | 23 ++ .../zoneinfo-outlook/Asia/Bangkok.ics (new) | 15 + .../zoneinfo-outlook/Asia/Beirut.ics (new) | 23 ++ .../zoneinfo-outlook/Asia/Bishkek.ics (new) | 15 + .../zoneinfo-outlook/Asia/Brunei.ics (new) | 15 + .../Asia/Choibalsan.ics (new) | 14 + .../Asia/Chongqing.ics (new) | 15 + .../zoneinfo-outlook/Asia/Colombo.ics (new) | 15 + .../zoneinfo-outlook/Asia/Damascus.ics (new) | 23 ++ .../zoneinfo-outlook/Asia/Dhaka.ics (new) | 15 + .../zoneinfo-outlook/Asia/Dili.ics (new) | 15 + .../zoneinfo-outlook/Asia/Dubai.ics (new) | 15 + .../zoneinfo-outlook/Asia/Dushanbe.ics (new) | 15 + .../zoneinfo-outlook/Asia/Gaza.ics (new) | 23 ++ .../zoneinfo-outlook/Asia/Harbin.ics (new) | 15 + .../Asia/Ho_Chi_Minh.ics (new) | 15 + .../Asia/Hong_Kong.ics (new) | 15 + .../zoneinfo-outlook/Asia/Hovd.ics (new) | 15 + .../zoneinfo-outlook/Asia/Irkutsk.ics (new) | 15 + .../zoneinfo-outlook/Asia/Istanbul.ics (new) | 23 ++ .../zoneinfo-outlook/Asia/Jakarta.ics (new) | 15 + .../zoneinfo-outlook/Asia/Jayapura.ics (new) | 15 + .../Asia/Jerusalem.ics (new) | 15 + .../zoneinfo-outlook/Asia/Kabul.ics (new) | 15 + .../Asia/Kamchatka.ics (new) | 15 + .../zoneinfo-outlook/Asia/Karachi.ics (new) | 15 + .../zoneinfo-outlook/Asia/Kashgar.ics (new) | 15 + .../Asia/Kathmandu.ics (new) | 15 + .../zoneinfo-outlook/Asia/Kolkata.ics (new) | 15 + .../Asia/Krasnoyarsk.ics (new) | 15 + .../Asia/Kuala_Lumpur.ics (new) | 15 + .../zoneinfo-outlook/Asia/Kuching.ics (new) | 15 + .../zoneinfo-outlook/Asia/Kuwait.ics (new) | 15 + .../zoneinfo-outlook/Asia/Macau.ics (new) | 15 + .../zoneinfo-outlook/Asia/Magadan.ics (new) | 15 + .../zoneinfo-outlook/Asia/Makassar.ics (new) | 15 + .../zoneinfo-outlook/Asia/Manila.ics (new) | 15 + .../zoneinfo-outlook/Asia/Muscat.ics (new) | 15 + .../zoneinfo-outlook/Asia/Nicosia.ics (new) | 23 ++ .../Asia/Novokuznetsk.ics (new) | 15 + .../Asia/Novosibirsk.ics (new) | 15 + .../zoneinfo-outlook/Asia/Omsk.ics (new) | 15 + .../zoneinfo-outlook/Asia/Oral.ics (new) | 15 + .../Asia/Phnom_Penh.ics (new) | 15 + .../Asia/Pontianak.ics (new) | 15 + .../Asia/Pyongyang.ics (new) | 15 + .../zoneinfo-outlook/Asia/Qatar.ics (new) | 15 + .../Asia/Qyzylorda.ics (new) | 15 + .../zoneinfo-outlook/Asia/Rangoon.ics (new) | 15 + .../zoneinfo-outlook/Asia/Riyadh.ics (new) | 15 + .../zoneinfo-outlook/Asia/Sakhalin.ics (new) | 15 + .../Asia/Samarkand.ics (new) | 15 + .../zoneinfo-outlook/Asia/Seoul.ics (new) | 15 + .../zoneinfo-outlook/Asia/Shanghai.ics (new) | 15 + .../Asia/Singapore.ics (new) | 15 + .../zoneinfo-outlook/Asia/Taipei.ics (new) | 15 + .../zoneinfo-outlook/Asia/Tashkent.ics (new) | 15 + .../zoneinfo-outlook/Asia/Tbilisi.ics (new) | 15 + .../zoneinfo-outlook/Asia/Tehran.ics (new) | 15 + .../zoneinfo-outlook/Asia/Thimphu.ics (new) | 15 + .../zoneinfo-outlook/Asia/Tokyo.ics (new) | 15 + .../Asia/Ulaanbaatar.ics (new) | 15 + .../zoneinfo-outlook/Asia/Urumqi.ics (new) | 15 + .../Asia/Vientiane.ics (new) | 15 + .../Asia/Vladivostok.ics (new) | 15 + .../zoneinfo-outlook/Asia/Yakutsk.ics (new) | 15 + .../Asia/Yekaterinburg.ics (new) | 15 + .../zoneinfo-outlook/Asia/Yerevan.ics (new) | 23 ++ .../Atlantic/Azores.ics (new) | 23 ++ .../Atlantic/Bermuda.ics (new) | 23 ++ .../Atlantic/Canary.ics (new) | 23 ++ .../Atlantic/Cape_Verde.ics (new) | 15 + .../Atlantic/Faroe.ics (new) | 23 ++ .../Atlantic/Madeira.ics (new) | 23 ++ .../Atlantic/Reykjavik.ics (new) | 15 + .../Atlantic/South_Georgia.ics (new) | 15 + .../Atlantic/St_Helena.ics (new) | 15 + .../Atlantic/Stanley.ics (new) | 23 ++ .../Australia/Adelaide.ics (new) | 23 ++ .../Australia/Brisbane.ics (new) | 15 + .../Australia/Currie.ics (new) | 23 ++ .../Australia/Darwin.ics (new) | 15 + .../Australia/Eucla.ics (new) | 15 + .../Australia/Hobart.ics (new) | 23 ++ .../Australia/Lindeman.ics (new) | 15 + .../Australia/Lord_Howe.ics (new) | 23 ++ .../Australia/Melbourne.ics (new) | 23 ++ .../Australia/Perth.ics (new) | 15 + .../Australia/Sydney.ics (new) | 23 ++ .../Europe/Amsterdam.ics (new) | 23 ++ .../Europe/Andorra.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Athens.ics (new) | 23 ++ .../Europe/Belgrade.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Berlin.ics (new) | 23 ++ .../Europe/Bratislava.ics (new) | 23 ++ .../Europe/Brussels.ics (new) | 23 ++ .../Europe/Bucharest.ics (new) | 23 ++ .../Europe/Budapest.ics (new) | 23 ++ .../Europe/Chisinau.ics (new) | 23 ++ .../Europe/Copenhagen.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Dublin.ics (new) | 23 ++ .../Europe/Gibraltar.ics (new) | 23 ++ .../Europe/Guernsey.ics (new) | 23 ++ .../Europe/Helsinki.ics (new) | 23 ++ .../Europe/Isle_of_Man.ics (new) | 23 ++ .../Europe/Istanbul.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Jersey.ics (new) | 23 ++ .../Europe/Kaliningrad.ics (new) | 15 + .../zoneinfo-outlook/Europe/Kiev.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Lisbon.ics (new) | 23 ++ .../Europe/Ljubljana.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/London.ics (new) | 23 ++ .../Europe/Luxembourg.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Madrid.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Malta.ics (new) | 23 ++ .../Europe/Mariehamn.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Minsk.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Monaco.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Moscow.ics (new) | 15 + .../Europe/Nicosia.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Oslo.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Paris.ics (new) | 23 ++ .../Europe/Podgorica.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Prague.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Riga.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Rome.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Samara.ics (new) | 15 + .../Europe/San_Marino.ics (new) | 23 ++ .../Europe/Sarajevo.ics (new) | 23 ++ .../Europe/Simferopol.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Skopje.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Sofia.ics (new) | 23 ++ .../Europe/Stockholm.ics (new) | 23 ++ .../Europe/Tallinn.ics (new) | 23 ++ .../Europe/Uzhgorod.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Vaduz.ics (new) | 23 ++ .../Europe/Vatican.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Vienna.ics (new) | 23 ++ .../Europe/Vilnius.ics (new) | 23 ++ .../Europe/Volgograd.ics (new) | 15 + .../zoneinfo-outlook/Europe/Warsaw.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Zagreb.ics (new) | 23 ++ .../Europe/Zaporozhye.ics (new) | 23 ++ .../zoneinfo-outlook/Europe/Zurich.ics (new) | 23 ++ .../Indian/Antananarivo.ics (new) | 15 + .../zoneinfo-outlook/Indian/Chagos.ics (new) | 15 + .../Indian/Christmas.ics (new) | 15 + .../zoneinfo-outlook/Indian/Cocos.ics (new) | 15 + .../zoneinfo-outlook/Indian/Comoro.ics (new) | 15 + .../Indian/Kerguelen.ics (new) | 15 + .../zoneinfo-outlook/Indian/Mahe.ics (new) | 15 + .../Indian/Maldives.ics (new) | 15 + .../Indian/Mauritius.ics (new) | 15 + .../Indian/Mayotte.ics (new) | 15 + .../Indian/Reunion.ics (new) | 15 + .../zoneinfo-outlook/Pacific/Apia.ics (new) | 15 + .../Pacific/Auckland.ics (new) | 23 ++ .../Pacific/Chatham.ics (new) | 23 ++ .../zoneinfo-outlook/Pacific/Chuuk.ics (new) | 15 + .../Pacific/Easter.ics (new) | 23 ++ .../zoneinfo-outlook/Pacific/Efate.ics (new) | 15 + .../Pacific/Enderbury.ics (new) | 15 + .../Pacific/Fakaofo.ics (new) | 15 + .../zoneinfo-outlook/Pacific/Fiji.ics (new) | 15 + .../Pacific/Funafuti.ics (new) | 15 + .../Pacific/Galapagos.ics (new) | 15 + .../Pacific/Gambier.ics (new) | 15 + .../Pacific/Guadalcanal.ics (new) | 15 + .../zoneinfo-outlook/Pacific/Guam.ics (new) | 15 + .../Pacific/Honolulu.ics (new) | 15 + .../Pacific/Johnston.ics (new) | 15 + .../Pacific/Kiritimati.ics (new) | 15 + .../Pacific/Kosrae.ics (new) | 15 + .../Pacific/Kwajalein.ics (new) | 15 + .../Pacific/Majuro.ics (new) | 15 + .../Pacific/Marquesas.ics (new) | 15 + .../Pacific/Midway.ics (new) | 15 + .../zoneinfo-outlook/Pacific/Nauru.ics (new) | 15 + .../zoneinfo-outlook/Pacific/Niue.ics (new) | 15 + .../Pacific/Norfolk.ics (new) | 15 + .../Pacific/Noumea.ics (new) | 15 + .../Pacific/Pago_Pago.ics (new) | 15 + .../zoneinfo-outlook/Pacific/Palau.ics (new) | 15 + .../Pacific/Pitcairn.ics (new) | 15 + .../Pacific/Pohnpei.ics (new) | 15 + .../Pacific/Ponape.ics (new) | 15 + .../Pacific/Port_Moresby.ics (new) | 15 + .../Pacific/Rarotonga.ics (new) | 15 + .../Pacific/Saipan.ics (new) | 15 + .../Pacific/Tahiti.ics (new) | 15 + .../Pacific/Tarawa.ics (new) | 15 + .../Pacific/Tongatapu.ics (new) | 15 + .../zoneinfo-outlook/Pacific/Truk.ics (new) | 15 + .../zoneinfo-outlook/Pacific/Wake.ics (new) | 15 + .../Pacific/Wallis.ics (new) | 15 + web/tzurl/zoneinfo/Africa/Abidjan.ics (new) | 16 + web/tzurl/zoneinfo/Africa/Accra.ics (new) | 42 +++ .../zoneinfo/Africa/Addis_Ababa.ics (new) | 23 ++ web/tzurl/zoneinfo/Africa/Algiers.ics (new) | 91 ++++++ web/tzurl/zoneinfo/Africa/Asmara.ics (new) | 30 ++ web/tzurl/zoneinfo/Africa/Bamako.ics (new) | 30 ++ web/tzurl/zoneinfo/Africa/Bangui.ics (new) | 16 + web/tzurl/zoneinfo/Africa/Banjul.ics (new) | 30 ++ web/tzurl/zoneinfo/Africa/Bissau.ics (new) | 23 ++ web/tzurl/zoneinfo/Africa/Blantyre.ics (new) | 16 + .../zoneinfo/Africa/Brazzaville.ics (new) | 16 + .../zoneinfo/Africa/Bujumbura.ics (new) | 16 + web/tzurl/zoneinfo/Africa/Cairo.ics (new) | 150 +++++++++ .../zoneinfo/Africa/Casablanca.ics (new) | 60 ++++ web/tzurl/zoneinfo/Africa/Ceuta.ics (new) | 100 ++++++ web/tzurl/zoneinfo/Africa/Conakry.ics (new) | 30 ++ web/tzurl/zoneinfo/Africa/Dakar.ics (new) | 23 ++ .../zoneinfo/Africa/Dar_es_Salaam.ics (new) | 30 ++ web/tzurl/zoneinfo/Africa/Djibouti.ics (new) | 16 + web/tzurl/zoneinfo/Africa/Douala.ics (new) | 16 + web/tzurl/zoneinfo/Africa/El_Aaiun.ics (new) | 23 ++ web/tzurl/zoneinfo/Africa/Freetown.ics (new) | 82 +++++ web/tzurl/zoneinfo/Africa/Gaborone.ics (new) | 30 ++ web/tzurl/zoneinfo/Africa/Harare.ics (new) | 16 + .../zoneinfo/Africa/Johannesburg.ics (new) | 39 +++ web/tzurl/zoneinfo/Africa/Kampala.ics (new) | 37 +++ web/tzurl/zoneinfo/Africa/Khartoum.ics (new) | 67 ++++ web/tzurl/zoneinfo/Africa/Kigali.ics (new) | 16 + web/tzurl/zoneinfo/Africa/Kinshasa.ics (new) | 16 + web/tzurl/zoneinfo/Africa/Lagos.ics (new) | 16 + .../zoneinfo/Africa/Libreville.ics (new) | 16 + web/tzurl/zoneinfo/Africa/Lome.ics (new) | 16 + web/tzurl/zoneinfo/Africa/Luanda.ics (new) | 23 ++ .../zoneinfo/Africa/Lubumbashi.ics (new) | 16 + web/tzurl/zoneinfo/Africa/Lusaka.ics (new) | 16 + web/tzurl/zoneinfo/Africa/Malabo.ics (new) | 23 ++ web/tzurl/zoneinfo/Africa/Maputo.ics (new) | 16 + web/tzurl/zoneinfo/Africa/Maseru.ics (new) | 30 ++ web/tzurl/zoneinfo/Africa/Mbabane.ics (new) | 16 + .../zoneinfo/Africa/Mogadishu.ics (new) | 30 ++ web/tzurl/zoneinfo/Africa/Monrovia.ics (new) | 30 ++ web/tzurl/zoneinfo/Africa/Nairobi.ics (new) | 37 +++ web/tzurl/zoneinfo/Africa/Ndjamena.ics (new) | 30 ++ web/tzurl/zoneinfo/Africa/Niamey.ics (new) | 30 ++ .../zoneinfo/Africa/Nouakchott.ics (new) | 30 ++ .../zoneinfo/Africa/Ouagadougou.ics (new) | 16 + .../zoneinfo/Africa/Porto-Novo.ics (new) | 23 ++ web/tzurl/zoneinfo/Africa/Sao_Tome.ics (new) | 23 ++ web/tzurl/zoneinfo/Africa/Tripoli.ics (new) | 68 +++++ web/tzurl/zoneinfo/Africa/Tunis.ics (new) | 67 ++++ web/tzurl/zoneinfo/Africa/Windhoek.ics (new) | 65 ++++ web/tzurl/zoneinfo/America/Adak.ics (new) | 187 ++++++++++++ .../zoneinfo/America/Anchorage.ics (new) | 187 ++++++++++++ .../zoneinfo/America/Anguilla.ics (new) | 16 + web/tzurl/zoneinfo/America/Antigua.ics (new) | 23 ++ .../zoneinfo/America/Araguaina.ics (new) | 85 ++++++ .../America/Argentina/Buenos_Aires.ics (new) | 124 ++++++++ .../America/Argentina/Catamarca.ics (new) | 143 +++++++++ .../America/Argentina/Cordoba.ics (new) | 136 +++++++++ .../America/Argentina/Jujuy.ics (new) | 154 ++++++++++ .../America/Argentina/La_Rioja.ics (new) | 138 +++++++++ .../America/Argentina/Mendoza.ics (new) | 149 +++++++++ .../America/Argentina/Rio_Gallegos.ics (new) | 131 ++++++++ .../America/Argentina/Salta.ics (new) | 135 +++++++++ .../America/Argentina/San_Juan.ics (new) | 138 +++++++++ .../America/Argentina/San_Luis.ics (new) | 161 ++++++++++ .../America/Argentina/Tucuman.ics (new) | 144 +++++++++ .../America/Argentina/Ushuaia.ics (new) | 131 ++++++++ web/tzurl/zoneinfo/America/Aruba.ics (new) | 23 ++ .../zoneinfo/America/Asuncion.ics (new) | 133 ++++++++ .../zoneinfo/America/Atikokan.ics (new) | 52 ++++ web/tzurl/zoneinfo/America/Bahia.ics (new) | 93 ++++++ .../America/Bahia_Banderas.ics (new) | 103 +++++++ .../zoneinfo/America/Barbados.ics (new) | 43 +++ web/tzurl/zoneinfo/America/Belem.ics (new) | 63 ++++ web/tzurl/zoneinfo/America/Belize.ics (new) | 94 ++++++ .../zoneinfo/America/Blanc-Sablon.ics (new) | 52 ++++ .../zoneinfo/America/Boa_Vista.ics (new) | 68 +++++ web/tzurl/zoneinfo/America/Bogota.ics (new) | 37 +++ web/tzurl/zoneinfo/America/Boise.ics (new) | 167 ++++++++++ .../zoneinfo/America/Cambridge_Bay.ics (new) | 156 ++++++++++ .../zoneinfo/America/Campo_Grande.ics (new) | 145 +++++++++ web/tzurl/zoneinfo/America/Cancun.ics (new) | 80 +++++ web/tzurl/zoneinfo/America/Caracas.ics (new) | 37 +++ web/tzurl/zoneinfo/America/Cayenne.ics (new) | 23 ++ web/tzurl/zoneinfo/America/Cayman.ics (new) | 23 ++ web/tzurl/zoneinfo/America/Chicago.ics (new) | 243 +++++++++++++++ .../zoneinfo/America/Chihuahua.ics (new) | 91 ++++++ .../zoneinfo/America/Costa_Rica.ics (new) | 43 +++ web/tzurl/zoneinfo/America/Cuiaba.ics (new) | 145 +++++++++ web/tzurl/zoneinfo/America/Curacao.ics (new) | 23 ++ .../zoneinfo/America/Danmarkshavn.ics (new) | 67 ++++ web/tzurl/zoneinfo/America/Dawson.ics (new) | 154 ++++++++++ .../zoneinfo/America/Dawson_Creek.ics (new) | 110 +++++++ web/tzurl/zoneinfo/America/Denver.ics (new) | 159 ++++++++++ web/tzurl/zoneinfo/America/Detroit.ics (new) | 146 +++++++++ .../zoneinfo/America/Dominica.ics (new) | 16 + .../zoneinfo/America/Edmonton.ics (new) | 152 ++++++++++ .../zoneinfo/America/Eirunepe.ics (new) | 74 +++++ .../zoneinfo/America/El_Salvador.ics (new) | 32 ++ .../zoneinfo/America/Fortaleza.ics (new) | 76 +++++ .../zoneinfo/America/Glace_Bay.ics (new) | 141 +++++++++ web/tzurl/zoneinfo/America/Godthab.ics (new) | 59 ++++ .../zoneinfo/America/Goose_Bay.ics (new) | 259 ++++++++++++++++ .../zoneinfo/America/Grand_Turk.ics (new) | 105 +++++++ web/tzurl/zoneinfo/America/Grenada.ics (new) | 16 + .../zoneinfo/America/Guadeloupe.ics (new) | 16 + .../zoneinfo/America/Guatemala.ics (new) | 36 +++ .../zoneinfo/America/Guayaquil.ics (new) | 23 ++ web/tzurl/zoneinfo/America/Guyana.ics (new) | 37 +++ web/tzurl/zoneinfo/America/Halifax.ics (new) | 229 ++++++++++++++ web/tzurl/zoneinfo/America/Havana.ics (new) | 145 +++++++++ .../zoneinfo/America/Hermosillo.ics (new) | 67 ++++ .../America/Indiana/Indianapolis.ics (new) | 126 ++++++++ .../zoneinfo/America/Indiana/Knox.ics (new) | 170 +++++++++++ .../America/Indiana/Marengo.ics (new) | 134 ++++++++ .../America/Indiana/Petersburg.ics (new) | 134 ++++++++ .../America/Indiana/Tell_City.ics (new) | 131 ++++++++ .../zoneinfo/America/Indiana/Vevay.ics (new) | 99 ++++++ .../America/Indiana/Vincennes.ics (new) | 133 ++++++++ .../America/Indiana/Winamac.ics (new) | 144 +++++++++ web/tzurl/zoneinfo/America/Inuvik.ics (new) | 123 ++++++++ web/tzurl/zoneinfo/America/Iqaluit.ics (new) | 136 +++++++++ web/tzurl/zoneinfo/America/Jamaica.ics (new) | 62 ++++ web/tzurl/zoneinfo/America/Juneau.ics (new) | 180 +++++++++++ .../America/Kentucky/Louisville.ics (new) | 206 +++++++++++++ .../America/Kentucky/Monticello.ics (new) | 165 ++++++++++ .../zoneinfo/America/Kralendijk.ics (new) | 23 ++ web/tzurl/zoneinfo/America/La_Paz.ics (new) | 30 ++ web/tzurl/zoneinfo/America/Lima.ics (new) | 49 +++ .../zoneinfo/America/Los_Angeles.ics (new) | 185 ++++++++++++ .../zoneinfo/America/Lower_Princes.ics (new) | 23 ++ web/tzurl/zoneinfo/America/Maceio.ics (new) | 80 +++++ web/tzurl/zoneinfo/America/Managua.ics (new) | 55 ++++ web/tzurl/zoneinfo/America/Manaus.ics (new) | 67 ++++ web/tzurl/zoneinfo/America/Marigot.ics (new) | 16 + .../zoneinfo/America/Martinique.ics (new) | 37 +++ .../zoneinfo/America/Matamoros.ics (new) | 81 +++++ .../zoneinfo/America/Mazatlan.ics (new) | 80 +++++ .../zoneinfo/America/Menominee.ics (new) | 153 ++++++++++ web/tzurl/zoneinfo/America/Merida.ics (new) | 62 ++++ .../zoneinfo/America/Metlakatla.ics (new) | 161 ++++++++++ .../zoneinfo/America/Mexico_City.ics (new) | 92 ++++++ .../zoneinfo/America/Miquelon.ics (new) | 96 ++++++ web/tzurl/zoneinfo/America/Moncton.ics (new) | 216 +++++++++++++ .../zoneinfo/America/Monterrey.ics (new) | 64 ++++ .../zoneinfo/America/Montevideo.ics (new) | 152 ++++++++++ .../zoneinfo/America/Montreal.ics (new) | 234 ++++++++++++++ .../zoneinfo/America/Montserrat.ics (new) | 16 + web/tzurl/zoneinfo/America/Nassau.ics (new) | 135 +++++++++ .../zoneinfo/America/New_York.ics (new) | 237 +++++++++++++++ web/tzurl/zoneinfo/America/Nipigon.ics (new) | 126 ++++++++ web/tzurl/zoneinfo/America/Nome.ics (new) | 187 ++++++++++++ web/tzurl/zoneinfo/America/Noronha.ics (new) | 76 +++++ .../America/North_Dakota/Beulah.ics (new) | 155 ++++++++++ .../America/North_Dakota/Center.ics (new) | 159 ++++++++++ .../America/North_Dakota/New_Salem.ics (new) | 159 ++++++++++ web/tzurl/zoneinfo/America/Ojinaga.ics (new) | 114 +++++++ web/tzurl/zoneinfo/America/Panama.ics (new) | 23 ++ .../zoneinfo/America/Pangnirtung.ics (new) | 161 ++++++++++ .../zoneinfo/America/Paramaribo.ics (new) | 44 +++ web/tzurl/zoneinfo/America/Phoenix.ics (new) | 52 ++++ .../America/Port-au-Prince.ics (new) | 69 +++++ .../zoneinfo/America/Port_of_Spain.ics (new) | 16 + .../zoneinfo/America/Porto_Velho.ics (new) | 63 ++++ .../zoneinfo/America/Puerto_Rico.ics (new) | 44 +++ .../zoneinfo/America/Rainy_River.ics (new) | 126 ++++++++ .../zoneinfo/America/Rankin_Inlet.ics (new) | 122 ++++++++ web/tzurl/zoneinfo/America/Recife.ics (new) | 76 +++++ web/tzurl/zoneinfo/America/Regina.ics (new) | 98 ++++++ .../zoneinfo/America/Resolute.ics (new) | 122 ++++++++ .../zoneinfo/America/Rio_Branco.ics (new) | 70 +++++ .../zoneinfo/America/Santa_Isabel.ics (new) | 107 +++++++ .../zoneinfo/America/Santarem.ics (new) | 70 +++++ .../zoneinfo/America/Santiago.ics (new) | 210 +++++++++++++ .../zoneinfo/America/Santo_Domingo.ics (new) | 68 +++++ .../zoneinfo/America/Sao_Paulo.ics (new) | 152 ++++++++++ .../zoneinfo/America/Scoresbysund.ics (new) | 72 +++++ web/tzurl/zoneinfo/America/Sitka.ics (new) | 174 +++++++++++ .../zoneinfo/America/St_Barthelemy.ics (new) | 16 + .../zoneinfo/America/St_Johns.ics (new) | 269 +++++++++++++++++ .../zoneinfo/America/St_Kitts.ics (new) | 16 + .../zoneinfo/America/St_Lucia.ics (new) | 23 ++ .../zoneinfo/America/St_Thomas.ics (new) | 16 + .../zoneinfo/America/St_Vincent.ics (new) | 23 ++ .../zoneinfo/America/Swift_Current.ics (new) | 75 +++++ .../zoneinfo/America/Tegucigalpa.ics (new) | 34 +++ web/tzurl/zoneinfo/America/Thule.ics (new) | 74 +++++ .../zoneinfo/America/Thunder_Bay.ics (new) | 146 +++++++++ web/tzurl/zoneinfo/America/Tijuana.ics (new) | 165 ++++++++++ web/tzurl/zoneinfo/America/Toronto.ics (new) | 233 ++++++++++++++ web/tzurl/zoneinfo/America/Tortola.ics (new) | 16 + .../zoneinfo/America/Vancouver.ics (new) | 188 ++++++++++++ .../zoneinfo/America/Whitehorse.ics (new) | 154 ++++++++++ .../zoneinfo/America/Winnipeg.ics (new) | 184 +++++++++++ web/tzurl/zoneinfo/America/Yakutat.ics (new) | 168 ++++++++++ .../zoneinfo/America/Yellowknife.ics (new) | 132 ++++++++ .../zoneinfo/Antarctica/Casey.ics (new) | 30 ++ .../zoneinfo/Antarctica/Davis.ics (new) | 38 +++ .../Antarctica/DumontDUrville.ics (new) | 30 ++ .../zoneinfo/Antarctica/Macquarie.ics (new) | 142 +++++++++ .../zoneinfo/Antarctica/Mawson.ics (new) | 23 ++ .../zoneinfo/Antarctica/McMurdo.ics (new) | 108 +++++++ .../zoneinfo/Antarctica/Palmer.ics (new) | 119 ++++++++ .../zoneinfo/Antarctica/Rothera.ics (new) | 16 + .../zoneinfo/Antarctica/South_Pole.ics (new) | 108 +++++++ .../zoneinfo/Antarctica/Syowa.ics (new) | 16 + .../zoneinfo/Antarctica/Vostok.ics (new) | 16 + .../zoneinfo/Arctic/Longyearbyen.ics (new) | 90 ++++++ web/tzurl/zoneinfo/Asia/Aden.ics (new) | 16 + web/tzurl/zoneinfo/Asia/Almaty.ics (new) | 90 ++++++ web/tzurl/zoneinfo/Asia/Amman.ics (new) | 92 ++++++ web/tzurl/zoneinfo/Asia/Anadyr.ics (new) | 133 ++++++++ web/tzurl/zoneinfo/Asia/Aqtau.ics (new) | 144 +++++++++ web/tzurl/zoneinfo/Asia/Aqtobe.ics (new) | 120 ++++++++ web/tzurl/zoneinfo/Asia/Ashgabat.ics (new) | 83 +++++ web/tzurl/zoneinfo/Asia/Baghdad.ics (new) | 87 ++++++ web/tzurl/zoneinfo/Asia/Bahrain.ics (new) | 23 ++ web/tzurl/zoneinfo/Asia/Baku.ics (new) | 120 ++++++++ web/tzurl/zoneinfo/Asia/Bangkok.ics (new) | 23 ++ web/tzurl/zoneinfo/Asia/Beirut.ics (new) | 98 ++++++ web/tzurl/zoneinfo/Asia/Bishkek.ics (new) | 109 +++++++ web/tzurl/zoneinfo/Asia/Brunei.ics (new) | 23 ++ web/tzurl/zoneinfo/Asia/Choibalsan.ics (new) | 91 ++++++ web/tzurl/zoneinfo/Asia/Chongqing.ics (new) | 47 +++ web/tzurl/zoneinfo/Asia/Colombo.ics (new) | 65 ++++ web/tzurl/zoneinfo/Asia/Damascus.ics (new) | 135 +++++++++ web/tzurl/zoneinfo/Asia/Dhaka.ics (new) | 66 ++++ web/tzurl/zoneinfo/Asia/Dili.ics (new) | 44 +++ web/tzurl/zoneinfo/Asia/Dubai.ics (new) | 16 + web/tzurl/zoneinfo/Asia/Dushanbe.ics (new) | 69 +++++ web/tzurl/zoneinfo/Asia/Gaza.ics (new) | 157 ++++++++++ web/tzurl/zoneinfo/Asia/Harbin.ics (new) | 62 ++++ .../zoneinfo/Asia/Ho_Chi_Minh.ics (new) | 37 +++ web/tzurl/zoneinfo/Asia/Hong_Kong.ics (new) | 109 +++++++ web/tzurl/zoneinfo/Asia/Hovd.ics (new) | 79 +++++ web/tzurl/zoneinfo/Asia/Irkutsk.ics (new) | 122 ++++++++ web/tzurl/zoneinfo/Asia/Istanbul.ics (new) | 194 ++++++++++++ web/tzurl/zoneinfo/Asia/Jakarta.ics (new) | 65 ++++ web/tzurl/zoneinfo/Asia/Jayapura.ics (new) | 30 ++ web/tzurl/zoneinfo/Asia/Jerusalem.ics (new) | 188 ++++++++++++ web/tzurl/zoneinfo/Asia/Kabul.ics (new) | 23 ++ web/tzurl/zoneinfo/Asia/Kamchatka.ics (new) | 109 +++++++ web/tzurl/zoneinfo/Asia/Karachi.ics (new) | 62 ++++ web/tzurl/zoneinfo/Asia/Kashgar.ics (new) | 54 ++++ web/tzurl/zoneinfo/Asia/Kathmandu.ics (new) | 23 ++ web/tzurl/zoneinfo/Asia/Kolkata.ics (new) | 38 +++ .../zoneinfo/Asia/Krasnoyarsk.ics (new) | 115 +++++++ .../zoneinfo/Asia/Kuala_Lumpur.ics (new) | 65 ++++ web/tzurl/zoneinfo/Asia/Kuching.ics (new) | 70 +++++ web/tzurl/zoneinfo/Asia/Kuwait.ics (new) | 16 + web/tzurl/zoneinfo/Asia/Macau.ics (new) | 75 +++++ web/tzurl/zoneinfo/Asia/Magadan.ics (new) | 115 +++++++ web/tzurl/zoneinfo/Asia/Makassar.ics (new) | 37 +++ web/tzurl/zoneinfo/Asia/Manila.ics (new) | 49 +++ web/tzurl/zoneinfo/Asia/Muscat.ics (new) | 16 + web/tzurl/zoneinfo/Asia/Nicosia.ics (new) | 96 ++++++ .../zoneinfo/Asia/Novokuznetsk.ics (new) | 127 ++++++++ .../zoneinfo/Asia/Novosibirsk.ics (new) | 122 ++++++++ web/tzurl/zoneinfo/Asia/Omsk.ics (new) | 115 +++++++ web/tzurl/zoneinfo/Asia/Oral.ics (new) | 144 +++++++++ web/tzurl/zoneinfo/Asia/Phnom_Penh.ics (new) | 37 +++ web/tzurl/zoneinfo/Asia/Pontianak.ics (new) | 65 ++++ web/tzurl/zoneinfo/Asia/Pyongyang.ics (new) | 45 +++ web/tzurl/zoneinfo/Asia/Qatar.ics (new) | 23 ++ web/tzurl/zoneinfo/Asia/Qyzylorda.ics (new) | 133 ++++++++ web/tzurl/zoneinfo/Asia/Rangoon.ics (new) | 37 +++ web/tzurl/zoneinfo/Asia/Riyadh.ics (new) | 16 + web/tzurl/zoneinfo/Asia/Sakhalin.ics (new) | 128 ++++++++ web/tzurl/zoneinfo/Asia/Samarkand.ics (new) | 89 ++++++ web/tzurl/zoneinfo/Asia/Seoul.ics (new) | 70 +++++ web/tzurl/zoneinfo/Asia/Shanghai.ics (new) | 51 ++++ web/tzurl/zoneinfo/Asia/Singapore.ics (new) | 72 +++++ web/tzurl/zoneinfo/Asia/Taipei.ics (new) | 68 +++++ web/tzurl/zoneinfo/Asia/Tashkent.ics (new) | 83 +++++ web/tzurl/zoneinfo/Asia/Tbilisi.ics (new) | 160 ++++++++++ web/tzurl/zoneinfo/Asia/Tehran.ics (new) | 157 ++++++++++ web/tzurl/zoneinfo/Asia/Thimphu.ics (new) | 23 ++ web/tzurl/zoneinfo/Asia/Tokyo.ics (new) | 50 +++ .../zoneinfo/Asia/Ulaanbaatar.ics (new) | 79 +++++ web/tzurl/zoneinfo/Asia/Urumqi.ics (new) | 47 +++ web/tzurl/zoneinfo/Asia/Vientiane.ics (new) | 37 +++ .../zoneinfo/Asia/Vladivostok.ics (new) | 115 +++++++ web/tzurl/zoneinfo/Asia/Yakutsk.ics (new) | 115 +++++++ .../zoneinfo/Asia/Yekaterinburg.ics (new) | 133 ++++++++ web/tzurl/zoneinfo/Asia/Yerevan.ics (new) | 111 +++++++ web/tzurl/zoneinfo/Atlantic/Azores.ics (new) | 224 ++++++++++++++ .../zoneinfo/Atlantic/Bermuda.ics (new) | 115 +++++++ web/tzurl/zoneinfo/Atlantic/Canary.ics (new) | 73 +++++ .../zoneinfo/Atlantic/Cape_Verde.ics (new) | 37 +++ web/tzurl/zoneinfo/Atlantic/Faroe.ics (new) | 58 ++++ .../zoneinfo/Atlantic/Madeira.ics (new) | 202 +++++++++++++ .../zoneinfo/Atlantic/Reykjavik.ics (new) | 104 +++++++ .../Atlantic/South_Georgia.ics (new) | 16 + .../zoneinfo/Atlantic/St_Helena.ics (new) | 23 ++ .../zoneinfo/Atlantic/Stanley.ics (new) | 131 ++++++++ .../zoneinfo/Australia/Adelaide.ics (new) | 137 +++++++++ .../zoneinfo/Australia/Brisbane.ics (new) | 51 ++++ .../zoneinfo/Australia/Currie.ics (new) | 130 ++++++++ .../zoneinfo/Australia/Darwin.ics (new) | 43 +++ web/tzurl/zoneinfo/Australia/Eucla.ics (new) | 53 ++++ .../zoneinfo/Australia/Hobart.ics (new) | 138 +++++++++ .../zoneinfo/Australia/Lindeman.ics (new) | 56 ++++ .../zoneinfo/Australia/Lord_Howe.ics (new) | 114 +++++++ .../zoneinfo/Australia/Melbourne.ics (new) | 130 ++++++++ web/tzurl/zoneinfo/Australia/Perth.ics (new) | 53 ++++ .../zoneinfo/Australia/Sydney.ics (new) | 130 ++++++++ .../zoneinfo/Europe/Amsterdam.ics (new) | 165 ++++++++++ web/tzurl/zoneinfo/Europe/Andorra.ics (new) | 54 ++++ web/tzurl/zoneinfo/Europe/Athens.ics (new) | 117 +++++++ web/tzurl/zoneinfo/Europe/Belgrade.ics (new) | 71 +++++ web/tzurl/zoneinfo/Europe/Berlin.ics (new) | 105 +++++++ .../zoneinfo/Europe/Bratislava.ics (new) | 97 ++++++ web/tzurl/zoneinfo/Europe/Brussels.ics (new) | 165 ++++++++++ .../zoneinfo/Europe/Bucharest.ics (new) | 110 +++++++ web/tzurl/zoneinfo/Europe/Budapest.ics (new) | 103 +++++++ web/tzurl/zoneinfo/Europe/Chisinau.ics (new) | 162 ++++++++++ .../zoneinfo/Europe/Copenhagen.ics (new) | 89 ++++++ web/tzurl/zoneinfo/Europe/Dublin.ics (new) | 202 +++++++++++++ .../zoneinfo/Europe/Gibraltar.ics (new) | 172 +++++++++++ web/tzurl/zoneinfo/Europe/Guernsey.ics (new) | 209 +++++++++++++ web/tzurl/zoneinfo/Europe/Helsinki.ics (new) | 75 +++++ .../zoneinfo/Europe/Isle_of_Man.ics (new) | 209 +++++++++++++ web/tzurl/zoneinfo/Europe/Istanbul.ics (new) | 194 ++++++++++++ web/tzurl/zoneinfo/Europe/Jersey.ics (new) | 209 +++++++++++++ .../zoneinfo/Europe/Kaliningrad.ics (new) | 165 ++++++++++ web/tzurl/zoneinfo/Europe/Kiev.ics (new) | 138 +++++++++ web/tzurl/zoneinfo/Europe/Lisbon.ics (new) | 228 ++++++++++++++ .../zoneinfo/Europe/Ljubljana.ics (new) | 71 +++++ web/tzurl/zoneinfo/Europe/London.ics (new) | 209 +++++++++++++ .../zoneinfo/Europe/Luxembourg.ics (new) | 156 ++++++++++ web/tzurl/zoneinfo/Europe/Madrid.ics (new) | 137 +++++++++ web/tzurl/zoneinfo/Europe/Malta.ics (new) | 118 ++++++++ .../zoneinfo/Europe/Mariehamn.ics (new) | 75 +++++ web/tzurl/zoneinfo/Europe/Minsk.ics (new) | 130 ++++++++ web/tzurl/zoneinfo/Europe/Monaco.ics (new) | 164 ++++++++++ web/tzurl/zoneinfo/Europe/Moscow.ics (new) | 182 +++++++++++ web/tzurl/zoneinfo/Europe/Nicosia.ics (new) | 96 ++++++ web/tzurl/zoneinfo/Europe/Oslo.ics (new) | 90 ++++++ web/tzurl/zoneinfo/Europe/Paris.ics (new) | 169 +++++++++++ .../zoneinfo/Europe/Podgorica.ics (new) | 71 +++++ web/tzurl/zoneinfo/Europe/Prague.ics (new) | 97 ++++++ web/tzurl/zoneinfo/Europe/Riga.ics (new) | 168 ++++++++++ web/tzurl/zoneinfo/Europe/Rome.ics (new) | 132 ++++++++ web/tzurl/zoneinfo/Europe/Samara.ics (new) | 158 ++++++++++ .../zoneinfo/Europe/San_Marino.ics (new) | 132 ++++++++ web/tzurl/zoneinfo/Europe/Sarajevo.ics (new) | 71 +++++ .../zoneinfo/Europe/Simferopol.ics (new) | 151 +++++++++ web/tzurl/zoneinfo/Europe/Skopje.ics (new) | 71 +++++ web/tzurl/zoneinfo/Europe/Sofia.ics (new) | 131 ++++++++ .../zoneinfo/Europe/Stockholm.ics (new) | 75 +++++ web/tzurl/zoneinfo/Europe/Tallinn.ics (new) | 161 ++++++++++ web/tzurl/zoneinfo/Europe/Uzhgorod.ics (new) | 147 +++++++++ web/tzurl/zoneinfo/Europe/Vaduz.ics (new) | 58 ++++ web/tzurl/zoneinfo/Europe/Vatican.ics (new) | 132 ++++++++ web/tzurl/zoneinfo/Europe/Vienna.ics (new) | 90 ++++++ web/tzurl/zoneinfo/Europe/Vilnius.ics (new) | 171 +++++++++++ .../zoneinfo/Europe/Volgograd.ics (new) | 133 ++++++++ web/tzurl/zoneinfo/Europe/Warsaw.ics (new) | 153 ++++++++++ web/tzurl/zoneinfo/Europe/Zagreb.ics (new) | 71 +++++ .../zoneinfo/Europe/Zaporozhye.ics (new) | 139 +++++++++ web/tzurl/zoneinfo/Europe/Zurich.ics (new) | 75 +++++ .../zoneinfo/Indian/Antananarivo.ics (new) | 30 ++ web/tzurl/zoneinfo/Indian/Chagos.ics (new) | 23 ++ .../zoneinfo/Indian/Christmas.ics (new) | 16 + web/tzurl/zoneinfo/Indian/Cocos.ics (new) | 16 + web/tzurl/zoneinfo/Indian/Comoro.ics (new) | 16 + .../zoneinfo/Indian/Kerguelen.ics (new) | 16 + web/tzurl/zoneinfo/Indian/Mahe.ics (new) | 16 + web/tzurl/zoneinfo/Indian/Maldives.ics (new) | 23 ++ .../zoneinfo/Indian/Mauritius.ics (new) | 32 ++ web/tzurl/zoneinfo/Indian/Mayotte.ics (new) | 16 + web/tzurl/zoneinfo/Indian/Reunion.ics (new) | 16 + web/tzurl/zoneinfo/Pacific/Apia.ics (new) | 44 +++ .../zoneinfo/Pacific/Auckland.ics (new) | 166 ++++++++++ web/tzurl/zoneinfo/Pacific/Chatham.ics (new) | 108 +++++++ web/tzurl/zoneinfo/Pacific/Chuuk.ics (new) | 16 + web/tzurl/zoneinfo/Pacific/Easter.ics (new) | 171 +++++++++++ web/tzurl/zoneinfo/Pacific/Efate.ics (new) | 48 +++ .../zoneinfo/Pacific/Enderbury.ics (new) | 30 ++ web/tzurl/zoneinfo/Pacific/Fakaofo.ics (new) | 16 + web/tzurl/zoneinfo/Pacific/Fiji.ics (new) | 36 +++ .../zoneinfo/Pacific/Funafuti.ics (new) | 16 + .../zoneinfo/Pacific/Galapagos.ics (new) | 23 ++ web/tzurl/zoneinfo/Pacific/Gambier.ics (new) | 16 + .../zoneinfo/Pacific/Guadalcanal.ics (new) | 16 + web/tzurl/zoneinfo/Pacific/Guam.ics (new) | 30 ++ .../zoneinfo/Pacific/Honolulu.ics (new) | 39 +++ .../zoneinfo/Pacific/Johnston.ics (new) | 16 + .../zoneinfo/Pacific/Kiritimati.ics (new) | 30 ++ web/tzurl/zoneinfo/Pacific/Kosrae.ics (new) | 30 ++ .../zoneinfo/Pacific/Kwajalein.ics (new) | 30 ++ web/tzurl/zoneinfo/Pacific/Majuro.ics (new) | 23 ++ .../zoneinfo/Pacific/Marquesas.ics (new) | 16 + web/tzurl/zoneinfo/Pacific/Midway.ics (new) | 44 +++ web/tzurl/zoneinfo/Pacific/Nauru.ics (new) | 37 +++ web/tzurl/zoneinfo/Pacific/Niue.ics (new) | 30 ++ web/tzurl/zoneinfo/Pacific/Norfolk.ics (new) | 23 ++ web/tzurl/zoneinfo/Pacific/Noumea.ics (new) | 34 +++ .../zoneinfo/Pacific/Pago_Pago.ics (new) | 44 +++ web/tzurl/zoneinfo/Pacific/Palau.ics (new) | 16 + .../zoneinfo/Pacific/Pitcairn.ics (new) | 23 ++ web/tzurl/zoneinfo/Pacific/Pohnpei.ics (new) | 16 + web/tzurl/zoneinfo/Pacific/Ponape.ics (new) | 16 + .../zoneinfo/Pacific/Port_Moresby.ics (new) | 23 ++ .../zoneinfo/Pacific/Rarotonga.ics (new) | 60 ++++ web/tzurl/zoneinfo/Pacific/Saipan.ics (new) | 37 +++ web/tzurl/zoneinfo/Pacific/Tahiti.ics (new) | 16 + web/tzurl/zoneinfo/Pacific/Tarawa.ics (new) | 16 + .../zoneinfo/Pacific/Tongatapu.ics (new) | 48 +++ web/tzurl/zoneinfo/Pacific/Truk.ics (new) | 16 + web/tzurl/zoneinfo/Pacific/Wake.ics (new) | 16 + web/tzurl/zoneinfo/Pacific/Wallis.ics (new) | 16 + 827 files changed, 42405 insertions(+), 20 deletions(-) commit 8606a9d3e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 28 09:33:00 2011 +0000 Made the week numbers and months in the mini calendars into links, following a suggestion by Marco Tedaldi. At the same time simplified the code used elsewhere in MRBS to make sure that a date is valid. web/mincals.inc | 463 +++++++++++++++++++++++---------------------- web/month.php | 21 +- web/mrbs_sql.inc | 8 +- web/trailer.inc | 7 +- 4 files changed, 247 insertions(+), 252 deletions(-) commit 71c76d19c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 27 13:14:25 2011 +0000 Allowed entries to be deleted even if they are longer than the max_duration or beyond the max_book_ahead date. Following suggestion from Marco Tedaldi web/areadefaults.inc.php | 5 ++++- web/mrbs_sql.inc | 17 +++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) commit 37c57f43e Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jul 22 21:33:38 2011 +0000 Fixed auth_ext authentication for users or passwords that contain a $ character followed by a number. Tracked down via a discussion on the mailing list. web/auth_ext.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit d1eb8214c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 19 22:48:40 2011 +0000 Updated comment web/functions_ical.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 62ebb26b0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 18 21:35:18 2011 +0000 Updated comment explaining (but not solving!) a bug whereby repeat events will be imported into Outlook when using Exchange 2007 with the wrong time (the UTC time interpreted as a local time). See also SF ID: 3324122. web/functions_ical.inc | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) commit beefff115 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 14 10:44:13 2011 +0000 Added comment web/functions_ical.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit 271fb4e74 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 14 09:23:58 2011 +0000 Fixed bug that meant that '0' was treated as an invalid search string web/Themes/default/header.inc | 2 +- web/search.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit 101625941 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 14 09:03:31 2011 +0000 Fixed bug that resulted in a PHP warning when a custom field with $select_options was left empty in the report form web/report.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 95aaa3635 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 14 08:54:56 2011 +0000 Moved position of $select_options initialisation so that it comes before the commented examples (just in case somebody puts their options in the same place) web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 78ef0e289 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jul 13 20:15:22 2011 +0000 Updated version number post-release. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1cd27432b (tag: mrbs-1_4_7) Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jul 13 20:13:03 2011 +0000 Updated NEWS and ChangeLog for 1.4.7 release. ChangeLog | 404 ++++++++++++++++++++++++++++++++++++++++++++++++++++ NEWS | 72 ++++++++++ 2 files changed, 476 insertions(+) commit c694c29e0 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jul 13 19:52:31 2011 +0000 * Updated version number to 1.4.7. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b55908347 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jul 13 19:46:49 2011 +0000 * A fix for use an uninitialised array in Themes/default/header.inc, as reported (and fix provided) by Henry Thompson on the mailing list. web/systemdefaults.inc.php | 1 + 1 file changed, 1 insertion(+) commit 9318d4d36 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jul 13 19:39:30 2011 +0000 * Added two new auth methods, 'crypt' and 'auth_basic'. The former uses PHP's crypt() function to interpret a password file. The other uses the PEAR package File_Passwd to interpret an "auth basic" file, like one created by Apache's htpasswd programme. Neither are documented in AUTHENTICATION yet. web/File/Passwd.php (new) | 416 ++++++++++++++++ web/File/Passwd/Authbasic.php (new) | 396 +++++++++++++++ web/File/Passwd/Authdigest.php (new) | 362 ++++++++++++++ web/File/Passwd/Common.php (new) | 382 ++++++++++++++ web/File/Passwd/Custom.php (new) | 593 ++++++++++++++++++++++ web/File/Passwd/Cvs.php (new) | 304 ++++++++++++ web/File/Passwd/Smb.php (new) | 426 ++++++++++++++++ web/File/Passwd/Unix.php (new) | 660 +++++++++++++++++++++++++ web/auth_auth_basic.inc (new) | 109 ++++ web/auth_crypt.inc (new) | 104 ++++ 10 files changed, 3752 insertions(+) commit 162cf9072 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 21 18:36:27 2011 +0000 If we're sending iCalendar notifications, then it seems that some calendar applications use the email subject as the booking title instead of the iCal SUMMARY field. As far as I can see this is wrong, but as a circumvention we'll put the booking title in the email subject line instead of the standard subject. (See also SF Tracker id 3297799) web/functions_mail.inc | 67 +++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 22 deletions(-) commit b19b41d57 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 21 15:01:31 2011 +0000 Implemented an optional limit on the maximum length of a booking for non-admins. At the moment it is a global limit rather than per-area. It also does not yet prevent invalid booking lengths being shown in the edit_entry form. web/edit_entry_handler.php | 17 ++++++----- web/lang.en | 15 ++++----- web/mrbs_sql.inc | 59 +++++++++++++++++++++++++++++------- web/systemdefaults.inc.php | 9 +++++- 4 files changed, 73 insertions(+), 27 deletions(-) commit 456f756b6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 21 08:51:00 2011 +0000 - On the Report page, converted input fields into auto-complete fields for custom fields that have select_options defined - For custom fields allowed $select_options to be an associative array, thus making it easy to change the displayed value without having to change the database. (See SF #3315966) INSTALL | 14 +++++++++ web/Themes/default/header.inc | 54 +++++++++++++++++++++------------ web/dbsys.inc | 30 +++++++++++++++++- web/edit_users.php | 10 +++++- web/functions.inc | 36 +++++++++++++++++----- web/functions_mail.inc | 14 ++++++++- web/functions_view.inc | 20 +++++++++++- web/report.php | 42 +++++++++++++++++++++++-- web/search.php | 20 ++++++++++-- web/systemdefaults.inc.php | 16 +++++++++- 10 files changed, 220 insertions(+), 36 deletions(-) commit b0b862b5c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jun 8 10:31:11 2011 +0000 Fixed bug that caused durations to be formatted incorrectly in some languages (eg German). See SF tracker #3313655. web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 773ef6fe0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 26 11:36:17 2011 +0000 Fixed bug which meant that a user logging in with an upper case version of his name (eg "John" instead of "john" was denied access to some pages in MySQL when the collation of the username field is set to binary and PostgreSQL always) web/auth_db.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6bb5e5c34 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 26 09:05:58 2011 +0000 Fixed bug preventing a room name being changed when only the case of letters in the name was being changed. web/dbsys.inc | 23 +++++++++++++++++++++++ web/edit_area_room.php | 7 ++++++- web/mysql.inc | 9 +++++++++ web/mysqli.inc | 9 +++++++++ web/pgsql.inc | 9 +++++++++ 5 files changed, 56 insertions(+), 1 deletion(-) commit a7971c03c Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed May 18 16:17:01 2011 +0000 * LDAP authentication change to fix (particular) configurations using $ldap_filter. Patch provided by rudd_j in SF tracker #3299258. web/auth_ldap.inc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) commit dd50db6d3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 14 11:01:24 2011 +0000 Added an option to report.php to summarize by type. Thamks to a patch submitted by Thomas Bleher. web/lang.de | 1 + web/lang.en | 1 + web/report.php | 43 ++++++++++++++++++++++++++++++++++++------- 3 files changed, 38 insertions(+), 7 deletions(-) commit 494435608 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 14 10:15:57 2011 +0000 Added lang.en as the fall-back language, in order that something is shown even when the $default_language_tokens file does not have a translated token. Based on a patch by Thomas Bleher. web/language.inc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) commit 8b019cfa7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat May 14 09:37:11 2011 +0000 Extracted the per-area default settings from systemdefaults and put them into a new file, areadefaults.inc.php, to make it more obvious that these are the default settings for new areas and will have no effect on existing areas. INSTALL | 31 +++-- web/areadefaults.inc.php (new) | 194 +++++++++++++++++++++++++++++++ web/config.inc.php | 6 +- web/defaultincludes.inc | 1 + web/mrbs_auth.inc | 2 +- web/systemdefaults.inc.php | 174 ++++++--------------------- 6 files changed, 253 insertions(+), 155 deletions(-) commit b0d00776b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri May 13 10:19:59 2011 +0000 Added some email debug information to help diagnose problems when sending emails. web/functions_mail.inc | 44 ++++++++++++++++++++++++++++++++++++ web/systemdefaults.inc.php | 7 +++++- 2 files changed, 50 insertions(+), 1 deletion(-) commit f58467919 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu May 5 19:47:45 2011 +0000 Clarified documention in auth_ext.php a little web/auth_ext.inc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) commit 44852cb51 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue May 3 08:48:28 2011 +0000 Added missing entries based on SF tracker #3293801 web/lang.de | 2 ++ 1 file changed, 2 insertions(+) commit 03a2e3526 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue May 3 08:32:56 2011 +0000 Removed unnecessary class attribute web/trailer.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1b1495e04 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue May 3 08:12:47 2011 +0000 Removed unnecessary <span>. Thanks to patch from Thomas Bleher. web/trailer.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit f1d820ef8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 20 14:52:28 2011 +0000 Changed encoding of mail messages from 7bit to 8bit web/functions_mail.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit af0626314 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 20 14:33:58 2011 +0000 Changed the encoding of the text calendar to base64 so that Postfix will preserve CRLF sequences (which are mandatory terminators according to RFC 5545). Thanks to Thomas Bleher for the patch. web/functions_mail.inc | 3 +++ 1 file changed, 3 insertions(+) commit aebdd5b87 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 15 17:55:40 2011 +0000 Added an option to make the default duration All Day tables.my.pre41.sql | 51 ++++++++++++++++---------------- tables.my.sql | 51 ++++++++++++++++---------------- tables.pg.pre73.sql | 51 ++++++++++++++++---------------- tables.pg.sql | 51 ++++++++++++++++---------------- web/Themes/default/header.inc | 22 +++++++++++--- web/dbsys.inc | 2 +- web/edit_area_room.php | 9 ++++++ web/functions.inc | 6 ++-- web/internalconfig.inc.php | 42 +++++++++++++------------- web/mrbs.css.php | 3 +- web/systemdefaults.inc.php | 5 ++++ web/upgrade/27/mysql.sql (new) | 6 ++++ web/upgrade/27/pgsql.sql (new) | 7 +++++ 13 files changed, 178 insertions(+), 128 deletions(-) commit ca414a3b4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 15 17:40:49 2011 +0000 Fixed bug introduced in Rev 1814 that caused the time selectors on the edit_entry form not to be displayed properly web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e4859bc27 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 15 07:38:08 2011 +0000 Updated comments following Rev 1813 web/Themes/default/header.inc | 2 ++ 1 file changed, 2 insertions(+) commit 04a8ee73e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 12 13:50:08 2011 +0000 - Tidied up the code - Changed the way IE6 conditional comments are used in the last revision to avoid HTML validation errors web/Themes/default/header.inc | 46 +++++++++++++++------------------ 1 file changed, 21 insertions(+), 25 deletions(-) commit 7c3f56d95 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 12 13:38:38 2011 +0000 Made the inputs for Match Area and Match Room on the Report page into autocomplete fields, meaning that you can either choose from a list of areas or rooms or else enter your own text. (As well as saving typing if you want a particular area or room it also has the added advantage of letting you see in advance what the results of a match would be). Not supported in IE6 and below as the autocomplete box doesn't render properly. web/Themes/default/header.inc | 91 +++++++++++++++++ ...i-bg_diagonals-medium_20_d34d17_40x40.png | Bin 247 -> 199 bytes .../ui-bg_gloss-wave_70_ffdd57_500x100.png | Bin 3122 -> 3830 bytes .../sunny/images/ui-icons_d19405_256x240.png | Bin 4369 -> 5355 bytes .../sunny/images/ui-icons_eb990f_256x240.png | Bin 5355 -> 4369 bytes .../sunny/images/ui-icons_ffe180_256x240.png | Bin 5355 -> 4369 bytes .../ui/css/sunny/jquery-ui-1.8.11.custom.css | 53 ++++++++++ web/jquery/ui/jquery-ui-1.8.11.custom.min.js | 48 +++++++++ web/mrbs.css.php | 12 +++ web/systemdefaults.inc.php | 13 ++- 10 files changed, 216 insertions(+), 1 deletion(-) commit 3656dce5e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 11 13:32:09 2011 +0000 Removed the explicit Norwegian datepicker initialisation as it has now been incorporated by the jQuery UI team in the standard product. web/Themes/default/header.inc | 5 ---- .../ui/jquery-ui-datepicker-no.js (gone) | 25 ------------------ 2 files changed, 30 deletions(-) commit 234bdb3cb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 11 13:22:24 2011 +0000 Removed the explicit en-AU and en-NZ datepicker initialisations as they have now been incorporated by the jQuery UI team in the standard product. web/Themes/default/header.inc | 7 +---- .../ui/jquery-ui-datepicker-en-AU.js (gone) | 24 ------------------ .../ui/jquery-ui-datepicker-en-NZ.js (gone) | 24 ------------------ 3 files changed, 1 insertion(+), 54 deletions(-) commit b6ab13468 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 11 13:13:03 2011 +0000 Upgraded to jQuery UI 1.8.11 web/Themes/default/header.inc | 2 +- ...i-bg_diagonals-medium_20_d34d17_40x40.png | Bin 199 -> 247 bytes .../ui-bg_gloss-wave_60_fece2f_500x100.png | Bin 4075 -> 3512 bytes .../sunny/images/ui-icons_eb990f_256x240.png | Bin 4369 -> 5355 bytes .../sunny/images/ui-icons_fadc7a_256x240.png | Bin 5355 -> 4369 bytes ...ustom.css => jquery-ui-1.8.11.custom.css} | 16 +- .../ui/jquery-ui-1.8.11.custom.min.js (new) | 182 ++++++++++++++ .../ui/jquery-ui-1.8.6.custom.min.js (gone) | 179 ------------- web/jquery/ui/jquery-ui-i18n.js | 221 +++++++++++++---- web/style.inc | 2 +- 10 files changed, 371 insertions(+), 231 deletions(-) commit d80c0ac35 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Apr 11 11:37:46 2011 +0000 Upgraded to jQuery 1.5.2 web/Themes/default/header.inc | 2 +- web/jquery/jquery-1.4.2.min.js (gone) | 154 ------------------------ web/jquery/jquery-1.5.2.min.js (new) | 16 +++ 3 files changed, 17 insertions(+), 155 deletions(-) commit 26e3c6b8a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 30 07:52:48 2011 +0000 Fixed bug causing custom fields not to be reported properly in delete email notifications web/edit_entry_handler.php | 5 ++++- web/functions_mail.inc | 2 +- web/mrbs_sql.inc | 8 ++++---- 3 files changed, 9 insertions(+), 6 deletions(-) commit 163550059 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 27 22:14:24 2011 +0000 Fixed a problem whereby the range of the time selectors was an hour out if you tried to make a booking for a DST changeover day (the booking was being made for the requested time, but the selectors prevented you from choosing the first/last hour of the booking day). [ In the process also removed a couple of instances of the use of the deprecated is_dst parameter to mktime() ] web/edit_entry.php | 18 ++++++++++++++---- web/edit_entry_handler.php | 13 ++++++------- 2 files changed, 20 insertions(+), 11 deletions(-) commit f6853fe72 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Mar 26 15:04:06 2011 +0000 * Hopefully clarified config.inc.php a little more. web/config.inc.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit dbb2e7846 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 16 08:03:58 2011 +0000 Removed reference to INSTALL file for further details on setting up email notifications (as there are none!) web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f02cfd401 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 15 16:42:17 2011 +0000 Removed a type which had accidentally got into the trunk during testing web/systemdefaults.inc.php | 1 - 1 file changed, 1 deletion(-) commit f20c5904e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 14 14:37:57 2011 +0000 Fixed a bug whereby the trailer wasn't being displayed properly in the case of a fatal error. web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c9a1d9134 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 14 14:23:46 2011 +0000 Fixed a bug whereby the header wasn't displayed in some circumstances (eg view an entry unlogged in, then log in and reject the entry) web/mrbs_sql.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 51fe72260 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Mar 9 17:00:09 2011 +0000 * Updated Spanish translation provided by Jose Luis Martin Jimenez. web/lang.es | 97 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 37 deletions(-) commit bd2cbb5a5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 3 10:29:59 2011 +0000 Fixed client side validation to check for mandatory custom checkbox inputs. INSTALL | 5 +++++ web/edit_entry.php | 8 +++++++- web/systemdefaults.inc.php | 5 +++-- 3 files changed, 15 insertions(+), 3 deletions(-) commit 8d12840cd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 1 09:53:06 2011 +0000 Fixed bug whereby the approval status in the repeat table wasn't being set properly. web/upgrade/17/post.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e4c0ea782 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 1 09:11:18 2011 +0000 Improved error reporting in previous change web/upgrade/17/post.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit 381e06916 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 1 08:45:29 2011 +0000 Added some error reporting to upgrade 17 web/upgrade/17/post.inc | 4 ++++ 1 file changed, 4 insertions(+) commit 8b7c8d6be Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 28 20:02:21 2011 +0000 Removed redundant global declaration web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 702dc0acf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 24 09:20:08 2011 +0000 Added some error handling to the auth_db database queries web/auth_db.inc | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) commit 2696477cf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 23 09:30:43 2011 +0000 Fixed incomplete php tag causing JavaScript errors on some systems web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 59ad4218f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 22 10:46:30 2011 +0000 Added a '/' to the list of characters escaped in JavaScript strings to prevent HTML validation errors being generated on the edit_entry page if there's a '/' in the room or area name. web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5801c1f77 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 22 10:26:03 2011 +0000 Removed the assumption that the key for the $typel array is a single character in the range 'A'..'Z', thus paving the way for increasing the number of meeting types allowed. web/edit_entry.php | 7 ++----- web/functions.inc | 25 +++++++++++-------------- web/systemdefaults.inc.php | 5 ++++- 3 files changed, 17 insertions(+), 20 deletions(-) commit 63daae422 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 17 15:13:04 2011 +0000 Fixed bug whereby the "You are <user>" link was not generating reports properly. web/report.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) commit 481dd2765 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Feb 11 22:51:15 2011 +0000 * Updated version number post-release. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5af8b07e0 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Feb 11 20:49:55 2011 +0000 * Fix from the mailing list so that custom fields are shown in the "view entry" screen. web/functions_view.inc | 1 + 1 file changed, 1 insertion(+) commit f58a8af22 (tag: mrbs-1_4_6) Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Feb 9 20:45:07 2011 +0000 * Updated NEWS and ChangeLog for 1.4.6 release. ChangeLog | 588 ++++++++++++++++++++++++++++++++++++++++++++++++++++ NEWS | 77 +++++++ 2 files changed, 665 insertions(+) commit 372260a04 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Feb 9 20:08:10 2011 +0000 * Updated version number for 1.4.6 release. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7fcec0440 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Feb 3 12:42:56 2011 +0000 * Updated Spanish translation received from Jose Luis Martin Jimenez. web/lang.es | 107 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 95 insertions(+), 12 deletions(-) commit e1dc84f88 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jan 31 16:56:27 2011 +0000 * Reverted one of the $PHP_SELF handling changes, which was unnecessary. web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7bda6f41d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 31 11:02:00 2011 +0000 Fixed an HTML validation error web/Themes/default/footer.inc | 3 --- 1 file changed, 3 deletions(-) commit dc3ed432d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 31 10:04:22 2011 +0000 Fixed bug introduced in Rev 1775, causing styling errors and lack of JavaScript functionality web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bcc28255e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jan 30 10:06:06 2011 +0000 Improved handling of SQL errors web/add.php | 6 ++++-- web/admin.php | 9 +++++++-- web/day.php | 6 ++++-- web/del.php | 5 +++-- web/edit_area_room.php | 11 ++++++++--- web/edit_entry.php | 6 ++++-- web/edit_entry_handler.php | 3 ++- web/edit_users.php | 3 +-- web/lang.en | 3 +++ web/month.php | 3 ++- web/mrbs_sql.inc | 11 ++++++++--- web/pending.php | 3 ++- web/report.php | 3 ++- web/search.php | 6 ++++-- web/week.php | 3 ++- 15 files changed, 56 insertions(+), 25 deletions(-) commit 16ccb6d01 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Jan 30 09:33:50 2011 +0000 * Fixed a few more HTML escaping issues, and rewrapped a few long lines. web/edit_entry.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) commit d9a3897a3 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Jan 30 08:18:37 2011 +0000 * Fixed a few more cases where things weren't correctly escaped. web/functions.inc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) commit e076914a1 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Jan 30 08:00:13 2011 +0000 * Fixed two more places where $PHP_SELF was used in HTML without being properly escaped. web/admin.php | 3 ++- web/view_entry.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) commit b2198d4a8 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jan 28 23:46:37 2011 +0000 * Fixed some XSS/escaping bugs reported by 'kevan_' in SF #3167226. web/Themes/default/header.inc | 6 +++--- web/session_php.inc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) commit 779738cbc Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jan 28 22:02:32 2011 +0000 * Possibly corrected the new locale selection logic from r1773. web/language.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit 807a0310c Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jan 28 21:54:16 2011 +0000 * Now chooses a determined locale wven if MRBS doesn't have a translation for that locale. It's better than nothing to get dates/times right. Reported by 'corn_kid' as SF #2934313. web/language.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit b80a74261 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jan 28 21:45:23 2011 +0000 * Implemented the ability to configure the default booking description with $default_description, as requested in SF #3001740. web/edit_entry.php | 2 +- web/systemdefaults.inc.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) commit ce951ce6f Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jan 28 21:33:34 2011 +0000 * Added the ability to specify a footer in the theme. Patch submitted by rudd_j in SF #3166889. web/Themes/default/footer.inc (new) | 15 +++++++++++++++ web/functions.inc | 8 ++++++++ 2 files changed, 23 insertions(+) commit 7d3107a1b Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jan 28 21:15:11 2011 +0000 * Added error logging into fatal_error(). Patch submitted by 'shallot' in SF #2955546. web/functions.inc | 7 +++++++ 1 file changed, 7 insertions(+) commit eb387a021 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jan 28 21:07:30 2011 +0000 * Coloured borders for booking types in the printing style sheet. Submitted by tuomas_ in SF #3003248. web/mrbs-print.css.php | 6 ++++++ 1 file changed, 6 insertions(+) commit 292b0310a Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jan 28 20:44:06 2011 +0000 * Made it so that you return to the right area after deleting a room. Based on a patch in SF #3019525. web/admin.php | 2 +- web/del.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit 47382a489 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jan 28 20:11:37 2011 +0000 * Removed a possible deprecation warning, SF #3165269. web/internalconfig.inc.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) commit 18d38c2f2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 28 09:52:37 2011 +0000 Fixed pending so that it can cope with mixed periods and times web/pending.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) commit 43630b0ee Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 28 09:42:18 2011 +0000 Fixed search so that it can handle mixed periods and times web/search.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) commit a05446af0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 28 09:40:18 2011 +0000 Fixed bug introduced in Rev 1756 web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 44b974544 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 28 09:17:06 2011 +0000 Fixed CSS error web/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 69d9c7ec1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 28 09:13:53 2011 +0000 Fixed summary table so that it can cope with mixed periods and times. web/lang.en | 1 + web/mrbs.css.php | 5 +- web/report.php | 309 ++++++++++++++++++++++++++++++++++----------- 3 files changed, 240 insertions(+), 75 deletions(-) commit 5e08b0d87 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 27 11:26:48 2011 +0000 Fixed bug whereby summaries were not sorted properly by name web/report.php | 50 ++++++++++++++++-------------------------------- 1 file changed, 17 insertions(+), 33 deletions(-) commit 310c9ea85 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 27 09:47:35 2011 +0000 Fixed bug whereby start and end times were incorrectly presented in reports when using mixed periods and times. web/report.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit 07a3371a5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 27 08:34:14 2011 +0000 Updated Upgrade documentation to reflect changes in Rev 1756 UPGRADE | 1 + 1 file changed, 1 insertion(+) commit 6310188c8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 27 08:12:02 2011 +0000 Clarified documentation on custom fields. INSTALL | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) commit 32238826d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 26 18:06:57 2011 +0000 Minor tweak to capitalisation web/lang.fr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 166fd7e9c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 26 17:17:35 2011 +0000 Removed hard-coded formats for strftime() and put them in systemdefaults in order to make it easier to tweak time and date formats to meet local expectations. web/day.php | 2 +- web/edit_area_room.php | 20 +++++++++---- web/edit_entry.php | 4 +-- web/functions.inc | 28 +++++++++++-------- web/functions_mail.inc | 12 ++++---- web/functions_view.inc | 6 +++- web/help.php | 4 ++- web/internalconfig.inc.php | 4 +++ web/language.inc | 4 +-- web/mincals.inc | 11 ++++---- web/month.php | 2 +- web/mrbs_sql.inc | 8 +++--- web/report.php | 54 ++++++++++-------------------------- web/systemdefaults.inc.php | 20 +++++++++++++ web/trailer.inc | 6 ++-- web/week.php | 12 ++------ 16 files changed, 103 insertions(+), 94 deletions(-) commit d79bb304f Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jan 26 16:12:45 2011 +0000 * Removed some stray tabs. UPGRADE | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) commit 427a8a3f4 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jan 26 16:08:43 2011 +0000 * Small documentation fix. INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4d3f7991f Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jan 26 16:04:51 2011 +0000 * Updated the MySQL table installation SQL files to utilise MySQL 4.1 features. A version for older versions of MySQL is retained tables.my.pre41.sql. * Added a warning when upgrading the database, to inform adninistrators that they may need to update their database to UTF-8 encoding, using the convert_db_to_utf8.php script. * Updated the INSTALL and UPGRADE documentation to match the new Unicode-only behaviour of MRBS, and to mention the new MySQL installation SQL files. * Improved the convert_db_to_utf8.php quite a bit. Updated the list of columns that need converting to UTF-8. Added support for converting the database collation in a MySQL MRBS database. INSTALL | 16 +- UPGRADE | 24 ++ convert_db_to_utf8.php | 417 +++++++++++++++++++++++++------ tables.my.pre41.sql (new) | 143 +++++++++++ tables.my.sql | 70 +++--- tables.pg.pre73.sql | 2 +- tables.pg.sql | 2 +- web/dbsys.inc | 2 +- web/upgrade/26/mysql.sql (new) | 1 + web/upgrade/26/pgsql.sql (new) | 0 web/upgrade/26/post.inc (new) | 10 + 11 files changed, 563 insertions(+), 124 deletions(-) commit f8a9985a4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 26 12:37:51 2011 +0000 Fixed problem where start and end times do not appear correctly in the select boxes on the edit_entry form when using 12 hour format and running on a Windows server. web/Themes/default/header.inc | 3 +-- web/language.inc | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) commit dc178ed28 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jan 26 11:30:56 2011 +0000 * Updated/fixed Czech translation from Marek Grác. web/lang.cs | 60 +++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) commit d4550f09e Merge: 0a4fefd96 c591213b3 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jan 26 11:27:39 2011 +0000 * Merged the 'only_unicode' branch, which removes MRBS non-Unicode mode. To come is an improved convert_db_to_utf8.php script that I have been working on. commit c591213b3 (origin/only_unicode) Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jan 25 15:00:15 2011 +0000 * Reverted inadvertent changes to config.inc.php. web/config.inc.php | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) commit 9793a98ad Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jan 25 14:57:59 2011 +0000 * Removed MRBS's non-Unicode mode. MRBS is now always Unicode, with pages served in UTF-8, data stored in the database as UTF-8, and translations all in UTF-8. INSTALL | 23 +-- UPGRADE | 10 +- convert_db_to_utf8.php | 3 +- web/config.inc.php | 15 +- web/edit_users.php | 10 +- web/functions_mail.inc | 10 +- web/lang.ca | 125 +++++++------ web/lang.cs | 273 +++++++++++++++-------------- web/lang.da | 109 ++++++------ web/lang.de | 231 ++++++++++++------------- web/lang.el | 315 +++++++++++++++++---------------- web/lang.en | 5 +- web/lang.es | 175 +++++++++---------- web/lang.eu | 5 +- web/lang.fi | 3 - web/lang.fr | 3 - web/lang.it | 5 +- web/lang.ja | 3 - web/lang.ko | 3 - web/lang.nl | 23 ++- web/lang.no | 3 - web/lang.pl | 3 - web/lang.pt | 313 +++++++++++++++++---------------- web/lang.sl | 3 - web/lang.sv | 327 +++++++++++++++++------------------ web/lang.tr | 309 ++++++++++++++++----------------- web/lang.zh-cn | 3 - web/lang.zh-tw | 3 - web/language.inc | 150 +++++----------- web/mysql.inc | 17 +- web/mysqli.inc | 17 +- web/systemdefaults.inc.php | 15 +- 32 files changed, 1179 insertions(+), 1333 deletions(-) commit 41396e1a7 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jan 25 14:11:35 2011 +0000 * A branch to remove the non-Unicode mode of MRBS operation. commit 0a4fefd96 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 25 14:01:36 2011 +0000 Added to comments for $override_locale web/systemdefaults.inc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 7219edbd6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 20 11:38:37 2011 +0000 - Fixed a bug whereby book ahead policies would not be applied when using periods, depending on what settings were already in the database. See SF Support Request #3161926 - At the same time removed the restriction that book ahead policies cannot be set per-area when using periods web/Themes/default/header.inc | 20 +++++++++++-- web/edit_area_room.php | 53 ++++++++++++++++++++++----------- web/lang.en | 1 + web/mrbs.css.php | 1 + web/mrbs_sql.inc | 16 ++++++++-- web/systemdefaults.inc.php | 37 ++++++++--------------- 6 files changed, 80 insertions(+), 48 deletions(-) commit 380fb6486 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 13 11:12:05 2011 +0000 Added a comment. web/functions_ical.inc | 5 +++++ 1 file changed, 5 insertions(+) commit 742c9d316 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 11 09:47:26 2011 +0000 - added explicit en-AU and en-NZ initialisations for jQuery UI datepicker. (Meanwhile a ticket, #6828, has been raised requesting their inclusion in the standard package) - added a correction for the Norwegian initialisation for datepicker (pending discussions with the author of the original initialisation with a view to incorporating the changes in the standard package) web/Themes/default/header.inc | 17 +++++++----- .../ui/jquery-ui-datepicker-en-AU.js (new) | 24 +++++++++++++++++ .../ui/jquery-ui-datepicker-en-NZ.js (new) | 24 +++++++++++++++++ .../ui/jquery-ui-datepicker-no.js (new) | 25 ++++++++++++++++++ 4 files changed, 84 insertions(+), 6 deletions(-) commit bacffa570 Merge: cb58c3760 943f06a8b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 7 17:00:33 2011 +0000 Merged the ics_attachments branch back into the trunk. MRBS now supports: - HTML emails - emails containing iCalendar details that can be imported automatically into calendar apps (eg Outlook, iCal, Thunderbird/Lightning, Google Calendar) - export of bookings as iCalendar files (.ics) from view_entry.php and report.php commit 943f06a8b (origin/ics_attachments) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 7 09:16:55 2011 +0000 Changed EOL sequence in mail headers from the default CRLF to LF (necessary for use with the mail backend). web/functions_mail.inc | 5 +++++ 1 file changed, 5 insertions(+) commit d0ca95a9a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 6 13:59:18 2011 +0000 Merged in latest changes from the trunk web/edit_area_room.php | 2 +- web/edit_entry.php | 9 +++------ web/functions.inc | 11 +++++++++++ 3 files changed, 15 insertions(+), 7 deletions(-) commit cb58c3760 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 6 13:51:55 2011 +0000 Added missing HTML escaping web/edit_area_room.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 662d3a0bb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 6 13:46:39 2011 +0000 Added escaping of JavaScript strings (see SF Bug ID 3152394) web/edit_entry.php | 9 +++------ web/functions.inc | 11 +++++++++++ 2 files changed, 14 insertions(+), 6 deletions(-) commit 91c1223bf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 6 08:49:07 2011 +0000 Added a CN parameter to the ORGANIZER and ATTENDEE properties, extracting the common name from the email address where possible. web/functions_ical.inc | 33 ++++++++++++++++++++++++++++----- web/functions_mail.inc | 31 +++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 5 deletions(-) commit e5e64b094 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 5 17:31:04 2011 +0000 Fixed bug in last commit web/functions_ical.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit a24d39dd4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 5 17:23:19 2011 +0000 Added an ORGANIZER property web/functions_ical.inc | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) commit d6be9cb5d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 5 09:51:08 2011 +0000 Added a LAST-MODIFIED property web/functions_ical.inc | 4 ++++ 1 file changed, 4 insertions(+) commit c1ab03f04 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 5 09:37:09 2011 +0000 Fixed problem whereby attendees could be included as both REQ-PARTICIPANT and NON-PARTICIPANT web/functions_ical.inc | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) commit 97fc0e1c0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 23 09:07:13 2010 +0000 Added comments web/functions_ical.inc | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) commit 110cf4ae3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 22 09:32:11 2010 +0000 Changed to pass $res by reference rather than value. web/functions_ical.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 27a128faf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 21 20:16:30 2010 +0000 Merged in latest changes from the trunk web/lang.fr | 183 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 110 insertions(+), 73 deletions(-) commit d561b0d02 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 21 19:54:25 2010 +0000 Tidied code web/functions_ical.inc | 1 - web/report.php | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) commit dc6c01195 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 21 19:21:41 2010 +0000 - Confirmation status is now recorded in the iCalendar object regardless of whether it is enabled in MRBS - Added privacy status, but left it commented out for the moment as it needs a booking owner to be added as well web/functions_ical.inc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) commit 68bfd78f1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 21 18:45:31 2010 +0000 Fixed bug so that if there is nothing to export then the message comes out in the browser, rather than in the exported file. web/lang.en | 4 +- web/report.php | 388 ++++++++++++++++++++++--------------------- web/view_entry.php | 14 +- 3 files changed, 206 insertions(+), 200 deletions(-) commit 8cd6e66d3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 21 16:43:10 2010 +0000 Moved the code for exporting a .ics file into a function which is now used by view_entry as well, meaning that the view_entry export correctly takes into account changed and cancelled members of a series. web/functions_ical.inc | 155 +++++++++++++++++++++++++++++++++++++++ web/functions_view.inc | 37 ++++++++++ web/report.php | 143 +----------------------------------- web/view_entry.php | 83 +++++++-------------- 4 files changed, 221 insertions(+), 197 deletions(-) commit e6f1a0ffb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 21 14:00:46 2010 +0000 Recognised missing entries from a series when exporting an iCalendar in Report web/functions_ical.inc | 3 ++- web/report.php | 51 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 2 deletions(-) commit 4d59b7d81 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 21 12:04:46 2010 +0000 Tidied up allocation of sequence numbers to existing bookings tables.my.sql | 2 +- tables.pg.pre73.sql | 2 +- tables.pg.sql | 2 +- web/dbsys.inc | 2 +- web/upgrade/25/mysql.sql (new) | 8 ++++++++ web/upgrade/25/pgsql.sql (new) | 8 ++++++++ 6 files changed, 20 insertions(+), 4 deletions(-) commit f120090b4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 21 12:03:38 2010 +0000 Fixed bug in export of iCalendar web/report.php | 1 + 1 file changed, 1 insertion(+) commit 7e6f14c10 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 21 00:08:28 2010 +0000 Fixed bug whereby, on exporting as an iCalendar, the report end date was being used as the series end date, even when the series finished before the report end date. web/report.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 2d93c80e1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 20 23:24:06 2010 +0000 Fixed escaping of line breaks in text to comply with RFC 5545 web/functions_ical.inc | 2 ++ 1 file changed, 2 insertions(+) commit 363191a59 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 20 23:17:33 2010 +0000 Added full details to reports exported as iCalendars web/functions.inc | 32 +++++++ web/functions_view.inc (new) | 167 +++++++++++++++++++++++++++++++++ web/mrbs_sql.inc | 20 +--- web/report.php | 13 ++- web/view_entry.php | 155 ++---------------------------- 5 files changed, 223 insertions(+), 164 deletions(-) commit d4182f23e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 20 16:29:47 2010 +0000 Fixed bug whereby privacy settings for custom fields were being ignored. web/view_entry.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit f9159c937 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 20 16:17:58 2010 +0000 Added an "Export as iCalendar" option to the Report page. Doesn't do Periods and doesn't yet do custom fields. web/functions_ical.inc | 2 +- web/lang.en | 3 +- web/mrbs.css.php | 2 + web/report.php | 201 ++++++++++++++++++++++++++++++++------- 4 files changed, 171 insertions(+), 37 deletions(-) commit d29ce6f86 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 20 15:50:44 2010 +0000 Fixed bug whereby a copy of an entry or a series was given the same ical_uid as the original web/edit_entry.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit 32944d0da Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 20 10:45:29 2010 +0000 Fixed bug causing HTML tags to get into the plain text description of an iCalendar event web/view_entry.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit 36142640c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 19 17:11:22 2010 +0000 Updated French translation provided by Philippe Levi. web/lang.fr | 183 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 110 insertions(+), 73 deletions(-) commit 3786450e1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 17 16:29:30 2010 +0000 Merged in latest changes from the trunk web/lang.pt | 49 ++++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 21 deletions(-) commit 8cbc53aa7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 17 16:24:19 2010 +0000 Updated Portuguese translation web/lang.pt | 49 ++++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 21 deletions(-) commit 56a17664f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 17 13:17:32 2010 +0000 Merged in latest changes from the trunk web/edit_entry_handler.php | 116 ++++++++++++++++------------------- 1 file changed, 52 insertions(+), 64 deletions(-) commit b1841e88b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 17 12:38:26 2010 +0000 Simplified code web/edit_entry_handler.php | 116 +++++++++++++++-------------------- 1 file changed, 50 insertions(+), 66 deletions(-) commit 8d49488ba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 17 11:30:09 2010 +0000 Fixed bug which caused repeat, all-day bookings not to book the last day of a series. web/edit_entry_handler.php | 4 ++++ 1 file changed, 4 insertions(+) commit 740ce5182 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 17 00:09:26 2010 +0000 Fixed bug introduced during recent restructuring - mails were not being sent to the admin web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 017df3feb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 15 10:28:00 2010 +0000 Updated comment web/functions_ical.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 2470f8a7c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 14 16:42:46 2010 +0000 Added a STATUS:CANCELLED property to cancelled bookings. It's not clear (to me) whether this is strictly required by RFC 5545 but it can't do any harm and without it some apps, eg Outlook 2003 (but not 2007), were not recognising cancellations that had previously been given a Status. web/functions_ical.inc | 14 ++++++++++++-- web/functions_mail.inc | 8 ++++---- web/view_entry.php | 4 ++-- 3 files changed, 18 insertions(+), 8 deletions(-) commit 977f4ac2b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 14 15:54:18 2010 +0000 Incremented sequence number on cancellation web/functions_mail.inc | 4 ++++ 1 file changed, 4 insertions(+) commit ec14a2e86 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 14 14:16:11 2010 +0000 Fixed bug where the header in HTML mails was not coming out in the correct language or character set. web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3bd59b73a Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Dec 14 10:56:26 2010 +0000 - Fixed a typo in a comment. web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 002aba8ee Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Dec 14 10:52:39 2010 +0000 - More optimisation of the UTF-8 helper functions. Uses the mbstring functions if they are available. web/language.inc | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) commit fb7c59fbf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 14 09:29:38 2010 +0000 Fixed bug in ical_fold() where it was omitting the last character web/functions_ical.inc | 55 ++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 28 deletions(-) commit 6a47be9a3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 14 00:35:48 2010 +0000 Rewrote ical_fold() to use utf8_seq() for much better performance. web/functions_ical.inc | 61 +++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 20 deletions(-) commit d0d72d168 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Dec 13 23:32:36 2010 +0000 - Fixed the new utf8_strlen(). web/language.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit aa77a58a0 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Dec 13 23:21:37 2010 +0000 - New, generally faster utf8 handling functions, hopefully. utf8_substr() with a large offset does appear to be slower though. :( - New utf8 helper, utf8_seq(). Returns the next UTF8 sequence, and the byte offset of the next sequence. Allows you to step through a UTF-8 string without continuously stepping from the start or building temporary strings. web/language.inc | 145 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 136 insertions(+), 9 deletions(-) commit 117db766a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 13 22:01:54 2010 +0000 Fixed bug in sending icalendar information on delete web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2f8a6775f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 13 16:28:17 2010 +0000 Prevented the export of iCalendar details if using periods (temporary measure until there's a solution to the problem of mapping periods onto times) web/view_entry.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit c36331156 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 13 16:23:37 2010 +0000 - fixed bug that meant that series that had an individual entry changed and were exported from view_entry were not imported into some calendars (eg Google calendar) properly - bug fixed by adding a recurrence id column to the entry tables.my.sql - added uid's and recurrence id's for all existing entries on upgrade tables.my.sql | 3 +- tables.pg.pre73.sql | 75 ++++++++------- tables.pg.sql | 5 +- web/dbsys.inc | 2 +- web/edit_entry.php | 2 + web/edit_entry_handler.php | 13 ++- web/functions_ical.inc | 5 +- web/internalconfig.inc.php | 11 ++- web/mrbs_sql.inc | 11 ++- web/upgrade/24/mysql.sql (new) | 6 ++ web/upgrade/24/pgsql.sql (new) | 6 ++ web/upgrade/24/post.inc (new) | 154 +++++++++++++++++++++++++++++++ 12 files changed, 247 insertions(+), 46 deletions(-) commit 722873b2b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 11 20:49:12 2010 +0000 Fixed a bug which caused calendar info not to be imported by some calendar apps (eg Microsoft Exchange Server) web/functions_ical.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) commit f7c33f388 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 11 17:54:21 2010 +0000 Replaced magic numbers for entry types with constants web/del_entry.php | 4 ++-- web/edit_entry.php | 2 +- web/edit_entry_handler.php | 4 ++-- web/functions_ical.inc | 2 +- web/internalconfig.inc.php | 13 +++++++++++++ web/mrbs_sql.inc | 6 +++--- web/view_entry.php | 4 ++-- 7 files changed, 24 insertions(+), 11 deletions(-) commit b09fed284 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 11 17:25:30 2010 +0000 AAdded the ability to download iCalendar files from the view_entry page web/functions.inc | 22 ++ web/functions_ical.inc | 91 ++++--- web/functions_mail.inc | 38 +-- web/lang.en | 2 + web/mrbs.css.php | 1 + web/mrbs_sql.inc | 5 +- web/view_entry.php | 534 +++++++++++++++++++-------------------- 7 files changed, 358 insertions(+), 335 deletions(-) commit c7e8b89ef Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 10 11:05:56 2010 +0000 Merged in latest changes from the trunk web/view_entry.php | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) commit b1a4bced2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 10 11:01:40 2010 +0000 Allowed entries for disabled rooms to be copied (but still not deleted or edited). web/view_entry.php | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) commit 55ceaef50 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 10 10:34:05 2010 +0000 Updated ical_fold() to use new utf8_ string functions, removing the dependence on the mb_ extensions. web/functions_ical.inc | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) commit 3368025ea Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 10 09:37:35 2010 +0000 Merged in latest changes from the trunk web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit f7c01db20 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 10 08:53:12 2010 +0000 Fixed bug that caused the room and area links in the day, week and month views to operate incorrectly when using "list" format. See SF Tracker ID: 3134046. web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit a2676292f Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Dec 9 23:07:10 2010 +0000 - Adding missing empty line, no functional change. web/language.inc | 1 + 1 file changed, 1 insertion(+) commit 10d5f4792 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Dec 9 23:01:21 2010 +0000 - Made utf8_strlen() much more efficient. web/language.inc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) commit b203c62e5 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Dec 9 22:58:31 2010 +0000 - Added another Unicode support function, utf8_bytecount(). Returns the number of _bytes_ in a string as opposed to utf8_strlen() which returns the number of characters. strlen() can't be trusted, as mbstring can be configured to overload strlen to return character counts. web/language.inc | 10 ++++++++++ 1 file changed, 10 insertions(+) commit 43203d99b Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Dec 9 21:58:32 2010 +0000 - Added utf8_next() and utf8_strlen() as support functions in language.inc. web/language.inc | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) commit 27b10e24e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 9 15:19:31 2010 +0000 Stopped iCalendar information being sent when using periods and bookings requiring approval web/approve_entry_handler.php | 4 ++++ 1 file changed, 4 insertions(+) commit 0be8f7670 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 9 14:53:14 2010 +0000 Stopped iCalendar information being generated when using periods, as there's no point: a calendar app will not be able to import an event defined in periods. (At some stage in the future I suppose we could define a mapping between periods and real times). web/functions_mail.inc | 12 ++++++------ web/systemdefaults.inc.php | 6 +++++- 2 files changed, 11 insertions(+), 7 deletions(-) commit cafa996ca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 9 14:37:48 2010 +0000 Simplified code web/approve_entry_handler.php | 34 +---- web/del_entry.php | 2 +- web/edit_entry_handler.php | 14 +- web/functions_mail.inc | 223 ++++++++++++-------------------- web/mrbs_sql.inc | 48 ++++++- 5 files changed, 140 insertions(+), 181 deletions(-) commit 0108b1672 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 8 19:46:51 2010 +0000 Added ATTENDEE and ROLE information to the iCalendar object. web/functions_ical.inc | 30 +++++++++++++++++++++++++++++- web/functions_mail.inc | 4 ++-- 2 files changed, 31 insertions(+), 3 deletions(-) commit a37190940 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 8 17:37:52 2010 +0000 More CSS tweaks web/functions_mail.inc | 7 ++++--- web/mrbs-mail.css | 10 +++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) commit 16cc5403c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 8 16:25:24 2010 +0000 Another CSS tweak web/functions_mail.inc | 4 ++-- web/mrbs-mail.css | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) commit 11dd71f76 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 8 15:59:39 2010 +0000 CSS tweak web/mrbs-mail.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit aaec21680 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 8 15:49:25 2010 +0000 Merged in latest changes from the trunk web/Mail.php | 136 +++++++--- web/Mail/RFC822.php | 275 +++++++++++--------- web/Mail/mail.php | 116 ++++++--- web/Mail/null.php | 62 +++-- web/Mail/sendmail.php | 120 ++++++--- web/Mail/smtp.php | 363 ++++++++++++++++++++++---- web/Net/SMTP.php | 542 ++++++++++++++++++++++++++++----------- web/functions_mail.inc | 7 +- 8 files changed, 1175 insertions(+), 446 deletions(-) commit 330c8ee93 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 8 15:24:56 2010 +0000 Fixed bug whereby mail was not being sent to those on the cc and bcc lists. web/functions_mail.inc | 4 ++++ 1 file changed, 4 insertions(+) commit b8502b906 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 8 14:59:24 2010 +0000 Updated PEAR Mail package to Release 1.2.0 and Net_SMTP to Release 1.4.4 web/Mail.php | 136 +++++++--- web/Mail/RFC822.php | 275 +++++++++++--------- web/Mail/mail.php | 116 ++++++--- web/Mail/null.php | 62 +++-- web/Mail/sendmail.php | 120 ++++++--- web/Mail/smtp.php | 363 +++++++++++++++++++++++---- web/Net/SMTP.php | 542 +++++++++++++++++++++++++++++----------- 7 files changed, 1169 insertions(+), 445 deletions(-) commit 4b4b4d39e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 8 14:07:52 2010 +0000 Made the filename for the .ics attachment a config variable web/functions_mail.inc | 2 +- web/systemdefaults.inc.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) commit b226148fd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 8 13:37:47 2010 +0000 Changed Mime structure of emails. Calendar attachments now recognised by Apple iCal. web/functions_mail.inc | 59 ++++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 9 deletions(-) commit fadc2d840 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 6 17:17:11 2010 +0000 Made "folding" multi-byte safe web/functions_ical.inc | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) commit 427cccb92 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 6 15:33:01 2010 +0000 Tidied up HTML web/functions_ical.inc | 13 +++++++++---- web/functions_mail.inc | 39 ++++++++++++++++++++++++++------------- web/lang.en | 2 ++ 3 files changed, 37 insertions(+), 17 deletions(-) commit e6eef6f55 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 6 13:32:33 2010 +0000 Fixed bug whereby the event description wasn't being entered in the iCalendar object properly web/functions_mail.inc | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) commit cd5dc46be Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 5 18:40:21 2010 +0000 Simplified the code. No functional change. web/functions_mail.inc | 268 ++++++++++++++++++--------------------- 1 file changed, 124 insertions(+), 144 deletions(-) commit 0701ba79b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Dec 4 16:38:45 2010 +0000 Simplified the code. No functional change. web/approve_entry_handler.php | 2 +- web/edit_entry_handler.php | 2 +- web/functions_mail.inc | 27 ++++++++++++++------------- web/mrbs_sql.inc | 1 - 4 files changed, 16 insertions(+), 16 deletions(-) commit 98b6e394d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 3 16:46:12 2010 +0000 Implemented "folding" web/functions_ical.inc | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) commit fd5824657 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 3 16:12:52 2010 +0000 Added support for HTML mail web/edit_entry_handler.php | 42 +-- web/functions.inc | 29 ++ web/functions_ical.inc (new) | 145 ++++++++++ web/functions_mail.inc | 493 ++++++++++++++------------------- web/internalconfig.inc.php | 7 - web/mrbs-mail.css (new) | 6 + web/systemdefaults.inc.php | 3 +- 7 files changed, 390 insertions(+), 335 deletions(-) commit 28c6529a8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 2 15:56:51 2010 +0000 Added full details to Delete description web/functions_mail.inc | 158 +++++++++++---------------------------- 1 file changed, 44 insertions(+), 114 deletions(-) commit 366cc55ae Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 2 15:06:26 2010 +0000 - Added the full details (including custom fields) to the iCalendar description. - Added escaping of text fields in the iCalendar object web/functions_mail.inc | 499 +++++++++++++++++++++------------------ 1 file changed, 271 insertions(+), 228 deletions(-) commit 9675a7587 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 2 12:24:14 2010 +0000 Editing and deleting individual members of a series now supported tables.my.sql | 74 +++++++++++++++++++++------------------- tables.pg.pre73.sql | 2 +- tables.pg.sql | 72 ++++++++++++++++++++------------------ web/del_entry.php | 7 ++++ web/functions_mail.inc | 5 +++ 5 files changed, 90 insertions(+), 70 deletions(-) commit d81ed13a2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 2 11:49:07 2010 +0000 Tidied code. No functional change. web/edit_entry_handler.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) commit 947dfcb9f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 2 11:22:31 2010 +0000 Improved algorithm for generating globally unique iCalendar uids web/edit_entry_handler.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) commit 3897f941e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 2 11:03:37 2010 +0000 Changes to individual entries and to series now work. Changes to individual members of a series not yet supported. web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2ad49dc2b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 2 10:15:22 2010 +0000 Switched to using globally unique ids for the iCalendar uids. web/dbsys.inc | 2 +- web/edit_entry.php | 52 ++++++++++++++++++----- web/edit_entry_handler.php | 72 ++++++++++++++++++++++++++++++++ web/functions_mail.inc | 18 +++----- web/internalconfig.inc.php | 16 ++++++- web/mrbs_sql.inc | 2 + web/systemdefaults.inc.php | 8 ++-- web/upgrade/23/mysql.sql (new) | 11 +++++ web/upgrade/23/pgsql.sql (new) | 11 +++++ 9 files changed, 163 insertions(+), 29 deletions(-) commit 97768e264 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 30 16:08:14 2010 +0000 Added iCalendar support on creation and deletion of series. (Changes to series or individual entries not yet supported). web/del_entry.php | 12 ++- web/edit_entry_handler.php | 20 ++++- web/functions_mail.inc | 146 ++++++++++++++++++++++++++--------- 3 files changed, 139 insertions(+), 39 deletions(-) commit 21ed0d4a0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 29 16:02:09 2010 +0000 Very very basic first implementation of .ics notifications. New single events can be entered onto a calendar and also deleted. Changes are not yet supported, nor are repeat events. web/edit_entry_handler.php | 2 + web/functions_mail.inc | 119 ++++++++++++++++++++++++++++++----- web/systemdefaults.inc.php | 2 + 3 files changed, 108 insertions(+), 15 deletions(-) commit d0c5d0f70 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 29 08:51:33 2010 +0000 Added hooks for sending HTML mail web/functions_mail.inc | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) commit c776adac6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 29 08:36:08 2010 +0000 Converted sendMail() to use Mail_Mime web/functions_mail.inc | 44 +++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 16 deletions(-) commit 99d1654a4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 29 08:31:08 2010 +0000 Added the PEAR Mail_Mime Package (Release 1.8.0) web/Mail/mime.php (new) | 1457 +++++++++++++++++++++++++++++++++ web/Mail/mimePart.php (new) | 1214 +++++++++++++++++++++++++++ 2 files changed, 2671 insertions(+) commit bf84a21ef Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 28 14:08:23 2010 +0000 Created a branch for the development of .ics files which can be attached to email notifications sent by MRBS and imported into calendars. commit 9a7460aaf Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Nov 26 12:24:05 2010 +0000 - Tidied example email address discussion. web/systemdefaults.inc.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 2d6cdc09e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 26 11:52:47 2010 +0000 Added a comment on email address formats web/systemdefaults.inc.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 023d69618 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 25 17:23:58 2010 +0000 - Removed the warning about the use of $provisional_enabled - Added $provisional_enabled to the list of deprecated config variables that are now replaced by something else, but still supported for the moment in order to make upgrading easier - Changed the way that the $mail_settings deprecated variables are treated and stopped trying to do anything too smart web/internalconfig.inc.php | 51 ++++++++++++++++++++++-------------- web/upgrade/21/post.inc | 36 ------------------------- 2 files changed, 31 insertions(+), 56 deletions(-) commit 55c3cb38b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 25 10:40:21 2010 +0000 Changed the privacy and confirmation status fields to be radio buttons rather than checkboxes to make it slightly clearer what they do. web/edit_entry.php | 66 +++++++++++++++++------------------- web/edit_entry_handler.php | 2 +- web/lang.en | 1 + 3 files changed, 33 insertions(+), 36 deletions(-) commit 5b304dbf1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 25 09:18:20 2010 +0000 Better fix (again!) for Rev 1642 (bug causing approval of entries not to work when using PostgreSQL) web/mrbs_sql.inc | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) commit ea6e38075 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 25 07:39:09 2010 +0000 Better fix for Rev 1642 (bug causing approval of entries not to work when using PostgreSQL) web/dbsys.inc | 22 ++++++++++++++++++++++ web/mrbs_sql.inc | 15 +++++++++------ web/mysql.inc | 9 +++++++++ web/mysqli.inc | 10 ++++++++++ web/pgsql.inc | 9 +++++++++ 5 files changed, 59 insertions(+), 6 deletions(-) commit d1bf94e34 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 25 04:49:43 2010 +0000 Fixed minor typo web/lang.en | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 441399f3c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 25 04:47:05 2010 +0000 Corrected French translation for rejected bookings. web/lang.fr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ab2bef7bd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 25 04:35:32 2010 +0000 Fixed error handling if there's an SQL error when approving an entry web/approve_entry_handler.php | 6 ++++++ 1 file changed, 6 insertions(+) commit 50bace757 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 25 04:17:21 2010 +0000 Fixed bug causing approval of entries not to work when using PostgreSQL web/mrbs_sql.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 6cef4e161 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 24 19:07:03 2010 +0000 Following the suggestion of Céline Grousson, added a new config variable to enable email notifications for new bookings to be turned off. At the same time took the opportunity to rationalise the naming of some of the mail settings, so the variables that control when an email should be sent are now called $mail_settings['on_new'], $mail_settings['on_change'] and $mail_settings['on_delete']. The old variables, $mail_settings['admin_all'] and $mail_settings['admin_on_delete'], are still supported for compatibility but their use is deprecated. UPGRADE | 12 ++++++++++++ web/del_entry.php | 2 +- web/edit_entry_handler.php | 13 ++++++------- web/internalconfig.inc.php | 23 ++++++++++++++++++++++- web/systemdefaults.inc.php | 17 +++++++++++++---- 5 files changed, 54 insertions(+), 13 deletions(-) commit ba2bc198a Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Nov 24 17:50:28 2010 +0000 - svn:mime-type tidying. commit cf87d0157 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Nov 24 16:09:08 2010 +0000 - One further test of svn:mime-type behaviour. commit e7059407c Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Nov 24 16:07:39 2010 +0000 - Testing the effects of svn:mime-type on ViewVC behaviour. commit 91dfe60d2 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Nov 24 13:08:24 2010 +0000 - Set svn:eol-style for new files. commit 2963591a3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 24 10:22:11 2010 +0000 - Updated jQuery UI from 1.8.4 to 1.8.6 - Removed the separate Portuguese regional setting for datepicker as it is now included as standard in 1.8.6 web/Themes/default/header.inc | 13 +-- .../ui-bg_gloss-wave_60_fece2f_500x100.png | Bin 3512 -> 4075 bytes .../ui-bg_gloss-wave_70_ffdd57_500x100.png | Bin 3830 -> 3122 bytes .../sunny/images/ui-icons_ed9f26_256x240.png | Bin 5355 -> 4369 bytes .../sunny/images/ui-icons_fadc7a_256x240.png | Bin 4369 -> 5355 bytes .../sunny/images/ui-icons_ffe180_256x240.png | Bin 4369 -> 5355 bytes ...custom.css => jquery-ui-1.8.6.custom.css} | 6 +- ....min.js => jquery-ui-1.8.6.custom.min.js} | 90 ++++++++--------- .../ui/jquery-ui-datepicker-pt.js (gone) | 24 ----- web/jquery/ui/jquery-ui-i18n.js | 70 ++++++++++++- web/style.inc | 2 +- 11 files changed, 124 insertions(+), 81 deletions(-) commit 060baac3b Merge: be83afa92 3babfd12b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 24 09:50:06 2010 +0000 Merged the disabled_rooms branch back into the trunk. Rooms and areas can now be disabled, meaning that they will not appear in the day/week/month views and bookings cannot be made for them. Any existing bookings will be preserved in the system, will be returned in Search and Report results and can be viewed in view_entry.php - but they will be read only. commit be83afa92 (tag: mrbs-1_4_5) Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Nov 22 21:21:00 2010 +0000 * Updated NEWS and ChangeLog for 1.4.5 release. ChangeLog | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++++ NEWS | 21 +++-- 2 files changed, 238 insertions(+), 6 deletions(-) commit 2cb0cdebd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 22 14:39:52 2010 +0000 Expanded comments on datepicker web/Themes/default/header.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit 77b400e9e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 22 14:39:15 2010 +0000 Fixed problem with the en-US datepicker setting web/jquery/ui/jquery-ui-datepicker-en-US.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 3babfd12b (origin/disabled_rooms) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 22 11:12:47 2010 +0000 Merged in latest changes from the trunk web/Themes/default/header.inc | 12 ++++++++---- web/version.inc | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) commit 1fc5f7978 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 22 10:23:16 2010 +0000 Removed the assumption by the JavaScript that the All Day checkbox exists, just in case anybody wants to remove it from the HTML. web/Themes/default/header.inc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit e7fe8139e Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Nov 21 22:00:43 2010 +0000 * Updated version number for 1.4.5 release. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d3783ca74 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 19 18:27:29 2010 +0000 Fixed problem with display of area selector when using the select format web/day.php | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) commit 1554dde13 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 19 17:07:48 2010 +0000 Merged in latest changes from the trunk web/Themes/default/header.inc | 9 +++++---- web/edit_entry.php | 4 ++-- web/internalconfig.inc.php | 2 -- web/lang.fr | 6 +++--- web/language.inc | 2 ++ web/mrbs-ie8.css | 4 ++++ web/systemdefaults.inc.php | 3 +++ 7 files changed, 19 insertions(+), 11 deletions(-) commit e3d1f4bd5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 19 16:59:23 2010 +0000 Completed support for disabled rooms and areas. Rooms and areas can now be disabled, meaning that they will not appear in the day/week/month views and bookings cannot be made for them. Any existing bookings will be preserved in the system, will be returned in Search and Report results and can be viewed in view_entry.php - but they will be read only. web/Themes/default/header.inc | 7 +- web/admin.php | 27 ++++- web/day.php | 37 ++++--- web/edit_entry.php | 18 ++-- web/functions.inc | 180 ++++++++++++++++++++++---------- web/month.php | 73 +++---------- web/mrbs.css.php | 6 +- web/mrbs_sql.inc | 4 +- web/pending.php | 2 + web/view_entry.php | 80 +++++++------- web/week.php | 75 +++---------- 11 files changed, 268 insertions(+), 241 deletions(-) commit db6db9a27 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 18 21:59:13 2010 +0000 Replaced HTML entities (eg é) with characters - the HTML entities don't work in email notifications. web/lang.fr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 7525545d1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 18 21:35:21 2010 +0000 Added config setting $default_type web/edit_entry.php | 2 +- web/systemdefaults.inc.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) commit f6a1dad1c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 18 19:12:18 2010 +0000 Restored the "Goto" button in the header. MRBS will still automatically go to the new date when it is changed in the datepicker, but there are occasions when you just want to go to the date that is already there - for example if you been on the Search or Report pages. web/Themes/default/header.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) commit eb2771d65 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 18 19:02:44 2010 +0000 Fixed layout problems in IE8 on the edit_entry and report pages web/mrbs-ie8.css | 4 ++++ 1 file changed, 4 insertions(+) commit 8c31b7ff9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 18 17:30:32 2010 +0000 Fixed a bug which meant that the start and end times did not appear on the edit_entry form when using Windows servers. web/edit_entry.php | 2 +- web/language.inc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) commit c7bc72f58 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 18 17:05:52 2010 +0000 Fixed bug which prevented converting area to times mode if the default mode is periods web/internalconfig.inc.php | 2 -- 1 file changed, 2 deletions(-) commit a46e98ac4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 18 13:39:19 2010 +0000 Merged in latest changes from the trunk web/Themes/default/header.inc | 42 +-- web/auth_ldap.inc | 252 ++++++++++++++--- web/edit_entry.php | 8 +- web/functions.inc | 11 +- web/functions_mail.inc | 6 +- web/internalconfig.inc.php | 42 ++- .../ui/jquery-ui-datepicker-en-US.js (new) | 24 ++ .../ui/jquery-ui-datepicker-en.js (new) | 24 ++ web/lang.de | 192 +++++++++++-- web/lang.es | 80 +++++- web/lang.fr | 131 +++++++-- web/language.inc | 6 +- web/mrbs.css.php | 2 +- web/systemdefaults.inc.php | 14 + web/theme.inc | 21 -- 15 files changed, 705 insertions(+), 150 deletions(-) commit 55a388cba Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 18 11:15:03 2010 +0000 Changed the area and room tables to record disabled status and changed the pages for editing rooms and areas to allow room and areas to be enabled/disabled. Still to come: changing the calendar views so that disabled rooms/areas are not displayed. tables.my.sql | 4 +- tables.pg.pre73.sql | 4 +- tables.pg.sql | 4 +- web/admin.php | 494 +++++++++++++++++-------------- web/dbsys.inc | 2 +- web/edit_area_room.php | 198 ++++++++----- web/internalconfig.inc.php | 10 + web/lang.en | 12 +- web/mrbs.css.php | 3 + web/upgrade/22/mysql.sql (new) | 9 + web/upgrade/22/pgsql.sql (new) | 9 + 11 files changed, 453 insertions(+), 296 deletions(-) commit ab73bc056 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 18 10:02:40 2010 +0000 Fixed a bug which meant that datepicker wasn't setting the correct regional setting if the $default_language_tokens was of the form xx-yy, eg "zh-cn"; web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 853c3bca7 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Nov 17 20:47:03 2010 +0000 * Added updated French translation from Jonathan Verbaere and updated Spanish translation from Jose Luis Martin Jimenez. web/lang.es | 80 ++++++++++++++++++++++++------ web/lang.fr | 131 +++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 168 insertions(+), 43 deletions(-) commit b401a46c6 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Nov 17 18:59:40 2010 +0000 * Fixed a function introduction comment. web/auth_ldap.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2833c8014 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Nov 17 18:54:36 2010 +0000 * Introduced the ability to get a user's email address from LDAP if the system is configured to use LDAP for authentication. Adds the config variables: $ldap_get_user_email, $ldap_email_attrib. As part of this work also added two new LDAP config variables: $ldap_unbind_between_attempts and $ldap_debug. web/auth_ldap.inc | 252 +++++++++++++++++++++++++++++------ web/functions_mail.inc | 6 +- web/systemdefaults.inc.php | 14 ++ 3 files changed, 233 insertions(+), 39 deletions(-) commit 8994d5727 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 17 17:59:26 2010 +0000 Removed the "go to" button from the date selector in the header when JavaScript is enabled. Now when the datepicker is closed MRBS automatically goes to the new date. Following a usability suggestion from Matthew Hilling on the mailing list. web/Themes/default/header.inc | 21 ++++++++++++++++----- web/functions.inc | 11 ++++++++++- web/mrbs.css.php | 2 +- 3 files changed, 27 insertions(+), 7 deletions(-) commit b78501a6e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 16 22:33:01 2010 +0000 Fixed a problem whereby MRBS wasn't properly recognising the override_locale when initialising datepicker if the locale contained a character set (eg "en_GB.utf-8"). web/Themes/default/header.inc | 1 + 1 file changed, 1 insertion(+) commit 1a3037a1a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 16 21:48:40 2010 +0000 Added 'en' and 'en-US' datepicker regional settings, which use a US format. The standard jQuery UI package does not have an explicit 'en' or 'en-US' setting: it is the default. However this means that if your browser language preference order is say en-US, en-GB you will get a GB datepicker rather than a US datepicker. web/Themes/default/header.inc | 18 +++++-------- .../ui/jquery-ui-datepicker-en-US.js (new) | 24 ++++++++++++++++++ .../ui/jquery-ui-datepicker-en.js (new) | 24 ++++++++++++++++++ 3 files changed, 54 insertions(+), 12 deletions(-) commit b2be99cf4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 16 18:00:50 2010 +0000 - Added some checks for a valid setting of $resolution - Moved internal checking out of theme.inc and into internalconfig.inc.php web/edit_entry.php | 8 ++++++- web/internalconfig.inc.php | 42 +++++++++++++++++++++++++++++++++--- web/theme.inc | 21 ------------------ 3 files changed, 46 insertions(+), 25 deletions(-) commit 9b9b39e0a Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Nov 16 17:14:18 2010 +0000 * Reverted my recent change in email notifications, the logic was wrong. Kept the formatting changes, to remove the overly long lines. web/language.inc | 1 - 1 file changed, 1 deletion(-) commit bc86777c1 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Nov 16 14:16:07 2010 +0000 * Proposed fix to allow sending only delete notifications to the administrator by email, problem reported on the mailing list. web/language.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 571074667 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Nov 15 21:52:32 2010 +0000 * Updated German translation from Michael Fladerer. web/lang.de | 192 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 171 insertions(+), 21 deletions(-) commit 91a44ba2b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 15 14:14:28 2010 +0000 Created a branch for the development of the ability to disable rooms and areas commit b75325990 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Nov 15 00:01:36 2010 +0000 * Updated checklang.php script, with ideas from Pål Monstad. checklang.php | 157 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 125 insertions(+), 32 deletions(-) commit 38b4fe11b Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Nov 14 19:54:27 2010 +0000 * Updated Norwegian translation from Pål Monstad. web/lang.no | 225 ++++++++++++++++++++++++++------------------------ 1 file changed, 119 insertions(+), 106 deletions(-) commit 27fb8b77f Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Nov 13 23:25:50 2010 +0000 * Fixed a typo in the Dutch translation I introduced. web/lang.nl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 65d65ae7c Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Nov 13 23:19:05 2010 +0000 * Updated Swedish translation, received by KerstinS in June! web/lang.sv | 144 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 126 insertions(+), 18 deletions(-) commit e7c8591bc Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Nov 13 23:12:46 2010 +0000 * Updated Dutch translation from Cor Marjee. web/lang.nl | 147 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 142 insertions(+), 5 deletions(-) commit a73695742 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 11 16:01:23 2010 +0000 Updated Portuguese translation web/lang.pt | 274 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 208 insertions(+), 66 deletions(-) commit f34e5a89d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 11 09:29:34 2010 +0000 Changed the name of the config variable for preventing multiple room selection from $auth['only_admin_can_select_multiple'] to $auth['only_admin_can_select_multiroom']. (Slightly more meaningful and also consistent with $auth['only_admin_can_book_multiday']) web/edit_entry.php | 6 +++--- web/systemdefaults.inc.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) commit 4d996e709 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 10 17:13:40 2010 +0000 Added the ability to prevent ordinary users from selecting multiple rooms on the edit_entry form, controlled by the config variable $auth['only_admin_can_select_multiple']. Thanks to a patch from Chris Cook on the mailing list. web/edit_entry.php | 33 ++++++++++++++++++++------------- web/systemdefaults.inc.php | 4 ++++ 2 files changed, 24 insertions(+), 13 deletions(-) commit 50141aba7 (tag: mrbs-1_4_5rc2) Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Nov 5 14:56:08 2010 +0000 * Updated NEWS and ChangeLog for 1.4.5rc2 release. ChangeLog | 286 ++++++++++++++++++++++++++++++++++++++++++++++++++++ NEWS | 33 ++++++ 2 files changed, 319 insertions(+) commit e6ea78d94 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Nov 5 14:40:14 2010 +0000 * Updated version number for 1.4.5rc2 release. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit caf6fafea Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 5 13:43:36 2010 +0000 Fixed incorrect PHP script marker web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ea32336cf Merge: 644b37815 d41880df9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 5 12:49:59 2010 +0000 Merged the from_to_bookings branch back into the trunk. commit 644b37815 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 5 12:07:43 2010 +0000 Added a config variable $auth['only_admin_can_see_other_users'] to allow visibility of other users' details to be restricted when using the 'db' authentication scheme. See SF tracker ID: 3102887. web/edit_users.php | 11 ++++++++++- web/systemdefaults.inc.php | 3 +++ 2 files changed, 13 insertions(+), 1 deletion(-) commit 1940582e6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 5 11:49:58 2010 +0000 Expanded the documentation on timezones. See SF tracker ID: 3102895 INSTALL | 26 ++++++++++++++++++++++++++ web/config.inc.php | 2 +- web/systemdefaults.inc.php | 4 +++- 3 files changed, 30 insertions(+), 2 deletions(-) commit d41880df9 (origin/from_to_bookings) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 5 11:22:33 2010 +0000 Made the start and end time selectors change when the selected area is changed. web/Themes/default/header.inc | 266 +++++++++++++++++++++++--------- web/edit_entry.php | 235 +++++++++++++++++++--------- 2 files changed, 354 insertions(+), 147 deletions(-) commit f7c77aa8b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 3 17:52:41 2010 +0000 Reduced the number of SQL queries and tidied up the code in preparation for being able to change the slot times when the area changes web/edit_entry.php | 135 +++++++++++++++++++++++-------------------- 1 file changed, 71 insertions(+), 64 deletions(-) commit aa95edc82 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 3 14:58:09 2010 +0000 Merged in latest changes from the trunk web/systemdefaults.inc.php | 1 + 1 file changed, 1 insertion(+) commit 5ed06e7d7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 3 14:53:41 2010 +0000 Declared the empty array $is_mandatory_field to avoid warning messages later on when used with array_key_exists() web/systemdefaults.inc.php | 1 + 1 file changed, 1 insertion(+) commit 682637c4e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 3 12:48:41 2010 +0000 Fixed bug in calculation of periods duration when the booking crosses a day or more and the end period is before the start period web/functions.inc | 6 ++++++ 1 file changed, 6 insertions(+) commit 658d12ef1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 3 12:31:07 2010 +0000 Added comment web/functions.inc | 1 + 1 file changed, 1 insertion(+) commit 37872755f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 3 12:29:03 2010 +0000 Fixed bug where the duration wasn't always being calculated correctly when using periods web/functions.inc | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) commit 374fc0bf9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 3 11:12:05 2010 +0000 Merged in latest changes from the trunk web/functions.inc | 1 + 1 file changed, 1 insertion(+) commit 5d2ecfdb0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 3 11:08:49 2010 +0000 Removed any trailing decimal zeros from the duration web/functions.inc | 1 + 1 file changed, 1 insertion(+) commit 4e35daf2f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 3 10:40:57 2010 +0000 - changed All Day bookings so that you can make an All Day, multi-day booking (unless of course multi-day booking is disabled) - fixed various related bugs and tidied up the code web/Themes/default/header.inc | 27 ++++++----- web/edit_entry.php | 81 ++++++++++++++++++--------------- web/edit_entry_handler.php | 4 +- 3 files changed, 61 insertions(+), 51 deletions(-) commit 84f10b390 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 2 17:19:48 2010 +0000 Fixed bug which meant that the original end time was not being restored properly when All Day was unchecked web/edit_entry.php | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) commit a3e53777c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 2 16:36:04 2010 +0000 Fixed bug whereby the date checks were not working properly if the date or month was 08 or 09. web/Themes/default/header.inc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) commit a8584979e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 2 16:22:45 2010 +0000 Disabled the end date selector if the All Day checkbox is ticked. (If you want to make an All Day booking for several days then it needs to be a Repeat booking) web/edit_entry.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) commit 7e153e4c3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 2 15:34:16 2010 +0000 Merged in latest changes from the trunk UPGRADE | 91 ++++-- tables.my.sql | 11 +- tables.pg.pre73.sql | 13 +- tables.pg.sql | 13 +- web/Themes/classic126/styling.inc | 2 +- web/Themes/default/header.inc | 35 +-- web/Themes/default/styling.inc | 2 +- web/approve_entry_handler.php (new) | 124 ++++++++ web/confirm_entry_handler.php (gone) | 127 -------- web/day.php | 5 +- web/dbsys.inc | 2 +- web/edit_area_room.php | 44 ++- web/edit_entry.php | 72 +++-- web/edit_entry_handler.php | 193 ++++++------ web/edit_users.php | 6 +- web/functions.inc | 154 +++++++--- web/functions_mail.inc | 409 +++++++++---------------- web/internalconfig.inc.php | 34 +- web/lang.en | 94 +++--- web/lang.es | 9 +- web/lang.fi | 9 +- web/lang.fr | 9 +- web/lang.it | 9 +- web/lang.ja | 25 +- web/lang.nl | 9 +- web/lang.pl | 9 +- web/lang.sl | 9 +- web/lang.tr | 9 +- web/language.inc | 2 +- web/month.php | 28 +- web/mrbs.css.php | 35 ++- web/mrbs_auth.inc | 4 +- web/mrbs_sql.inc | 219 ++++--------- web/pending.php | 27 +- web/report.php | 214 +++++++++++-- web/search.php | 4 +- web/systemdefaults.inc.php | 41 ++- web/upgrade/15/pgsql.sql | 1 - web/upgrade/15/post.inc | 12 +- web/upgrade/17/mysql.sql (new) | 4 + web/upgrade/17/pgsql.sql (new) | 4 + web/upgrade/17/post.inc (new) | 92 ++++++ web/upgrade/18/mysql.sql (new) | 10 + web/upgrade/18/pgsql.sql (new) | 10 + web/upgrade/19/mysql.sql (new) | 6 + web/upgrade/19/pgsql.sql (new) | 6 + web/upgrade/20/mysql.sql (new) | 24 ++ web/upgrade/20/pgsql.sql (new) | 11 + web/upgrade/21/mysql.sql (new) | 1 + web/upgrade/21/pgsql.sql (new) | 0 web/upgrade/21/post.inc (new) | 74 +++++ web/view_entry.php | 54 ++-- web/week.php | 4 +- 53 files changed, 1396 insertions(+), 1019 deletions(-) commit 89110aa33 Merge: f52e30646 a96e93fb3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 2 15:10:18 2010 +0000 Merged the provisional_bookings_new_style branch back into the trunk. MRBS now has the ability to make "tentative" bookings, ie bookings which are not 100% certain to happen, but where the user wants to reserve the slot in the meantime. commit a96e93fb3 (origin/provisional_bookings_new_style) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 2 14:51:00 2010 +0000 Updated the UPGRADE information UPGRADE | 91 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 32 deletions(-) commit 07b3b7b8f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 2 14:39:39 2010 +0000 Added a check to see whether $provisional_enabled (which has now been renamed) is still used in the config file web/mrbs.css.php | 2 ++ web/upgrade/21/post.inc | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) commit 42a2bc0c5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 2 12:25:37 2010 +0000 Fixed problems which caused PostgreSQL to generate "argument of AND must be type boolean, not type integer" and similar errors web/Themes/default/header.inc | 2 +- web/functions.inc | 2 +- web/pending.php | 2 +- web/report.php | 18 ++++++++++-------- web/search.php | 4 ++-- 5 files changed, 15 insertions(+), 13 deletions(-) commit f53112476 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 2 11:32:42 2010 +0000 Fixed bug causing upgrade error using PostgreSQL web/upgrade/21/post.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 05341bc36 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 2 11:30:57 2010 +0000 Merged in latest changes from the trunk web/upgrade/15/post.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit f52e30646 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 2 11:27:15 2010 +0000 Fixed bug causing upgrade error using PostgreSQL web/upgrade/15/post.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 7941d31e4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 2 10:10:28 2010 +0000 Fix for a NULL upgrade, Postgresql doesn't like an SQL file with no query. web/upgrade/21/pgsql.sql | 1 - 1 file changed, 1 deletion(-) commit 28a2cc7c4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 2 09:29:31 2010 +0000 Removed a "LIMIT" from an UPDATE query as PostgreSQL doesn't like them. web/upgrade/17/post.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 1dc166cca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 2 09:00:54 2010 +0000 Merged in latest changes from the trunk web/functions.inc | 2 +- web/mrbs_sql.inc | 6 ++---- web/upgrade/15/pgsql.sql | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) commit b677b7a89 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 1 19:32:07 2010 +0000 Added a check to see that $timezone is set to a valid timezone identifier web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a420b6e8f Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Oct 31 08:16:58 2010 +0000 * Fixed confirmation of bookings for people using the Postgresql backend. Postgresql doesn't accept LIMIT in UPDATE statements. web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 44c8e4e42 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Oct 31 08:14:33 2010 +0000 * Fix for a NULL upgrade, Postgresql doesn't like an SQL file with no query. web/upgrade/15/pgsql.sql | 1 - 1 file changed, 1 deletion(-) commit b3d31cd1f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 26 15:39:05 2010 +0000 Layout and text tweaks web/edit_area_room.php | 24 ++++++++++-------------- web/lang.en | 2 +- 2 files changed, 11 insertions(+), 15 deletions(-) commit 86983e07e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 26 14:37:18 2010 +0000 Merged in latest changes from the trunk web/edit_area_room.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit f5c1bda51 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 26 14:35:00 2010 +0000 Merged in latest changes from the trunk web/edit_area_room.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 614976767 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 26 14:22:50 2010 +0000 Fixed bug whereby values might not get updated web/edit_area_room.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit da78694c4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 25 23:36:16 2010 +0000 Merged the latest changes into the trunk. WARNING!!! The database versions have been renumbered as there was a clash between the trunk and this branch. Consequently versions 15-18 have been renumbered 17-20 (and 21 added to perform some tidy up), making room for 15 and 16 from the trunk. If you have been working from this branch and your database is at version 15 or above then you will need to drop your tables and re-create them. tables.my.sql | 3 +- tables.pg.pre73.sql | 3 +- tables.pg.sql | 3 +- web/Themes/default/header.inc | 35 ++- web/add.php | 42 ++- web/dbsys.inc | 2 +- web/edit_area_room.php | 493 ++++++++++++++++--------------- web/edit_entry.php | 28 +- web/functions.inc | 10 +- web/internalconfig.inc.php | 16 +- web/lang.ca | 2 +- web/lang.en | 5 +- web/lang.es | 2 +- web/mrbs-ielte7.css.php | 1 + web/mrbs.css.php | 1 + web/systemdefaults.inc.php | 4 +- web/upgrade/15/mysql.sql (new) | 1 + web/upgrade/15/pgsql.sql (new) | 1 + web/upgrade/15/post.inc (new) | 40 +++ web/upgrade/16/mysql.sql (new) | 6 + web/upgrade/16/pgsql.sql (new) | 6 + web/upgrade/16/post.inc (new) | 19 ++ web/upgrade/21/mysql.sql (new) | 1 + web/upgrade/21/pgsql.sql (new) | 1 + web/upgrade/21/post.inc (new) | 40 +++ 25 files changed, 496 insertions(+), 269 deletions(-) commit a378c017a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 25 22:40:56 2010 +0000 Bumped up version number in anticipation of a merge web/upgrade/{15 => 17}/mysql.sql | 0 web/upgrade/{15 => 17}/pgsql.sql | 0 web/upgrade/{15 => 17}/post.inc | 0 3 files changed, 0 insertions(+), 0 deletions(-) commit 3fae4ca0e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 25 22:39:31 2010 +0000 Bumped up version number in anticipation of a merge web/upgrade/{16 => 18}/mysql.sql | 0 web/upgrade/{16 => 18}/pgsql.sql | 0 2 files changed, 0 insertions(+), 0 deletions(-) commit e9e609791 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 25 22:38:29 2010 +0000 Bumped up version number in anticipation of a merge web/upgrade/{17 => 19}/mysql.sql | 0 web/upgrade/{17 => 19}/pgsql.sql | 0 2 files changed, 0 insertions(+), 0 deletions(-) commit 106704359 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 25 22:37:26 2010 +0000 Bumped up version number in anticipation of a merge web/upgrade/{18 => 20}/mysql.sql | 0 web/upgrade/{18 => 20}/pgsql.sql | 0 2 files changed, 0 insertions(+), 0 deletions(-) commit c9102d0ae Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 25 17:02:42 2010 +0000 Merged in latest changes from the trunk web/Themes/default/header.inc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) commit 6736524c2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 25 16:58:35 2010 +0000 Fixed JavaScript undefined object problem web/Themes/default/header.inc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) commit f0d57a8a8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 25 16:51:18 2010 +0000 - Corrected previous fix - Checked the All Day checkbox if appropriate on page load web/Themes/default/header.inc | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) commit 7512e6a0a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 25 16:18:44 2010 +0000 Fixed JavaScript undefined object problem web/Themes/default/header.inc | 81 ++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 37 deletions(-) commit b4c3e585d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 25 11:42:53 2010 +0000 Merged in latest changes from the trunk web/systemdefaults.inc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 3acab4b51 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 25 11:40:21 2010 +0000 Added comment that $enable_periods is now settable per-area web/systemdefaults.inc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit db56633a4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 25 11:35:37 2010 +0000 Merged in latest changes from the trunk tables.my.sql | 3 +- tables.pg.pre73.sql | 5 +- tables.pg.sql | 5 +- web/Themes/default/header.inc | 30 ++ web/add.php | 42 ++- web/dbsys.inc | 2 +- web/edit_area_room.php | 493 ++++++++++++++++--------------- web/functions.inc | 15 +- web/internalconfig.inc.php | 11 + web/lang.en | 5 +- web/mrbs-ielte7.css.php | 1 + web/mrbs.css.php | 1 + web/upgrade/15/mysql.sql (new) | 1 + web/upgrade/15/pgsql.sql (new) | 1 + web/upgrade/15/post.inc (new) | 40 +++ web/upgrade/16/mysql.sql (new) | 6 + web/upgrade/16/pgsql.sql (new) | 6 + web/upgrade/16/post.inc (new) | 19 ++ 18 files changed, 428 insertions(+), 258 deletions(-) commit c46ccc157 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 25 11:30:48 2010 +0000 Implemented $enable_periods on a per-area basis. This means that sites can now have some areas using periods and others using time slots. tables.my.sql | 3 +- tables.pg.pre73.sql | 5 +- tables.pg.sql | 5 +- web/Themes/default/header.inc | 30 ++ web/dbsys.inc | 2 +- web/edit_area_room.php | 493 ++++++++++++++++--------------- web/functions.inc | 10 +- web/internalconfig.inc.php | 4 +- web/lang.en | 5 +- web/mrbs-ielte7.css.php | 1 + web/mrbs.css.php | 1 + web/upgrade/16/mysql.sql (new) | 6 + web/upgrade/16/pgsql.sql (new) | 6 + web/upgrade/16/post.inc (new) | 19 ++ 14 files changed, 339 insertions(+), 251 deletions(-) commit 76df3cb16 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 23 13:10:24 2010 +0000 Update the area table replacing any NULLs with the per-area settings defaults. This is the second and final part of a fix to a bug which caused Search and Report not to find all the results that they should have done if you were not logged in as an admin. tables.my.sql | 2 +- tables.pg.pre73.sql | 2 +- tables.pg.sql | 2 +- web/dbsys.inc | 2 +- web/upgrade/15/mysql.sql (new) | 1 + web/upgrade/15/pgsql.sql (new) | 1 + web/upgrade/15/post.inc (new) | 40 ++++++++++++++++++++++++++++++++ 7 files changed, 46 insertions(+), 4 deletions(-) commit ec4fd656a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 23 12:25:13 2010 +0000 Changed Add Area so that it writes the default area settings to the database rather than NULL. This is the first part of a fix to a bug which caused Search and Report not to find all the results that they should have done if you were not logged in as an admin. (Second part will be to update existing rows in the area table replacing NULLs with the area defaults). web/add.php | 42 ++++++++++++++++++++++++++++++++---- web/functions.inc | 7 ++---- web/internalconfig.inc.php | 9 ++++++++ 3 files changed, 49 insertions(+), 9 deletions(-) commit 09f16a674 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 22 19:25:22 2010 +0000 Fixed problem of rounding of days in duration web/Themes/default/header.inc | 1 + 1 file changed, 1 insertion(+) commit e7cae5d5c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 22 17:34:55 2010 +0000 - fixed bug which meant that preventing multiday bookings didn't work properly - made disabling of the start and end times and all day checkbox work properly web/Themes/default/header.inc | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) commit c871dee0d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 22 16:16:55 2010 +0000 Fixed bug so that when All Day is checked the end time displays the correct duration web/Themes/default/header.inc | 10 +++++++--- web/edit_entry.php | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) commit bad156d07 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 22 15:56:47 2010 +0000 Fixed bug which caused the last slot to be unbookable (and also an All Day booking to have the wrong values in the form) web/edit_entry.php | 1 + 1 file changed, 1 insertion(+) commit 591ae20c0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 22 15:43:45 2010 +0000 Added the ability to prevent ordinary users from making multi-day bookings. Controlled by $auth['only_admin_can_book_multiday'] web/Themes/default/header.inc | 34 +++++++++++++++++++++++---------- web/edit_entry.php | 5 +++++ web/edit_entry_handler.php | 9 +++++++++ web/systemdefaults.inc.php | 3 +++ 4 files changed, 41 insertions(+), 10 deletions(-) commit d00b6b4db Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 22 14:27:07 2010 +0000 Added days to the duration web/Themes/default/header.inc | 93 +++++++++++++++++++++++---------- web/lang.en | 7 +++ 2 files changed, 71 insertions(+), 29 deletions(-) commit 94ce5688b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 22 10:51:17 2010 +0000 Fixed the select box resizing so that they resize themselves before being adjusted (otherwise they don't shrink if the content has got narrower) web/Themes/default/header.inc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) commit 0aefeef0d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 22 10:24:46 2010 +0000 Changed the way the start and end select boxes operate so that if the start time is changed, then the end time is changed keeping the duration the same. If the end time is changed then the start time is kept constant and the duration is changed. web/Themes/default/header.inc | 61 +++++++++++++++------------------ 1 file changed, 27 insertions(+), 34 deletions(-) commit cb521340a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 22 10:03:13 2010 +0000 Fixed parse error web/edit_entry_handler.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) commit 3b63d1e6f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 22 09:15:37 2010 +0000 Made the widths of the start and time select boxes equal after each change. Thanks to jQuery. web/Themes/default/header.inc | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) commit 741552e97 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 22 08:41:07 2010 +0000 Fixed bug whereby integer durations (eg 10 hours) were having trailing zeros stripped web/Themes/default/header.inc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) commit fbc9ae5ad Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 21 17:02:54 2010 +0000 Merged in latest changes from the trunk INSTALL | 38 ++++++++++++++++++++++++++ web/Themes/default/header.inc | 12 ++++++++- web/edit_area_room.php | 24 ++++++++++++----- web/edit_entry.php | 47 ++++++++++++++++++++++++++++++++- web/edit_entry_handler.php | 22 +++++++++++++++ web/functions.inc | 7 ++++- web/functions_mail.inc | 34 +++++++++++++++++++----- web/lang.en | 3 +++ web/mrbs-ie8.css | 1 + web/mrbs.css.php | 6 ++--- web/session_cookie.inc | 19 +++++++++---- web/session_php.inc | 4 +-- web/systemdefaults.inc.php | 8 ++++-- 13 files changed, 197 insertions(+), 28 deletions(-) commit 8b6994731 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 21 16:49:27 2010 +0000 Removed duplicate definitions ("valid_time_of_day") web/lang.ca | 2 +- web/lang.es | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 7b61cb5e8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 21 13:57:25 2010 +0000 Fixed bug whereby the duration was being shown on the selected start time web/Themes/default/header.inc | 34 +++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) commit 64663e7c3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 21 13:44:45 2010 +0000 Removed the valid time of day check, which is now redundant. web/edit_entry.php | 12 ------------ web/lang.ca | 3 +-- web/lang.cs | 1 - web/lang.da | 1 - web/lang.de | 1 - web/lang.el | 1 - web/lang.en | 1 - web/lang.es | 3 +-- web/lang.eu | 1 - web/lang.fi | 1 - web/lang.fr | 1 - web/lang.it | 1 - web/lang.ja | 1 - web/lang.ko | 1 - web/lang.nl | 1 - web/lang.no | 1 - web/lang.pl | 1 - web/lang.pt | 1 - web/lang.sl | 1 - web/lang.sv | 1 - web/lang.tr | 1 - web/lang.zh-cn | 1 - web/lang.zh-tw | 1 - 23 files changed, 2 insertions(+), 36 deletions(-) commit abeca8fdb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 21 13:34:36 2010 +0000 Extended the check that the start day is not after the end day to the form submission validation web/Themes/default/header.inc | 51 ++++++++++++++++++--------------- web/edit_entry.php | 11 +++++++ web/lang.en | 2 ++ 3 files changed, 41 insertions(+), 23 deletions(-) commit 8758c6cbb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 21 13:16:59 2010 +0000 Added a check to see that the start day is not after the end day web/Themes/default/header.inc | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) commit ce5485358 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 21 12:51:20 2010 +0000 Removed the display of duration if the booking is spanning more than one day (the display gets too complicated visually) web/Themes/default/header.inc | 63 +++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 11 deletions(-) commit 26b26488e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 21 11:22:51 2010 +0000 Corrected the end date and time when editing a series web/edit_entry.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit 76fba3be2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 21 11:10:34 2010 +0000 Added in durations web/Themes/default/header.inc | 89 ++++++++++++++++++++++++++++++--- 1 file changed, 82 insertions(+), 7 deletions(-) commit f5fbcdeeb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 21 07:50:11 2010 +0000 From and To times now adjusted automatically to prevent zero or negative booking durations. web/Themes/default/header.inc | 85 ++++++++++++++++++++++++++++++++- web/edit_entry.php | 4 +- 2 files changed, 86 insertions(+), 3 deletions(-) commit 38fd2ce22 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 20 15:20:18 2010 +0000 Bookings now specified in terms of start and end date and time, instead of duration. Duration has yet to be added back in (using JavaScript) web/edit_entry.php | 223 ++++++++++++----------------------- web/edit_entry_handler.php | 74 ++++-------- web/lang.en | 1 + web/mrbs-ie.css | 3 +- web/mrbs.css.php | 4 +- 5 files changed, 99 insertions(+), 206 deletions(-) commit b8f7807a4 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Oct 20 11:42:27 2010 +0000 * Made the new mandatory field checking Javascript code compatible with IE, by using jQuery. web/edit_entry.php | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) commit 24e45f7a3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 19 10:51:13 2010 +0000 Merged in latest changes from the trunk INSTALL | 38 +++++++++++++++++++++++++++++++++++ web/edit_entry.php | 39 +++++++++++++++++++++++++++++++++++- web/edit_entry_handler.php | 21 +++++++++++++++++++ web/functions.inc | 7 ++++++- web/lang.en | 2 ++ web/session_cookie.inc | 19 +++++++++++++----- web/session_php.inc | 4 ++-- web/systemdefaults.inc.php | 8 ++++++-- 8 files changed, 127 insertions(+), 11 deletions(-) commit 7ceeece28 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 19 10:40:33 2010 +0000 Added documentation on making custom fields private. INSTALL | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit fdd62164c Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Oct 19 08:36:05 2010 +0000 * Renamed the new config array $mandatory_fields to $is_mandatory_field to match the existing convention. Also added some documentation of this new configuration option into systemdefaults.inc.php. INSTALL | 2 +- web/edit_entry.php | 8 ++++---- web/edit_entry_handler.php | 4 ++-- web/systemdefaults.inc.php | 4 ++++ 4 files changed, 11 insertions(+), 7 deletions(-) commit f3d2a94dc Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Oct 18 16:44:06 2010 +0000 * Fixed accidental checkin of debug code. Documented the new $auth["session_cookie"]["session_expire_time"] fucntionality in systemdefaults.inc.php. web/session_cookie.inc | 15 ++++++--------- web/systemdefaults.inc.php | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) commit 89f8308f1 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Oct 18 16:32:17 2010 +0000 * Added support for setting 'cookie' session scheme to use only session cookies. For this set $auth["session_cookie"]["session_expire_time"] to 0. Fixed token checking code, so this it takes notice of this variable. web/session_cookie.inc | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) commit 084ec473f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 18 16:10:43 2010 +0000 Moved the code for generating the start date and time into a function (so that it can be re-used for the end time) web/edit_entry.php | 192 ++++++++++++++++++++++++------------------- 1 file changed, 106 insertions(+), 86 deletions(-) commit 6cc706d3c Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Oct 18 16:07:50 2010 +0000 * Fixed an unescaped / in a regular expression. web/session_cookie.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c37aa4356 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Oct 18 16:06:52 2010 +0000 * Changed default value of $cookie_path_override to unset. web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 475bce74e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 18 15:25:11 2010 +0000 Reversed the order of session_name() and session_set_cookie_params() for safety (see PHP manual) web/session_php.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d26dcce54 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 18 15:16:03 2010 +0000 Fixed problem which gave a warning in regular expression web/session_php.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a92c3d547 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Oct 18 11:30:51 2010 +0000 * Added the ability to make a custom entry field mandatory. Introduces the config variable $mandatory_fields. * Documented $select_options and $mandatory_fields in INSTALL. INSTALL | 26 ++++++++++++++++++++++++ web/edit_entry.php | 39 +++++++++++++++++++++++++++++++++++- web/edit_entry_handler.php | 21 +++++++++++++++++++ web/functions.inc | 7 ++++++- web/lang.en | 2 ++ 5 files changed, 93 insertions(+), 2 deletions(-) commit ce97e6d60 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 15 16:26:19 2010 +0000 Merged in latest changes from the trunk web/functions_mail.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit e51700a8e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 15 16:09:25 2010 +0000 Fixed problem with internationalisation of email notifications web/functions_mail.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit 56be23790 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 15 10:21:44 2010 +0000 Added an optional $disabled parameter to the form input generating functions web/edit_entry.php | 2 +- web/edit_users.php | 4 ++-- web/functions.inc | 43 ++++++++++++++++++++++++++++++++++--------- 3 files changed, 37 insertions(+), 12 deletions(-) commit af68c1deb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 15 09:57:31 2010 +0000 Merged in latest changes from the trunk web/edit_area_room.php | 24 ++++++++++++++++++------ web/functions_mail.inc | 26 ++++++++++++++++++++++---- web/lang.en | 1 + web/mrbs.css.php | 2 +- 4 files changed, 42 insertions(+), 11 deletions(-) commit 9f00f2f48 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 15 09:44:32 2010 +0000 - Made the area and room admin email address boxes textareas - Allowed newlines to be used as address separators as well as commas - Added a title tooltip explaining this - Made formatting of textareas consistent in the edit_area_room page web/edit_area_room.php | 24 ++++++++++++++++++------ web/functions_mail.inc | 26 ++++++++++++++++++++++---- web/lang.en | 1 + web/mrbs.css.php | 2 +- 4 files changed, 42 insertions(+), 11 deletions(-) commit 978f2f932 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 14 17:10:20 2010 +0000 Merged in latest changes from the trunk web/Themes/default/header.inc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) commit 827f95f6e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 14 17:04:00 2010 +0000 Improved the localisation of the datepicker calendar so that if the broswer language is set to xx-YY, MRBS will try and use the datepicker xx localisation if there isn't one for xx-YY. web/Themes/default/header.inc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) commit 761fec45d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 14 16:38:15 2010 +0000 Created separate subject lines for new and changed emails, rather than having the combined "added/changed" subject. web/functions_mail.inc | 3 ++- web/lang.en | 9 +++++---- web/lang.es | 9 +++++---- web/lang.fi | 9 +++++---- web/lang.fr | 9 +++++---- web/lang.it | 9 +++++---- web/lang.ja | 9 +++++---- web/lang.nl | 9 +++++---- web/lang.pl | 9 +++++---- web/lang.sl | 9 +++++---- web/lang.tr | 9 +++++---- 11 files changed, 52 insertions(+), 41 deletions(-) commit a64881e54 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 14 16:01:19 2010 +0000 Made the code for displaying the name field in the Edit User form generic so that it can also be used for custom fields that should only be editable by admins web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4cd5f183f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 13 13:24:15 2010 +0000 Merged in latest changes from the trunk ChangeLog | 1017 +++++++++++++++++++++++++++++++++++++------- NEWS | 31 ++ web/mrbs-ie8.css | 1 + web/mrbs.css.php | 4 +- web/version.inc | 2 +- 5 files changed, 891 insertions(+), 164 deletions(-) commit 1dc9747c1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 13 07:46:50 2010 +0000 Fixed a problem with the formatting of radio button labels on the edit area page in IE8. web/mrbs-ie8.css | 1 + web/mrbs.css.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) commit b9b078fc7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 11 10:49:08 2010 +0000 Moved date and time/period onto the same line and renamed it "Start" (in preparation for adding an "End" line) web/edit_entry.php | 48 ++++++++++++++++++-------------------------- web/lang.en | 1 + 2 files changed, 21 insertions(+), 28 deletions(-) commit fb5ebf1ff Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Oct 11 09:56:58 2010 +0000 Created a new branch for the development of bookings From and To a date/time, as opposed to From and a Duration. commit 4fac34953 (tag: mrbs-1_4_5rc1) Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Oct 8 09:28:53 2010 +0000 * Updated NEWS and ChangeLog for 1.4.5rc1 release. ChangeLog | 1017 +++++++++++++++++++++++++++++++++++++++++++-------- NEWS | 31 ++ 2 files changed, 887 insertions(+), 161 deletions(-) commit e80178d1d Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Oct 8 09:05:56 2010 +0000 * Updated version number for 1.4.5rc1 release. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5c5435b38 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 6 15:20:47 2010 +0000 Merged in latest changes from the trunk web/edit_entry.php | 39 ++++++++++++++-------------- web/functions.inc | 11 ++++++-- web/month.php | 2 +- web/mrbs_sql.inc | 4 +-- web/systemdefaults.inc.php | 12 ++++++++- web/view_entry.php | 50 +++++++++++++++++++----------------- 6 files changed, 68 insertions(+), 50 deletions(-) commit a53cd31dd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 6 14:59:45 2010 +0000 Added the ability to choose which fields in the entry table should be regarded as private. Controlled by an array $is_private_field in the config file, indexed by tablename.columnname. web/edit_entry.php | 38 +++++++++++++-------------- web/functions.inc | 11 ++++++-- web/month.php | 2 +- web/mrbs_sql.inc | 2 +- web/systemdefaults.inc.php | 12 ++++++++- web/view_entry.php | 50 +++++++++++++++++++----------------- 6 files changed, 66 insertions(+), 49 deletions(-) commit 4e48064d5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 5 07:47:50 2010 +0000 Merged in latest changes from the trunk web/search.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) commit e6d150d1c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 5 07:45:24 2010 +0000 Fixed bug which caused Previous and Next links in search results not to work properly if the search start date was not the same as today's date. web/search.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) commit 44f638ea9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 30 14:12:22 2010 +0000 Merged in latest changes from the trunk INSTALL | 54 ++++++++++++++++++++++++++- web/add.php | 11 ++++-- web/admin.php | 12 +++--- web/edit_area_room.php | 21 ++++++----- web/edit_entry.php | 54 +++------------------------ web/edit_entry_handler.php | 2 +- web/edit_users.php | 71 +++++++++++++++++++----------------- web/functions.inc | 43 ++++++++++++++++++++++ web/internalconfig.inc.php | 19 ++++++---- web/lang.en | 1 + web/mrbs_sql.inc | 4 +- web/systemdefaults.inc.php | 7 ++-- 12 files changed, 187 insertions(+), 112 deletions(-) commit c5d4cf79b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 30 13:16:21 2010 +0000 Fixed bug which allowed rooms and areas to be created with no name. web/add.php | 11 ++++++++--- web/lang.en | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) commit eac75e065 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 30 13:04:21 2010 +0000 Fixed bug whereby special characters in custom fields were being truncated in the middle of an HTML entity. web/admin.php | 12 +++++++----- web/edit_users.php | 10 +++++----- 2 files changed, 12 insertions(+), 10 deletions(-) commit 271b1dbbe Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 30 12:11:55 2010 +0000 Simplified code by getting rid of magic prefix for custom fields and replacing it with a constant. web/edit_area_room.php | 19 ++++++++++--------- web/edit_entry.php | 11 ++++++----- web/edit_entry_handler.php | 2 +- web/edit_users.php | 2 -- web/internalconfig.inc.php | 19 ++++++++++++------- 5 files changed, 29 insertions(+), 24 deletions(-) commit f5ef4a32b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 30 11:44:50 2010 +0000 Extended $select_options (ie constraining fields to a set of pre-defined values) to custom fields in the users table web/edit_area_room.php | 2 ++ web/edit_entry.php | 43 ------------------------ web/edit_users.php | 63 ++++++++++++++++++++---------------- web/functions.inc | 43 ++++++++++++++++++++++++ web/mrbs_sql.inc | 4 ++- web/systemdefaults.inc.php | 7 ++-- 6 files changed, 86 insertions(+), 76 deletions(-) commit 49417203d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 30 10:05:11 2010 +0000 Added note imposing a restriction on custom field names, together with an explanation. (The restriction is to names consisting of letters, numbers and underscores) INSTALL | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) commit 007a3bd3d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 26 15:59:47 2010 +0000 Merged in latest changes from the trunk web/day.php | 18 ++++++++++-------- web/functions.inc | 17 ++++++++++++++--- web/images/repeat.png (new) | Bin 0 -> 469 bytes web/month.php | 17 ++++++++++------- web/mrbs.css.php | 3 +++ web/week.php | 14 +++++++------- 6 files changed, 44 insertions(+), 25 deletions(-) commit f2d8b293a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 24 17:44:14 2010 +0000 Added a repeat symbol to the display of series on the day, week and month views. web/day.php | 18 ++++++++++-------- web/functions.inc | 17 ++++++++++++++--- web/images/repeat.png (new) | Bin 0 -> 469 bytes web/month.php | 23 ++++++++++++----------- web/mrbs.css.php | 3 +++ web/week.php | 14 +++++++------- 6 files changed, 46 insertions(+), 29 deletions(-) commit 6378abac7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 24 10:55:42 2010 +0000 Merged in latest changes from the trunk web/edit_users.php | 2 +- web/lang.pt | 4 ++-- web/mrbs.css.php | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) commit a280ef8ea Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 24 10:52:11 2010 +0000 Fixed spelling error web/lang.pt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit a935a1e40 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 24 10:03:32 2010 +0000 Fixed a problem with the positioning of the "last admin" warning message web/edit_users.php | 2 +- web/mrbs.css.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) commit b092aa2b0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 23 15:53:55 2010 +0000 Merged in latest changes from the trunk web/Themes/default/header.inc | 6 +++++ .../ui/jquery-ui-datepicker-pt.js (new) | 24 ++++++++++++++++++ 2 files changed, 30 insertions(+) commit 9d03bf3e1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 23 15:46:19 2010 +0000 Set the default setting to 'pt' instead of 'pt-BR' web/jquery/ui/jquery-ui-datepicker-pt.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a3043b70a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 23 15:28:46 2010 +0000 Added a Portuguese localisation for the datepicker pop-up calendar. (The standard package just has a Portuguese-Brazilian localisation. I am submitting the Portuguese version to the datepicker team). web/Themes/default/header.inc | 6 +++++ .../ui/jquery-ui-datepicker-pt.js (new) | 24 ++++++++++++++++++ 2 files changed, 30 insertions(+) commit 3ac6d70a6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 23 11:25:57 2010 +0000 Simplified code. No functionality change. web/functions_mail.inc | 66 ++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 43 deletions(-) commit ae8d454ef Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 23 11:03:48 2010 +0000 Fixed bug (introduced in Rev 1454) which gave incorrect end dates and repeat end dates in email notifications. web/functions_mail.inc | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) commit 34ba8478e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 23 10:38:25 2010 +0000 Merged in latest changes from the trunk INSTALL | 22 ++++++++++++++++++++++ web/day.php | 14 +++++++++++--- web/edit_entry_handler.php | 8 +++++++- web/functions.inc | 10 +++++++++- web/lang.en | 1 + web/month.php | 4 +++- web/mrbs.css.php | 7 +++++-- web/systemdefaults.inc.php | 6 ++++++ web/week.php | 4 +++- 9 files changed, 67 insertions(+), 9 deletions(-) commit e0ab53fdc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 23 10:33:22 2010 +0000 Fixed a bug whereby the repeat type was being incorrectly reported in email notifications for changed entries. web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 940957f59 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 23 10:09:47 2010 +0000 Limited any floating point durations in email notifications and view_entry to 3 decimal places (previously there could be 11 decimal places) web/functions.inc | 7 +++++++ 1 file changed, 7 insertions(+) commit b2faf4aea Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 23 09:50:14 2010 +0000 Fixed a problem whereby email notifications reported the originally requested duration, rather than the actual duration after adjusting the request to fit into slot boundaries. This was potentially confusing as the duration in the email notification would differ from (a) the details in view_entry and (b) the details in the delete notification when the same booking was deleted. web/edit_entry_handler.php | 8 +++++++- web/functions.inc | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) commit 37ea0c44c Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Sep 22 12:54:28 2010 +0000 * Made banner date field a little wider, it didn't fit "22/09/2010" for me. web/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 68829f9f0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 21 08:13:58 2010 +0000 Added an optional display of the timezone to the day view. See SF Feature Requests item #3065070 web/day.php | 14 +++++++++++--- web/lang.en | 1 + web/month.php | 4 +++- web/mrbs.css.php | 5 ++++- web/systemdefaults.inc.php | 3 +++ web/week.php | 4 +++- 6 files changed, 25 insertions(+), 6 deletions(-) commit 946d3fda8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 20 14:13:17 2010 +0000 Added information on inserting new periods in an existing system. INSTALL | 22 ++++++++++++++++++++++ web/systemdefaults.inc.php | 3 +++ 2 files changed, 25 insertions(+) commit ba571840b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 20 13:10:11 2010 +0000 Removed redundant reference to old style provisional booking. web/internalconfig.inc.php | 1 - 1 file changed, 1 deletion(-) commit 0d1633b52 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 20 09:43:45 2010 +0000 Merged in latest changes from the trunk INSTALL | 2 +- web/config.inc.php | 2 +- web/edit_entry.php | 126 ++++++++++++++++++++++++++--------- web/systemdefaults.inc.php | 20 ++++++ 4 files changed, 118 insertions(+), 32 deletions(-) commit 580888778 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 20 09:07:04 2010 +0000 Fixed a bug which caused in some browsers (eg IE) the error message "You have not entered a Brief Description" when using select boxes. web/edit_entry.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) commit ab0014c50 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 17 15:28:10 2010 +0000 Added the ability to constrain certain fields (name, description and custom fields) in the entry table to a set of values defined in the config file. web/edit_entry.php | 109 ++++++++++++++++++++++++++--------- web/systemdefaults.inc.php | 21 +++++++ 2 files changed, 104 insertions(+), 26 deletions(-) commit 1c24d3fb4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 17 09:57:54 2010 +0000 Added confirmation status and approval status to delete notification email details. web/functions_mail.inc | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) commit 6928b5585 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 17 08:28:04 2010 +0000 Changed link to list of supported timezones to remove the assumption of English. INSTALL | 2 +- web/config.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 8a0990704 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 15 15:39:32 2010 +0000 Tidied up the code by having a consistent use of the array index 'end_date'. No functionality change. web/approve_entry_handler.php | 1 - web/edit_entry_handler.php | 10 +++++----- web/functions_mail.inc | 6 +++--- web/mrbs_sql.inc | 21 +++++---------------- web/view_entry.php | 2 +- 5 files changed, 14 insertions(+), 26 deletions(-) commit d2bf85d33 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 15 15:17:08 2010 +0000 Simplified code (put the data for an entry into an array). No functionality change. web/approve_entry_handler.php | 33 +++------- web/edit_entry_handler.php | 72 ++++++++++----------- web/functions_mail.inc | 70 ++++++++++----------- web/mrbs_sql.inc | 108 +++++++------------------------- 4 files changed, 102 insertions(+), 181 deletions(-) commit 6a0ce6d04 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 15 09:13:17 2010 +0000 Simplified SQL query and added a LIMIT 1 to improve performance web/edit_entry_handler.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit acf838888 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 15 09:02:05 2010 +0000 Simplified code. No functionality change. web/edit_entry_handler.php | 102 +++++++++++++---------------------- 1 file changed, 36 insertions(+), 66 deletions(-) commit 35ad1e1ca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 14 16:04:51 2010 +0000 - fixed bug which gave an invalid id message when editing a series with email notifications turned on - in the process changed the meaning of the $series parameter to mean that, if true, the $id is an id from the repeat table; this brings it into line with the rest of MRBS, except for del_entry.php which will have to be changed sometime later. web/edit_entry_handler.php | 8 ++++---- web/functions_mail.inc | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) commit 55c226baa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 6 23:47:34 2010 +0000 Merged in latest changes from the trunk web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 26e7a46e4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 6 23:27:29 2010 +0000 Changed form method from "get" to "post" to avoid long URLs (even more important now with custom fields) web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit fb5cac4ff Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 5 14:07:12 2010 +0000 Merged in latest changes from the trunk web/del_entry.php | 2 +- web/edit_area_room.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) commit b5b7e0b91 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 5 13:42:13 2010 +0000 Fixed bug whereby it was possible for delete notification emails to be sent even though they hadn't been requested. web/del_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 78e7312e6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 5 13:33:36 2010 +0000 Moved the Custom HTML section into the General Settings fieldset. web/edit_area_room.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 1f2457d11 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 5 12:38:28 2010 +0000 Merged in latest changes from the trunk web/internalconfig.inc.php | 33 +++++++++++++++++++++++++-------- web/lang.en | 2 +- 2 files changed, 26 insertions(+), 9 deletions(-) commit 3df977f61 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 5 12:30:52 2010 +0000 Tidied up $area_defaults web/internalconfig.inc.php | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) commit 9f871693c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 5 12:17:19 2010 +0000 Added advice to backup the database before upgrading. web/lang.en | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f43ed89a7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 3 11:33:44 2010 +0000 - Added the ability to filter reports on the various status settings - Fixed bugs caused by incorrect use of SQL predicates involving the status bits (ie using them as integers rather than booleans) web/Themes/default/header.inc | 21 +--- web/functions.inc | 30 +++++ web/functions_mail.inc | 4 +- web/internalconfig.inc.php | 3 +- web/lang.en | 9 +- web/mrbs.css.php | 5 +- web/pending.php | 11 +- web/report.php | 212 ++++++++++++++++++++++++++++---- web/search.php | 4 +- web/view_entry.php | 2 +- 10 files changed, 245 insertions(+), 56 deletions(-) commit eb6652083 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 2 14:17:01 2010 +0000 Merged in latest changes from the trunk tables.pg.pre73.sql | 6 +++--- tables.pg.sql | 6 +++--- web/edit_area_room.php | 1 + web/upgrade/8/pgsql.sql | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) commit 1edd9da16 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 2 13:59:58 2010 +0000 - Added a table prefix to PostgreSQL index name to make it unique. - Fixed a bug which would have resulted in a failure to upgrade if using PostgreSQL and other than the default table prefix web/upgrade/8/pgsql.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4f2e33235 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 2 13:35:10 2010 +0000 Tidied up the code (no actual bug, but the conversion of one variable from a boolean to an int was missing as part of a defensive measure necessary for PostgreSQL) web/edit_area_room.php | 1 + 1 file changed, 1 insertion(+) commit 6bd00055e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 2 13:08:53 2010 +0000 Added a table prefix to PostgreSQL index names to make them unique. tables.pg.pre73.sql | 6 +++--- tables.pg.sql | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) commit 9a1fbce6d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 2 10:21:40 2010 +0000 - Converted the status field in the entry and repeat tables into an unsigned tinyint (MySQL only: PostgreSQL does not support unsigned, but then the status field is a smallint as PostgreSQL does not support tinyint either, so it does not matter) - Enabled the confirmation settings to be set on a per-area basis tables.my.sql | 8 +++++--- tables.pg.pre73.sql | 6 ++++-- tables.pg.sql | 6 ++++-- web/dbsys.inc | 2 +- web/edit_area_room.php | 34 ++++++++++++++++++++++++++++++++ web/functions.inc | 7 +++++-- web/lang.en | 9 +++++++-- web/upgrade/18/mysql.sql (new) | 24 ++++++++++++++++++++++ web/upgrade/18/pgsql.sql (new) | 11 +++++++++++ 9 files changed, 95 insertions(+), 12 deletions(-) commit f447ad525 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 1 15:19:00 2010 +0000 Removed a redundant line of code web/edit_entry.php | 1 - 1 file changed, 1 deletion(-) commit 0feda4292 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 1 15:05:00 2010 +0000 Merged in latest changes from the trunk web/systemdefaults.inc.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) commit 5b99eb908 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 1 14:42:32 2010 +0000 Implemented new style provisional bookings, which are now known as "tentative" bookings. A booking can now have three, independent, statuses: - Privacy status (public or private) - Approval status (approved or awaiting approval) - Confirmation status (confirmed or tentative) web/edit_entry.php | 62 ++++++++++++++++++++++++------------ web/edit_entry_handler.php | 7 ++++ web/functions.inc | 34 +++++++++++++------- web/functions_mail.inc | 19 ++++++++--- web/internalconfig.inc.php | 1 + web/lang.en | 61 +++++++++++++++++++---------------- web/month.php | 14 +++++--- web/mrbs.css.php | 6 ++-- web/systemdefaults.inc.php | 14 +++++++- web/view_entry.php | 9 +++++- 10 files changed, 154 insertions(+), 73 deletions(-) commit d892e95b4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 1 13:36:10 2010 +0000 Changed the comments associated with the $private_default config variable to reflect the way the code actually works and, presumably, the way it was intended to work. (Previously if you set $private_enabled to FALSE and $private_default to TRUE then the comments indicated that all new bookings would be marked as private. But this isn't the way the code works, and if you wanted to achieve that you could do it by setting $private_mandatory to TRUE). web/systemdefaults.inc.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) commit ce5185617 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 1 10:06:58 2010 +0000 Tightened up on the use of "accept" and "confirm" with respect to bookings requiring approval. "Approve" is now used instead. This is to avoid confusion with the forthcoming new style provisional bookings which will allow bookings to be confirmed (in the sense that they are definitely going to happen). ...handler.php => approve_entry_handler.php} | 12 +++++----- web/functions_mail.inc | 12 +++++----- web/lang.en | 10 ++++---- web/lang.ja | 10 ++++---- web/mrbs.css.php | 14 +++++------ web/mrbs_auth.inc | 2 +- web/mrbs_sql.inc | 8 +++---- web/pending.php | 10 ++++---- web/view_entry.php | 22 +++++++++--------- 9 files changed, 50 insertions(+), 50 deletions(-) commit b3a34d4d2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 1 08:38:11 2010 +0000 Renamed provisional bookings to avoid confusion with the new style provisional bookings that will appear soon. (Old style provisional bookings are now bookings requiring approval). tables.my.sql | 4 ++-- tables.pg.pre73.sql | 4 ++-- tables.pg.sql | 4 ++-- web/Themes/classic126/styling.inc | 2 +- web/Themes/default/header.inc | 24 +++++++++++------------ web/Themes/default/styling.inc | 2 +- web/confirm_entry_handler.php | 2 +- web/dbsys.inc | 2 +- web/del_entry.php | 2 +- web/edit_area_room.php | 14 +++++++------- web/edit_entry_handler.php | 10 +++++----- web/functions.inc | 20 +++++++++---------- web/functions_mail.inc | 16 +++++++-------- web/internalconfig.inc.php | 2 +- web/lang.en | 10 +++++----- web/lang.ja | 6 +++--- web/language.inc | 2 +- web/month.php | 4 ++-- web/mrbs.css.php | 10 +++++----- web/mrbs_auth.inc | 2 +- web/mrbs_sql.inc | 2 +- web/pending.php | 16 +++++++-------- web/systemdefaults.inc.php | 30 ++++++++++++++--------------- web/upgrade/17/mysql.sql (new) | 6 ++++++ web/upgrade/17/pgsql.sql (new) | 6 ++++++ web/view_entry.php | 12 ++++++------ 26 files changed, 112 insertions(+), 102 deletions(-) commit 594cd0205 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 31 15:23:41 2010 +0000 Combined the existing private and status fields into a single status field which now consists of bit flags - at the moment only two, for privacy and approval status, but shortly to be joined by the new style provisional bookings. INSTALL | 36 ++++- tables.my.sql | 7 +- tables.pg.pre73.sql | 7 +- tables.pg.sql | 7 +- web/Themes/default/header.inc | 21 ++- web/add.php | 14 +- web/confirm_entry_handler.php | 111 ++++++++------- web/day.php | 3 +- web/dbsys.inc | 2 +- web/defaultincludes.inc | 2 +- web/del_entry.php | 9 +- web/edit_entry.php | 7 +- web/edit_entry_handler.php | 22 +-- web/functions.inc | 35 ++--- web/functions_mail.inc | 234 ++++++++----------------------- web/internalconfig.inc.php | 33 +++-- web/month.php | 24 ++-- web/mrbs_sql.inc | 94 ++++++------- web/pending.php | 14 +- web/report.php | 4 +- web/search.php | 4 +- web/upgrade/15/mysql.sql (new) | 4 + web/upgrade/15/pgsql.sql (new) | 4 + web/upgrade/15/post.inc (new) | 93 ++++++++++++ web/upgrade/16/mysql.sql (new) | 10 ++ web/upgrade/16/pgsql.sql (new) | 10 ++ web/view_entry.php | 13 +- web/week.php | 4 +- 28 files changed, 445 insertions(+), 383 deletions(-) commit 93b5b1578 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 31 14:17:39 2010 +0000 - Fixed bug whereby the default area settings (eg $provisional_enabled) were not being picked up properly - Fixed bug whereby new areas were being created with the incorrect default privacy settings web/Themes/default/header.inc | 19 ++++++++++++++++--- web/add.php | 14 ++++---------- web/defaultincludes.inc | 2 +- web/internalconfig.inc.php | 11 +++++++++++ web/pending.php | 12 +++++++++++- 5 files changed, 43 insertions(+), 15 deletions(-) commit 4b3709e95 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 29 08:54:14 2010 +0000 Updated the installation instructions to include more details on how to install MRBS on a remote web server. INSTALL | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) commit 490ff8a6e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 27 16:06:40 2010 +0000 Fixed a bug which gave an "Invalid series ID" message if you tried to delete a series and email notifications were turned on. web/del_entry.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit 845a61af0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 27 11:46:07 2010 +0000 Fixed bug which occurred in email notifications when the browser language was different to the email language: email notifications would show a change to the duration simply because the new and previous durations were in different languages. web/functions_mail.inc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) commit 64d69cb51 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 26 15:47:18 2010 +0000 Added missing break statement. No effect on MRBS functionality. web/edit_entry.php | 1 + 1 file changed, 1 insertion(+) commit 29ebc5f42 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 25 15:07:08 2010 +0000 Merged latest changes from the trunk into the provisional_bookings_new_style branch. web/Themes/default/header.inc | 214 +-- web/edit_entry.php | 12 +- web/edit_entry_handler.php | 19 +- web/functions.inc | 130 +- web/jquery/jquery-1.4.2.min.js (new) | 154 ++ ...iagonals-medium_20_d34d17_40x40.png (new) | Bin 0 -> 199 bytes .../ui-bg_flat_30_cccccc_40x100.png (new) | Bin 0 -> 180 bytes .../ui-bg_flat_50_5c5c5c_40x100.png (new) | Bin 0 -> 180 bytes ...bg_gloss-wave_45_817865_500x100.png (new) | Bin 0 -> 3971 bytes ...bg_gloss-wave_60_fece2f_500x100.png (new) | Bin 0 -> 3512 bytes ...bg_gloss-wave_70_ffdd57_500x100.png (new) | Bin 0 -> 3830 bytes ...bg_gloss-wave_90_fff9e5_500x100.png (new) | Bin 0 -> 2257 bytes ...highlight-soft_100_feeebd_1x100.png (new) | Bin 0 -> 108 bytes ...i-bg_inset-soft_30_ffffff_1x100.png (new) | Bin 0 -> 100 bytes .../images/ui-icons_3d3d3d_256x240.png (new) | Bin 0 -> 4369 bytes .../images/ui-icons_bd7b00_256x240.png (new) | Bin 0 -> 4369 bytes .../images/ui-icons_d19405_256x240.png (new) | Bin 0 -> 4369 bytes .../images/ui-icons_eb990f_256x240.png (new) | Bin 0 -> 4369 bytes .../images/ui-icons_ed9f26_256x240.png (new) | Bin 0 -> 5355 bytes .../images/ui-icons_fadc7a_256x240.png (new) | Bin 0 -> 4369 bytes .../images/ui-icons_ffe180_256x240.png (new) | Bin 0 -> 4369 bytes .../sunny/jquery-ui-1.8.4.custom.css (new) | 362 +++++ .../ui/jquery-ui-1.8.4.custom.min.js (new) | 179 +++ web/jquery/ui/jquery-ui-i18n.js (new) | 1176 ++++++++++++++++ web/language.inc | 25 +- web/mrbs.css.php | 2 + web/mrbs_sql.inc | 70 +- web/report.php | 18 +- web/search.php | 17 +- web/standard_vars.inc.php | 2 +- web/style.inc | 2 + web/systemdefaults.inc.php | 6 +- 32 files changed, 2190 insertions(+), 198 deletions(-) commit 5c556bddd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 25 14:52:15 2010 +0000 Corrected spelling error in a comment web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit eed67e37e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 25 14:48:22 2010 +0000 - Fixed bug which showed up when trying to accept a provisional repeat booking - Simplified the code web/mrbs_sql.inc | 69 +++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 41 deletions(-) commit 4dc577cc4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 25 10:44:59 2010 +0000 Made datepicker respect $override_locale if possible web/Themes/default/header.inc | 64 +++++++++++++++++++++++---------- web/language.inc | 25 ++++++++++++- 2 files changed, 69 insertions(+), 20 deletions(-) commit 769dfd0af Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 24 13:56:16 2010 +0000 Expanded the comments on min/max book_ahead for periods. web/systemdefaults.inc.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit 880949524 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 24 07:42:09 2010 +0000 Fixed bug that caused the message "Fatal error: Column 'rep_opt' specified twice" when making weekly and n-weekly repeat bookings. See SF Tracker ID: 3050845. web/mrbs_sql.inc | 1 + 1 file changed, 1 insertion(+) commit a23d9ad6b Merge: bca90e16d c73e6cad9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 19 17:01:17 2010 +0000 Merged datepicker branch (pop-up calendars) back into the trunk. commit c73e6cad9 (origin/datepicker) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 17 16:55:42 2010 +0000 Built the jQuery UI library into the MRBS tree rather than use the Google CDN. web/Themes/default/header.inc | 17 +- web/jquery/jquery-1.4.2.min.js (new) | 154 ++ ...iagonals-medium_20_d34d17_40x40.png (new) | Bin 0 -> 199 bytes .../ui-bg_flat_30_cccccc_40x100.png (new) | Bin 0 -> 180 bytes .../ui-bg_flat_50_5c5c5c_40x100.png (new) | Bin 0 -> 180 bytes ...bg_gloss-wave_45_817865_500x100.png (new) | Bin 0 -> 3971 bytes ...bg_gloss-wave_60_fece2f_500x100.png (new) | Bin 0 -> 3512 bytes ...bg_gloss-wave_70_ffdd57_500x100.png (new) | Bin 0 -> 3830 bytes ...bg_gloss-wave_90_fff9e5_500x100.png (new) | Bin 0 -> 2257 bytes ...highlight-soft_100_feeebd_1x100.png (new) | Bin 0 -> 108 bytes ...i-bg_inset-soft_30_ffffff_1x100.png (new) | Bin 0 -> 100 bytes .../images/ui-icons_3d3d3d_256x240.png (new) | Bin 0 -> 4369 bytes .../images/ui-icons_bd7b00_256x240.png (new) | Bin 0 -> 4369 bytes .../images/ui-icons_d19405_256x240.png (new) | Bin 0 -> 4369 bytes .../images/ui-icons_eb990f_256x240.png (new) | Bin 0 -> 4369 bytes .../images/ui-icons_ed9f26_256x240.png (new) | Bin 0 -> 5355 bytes .../images/ui-icons_fadc7a_256x240.png (new) | Bin 0 -> 4369 bytes .../images/ui-icons_ffe180_256x240.png (new) | Bin 0 -> 4369 bytes .../sunny/jquery-ui-1.8.4.custom.css (new) | 362 +++++ .../ui/jquery-ui-1.8.4.custom.min.js (new) | 179 +++ web/jquery/ui/jquery-ui-i18n.js (new) | 1176 ++++++++++++++++ web/style.inc | 2 +- 22 files changed, 1886 insertions(+), 4 deletions(-) commit 8c7cf645e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 13 20:02:47 2010 +0000 Moved the style link into style.inc web/Themes/default/header.inc | 1 - web/style.inc | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) commit f42986b50 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 13 18:49:27 2010 +0000 Fixed bug causing datepicker not to work in IE7 web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8272bb70a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 13 18:38:07 2010 +0000 Fixed bug which incorrectly set the default localisation. web/Themes/default/header.inc | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) commit 594baef18 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 13 18:02:45 2010 +0000 Tied labels to the datepicker input fields so that clicking on the label brings up the datepicker. web/edit_entry.php | 12 ++++++++---- web/edit_entry_handler.php | 19 +++++++++++-------- web/functions.inc | 9 +++------ web/report.php | 18 ++++++++---------- web/search.php | 17 +++++++++++++++-- 5 files changed, 45 insertions(+), 30 deletions(-) commit e7a4bc05c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 13 17:29:01 2010 +0000 Fixed HTML validation error web/Themes/default/header.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 088fbb061 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 13 16:37:47 2010 +0000 Initial implementation of datepicker date fields web/Themes/default/header.inc | 169 ++++++++++++++------------------ web/functions.inc | 133 ++++++++++++++++++------- web/mrbs.css.php | 2 + 3 files changed, 172 insertions(+), 132 deletions(-) commit 6b74efb53 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 13 09:58:50 2010 +0000 Created a branch for the development of pop-up calendars using jQuery UI datepicker commit bca90e16d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 10 21:30:05 2010 +0000 Fixed potential bug that might occur in some abnormal circumstances. web/standard_vars.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3ecfde90b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Aug 7 13:37:27 2010 +0000 Created a branch for the development of new style provisional bookings - ie bookings where the booker is not yet 100% sure the meeting will happen, as opposed to old style provisional bookings where bookings from ordinary users need to be approved by admins. commit 08ad834fb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 6 15:04:28 2010 +0000 Added a check that the entry table exists before commencing an upgrade, just in case this is a new installation and the database tables haven't even been created. (See SF Support Requests item #3039589). web/dbsys.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) commit 869b68799 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 6 11:11:38 2010 +0000 Fixed a problem with the positioning of the password policy error list web/mrbs.css.php | 1 + 1 file changed, 1 insertion(+) commit 14fe4d06b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 6 09:32:39 2010 +0000 Extended edit_area_room.php so that it can cope with non-nullable custom fields properly web/edit_area_room.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 4bc4c906a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 6 08:53:54 2010 +0000 - Fixed previous fix (Rev 1402) properly - Extended edit_users so that it can cope with non-nullable custom fields web/edit_users.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit c18a8afe9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 6 08:48:07 2010 +0000 Fixed bug whereby empty integer custom fields were not being properly handled. web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ce3983a30 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 6 08:39:42 2010 +0000 Fixed bug which meant that the SQL error message wasn't always displayed. web/edit_users.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit d1ccfad85 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jul 28 12:36:05 2010 +0000 * Added 30 minute expiry to generated CSS files. web/functions.inc | 17 +++++++++++++++++ web/mrbs-ielte7.css.php | 6 ++++-- web/mrbs-js-overrides.css.php | 10 ++++++++-- web/mrbs-print.css.php | 7 ++++++- web/mrbs.css.php | 5 +++-- 5 files changed, 38 insertions(+), 7 deletions(-) commit c1e90496c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 27 21:07:46 2010 +0000 Simplified code dealing with custom fields web/edit_entry.php | 20 ++++++++------------ web/view_entry.php | 27 +++++++++++---------------- 2 files changed, 19 insertions(+), 28 deletions(-) commit a8a68e9d2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 27 11:57:05 2010 +0000 Added the 'is_nullable' property to sql_mysqli_field_info() - forgotten at Rev 1395. web/mysqli.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit 3e015f4ff Merge: ad1069bf4 6b69a3dec Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 27 11:27:51 2010 +0000 Merged the custom_entry_fields branch back into the trunk. MRBS now recognises custom fields added to the entry and repeat tables. As well as the edit_entry and view_entry pages, the Report and Search pages and email notifications now support custom fields. commit 6b69a3dec (origin/custom_entry_fields) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 27 10:37:43 2010 +0000 Updated documentation to cover custom fields in the entry and repeat tables. INSTALL | 21 ++++++++++++++------ web/edit_entry.php | 47 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 6 deletions(-) commit 5a5dd1557 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 27 10:16:41 2010 +0000 Improved the fix for the Rev 1387 problem. A new key, 'is_nullable', has been added to the array returned by sql_field_info() and this is used to determine whether NULL or 0 should be written out to the database for integer custom fields where the user has given no input. web/dbsys.inc | 1 + web/mrbs_sql.inc | 15 ++++----------- web/mysql.inc | 4 ++++ web/pgsql.inc | 7 ++++++- 4 files changed, 15 insertions(+), 12 deletions(-) commit 5224eb9a3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 26 15:49:33 2010 +0000 Deletion emails now support custom fields web/functions_mail.inc | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) commit da0687f83 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 26 15:36:51 2010 +0000 Email notifications of new/changed bookings now include custom fields (still to do deleted bookings) web/functions_mail.inc | 60 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) commit d481a7eb7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 26 15:06:42 2010 +0000 - Removed a redundant line of code - Fixed a bug causing integer custom fields of 0 to be written as NULL web/mrbs_sql.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit d57b4952c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 26 14:53:12 2010 +0000 Simplified the code for mrbsCreateSingleEntry() and mrbsCreateRepeatEntry() web/internalconfig.inc.php | 19 ++ web/mrbs_sql.inc | 355 ++++++++++++++++++----------------- 2 files changed, 203 insertions(+), 171 deletions(-) commit 1499c3ddd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 26 12:56:22 2010 +0000 Slightly better fix for Rev 1387. web/mrbs_sql.inc | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) commit ad1069bf4 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jul 26 11:15:10 2010 +0000 * Reverted inadvertant commit of local config.inc.php changes web/config.inc.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) commit 6cd01e738 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jul 26 11:12:49 2010 +0000 * Czech language update supplied by Marek Grac in SF #2800173 web/config.inc.php | 11 +++++++++-- web/lang.cs | 2 +- web/lang.fr | 24 ++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) commit 4e10dd107 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 26 09:57:13 2010 +0000 Fixed a bug that gave an SQL error if a field intended to be a boolean (ie was a smallint or less) was designated "NOT NULL". web/mrbs_sql.inc | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) commit a54117794 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 25 22:49:38 2010 +0000 Report search criteria now include custom fields web/report.php | 85 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 80 insertions(+), 5 deletions(-) commit 8ec3bd755 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 25 20:59:45 2010 +0000 Added custom field information to report output. (Report search criteria still to be extended to include custom fields). web/report.php | 67 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 5 deletions(-) commit 0c4a8fa7a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 25 18:20:58 2010 +0000 Added support for custom fields to Search web/search.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) commit 3dc30bfbd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 25 17:45:11 2010 +0000 Can now make repeat bookings with custom fields. web/mrbs_sql.inc | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) commit 73d85af8b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 25 17:20:15 2010 +0000 Moved all the internal, development use only, definitions and global variables out of systemdefaults and into a new file, so that only stuff that is relevant to site admins is contained in systemdefaults.inc.php. web/defaultincludes.inc | 3 +- web/internalconfig.inc.php (new) | 84 ++++++++++++++++++++++++++++++ web/systemdefaults.inc.php | 78 +-------------------------- 3 files changed, 87 insertions(+), 78 deletions(-) commit 8039f6005 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 25 16:53:24 2010 +0000 Edit_entry will now process new bookings with custom fields (but not yet repeat entries) tables.my.sql | 15 ++++++++---- tables.pg.pre73.sql | 24 ++++++++++-------- tables.pg.sql | 47 ++++++++++++++++++++---------------- web/edit_entry.php | 13 ++++++++-- web/edit_entry_handler.php | 22 +++-------------- web/mrbs_sql.inc | 4 +-- web/systemdefaults.inc.php | 27 ++++++++++++++++++++- 7 files changed, 92 insertions(+), 60 deletions(-) commit 2092b7b53 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 23 22:12:28 2010 +0000 Custom fields are now recognised by edit_entry_handler and written out to the database (single entries only at this stage). Still to do - fix edit_entry for new bookings - handle repeat bookings - enhance email notifications to recognise custom fields - enhance Search and report to recognise custom fields web/edit_entry_handler.php | 52 +++++++++++++++++++++++- web/mrbs_sql.inc | 77 +++++++++++++++++++++++++++--------- 2 files changed, 110 insertions(+), 19 deletions(-) commit dd238afb7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 23 21:20:09 2010 +0000 Fixed undefined variable problem web/edit_entry.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 3ae37f2a5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 23 20:15:37 2010 +0000 Made edit_entry recognise custom fields - but edit_entry_handler has still to be modified, so the custom fields are ignored on Save. web/edit_entry.php | 125 +++++++++++++++++++++++++++++++++++-------- web/mrbs.css.php | 4 +- 2 files changed, 105 insertions(+), 24 deletions(-) commit aedd85073 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 23 17:52:46 2010 +0000 - made consistent the point at which variables have HTML escaping applied (and in the process fixed a bug that would occur if a username contains HTML special chars) - added translation of newlines in custom fields to <br> web/view_entry.php | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) commit 3b7b21523 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 23 17:39:15 2010 +0000 Extended view_entry so that it can cope with the remaining types of custom fields. web/lang.en | 2 ++ web/view_entry.php | 26 ++++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) commit 1353fd2ac Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jul 23 15:17:49 2010 +0000 * Modified mrbsGetBookingInfo() to support custom entry fields. * Modified view_entry.php to show custom entry fields. Supports text fields (any textual column) and boolean fields (any integer column). Uses "entry.COLUMN_NAME" from vocab file for field description. web/mrbs_sql.inc | 108 ++++++++++++++++++++++++++++++------------- web/view_entry.php | 97 +++++++++++++++++++++++++++++++------- 2 files changed, 158 insertions(+), 47 deletions(-) commit fa53e8d87 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jul 23 15:10:51 2010 +0000 * A branch for development of custom entry fields. commit 8baa933af Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 14 12:23:33 2010 +0000 Fixed bug whereby the reminder settings (reminders_enabled and reminder_interval) were being ignored in pending.php web/pending.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit c764033c0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 14 12:11:28 2010 +0000 Fixed bug which meant that it was impossible to get to the form that allows you to edit area details. (Bug introduced as part of an incorrect fix in Rev 1369, which was an attempt to fix a problem introduced in Rev 1364) web/admin.php | 6 +- web/edit_area_room.php | 411 ++++++++++++++++++++------------------- 2 files changed, 211 insertions(+), 206 deletions(-) commit c39eb15f6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 14 10:51:22 2010 +0000 - Fixed a bug which was resulting in an SQL error if you logged out of MRBS when the More Info page was displayed - Made view_entry more robust by checking that an id variable exists - Fixed a bug in the fatal error handling whereby some global variables had not been declared resulting in undefined variable problems. web/functions.inc | 2 ++ web/mrbs_sql.inc | 17 ++++++++++++++--- web/view_entry.php | 4 +--- 3 files changed, 17 insertions(+), 6 deletions(-) commit 8f52b0711 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 14 10:08:54 2010 +0000 Preserved the details of the last More Info request in provisional bookings to avoid admins bombarding users with requests for more info. The details are displayed as a title tooltip on the More Info button. tables.my.sql | 8 ++- tables.pg.pre73.sql | 12 +++- tables.pg.sql | 12 +++- web/confirm_entry_handler.php | 2 + web/dbsys.inc | 2 +- web/lang.en | 4 ++ web/mrbs_sql.inc | 115 ++++++++++++++++++------------- web/pending.php | 31 +++++++-- web/upgrade/14/mysql.sql (new) | 14 ++++ web/upgrade/14/pgsql.sql (new) | 14 ++++ web/view_entry.php | 53 ++++++++++++-- 11 files changed, 197 insertions(+), 70 deletions(-) commit 7ca5d3b62 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 1 15:35:47 2010 +0000 Fixed bug that resulted in an "Access Denied" message for ordinary users when viewing room information. Bug introduced as a result of the Rev 1364 changes. web/edit_area_room.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b75921574 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 1 14:35:55 2010 +0000 Removed redundant setting of $room and $area. web/index.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) commit 729e98b28 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 1 14:14:41 2010 +0000 Removed a redundant call to get_default_room() web/week.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) commit b89ba0e7f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 1 14:06:09 2010 +0000 Modified the function get_default_room() so that if $default_room is in the area, then it returns $default_room, otherwise it returns the first room , by sortkey order, in the area. web/functions.inc | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) commit f75542d31 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 1 13:39:28 2010 +0000 Modified the function get_default_area() so that it first tries to return the area corresponding to the $default_room if it is set and exists. Only if that fails will it return the first area by alphabetical order of areaname. (Also fixed the comments to reflect the fact that it is returning the first area by name, rather than id). web/functions.inc | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) commit bbca9f4ce Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 1 13:12:47 2010 +0000 Removed the getting of the standard variables $day, $month, $year, $area and $room together with the setting of sensible defaults into a new include file, standard_vars.inc.php. web/add.php | 6 +--- web/admin.php | 20 +----------- web/confirm_entry_handler.php | 18 +---------- web/day.php | 40 +----------------------- web/defaultincludes.inc | 1 + web/del.php | 18 +---------- web/del_entry.php | 7 +---- web/edit_area_room.php | 16 +--------- web/edit_entry.php | 26 +--------------- web/edit_entry_handler.php | 30 ++++++------------ web/edit_users.php | 6 +--- web/help.php | 20 ------------ web/index.php | 12 +++----- web/month.php | 43 -------------------------- web/pending.php | 18 ----------- web/report.php | 19 +----------- web/search.php | 21 +------------ web/session_cookie.inc | 3 +- web/session_php.inc | 2 +- web/standard_vars.inc.php (new) | 51 +++++++++++++++++++++++++++++++ web/view_entry.php | 19 +----------- web/week.php | 39 +---------------------- 22 files changed, 82 insertions(+), 353 deletions(-) commit 828503b94 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 29 21:48:54 2010 +0000 Made it possible to deny public access to MRBS by setting a single config variable (in response to multiple requests from the mailing list). web/add.php | 8 +-- web/admin.php | 11 ++--- web/confirm_entry_handler.php | 9 +--- web/day.php | 3 ++ web/del.php | 8 +-- web/del_entry.php | 5 +- web/edit_area_room.php | 11 ++--- web/edit_entry.php | 9 ++-- web/edit_entry_handler.php | 9 ++-- web/edit_users.php | 8 +-- web/help.php | 3 ++ web/month.php | 16 +++--- web/mrbs_auth.inc | 86 +++++++++++++++++++++++++++++++++ web/pending.php | 10 ++-- web/report.php | 12 +++-- web/search.php | 9 +++- web/systemdefaults.inc.php | 3 ++ web/view_entry.php | 16 +++--- web/week.php | 2 + 19 files changed, 163 insertions(+), 75 deletions(-) commit 852877000 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 29 21:42:37 2010 +0000 Fixed bug which caused area private_override settings to be ignored in reports. (The default global private_override setting from the config file was being used to determine whether a user was allowed access to the report page. This is unnecessary as individual area settings are used by the SQL query to determine whether bookings should be shown in report results). web/report.php | 9 --------- 1 file changed, 9 deletions(-) commit a94414822 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 29 21:08:39 2010 +0000 Fixed undefined index problem, which could cause problems in some circumstances with the display of private bookings. web/week.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit aeb115946 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 29 20:32:42 2010 +0000 Fixed bug which caused area private_override settings to be ignored in searches. (The default global private_override setting from the config file was being used to determine whether a user was allowed access to the search page. This is unnecessary as individual area settings are used by the SQL query to determine whether bookings should be shown in search results). web/search.php | 10 ---------- 1 file changed, 10 deletions(-) commit 03b4b8c30 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 18 07:54:11 2010 +0000 Fix for bug reported by Steven Stringham in the mailing list: a booking of 1 year is shown as a booking of 1 minute in the edit_entry form. web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7a801725b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 15 15:30:47 2010 +0000 Slightly improved fix for previous problem (Rev 1357) web/mrbs_sql.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit 781fa694a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 15 11:04:09 2010 +0000 Fixed a bug which meant that ordinary users were able to delete bookings made in the past even though the booking policy said that they couldn't. (The booking policy was only being applied to the creation or modification of entries but not to their deletion). web/del_entry.php | 7 +++++++ web/mrbs_sql.inc | 36 +++++++++++++++++++++++++++--------- web/systemdefaults.inc.php | 2 +- 3 files changed, 35 insertions(+), 10 deletions(-) commit 01dbd7cea Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 8 15:39:10 2010 +0000 Clarified the edit_entry form slightly by adding a thin horizontal line between the repeat section and the rest of the form. Can be disabled in the CSS. See SF Feature Request ID 3011370. web/edit_entry.php | 7 ++++++- web/mrbs.css.php | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) commit c1e302ed7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 8 11:11:56 2010 +0000 Replaced with spaces some tabs that had crept in due to a misconfigured editor. web/Mail/mail.php | 2 +- web/Mail/sendmail.php | 2 +- web/edit_entry_handler.php | 2 +- web/functions.inc | 4 ++-- web/language.inc | 4 ++-- web/mrbs.css.php | 2 +- web/xbLib.js | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) commit 858f69232 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 8 10:28:09 2010 +0000 - fixed a bug whereby the $mail_vocab would not be set if the only person set to receive emails was $mail_settings['book_admin_on_provisional'] - tidied up the tests for whether an email is necessary web/confirm_entry_handler.php | 6 +----- web/edit_entry_handler.php | 8 ++------ web/language.inc | 6 ++++-- 3 files changed, 7 insertions(+), 13 deletions(-) commit 098466985 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jun 2 20:42:01 2010 +0000 * Fixed/improved convert_db_to_utf8.php based on changes provided in SF tracker #3010397. convert_db_to_utf8.php | 83 ++++++++++++++++++++++++---------------- 1 file changed, 51 insertions(+), 32 deletions(-) commit b31e77b06 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu May 27 20:01:20 2010 +0000 * Japanese translation update from Takanori MATSUURA in SF tracker #2939298. web/lang.ja | 149 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 124 insertions(+), 25 deletions(-) commit d8db910de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 27 06:14:48 2010 +0000 Made it clearer in the comments and the installation documentation that the $timezone line in the config file must be uncommented by removing the initial '//'. INSTALL | 3 ++- web/config.inc.php | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) commit 311f46b95 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Apr 25 20:31:11 2010 +0000 Added "LIMIT 1" where appropriate to SQL queries to improve performance. web/edit_entry.php | 11 ++++++++--- web/edit_entry_handler.php | 2 +- web/month.php | 6 ++---- web/mrbs_sql.inc | 4 ++-- web/view_entry.php | 2 +- web/week.php | 6 ++---- 6 files changed, 16 insertions(+), 15 deletions(-) commit 305faffe4 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Apr 22 21:29:27 2010 +0000 * Corrected the abstract sql_error() call, so that it passes on the optional DB handle. web/dbsys.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5c4e79308 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Apr 22 20:20:47 2010 +0000 * Updated version number post-release. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 037184a46 (tag: mrbs-1_4_4_1) Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Apr 22 20:13:23 2010 +0000 * Updated NEWS and ChangeLog for 1.4.4.1 release. ChangeLog | 24 ++++++++++++++++++++++++ NEWS | 6 ++++++ 2 files changed, 30 insertions(+) commit 55c843c0f Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Apr 22 20:10:50 2010 +0000 * Up version for 1.4.4.1 release. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b7f143487 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Apr 22 16:36:42 2010 +0000 * Corrected DB schema version. :( tables.my.sql | 2 +- tables.pg.pre73.sql | 2 +- tables.pg.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 8ce6370a1 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Apr 21 22:32:30 2010 +0000 * Update version number post-release. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit edbad8c3d (tag: mrbs-1_4_4) Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Apr 21 15:30:20 2010 +0000 * Updated NEWS and ChangeLog for 1.4.4 release. ChangeLog | 542 ++++++++++++++++++++++++++++++++++++++++++++++++++++ NEWS | 53 +++++ 2 files changed, 595 insertions(+) commit 96e471c48 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Apr 21 09:53:39 2010 +0000 Reverted inadvertent change to config.inc.php web/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3b38cb5a7 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Apr 21 09:52:22 2010 +0000 Updated version number for release web/config.inc.php | 2 +- web/version.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit cd5d25d0d Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Apr 21 09:51:01 2010 +0000 Added transaction support to MySQL DB abstractions web/mysql.inc | 6 ++++-- web/mysqli.inc | 6 ++++-- web/pgsql.inc | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) commit 3be702e17 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 21 08:46:28 2010 +0000 Updated the Install and Upgrade instructions. INSTALL | 16 ++++------------ UPGRADE | 24 ++++++++++++++++++++---- 2 files changed, 24 insertions(+), 16 deletions(-) commit 304320106 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 20 21:38:16 2010 +0000 - Tidied up and updated the INSTALL information; tried to avoid duplication of information between INSTALL and systemdefaults.inc.php - Renamed the tables.pg sql files so that tables.pg.sql is the file to use for the latest version of PostgreSQL INSTALL | 451 +++-------------- ...pg.73and_above.sql => tables.pg.pre73.sql | 30 +- tables.pg.sql | 30 +- web/systemdefaults.inc.php | 19 +- 4 files changed, 103 insertions(+), 427 deletions(-) commit cecd5dd0b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 20 20:16:35 2010 +0000 Tried to improve the layout of the email configuration settings to make it slightly clearer how to configure email. web/systemdefaults.inc.php | 127 +++++++++++++++++------------------ 1 file changed, 63 insertions(+), 64 deletions(-) commit 8580e356f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Apr 20 19:16:33 2010 +0000 Added some comments following Rev 1329 web/edit_entry.php | 2 ++ 1 file changed, 2 insertions(+) commit d0ddda4a6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 15 23:21:32 2010 +0000 Fixed bug which was preventing individual members of a series being edited (bug introduced in Rev 1297). web/edit_entry.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) commit 15b05e998 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 15 15:12:44 2010 +0000 Added a "LIMIT 1" to an SQL query to improve performance web/auth_db.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5d2447996 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 15 15:09:13 2010 +0000 Added missing SQL escaping web/auth_db.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 66c210d25 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 15 13:59:43 2010 +0000 Fixed incorrect keyword property commit 806b2a209 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 15 13:56:28 2010 +0000 Fixed another problem with provisional bookings. (The problem doesn't affect standard MRBS, but becomes apparent if you try and extend MRBS using the concept of room admins who can approve bookings for certain rooms). web/pending.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 411ea31bc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 15 13:12:32 2010 +0000 Fixed a problem with provisional bookings. (The problem doesn't affect standard MRBS, but becomes apparent if you try and extend MRBS using the concept of room admins who can approve bookings for certain rooms). web/mrbs_auth.inc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) commit b10ea36a5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 14 22:06:09 2010 +0000 Fixed two bugs to do with provisional bookings: (1) Reminder interval was being ignored in pending.php (2) Comment did not match default reminder interval in systemdefaults.inc.php web/pending.php | 4 ++-- web/systemdefaults.inc.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 80bef6a28 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 14 19:57:38 2010 +0000 Very minor change to formatting of day/week/month pages web/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 16f4c300e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 9 18:12:25 2010 +0000 Fixed a minor formatting problem on the edit_area_room page. web/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0b54d6ab5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 9 10:14:52 2010 +0000 Updated comments (forgot to do this in the last revision). web/systemdefaults.inc.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) commit d8461c085 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 9 09:57:20 2010 +0000 Allowed provisional bookings to be enabled on a per-area basis. tables.my.sql | 2 ++ tables.pg.73and_above.sql | 4 +++- tables.pg.sql | 4 +++- web/Themes/default/header.inc | 14 +++++++++++--- web/dbsys.inc | 2 +- web/edit_area_room.php | 22 +++++++++++++++++++++- web/functions.inc | 7 +++++-- web/lang.en | 3 +++ web/pending.php | 2 ++ web/upgrade/13/mysql.sql (new) | 5 +++++ web/upgrade/13/pgsql.sql (new) | 5 +++++ web/upgrade/13/post.inc (new) | 26 ++++++++++++++++++++++++++ 12 files changed, 87 insertions(+), 9 deletions(-) commit de337c040 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 8 09:10:46 2010 +0000 Updated installation instructions with details of how to add columns to the room and users tables. INSTALL | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) commit 6ad0aff47 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 31 08:10:31 2010 +0000 Added a check to see if $timezone has been set. If not, MRBS halts with a configuration error. Designed to prevent sites running into possible DST problems. web/functions.inc | 5 +++++ 1 file changed, 5 insertions(+) commit 747f14798 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 28 17:03:31 2010 +0000 Updated installation SQL to reflect the recent addition of the custom_html field tables.my.sql | 4 +++- tables.pg.73and_above.sql | 8 +++++--- tables.pg.sql | 8 +++++--- 3 files changed, 13 insertions(+), 7 deletions(-) commit 4767e2f50 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 28 12:42:33 2010 +0000 Minor fix to formatting of textareas in IE7 and below, which don't understand margin-bottom in some circumstances. web/mrbs-ielte7.css.php | 2 ++ 1 file changed, 2 insertions(+) commit 64891f94b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 28 09:48:50 2010 +0000 - added custom_html fields to the area and room tables. The HTML is displayed in a div with id "custom_html" on the Rooms and edit_area_room pages. The div can be styled and positioned using CSS. Useful, for example, for displaying an embedded Google map showing the location of a room or area. See also Sourceforge feature request ID 2976404 - Fixed a bug which prevented the edit and delete image buttons working with IE6 - Removed the sort_key from the list of room details shown to non-admins web/admin.php | 80 ++++++++++++++-------------- web/dbsys.inc | 2 +- web/edit_area_room.php | 89 +++++++++++++++++++++++--------- web/edit_users.php | 5 +- web/lang.en | 3 ++ web/mrbs-ie.css | 1 + web/mrbs-ielte7.css.php | 5 ++ web/mrbs.css.php | 29 +++++++---- web/upgrade/12/mysql.sql (new) | 11 ++++ web/upgrade/12/pgsql.sql (new) | 11 ++++ 10 files changed, 157 insertions(+), 79 deletions(-) commit 5f0842a9b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 23 09:52:35 2010 +0000 Removed some redundant global declarations. No functional change to MRBS. web/functions_mail.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit e2727485e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 22 16:03:23 2010 +0000 Moved code for getting area admin and room admin email addresses into two functions, get_area_admin_email() and get_room_admin_email(). No functional change to MRBS. web/functions_mail.inc | 97 ++++++++++++++++++++++++++++------------ 1 file changed, 68 insertions(+), 29 deletions(-) commit 291f50d53 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 21 22:12:04 2010 +0000 Minor adjustment to styling of textarea in edit_users form web/mrbs.css.php | 2 ++ 1 file changed, 2 insertions(+) commit a3e9074d1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 21 20:46:30 2010 +0000 - Standardised on a convention of using "tablename.columnname" in the lang files as the tag for user defined fields added to tables, where tablename is the table name stripped of the table prefix. Unfortunately this means that anyone with existing user defined fields in the users table will have to change the tags from "user_" to "users." when they upgrade, but it does mean there is now a convention for future additions. - Moved the function get_loc_field_name() to the language file and generalised it to cover any table web/admin.php | 6 +----- web/edit_area_room.php | 6 +----- web/edit_users.php | 17 +---------------- web/lang.ca | 12 ++++++------ web/lang.cs | 12 ++++++------ web/lang.da | 12 ++++++------ web/lang.de | 12 ++++++------ web/lang.el | 12 ++++++------ web/lang.en | 12 ++++++------ web/lang.es | 12 ++++++------ web/lang.eu | 12 ++++++------ web/lang.fi | 12 ++++++------ web/lang.fr | 12 ++++++------ web/lang.it | 12 ++++++------ web/lang.ja | 12 ++++++------ web/lang.ko | 12 ++++++------ web/lang.nl | 12 ++++++------ web/lang.no | 12 ++++++------ web/lang.pl | 12 ++++++------ web/lang.pt | 12 ++++++------ web/lang.sl | 12 ++++++------ web/lang.sv | 12 ++++++------ web/lang.tr | 12 ++++++------ web/lang.zh-cn | 12 ++++++------ web/lang.zh-tw | 12 ++++++------ web/language.inc | 17 +++++++++++++++++ web/session_cookie.inc | 4 ++-- web/session_php.inc | 4 ++-- 28 files changed, 156 insertions(+), 162 deletions(-) commit 265988044 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 21 18:16:42 2010 +0000 Extended edit_users so that it can display textareas and checkboxes for user defined fields, as well as just text inputs. web/admin.php | 14 +- web/edit_area_room.php | 34 +-- web/edit_users.php | 494 +++++++++++++++++++++-------------- web/mrbs-ielte6.css | 6 +- web/mrbs.css.php | 44 ++-- web/systemdefaults.inc.php | 13 +- 6 files changed, 351 insertions(+), 254 deletions(-) commit edf04e4eb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 21 10:38:46 2010 +0000 Brought styling of the users table and the list of outstanding provisional bookings into line with the new styling for the rooms table web/admin.php | 4 +-- web/edit_users.php | 61 +++++++++++++++++++++----------------------- web/mrbs.css.php | 47 +++++++++++++--------------------- 3 files changed, 49 insertions(+), 63 deletions(-) commit eee3004d9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 21 08:54:33 2010 +0000 The room editing pages (admin.php and edit_area_room.php) will now recognise user defined columns in the room table, displaying them in the room editing form as appropriate. This enables information about the rooms to be added to the system (eg coffee machine? whiteboard? etc.). At the moment only text, varchar, int, smallint and tinyint are supported, displayed as textarea, text or checkbox fields as appropriate. Smaallints and tinyints are assumed to be booleans and are displayed as checkboxes. Text descriptions are looked for in the lang files with the tag room.column_name, eg room.coffee_machine, enabling translations to be provided. If not present, the column name will be used for labels etc. web/admin.php | 83 +++++++++++- web/dbsys.inc | 54 ++++++++ web/edit_area_room.php | 242 +++++++++++++++++++++++++++++------ web/images/check.png (new) | Bin 0 -> 334 bytes web/mrbs-ielte6.css | 3 + web/mrbs.css.php | 8 +- web/mysql.inc | 86 +++++++++++++ web/mysqli.inc | 86 +++++++++++++ web/pgsql.inc | 69 ++++++++++ 9 files changed, 584 insertions(+), 47 deletions(-) commit ae931fb4e Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Mar 19 09:40:34 2010 +0000 * Very belatedly updated version post the 1.4.3 release web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f29b84938 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 17 09:27:24 2010 +0000 - Redesigned (and hopefully improved) the layout of the admin page with a view to being able to add extra fields to the room table in the future - Opened up the admin and edit_area_room pages to users at level 1, who can view room details but not change them - Renamed “Admin” in the header to “Rooms” - Removed the browser language details from the Rooms page as they’re available on the Help page - Created an images directory for holding icons web/Themes/classic126/styling.inc | 1 + web/Themes/default/header.inc | 2 +- web/Themes/default/styling.inc | 1 + web/admin.php | 336 ++++++++++++++++++---------- web/edit_area_room.php | 134 +++++++---- web/functions.inc | 8 +- web/images/delete.png (new) | Bin 0 -> 311 bytes web/images/edit.png (new) | Bin 0 -> 451 bytes web/{ => images}/new.gif | Bin web/lang.en | 5 +- web/month.php | 4 +- web/mrbs-ie8.css | 2 - web/mrbs-ielte7.css.php | 7 + web/mrbs.css.php | 68 ++++-- 14 files changed, 374 insertions(+), 194 deletions(-) commit 5da0dd84d Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Mar 16 21:00:08 2010 +0000 * Removed text after closing tag, as reported in SF tracker #2970638 - in fact removed the end tag altogether after learning this is allowed and accepted practice. web/lang.pl | 3 --- 1 file changed, 3 deletions(-) commit 500324eb8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 14 21:37:43 2010 +0000 - Removed the Submit button from Area and Room select forms when JavaScript is enabled as they are redundant. - Minor tidy up of JavaScript web/functions.inc | 10 ++++++---- web/mrbs-js-overrides.css.php | 8 ++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) commit c34896711 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 3 17:48:43 2010 +0000 Made the error message slightly more helpful when $morningstarts, $eveningends and $resolution are misconfigured. web/theme.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 9d08ac725 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 22 11:42:44 2010 +0000 More minor tidying of the code. No functional change to MRBS. web/edit_entry.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) commit 84715f733 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 21 23:34:58 2010 +0000 Replaced the document.writeln's with DOM compliant JavaScript, and did some minor tidying up. No functional change to MRBS. web/edit_entry.php | 79 ++++++++++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 33 deletions(-) commit 3be61d795 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 17 23:15:06 2010 +0000 Fixed a bug which meant that n-weekly repeats weren't being calculated properly when more than one repeat day was checked. web/mrbs_sql.inc | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) commit 6415d9280 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 17 20:59:15 2010 +0000 Replaced magic numbers used for values of rep_type with constants. web/edit_entry.php | 20 ++++++++++---------- web/edit_entry_handler.php | 18 +++++++++--------- web/functions_mail.inc | 16 ++++++++-------- web/mrbs_sql.inc | 22 +++++++++------------- web/systemdefaults.inc.php | 12 ++++++++++++ web/view_entry.php | 8 ++++---- 6 files changed, 52 insertions(+), 44 deletions(-) commit 0947848c3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 17 17:40:29 2010 +0000 - Added the ability to prevent ordinary users from making repeat bookings. Controlled by the configuration setting $auth['only_admin_can_book_repeat'] - Fixed some minor problems to do with editing repeat bookings - Tidied up the code in edit_entry.php a little web/edit_entry.php | 157 +++++++++++++++++++---------------- web/edit_entry_handler.php | 13 +++ web/systemdefaults.inc.php | 3 + web/view_entry.php | 16 ++-- 4 files changed, 112 insertions(+), 77 deletions(-) commit bd7f71557 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 10 17:16:05 2010 +0000 Partially fixed a problem to do with the handling of All Day bookings crossing a DST boundary. It's not a complete fix - I've just made the handling mirror that of ordinary (non All Day) bookings - and I decided to leave fixing it properly until the Deprecated is_dst issue is tackled. web/edit_entry_handler.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 2f0f4a4c2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 10 16:31:57 2010 +0000 Fixed bug which caused the duration to be blank in email notifications for bookings when "All day" was checked. web/edit_entry_handler.php | 21 +++++++++++++++------ web/functions.inc | 33 +++++++++++++++++++-------------- 2 files changed, 34 insertions(+), 20 deletions(-) commit ca7a1c470 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 10 12:53:12 2010 +0000 Added comments to make it clearer that certain settings are configurable on a per-area basis. web/systemdefaults.inc.php | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) commit e56abcfae Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 8 13:08:01 2010 +0000 Fixed bug when using periods which meant that if you made a booking for N periods and there were fewer than N periods left in the day, the booking didn't flow on to the next day properly unless the start period was the first period of the day. web/functions.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit bcba91325 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Feb 8 12:37:20 2010 +0000 Fixed incorrect reporting of durations in email notifications (both when using periods and not). Bug reported by Colin Napier. web/edit_entry_handler.php | 20 +++++--------------- web/functions.inc | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 16 deletions(-) commit 3c8296c65 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 7 09:09:56 2010 +0000 Fixed bug in max_book_ahead checking when using periods. Thanks to Colin Napier. web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b35044add Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 3 12:01:23 2010 +0000 Added the name of the deleting user to email notifications of deleted entries. web/functions_mail.inc | 6 +++++- web/lang.en | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) commit 29946e033 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jan 20 10:03:46 2010 +0000 Minor correction to fix problem with the positioning of the simple trailer in some circumstances (it didn't always appear at the bottom) web/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 470de88f1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 17 18:32:24 2009 +0000 Added the ability to limit how far in advance (both minimum and maximum times) ordinary users can make bookings. Works whether using periods or not, though for periods the time intervals are limited to days as MRBS does not know when the periods occur during the day. The intervals can be negative, allowing one to specify, for example, that users cannot make or edit bookings more than five minutes in the past or two weeks ahead. For times mode (ie when not using periods) the limits are settable on a per-area basis. For periods the limits apply globally at the moment. tables.my.sql | 32 ++++--- tables.pg.73and_above.sql | 32 ++++--- tables.pg.sql | 32 ++++--- web/Themes/default/header.inc | 40 ++++++++- web/confirm_entry_handler.php | 2 +- web/dbsys.inc | 2 +- web/del_entry.php | 2 +- web/edit_area_room.php | 143 ++++++++++++++++++++++--------- web/edit_entry_handler.php | 53 ++++++------ web/functions.inc | 83 +++++++++++++----- web/functions_mail.inc | 2 +- web/lang.en | 5 ++ web/mrbs.css.php | 5 +- web/mrbs_auth.inc | 29 ++----- web/mrbs_sql.inc | 45 ++++++++++ web/pending.php | 2 +- web/systemdefaults.inc.php | 44 ++++++++++ web/upgrade/11/mysql.sql (new) | 10 +++ web/upgrade/11/pgsql.sql (new) | 10 +++ web/view_entry.php | 2 +- 20 files changed, 419 insertions(+), 156 deletions(-) commit 2c65f5339 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 17 17:53:52 2009 +0000 - Ensured that sql_row_keyed() actually returns an associative array, rather than one with both numeric and associative indices - Fixed a couple of places that still relied on a numeric index web/month.php | 2 +- web/mysql.inc | 4 +++- web/mysqli.inc | 4 +++- web/pgsql.inc | 4 +++- web/week.php | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) commit 465bc6115 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Dec 14 20:30:23 2009 +0000 * Fixes for the LDAP authentication method when $ldap_filter is configured. web/auth_ldap.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 4785a572f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 13 19:34:50 2009 +0000 - Set the focus to the search string field on the search form on page load - Set the focus to the brief description field on the edit_entry form on page load (but only for new bookings) web/Themes/default/header.inc | 29 +++++++++++++++++++++++++++++ web/search.php | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) commit 888fbb11c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 13 18:32:27 2009 +0000 Fixed HTML validation problem web/pending.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d2916b512 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 13 18:22:07 2009 +0000 - Added a missing '>' to the body tag - Set the focus to the username on the logon form on page load web/Themes/default/header.inc | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) commit e7dc2c86e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 11 16:35:15 2009 +0000 Fixed a problem with the display of the All Day checkbox in the edit_entry form in IE8. web/mrbs-ie8.css | 1 + 1 file changed, 1 insertion(+) commit 812b8b43f Merge: 3d095199c 47fd8233e Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Dec 9 22:37:17 2009 +0000 * Performed --reintegrate branch merge of 'provisional_bookings' branch, r1242-1280. commit 47fd8233e (origin/provisional_bookings) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 9 21:02:28 2009 +0000 Changed day/week/month views so that the status of bookings is ignored if $provisional_enabled is FALSE (ie even if a booking is set as provisional in the database it is displayed as an ordinary booking). web/functions.inc | 7 ++++--- web/month.php | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) commit 5a55e3347 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 9 20:50:55 2009 +0000 Merged in latest changes from trunk ChangeLog | 628 +++++++++++++++++++++++++++++++++++ NEWS | 47 ++- web/auth_imap.inc | 2 +- web/auth_ldap.inc | 2 +- web/day.php | 37 ++- web/edit_users.php | 82 ++++- web/index.php | 1 + web/lang.en | 7 + web/lang.fi | 67 +++- web/mysql.inc | 13 + web/mysqli.inc | 13 + web/systemdefaults.inc.php | 27 +- web/version.inc | 2 +- web/week.php | 43 ++- 14 files changed, 925 insertions(+), 46 deletions(-) commit 3d095199c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 9 13:16:58 2009 +0000 Added missing include file, the absence of which caused errors when $default_room was non-zero. web/index.php | 1 + 1 file changed, 1 insertion(+) commit b6af3dcaf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 8 18:07:35 2009 +0000 Fixed a bug in the last change (Rev 1276): passwords should only be validated if it's a new user, or an existing user changing their password. web/edit_users.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) commit 9da348ebf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 8 14:10:13 2009 +0000 Added the ability to set a password strength policy when using the 'db' authentication scheme. The policy can be defined in terms of minimum length and minimum numbers of alpha, lower-case, upper-case, numeric and special (ie non alpha-numeric) characters. The validation is only server side at the moment. Client side validation is not included yet as JavaScript's native support for Unicode pattern matching is very limited. web/edit_users.php | 73 +++++++++++++++++++++++++++++++++++- web/lang.en | 7 ++++ web/systemdefaults.inc.php | 16 ++++++-- 3 files changed, 92 insertions(+), 4 deletions(-) commit bef5600be Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 27 00:27:00 2009 +0000 Added the ability to repeat the headers at the bottom of the table, controlled by a new config setting $column_labels_both_ends web/day.php | 37 +++++++++++++++++++------------ web/systemdefaults.inc.php | 4 ++++ web/week.php | 43 ++++++++++++++++++++++-------------- 3 files changed, 53 insertions(+), 31 deletions(-) commit 173eae5de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 26 05:31:06 2009 +0000 Fixed test for E_DEPRECATED constant so that it doesn't give a warning if it doesn't exist. web/systemdefaults.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c71ec2d75 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Nov 25 11:31:48 2009 +0000 * Finnish translation update, as provided by Tuomas in SF tracker #2870678 - annoyingly I missed the 1.4.3 release though. web/lang.fi | 67 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 4 deletions(-) commit 3fff3ea05 (tag: mrbs-1_4_3) Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Nov 24 21:56:58 2009 +0000 * Updated NEWS anc ChangeLog for 1.4.3 release. ChangeLog | 628 ++++++++++++++++++++++++++++++++++++++++++++++++++++ NEWS | 47 +++- 2 files changed, 674 insertions(+), 1 deletion(-) commit 54e173c4f Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Nov 24 21:21:09 2009 +0000 * Fixed LDAP auth method so that $ldap_filter will work if you use $ldap_dn_search_attrib. * Updated 'mysql' and 'mysqli' DB abstractions to request a UTF-8 client charset if $unicode_encoding is true. * Updated version number to 1.4.3. web/auth_ldap.inc | 2 +- web/mysql.inc | 13 +++++++++++++ web/mysqli.inc | 13 +++++++++++++ web/version.inc | 2 +- 4 files changed, 28 insertions(+), 2 deletions(-) commit 8c8348d0d Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Nov 14 21:35:57 2009 +0000 * Added code to disable the E_DEPRECATED error class, due to our use of the 'is_dst' option in mktime() being deprecated in PHP >= 5.3.0. web/systemdefaults.inc.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit fd7a2987d Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Nov 14 20:56:04 2009 +0000 * Fixed a regular expression used for IMAP quoting, received as a patch from Thomas Bleher. web/auth_imap.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 65b9553d9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 13 23:40:48 2009 +0000 Moved the id and series parameters into a query string for forms that call view_entry. That's because some pages called by view_entry use HTTP_REFERER to form a return URL, and view_entry needs to have a valid id and series passed to it. web/pending.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) commit 4b0f098f8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 13 21:49:27 2009 +0000 Merged with latest fix from the trunk (ie fixing the bug that prevented users being edited) web/edit_users.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) commit 38c321035 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 13 21:09:48 2009 +0000 Fixed a bug which prevented users from being edited (unless they happened to be the user with id 0) web/edit_users.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) commit 36a083d14 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 13 19:02:59 2009 +0000 Added a third parameter, $room, to getWritable() so that it can be extended in future to use the room id when checking whether a user can edit an entry web/del_entry.php | 2 +- web/edit_entry.php | 4 ++-- web/edit_entry_handler.php | 29 ++++++++++++++++++++++++++- web/edit_users.php | 2 +- web/functions.inc | 2 +- web/month.php | 2 +- web/mrbs_auth.inc | 38 ++++++++++++++++++++++++++++++++++-- web/mrbs_sql.inc | 6 +++--- web/view_entry.php | 2 +- 9 files changed, 74 insertions(+), 13 deletions(-) commit ebad54d73 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 13 11:02:40 2009 +0000 - made the pending bookings list check for confirmation authority against room id (for future enhancements) - fixed problem in confirm_entry_handler.php where the check for confirmation authority was carried out before the room was known - tidied up pending.php by removing some redundant global declarations web/confirm_entry_handler.php | 20 ++++++++++---------- web/pending.php | 14 +++++--------- 2 files changed, 15 insertions(+), 19 deletions(-) commit 4734d724b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 12 20:39:48 2009 +0000 Excluded non-working days when calculating the time since the last reminder. Working days are defined in systemdefaults.inc.php and by default are set to Mon-Fri. web/functions.inc | 100 +++++++++++++++++++++++++++++++++-- web/systemdefaults.inc.php | 10 ++-- 2 files changed, 101 insertions(+), 9 deletions(-) commit 724d32e25 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 12 18:05:57 2009 +0000 Restricted emailing approval authorities when a booking is made to those cases where the booking actually needs approval. web/functions_mail.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 5276b0fb7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 12 14:19:25 2009 +0000 Added a print_simple_header() function for use when the normal header uses features which are not yet available. Used in the first instance by the database upgrade procedure as the normal header now checks the database for outstanding provisional bookings. web/Themes/default/header.inc | 4 ++-- web/dbsys.inc | 10 +++++++--- web/functions.inc | 29 +++++++++++++++++++++++++++++ web/systemdefaults.inc.php | 2 ++ 4 files changed, 40 insertions(+), 5 deletions(-) commit d33f5ffde Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Nov 12 00:35:47 2009 +0000 Added pending.php listing outstanding provisional reservations web/Themes/classic126/styling.inc | 5 + web/Themes/default/header.inc | 109 +++++++++++- web/Themes/default/styling.inc | 5 + web/lang.en | 5 + web/mrbs.css.php | 26 +++ web/pending.php (new) | 257 ++++++++++++++++++++++++++++ 6 files changed, 405 insertions(+), 2 deletions(-) commit 75e599489 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 11 21:51:25 2009 +0000 Implemented Remind Button and associated email notifications tables.my.sql | 4 +- tables.pg.73and_above.sql | 8 ++-- tables.pg.sql | 8 ++-- web/confirm_entry_handler.php | 34 ++++++++++---- web/dbsys.inc | 2 +- web/edit_entry_handler.php | 33 ++++++++------ web/functions.inc | 10 ++++ web/functions_mail.inc | 29 ++++++++++-- web/lang.en | 3 +- web/mrbs_sql.inc | 78 ++++++++++++++++++++++++++------ web/systemdefaults.inc.php | 8 ++++ web/upgrade/10/mysql.sql (new) | 12 +++++ web/upgrade/10/pgsql.sql (new) | 12 +++++ web/view_entry.php | 55 +++++++++++++++------- 14 files changed, 229 insertions(+), 67 deletions(-) commit cb4de1266 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 11 14:36:47 2009 +0000 Email notifications implemented on provisional booking more info requests web/confirm_entry_handler.php | 13 ++- web/functions_mail.inc | 145 +++++++++++++++++--------------- web/lang.en | 1 + 3 files changed, 92 insertions(+), 67 deletions(-) commit f528b68a8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 11 13:15:13 2009 +0000 Email notifications implemented on provisional booking rejection web/del_entry.php | 66 ++++++++++++++++++++++++++---------- web/functions_mail.inc | 50 +++++++++++++++++++++++---- web/lang.en | 1 + web/systemdefaults.inc.php | 2 +- 4 files changed, 95 insertions(+), 24 deletions(-) commit 36332d1ab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 11 12:20:17 2009 +0000 - email notifications implemented on confirmation of provisional bookings - mrbsGetEntryInfo() replaced by a more extensive mrbsGetBookingInfo() which is now called by view_entry.php and confirm_entry_handler.php web/confirm_entry_handler.php | 70 +++++++++++++- web/del_entry.php | 2 +- web/functions_mail.inc | 55 +++++++---- web/lang.en | 11 ++- web/mrbs_sql.inc | 159 +++++++++++++++++++++++++++----- web/view_entry.php | 115 ++++------------------- 6 files changed, 266 insertions(+), 146 deletions(-) commit ce8c551d1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 11 00:01:38 2009 +0000 Introduced a new mail setting $mail_settings['treat_cc_as_to'] that puts the 'cc' recipients on the 'to' line instead of on the 'cc' line. Useful for those whose hosting companies have configured their mail servers not to send out emails if the cc or bcc fields are set. web/functions_mail.inc | 11 +++++++++++ web/systemdefaults.inc.php | 5 +++++ 2 files changed, 16 insertions(+) commit 947b4db00 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 10 23:11:44 2009 +0000 Simplified the processing of email addresses and added removal of duplicates. web/functions_mail.inc | 157 ++++++++++++++--------------------- web/systemdefaults.inc.php | 2 +- 2 files changed, 63 insertions(+), 96 deletions(-) commit a8cf357fa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 10 22:06:50 2009 +0000 Reject button now works in view_entry.php web/lang.en | 7 ++- web/mrbs.css.php | 7 +++ web/view_entry.php | 140 ++++++++++++++++++++++++++++++------------- 3 files changed, 113 insertions(+), 41 deletions(-) commit 5f7d96b6b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 10 17:28:29 2009 +0000 Accept button implemented for view_entry.php web/confirm_entry_handler.php (new) | 59 +++++++++ web/lang.en | 2 + web/mrbs_sql.inc | 25 ++++ web/view_entry.php | 183 ++++++++++++++++++-------- 4 files changed, 213 insertions(+), 56 deletions(-) commit e6c02453e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 10 13:34:07 2009 +0000 Booking status added to email notifications. web/edit_entry_handler.php | 6 ++++-- web/functions_mail.inc | 9 +++++++-- web/systemdefaults.inc.php | 4 ++++ 3 files changed, 15 insertions(+), 4 deletions(-) commit 2d3fc2185 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 10 13:00:18 2009 +0000 view_entry.php now shows the booking status web/lang.en | 3 +++ web/view_entry.php | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) commit 153dff21a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 10 11:29:47 2009 +0000 Month view now shows provisional bookings with a distinct styling web/month.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit dd5052f8f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 10 11:20:20 2009 +0000 Day and Week views now show provisional bookings with a different styling web/day.php | 3 ++- web/functions.inc | 19 +++++++++++++++++++ web/mrbs.css.php | 5 +++++ web/week.php | 3 ++- 4 files changed, 28 insertions(+), 2 deletions(-) commit dc26f2986 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 9 23:20:53 2009 +0000 Bookings are now written into the database with a status code (provisional or confirmed) web/edit_entry_handler.php | 23 +++++++++++++++++++---- web/mrbs_auth.inc | 27 +++++++++++++++++++++++++++ web/mrbs_sql.inc | 22 +++++++++++++++------- web/systemdefaults.inc.php | 9 +++++++++ 4 files changed, 70 insertions(+), 11 deletions(-) commit 440e078c4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 9 21:47:09 2009 +0000 Upgraded database to allow provisional bookings. tables.my.sql | 3 ++- tables.pg.73and_above.sql | 5 +++-- tables.pg.sql | 5 +++-- web/dbsys.inc | 2 +- web/systemdefaults.inc.php | 15 +++++++++++++-- web/upgrade/9/mysql.sql (new) | 8 ++++++++ web/upgrade/9/pgsql.sql (new) | 8 ++++++++ 7 files changed, 38 insertions(+), 8 deletions(-) commit fb9423c81 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 9 21:27:22 2009 +0000 Updated the db version number. tables.pg.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1bbfec83e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 9 16:56:50 2009 +0000 Created branch for working on provisional bookings commit 8e903fd88 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 8 10:32:28 2009 +0000 Added an id to a form so that sites can add their own styling. web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f4b87172c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 4 16:01:21 2009 +0000 Added comment to steer admins toward the lang files if they want to change some of the text strings. web/config.inc.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 9633e7381 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 3 15:23:36 2009 +0000 - changed behaviour of monthly and yearly repeats so that if a day does not exist in the month (eg 29/30/31) MRBS will use the last day of the month (instead of going forward into the next month as it did before) - updated Help text to reflect new monthly and yearly repeat behaviour - updated Help text to reflect existing monthly, corresponding day behaviour (ie using 29/30/31 is valid and is useful) - combined logic for weekly and n-weekly repeats: a weekly repeat is just a special case of an n-weekly repeat - simplified fix introduced in Rev 1236 now that we can rely on at least one repeat day being set for weekly and n-weekly repeats (see Rev 1238) web/mrbs_sql.inc | 81 ++++++++++++++++++++++++--------------------- web/site_faq.html | 21 +++++++++--- 2 files changed, 60 insertions(+), 42 deletions(-) commit c67fb4652 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Nov 3 14:25:31 2009 +0000 Fixed bug introduced in Rev 1237 that caused n-weekly repeats to get stuck in an infinite loop (the code assumes that at least one repeat day has been set). web/edit_entry_handler.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit 9d82ad3ab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 2 15:00:14 2009 +0000 Removed the checks that tested whether at least one repeat day had been checked in the case of weekly and n-weekly repeats. The checks were not necessary because if no repeat days are checked, MRBS assumes that the repeat day is the day of the week of the start of the period (as indeed it says in the Help text). web/edit_entry.php | 20 -------------------- web/edit_entry_handler.php | 24 ------------------------ 2 files changed, 44 deletions(-) commit 06a021dc8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Nov 2 14:44:47 2009 +0000 Fixed a bug which meant that for weekly and n-weekly bookings the first day of the period was booked when it should not have been because one or more of the repeat days had been checked - but not the day of the week of the start of the period. For example if you request a weekly repeat from 1-30 November 2009 for Thursdays, then the 1 Nov was also being booked when it should not have been because it's a Sunday. (Problem reported by Randy Allen on the general mailing list). web/mrbs_sql.inc | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) commit d75390f59 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Nov 1 20:13:02 2009 +0000 - altered the behaviour of edit_area_room.php so that after you've edited a room or an area you are returned to the admin page, rather than staying on the edit_area_room.php page. - fixed a bug which resulted in invalid HTML and an incorrectly rendered page when editing an area and using periods web/edit_area_room.php | 914 ++++++++++++++++++++------------------- 1 file changed, 467 insertions(+), 447 deletions(-) commit 0429c730e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 31 23:23:07 2009 +0000 Removed stray blank line. web/edit_users.php | 1 - 1 file changed, 1 deletion(-) commit 0c8bb45a3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 31 18:48:40 2009 +0000 Improved the error handling when adding a new user, so that form data is reloaded if there is an error and does not have to be re-typed by the user. web/edit_users.php | 254 ++++++++++++++++++++++++------------------- web/lang.en | 4 +- 2 files changed, 143 insertions(+), 115 deletions(-) commit 4fc0da8d3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 27 23:28:50 2009 +0000 Added "area" token web/lang.fr | 1 + 1 file changed, 1 insertion(+) commit 5e32ce4f1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 27 16:52:17 2009 +0000 Added a sort key for rooms, so that rooms can be sorted in an order defined by the administrator rather than alphabetically. By default the sort key is the same as the room name and rooms will be sorted alphabetically as before. The sort order applies whenever rooms are listed, eg in the main day view and in drop-down lists. tables.my.sql | 6 ++++-- tables.pg.73and_above.sql | 4 +++- tables.pg.sql | 2 ++ web/add.php | 4 ++-- web/admin.php | 2 +- web/day.php | 2 +- web/dbsys.inc | 2 +- web/edit_area_room.php | 9 +++++++++ web/edit_entry.php | 4 ++-- web/functions.inc | 6 +++--- web/lang.en | 2 ++ web/month.php | 2 +- web/report.php | 4 ++-- web/upgrade/8/mysql.sql (new) | 5 +++++ web/upgrade/8/pgsql.sql (new) | 7 +++++++ web/upgrade/8/post.inc (new) | 14 ++++++++++++++ web/week.php | 2 +- 17 files changed, 60 insertions(+), 17 deletions(-) commit 021e5573f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 22 16:21:18 2009 +0000 Added error checking after the first SQL query. (Although there is some error checking after the second query, it is never reached if there's an error in the SQL predicate, or the first SQL query generally, and MRBS just incorrectly reports that there are no entries matching the search string). web/search.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit c627f5fdd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 22 16:16:22 2009 +0000 Changed capitalisation of table aliases in the SQL query to be consistent with search.php. No functional change to MRBS. web/report.php | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) commit 8ceb3134a Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Oct 22 12:59:24 2009 +0000 * Updated DB schema number in the instalation SQL files. tables.my.sql | 2 +- tables.pg.73and_above.sql | 2 +- tables.pg.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit b85338be5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 21 21:44:58 2009 +0000 - Ensured that searches respect the per-area privacy settings - Fixed bug which meant that searches did not work on PostgreSQL when users were not admins and $private_override was not set to public web/search.php | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) commit b9b0a75ab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 21 21:39:20 2009 +0000 - Ensured that reports respect the per-area privacy settings - Fixed bug which meant that (depending on their name) admins would not be recognised as having admin rights, and so would not see private bookings made by other users web/report.php | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) commit 9fef88891 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 21 20:43:03 2009 +0000 Ensured that the private settings in the area table are always not NULL, by converting existing areas and setting the private fields when creating new areas. (It will make ensuring that Search and Report respect the private settings easier if the settings can be guaranteed to be not NULL). web/add.php | 10 +++++++++- web/dbsys.inc | 2 +- web/upgrade/7/mysql.sql (new) | 1 + web/upgrade/7/pgsql.sql (new) | 0 web/upgrade/7/post.inc (new) | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 44 insertions(+), 2 deletions(-) commit 59fbd7839 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 21 18:26:48 2009 +0000 Fix to ensure that view_entry uses the per-area privacy settings (problem reported by David Moore on the general mailing list). Still to come: fixes for Search and Report which suffer from a similar problem. web/view_entry.php | 6 ++++++ 1 file changed, 6 insertions(+) commit b85eec96e Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Oct 20 11:51:26 2009 +0000 * Removed odd stray spaces from the config file. web/config.inc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 141b521af Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Oct 20 11:49:41 2009 +0000 * Replaced all usage of ereg_replace() with calls to preg_replace() for consistency and because PHP 5.3 has deprecated the function. web/auth_imap.inc | 2 +- web/escapeshellarg.inc | 2 +- web/month.php | 2 +- web/session_cookie.inc | 3 ++- web/session_php.inc | 3 ++- web/week.php | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) commit 5df60da52 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Oct 18 16:02:33 2009 +0000 * Fix for setting UTF-8 locale on BSD (and Linux). It turns out Linux is also happy to specify a UTF-8 locale with ".UTF-8" in upper case. Fix provided by Ian Rees in SF tracker #2859067. web/language.inc | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) commit d2dcee7b2 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Oct 18 15:35:24 2009 +0000 * Patch from Emmanuel Dreyfus to add a configuration variable to configure a login link for the "remote_user" authentication scheme. web/session_remote_user.inc | 21 +++++++++++++++++---- web/systemdefaults.inc.php | 1 + 2 files changed, 18 insertions(+), 4 deletions(-) commit 2e0337ffe Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Oct 18 15:30:55 2009 +0000 * Patch from Emmanuel Dreyfus to add a config variable to force the booking resolution to the value of $resolution, rather than the resolution for the area set in the database. web/functions.inc | 4 +++- web/systemdefaults.inc.php | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) commit 36963e677 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Oct 18 15:25:13 2009 +0000 Slight variation on a patch from Emmanuel Dreyfus (changed variable name) web/mrbs_auth.inc | 5 +++++ web/systemdefaults.inc.php | 4 ++++ 2 files changed, 9 insertions(+) commit d85245148 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 8 06:16:54 2009 +0000 - Reverted Revision 1211 (ie put entities back in) - entities are now replaced in the CSV report header row using mrbs_entity_decode() web/lang.fr | 88 ++++++++++++++++++++++++------------------------ web/report.php | 48 ++++++++++++++++++-------- 2 files changed, 78 insertions(+), 58 deletions(-) commit 161f49269 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 7 15:20:21 2009 +0000 - Added an mrbs_entity_decode() function - Extended removal of entities in period names in mail messages to PHP4 and below. web/functions.inc | 45 +++++++++++++++++++++++++++++++++++++++- web/functions_mail.inc | 9 +------- 2 files changed, 45 insertions(+), 9 deletions(-) commit 413c2a221 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 2 10:05:30 2009 +0000 Changed name of optional third parameter in utf8_substr() from $end to $length to make it less confusing. web/language.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit ac12b4c08 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 1 23:22:55 2009 +0000 Changed to an ordinary space (except where there are two of them) - otherwise they appear as is in CSV report headers. web/lang.fr | 88 +++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) commit f312f6e93 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 1 22:57:34 2009 +0000 Changed Content-type for CSV reports to text/csv and added a charset to aid internationalisation. (Note that Excel does not open CSV files properly. To open a UTF-8 file in Excel, save it as a .txt file first and then specify the charset in the dialogue that appears when you open the file in Excel). web/report.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit acd64b2b2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 1 22:46:01 2009 +0000 Introduced a get_charset() function. No functional change to MRBS. web/Themes/default/header.inc | 15 ++------------- web/language.inc | 10 ++++++++++ web/style.inc | 18 +----------------- 3 files changed, 13 insertions(+), 30 deletions(-) commit 003dc9ce0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 27 17:14:14 2009 +0000 Further simplified the code in getPreviousEntryData(). No functional change to MRBS. web/functions_mail.inc | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) commit 57a5a7374 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 27 16:13:47 2009 +0000 Fixed a bug which meant that the number of weeks wasn't shown in the form when editing an existing n-weekly booking. web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e8a1ae0a2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 27 16:07:47 2009 +0000 Fixed a (very minor!) bug that meant that $weekstarts was ignored in email notifications and repeat entries covering more than one day of the week were listed starting at the wrong place. For example if $weekstarts=1 (ie Mon) and a weekly repeat is made for Sat and Sun, the email notification listed them as Sun, Sat instead of Sat, Sun. web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0dfade970 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 27 15:54:10 2009 +0000 Simplified the code in getPreviousEntryData(). No functional change to MRBS. web/functions_mail.inc | 154 ++++++++++++++++----------------------- 1 file changed, 64 insertions(+), 90 deletions(-) commit ca6d01203 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 25 08:46:19 2009 +0000 Converted CSV constants into variables, so that they can be redefined in config.inc.php web/report.php | 35 +++++++++++++++++++++-------------- web/systemdefaults.inc.php | 8 ++++---- 2 files changed, 25 insertions(+), 18 deletions(-) commit a07378ed6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 24 17:36:46 2009 +0000 Corrected constant definitions used for CSV reports. web/systemdefaults.inc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 1f1e51175 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 23 15:12:05 2009 +0000 Added the ability to output reports and summaries as CSV files. web/lang.en | 58 ++-- web/report.php | 628 +++++++++++++++++++++++------------ web/systemdefaults.inc.php | 13 + 3 files changed, 467 insertions(+), 232 deletions(-) commit e338bd07f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 17 15:25:36 2009 +0000 Tried to make the language settings slightly clearer. No functional change to MRBS. web/systemdefaults.inc.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) commit efc7a9b91 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Sep 15 22:12:42 2009 +0000 * Added support for Bulgarian localisation web/language.inc | 3 +++ 1 file changed, 3 insertions(+) commit 23b264b28 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 11 14:29:20 2009 +0000 Minor change to formatting of the edit_user form to improve looks (added some more space below the form legend for IE, as IE by default leaves none) web/mrbs-ie.css | 4 ++++ 1 file changed, 4 insertions(+) commit 67cc08ef5 Author: dceschools <devnull@localhost> Date: Tue Sep 8 15:52:50 2009 +0000 Add unset to array variables in systemdefaults.inc.php so they can be copied to config.inc.php if needed. web/systemdefaults.inc.php | 2 ++ 1 file changed, 2 insertions(+) commit 86a89f1da Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 4 11:56:07 2009 +0000 Fixed a problem which caused the highlight colour to shine through bookings that have an opacity of less than 1 (eg private bookings) when they occur in cells in the day and week views that have multiple bookings. web/mrbs.css.php | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) commit e91590a26 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 3 23:26:18 2009 +0000 Changed event handlers for the radio buttons to be onClick rather than onChange (the onChange handler shouldn't fire until the control loses focus - correctly implemented on IE but not on FF). web/edit_area_room.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 0d6269854 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 3 13:49:45 2009 +0000 Changed SQL ORDER BY clauses to use column names rather than column positions in order to improve maintainability. No functional change to MRBS. web/day.php | 2 +- web/month.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit d2f7e261e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 3 13:31:50 2009 +0000 Changed SQL ORDER BY clauses to use column names rather than column positions in order to improve maintainability. No functional change to MRBS. web/report.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1ae8a4aab Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 3 13:17:03 2009 +0000 Minor change to bring into line with MRBS coding conventions. web/report.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit a2ea0e037 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 28 15:09:35 2009 +0000 Corrected use of version_compare() web/functions.inc | 2 +- web/functions_mail.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 726ba6286 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 28 14:01:59 2009 +0000 Fixed the display in the header ("You are <user>") of usernames that contain html special chars. web/session_cookie.inc | 2 +- web/session_http.inc | 2 +- web/session_php.inc | 2 +- web/session_remote_user.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) commit ede6c520b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 28 13:50:52 2009 +0000 Fixed bug which meant that a user could not see their own private bookings if the user name contained HTML special chars. web/view_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8c57e1a48 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 26 23:26:28 2009 +0000 Fixed a bug which meant that when using periods, any HTML entities or tags in the period name string (which are allowed) were left as is in email notifications, which are sent as plain text emails. (HTML entities are only replaced in PHP5 and above, to avoid any complications with lack of support for multi-byte character sets). web/functions_mail.inc | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) commit 9f97474f5 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Aug 24 09:06:29 2009 +0000 * Improved/fixed the PostgreSQL sql_table_exists() implementation. web/pgsql.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) commit e5fceede7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Aug 23 18:13:43 2009 +0000 Removed duplicate primary key declaration from users table. tables.pg.73and_above.sql | 4 +--- tables.pg.sql | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) commit 138b42b1f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 12 14:06:50 2009 +0000 Fixed bug causing undefined variable notice when an email notification of a series is viewed. (The notice is only visible in MRBS if error_reporting is set to include Notices). web/view_entry.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit eab07c0e1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 11 14:11:04 2009 +0000 Addition of comment. web/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4ea16d5f8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 11 14:05:50 2009 +0000 Moved consistency checking of user settings for periods and time slots out of systemdefaults.inc.php where it is now unnecessary (because systemdefaults.inc.php cannot be changed by the user) and put it into theme.inc. web/systemdefaults.inc.php | 23 ----------------------- web/theme.inc | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 23 deletions(-) commit ab48b69d8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Aug 11 12:33:38 2009 +0000 - Changed the constants in systemdefaults.inc.php to variables, as constants can only be defined once, meaning they cannot be redefined in config.inc.php (IS_XHTML should remain a constant though as that is not intended to be redefined in config.inc.php) - Resolved the Catch-22 (reported by Thomas Bleher on the mailing list) which prevented language settings from being defined in config.inc.php web/config.inc.php | 36 ++++++++++++++++ web/del_entry.php | 4 +- web/edit_entry_handler.php | 16 +++---- web/functions_mail.inc | 56 ++++++++++++++---------- web/language.inc | 6 +-- web/systemdefaults.inc.php | 84 ++++++++++++++++++------------------ web/theme.inc | 1 + 7 files changed, 127 insertions(+), 76 deletions(-) commit 2e3730358 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 5 22:36:05 2009 +0000 Fixed very minor problem (not normally visible to the user) that caused an 'undefined' error in JavaScript when there are no rooms defined for an area. web/edit_entry.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit f4e324e58 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Aug 5 15:52:15 2009 +0000 * Added missing SQL escaping for $user in search.php, this variable is not directly enterable by a user, so the issue was of a lesser consequence. web/search.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 6de9c1b88 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Aug 1 21:05:58 2009 +0000 * Implemented new config variable, $mincals_week_numbers. If this is set to true, week numbers will be shown in the mini-calendars. The numbers will only be accurate if you set $weekstarts to 1. web/mincals.inc | 16 +++++++++++++++- web/mrbs.css.php | 2 +- web/systemdefaults.inc.php | 5 +++++ 3 files changed, 21 insertions(+), 2 deletions(-) commit a0ee20ef2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 22 13:30:39 2009 +0000 Fixed a bug introduced in Revision 1123 which meant that the empty cells in the month view were no longer clickable. web/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 046f92de9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 22 09:52:45 2009 +0000 Added declaration of $PHP_SELF to avoid problems when using versions of PHP < 4.1.0 web/Themes/default/header.inc | 1 + 1 file changed, 1 insertion(+) commit 6e956b6ac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 21 16:20:10 2009 +0000 Fixed problem with the TargetURL being undefined and causing badly formed HTML when Notice errors are turned on. (However the problem still exists that when using HTTP sessions MRBS will redirect to the admin page on login, rather than the current page. I haven't tried to fix this.) web/session_http.inc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) commit 5523ed114 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 21 15:02:24 2009 +0000 Removed redundant declarations of $auth web/session_cookie.inc | 3 +-- web/session_php.inc | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) commit b4bedad49 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 21 14:48:01 2009 +0000 Removed references to redundant variable $user_link web/session_cookie.inc | 2 +- web/session_php.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit f2b8025f1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 21 14:43:41 2009 +0000 Fixed bug that caused query string to be missing parameter values for day, month and year in the "You are user" link in the header in the http and remote_user session schemes. (Didn't affect functionality as search.php was resilient, but it caused undefined variable notices when running with notices turned on). web/session_http.inc | 1 + web/session_remote_user.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) commit d44ec9d9c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 20 16:23:13 2009 +0000 Brought commenting style into line with MRBS standard practice. web/edit_entry.php | 8 ++++---- web/report.php | 10 +++++----- web/search.php | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) commit 61dc37898 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jul 17 19:59:50 2009 +0000 * Tweaked capitalisation of warning in config.inc.php. web/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6f58e8f29 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jul 17 19:52:45 2009 +0000 * Fixed error reporting in DB upgrade mechanism. web/upgrade.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c1cdb9597 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Jul 16 16:03:44 2009 +0000 * Added $Id$ to new file, defaultincludes.inc. web/defaultincludes.inc | 2 ++ 1 file changed, 2 insertions(+) commit b9ff0cbfa Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Jul 16 15:56:07 2009 +0000 * Moved default configuration out of config.inc.php into systemdefaults.inc.php. Users should _not_ modify systemdefaults.inc.php and instead add lines into config.inc.php. * Created defaultincludes.inc, which includes the 6 standard files that pages include. Most pages include this. checklang.php | 1 + convert_db_to_utf8.php | 1 + testdata.php | 1 + web/add.php | 6 +- web/admin.php | 6 +- web/config.inc.php | 680 +-------------------------- web/day.php | 7 +- web/defaultincludes.inc (new) | 10 + web/del.php | 6 +- web/del_entry.php | 7 +- web/edit_area_room.php | 7 +- web/edit_entry.php | 7 +- web/edit_entry_handler.php | 7 +- web/edit_users.php | 6 +- web/help.php | 7 +- web/index.php | 5 +- web/month.php | 7 +- web/mrbs-ielte7.css.php | 2 + web/mrbs.css.php | 2 + web/report.php | 6 +- web/search.php | 6 +- web/systemdefaults.inc.php (new) | 726 +++++++++++++++++++++++++++++ web/view_entry.php | 6 +- web/week.php | 7 +- 24 files changed, 769 insertions(+), 757 deletions(-) commit 523ae17e9 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jul 15 23:11:54 2009 +0000 * Updated version number post release of 1.4.2. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit aac89dbe8 (tag: mrbs-1_4_2) Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jul 15 22:46:21 2009 +0000 * Updated NEWS/ChangeLog for MRBS 1.4.2 release. ChangeLog | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++ NEWS | 7 +++++- 2 files changed, 72 insertions(+), 1 deletion(-) commit f964ef282 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jul 15 22:36:28 2009 +0000 * Updated version number for 1.4.2 release. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a384bcc06 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 14 08:58:22 2009 +0000 Fixed problem that meant that the correct database connection wasn't being used when upgrading the database (ie MRBS was using the ordinary username/password specified in the config file rather than the admin username/password entered during the upgrade process). web/dbsys.inc | 4 ++-- web/upgrade.inc | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) commit 8b2ca6381 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 8 12:04:50 2009 +0000 Updated comments to reflect the new definition of maximum field lengths in the config file. tables.my.sql | 7 +++---- tables.pg.73and_above.sql | 7 +++---- tables.pg.sql | 7 +++---- 3 files changed, 9 insertions(+), 12 deletions(-) commit b6d29ecda Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jul 8 12:01:37 2009 +0000 * Small typo fix in a comment in the new $maxlength array values in config.inc.php. web/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 658c0a9f8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 8 11:55:28 2009 +0000 Added checking of lengths for room description in order to avoid SQL errors in PostgreSQL. web/add.php | 4 +++- web/admin.php | 2 +- web/config.inc.php | 11 ++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) commit 6faec5050 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 8 10:56:26 2009 +0000 Added checking of name lengths for username and email address in order to avoid SQL errors in PostgreSQL. web/config.inc.php | 3 +++ web/edit_users.php | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) commit edb8e9423 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 8 09:40:57 2009 +0000 Added checking of name lengths for room and area names in order to avoid SQL errors in PostgreSQL. web/add.php | 4 ++++ web/admin.php | 4 ++-- web/config.inc.php | 4 +++- web/edit_entry.php | 2 +- web/edit_entry_handler.php | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) commit 271b25194 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jul 3 20:07:42 2009 +0000 * Updated comments at the top of the table definition SQL files, to tell people to update the 'INSERT INTO' lines too, if they change the table prefix. tables.my.sql | 5 +++-- tables.pg.73and_above.sql | 5 +++-- tables.pg.sql | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) commit dc96e1152 (tag: mrbs-1_4_2rc1) Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Jul 2 09:12:49 2009 +0000 * Updated NEWS and ChangeLog for MRBS 1.4.2 release. ChangeLog | 1171 +++++++++++++++++++++++++++++++++++++++++++++++++++ NEWS | 72 +++- 2 files changed, 1241 insertions(+), 2 deletions(-) commit e31d6d18f Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Jul 2 08:25:52 2009 +0000 * Updated version number to 1.4.2rc1. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cfb2ff440 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 29 12:03:30 2009 +0000 - Changed the Upgrade 6 procedure so that it populates the users table with admins at $max_level instead of 2. - Moved the definition of $max_level and $min_user_editing_level out of auth_db.inc and into config.inc.php web/auth_db.inc | 6 ------ web/config.inc.php | 8 ++++++++ web/upgrade/6/post.inc | 4 +++- 3 files changed, 11 insertions(+), 7 deletions(-) commit 91d074a3e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 29 11:39:08 2009 +0000 Fixed an existing problem where the default value fr the level column is set to 1 instead of 0 in the case that the users table already exists. web/upgrade/6/post.inc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) commit d0744c6c9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 29 10:58:53 2009 +0000 Added fix to prevent warning message from fread() if file size is 0. web/upgrade.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 9db544a33 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 29 09:59:52 2009 +0000 Minor update to comments. web/dbsys.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1bc603266 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Jun 28 20:29:33 2009 +0000 * Fixed put in DV schema version 6 post.inc - was using a MySQL specific DB function rather than the abstracted function. Made PostgreSQL bomb out instead of complete correctly. web/upgrade/6/post.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 056a65071 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Jun 28 19:14:56 2009 +0000 * Improved error handing in DB upgrade system. If any errors are encountered, the upgrade process is now immediately stopped. * Fixed version 5 and 6 schema upgrades for PostgreSQL, it didn't like being sent SQL with just a comment. web/dbsys.inc | 13 +++++++++---- web/upgrade.inc | 7 ++++++- web/upgrade/5/pgsql.sql | 1 - web/upgrade/6/pgsql.sql | 1 - 4 files changed, 15 insertions(+), 7 deletions(-) commit 3ca43c3b9 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jun 26 14:46:27 2009 +0000 * Fixed bracketing in sql_query() call in db schema 6 post.inc, though it shouldn't in fact make any difference. web/upgrade/6/post.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3ae59d0d9 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jun 26 14:08:28 2009 +0000 * Moved code to add the 'level' column into the mrbs_users table out of edit_users.php and into DB schema version 6 upgrade code. * Fixed the name of the PostgreSQL upgrade SQL file for schema version 5. tables.my.sql | 2 +- tables.pg.73and_above.sql | 2 +- tables.pg.sql | 2 +- web/dbsys.inc | 2 +- web/edit_users.php | 27 --------------- web/upgrade/5/{pgsql.inc => pgsql.sql} | 0 web/upgrade/6/mysql.sql (new) | 1 + web/upgrade/6/pgsql.sql (new) | 1 + web/upgrade/6/post.inc (new) | 42 ++++++++++++++++++++++++ 9 files changed, 48 insertions(+), 31 deletions(-) commit 3b19c21c2 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Jun 25 22:52:56 2009 +0000 * Added missing DB schema version 4 changes to initial table creation SQL files. tables.my.sql | 4 ++++ tables.pg.73and_above.sql | 6 +++++- tables.pg.sql | 6 +++++- 3 files changed, 14 insertions(+), 2 deletions(-) commit 09abb771e Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Jun 25 22:36:44 2009 +0000 * Created syntax for creation of mrbs_users for MySQL. tables.my.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 83986a829 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Jun 25 22:33:26 2009 +0000 * Moved creation of mrbs_users table into the SQL schema update number 5. tables.my.sql | 14 ++++++++++++- tables.pg.73and_above.sql | 15 ++++++++++++- tables.pg.sql | 15 ++++++++++++- web/dbsys.inc | 2 +- web/edit_users.php | 32 ---------------------------- web/upgrade/5/mysql.sql (new) | 1 + web/upgrade/5/pgsql.inc (new) | 1 + web/upgrade/5/post.inc (new) | 37 +++++++++++++++++++++++++++++++++ 8 files changed, 81 insertions(+), 36 deletions(-) commit 521f70258 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 25 19:36:34 2009 +0000 Changed the authentication scheme for database upgrades so that instead of requiring the user to be logged in as an MRBS admin, the system now asks for a database username and password with admin rights. This has the advantages that (a) the database username and password supplied in the config file need only have ordinary user rights* and (b) it prevents the Catch 22 situation when upgrading the users table (you can't upgrade the database until you've logged in as an admin, but you can't log in as an admin until you've upgraded the database). [*Note though that if using the db authentication scheme, the users table is still altered using the standard database username supplied in the config file. This still needs to be changed to use the standard upgrade mechanism] web/dbsys.inc | 90 ++++++++++++++++++++++++++++++++++++---------- web/lang.en | 7 ++-- web/mrbs.css.php | 12 ++++++- web/mysql.inc | 7 ++++ web/mysqli.inc | 7 ++++ web/pgsql.inc | 7 ++++ web/upgrade.inc | 2 +- 7 files changed, 110 insertions(+), 22 deletions(-) commit 73a1a1d47 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jun 24 15:47:32 2009 +0000 Made the private bookings config editable per-area, with the config variables being the default settings to be used when a new area is created. web/config.inc.php | 13 ++-- web/dbsys.inc | 2 +- web/edit_area_room.php | 102 +++++++++++++++++++++++++++++--- web/functions.inc | 8 ++- web/lang.en | 56 +++++++++++------- web/mrbs-ie.css | 1 + web/mrbs-ie8.css | 6 ++ web/mrbs.css.php | 9 +++ web/upgrade/4/mysql.sql (new) | 7 +++ web/upgrade/4/pgsql.sql (new) | 8 +++ web/upgrade/4/post.inc (new) | 29 +++++++++ 11 files changed, 205 insertions(+), 36 deletions(-) commit 89ef4adfd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 23 15:02:08 2009 +0000 Fixed bug introduced in Rev 1123 which stopped the display of minimised multiple bookings working properly in IE8. web/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 833decc27 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 23 14:35:08 2009 +0000 - Added a class for private bookings so that they can be styled using that class, rather than by defining extra booking types. The default styling is for the opacity of the cell to be set to 0.6 (ie they are slightly washed out versions of public bookings) and the text to be in italics. Note that the opacity changes do not show up in IE because its support for opacity is temperamental, but the italic font will still show up and the font colour is also lightened to simulate the opacity change. - Added colour coding of private bookings to the month view (and used the same opacity/italic treatment as in the day and week views). - Minor changes to default text for private bookings web/Themes/classic126/styling.inc | 13 +----- web/Themes/default/styling.inc | 12 +---- web/functions.inc | 69 +++++++++++++++++------------ web/lang.en | 2 +- web/month.php | 16 ++++--- web/mrbs-ielte8.css (new) | 11 +++++ web/mrbs.css.php | 2 + web/style.inc | 3 ++ web/view_entry.php | 38 +++++++++------- 9 files changed, 95 insertions(+), 71 deletions(-) commit 59b3382c4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 23 11:35:30 2009 +0000 Fixed report SQL following change of PostgreSQL type for private from boolean to smallint. web/report.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit e67d1afd1 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jun 23 10:48:26 2009 +0000 * Added check for LDAP support into auth_ldap.inc - based on a suggestion from Chris Cook. web/auth_ldap.inc | 6 ++++++ 1 file changed, 6 insertions(+) commit d0ecdaa97 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 22 22:56:38 2009 +0000 Added checks for zero values of Resolution in order to avoid divide by zero errors and endless loops. web/edit_area_room.php | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) commit 80e1021d6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 22 22:06:36 2009 +0000 Fixed a problem (reported as SF Feature Request 249087) which meant that if $clipped is set to FALSE, then empty cells are no longer clickable. (The fix isn't a perfect fix, but at least means that the system is usable when $clipped is set to FALSE. In particular the fix doesn't work on IE6 and IE7 and so for those browsers $clipped is ignored and assumed to be TRUE. For other browsers, empty cells are only clickable in the top section - ie if one of the cells in a row is stretched because the content is too large for the cell, then the empty cells are only clickable in the standard height portion - and bookings are only clickable for the height of the text rather than over the whole cell. web/config.inc.php | 16 ++++++++++ web/mrbs-ielte7.css (gone) | 13 -------- web/mrbs-ielte7.css.php (new) | 51 +++++++++++++++++++++++++++++++ web/mrbs.css.php | 54 ++++++++++++++------------------- web/style.inc | 2 +- 5 files changed, 90 insertions(+), 46 deletions(-) commit 391e2ec5e Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jun 19 21:58:03 2009 +0000 * Removed unnecessary SQL escaping. When sql_syntax_caseless_contains() is used you don't need to use addslashes() as sql_syntax_caseless_contains() escaping the string itself. Added notes to this effect where sql_syntax_caseless_contains() is used. web/report.php | 15 ++++++++++----- web/search.php | 8 +++++--- 2 files changed, 15 insertions(+), 8 deletions(-) commit 080e83d37 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jun 19 21:10:10 2009 +0000 * Added more missing SQL escaping. web/edit_users.php | 4 ++-- web/mrbs_sql.inc | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) commit 182b6e5f6 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jun 19 20:50:59 2009 +0000 * Added missing SQL escaping to search functionality. web/search.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) commit 5e51e1f7d Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jun 19 20:45:24 2009 +0000 * Added SQL escaping in reports (Secunia Advisory SA35469). web/report.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit 5eb7bfff0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 18 21:54:26 2009 +0000 Truncated the name field to the maximum length as a precaution. Although the MAXLENGTH attribute is used in the <input> tag, this can sometimes be ignored by the browser, for example by Firefox when autocompletion is used. The user could also edit the HTML and remove the MAXLENGTH attribute. Passing an oversize string to some databases (eg some versions of PostgreSQL) results in an SQL error, rather than silent truncation of the string. web/edit_entry_handler.php | 9 +++++++++ 1 file changed, 9 insertions(+) commit cc0a09ccf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jun 17 14:48:40 2009 +0000 Converted the 'private' field in the entry and repeat tables from a boolean to a smallint for PostgreSQL implementations. PHP returns PostgreSQL boolean fields as strings, ie 't' or 'f' which always evaluate to true without a lot of processing. This means that entries are always considered to be private, whether they really are or not. Although using smallints takes up more space (2 bytes instead of 1 bit), it makes the code much simpler. The upgrade SQL files have been retrospectively changed, ie no attempt has been made to provide an Upgrade 4 file which converts existing booleans to smallints. As MRBS fails immediately an entry is created when using booleans and no reports of failure have been seen, it seems unlikely that there are any existing PostgreSQL implementations using a 1.4.1 + SVN version of MRBS. If there are, the fields can always be converted using a PostgreSQL admin tool. tables.pg.73and_above.sql | 4 ++-- tables.pg.sql | 4 ++-- web/mrbs_sql.inc | 4 ++-- web/upgrade/3/pgsql.sql | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) commit 6191ae284 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 15 20:23:39 2009 +0000 Fixed a problem that was causing PostgreSQL databases to complain giving the error message "ERROR: column "private" is of type boolean but expression is of type integer HINT: You will need to rewrite or cast the expression". web/mrbs_sql.inc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) commit 69ddb9719 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu May 28 22:23:30 2009 +0000 * Made backwards-compatibility special case in auth_db_ext.inc more clear. web/auth_db_ext.inc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) commit 88fe81e2b Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri May 22 13:56:29 2009 +0000 * Added a new authentication method, auth_smtp.inc. Utilises the Net_SMTP Pear package. web/auth_smtp.inc (new) | 104 ++++++++++++++++++++++++++++++++++++++ web/config.inc.php | 3 ++ 2 files changed, 107 insertions(+) commit 3fa4a7f6b Author: dceschools <devnull@localhost> Date: Tue May 19 17:54:39 2009 +0000 Fixes problem of private booking details being exposed when another user copies an existing hidden event. Private details are now cleared when this happens. web/edit_entry.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) commit 482727517 Author: dceschools <devnull@localhost> Date: Mon May 18 17:35:52 2009 +0000 Fixes problem of private booking details being exposed when there is a scheduling conflict. web/mrbs_sql.inc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) commit 540cc9461 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu May 14 16:20:10 2009 +0000 Fixed edit_entry form so that if a booking is being copied then the create_by field is changed to be the current user rather than the original creator (they could be different if it's an admin doing the copying). web/edit_entry.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 20b233a14 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 13 21:45:04 2009 +0000 Added escaping (HTML and JavaScript) to prevent errors when room names contain characters that look like HTML (eg '<i>Large</i> Room') web/edit_entry.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit a3db47b08 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 13 15:55:16 2009 +0000 Added a maxlength attribute to the name input on the edit_entry form to stop users typing in more characters than the database will accept (and later finding that the name has been silently truncated). tables.my.sql | 7 +++++-- tables.pg.73and_above.sql | 5 +++++ tables.pg.sql | 5 +++++ web/config.inc.php | 5 +++++ web/edit_entry.php | 4 +++- 5 files changed, 23 insertions(+), 3 deletions(-) commit 34855f9c1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed May 13 10:14:13 2009 +0000 Tidied up the code and moved the $clipped variable to the top of the file to make it more obvious. No change to functionality. web/mrbs.css.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) commit 1599b321c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue May 12 08:51:40 2009 +0000 Fixed bug introduced in Rev 1099. When editing a room, room names are now only checked for uniqueness if you are changing the room name or the area (ie not if you are just editing details such as capacity). web/edit_area_room.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) commit 4e4da329c Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue May 5 20:52:42 2009 +0000 * Fixed database schemas for DB schema 3: MySQL schema updated to retain MySQL 3 support (MySQL 3 doesn't have a BOOL type). Syntax errors in Postgresql tables (SF tracker #2786678) and upgrade SQL fixed. tables.my.sql | 6 +++--- tables.pg.73and_above.sql | 4 ++-- tables.pg.sql | 4 ++-- web/upgrade/3/mysql.sql | 4 ++-- web/upgrade/3/pgsql.sql | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) commit 3fb164c72 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 29 23:16:16 2009 +0000 Added escaping of the backslash character in room name. This fixes a bug that meant that when JavaScript was enabled room names with backslashes were not being displayed properly in the room select on the edit entry form. In extreme cases (if the room name ended with a backslash) the area select would not appear at all because the unescaped backslash was causing an unterminated string literal. web/edit_entry.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 7111f1a15 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 29 22:13:43 2009 +0000 Fixed a bug in the display of multiple bookings whereby in some circumstances the name and description of the booking were not correct. web/functions.inc | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) commit f6bbf7bb4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 29 10:19:16 2009 +0000 Fixed a bug in the display of multiple bookings and simplified the code at the same time. web/functions.inc | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) commit 4c9aaad3f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 23 09:11:34 2009 +0000 Fix to avoid an undefined variable notice when creating the initial user. web/edit_users.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 64fa2931e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 22 16:09:51 2009 +0000 Added escaping of input when checking that a username is unique. web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3fc3e812c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 22 15:58:21 2009 +0000 - Added checks to ensure that area names are unique and room names are unique within an area. - Fixed bug introduced in Rev 1094 (freeing wrong mutex) web/add.php | 51 +++++++++++++++++++++++++++++++++------- web/admin.php | 10 ++++++-- web/edit_area_room.php | 13 +++++++--- web/lang.en | 2 ++ 4 files changed, 62 insertions(+), 14 deletions(-) commit 831e9796a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 22 15:22:32 2009 +0000 Removed <p> tags from the fatal error message strings as these are now provided by the fatal_error() function itself. web/add.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 43a9535c5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 22 14:57:53 2009 +0000 Tidied up the operation of deleting a room so that when a room is deleted, entries in the repeat table associated with that room are deleted, as well as the entries themselves. web/del.php | 1 + 1 file changed, 1 insertion(+) commit 994ba5360 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 22 14:40:00 2009 +0000 Fixed bug introduced in Rev 1094. web/edit_area_room.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit d437ffbe6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 22 14:35:58 2009 +0000 Changed the language token used from "areas" to "area" to reflect the fact that only one area can be selected from the drop-down. web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 68edb8193 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 22 14:29:36 2009 +0000 Added the ability to move a room between areas when editing a room. web/edit_area_room.php | 70 ++++++++++++++++++++++++++++++++++++---- web/lang.en | 6 ++-- 2 files changed, 67 insertions(+), 9 deletions(-) commit 64f607026 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 16 14:39:16 2009 +0000 - Improved error handling when making a booking and writing to the table fails. MRBS now halts with a fatal error message, instead of continuing and silently ignoring the error. There have been a number of reports on the mailing list of administrators baffled by this, when the cause is usually that the MRBS tables have not been set up properly. - Fixed a problem causing an HTML validation error when a fatal error message is output. web/functions.inc | 2 +- web/mrbs_sql.inc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) commit 959b8b7f9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 16 13:23:57 2009 +0000 - Extended the theme capability by moving the print_header() function into the Themes directory to enable it to be more easily replaced by a plug-in. This is designed for cases where styling changes alone cannot achieve the desired header look and feel and the mark-up itself needs to be changed (eg to change nav bars). As suggested on the mailing list. - Also changed the way that themes work slightly: MRBS now looks for the files styling.inc and header.inc in the directory Themes/$theme and if cannot find those uses the ones in Themes/default, which must be present. .../styling.inc} | 0 web/Themes/default/header.inc (new) | 290 +++++++++++++++++ .../{default.inc => default/styling.inc} | 0 web/config.inc.php | 20 +- web/day.php | 2 +- web/functions.inc | 290 +---------------- web/mrbs-js-overrides.css.php | 3 +- web/mrbs-print.css.php | 3 +- web/mrbs.css.php | 2 +- web/theme.inc (new) | 12 + web/week.php | 2 +- 11 files changed, 331 insertions(+), 293 deletions(-) commit cbd54d6d3 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Apr 6 21:27:45 2009 +0000 * Set SVN ignores for Eclipse project files. commit a9ac90c48 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Apr 6 20:53:38 2009 +0000 * Set SVN props on the version 3 DB schema update files and added $Id$ lines. * Added final \n into version 2 DB schema update post.inc file. web/upgrade/2/post.inc | 2 +- web/upgrade/3/mysql.sql | 1 + web/upgrade/3/pgsql.sql | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) commit 80a9e5072 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Apr 6 20:46:15 2009 +0000 * Added Croation (hr_HR) i18n support - in case we get a Croatian translation off a mailing list poster. web/language.inc | 3 +++ 1 file changed, 3 insertions(+) commit 072cedeb0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 3 18:23:19 2009 +0000 Simplified the CSS for merged cells a little. No change to MRBS functionality or look and feel. web/functions.inc | 18 +++++++++--------- web/mrbs.css.php | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) commit 5f65a09d6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 3 17:55:17 2009 +0000 Restored zebra stripes to the standard day view. They had somehow been lost in the move to transposed tables. (Was OK for the standard week view, and OK for transposed tables in both the day and week views). web/day.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5ab62a95c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 3 17:14:20 2009 +0000 Changed the use of "times" as a class and variable name for the first column, as with transposed tables it is now not accurate. Now using "row_labels" instead. No change to MRBS functionality. web/Themes/classic126.inc | 2 +- web/Themes/default.inc | 2 +- web/functions.inc | 6 +++--- web/mrbs.css.php | 25 +++++++++++++------------ 4 files changed, 18 insertions(+), 17 deletions(-) commit 4f5eea4d5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 3 16:52:17 2009 +0000 Fixed problem in Rev 1084 where the wrong CSS commenting style was used ( // ... instead of /* ... */ ) web/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 24400502a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Apr 3 07:53:25 2009 +0000 Fixed problem whereby the times (or rooms with transposed tables) in the left and right columns in the day and week views are clipped and do not expand with content in Firefox 2. The problem was more noticeable when using transposed tables as room names tend to be longer than times. web/mrbs.css.php | 3 +++ 1 file changed, 3 insertions(+) commit 347808058 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Apr 2 22:28:41 2009 +0000 Added support for transposed tables in the day and week views. Transposed tables are controlled by a config variable called $times_along_top. ($times_right_side has been renamed $row_labels_both_sides, as it's now possible to have rooms down the right hand side when the table is transposed.) web/config.inc.php | 15 ++- web/day.php | 249 ++++++++++++++++++++++------------- web/functions.inc | 66 +++++++++- web/mrbs.css.php | 12 +- web/week.php | 305 ++++++++++++++++++++++++++++--------------- 5 files changed, 444 insertions(+), 203 deletions(-) commit 8b3f9391e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 1 13:55:22 2009 +0000 Fixed problem with recent change to nl2br calls. The optional second parameter to nl2br is only available from PHP 5.3.0 onwards, so implemented mrbs_nl2br which takes account of this. web/functions.inc | 14 ++++++++++++++ web/report.php | 2 +- web/view_entry.php | 4 ++-- 3 files changed, 17 insertions(+), 3 deletions(-) commit c683f8745 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 1 12:58:57 2009 +0000 Moved the IS_XHTML constant to a slightly more logical place in the config file - down at the bottom with the other internal use stuff. web/config.inc.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) commit 26ffd70f1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Apr 1 12:47:44 2009 +0000 Changed calls to nl2br() to use a config file constant IS_XHTML set to FALSE. Without that XHTML style <br /> tags were being produced causing validation warnings. web/config.inc.php | 8 ++++++++ web/report.php | 2 +- web/view_entry.php | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) commit 13114bf7f Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Mar 31 20:25:12 2009 +0000 * Fix for NIS authentication on systems that use crypt methods other than DES. web/auth_nis.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5607a4819 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 31 11:38:41 2009 +0000 Changed getAuthorised checks at the beginning of the page so that they check against $max_level if set, otherwise level 2. This allows multiple levels of admins to be introduced (eg booking admins, user admins and system admins). web/add.php | 3 ++- web/admin.php | 3 ++- web/del.php | 3 ++- web/edit_area_room.php | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) commit 8c0625ac8 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Mar 26 21:23:13 2009 +0000 * Added missing schema updates for clean installations. tables.my.sql | 6 +++++- tables.pg.73and_above.sql | 22 ++++++++++++++++------ tables.pg.sql | 22 ++++++++++++++++------ 3 files changed, 37 insertions(+), 13 deletions(-) commit e05ff2c60 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 26 00:35:30 2009 +0000 Fixed bug causing days of the week not to take account of $weekstarts in email notifications of repeating entries. web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 12c102df0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 25 23:14:38 2009 +0000 Fix to avoid an undefined variable message. web/functions_mail.inc | 2 ++ 1 file changed, 2 insertions(+) commit e2cf01193 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 25 14:44:42 2009 +0000 Switched to using email validation function. web/edit_users.php | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) commit 7b00564b7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 25 14:22:05 2009 +0000 Moved the email address validation for areas and rooms into a function. web/edit_area_room.php | 35 ++++------------------------------- web/functions.inc | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 31 deletions(-) commit 680a326d5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 25 13:30:48 2009 +0000 Extended the database upgrade scheme to allow sites to add their own local upgrades. Local upgrades are kept in upgrade/local and are executed after any necessary global MRBS upgrades have been completed. web/dbsys.inc | 23 +++++++++++++++++++++-- web/lang.en | 7 ++++--- web/upgrade.inc | 26 ++++++++++++++++++++------ web/upgrade/local/1/mysql.sql (new) | 4 ++++ web/upgrade/local/1/pgsql.sql (new) | 4 ++++ 5 files changed, 53 insertions(+), 11 deletions(-) commit b2cb98184 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 25 09:33:26 2009 +0000 Fixed a couple of other places where $HTTP_REFERER could be undefined (see comment in Rev 1070) web/session_cookie.inc | 7 +++++-- web/session_php.inc | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) commit 198f18efc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 25 09:18:37 2009 +0000 Fixed problem caused by an undefined variable when running with E_NOTICE errors turned on. (The undefined variable notice message turns up in the returl parameter in the query string which is then passed to the header("Location: ") redirect call which then results in a "Warning: Header may not contain more than a single header, new line detected" error message). web/edit_entry.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit 43f23f5c0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 25 08:47:35 2009 +0000 Changed some parts to use the existing function mrbsGetRoomArea instead of constructing their own SQL queries. web/edit_area_room.php | 3 ++- web/edit_entry.php | 6 ++---- web/index.php | 16 ++++------------ 3 files changed, 8 insertions(+), 17 deletions(-) commit 8d8756ddf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Mar 24 09:25:28 2009 +0000 Fixed bug that was causing the repeat day not to be checked for existing series in the edit_entry form (and was causing undefined variable errors). web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a406930f4 Author: dceschools <devnull@localhost> Date: Mon Mar 23 22:02:10 2009 +0000 Fixed Undefined Variable warning related to private bookings when accessing Help page. web/functions.inc | 1 + 1 file changed, 1 insertion(+) commit e92a26ec3 Author: dceschools <devnull@localhost> Date: Mon Mar 23 20:13:13 2009 +0000 Corrected DB upgrade for private bookings to use configured DB prefix instead of default mrbs_ prefix. web/upgrade/3/mysql.sql | 4 ++-- web/upgrade/3/pgsql.sql | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit f157204a0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 23 19:20:50 2009 +0000 Fixed bug causing undefined variable notice. web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cfc7a8a44 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 23 18:26:31 2009 +0000 Fixed bug which prevented ordinary users editing their own details when using 'db' authentication. web/edit_users.php | 5 +++++ 1 file changed, 5 insertions(+) commit 3f0dc66f5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 22 23:11:25 2009 +0000 Added some ids to divs to assist in styling the header. web/functions.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit 018bf5390 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 22 17:42:56 2009 +0000 Fixed bug that meant that the right area settings ($resolution, etc.) were not being picked up if you were editing an existing booking and the system had more than one area. web/edit_entry.php | 7 +++++++ 1 file changed, 7 insertions(+) commit c979e9177 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 22 17:01:52 2009 +0000 Improved handling of conflicts in edit_entry to allow for easy addition of more booking policies (at present there is only one, a limit on the number of bookings). web/edit_entry_handler.php | 45 +++++++++++++++++++++++++----------- web/lang.en | 3 ++- 2 files changed, 33 insertions(+), 15 deletions(-) commit 3cb5d7430 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 22 15:22:19 2009 +0000 Fixed bug which caused the wrong area settings ($resolution etc) to be used by edit_entry_handler when there was more than one area. web/edit_entry.php | 6 +++--- web/edit_entry_handler.php | 9 ++++++++- web/functions.inc | 8 ++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) commit 7ffd3a4ea Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Mar 22 11:58:14 2009 +0000 Restored the highlighting of single rows (achieved through clicking on a time) that got lost when support for the display of multiple bookings in a timeslot was added. web/day.php | 10 +++++++++- web/functions.inc | 17 +++++++---------- web/week.php | 10 +++++++++- 3 files changed, 25 insertions(+), 12 deletions(-) commit 9efbd8ab9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Mar 21 13:24:11 2009 +0000 Used a slightly more obvious conversion of JavaScript variables from strings to integers. No change to functionality - just a bit more maintainable. web/edit_area_room.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit f1d970a8a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 20 00:24:45 2009 +0000 Improved checking of number of slots in the config file and also when editing areas. web/config.inc.php | 14 ++++++++------ web/edit_area_room.php | 15 ++++++++++++++- web/lang.en | 1 + 3 files changed, 23 insertions(+), 7 deletions(-) commit 5a3a35726 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 19 23:22:14 2009 +0000 Fixed problem that stopped editing of area details working when using periods. web/edit_area_room.php | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) commit cb81695bb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 19 22:52:37 2009 +0000 Fixed a problem with the display of multiple bookings when the first booking in the slot starts at morningstarts. web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1d3cdc0fb Author: dceschools <devnull@localhost> Date: Wed Mar 18 21:56:42 2009 +0000 Added ability to create private bookings. If enabled, entries can be hidden from other non-admin users. See config file to enable this feature and for options. web/Themes/classic126.inc | 13 ++++++-- web/Themes/default.inc | 12 +++++++- web/config.inc.php | 24 +++++++++++++++ web/day.php | 5 ++- web/dbsys.inc | 2 +- web/edit_entry.php | 31 +++++++++++++++++-- web/edit_entry_handler.php | 18 +++++++++-- web/functions.inc | 54 ++++++++++++++++++++++++++++++++- web/lang.en | 2 ++ web/month.php | 36 ++++++++++++++++++++-- web/mrbs.css.php | 1 + web/mrbs_sql.inc | 25 ++++++++++----- web/report.php | 36 ++++++++++++++++++++++ web/search.php | 39 ++++++++++++++++++++++++ web/upgrade/3/mysql.sql (new) | 9 ++++++ web/upgrade/3/pgsql.sql (new) | 9 ++++++ web/view_entry.php | 24 +++++++++++++-- web/week.php | 9 ++++-- 18 files changed, 321 insertions(+), 28 deletions(-) commit d9de185fb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 18 20:38:36 2009 +0000 Made representation of 12 midnight with a 12 hour clock consistent with the rest of MRBS - ie written as 12:00AM not 0:00AM. web/edit_entry.php | 51 +++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 19 deletions(-) commit e85a1aa9f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 18 20:18:09 2009 +0000 Fix to avoid an undefined variable notice. web/edit_entry_handler.php | 1 + 1 file changed, 1 insertion(+) commit 487b4db6c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 18 19:14:51 2009 +0000 Made the timeslot settings (resolution, default_duration, morningstarts, morningstarts_minutes, eveningends and eveningends_minutes) per-area settings with the values being held in the area table of the database. Default values are taken from the config file. The area values can be edited from the edit_area_room.php page. At this stage period settings have not been moved to a per-area basis, but could be in the future, as could other config variables such as timezone. tables.my.sql | 12 +- web/config.inc.php | 70 +++++-- web/day.php | 14 +- web/dbsys.inc | 2 +- web/edit_area_room.php | 350 +++++++++++++++++++++++++++++--- web/edit_entry.php | 21 +- web/edit_entry_handler.php | 14 +- web/functions.inc | 26 +++ web/lang.en | 31 +-- web/month.php | 12 +- web/mrbs-ielte6.css | 3 - web/mrbs.css.php | 99 ++++----- web/upgrade/2/mysql.sql (new) | 9 + web/upgrade/2/pgsql.sql (new) | 10 + web/upgrade/2/post.inc (new) | 27 +++ web/week.php | 12 +- 16 files changed, 553 insertions(+), 159 deletions(-) commit 028cc95c2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 16 16:10:55 2009 +0000 Added the ability for a PHP file (called 'post.inc') to be executed if present after a database upgrade. This allows, for example, new columns to be populated with appropriate values. web/upgrade.inc | 6 ++++++ 1 file changed, 6 insertions(+) commit 58406a199 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 13 22:32:25 2009 +0000 Fixed a problem with company name not appearing. web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a534a3d47 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 13 22:29:51 2009 +0000 Fixed some potential undefined index NOTICE errors. web/day.php | 4 ++++ web/functions.inc | 1 + web/week.php | 4 ++++ 3 files changed, 9 insertions(+) commit d4266ecbe Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Mar 13 19:44:08 2009 +0000 Fixed the display in the day and week views so that if there are timeslots that have more than one booking then the table is still displayed properly. Although normally it is not possible to have more than one booking in a timeslot, it can occur if (a) the resolution is increased, (b) the display day is shifted, or (c) bookings were made before Revision 1040 and the booking was not aligned to a timeslot. Cells with more than one booking are now displayed as a mini table that can be maximised to see the details of the bookings. web/Themes/classic126.inc | 8 +- web/Themes/default.inc | 5 +- web/day.php | 158 ++-------- web/functions.inc | 397 ++++++++++++++++++++++++++ web/mrbs-ielte6.css | 8 + web/mrbs-js-overrides.css.php (new) | 20 ++ web/mrbs-js-overrides.js (new) | 10 + web/mrbs.css.php | 67 ++--- web/style.inc | 6 + web/week.php | 212 ++------------ 10 files changed, 535 insertions(+), 356 deletions(-) commit ce449d0d9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 11 17:08:44 2009 +0000 Added a restriction that you cannot edit a username (even your own) unless you are an admin with user editing rights. web/edit_users.php | 10 ++++++++++ 1 file changed, 10 insertions(+) commit d0c2a1e81 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Mar 11 16:46:25 2009 +0000 (1) Fixed a problem that meant that if you were using 'db' authentication and had two levels of admin (booking admins at level 2 and user admins at level 3), it was possible for booking admins to edit other users details. (2) Added a language token for a level 3 admin web/edit_users.php | 369 ++++++++++++++++++++++--------------------- web/lang.en | 1 + 2 files changed, 192 insertions(+), 178 deletions(-) commit 5af3887ca Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Mar 5 17:31:16 2009 +0000 Fixed bug which caused highlighting not to work in IE6 when the $main_cell_height is increased from its default. See SF Tracker 2548900. Thanks to D. Faulkner for the solution. web/mrbs.css.php | 1 + web/xbLib.js | 28 ++++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) commit e0e22e219 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Mar 2 15:03:05 2009 +0000 * Added a comment to the new config variable. web/config.inc.php | 3 +++ 1 file changed, 3 insertions(+) commit 0f46eb43c Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Mar 2 14:57:54 2009 +0000 * Added new config variable, $auth["session_php"]["session_expire_time"], which sets the expiry time of the session cookie if you use the 'php' session scheme. The default value in config.inc.php is 30 days, thereby matching the expiry time of the 'cookie' session scheme. The previous behaviour was that sessions were not persistent - this can still be achieved by changing the config variable to 0. Also changed the name of session to 'MRBS_SESSID' to make it more distinct. web/config.inc.php | 6 ++++++ web/session_php.inc | 14 +++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) commit 7d6d8ae20 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Mar 2 14:30:23 2009 +0000 * Changed most 'include' statements to be 'require_once' as this is really what they are. * Changed all but one page completions to use print_footer(). * Removed stale file, 'pgsql.before_php42.inc'. If you use Postgresql you must have PHP 4.2 or higher. * Added 'require_once "functions.inc"' into grab_globals.inc as it uses a function (unslashes) from that file. This fixes a bug I encountered during testing. checklang.php | 2 +- convert_db_to_utf8.php | 8 +- pgsql.before_php42.inc (gone) | 239 -------------------------------- testdata.php | 4 +- web/add.php | 8 +- web/admin.php | 10 +- web/auth_ext.inc | 2 +- web/day.php | 12 +- web/dbsys.inc | 8 +- web/del.php | 12 +- web/del_entry.php | 12 +- web/edit_area_room.php | 14 +- web/edit_entry.php | 10 +- web/edit_entry_handler.php | 33 ++--- web/edit_users.php | 40 +++--- web/functions.inc | 4 +- web/grab_globals.inc.php | 6 + web/help.php | 14 +- web/index.php | 4 +- web/month.php | 14 +- web/mrbs-print.css.php | 2 +- web/mrbs.css.php | 2 +- web/mrbs_auth.inc | 10 +- web/report.php | 10 +- web/search.php | 16 +-- web/session_cookie.inc | 13 +- web/session_php.inc | 10 +- web/trailer.inc | 8 +- web/view_entry.php | 10 +- web/week.php | 14 +- 30 files changed, 163 insertions(+), 388 deletions(-) commit 7abb55d4f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Mar 2 01:29:12 2009 +0000 Fixed a problem with the rounding of booking slots to resolution boundaries. It was possible to make a booking that neither started nor ended on a slot boundary. If a subsequent booking was made that started within the slot just after the previous booking ended then there would be two bookings within the same slot, throwing the display table into disarray. web/edit_entry_handler.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) commit 4288a282a Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Mar 1 23:23:29 2009 +0000 * Fixed auth level check in db upgrade code. web/dbsys.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f12914536 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Mar 1 23:18:07 2009 +0000 * Added support for automatic database upgrades. This includes the addition of a new database table, with the default name of mrbs_variables. * Moved definition of table name variables out of config.inc.php, into dbsys.inc. * Database version check/upgrade code is implemented in dbsys.inc and upgrade.inc. Database upgrade SQL code is stored in upgrade/<SCHEMA_VERSION>/<DB_TYPE>.sql. Added three new localisation tokens into lang.en. * Added multiple inclusion protection to all functions.inc and mrbs_auth.inc inclusions. * Added code to allow print_header() to be called more than once. The second time just does nothing. * Added new DB abstraction function, sql_table_exists($table). * Added new function, print_footer(), to print a basic page footer, and optionally exit. * Fixed prototype of getAuthorised(). tables.my.sql | 12 ++++++ tables.pg.73and_above.sql | 11 ++++- tables.pg.sql | 9 ++++ web/add.php | 4 +- web/admin.php | 4 +- web/config.inc.php | 9 ---- web/day.php | 4 +- web/dbsys.inc | 76 +++++++++++++++++++++++++++++++++ web/del.php | 4 +- web/del_entry.php | 4 +- web/edit_area_room.php | 4 +- web/edit_entry.php | 4 +- web/edit_entry_handler.php | 4 +- web/edit_users.php | 4 +- web/functions.inc | 30 ++++++++++++- web/help.php | 4 +- web/lang.en | 5 +++ web/month.php | 4 +- web/mrbs_auth.inc | 6 +-- web/mysql.inc | 11 +++++ web/mysqli.inc | 11 +++++ web/pgsql.inc | 14 ++++++ web/report.php | 4 +- web/search.php | 4 +- web/upgrade.inc (new) | 70 ++++++++++++++++++++++++++++++ web/upgrade/1/mysql.sql (new) | 12 ++++++ web/upgrade/1/pgsql.sql (new) | 10 +++++ web/view_entry.php | 4 +- web/week.php | 4 +- 29 files changed, 299 insertions(+), 47 deletions(-) commit 622d2838d Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Feb 27 23:22:59 2009 +0000 * Fixed syntax error reported on the mailing list. web/auth_db_ext.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 81b05d688 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Feb 26 20:53:05 2009 +0000 * Fix for SF tracker #2637686 - fixes width of create_by column in the mrbs_repeat table for Postgresql >= 7.3. tables.pg.73and_above.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ac45444b4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Feb 26 15:14:06 2009 +0000 Minor update to a comment web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a21483658 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 25 12:06:53 2009 +0000 Generalised the code for editing users so that it can in the future cope with having admin levels higher than 2. This might be necessary if one wants to have greater granularity of admin rights, for example distinguishing between booking admins, user admins and system admins. (A system admin might be necessary if, for example, some of the parameters currently in the config file are made editable from MRBS). web/auth_db.inc | 4 +++- web/edit_users.php | 45 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 39 insertions(+), 10 deletions(-) commit 457fa1598 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 25 11:47:35 2009 +0000 Removed code creating a duplicate hidden field, accidentally left in during development. web/edit_users.php | 5 ----- 1 file changed, 5 deletions(-) commit 2db4bc6c4 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Feb 24 22:52:28 2009 +0000 * Updated documentation on 'db' and 'db_ext' auth methods - they no longer claim to only work for MySQL. AUTHENTICATION | 102 +++++++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 53 deletions(-) commit 5b85ac151 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Feb 24 22:40:13 2009 +0000 * Fixed name of sql_mysql_syntax_addcolumn_after() and sql_mysqli_syntax_addcolumn_after(). * Corrected comment above sql_syntax_addcolumn_after() function. web/dbsys.inc | 3 ++- web/mysql.inc | 2 +- web/mysqli.inc | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) commit 1e1174039 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Feb 24 22:27:19 2009 +0000 Fixes for utilising 'db' auth method with a Postgresql database: * The new upgrade code used "ALTER TABLE ADD col AFTER othercol" syntax, which isn't available in Postgresql. Added a new DB abstraction call, sql_syntax_addcolumn_after($col), which returns an empty string in any DB abstraction (like Postgresql) that doesn't have the AFTER syntax. * Created another DB abstraction call, sql_syntax_createtable_autoincrementcolumn(), which returns the correct SQL to specify a column as being an auto-incrementing integer. This is required because the syntax for this is quite different between MySQL and Postgresql. edit_users.php now uses this to create the mrbs_users table. * Removed the use of the "REPLACE INTO" SQL in edit_users.php, which Postgresql doesn't support. Based on the patches received from Taryn East. web/dbsys.inc | 51 ++++++++++++++++++++++ web/edit_users.php | 102 +++++++++++++++++++++++++++++++------------ web/mysql.inc | 20 +++++++++ web/mysqli.inc | 19 ++++++++ web/pgsql.inc | 10 +++++ 5 files changed, 175 insertions(+), 27 deletions(-) commit fb60867a6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Feb 24 19:26:53 2009 +0000 Upgraded the DB authentication scheme so that access rights are now stored in the MRBS database and administered from MRBS. (Previously admin users were configured in the config file). If upgrading from an earlier version of MRBS that was using DB authentication, then the first time that edit_users.php is run, MRBS will automatically add the access rights field to the users table and give admin rights to those users for whom admin rights are configured in the config file. So if upgrading, make sure that the admin rights are in the config file until edit_users.php has been run for the first time. After that MRBS does not check the config file for admin rights, but instead checks the database, so the admin rights in the config file can then be deleted. If running MRBS, or MRBS using DB authentication for the first time, the system will automatically create the users table as before and then you must add the first administrator user. As safety measures, MRBS will force the first user created to be an admin user, and will prevent you from deleting the last admin user in the table. At the same time the function authGetUserLevel has been modified so that it just takes one parameter instead of two. The second parameter was always the same, $auth, which was a global anyway. With the changes to the DB authentication scheme, the second parameter is not needed, and for all other schemes it can be accessed as a global. Based on contributions from Taryn East. AUTHENTICATION | 49 ++++-- web/auth_config.inc | 8 +- web/auth_db.inc | 29 ++-- web/auth_db_ext.inc | 8 +- web/auth_ext.inc | 8 +- web/auth_imap.inc | 8 +- web/auth_imap_php.inc | 8 +- web/auth_ldap.inc | 8 +- web/auth_nis.inc | 8 +- web/auth_none.inc | 8 +- web/auth_nw.inc | 8 +- web/auth_pop3.inc | 8 +- web/config.inc.php | 16 +- web/edit_users.php | 353 ++++++++++++++++++++++++++-------------- web/lang.ca | 2 +- web/lang.cs | 2 +- web/lang.da | 2 +- web/lang.de | 2 +- web/lang.el | 2 +- web/lang.en | 8 +- web/lang.es | 2 +- web/lang.eu | 2 +- web/lang.fi | 4 +- web/lang.fr | 2 +- web/lang.it | 2 +- web/lang.ja | 2 +- web/lang.ko | 2 +- web/lang.nl | 2 +- web/lang.no | 2 +- web/lang.pl | 2 +- web/lang.pt | 2 +- web/lang.sl | 2 +- web/lang.sv | 2 +- web/lang.tr | 2 +- web/lang.zh-cn | 2 +- web/lang.zh-tw | 2 +- web/mrbs.css.php | 3 + web/mrbs_auth.inc | 6 +- 38 files changed, 375 insertions(+), 213 deletions(-) commit 9d6759fbe Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Feb 18 00:20:52 2009 +0000 Updated comment to reflect the fact that colours for booking types are now defined in the Themes directory. web/config.inc.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit affc28e96 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Feb 15 21:42:55 2009 +0000 * English translation change, as suggested on the mailing list. web/lang.en | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 90e88d7d0 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Feb 15 19:57:54 2009 +0000 * Implemented suggestion from SF tracker #1696876. web/view_entry.php | 1 + 1 file changed, 1 insertion(+) commit ad575ec2a Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Feb 15 18:41:48 2009 +0000 * Added Polish translation, provided by Arkadiusz Patyk. web/lang.pl (new) | 262 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 262 insertions(+) commit 11debd7de Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 15 13:17:31 2009 +0000 Tweaked border colours for print view to tie in with theme colour schemes. web/Themes/classic126.inc | 8 ++++---- web/Themes/default.inc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) commit b87875e32 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 15 13:11:26 2009 +0000 Added a top margin to the colour key table in the print view in order to separate it from the main table. (In the screen view the separation is provided by the Goto Prev/This/Next links) web/mrbs-print.css.php | 6 ++++++ 1 file changed, 6 insertions(+) commit a9bfa3fc8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Feb 15 12:54:30 2009 +0000 - Changed the print media CSS so that it can use different table and cell border colours from the screen view. Without this, cell boundaries are invisible when printed. - As part of this change moved the selection of theme from the CSS file to the config file, which makes sense as all major configuration choices are made in the config file web/Themes/classic126.inc | 6 ++++++ web/Themes/default.inc | 6 ++++++ web/config.inc.php | 20 ++++++++++++++++++++ web/mrbs-print.css (gone) | 5 ----- web/mrbs-print.css.php (new) | 32 ++++++++++++++++++++++++++++++++ web/mrbs.css.php | 14 +------------- web/style.inc | 2 +- 7 files changed, 66 insertions(+), 19 deletions(-) commit a5a3b8e38 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Feb 14 23:32:30 2009 +0000 * Updated version number to 1.4.1+svn. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9e1a08590 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Feb 14 23:31:22 2009 +0000 * A couple of changes that should hopefully solve the reported problems of a number in an SQL statement being in "engineering" format and therefore causing an SQL error. First report was SF #1794351 I believe. web/edit_entry_handler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1d44bd196 (tag: mrbs-1_4_1) Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Feb 14 21:51:26 2009 +0000 * Updated NEWS and ChangeLog for 1.4.1 release. ChangeLog | 319 ++++++++++++++++++++++++++++++++++++++++++++++++++++ NEWS | 37 ++++++ 2 files changed, 356 insertions(+) commit 898c98bf9 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Feb 14 14:10:53 2009 +0000 * Updated version number for 1.4.1 release. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 366ef990e Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Feb 6 13:11:29 2009 +0000 * Added svn:eol-type native to Theme files, and added missing final \n's to a number of files. I wrote a script to check for both problems, which I'll check-in to the tools tree. NEWS | 2 +- README.nwauth | 2 +- web/Themes/classic126.inc | 184 ++++++++++++++++++------------------ web/Themes/default.inc | 184 ++++++++++++++++++------------------ web/mrbs-ie8.css | 2 +- web/mrbs-ielte6.css | 2 +- web/mrbs-ielte7.css | 2 +- web/site_faq_nl.html | 2 +- 8 files changed, 190 insertions(+), 190 deletions(-) commit 20d5f255d Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Feb 6 12:47:24 2009 +0000 * Set svn:eol-style to native on some files that didn't have it set yet. web/mrbs-ie.css | 74 +-- web/mrbs-ie8.css | 36 +- web/mrbs-ielte6.css | 54 +- web/mrbs-ielte7.css | 24 +- web/mrbs.css.php | 1436 ++++++++++++++++++++--------------------- 5 files changed, 812 insertions(+), 812 deletions(-) commit c27105e33 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Feb 5 22:34:44 2009 +0000 * Added missing $Id$ to a few files. web/dbsys.inc | 2 ++ web/version.inc | 2 ++ 2 files changed, 4 insertions(+) commit 11a34b329 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Feb 5 22:25:23 2009 +0000 * Belated updated version specifier to 1.4+svn. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8fc4e06a3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Jan 24 17:03:27 2009 +0000 Added the concept of Themes to MRBS, and implemented the first theme - "classic126" which uses the MRBS 1.2.6 colour scheme. Colours which can be changed have now been extracted from the main CSS file and put in an include file in the Themes directory. Themes are selected by commenting out or un-commenting the appropriate include statements in the main CSS file. web/Themes/classic126.inc (new) | 92 +++++++++++++++++++ web/Themes/default.inc (new) | 92 +++++++++++++++++++ web/mrbs.css.php | 145 +++++++++--------------------- 3 files changed, 224 insertions(+), 105 deletions(-) commit 09fdf7e06 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 23 20:51:57 2009 +0000 Added to comments. web/edit_entry_handler.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 9891c788d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 23 20:36:13 2009 +0000 User feedback improvement: changed the period that is shown (disabled) in the Period field when All Day is checked to the first period, and restored the previous value when it is unchecked. This matches the behaviour when using time slots. See also Revision 991 and SF Tracker #2494369 web/edit_entry.php | 4 ++++ 1 file changed, 4 insertions(+) commit 7bde02909 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 23 20:31:25 2009 +0000 Fixed a bug which meant that repeating All Day bookings were not being booked for the right number of days (eg daily repeats were being booked for N-1 instead of N days). Bug caused by the fact that the JavaScript in edit_entry was disabling some fields, and so they were not being passed through by the form. Could have fixed this by changing edit_entry to make the fields readonly instead of disabled, and thus passed through, but decided not to as browsers generally do not grey out readonly fields - and so there would not be enough user feedback. Instead decided to fix by setting the relevant form variables at the beginning of edit_entry_handler when all_day is checked. Note that these symptoms were in MRBS before the disabled fields were introduced in Revision 991, but the cause was different: whilst the fields were enabled, their values were being set to 0 and so the test for when to finish a repeat series was finishing prematurely. See also SF Tracker #2494369. web/edit_entry_handler.php | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) commit 3422b5ddc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 22 09:53:46 2009 +0000 Added keywords commit e98bc2b86 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jan 22 00:36:30 2009 +0000 Implemented the option to hide certain days of the week (eg weekends) in the week and month views. The days of the week are specified in the config file by the array $hidden_days. Hidden days will not be displayed in the main table in the week and month views; they will be greyed out in the trailer links and in the mini-cals; and in the day view the Goto Next/Previous links will skip past them. However they are are still bookable if you want, by choosing the day in the edit entry form, and you can still see bookings for hidden days if you jump directly to the day view for a hidden day using the date selector. Moreover it is perfectly possible to book repeating bookings that fall on hidden days. (The option to prevent certain days of the week being booked by non-admins is an independent option which could be implemented at a later date). web/config.inc.php | 13 +++ web/day.php | 19 +++- web/functions.inc | 7 ++ web/mincals.inc | 42 +++++-- web/month.php | 203 ++++++++++++++++++++-------------- web/mrbs-ie8.css | 15 ++- web/mrbs-ielte7.css (new) | 13 +++ web/mrbs.css.php | 61 ++++++++++- web/style.inc | 3 + web/trailer.inc | 30 ++++- web/week.php | 211 ++++++++++++++++++++---------------- 11 files changed, 423 insertions(+), 194 deletions(-) commit 1f680b50e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jan 20 14:17:24 2009 +0000 Fixed problem reported by Phillip Williams on the mailing list. Checking of $resolution and slot times now only happens if periods are not enabled, and checking of the number of periods defined only happens if periods are enabled. web/config.inc.php | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) commit 268029ba6 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jan 19 14:01:31 2009 +0000 * Corrected mispelt function implementation in 'mysql' DB abstraction layer. web/mysql.inc | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) commit d9b8fcdfa Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Jan 15 09:22:10 2009 +0000 * Small documentation fix, db_ext authentication method no longer says it is only for a MySQL database. AUTHENTICATION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit aa73596af Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jan 14 22:04:22 2009 +0000 * Added new file that I forgot to add in the previous checkin! web/dbsys.inc (new) | 480 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 480 insertions(+) commit c4771feb5 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jan 14 21:48:50 2009 +0000 * Revamped the database abstraction system a bit. You can now use the abstraction API to connect to any database you like, as long as an abstraction is provided for it. This has been made possible by creating a new PHP file, dbsys.inc, that defines all the sql_* functions. Each database abstraction then defines sql_XXX_*, where XXX is the database system. Additionally to the old API there is then an sql_connect() function to connect to a database, and also an sql_XXX_default_connect() function that connects to the default MRBS database as appropriate in a particular abstraction. * 'db_ext' authentication scheme can now use any of the available SQL abstraction schemes, by defining $auth['db_ext']['db_system']. If this is not defined the configuration variable is defaulted to 'mysql'. AUTHENTICATION | 8 +- README.sqlapi | 34 +++-- web/add.php | 2 +- web/admin.php | 2 +- web/auth_db_ext.inc | 23 +-- web/config.inc.php | 4 + web/day.php | 2 +- web/del.php | 2 +- web/del_entry.php | 2 +- web/edit_area_room.php | 2 +- web/edit_entry.php | 2 +- web/edit_entry_handler.php | 2 +- web/edit_users.php | 2 +- web/help.php | 2 +- web/index.php | 2 +- web/month.php | 2 +- web/mysql.inc | 196 ++++++++++++++++--------- web/mysqli.inc | 248 ++++++++++++++++++++++---------- web/pgsql.inc | 267 ++++++++++++++++++++++++----------- web/report.php | 2 +- web/search.php | 2 +- web/view_entry.php | 2 +- web/week.php | 2 +- 23 files changed, 548 insertions(+), 264 deletions(-) commit d0bb0b50f Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jan 12 21:51:25 2009 +0000 * Small Italian translation update from Claudio Strizzolo. web/lang.it | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6b8cb5d3f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jan 12 11:20:28 2009 +0000 Fixed the problem of the sticky week not being highlighted properly. First reported by dmacdoug in the mailing list. Fix attempted in Revision 983, which proved to be incorrect. Many thanks to dwpoon for this fix. Se also SF Patches item #2493501. web/mincals.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) commit cd9886616 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jan 9 19:30:32 2009 +0000 Fixed SF Tracker #2494369 (The duration length and units can still be changed even when All Day is checked, leading to user confusion). Fix based on input from David Cummins. web/edit_entry.php | 68 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 9 deletions(-) commit efff9c59d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Dec 21 22:22:07 2008 +0000 Further improved testing for IE6 or lower browsers by: - testing for null href strings, which will be the case for embedded style sheets (if used) - stopping testing style sheets once an IE6 or lower sheet has been found web/xbLib.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit 44964c61d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 19 15:57:09 2008 +0000 Fixed bug reported by Brian Taylor in the mailing list (" If I use the search facility to find a specific entry, click on edit and then save I get the error message - Empty or invalid search string. This only happens if you attempt to edit an entry, all the other options work."). After editing an entry found from a search you are now returned to the default view for the date that you have just edited. [The alternative is to return the user to the search results, but I'm not sure that's particularly useful - and besides it would be a little trickier to code as you'd have to preserve the search parameter in the query string.] web/edit_entry_handler.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit e5195756c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 18 17:29:19 2008 +0000 Fixed problem reported by Michael Graham on the mailing list: bookings for fractions of an hour are incorrectly rounded down. web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ff48344cd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 18 17:00:29 2008 +0000 Changed the way that the JavaScript tests for the presence of IE6 or lower browsers (and therefore whether to use JavaScript or CSS highlighting). It now checks the "href" strings of style sheets that have been loaded, rather than the titles, as using titles causes other problems (see SF tracker #2418073). This change improves on the fix supplied in Revision 986 as there is now need for titles at all, and they can now be used in future if necessary for the purposes for which they were intended (eg distinguishing between persistent and preferred style sheets). web/style.inc | 12 +++++++----- web/xbLib.js | 8 +++++--- 2 files changed, 12 insertions(+), 8 deletions(-) commit 0671c5db1 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Dec 13 20:23:37 2008 +0000 * Fix for SF tracker #2418172, fixing a bug that stopped time highlighting from working. Fix supplied by David Cummings. * Fix for SF tracker #2418073, fixing a bug that stopped the print media stylesheet from working in Firefox. Fix suplied by David Cummings. web/day.php | 1 + web/style.inc | 4 ++-- web/week.php | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) commit 0142c0d72 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 12 09:57:11 2008 +0000 Improved comments and variable naming to make it slightly clearer what's going on when working out which days to highlight in the week view. web/mincals.inc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) commit 39c8dad52 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Dec 12 00:00:46 2008 +0000 Fixed bug reported by dmacdoug in the mailing list: the week view highlighting is shifted forward one day. web/mincals.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 4bde22c74 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Dec 11 10:31:40 2008 +0000 Fixed bug reported by Paul Turner on the mailing list: the 'Next' button in Search does not work. web/search.php | 2 ++ 1 file changed, 2 insertions(+) commit 09dd23a17 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Dec 10 08:14:11 2008 +0000 Fixed error introduced in last revision. (Spelling of color). Third time lucky! web/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 708c8dcf8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Dec 9 10:55:42 2008 +0000 Corrected a very minor mistake introduced in the last revision (no impact on appearance) web/mrbs.css.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit e466de75f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 8 11:45:37 2008 +0000 Added the ability to have supplementary text after the company logo or name (for example "XYZ Department") as some users need this. web/config.inc.php | 5 ++++- web/functions.inc | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) commit 363b6a2a3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Dec 8 11:25:05 2008 +0000 Fixed bug which was causing the wrong text to be sent in the subject line for email notifications when $mrbs_company was set to be a logo image web/config.inc.php | 15 ++++++++++----- web/functions.inc | 30 ++++++++++++++++++++++++++---- web/mrbs.css.php | 7 ++++--- 3 files changed, 40 insertions(+), 12 deletions(-) commit 96b8f501a Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Dec 5 13:57:41 2008 +0000 * Fix for SF tracker #2388038 as provided in the tracker by 'blueteen'. Now uses the right SQL column for the area name when building a notification email. web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ca2e1c733 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Dec 3 14:35:09 2008 +0000 * Updated NEWS and ChangeLog for 1.4 release. ChangeLog | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++ NEWS | 10 ++- 2 files changed, 180 insertions(+), 1 deletion(-) commit 298fca261 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Dec 3 14:27:45 2008 +0000 * Updated version number to 1.4. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4e71e7bd4 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Dec 3 14:27:20 2008 +0000 * Tweaked the comment in config.inc.php about setting $timezone. web/config.inc.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit df29f3cd0 (tag: mrbs-1_4) Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Nov 14 15:31:35 2008 +0000 * Third time lucky with translation update! web/lang.en | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2cdcf3999 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Nov 14 15:29:12 2008 +0000 * Fixed a typo in my previous translation update. web/lang.en | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1d6fa0ef8 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Nov 14 15:25:49 2008 +0000 * Clarified 'no_users_create_first_admin' English translation a bit. web/lang.en | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 84189c74c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 14 14:20:54 2008 +0000 Added a comment to the config file to make it clear that the 'db' authentication scheme relies on there being an admin user called 'administrator' for initial set-up. web/config.inc.php | 4 ++++ 1 file changed, 4 insertions(+) commit 8707d28eb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 14 13:07:28 2008 +0000 Changed the value of the Submit button when adding or editing a user from "OK" to "Save". The "OK" button was misleading as it could be interpreted as a request to acknowledge an error message. web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 81efbf59e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 14 12:49:50 2008 +0000 Changed edit_users.php so that it won't accept users with no name. web/edit_users.php | 27 +++++++++++++++++++++++---- web/lang.en | 1 + 2 files changed, 24 insertions(+), 4 deletions(-) commit 9ddfc9f96 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 14 12:29:35 2008 +0000 Fixed bug in edit_users.php, so that field values (eg user names) are now put through htmlspecialchars() before being displayed in the user list. web/edit_users.php | 4 ++++ 1 file changed, 4 insertions(+) commit e66e06fa6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Nov 14 12:16:43 2008 +0000 Fixed SF bug 2275465, originally reported by Simon Hunter. Edit_users will now ensure that user names are unique. web/edit_users.php | 34 ++++++++++++++++++++++++++++++++++ web/lang.en | 3 +++ 2 files changed, 37 insertions(+) commit f2b7d6943 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Nov 9 22:04:21 2008 +0000 * Commented out default timezone in config.inc.php, I didn't mean to have it uncommented. web/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2e619c8aa Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Nov 9 21:59:45 2008 +0000 * Fixed database escaping issues, reported as SF tracker #2229897 and diagnosed by 'mahbr'. * Added setting into config.inc.php (and code to use it) to set the timezone that the MRBS web server runs in. This is especially required with PHP 5 on Linux, as if you don't set the timezone it seems PHP just runs without any proper timezone functionality. web/add.php | 6 +++--- web/auth_db.inc | 7 +++++-- web/config.inc.php | 8 ++++++++ web/edit_area_room.php | 10 +++++----- web/edit_users.php | 2 +- web/functions.inc | 34 ++++++++++++++++++-------------- web/mrbs_sql.inc | 8 ++++---- web/session_http.inc | 13 ++---------- web/site_faq_nl.html (mode -x) | 0 9 files changed, 47 insertions(+), 41 deletions(-) commit 565e17857 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Nov 7 14:35:47 2008 +0000 * Fixed booking of meetings when $twentyfourhour_format is 0. Wasn't reading the 'ampm' form field in edit_entry_handler.php. Reported in SF tracker #2107847 by jwarchol. web/edit_entry_handler.php | 1 + 1 file changed, 1 insertion(+) commit 34d719f4b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Nov 5 17:41:10 2008 +0000 Modified xblSetNodeBgColor(node, color) so that it can cope with a null color. Although most browsers seem to accept a value of null being passed to setAttribute or setProperty, some, eg Konqueror, do not. It was this that was causing the "sticky highlighting" problem in Konqueror. (Although the "sticky highlighting" problem has already been cured by ensuring that a null value is never passed to xblSetNodeBgColor(), this change is being made as an added precaution). web/xbLib.js | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) commit 3824df237 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 28 01:37:26 2008 +0000 Tweaked formatting of edit_entry form web/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f2de23367 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 28 01:23:05 2008 +0000 (1) Fixed layout of am/pm radio buttons in the edit_entry form (when not using 24 hour format) (2) Tweaked styling of inputs on the edit_entry form web/edit_entry.php | 10 ++++++---- web/mrbs.css.php | 12 ++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) commit b73a82c69 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Oct 26 18:35:42 2008 +0000 * Patch to fix a problem reported in SF tracker #2193184. Problem reported and patch supplied by 'peterjclaw'. web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2082dca16 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Oct 21 21:57:28 2008 +0000 Implemented $month_cell_scrolling so that the scrolling behaviour in the month view can be easily turned off and on. web/mrbs-ielte6.css | 4 +++- web/mrbs.css.php | 19 +++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) commit d00d441be Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 19 11:45:08 2008 +0000 Fixed the comments concerning the use of a company logo: made the suggested code HTMl 4.01 compliant. web/config.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 610ad2f64 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Oct 19 08:04:26 2008 +0000 (1) Fixed problem whereby the minical links were not behaving properly when you hovered over them (because I'd forgotten to restrict the tr:hover behaviour to the bookings table when introducing CSS highlighting) (2) Tweaked the default colour for an invalid day in the month view to tie in to the default colour scheme (3) Tweaked the default colour for the search term in search results to tie in to the default colour scheme web/mrbs.css.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 29c868e80 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Oct 18 21:49:18 2008 +0000 * Unset 'svn:keywords' on ChangeLog. commit 8d2379310 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Oct 18 19:41:35 2008 +0000 * Updated NEWS and ChangeLog for MRBS 1.4beta2 release. ChangeLog | 488 ++++++++++++++++++++++++++++++++++++++++++++++++++++ NEWS | 39 ++++- 2 files changed, 525 insertions(+), 2 deletions(-) commit 3b9fd567c Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Oct 18 18:59:54 2008 +0000 * Updated version specifier to 1.4beta2. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit dd36783f1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Oct 18 09:16:31 2008 +0000 Optimised HTML output in tdcell by suppressing rowspan="n" when n=1. web/functions.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit 10a3ca1d6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 17 15:04:21 2008 +0000 Updated comments to explain the new behaviour whereby the time period cell corresponding to the start of a booking is highlighted when you hover over a booked cell. web/mrbs.css.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit bb50d6a42 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Oct 17 12:20:25 2008 +0000 * Added Hungarian support to the internationalisation - only required entries in the Windows specific maps, as hu_HU is the POSIX locale. web/language.inc | 2 ++ 1 file changed, 2 insertions(+) commit ec2346467 (tag: mrbs-1_4beta2) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Oct 17 11:18:40 2008 +0000 Tweaked default colours to provide more contrast between odd and even rows. web/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 659dc9b54 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Oct 16 21:29:27 2008 +0000 * Removed all HTML entities in the translations apart from . The only two languages that used these were Spanish and Catalan. Updated LANGUAGE document to tell translators to not use character entities. This was all done because functions_mail.inc was having to call html_entity_decode() to remove the HTML entities, but this function was only added in PHP 4.3, and only works properly (in UTF-8) from PHP 5. The use of html_entity_decode() has now been removed. LANGUAGE | 8 ++- web/functions_mail.inc | 11 +--- web/lang.ca | 116 ++++++++++++++++----------------- web/lang.es | 136 +++++++++++++++++++-------------------- 4 files changed, 135 insertions(+), 136 deletions(-) commit b7f28c661 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 16 09:43:51 2008 +0000 Fixed the problem of poor performance of cell highlighting in IE7 and IE8 when the day and week tables are large by implementing CSS highlighting (ie using the :hover pseudo-class) as the default. JavaScript highlighting is now only used if (a) $javascript_cursor is set to true in the config file and (b) the browser is IE6 or less. At the same time changed the default mode for JavaScript highlighting back to 'hybrid', as this gives better performance than 'class' for IE6. web/config.inc.php | 15 ++++++++--- web/month.php | 14 ++++++++--- web/mrbs.css.php | 59 +++++++++++++++++++++++++++++++++++++++++--- web/style.inc | 13 ++++++---- web/week.php | 7 +++++- web/xbLib.js | 33 +++++++++++++++++++++++++ 6 files changed, 124 insertions(+), 17 deletions(-) commit a86ef0d59 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Oct 14 10:23:07 2008 +0000 * Updated Japanese translation from MATSUURA Takanori. web/lang.ja | 60 +++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 28 deletions(-) commit 31c059232 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 9 15:40:57 2008 +0000 Reverted last set of changes web/xbLib.js | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) commit 5bb050fa4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Oct 9 14:26:27 2008 +0000 Implemented a better fix for the Konqueror "sticky highlighting" problem - as suggested by Jean-François Larvoire web/xbLib.js | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) commit 710d5224f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Oct 1 12:47:59 2008 +0000 Added some padding to the table header cells in the day/week/month views. web/mrbs.css.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 7a37c3fb5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 30 12:21:47 2008 +0000 Fixed the "sticky highlighting" problem in Konqueror (highlighted cells do not go back to normal when you move the mouse out and the highlight method is set to "hybrid"). web/config.inc.php | 3 ++- web/xbLib.js | 46 +++++++++++++++++++++++++++++--------------- 2 files changed, 32 insertions(+), 17 deletions(-) commit e8a28356a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 28 19:16:23 2008 +0000 Changed default colours for booking types. web/mrbs.css.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 5d7715c99 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Sep 28 18:56:38 2008 +0000 Fixed bug introduced in revision 890. Day/week/month now use the database abstraction layer. web/day.php | 2 +- web/month.php | 2 +- web/week.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 6425e521b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 26 10:16:02 2008 +0000 Ensured that if you delete an entry you go back to the view you started from, rather than the day view. (See also Revision 921). web/del_entry.php | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) commit e4e041108 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 26 10:06:18 2008 +0000 Fixed view_entry.php so that if you edit or copy an entry from here, then you go back afterwards to where you were beforehand (with some sensible view if you got there from an email). (See also Revision 921) web/view_entry.php | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) commit 61e1d2324 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 26 08:25:04 2008 +0000 Fixed the edit entry procedure so that if you try to create a new booking without first being logged on, you are returned at the end of the procedure to the view that you started at, instead of being returned to the default view. (See also Revision 921). web/edit_entry.php | 11 +++++++++-- web/session_cookie.inc | 24 +++++++++++++++++++++++- web/session_php.inc | 35 ++++++++++++++++++++++++++++------- 3 files changed, 60 insertions(+), 10 deletions(-) commit a189c0842 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 25 22:47:15 2008 +0000 Tidied up changes for "sticky room" by ensuring that the room information is passed to showAccessDenied. web/add.php | 2 +- web/admin.php | 2 +- web/del.php | 2 +- web/del_entry.php | 2 +- web/edit_area_room.php | 2 +- web/edit_entry.php | 4 ++-- web/edit_entry_handler.php | 4 ++-- web/edit_users.php | 6 +++--- web/mrbs_auth.inc | 6 +++--- 9 files changed, 15 insertions(+), 15 deletions(-) commit d735a3740 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 25 21:32:50 2008 +0000 Modified edit_entry_handler.php so that the "sticky day" and "sticky room" are updated when a booking is made, as presumably the user is now interested in the day and room that they were trying to book, rather than the previous sticky day and room. web/edit_entry_handler.php | 66 ++++++++++++++++++++++++------------ 1 file changed, 44 insertions(+), 22 deletions(-) commit 57297e3e5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 25 20:03:27 2008 +0000 Modified edit_entry_handler.php so that the possibility of the return url giving an endless loop is avoided. web/edit_entry_handler.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit 4437f71b7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 25 18:59:45 2008 +0000 Ensured that room information is preserved as you switch between views (ie in the same that the day information is now preserved as the "sticky day", so there is a "sticky room"). web/admin.php | 3 ++- web/day.php | 42 +++++++++++++++++++++------------ web/del.php | 4 ++-- web/edit_area_room.php | 2 +- web/edit_entry.php | 2 +- web/edit_entry_handler.php | 9 ++++---- web/edit_users.php | 10 ++++---- web/functions.inc | 45 +++++++++++++++++++++++++++--------- web/help.php | 3 ++- web/month.php | 2 +- web/mrbs_auth.inc | 2 +- web/report.php | 3 ++- web/search.php | 3 ++- web/session_cookie.inc | 8 +++---- web/session_php.inc | 8 +++---- web/view_entry.php | 3 ++- web/week.php | 2 +- 17 files changed, 96 insertions(+), 55 deletions(-) commit f1196b4e5 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 23 08:20:39 2008 +0000 Fixed edit_entry_handler.php so that on exit it returns to the page it was called from instead of going automatically to the day view. web/edit_entry_handler.php | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) commit 0990a8719 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 23 08:18:24 2008 +0000 Added day information to the room and area HTML links in the month view (the Select drop-down menus were OK, as were the day and week views). web/month.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 12f866878 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Sep 19 09:28:37 2008 +0000 1. Improved behaviour of new booking link in the month view so that the link is now active everywhere in the cell where there isn't something else. 2. Changed the title for bookings in the month view so that the full information (slot time and description) is displayed in the title tooltip when you hover over the booking for all three modes ('slot', 'description' and 'both'). web/month.php | 29 ++++++++++++----------------- web/mrbs.css.php | 39 ++++++++++++++++++++++++++++++++++----- 2 files changed, 46 insertions(+), 22 deletions(-) commit 2f18dcc8e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 18 15:41:16 2008 +0000 (1) Added highlighting of the "sticky day" to the mini-cals, on top of highlighting the current day/week/month. (2) Implemented the "sticky day" in the week links, preserving the day of the week when moving to a week for which the current sticky day is invalid. (3) Added links to the View Day/Week/Month labels in the classic trailer, to bring it into line with the simple trailer and to assist navigation between the day/week/month views now that the "sticky date" concept is working. web/mincals.inc | 220 ++++++++++++++++++++++++++------------------- web/mrbs.css.php | 1 + web/trailer.inc | 16 +++- web/week.php | 34 +++---- 4 files changed, 159 insertions(+), 112 deletions(-) commit 3b7143840 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Sep 18 08:46:36 2008 +0000 * A few Italian translation updates, from Erica Maria Peressini. web/lang.it | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 7b2dddc9a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 17 15:54:43 2008 +0000 Improved links in trailer and month views so that day information is preserved if possible (following Chris Cook's suggestion). web/month.php | 45 ++++++++++++++++++++++++++++++++++++++++----- web/trailer.inc | 14 +++++++++++++- 2 files changed, 53 insertions(+), 6 deletions(-) commit 6de069071 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 17 15:09:22 2008 +0000 Improved choice of default day in month.php following Chris Cook's suggestion. At the same time tidied up default date selection in day and week views. web/day.php | 14 +++++++++++--- web/month.php | 23 ++++++++++++++++++++--- web/week.php | 9 ++++++++- 3 files changed, 39 insertions(+), 7 deletions(-) commit e7de88b8e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 17 14:21:15 2008 +0000 1. Fixed internationalisation issues in CSS (the CSS was generating commas as decimal points in some locales). 2. Adjusted default CSS sizes to suit most translations. 3. Tidied up some language files - removing superfluous colons or correcting typos in HTML entities. web/lang.ca | 4 +-- web/lang.es | 2 +- web/lang.eu | 30 ++++++++++---------- web/lang.sv | 2 +- web/lang.zh-cn | 64 +++++++++++++++++++++--------------------- web/mrbs.css.php | 70 +++++++++++++++++++++++++++------------------- 6 files changed, 93 insertions(+), 79 deletions(-) commit ea0f1f618 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 17 09:41:05 2008 +0000 1. Fixed problem that caused the admin form in Safari to stretch to the full screen width 2. Changed default setting of show_plus_link to be 'false'. 3. Changed default setting of highlight_method to be 'class'. This lets you specify other properties for highlighted cells apart from just the background colour - in particular the font colour so that if you switch to a light background you can switch the font to be dark. (It also avoids the "sticky highlighting" problem in Konqueror which shows up using 'hybrid'. This problem still needs to be fixed though). Also adjusted some of the styling to work better with 'class'. web/config.inc.php | 8 ++++---- web/mrbs.css.php | 14 ++++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) commit 5cc5d2151 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 16 15:53:17 2008 +0000 1. Improved display (kept left-right alignment of labels and inputs) when the browser window width is decreased for the edit_entry, search, report and logon forms. 2. Improved display of trailer, especially when the browser width is decreased. web/mrbs-ielte6.css | 3 +++ web/mrbs.css.php | 43 +++++++++++++++++++++++++------------------ web/search.php | 2 +- web/trailer.inc | 26 ++++++++++++++++++++------ 4 files changed, 49 insertions(+), 25 deletions(-) commit 45a81ac7c Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Sep 16 12:57:40 2008 +0000 * Added missing 'period' form variable in edit_entry.php and edit_entry_handler.php that was stopping correct booking of meetings if you were in 'periods' mode. As reported and solved by Chris Cook on the mailing list. web/edit_entry.php | 1 + web/edit_entry_handler.php | 1 + 2 files changed, 2 insertions(+) commit b1690ec0c Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Sep 16 09:37:55 2008 +0000 * Fixed problem that caused selection of booking type in reports not to work. * Fixed small typo in the config file. web/config.inc.php | 2 +- web/report.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 4eec34222 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 16 09:32:07 2008 +0000 Fixed bug that caused selection of multiple rooms not to work web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ec4651b8e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 15 15:43:31 2008 +0000 Fixed bug that caused incorrect number of days to be displayed in date selector when first loaded (and also caused Internet Explorer to report "Done, but with errors on page" in status bar) web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 100703635 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Sep 15 10:35:44 2008 +0000 * French translation updates from Alain PORTAL. web/lang.fr | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) commit 21611c8bf Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Sep 14 19:03:42 2008 +0000 * Updated Italian translations from Erica Maria Peressini, Turkish translations from Ahmet YILDIZ and Spanish translations from SoTMaR. * Deleted old, incorrectly named lang.cz translation, the proper file is lang.cs. web/lang.cz (gone) | 246 ------------------------------------------- web/lang.es | 12 +++ web/lang.it | 20 +++- web/lang.tr | 33 +++--- 4 files changed, 46 insertions(+), 265 deletions(-) commit 87d2f0b8f Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 13 22:02:48 2008 +0000 * Converted some encoded characters to character entities, as encoded characters are unsafe in FAQ files in MRBS's current internationalisation implementation. web/site_faq_nl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3d74c382b Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 13 21:24:28 2008 +0000 * Added Dutch site FAQ, as provided by Cor Marjee. web/site_faq_nl.html (new +x) | 198 ++++++++++++++++++++++++++++++++ 1 file changed, 198 insertions(+) commit c1c515640 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 13 21:19:27 2008 +0000 * Dutch translation updates from Cor Marjee. web/lang.nl | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) commit c048291cf Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Sep 13 21:03:21 2008 +0000 * Slovenian translation updates from Martin Terbuc. web/lang.sl | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) commit 480b595fa Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 13 19:48:35 2008 +0000 Moved the styling introduced in Revision 895 out of functions.inc and into CSS web/functions.inc | 5 ++--- web/mrbs.css.php | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) commit 3ceee47fe Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 13 19:13:34 2008 +0000 The bug fix in Revision 895 was incomplete. The colour key table should now be fixed so that incomplete first rows are drawn properly, as well as incomplete subsequent rows. web/functions.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 22ba0235b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 13 17:52:38 2008 +0000 Fixed links in "simple trailer" so that the area and room are correct web/trailer.inc | 67 +++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 31 deletions(-) commit 8ec28fa5e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 13 17:46:14 2008 +0000 Improved display of trailer in "classic" view web/mrbs.css.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 6b8da7334 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 13 17:07:59 2008 +0000 Added a title to the booking in "both" mode, so that the full text of the booking description can be seen when you hover over it. web/month.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 86dfb20f0 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 13 16:54:27 2008 +0000 Implemented the "simple trailer" as suggested by Chris Cook web/config.inc.php | 5 + web/mrbs.css.php | 2 + web/trailer.inc | 215 +++++++++++++++++++++++-------------------- 3 files changed, 122 insertions(+), 100 deletions(-) commit 8b74f2094 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 13 15:30:49 2008 +0000 Improved display of colour key tables so that cell borders are not drawn at the end of an incomplete row. web/functions.inc | 7 +++++++ 1 file changed, 7 insertions(+) commit 375efecb6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 13 15:04:37 2008 +0000 Fixed bug that caused colour key table to be drawn incorrectly when there were more than 10 colour types web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2fb44aa0e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sat Sep 13 14:59:34 2008 +0000 Improved layout of colour key table so that unequal rows are avoided if possible. web/functions.inc | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) commit f7811f2a2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 10 22:30:29 2008 +0000 Fixed bug which caused HTML validation to fail in the month view if the first day of the month was also the first day of the week (ie no greyed out days at the beginning of the first row). web/month.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 78371b806 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 10 21:45:03 2008 +0000 Fixed a typo in the comments in the last change web/day.php | 2 +- web/month.php | 2 +- web/week.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 83c51791f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 10 21:32:37 2008 +0000 Improved the display of the day/week/month views so that the area select box or list is not displayed if there is only one area defined (as then it's redundant). web/day.php | 35 ++++++++++++++-------------- web/month.php | 60 ++++++++++++++++++++--------------------------- web/week.php | 62 ++++++++++++++++++++----------------------------- 3 files changed, 68 insertions(+), 89 deletions(-) commit a98913b21 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 10 20:07:53 2008 +0000 Improved the layout of the colour key table when there are long type descriptions (which one would not normally expect anyway). The content is now clipped so that the table does not become too large, but in order that you can still read the full description if you want to, it's also in the title for the cell: so hovering over the cell will give you the full description. web/functions.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 053c4334d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 10 16:04:50 2008 +0000 Fixed bug whereby the CSS for an all day booking wasn't being generated. It seems that the only visible effect was that an all day booking cell was only clickable over the text, rather than the whole cell. However there may have been other problems that I hadn't noticed. web/mrbs.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4b22fed4c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 10 15:45:02 2008 +0000 Fixed minor problem whereby, with $show_plus_link set to FALSE, the cursor wasn't showing a pointer when hovering over an empty cell, even though the link was active. web/mrbs.css.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 7642eca07 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Sep 9 20:21:13 2008 +0000 * Fixed a few typos/spelling mistakes in NEWS. NEWS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 010cd2cb4 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Sep 9 19:51:11 2008 +0000 * Updated changelog for MRBS 1.4beta1 release. ChangeLog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) commit 8d73d38b5 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Sep 9 19:48:24 2008 +0000 * Changed beta version specifier to 1.4beta1. * Updated NEWS for 1.4beta1 release. NEWS | 49 +++++++++++++++++++++++++++++++++++++++++++++++ web/version.inc | 2 +- 2 files changed, 50 insertions(+), 1 deletion(-) commit 909cb2566 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Sep 9 16:36:05 2008 +0000 * Updated changelog for MRBS 1.4-b1 release. ChangeLog | 145 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) commit 432c25fe2 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Sep 9 16:33:42 2008 +0000 * Updated version number for MRBS 1.4-b1. web/version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f6313b576 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Sep 9 16:31:53 2008 +0000 * Added missing emacs mode specifier to the top of lang.en * Added back "server time" display to help page that was lost in the branch merge. * Added back definition of $default_duration in config.inc.php, that was lost in the branch merge. * The 'plus' graphic is now hidden when printing. * Set svn:keywords for mrbs-print.css in order to get $Id$ filled out. web/config.inc.php | 5 +++++ web/help.php | 1 + web/lang.en | 2 +- web/mrbs-print.css | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) commit 63853deba (tag: mrbs-1_4beta1, tag: mrbs-1_4_b1) Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 9 15:24:30 2008 +0000 Changed default look and feel web/day.php | 12 +-- web/edit_entry.php | 2 +- web/month.php | 4 +- web/mrbs-ie.css | 1 + web/mrbs.css.php | 209 ++++++++++++++++++++++++++++--------------- web/report.php | 2 +- web/week.php | 12 +-- web/xbLib.js | 22 ++--- 8 files changed, 163 insertions(+), 101 deletions(-) commit c3393c936 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Sep 4 10:23:12 2008 +0000 Fixed bug introduced when previously fixing the "all day" bug web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 002d019cb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Sep 3 22:47:52 2008 +0000 Added colour coding to main table in month view, together with better handling of overflow. web/month.php | 113 ++++++++++++++++++++---------------------- web/mrbs-ie.css | 4 +- web/mrbs-ielte6.css | 3 ++ web/mrbs.css.php | 92 ++++++++++++++++------------------ 4 files changed, 103 insertions(+), 109 deletions(-) commit caf455440 Merge: bb59c6242 1ef2feeb8 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 2 18:54:04 2008 +0000 Merged into the trunk revisions 804-872 from the improve_css_2008_06 commit 1ef2feeb8 (origin/improve_css_2008_06) Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Sep 2 12:38:39 2008 +0000 * Fixed typo in configuration comment. web/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e001c2748 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Sep 2 12:18:47 2008 +0000 * Changed the default slot config to give half-hourly slots from 07:00 to 19:00, with the last slot being 18:30 -> 19:00. I believe this makes more sense than the previous default configuration. web/config.inc.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit 50bab9060 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Sep 2 12:13:37 2008 +0000 * Fixed simple syntax error. web/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 56ca7f69e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Sep 2 11:54:02 2008 +0000 Fixed the "all-day bug" whereby bookings that were made with All Day checked did not reserve the last slot of the day in time mode (was OK with periods). web/edit_entry_handler.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) commit 224677494 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 1 23:42:07 2008 +0000 (1) Undid the change in Revision 862 so that the last slot in the day is now displayed in the day and week views. (2) Improved the commenting of periods and also $morningstarts and $eveningends in the config file. Added some error checking as well. (3) Removed some tabs that had crept in during copy and paste operations. web/config.inc.php | 53 ++++++++++++++++++++++++++++++-------------- web/day.php | 28 +++++++++-------------- web/week.php | 28 +++++++++-------------- 3 files changed, 56 insertions(+), 53 deletions(-) commit d2b80a844 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Sep 1 21:17:58 2008 +0000 Changed naming of the td classes used for the main table in the day and week views so that they reflect the purpose of the cell rather than the styling (eg td.red is now td.times). web/config.inc.php | 2 -- web/day.php | 11 ++++++----- web/functions.inc | 3 ++- web/mrbs.css.php | 31 +++++++++++++++---------------- web/week.php | 30 +++++++++++------------------- 5 files changed, 34 insertions(+), 43 deletions(-) commit bb59c6242 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Aug 29 19:39:59 2008 +0000 * Added magic xemacs commands to the tops of the translation files, so that xemacs will know what encoding the files are in. web/lang.ca | 5 ++++- web/lang.cs | 3 ++- web/lang.cz | 3 ++- web/lang.da | 3 ++- web/lang.de | 3 ++- web/lang.el | 3 ++- web/lang.es | 3 ++- web/lang.eu | 3 ++- web/lang.fi | 3 ++- web/lang.fr | 3 ++- web/lang.it | 3 ++- web/lang.ja | 3 ++- web/lang.ko | 2 +- web/lang.nl | 3 ++- web/lang.no | 3 ++- web/lang.pt | 3 ++- web/lang.sl | 3 ++- web/lang.sv | 3 ++- web/lang.tr | 3 ++- web/lang.zh-cn | 3 ++- web/lang.zh-tw | 3 ++- 21 files changed, 43 insertions(+), 21 deletions(-) commit 2e6fe938f Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Aug 29 19:31:49 2008 +0000 * Emails sent from MRBS now encode the subject data correctly, if the subject contains anything but ASCII. * Moved the email translation tokens back into the lang.* files, where they belong, instead of having them in config.inc.php. Note to translators: this means that only there is only English text for $vocab["mail_*"] apart from the partial translations in the Japanese and Turkish files. web/config.inc.php | 21 --------------------- web/functions_mail.inc | 6 ++++++ web/lang.ca | 5 ----- web/lang.cs | 5 ----- web/lang.cz | 5 ----- web/lang.da | 5 ----- web/lang.de | 5 ----- web/lang.el | 5 ----- web/lang.en | 10 +++++----- web/lang.es | 5 ----- web/lang.eu | 5 ----- web/lang.fi | 5 ----- web/lang.fr | 5 ----- web/lang.it | 5 ----- web/lang.ja | 8 +++----- web/lang.ko | 5 ----- web/lang.nl | 5 ----- web/lang.no | 5 ----- web/lang.pt | 5 ----- web/lang.sl | 5 ----- web/lang.sv | 5 ----- web/lang.tr | 10 +++++----- web/lang.zh-cn | 5 ----- web/lang.zh-tw | 5 ----- 24 files changed, 19 insertions(+), 131 deletions(-) commit f41a9e1e9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 29 15:27:08 2008 +0000 Fixed (a) bug in calculating max number of slots for CSS (b) bug calculating booking duration slots for CSS web/day.php | 10 +++++++++- web/mrbs.css.php | 12 +++++++++++- web/week.php | 10 +++++++++- 3 files changed, 29 insertions(+), 3 deletions(-) commit 30656f0ac Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Aug 29 12:53:31 2008 +0000 Implemented fixed height cells with clipping in the day and week views. This behaviour can be enabled/disabled by a boolean in the CSS file. web/day.php | 26 +++++++++----- web/mrbs.css.php | 86 ++++++++++++++++++++++++++++++++++++++++++++-- web/week.php | 29 ++++++++++------ 3 files changed, 119 insertions(+), 22 deletions(-) commit 15bc2ae2c Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Aug 25 21:26:58 2008 +0000 * Fixed day end in day and week view, by not including an extra slot at the end of the defined day. * Fixed room/area links in week view to keep you in week view. web/day.php | 6 +++--- web/week.php | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) commit 05f091ceb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Aug 25 13:41:51 2008 +0000 Implemented merged cells in the day and week views. (They are not applicable to the month view). In other words a booking spanning more than one time slot now shows up as a single cell spanning multiple rows, rather than a single cell followed by cells with ditto marks below. web/day.php | 108 +++++++++++++++++++++++------------------- web/functions.inc | 7 +-- web/week.php | 111 ++++++++++++++++++++++++-------------------- 3 files changed, 124 insertions(+), 102 deletions(-) commit 1fd2ad6cf Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Aug 21 23:24:10 2008 +0000 Improved the usability of the help information by using the :target pseudo-class. At the same time fixed some minor issues in the French and Italian text. web/mrbs.css.php | 4 +- web/site_faq.html | 292 ++++++++++++++++++++------------------ web/site_faq_de.html | 313 ++++++++++++++++++++++------------------- web/site_faq_es.html | 312 +++++++++++++++++++++------------------- web/site_faq_fr.html | 311 +++++++++++++++++++++------------------- web/site_faq_it.html | 274 +++++++++++++++++++----------------- 6 files changed, 804 insertions(+), 702 deletions(-) commit 138d2bd08 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Aug 19 20:01:07 2008 +0000 * Patch from SF tracker #2057646 - fixes the arguments of utf8_convert_aix(). Patch provided by bwiberg. web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f39344785 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Aug 18 11:55:30 2008 +0000 * Added missing calls to unslashes() in session_cookie.inc. I believe they're not strictly necessary, but it's best to be safe. web/session_cookie.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 53cf8910f Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Aug 18 11:38:44 2008 +0000 * Revamped 'cookie' session scheme, so that the client receives and stores an encrypted session token. MRBS then validates this token on each page fetch. Adds new configuration items into config.inc.php. * Added Crypt_Blowfish PEAR module, version 1.0.1 - used by session_cookie.inc. web/Blowfish.php (new) | 317 +++++++++++++++++++++++++++ web/Blowfish/DefaultKey.php (new) | 327 ++++++++++++++++++++++++++++ web/config.inc.php | 14 ++ web/session_cookie.inc | 66 +++++- 4 files changed, 717 insertions(+), 7 deletions(-) commit ee47ed0f7 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 13 22:13:25 2008 +0000 Changed DOCTYPE to HTML 4.01 Strict and ensured all code passes validation. web/day.php | 28 +++++-- web/del.php | 11 ++- web/edit_area_room.php | 18 ++--- web/edit_entry.php | 28 ++++--- web/edit_entry_handler.php | 14 +++- web/edit_users.php | 36 +++++---- web/functions.inc | 153 ++++++++++++++++++----------------- web/help.php | 2 + web/lang.eu | 2 +- web/lang.ja | 6 +- web/lang.zh-cn | 2 +- web/month.php | 32 +++++--- web/mrbs.css.php | 54 +++++++------ web/report.php | 4 +- web/session_cookie.inc | 26 +++--- web/session_http.inc | 8 +- web/session_php.inc | 28 ++++--- web/view_entry.php | 2 +- web/week.php | 32 +++++--- 19 files changed, 280 insertions(+), 206 deletions(-) commit c7c34b263 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Aug 7 19:16:38 2008 +0000 * A few translation updates from the mailing list, with a few corrections. web/lang.de | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 53c4973b6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 6 22:59:25 2008 +0000 Removed some redundant styling definitions web/mrbs.css.php | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) commit 6ec824914 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 6 20:39:03 2008 +0000 (1) Moved styling out of week.php and into CSS. (2) Made some changes to day.php to bring it into line with week.php. (3) Added the go to week before/after links below the main table in week.php, to make it consistent with day.php web/day.php | 8 +++--- web/mrbs.css.php | 11 +++++--- web/week.php | 62 ++++++++++++++++++++++++---------------------- 3 files changed, 44 insertions(+), 37 deletions(-) commit 80a9b63a4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Aug 6 17:06:18 2008 +0000 Moved styling out of trailer.inc and view_entry.php into CSS. web/mrbs.css.php | 16 ++++- web/trailer.inc | 29 ++++---- web/view_entry.php | 157 +++++++++++++++++++++++-------------------- 3 files changed, 116 insertions(+), 86 deletions(-) commit dc0cca42a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 23 23:16:21 2008 +0000 (1) Moved styling out of site_faq_fr.html and site_faq_it.html into CSS. (2) Changed "top" to Spanish equivalent in site_faq_es.html (forgot to do this last time) (3) Slight change to wording in English site_faq.html (4) Removed colons in a couple of places in lang.fr because they now appear in help.php web/lang.fr | 4 +- web/site_faq.html | 2 +- web/site_faq_es.html | 20 +-- web/site_faq_fr.html | 343 ++++++++++++++++++++++------------------- web/site_faq_it.html | 277 +++++++++++++++++++-------------- 5 files changed, 358 insertions(+), 288 deletions(-) commit 5f9e8c6ed Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 22 23:23:01 2008 +0000 Moved styling out of site_faq_es.html and into CSS. web/site_faq_es.html | 326 ++++++++++++++++++++++++----------------- 1 file changed, 193 insertions(+), 133 deletions(-) commit deffeecbd Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 22 21:54:47 2008 +0000 Moved styling out of site_faq_de.html and into CSS. Fixed a couple of minor problems in site_faq.html. web/site_faq.html | 4 +- web/site_faq_de.html | 610 +++++++++++++++-------------------------- 2 files changed, 219 insertions(+), 395 deletions(-) commit 8266580f1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 22 19:20:24 2008 +0000 Fixed problem with styling of form in admin.php. Improved styling of forms in edit_entry.php, report.php and search.php when used with IE6. web/admin.php | 3 ++- web/mrbs-ielte6.css | 13 +++++++++---- web/mrbs.css.php | 45 +++++++++++++++++++++---------------------- 3 files changed, 33 insertions(+), 28 deletions(-) commit 72bfe5d58 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 20 22:38:29 2008 +0000 Moved styling out of site_faq.html and into CSS. web/mrbs.css.php | 9 ++ web/site_faq.html | 307 +++++++++++++++++++++++++------------------- 2 files changed, 182 insertions(+), 134 deletions(-) commit a75418bd1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 18 22:54:50 2008 +0000 Changed functions.inc so that a class is added to the <body> tag on each page in order to make it easier to add page specific styling. Went back to edit some other files in order to remove conflicts. web/edit_entry.php | 6 ++--- web/functions.inc | 6 ++++- web/mrbs.css.php | 55 ++++++++++++++-------------------------- web/report.php | 4 +-- web/search.php | 6 ++--- web/session_cookie.inc | 2 +- web/session_php.inc | 4 +-- 7 files changed, 35 insertions(+), 48 deletions(-) commit d12d322e6 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jul 18 21:31:21 2008 +0000 * Authors in the ChangeLog now have proper names/email addresses, svn2cl is now called with the --authors option. ChangeLog | 1081 ++++++++++++++++++++++++++------------------------- 1 file changed, 557 insertions(+), 524 deletions(-) commit 49b9029b4 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jul 18 21:21:34 2008 +0000 * Updated a few tokens in the German translation, curtesy of my wife. * Added "server time" to help page, necessitating a new translation token, "servertime". The only other language this is translated for is German. * Improved the display of the "Browser language section" in the admin page, and added it to the help page too. This changed the meaning of the "browserlang" translation token a bit, and removed the need for the "postbrowserlang" token. * Fixed a bug in the mysqli database abstraction, along the way made get_default_area() in functions.inc more robust. * Added $default_duration into config.inc.php, which allows the administrator to change the default booking duration, which was previously hard-coded into edit_entry.php. * Corrected incorrect short PHP tag in testdata.php. * New svn2cl generated ChangeLog. ChangeLog | 6242 +++++++++++++++++++++++++----------------- testdata.php | 2 +- web/admin.php | 12 +- web/config.inc.php | 5 + web/edit_entry.php | 6 +- web/functions.inc | 2 +- web/help.php | 7 + web/lang.ca | 1 - web/lang.cs | 1 - web/lang.cz | 1 - web/lang.da | 1 - web/lang.de | 6 +- web/lang.el | 1 - web/lang.en | 4 +- web/lang.es | 1 - web/lang.eu | 1 - web/lang.fi | 1 - web/lang.fr | 1 - web/lang.it | 1 - web/lang.ja | 1 - web/lang.ko | 1 - web/lang.nl | 1 - web/lang.no | 1 - web/lang.pt | 1 - web/lang.sl | 1 - web/lang.sv | 1 - web/lang.tr | 1 - web/lang.zh-cn | 1 - web/lang.zh-tw | 1 - web/mysqli.inc | 7 +- 30 files changed, 3736 insertions(+), 2577 deletions(-) commit 3fa234d87 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jul 18 20:56:54 2008 +0000 * Tidied formatting in testdata.php. testdata.php | 102 ++++++++++++++++++++++++------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) commit 872c60edb Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 18 19:57:25 2008 +0000 Moved styling out of session_php.inc and into CSS web/mrbs.css.php | 2 +- web/session_php.inc | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) commit ef1999e76 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 17 22:18:07 2008 +0000 Moved styling out of session_cookie.inc and into CSS web/mrbs.css.php | 20 +++++++++++++++++--- web/session_cookie.inc | 36 +++++++++++++++++++----------------- 2 files changed, 36 insertions(+), 20 deletions(-) commit 6e89bfa8c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 17 21:30:32 2008 +0000 Moved styling out of search.php and into CSS web/mrbs.css.php | 33 ++++++++++++++++++++--- web/search.php | 67 +++++++++++++++++++++++++++++----------------- 2 files changed, 73 insertions(+), 27 deletions(-) commit 9d3dd0ba4 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Jul 17 21:12:20 2008 +0000 * Removed tabs and tidied code, insisting on braces for all blocks. (Changed my mind again, xbLib.js _isn't_ external code) web/xbLib.js | 850 ++++++++++++++++++++++++++++++------------------- 1 file changed, 521 insertions(+), 329 deletions(-) commit b76692e30 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 17 08:33:35 2008 +0000 Completed moving styling out of report.php and into CSS web/mrbs.css.php | 31 ++++++++++++++- web/report.php | 95 ++++++++++++++++++++++++++-------------------- 2 files changed, 82 insertions(+), 44 deletions(-) commit bbaf5e0d6 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jul 15 20:17:16 2008 +0000 * Reverted the TAB removal for third-party code. web/Mail/mail.php | 2 +- web/Mail/sendmail.php | 2 +- web/xbLib.js | 210 ++++++++++++++++++++-------------------- 3 files changed, 107 insertions(+), 107 deletions(-) commit bc8e55ce5 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jul 15 19:53:13 2008 +0000 * Tidied indentation, following the previous removal of TAB characters. web/auth_config.inc | 94 ++++++++++---------- web/auth_db.inc | 66 +++++++------- web/auth_db_ext.inc | 198 +++++++++++++++++++++--------------------- web/auth_ext.inc | 2 +- web/auth_imap.inc | 14 +-- web/auth_ldap.inc | 94 ++++++++++---------- 6 files changed, 235 insertions(+), 233 deletions(-) commit da682167c Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 15 18:03:10 2008 +0000 Tidied up following replacement of tabs by spaces web/edit_users.php | 36 ++++++++++++++++++------------------ web/session_cookie.inc | 32 ++++++++++++++++---------------- 2 files changed, 34 insertions(+), 34 deletions(-) commit 99480ed3b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 15 16:18:22 2008 +0000 Replaced tabs with spaces web/Mail/mail.php | 2 +- web/Mail/sendmail.php | 12 +-- web/admin.php | 62 ++++++------ web/auth_config.inc | 32 +++--- web/auth_db.inc | 24 ++--- web/auth_db_ext.inc | 24 ++--- web/auth_ext.inc | 8 +- web/auth_imap.inc | 10 +- web/auth_ldap.inc | 94 +++++++++--------- web/auth_nis.inc | 2 +- web/config.inc.php | 6 +- web/day.php | 30 +++--- web/del.php | 26 ++--- web/edit_area_room.php | 68 ++++++------- web/edit_entry.php | 124 +++++++++++------------ web/edit_users.php | 104 +++++++++---------- web/functions.inc | 18 ++-- web/functions_mail.inc | 6 +- web/language.inc | 6 +- web/mincals.inc | 36 +++---- web/month.php | 56 +++++------ web/mrbs.css.php | 38 +++---- web/mrbs_sql.inc | 48 ++++----- web/report.php | 146 +++++++++++++-------------- web/session_cookie.inc | 30 +++--- web/session_http.inc | 8 +- web/session_php.inc | 10 +- web/style.inc | 18 ++-- web/trailer.inc | 4 +- web/view_entry.php | 82 +++++++-------- web/week.php | 34 +++---- web/xbLib.js | 210 +++++++++++++++++++-------------------- 32 files changed, 689 insertions(+), 689 deletions(-) commit a698b6c2d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 14 22:15:53 2008 +0000 Moved styling out of the form in report.php and into CSS. Made some corresponding changes to edit_entry.php, which shares the same class of form. web/edit_entry.php | 6 +- web/mrbs-ie.css | 28 +++-- web/mrbs.css.php | 116 ++++++++++------- web/report.php | 290 +++++++++++++++++++++++-------------------- 4 files changed, 242 insertions(+), 198 deletions(-) commit bedfe05d4 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jul 11 10:38:27 2008 +0000 Fixed bug in month.php to stop encoding period descriptions before output. MRBS now assumes that period descriptions are already properly encoded when defined in the config file. At the same made a very minor change to styling (increased the bottom padding on the new booking image). web/config.inc.php | 5 +++++ web/month.php | 4 ++-- web/mrbs.css.php | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) commit f8f7408d1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 10 21:22:32 2008 +0000 Tidied up HTML in mysql.inc (added a closing </p>) web/mysql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit dcf0ba3a3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 10 21:00:19 2008 +0000 Tidied up HTML in pgsql.inc (added a closing </p>) web/pgsql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2cebbc26b Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 10 20:54:32 2008 +0000 Tidied up HTML in mysqli.inc (added a closing </p>) web/mysqli.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit ee1839ed3 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 10 18:39:08 2008 +0000 Fixed bug in showAccessDenied [missing htmlspecialchars()] web/mrbs_auth.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2d68929cc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jul 10 17:26:21 2008 +0000 Moved styling out of month.php and into CSS. At the same time changed mincals and made corresponding canges to day.php and week.php. web/day.php | 31 ++++++----- web/mincals.inc | 16 +++--- web/month.php | 131 +++++++++++++++++++++++---------------------- web/mrbs.css.php | 60 +++++++++++++-------- web/week.php | 64 +++++++++++----------- 5 files changed, 167 insertions(+), 135 deletions(-) commit 2f19e64e0 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jul 8 16:14:14 2008 +0000 * Minor changes to the various language versions of the site FAQ. Removed the unnecessary final <hr> from most versions, and removed unnecessary header and footer from German version. No other changes made, specifically no CSS improvements. web/site_faq.html | 2 +- web/site_faq_de.html | 15 --------------- web/site_faq_es.html | 3 --- web/site_faq_fr.html | 2 +- web/site_faq_it.html | 2 +- 5 files changed, 3 insertions(+), 21 deletions(-) commit 82513b683 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jul 8 15:42:23 2008 +0000 Moved styling out of mincals.inc and into CSS web/mincals.inc | 23 +++++++++++++---------- web/mrbs-ie.css | 1 + web/mrbs.css.php | 12 +++++++----- 3 files changed, 21 insertions(+), 15 deletions(-) commit ffefd4a5a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 7 23:03:38 2008 +0000 Moved styling information out of the lang.* files. (Only instance was in the npt_php3 string, which was only used in one place in functions.inc) web/functions.inc | 2 +- web/lang.ca | 3 +-- web/lang.cs | 2 +- web/lang.cz | 2 +- web/lang.da | 2 +- web/lang.de | 2 +- web/lang.el | 2 +- web/lang.en | 2 +- web/lang.es | 2 +- web/lang.eu | 2 +- web/lang.fi | 2 +- web/lang.fr | 2 +- web/lang.it | 2 +- web/lang.ja | 2 +- web/lang.ko | 2 +- web/lang.nl | 2 +- web/lang.no | 2 +- web/lang.pt | 2 +- web/lang.sl | 2 +- web/lang.sv | 2 +- web/lang.tr | 2 +- web/lang.zh-cn | 2 +- web/lang.zh-tw | 2 +- 23 files changed, 23 insertions(+), 24 deletions(-) commit f4f53e66f Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 7 22:13:13 2008 +0000 Made language.inc pass HTML validation by adding a DOCTYPE, <html> etc. Some minor tidying up of styling. web/language.inc | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) commit abea52b16 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jul 7 21:17:20 2008 +0000 Tidied up styling in help.php (put the version info in a table) web/help.php | 11 +++++++---- web/mrbs.css.php | 5 +++++ 2 files changed, 12 insertions(+), 4 deletions(-) commit 482dd57b2 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jul 6 22:47:43 2008 +0000 Moved styling out of functions.inc and into CSS. web/functions.inc | 166 +++++++++++++++++--------------------------- web/mrbs.css.php | 12 +++- 2 files changed, 76 insertions(+), 102 deletions(-) commit c7e32a498 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 2 22:35:19 2008 +0000 Fixed problem in Help, Report and Search which meant that the logon box wasn't appearing in the header. (Added include "mrbs_auth.inc" so that the PrintLogonBox function exists) web/help.php | 1 + web/report.php | 1 + web/search.php | 1 + 3 files changed, 3 insertions(+) commit acd118edc Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Wed Jul 2 22:23:18 2008 +0000 Removed styling from the PrintLogonBox function in the session_* files and made corresponding changes to functions.inc. Also moved some other styling information out of functions.inc and into CSS. web/functions.inc | 10 +++++++-- web/mrbs.css.php | 5 +++++ web/session_cookie.inc | 31 +++++++++++----------------- web/session_http.inc | 38 +++++++++++------------------------ web/session_php.inc | 38 ++++++++++------------------------- web/session_remote_user.inc | 16 ++++----------- 6 files changed, 52 insertions(+), 86 deletions(-) commit a3fa00a11 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 26 00:04:38 2008 +0000 Moved styling out of edit_users.php and into CSS. Tidied up admin.php at the same time to make it consistent with edit_users.php. web/admin.php | 30 ++-- web/edit_users.php | 318 ++++++++++++++++++++++-------------------- web/mrbs-ielte6.css | 4 + web/mrbs.css.php | 70 +++++++++- 4 files changed, 254 insertions(+), 168 deletions(-) commit dfb40b35d Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 23 17:15:31 2008 +0000 Tidied up HTML in edit_entry_handler.php and also in the mrbsCheckFree function in mrbs_sql.inc web/edit_entry_handler.php | 14 ++++++++------ web/mrbs_sql.inc | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) commit a4ef1e557 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 22 23:50:27 2008 +0000 Fixed styling for admin.php to work with IE8 Beta 1. Also made some general tidy-ups. web/admin.php | 15 +++++++++------ web/mrbs-ie8.css (new) | 6 ++++++ web/mrbs-ielte6.css | 1 + web/mrbs.css.php | 34 ++++++++++++++++++++++++---------- web/style.inc | 3 +++ 5 files changed, 43 insertions(+), 16 deletions(-) commit b546eed5a Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 22 19:57:48 2008 +0000 (1) Moved styling out of edit_entry.php and into CSS (2) Fixed bugs in JavaScript that produces the Areas input (3) Fixed a bug that meant the Periods selector wasn't displaying all the periods properly web/edit_entry.php | 691 ++++++++++++++++++++---------------------- web/mrbs-ie.css | 18 ++ web/mrbs-ielte6.css | 2 +- web/mrbs.css.php | 89 +++++- 4 files changed, 434 insertions(+), 366 deletions(-) commit 1b521c1b6 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 20 20:19:26 2008 +0000 (1) Added some units to lengths in order to pass CSS validation. (2) Fixed a problem with edit_area_room styles introduced at last revision. web/mrbs.css.php | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) commit 511fb5e36 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Fri Jun 20 18:59:16 2008 +0000 Took more styling out of admin.php (from the "Add Area" and "Add Room" forms) and put it into CSS. web/admin.php | 70 ++++++++++++++++++++++++------------------- web/mrbs-ie.css | 5 +++- web/mrbs-ielte6.css | 4 +++ web/mrbs.css.php | 32 +++++++++++++++----- 4 files changed, 71 insertions(+), 40 deletions(-) commit 22c0f2b5e Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Sun Jun 15 19:31:18 2008 +0000 Moved styling out of edit_area_room.php and into CSS web/edit_area_room.php | 143 ++++++++++++++++++------------------ web/mrbs-ie.css (new) | 6 ++ web/mrbs-ielte6.css (new) | 6 ++ web/mrbs.css.php | 28 ++++++- web/style.inc | 6 ++ 5 files changed, 116 insertions(+), 73 deletions(-) commit a0c32f5b9 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Tue Jun 10 14:57:22 2008 +0000 Moved styling out of del.php and into CSS web/del.php | 17 ++++++++++------- web/mrbs.css.php | 8 ++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) commit 605b125c1 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Mon Jun 9 11:58:32 2008 +0000 Moved styling out of day.php and into CSS web/day.php | 92 ++++++++++++++++++++++++---------------------- web/mrbs.css.php | 18 +++++++++ web/xbLib.js | 2 +- 3 files changed, 67 insertions(+), 45 deletions(-) commit ba8287c13 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 5 16:30:16 2008 +0000 Moved styling information out of admin.php and into CSS web/admin.php | 24 ++++++++++++++---------- web/mrbs.css.php | 6 ++++++ 2 files changed, 20 insertions(+), 10 deletions(-) commit 1e4bf4700 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 5 13:42:15 2008 +0000 Still getting familiar with Subversion - added mrbs.css.php and deleted mrbs.css. These two changes should have been included in the last revision. web/{mrbs.css => mrbs.css.php} | 162 ++++++++++++++++--------------- 1 file changed, 85 insertions(+), 77 deletions(-) commit 2bdc65363 Author: Campbell Morrison <cimorrison@users.sourceforge.net> Date: Thu Jun 5 13:12:56 2008 +0000 Converted to use a dynamic CSS file (mrbs.css.php instead of mrbs.css) web/config.inc.php | 2 +- web/style.inc | 2 +- web/xbLib.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) commit e15ca3da7 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jun 4 20:56:36 2008 +0000 * Created branch 'improve_css_2008_06', to hold development of improved CSS. commit 4de35614d Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Apr 17 20:29:24 2008 +0000 * Improved and standardised coding style/standard throughout. Now don't use # comments anywhere, only // and /* */. Removed all tabs, replaced with 2 spaces. Ensured every block use braces. auth_ldap.pl | 2 +- badpw.pl | 11 +- checklang.php | 127 +-- convert_db_to_utf8.php | 10 +- testdata.php | 97 ++- web/add.php | 50 +- web/admin.php | 121 +-- web/auth_config.inc | 8 +- web/auth_db.inc | 8 +- web/auth_db_ext.inc | 8 +- web/auth_ext.inc | 88 +- web/auth_imap.inc | 166 ++-- web/auth_imap_php.inc | 88 +- web/auth_ldap.inc | 300 +++---- web/auth_nis.inc | 79 +- web/auth_none.inc | 28 +- web/auth_nw.inc | 71 +- web/auth_pop3.inc | 250 +++--- web/config.inc.php | 611 +++++++------- web/day.php | 621 ++++++++------- web/del.php | 161 ++-- web/del_entry.php | 44 +- web/edit_area_room.php | 170 ++-- web/edit_entry.php | 580 ++++++++------ web/edit_entry_handler.php | 574 ++++++------- web/edit_users.php | 535 +++++++------ web/functions.inc | 723 ++++++++++------- web/functions_mail.inc | 1418 +++++++++++++++++---------------- web/grab_globals.inc.php | 36 +- web/help.php | 22 +- web/index.php | 53 +- web/lang.ca | 64 +- web/lang.cs | 68 +- web/lang.cz | 68 +- web/lang.da | 66 +- web/lang.de | 66 +- web/lang.el | 68 +- web/lang.en | 64 +- web/lang.es | 66 +- web/lang.eu | 68 +- web/lang.fi | 68 +- web/lang.fr | 64 +- web/lang.it | 66 +- web/lang.ja | 62 +- web/lang.ko | 66 +- web/lang.nl | 66 +- web/lang.no | 68 +- web/lang.pt | 68 +- web/lang.sl | 64 +- web/lang.sv | 64 +- web/lang.tr | 64 +- web/lang.zh-cn | 66 +- web/lang.zh-tw | 66 +- web/language.inc | 94 +-- web/month.php | 669 +++++++++------- web/mrbs_auth.inc | 62 +- web/mrbs_sql.inc | 642 +++++++-------- web/mysql.inc | 156 ++-- web/mysqli.inc | 174 ++-- web/pgsql.inc | 180 +++-- web/report.php | 804 ++++++++++--------- web/search.php | 205 ++--- web/session_cookie.inc | 135 ++-- web/session_host.inc | 14 +- web/session_http.inc | 125 +-- web/session_ip.inc | 12 +- web/session_nt.inc | 12 +- web/session_omni.inc | 8 +- web/session_php.inc | 210 ++--- web/session_remote_user.inc | 70 +- web/style.inc | 27 +- web/trailer.inc | 136 ++-- web/version.inc | 8 +- web/view_entry.php | 247 +++--- web/week.php | 724 +++++++++-------- 75 files changed, 7020 insertions(+), 6204 deletions(-) commit be8cfe8e8 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Apr 14 20:37:18 2008 +0000 * Replaced old dodgy "print preview" functionality with proper CSS 'print' media method. Page elements not appropriate for printing are now removed automatically by the user's browser when the user prints. web/day.php | 154 ++++++++++++++++----------- web/functions.inc | 12 +-- web/month.php | 163 +++++++++++++++------------- web/mrbs-print.css (new) | 3 + web/report.php | 191 +++++++++++++++++++++------------ web/style.inc | 1 + web/trailer.inc | 27 +++-- web/week.php | 211 +++++++++++++++++++++---------------- 8 files changed, 445 insertions(+), 317 deletions(-) commit 686eb2fb5 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Apr 13 20:50:34 2008 +0000 * Improved HTML and SQL escaping throughout (mostly HTML). * Improved HTML throughout, indented things nicely in some files but not others. Moved to all lower case tags/attribs and quoted attrib values (ready for XHTML?). * Removed the _horrible_ (and probably insecure) unpacking of $_GET and $_POST. Each file now specifically gets form variables, and converts them to the right type. Implemented new function, get_form_val() in grab_globals.inc to facilitate this. * Removed the use of numerically indexed SQL row fetches. Almost every SQL query now uses sql_row_keyed() to get a named associative array, which makes the code far more readable, and in some cases far easier. * Belatedly updated the version number, realised I didn't even update it for the 1.2.6.1 release. web/add.php | 45 ++- web/admin.php | 131 ++++---- web/day.php | 83 +++--- web/del.php | 27 +- web/del_entry.php | 8 + web/edit_area_room.php | 112 +++++-- web/edit_entry.php | 377 ++++++++++++++---------- web/edit_entry_handler.php | 242 ++++++++++----- web/edit_users.php | 281 ++++++++++-------- web/functions.inc | 160 +++++----- web/functions_mail.inc | 32 +- web/grab_globals.inc.php | 109 ++++--- web/help.php | 20 +- web/index.php | 4 +- web/language.inc | 50 ++-- web/mincals.inc | 8 +- web/month.php | 76 +++-- web/mrbs_sql.inc | 557 ++++++++++++++++++++--------------- web/report.php | 142 +++++---- web/search.php | 93 +++--- web/session_cookie.inc | 67 +++-- web/session_php.inc | 21 +- web/style.inc | 8 +- web/trailer.inc | 4 +- web/version.inc | 2 +- web/view_entry.php | 283 ++++++++++-------- web/week.php | 73 +++-- 27 files changed, 1777 insertions(+), 1238 deletions(-) commit 313cce063 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Apr 13 20:02:13 2008 +0000 * Undid change that I accidentally made in revision 797. auth_ldap.pl | 1 - 1 file changed, 1 deletion(-) commit 90d9fd128 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Apr 13 19:59:24 2008 +0000 * Set keywords properties. web/Mail.php | 2 +- web/functions_mail.inc | 2 +- web/grab_globals.inc.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 2b938a389 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Apr 13 19:28:51 2008 +0000 * Changed MIME types to not be 'application' types, as this stops Subversion showing diffs. auth_ldap.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 9dccf71eb Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Apr 12 21:05:36 2008 +0000 * Moved mrbs-1_2-branch onto trunk, in order to promote it to the active development line. Previously moved the trunk off to branches/abandoned-mrbs-1_3-development/ to abandon the trunk development that was working towards MRBS 1.3. commit 146066da8 (origin/mrbs-1_2-branch) Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Apr 12 20:03:49 2008 +0000 * Set some MIME types. * Removed incorrect 'executable' property on some files. * Corrected a few places that over-zealously HTML escaped & characters. Namely when the URL in question is only used in a Location: redirect, where HTML escaping is unnecessary and incorrect. web/auth_pop3.inc (mode -x) | 0 web/del_entry.php | 2 +- web/edit_area_room.php | 2 +- web/edit_entry_handler.php | 2 +- web/edit_users.php | 2 +- web/index.php | 8 ++++---- web/lang.cz (mode -x) | 0 7 files changed, 8 insertions(+), 8 deletions(-) commit d3aa0fd76 (tag: mrbs12_better_html_bp_mp1) Merge: 4c6a7da1d 53ad5e352 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Apr 3 18:59:27 2008 +0000 * Merged mrbs12_better_html branch, which gives MRBS correct HTML 4.01 Transitional HTML. Majority of changes thanks to Claudio Strizzolo. commit 53ad5e352 (tag: mrbs12_better_html_mp1, origin/mrbs12_better_html) Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Apr 3 18:51:15 2008 +0000 * A few further HTML fixes. web/edit_entry.php | 32 ++++++++++++++++++++------------ web/report.php | 6 +++--- web/search.php | 3 +-- web/view_entry.php | 2 +- 4 files changed, 25 insertions(+), 18 deletions(-) commit 79070a1c2 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Mar 28 12:34:05 2008 +0000 * Wide changes to improve HTML compliance (HTML 4.01 Transitional), provided by Claudio Strizzolo. Not yet heavily checked or tested. Just on a branch for now. web/admin.php | 18 ++-- web/day.php | 30 +++---- web/del.php | 2 +- web/del_entry.php | 4 +- web/edit_area_room.php | 14 +-- web/edit_entry.php | 16 ++-- web/edit_entry_handler.php | 2 +- web/edit_users.php | 40 ++++----- web/functions.inc | 32 +++---- web/grab_globals.inc.php | 7 +- web/help.php | 6 +- web/index.php | 8 +- web/lang.ca | 2 +- web/lang.cs | 2 +- web/lang.cz | 2 +- web/lang.da | 2 +- web/lang.de | 2 +- web/lang.el | 2 +- web/lang.en | 2 +- web/lang.es | 2 +- web/lang.fr | 2 +- web/lang.it | 2 +- web/lang.ja | 8 +- web/lang.ko | 2 +- web/lang.nl | 2 +- web/lang.no | 2 +- web/lang.pt | 2 +- web/lang.sl | 2 +- web/lang.sv | 2 +- web/lang.zh-tw | 2 +- web/language.inc | 4 +- web/mincals.inc | 4 +- web/month.php | 44 +++++----- web/mrbs.css | 2 +- web/mrbs_sql.inc | 6 +- web/search.php | 16 ++-- web/session_cookie.inc | 40 ++++----- web/session_http.inc | 18 ++-- web/session_php.inc | 40 ++++----- web/session_remote_user.inc | 14 +-- web/site_faq.html | 161 ++++++++++++---------------------- web/site_faq_it.html | 159 +++++++++++++-------------------- web/trailer.inc | 26 +++--- web/view_entry.php | 12 +-- web/week.php | 44 +++++----- 45 files changed, 365 insertions(+), 446 deletions(-) commit 4c6a7da1d Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Mar 21 21:24:24 2008 +0000 * Upped width of mrbs_entry.create_by to 80 characters, to match the other schemas. tables.pg.73and_above.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1a98468a6 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Mar 21 20:14:38 2008 +0000 * Added Basque translation, curtesy of Juan Ezeiza Gutiérrez. web/lang.eu (new) | 251 ++++++++++++++++++++++++++++++++++++++++++++ web/language.inc | 4 + 2 files changed, 255 insertions(+) commit fe6cbab68 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Mar 19 21:27:12 2008 +0000 * Updated Japanese translation from MATSUURA Takanori in SF #1806694. I had to correct the translation tokens for the places where I moved final colons into the code. I've hopefully changed only the required ones. web/lang.ja | 111 ++++++++++++++++++++++++++------------------------ 1 file changed, 58 insertions(+), 53 deletions(-) commit 8f09ebbe3 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Mar 19 21:06:20 2008 +0000 * Made mysql.inc use the explicit database connection that is opened. Based on a patch posted on Sourceforge by an anonymous user. * Added Simplified Chinese translation, provided by 'sunjunps' on SF tracker #1818278. web/lang.zh-cn (new) | 251 +++++++++++++++++++++++++++++++++++++++++ web/mysql.inc | 22 +++- 2 files changed, 267 insertions(+), 6 deletions(-) commit 65bf18c26 Author: unknown <devnull@localhost> Date: Wed Jan 30 10:53:35 2008 +0000 This commit was manufactured by cvs2svn to create branch 'mrbs12_better_html'. commit f0992d07d (tag: mrbs12_better_html_bp, tag: mrbs-1_2_6_1) Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jan 30 10:53:32 2008 +0000 * Updated ChangeLog for 1.2.6.1 release. ChangeLog | 551 ++++++++++++++++++++++++++++------------------------ 1 file changed, 297 insertions(+), 254 deletions(-) commit 5b5657892 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jan 30 10:51:16 2008 +0000 * Updated NEWS for 1.2.6.1 release. NEWS | 9 +++++++++ 1 file changed, 9 insertions(+) commit 999d0ea5d Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jan 30 10:43:07 2008 +0000 * Fixed major bug in LDAP authentication is $ldap_search_attrib was set. It was incorrectly letting any username/password combination in! * Added description of new LDAP auth configuration variables into config.inc.php, and changed the default of $ldap_v3 to "true". web/auth_ldap.inc | 2 +- web/config.inc.php | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) commit 4ea4d4af2 (tag: mrbs-1_2_6) Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jan 28 15:52:35 2008 +0000 * Updated ChangeLog for 1.2.6 release. ChangeLog | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) commit c7984e291 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jan 28 15:50:14 2008 +0000 * Added copy booking/series feature, as provided by Julian Eglestaff. Adds two new translation tokens, which are now only available in English. NEWS | 2 +- web/edit_entry.php | 38 ++++++++++++++++++++++++++++++++++++-- web/lang.en | 2 ++ web/view_entry.php | 13 +++++++++++++ 4 files changed, 52 insertions(+), 3 deletions(-) commit f9923f165 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jan 28 15:06:27 2008 +0000 * Updated ChangeLog for release of 1.2.6. ChangeLog | 656 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 398 insertions(+), 258 deletions(-) commit 97110d01e Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jan 28 15:04:09 2008 +0000 * Updated NEWS for release of 1.2.6. NEWS | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) commit a32913d73 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jan 28 14:43:06 2008 +0000 * Removed a few terminating colons in the French translation that slipped through. Gives me a chance to acknowledge dionysos-sf for providing the updated French translation (in SF #1791821). web/lang.fr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 2ebac6b5a Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jan 28 14:37:22 2008 +0000 * Removed all terminating colons from the translations, moving them to the (arguably) correct place: the code. * Added JavaScript and server side checking for setting of a repeat day if a booking requires one. * Added server side checking for setting a valid n-weekly value. * Emails sent by MRBS are now in UTF-8 (if $unicode_encoding is 1), unless $mail_vocab is set to something else. * Added Turkish support and translation, thanks to Ahmet YILDIZ. * Removed possible infinite loop in n-weekly booking creation. * Fixed invalid truncation of text in month.php, it could truncate descriptions mid-UTF8 sequence before. * Added new auth method, imap_php, which authenticates via IMAP, but using the PHP 'imap' extension, which allows for SSL/TLS connections. * Upped version number to 1.2.6 in preparation for a release. web/admin.php | 2 +- web/auth_imap_php.inc (new) | 107 +++++++++++++ web/config.inc.php | 21 +++ web/day.php | 4 +- web/edit_area_room.php | 6 +- web/edit_entry.php | 48 ++++-- web/edit_entry_handler.php | 42 ++++- web/functions.inc | 2 +- web/functions_mail.inc | 283 ++++++++++++++++++++-------------- web/lang.ca | 72 ++++----- web/lang.cs | 68 ++++---- web/lang.cz | 68 ++++---- web/lang.da | 70 ++++----- web/lang.de | 64 ++++---- web/lang.el | 70 ++++----- web/lang.en | 68 ++++---- web/lang.es | 70 ++++----- web/lang.fi | 74 ++++----- web/lang.fr | 225 ++++++++++++++------------- web/lang.it | 66 ++++---- web/lang.ja | 76 ++++----- web/lang.ko | 66 ++++---- web/lang.nl | 68 ++++---- web/lang.no | 70 ++++----- web/lang.pt | 68 ++++---- web/lang.sl | 74 ++++----- web/lang.sv | 68 ++++---- web/lang.tr (new) | 256 ++++++++++++++++++++++++++++++ web/lang.zh-tw | 68 ++++---- web/language.inc | 49 ++++-- web/month.php | 6 +- web/mrbs_sql.inc | 4 +- web/report.php | 40 ++--- web/search.php | 2 +- web/version.inc | 2 +- web/view_entry.php | 24 +-- web/week.php | 4 +- 37 files changed, 1453 insertions(+), 922 deletions(-) commit 3a19f14a9 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jan 28 11:28:59 2008 +0000 * auth_ldap: Added support for searching the LDAP directory for the full DN to try and bind with. This allows for operation with Microsoft AD servers. Utilises new config variable $ldap_dn_search_attrib, and optionally $ldap_dn_search_dn (the DN to bind with for the search) and $ldap_dn_search_password (the password to bind with). If $ldap_dn_search_dn is set, $ldap_dn_search_password MUST be set. NOTE: This is as yet untested, as I don't currently have an MRBS test installation that can bind to an AD server for testing. web/auth_ldap.inc | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) commit e0b91bad6 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jan 28 11:20:06 2008 +0000 * Detabbified (4 space indent now) auth_ldap.inc, so it's easier to edit. Only whitespace changes., web/auth_ldap.inc | 213 ++++++++++++++++++++++---------------------- 1 file changed, 106 insertions(+), 107 deletions(-) commit c7c463a0a Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Sep 7 12:50:49 2007 +0000 * Fix for SF tracker #1666299, as supplied by the reporter, 'northtommy'. Update of the room list as you change area in the edit entry screen is now correct. web/edit_entry.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit f14415c5e Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jun 18 13:40:45 2007 +0000 * Fixed HTML escaping problem in edit_entry.php, the ENT_NOQUOTES mode of htmlspecialchars() was being used, when it shouldn't have been. web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7519f5c87 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jun 18 09:25:51 2007 +0000 * A few fixes in checklang.php to make it work better and be more useful. * Removed unnecessary table HTML tags in edit_area_room.php. Fixes SF tracker #1696383, as reported by 'mikedip'. * Fixed SQL escaping in edit_users.php, also required changes to pgsql.inc and mysqli.inc to fix the sql_field_type() function. * i18n/l10n fixes in language.inc. Windows locale map extended/fixed, added Catalan support, improved the map the Unix locale map was applied. Catalan translation provided by Jordi Prats. * Fixed bug in language preference code, fix supplied by 'mikedip' in SF tracker #1696382. checklang.php | 23 +++- web/edit_area_room.php | 3 - web/edit_users.php | 27 +++-- web/lang.ca (new) | 251 +++++++++++++++++++++++++++++++++++++++ web/language.inc | 105 ++++++++++------ web/month.php | 42 +++---- web/mysqli.inc | 21 +++- web/pgsql.inc | 21 +++- 8 files changed, 412 insertions(+), 81 deletions(-) commit e6be49fd6 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Mar 1 14:36:26 2007 +0000 * Added updated Italian translation and Italian FAQ, as posted on mrbs-general more than 2 years ago! web/lang.it | 176 +++++++++++++++++------------------ web/site_faq_it.html (new) | 165 ++++++++++++++++++++++++++++++++ 2 files changed, 253 insertions(+), 88 deletions(-) commit 013832510 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Feb 25 18:41:28 2007 +0000 * Added support for Slovenian language, and added translation provided by Martin Terbuc. web/lang.sl (new) | 256 ++++++++++++++++++++++++++++++++++++++++++++ web/language.inc | 5 + 2 files changed, 261 insertions(+) commit 3bbce993e Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Feb 24 20:34:30 2007 +0000 * Added a new-style, unified ChangeLog. ChangeLog | 2429 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 2303 insertions(+), 126 deletions(-) commit 73079ca7e Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Feb 24 20:32:35 2007 +0000 * Removed sub-directory ChangeLog, I've decided it makes no sense. * Upped version number to "1.2.5+cvs". web/ChangeLog (gone) | 2537 ---------------------------------------- web/version.inc | 2 +- 2 files changed, 1 insertion(+), 2538 deletions(-) commit abfaae25f (tag: mrbs-1_2_5) Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Feb 24 20:14:34 2007 +0000 * Updated ChangeLogs for 1.2.5 release (again!). ChangeLog | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) commit 7b56bb475 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Feb 24 20:12:33 2007 +0000 * Updated NEWS for 1.2.5 release (rather late, almost forgot). NEWS | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) commit 8eed9a5f9 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Feb 23 22:12:48 2007 +0000 * Updated ChangeLogs for 1.2.5 release. ChangeLog | 303 +++++++++++++++++++------------ web/ChangeLog | 472 +++++++++++++++++++++++++++++------------------- 2 files changed, 473 insertions(+), 302 deletions(-) commit c553d4e11 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Feb 23 22:06:45 2007 +0000 * Fixed a few bugs in month view, including double escaping of the < and > characters used in booking slot descriptions (SF tracker #1663905) and also the times were being shown incorrectly, as date() was being used instead of the now standard (for anything displayed to the user) utf8_strftime(). * Upped version to 1.2.5 in preparation for release. web/month.php | 24 ++++++++++++------------ web/version.inc | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) commit 9d313edc1 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Feb 13 13:05:53 2007 +0000 * Got rid of nasty DOS line endings in lang.sv. commit 391850e80 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Feb 13 12:53:36 2007 +0000 * LDAP auth scheme now has the ability to use LDAP v3 protocol, and to use TLS, if configured to do so in config.inc.php. Implements SF tracker #1644311. * Fixed documentation of auth schemes in AUTHENTICATION to not mention the getUserPassword() function that is no longer used. * A few fixes to checklang.php. * Added the ability to configure the cookie path that the 'php' and 'cookie' session schemes use, to override the auto-determination these schemes use. Also made the 'cookie' session scheme actually use an expiring cookie. Fixes SF tracker #1515118. * Removed all use of the utf8_date() function, utf8_strftime() is used instead. utf8_strftime() now works around a bug in strftime() in the handling of %p, using date() if your locale happens to return empty strings for the %p substitution. * Replaced a short php start tag in edit_entry_handler.php with the correct long form one. Fixes SF tracker #1652396. Also corrected a short start tag in lang.es. * Added code into edit_entry_handler.php to support locales that use ',' as the decimal point. This will translate "1,5" hours into "1.5" so it is understood. Fixes SF tracker #1647430. * Added updated Swedish translation tokens, as provided by bwiberg. * Added AIX support into language.inc. You can now run MRBS on an AIX server, in Unicode mode too. AIX support provided (and tested) by bwiberg. * Backported the improved language preference code from the trunk MRBS development. The preference order of languages specified by a user is now acted upon. * Corrected some bracketing in month.php, as reported by a number of people, including 't-matsuu' in SF tracker #1644042 who provided a fix. * Corrected CSS commenting in mrbs.css, as reported in SF tracker #1644042. AUTHENTICATION | 13 +- checklang.php | 17 +- web/auth_ldap.inc | 11 + web/config.inc.php | 9 + web/day.php | 4 +- web/edit_entry.php | 4 +- web/edit_entry_handler.php | 5 +- web/functions.inc | 10 +- web/lang.es | 2 +- web/lang.sv | 7 +- web/language.inc | 378 ++++++++++++++++++++++++++++++++--- web/month.php | 2 +- web/mrbs.css | 2 +- web/report.php | 53 ++--- web/session_cookie.inc | 14 +- web/session_php.inc | 11 +- web/week.php | 4 +- 17 files changed, 449 insertions(+), 97 deletions(-) commit 618d4fb0e (tag: mrbs-1_2_4) Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jan 24 11:12:59 2007 +0000 * Updated NEWS and ChangeLogs for MRBS 1.2.4 release. ChangeLog | 118 +++++++++++++++++++++++++++++++++- NEWS | 45 +++++++++++++ web/ChangeLog | 168 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 328 insertions(+), 3 deletions(-) commit f0b75dd66 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jan 24 10:40:16 2007 +0000 * Moved version number out of config.inc.php and into a version.inc, which provides a function to retrieve the version number. Upped version to 1.2.4. web/config.inc.php | 3 --- web/help.php | 5 +++-- web/version.inc (new) | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) commit 9427d4362 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Oct 9 15:54:00 2006 +0000 * Added robots.txt and "Robots" META tag, to stop robots trawling MRBS installations. Fixes SF bug tracker #1557192. * Improved documentation in AUTHENTICATION on LDAP auth method to make it clear that the 'ldap' PHP extension is required. Fixes SF bug tracker #1554351. * Fixes in auth_imap.inc to ensure that internet sockets to the IMAP server are closed, in an attempt to fix a report in SF tracker #1558451, though the reporter has since told me my fixes didn't help his problem... * Fixed example setting of $ldap_filter in config.inc.php, it showed $ldap_user_filter instead of $ldap_filter. Fixes SF bug tracker #1550827. * Added a little code to turn $month, $week and $day into integers explicitly, before calling checkdate(), this was reported under SF tracker #1557192 as a place where MRBS will output warnings (when being trawled by GoogleBot). * Added a check in edit_entry_handler.php to ensure that the "Brief Description" is not empty. This will only happen if the user doesn't have JavaScript turned on, as usually there is JavaScript validation that you enter a description. Translators note that I had to add two more vocab tokens. * Tidied HTML formatting - just the header section (for now). * Added updated Finnish translation as provided by Tom Ingberg in SF tracker #1450459. The translation encoding has changed to UTF-8, so anyone with a Finnish installation that sets $unicode_encoding to 1 will need to run convert_db_to_utf8.php to convert the text in their database from iso-8859-1 to UTF-8. * A few fixes to mysqli.inc that I'd not spotted in my earlier testing. * A fix in session_php.inc to ensure that the user's password gets unslashed(). Fixed SF bug tracker #1563470. * A few changes in trailer.inc so that the current day/week/month in the trailer links are highlighted somewhat. Implements SF feature request tracker # 875744. AUTHENTICATION | 9 +- web/auth_imap.inc | 8 +- web/config.inc.php | 2 +- web/day.php | 2 +- web/edit_entry_handler.php | 12 +++ web/functions.inc | 139 ++++++++++++++----------- web/lang.en | 2 + web/lang.fi | 196 +++++++++++++++++------------------ web/month.php | 2 +- web/mysqli.inc | 4 +- web/robots.txt (new) | 2 + web/session_php.inc | 48 +++++---- web/style.inc | 7 +- web/trailer.inc | 18 +++- web/week.php | 2 +- 15 files changed, 251 insertions(+), 202 deletions(-) commit ce6917b45 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jul 7 20:16:27 2006 +0000 * Updated Spanish translation, as provided by SoTMaR. web/lang.es | 220 +++++++++++++++++++++++++------------------------- 1 file changed, 110 insertions(+), 110 deletions(-) commit 5531db057 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jul 7 19:16:31 2006 +0000 * Added 'mysqli' database abstraction, to allow PHP 5 installations to use the newer/better 'mysqli' extension instead of 'mysql'. Reasonably tested on a Linux Apache 2.2.0/MySQL 5.0.18/PHP 5.1.2 installation. Updated the documentation to mention the new database abstraction method, hopefully in all the necessary places. INSTALL | 18 +-- README | 4 +- README.sqlapi | 13 ++- web/config.inc.php | 3 +- web/mysqli.inc (new) | 248 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 270 insertions(+), 16 deletions(-) commit b8cb80baf Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Apr 26 10:15:29 2006 +0000 * Fixed typo in comment in config.inc.php. web/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bf2dd32a2 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Apr 26 10:01:43 2006 +0000 * Upped version number to 1.2.3+cvs (rather belatedly) * Fixed some HTML escaping issues in the grids. * Fixed a problem whereby non-repeating entries wouldn't be emailed to area/room admins. Fixes SF tracker #1474386, fix provided by 'karcher'. * Added a little error logging into email functionality. You should get an diagnostic error in your error log if an email fails to be sent. * Fixed zh-tw translation to correctly specify its encoding as utf-8. * Improved get_vocab() so that it doesn't do an iconv if the language encoding is utf-8. * Fixed bug in report.php that meant the meeting end date was shown when the start date should have been. This fix was provided to me somehow, but I can't find who provided it... * Added "remote_user" session scheme, as provided by 'bwiberg' on SF tracker #1432748. Allows MRBS to be configured to use a server authentication scheme that sets the REMOTE_USER environment variable. AUTHENTICATION | 24 ++++++++ web/config.inc.php | 8 ++- web/day.php | 2 +- web/functions_mail.inc | 21 ++++++- web/lang.zh-tw | 2 +- web/language.inc | 2 +- web/month.php | 12 ++-- web/report.php | 2 +- web/session_remote_user.inc (new) | 90 +++++++++++++++++++++++++++++ 9 files changed, 149 insertions(+), 14 deletions(-) commit 1b51defbd Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Jan 26 11:34:02 2006 +0000 * Removed errant CRs from a few files. commit 7aa45517e Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Jan 26 11:23:06 2006 +0000 * Allow more entry types, now A-Z instead of A-J. * Fix in notifyAdminOnBooking, to fix SF tracker #1315854, as supplied by Neville Gilbert. The fix ensures that the area administrator is sent an email when a booking is created. * Improve server OS detection in language.inc. SunOS is now handled, including utf-8 locale support. * Improved n-weekly repeat code, you can now do an n-weekly repeating meeting that happens on a sunday. Calculation of which days to create bookings on is now done more carefully. SF tracker #1300974 * Updated Swedish translation, as provided by Bjorn Wiberg in SF tracker #1397719. * Fixed problem in report.php that would create an error if MRBS was configured to use HTTP session handling and you clicked the "You are ..." link. Provided by Bjorn Wiberg in SF tracker #1396685. web/edit_entry.php | 2 +- web/functions.inc | 2 +- web/functions_mail.inc | 2 +- web/lang.sv | 153 ++++++++++++++++++++------------------- web/language.inc | 29 ++++++-- web/mrbs_sql.inc | 23 ++++-- web/report.php | 4 +- 7 files changed, 124 insertions(+), 91 deletions(-) commit d7e89b467 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Sep 2 22:31:01 2005 +0000 * Postgresql table creation fixed for Postgresql 8. Integer columns can't have a DEFAULT of '', fixed this oversight. tables.pg.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8e8963ba5 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Sep 2 21:47:41 2005 +0000 * Added ability to change the port of the LDAP server when the 'ldap' auth scheme is used. Set $ldap_port in config.inc.php to change from the default port. * Added documentation for ldap port configuration into AUTHENTICATION, along with some brief details on the 'nis' auth scheme. * Tidied up some of the text in INSTALL describing MRBS's i18n and l10n support. * Made checklang.php work with register_globals off, and made the output prettier. * Fixed a typo in a comment in config.inc.php * Added a missing $ in a Finnish vocab entry. AUTHENTICATION | 9 ++++++- INSTALL | 63 ++++++++++++++++++++++---------------------- checklang.php | 31 +++++++++++++++++----- web/auth_ldap.inc | 10 ++++++- web/config.inc.php | 4 ++- web/lang.fi | 2 +- 6 files changed, 78 insertions(+), 41 deletions(-) commit 2eb23d887 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Sep 2 10:42:34 2005 +0000 * Bug fix for the SQL statement that generates the mrbs_users table. Autoincrement columns don't need a DEFAULT, and if specified with one on MySQL >= 4.1 the SQL statement fails. The DEFAULT clause has been removed from the SQL. web/edit_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 539cb6b8e Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Aug 31 15:45:43 2005 +0000 * Added German translation of site FAQ, courtesy of Bertold Altaner. web/site_faq_de.html (new) | 411 +++++++++++++++++++++++++++++++++++ 1 file changed, 411 insertions(+) commit aaa23e622 (tag: mrbs-1_2_3) Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Aug 20 19:22:51 2005 +0000 * Updated ChangeLogs and NEWS for 1.2.3 release. ChangeLog | 194 ++++++++++++-------- NEWS | 21 +++ web/ChangeLog | 471 +++++++++++++++++++++++++++++------------------- 3 files changed, 418 insertions(+), 268 deletions(-) commit 2e6d73460 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Aug 20 18:49:50 2005 +0000 * Minor tidying. web/session_http.inc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) commit 4c3a85f4b Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Aug 20 18:38:50 2005 +0000 * Improved/fixed HTTP session scheme. It now also shows whether the login box in the to banner, and shows who you're logged in as. Tested it on my Linux box. * Minor tidying in a few files. web/session_cookie.inc | 10 +++-- web/session_http.inc | 82 ++++++++++++++++++++++++++++++---------- web/session_php.inc | 36 +++++++++--------- 3 files changed, 88 insertions(+), 40 deletions(-) commit 250f9d39a Author: John Beranek <jberanek@users.sourceforge.net> Date: Sat Aug 20 09:46:44 2005 +0000 * Improved db_ext auth scheme - moved the configuration into config.inc.php, where it belongs. Additionally added support for the password in the external database being in different formats, namely one of: - MD5 - SHA1 - crypt - plaintext Also documented the scheme in AUTHENTICATION, and added example config in config.inc.php. * Fixes for cookie and php session schemes, username and password as obtained from the web form are now 'unslashed' before being stored and/or passed to the auth scheme. auth_db.inc updated to escape the username being putting it in the database query. * Added site_faq_es.html, contributed by Carlos Insunza. AUTHENTICATION | 52 ++++++++++++++ web/auth_db.inc | 1 + web/auth_db_ext.inc | 71 +++++++++++++----- web/config.inc.php | 16 ++++- web/session_cookie.inc | 3 + web/session_php.inc | 2 + web/site_faq_es.html (new) | 136 +++++++++++++++++++++++++++++++++++ 7 files changed, 260 insertions(+), 21 deletions(-) commit 6f04920fc Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jul 13 10:30:25 2005 +0000 * Added Korean translation, as contributed by YoungJoon Kim. web/lang.ko (new) | 251 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 251 insertions(+) commit 60352154d Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jun 10 08:54:14 2005 +0000 * Updated norwegian translation supplied by Emil Stoa. web/lang.no | 79 ++++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 39 deletions(-) commit fb9849e82 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue May 17 15:00:42 2005 +0000 * A few improvements to db authentication system: - mrbs_users table is now created with a 40 character wide password column. Used to be 32 which was only just enough. This matches the column width I made the trunk development MRBS use. - A message is now shown at the top of the edit users page when the mrbs_users table is empty that describes the situation and what to do. - After a user entry is updated we now redirect the web browser back to the edit users page, to discard the form arguments. web/edit_users.php | 30 ++++++++++++++++++++---------- web/lang.en | 2 ++ 2 files changed, 22 insertions(+), 10 deletions(-) commit 4e490168c Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed May 11 10:59:15 2005 +0000 * Update version number to 1.2.2+cvs web/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b02e7f318 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed May 11 10:03:04 2005 +0000 * Added new authentication scheme, a result of support request 1199314. It queries a table in an external database for username/password information. It's mysql only, and assumes the password is stored in plaintext. Config values must be changed at the top of the file too. web/auth_db_ext.inc (new) | 97 +++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) commit 6fa519390 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Thu Apr 28 20:44:13 2005 +0000 fixed incorrect comment web/edit_entry_handler.php | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) commit 1d30e5d7e (tag: mrbs-1_2_2) Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Apr 22 10:57:42 2005 +0000 * Update to NEWS file, I'd forgotton to fill in the names of the contributors of updated Taiwanese and Japanese translations. NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 99e38511d Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Apr 22 10:45:45 2005 +0000 * Updated ChangeLogs and NEWS files for 1.2.2 release. ChangeLog | 843 ++++++++++++------------------------------------ NEWS | 16 + web/ChangeLog | 778 +++++++++++++++++++++++++------------------- 3 files changed, 654 insertions(+), 983 deletions(-) commit 337e70b60 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Apr 22 10:18:32 2005 +0000 * Updated version number to 1.2.2. web/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2e004a8e1 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Apr 11 13:44:34 2005 +0000 * Updated Taiwanese translation. Now stored in UTF-8 encoding. Taiwanese users who have set $unicode_encoding to 0 will need to convert their databases to UTF-8. web/lang.zh-tw | 354 +++++++++++++++++++++++------------------------ 1 file changed, 177 insertions(+), 177 deletions(-) commit 449e90a62 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Apr 11 13:40:40 2005 +0000 * Updated Japanese translation. Now stored in UTF-8 encoding. Japanese users who have set $unicode_encoding to 0 will need to convert their databases to UTF-8. web/lang.ja | 382 +++++++++++++++++++++++++------------------------- 1 file changed, 191 insertions(+), 191 deletions(-) commit 4f6cc97e1 (tag: mrbs-1_2-branch_lastmerge) Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Mar 29 13:26:27 2005 +0000 * Made username matching case insensitive throughout. Auth schemes may still have case sensitive usernames though. * auth_config username matching made case insensitive. * Improved auth system, the session code doesn't need to return the user password any more, and getAuthorised() now only requires one parameter. * session_cookie.inc now deletes the cookie when the user logs out. User password isn't stored in a cookie any more, which is much more secure. * session_php.inc now creates a session for the directory MRBS is run from, instead of assuming '/'. Additionally, session data is deleted on log out, and the user's password isn't stored in the session data any more. web/add.php | 2 +- web/admin.php | 2 +- web/auth_config.inc | 15 ++++--- web/auth_db.inc | 2 +- web/auth_ext.inc | 2 +- web/auth_imap.inc | 2 +- web/auth_ldap.inc | 2 +- web/auth_nis.inc | 2 +- web/auth_none.inc | 2 +- web/auth_nw.inc | 2 +- web/auth_pop3.inc | 2 +- web/del.php | 2 +- web/del_entry.php | 2 +- web/edit_area_room.php | 2 +- web/edit_entry.php | 2 +- web/edit_entry_handler.php | 2 +- web/edit_users.php | 2 +- web/mrbs_auth.inc | 46 +++++++++---------- web/session_cookie.inc | 47 ++++++++------------ web/session_host.inc | 6 --- web/session_ip.inc | 5 --- web/session_nt.inc | 5 --- web/session_omni.inc | 8 ---- web/session_php.inc | 86 ++++++++++++++++++------------------ 24 files changed, 110 insertions(+), 140 deletions(-) commit 2e051bfd3 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Feb 13 11:40:26 2005 +0000 * Fix for Sourceforge bug ID 1112161. Removed case insensitivity from auth schemes. web/auth_config.inc | 2 +- web/auth_db.inc | 2 +- web/auth_ext.inc | 2 +- web/auth_imap.inc | 2 +- web/auth_ldap.inc | 2 +- web/auth_nis.inc | 2 +- web/auth_none.inc | 2 +- web/auth_nw.inc | 2 +- web/auth_pop3.inc | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) commit cc2b5b734 Author: John Beranek <jberanek@users.sourceforge.net> Date: Sun Feb 13 11:21:02 2005 +0000 * Fix for Sourceforge bug ID 1090172. Increase length of booking creator field to 80 characters. tables.my.sql | 4 ++-- tables.pg.sql | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit 097ae7d07 (tag: mrbs-1_2_1) Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Dec 10 10:19:26 2004 +0000 * Updated NEWS file for MRBS 1.2.1 release. NEWS | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) commit 7937408c4 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Dec 10 09:58:42 2004 +0000 * Updated ChangeLogs for 1.2.1 release. ChangeLog | 10 +++++++ web/ChangeLog | 78 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) commit 2ee572184 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Nov 29 23:12:33 2004 +0000 * MySQL tables fixed for MySQL 4.0, namely to remove DEFAULT from auto_increment columns. * Also synced the various upgrade MySQL files, including changing the rep_num_weeks column to smallint with no default throughout. tables.my.sql | 12 ++++++------ upgrade.my.sql | 4 ++-- upgrade2.my.sql | 2 +- upgrade3.my.sql | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) commit 925babfc1 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Sun Nov 21 00:23:07 2004 +0000 Bug 1027328 - fixed sendMail function so that it provides the correct parameters and headers for each type of backend (mail, sendmail or smtp). Thanks to Thekk. web/functions_mail.inc | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) commit f05ffba8f Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Sat Nov 20 00:42:41 2004 +0000 RFE 1000967 - enhance email notifications. Also reference Neil Hawes' emails to the list: http://sourceforge.net/mailarchive/message.php?msg_id=9550429 Updated functions_mail.inc so that email notifications include repeat information for new/change/delete and the output for start and end times are the same as that shown when viewing an entry. Thanks to Neil Hawes and Stuart Chalmers. web/functions_mail.inc | 204 ++++++++++++++++++++++++++++++++++----- 1 file changed, 180 insertions(+), 24 deletions(-) commit 287e63b3c Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Fri Nov 19 22:25:49 2004 +0000 Bug 1068522 - changed "" around $db_password value to '' so that special characters are not interpeted. Thanks to Matt Schuler web/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f86e0ef6f Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Fri Nov 19 22:08:51 2004 +0000 Bug 1035790 - unable to book series with pgsql. Fixed INSERT command in mrbsCreateRepeatEntry as per suggestion of Thekk. web/mrbs_sql.inc | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) commit 9473b8bc9 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Tue Nov 9 22:37:50 2004 +0000 Bug 994056 - fixed emailing so that emails are sent to mrbs_admin, area and room admins under all conditions if configured to do so. web/edit_entry_handler.php | 4 ++-- web/functions_mail.inc | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) commit ba5f551d8 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Thu Oct 28 20:54:06 2004 +0000 Bug 1040185 - changed mktime so that am and pm generation is not affected by timezone and the fact that "Negative timestamps are not supported under any known version of Windows" (from php manual). web/edit_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 62c44b056 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Sep 21 13:11:13 2004 +0000 * Fixed lang/locale selection for Czech language. Czech country code is "cs", not "cz". web/lang.cs (new) | 251 ++++++++++++++++++++++++++++++++++++++++++++ web/language.inc | 4 + 2 files changed, 255 insertions(+) commit cf27c96c8 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Sep 17 22:44:08 2004 +0000 * Merged a functions.inc change from the trunk, namely a fix for the ChangeOptionDays JavaScript function. * Fix for page refresh functionality. If a refresh time is configured, only do it for day.php, week.php and month.php web/functions.inc | 30 +++++++++++++++++++++++++----- web/style.inc | 4 +++- 2 files changed, 28 insertions(+), 6 deletions(-) commit 4c5277dc7 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Sep 14 09:01:26 2004 +0000 * Updated lang.nl from Marc ter Horst web/lang.nl | 162 +++++++++++++++++++++++++------------------------- 1 file changed, 81 insertions(+), 81 deletions(-) commit 829e904ec Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Sep 13 16:11:25 2004 +0000 * Merged a "post-1.2 release" fix from the trunk onto the 1.2 branch. web/functions.inc | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit 5328691ed Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Sep 13 15:47:31 2004 +0000 * Created branch (mrbs-1_2-branch) for MRBS 1.2 fixes/minor updates. Changed version number to 1.2.1 web/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a63971f54 (tag: mrbs-1_2-branch_bp, tag: mrbs-1_2) Author: unknown <devnull@localhost> Date: Thu Sep 9 13:10:44 2004 +0000 This commit was manufactured by cvs2svn to create branch 'mrbs-1_2-branch'. commit 305591501 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Sep 9 13:10:43 2004 +0000 * Updated NEWS file. NEWS | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) commit c41be6ff3 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Sep 9 12:11:14 2004 +0000 * Updated ChangeLog files for 1.2 release. ChangeLog | 473 +++++-------------------- web/ChangeLog | 920 ++++++++++++++++-------------------------------- 2 files changed, 398 insertions(+), 995 deletions(-) commit 7a0ba0c89 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Tue Aug 24 16:58:55 2004 +0000 Minor bug fix: The hidden active cell was sized differently from the main table cell. This generated extra mouse events, causing flicker on the status line. web/mrbs.css | 2 +- web/xbLib.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 5d9808191 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Thu Aug 5 22:13:56 2004 +0000 Removed sql_free() statements as they are not required when using sql_row. Fixed bug 994056 web/functions_mail.inc | 2 -- 1 file changed, 2 deletions(-) commit 0bcce10de Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Fri Jul 30 20:40:14 2004 +0000 Added missing ampersand for URL in emails when a series is involved. web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 37eab2c7e Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jul 28 15:52:59 2004 +0000 * Updated lang.cz from David Krotil. Only required one token to be translated. web/lang.cz | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 09f2eb739 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jul 28 10:01:13 2004 +0000 * Language tokens synchronised. All files now have the same number of lines, and the same number of tokens. Some languages are now missing quite a few translations. * Integrated fix for Windows locale selection contained in bug #992390 (Huey). Browser language "en-ie" is now translated to the correct Windows locale. web/lang.cz | 9 +++++++-- web/lang.da | 43 +++++++++++++++++++++++++++++++++++++++- web/lang.de | 19 ++++++++++++++++-- web/lang.el | 45 +++++++++++++++++++++++++++++++++++++++++- web/lang.en | 2 ++ web/lang.es | 44 ++++++++++++++++++++++++++++++++++++++++- web/lang.fi | 49 +++++++++++++++++++++++++++++++++++++++------- web/lang.fr | 4 +++- web/lang.it | 43 +++++++++++++++++++++++++++++++++++++++- web/lang.ja | 44 ++++++++++++++++++++++++++++++++++++++++- web/lang.nl | 43 +++++++++++++++++++++++++++++++++++++++- web/lang.no | 43 +++++++++++++++++++++++++++++++++++++++- web/lang.pt | 44 ++++++++++++++++++++++++++++++++++++++++- web/lang.sv | 42 ++++++++++++++++++++++++++++++++++++++- web/lang.zh-tw | 43 +++++++++++++++++++++++++++++++++++++++- web/language.inc | 1 + 16 files changed, 496 insertions(+), 22 deletions(-) commit e1bf4065e Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jun 29 13:04:09 2004 +0000 * locale setting fixes. Added ability to print warning at the top of the screen if MRBS fails to set a locale. Added mapping into Windows locale map of 'sv-se' to 'sve', this handles browsers set to send 'sv-se'. Added mapping into Unix locale map of 'en_EN' to 'en_GB' to fix incorrect locale of 'en_EN' (I could have used en_US instead). Added support for OS X into locale setting code. OS X is treated as "unix". web/functions.inc | 4 +++- web/language.inc | 35 +++++++++++++++++++++++++++++------ 2 files changed, 32 insertions(+), 7 deletions(-) commit 717c4f01a Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Wed Jun 23 21:06:52 2004 +0000 Changed view_entry.php so that it could handle the situation where an id for a series is passed to it. A series is identified by series=1 in the url. Changed functions_mail.inc to generate urls with series=1 in the email messages where the message relates to a series. Changed lang.en to have an error message for when an invalid series id is passed to view_entry.php. Fixes bug 972194 Fixed bug web/functions_mail.inc | 9 +- web/lang.en | 3 +- web/view_entry.php | 177 +++++++++++++++++++++++++++++---------- 3 files changed, 142 insertions(+), 47 deletions(-) commit bc2c9e103 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Jun 23 10:49:46 2004 +0000 * Fixes SF request 934394, namely JavaScript errors on changing Start/End dates in the form. Form prefix wasn't being passed from PHP function genDateSelector() to JavaScript function ChangeOptionDays(). web/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit a0c39d28c Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Tue Jun 15 21:49:36 2004 +0000 Fixed bug 972293 so that periods are handled correctly in email notifications Removed duplicate $mail_vocab["start_date"] when deleting a "time" entry. web/functions_mail.inc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) commit 50c8260bb Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Tue Jun 15 20:40:54 2004 +0000 Changed so that '+' sign and javascript are not included in month "print preview" web/month.php | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) commit 6d66fd2b5 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Tue Jun 15 19:52:57 2004 +0000 Changed main table formatting to match day and week view tables. web/month.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 44288a3cc Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Tue Jun 15 19:46:43 2004 +0000 Changed background-color and border-color for TH elements so that in day and week view the links in the header cells of the tables are more readable. web/mrbs.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit b2519eeb4 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Tue Jun 15 19:43:40 2004 +0000 Changed default colour for odd row (TD.odd_row) so that it is not the same as the default colour for TD.J web/mrbs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c22f58b3d Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Mon Jun 14 21:34:10 2004 +0000 Fixes problem identifed by Dane where an invalid user will appear to be logged in. This was caused by the cookie being set and no validation of the user being done because the wrong variables were being used. This is not a security issue. web/session_cookie.inc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) commit da717020c Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Mon Jun 14 21:22:33 2004 +0000 Changed comment about $url_base to recommend setting this if email notifications are to be used. Fixed Bug 972186 INSTALL | 6 +++++- web/config.inc.php | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) commit 8e05ee9a2 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Sun Jun 13 15:06:09 2004 +0000 - $endtime is declared as a global in notifyAdminOnBooking but it is modified by being used as a "local" variable - renamed the "local" variable Fixes bug #968682 - use rep_type as more accurate indication of series or not, so that $myendtime can be set the most appropriate value. web/functions_mail.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit bb855bc31 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Sat Jun 12 10:38:45 2004 +0000 Changing ordering of rooms in day view back to "by room name" as "by capacity" was specific to Jean-François' implementation. web/day.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 448851370 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Sat Jun 12 08:38:33 2004 +0000 Doc updated to reflect changes in auth_ldap.inc 1.7 and config.inc.php 1.38 AUTHENTICATION | 70 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 50 insertions(+), 20 deletions(-) commit d433d9fcd Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Sat Jun 12 08:34:29 2004 +0000 Update auth_ldap.inc and config.inc.php. - LDAP servers may not allow anon. bind so this broke the previous version of auth_ldap.inc. I have removed the attempt at an anon. bind and have given the admin more control over the dn that an auth. bind is attempted with. - the user attribute can be defined individually for each base dn if reequired. - $ldap_base_dn and $ldap_usesr_attrib are handled in a similar way to imap and pop3, server and port, definitions, and config.inic.php has been updated to reflect this. web/auth_ldap.inc | 158 ++++++++++++++++++++++++++----------------- web/config.inc.php | 18 ++--- 2 files changed, 105 insertions(+), 71 deletions(-) commit e9d20ee22 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu May 27 20:53:56 2004 +0000 Updated Czech lang file ("David Krotil" David.Krotil@mu-sokolov.cz) web/lang.cz | 192 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 114 insertions(+), 78 deletions(-) commit 760eff1c1 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed May 26 15:55:19 2004 +0000 Updating lang.de (thanks Andreas Moroder) ChangeLog | 8 +++-- web/ChangeLog | 10 ++++++ web/lang.de | 88 ++++++++++++++++++++++++++++++++----------------- 3 files changed, 73 insertions(+), 33 deletions(-) commit a92f1322a Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu May 20 02:00:32 2004 +0000 Updating mrbs version to next 1.2. web/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6a281ee26 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed May 19 15:42:41 2004 +0000 - Bug fix: emails are not RFC2045 compliant. Mail body can contain non us-ascii characters, then header should have MIME-Version and Content-Type headers. web/functions_mail.inc | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) commit 810d600ef Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri May 14 04:52:23 2004 +0000 Doc fix. NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b8ffb9a7f Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri May 14 03:23:21 2004 +0000 ChangeLog update. ChangeLog | 237 +++++++++++++++++++---------- web/ChangeLog | 390 ++++++++++++++++++++++++++++-------------------- 2 files changed, 386 insertions(+), 241 deletions(-) commit c821b1dca Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri May 14 03:08:11 2004 +0000 Dox fix: Documentation update AUTHENTICATION | 25 ++++++++++++++------ INSTALL | 6 ++++- NEWS | 60 +++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 80 insertions(+), 11 deletions(-) commit a475dcd03 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri May 14 02:35:02 2004 +0000 Dox fix: This script can be used with both mysql and postgresql upgrade3.my.sql | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit e7a1a84d9 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri May 14 01:54:24 2004 +0000 Sync with tables.my.sql upgrade2.my.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a80e05c70 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri May 14 01:52:14 2004 +0000 Sync. sql statement with tables.pg.73and_above.sql upgrade2.pg.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f99e3966f Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri May 14 01:50:03 2004 +0000 Added new fields for emails. tables.pg.73and_above.sql | 16 +++++++++------- tables.pg.sql | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) commit a77984dba Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed May 12 03:31:34 2004 +0000 + If MAIL_DOMAIN is used and username returned by mrbs contains extra strings appended like domain name ('username.domain'), need to provide this extra string so that it will be removed from the username. ChangeLog | 9 +++++++++ web/ChangeLog | 9 +++++++++ web/config.inc.php | 7 ++++++- 3 files changed, 24 insertions(+), 1 deletion(-) commit 1d2e06e73 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed May 12 03:25:26 2004 +0000 + If MAIL_DOMAIN is used and username returned by mrbs contains extra strings appended like domain name ('username.domain'), need to provide this extra string so that it will be removed from the username. - Fixed bug: if MAIL_BOOKER is enabled, previous booker was empty if MAIL_DETAILS was not set. INSTALL | 6 +++ web/ChangeLog | 32 +++++++++++++ web/edit_entry_handler.php | 18 ++++--- web/functions_mail.inc | 93 ++++++++++++++++++------------------ 4 files changed, 97 insertions(+), 52 deletions(-) commit 355b0e190 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed May 12 01:25:40 2004 +0000 - (sendMail()): forgot to add the 'To' header to mails. Some smtp servers and sendmail may display 'undisclosed-recipients: <undisclosed-recipients:>' instead of recipients list. web/functions_mail.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 5ecf9b44e Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Tue May 11 05:00:16 2004 +0000 -(getPreviousEntryData): removed repeat table in FROM statement if this is not a serie (can cause sql error on some systems) web/functions_mail.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 3abd4af75 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Tue May 11 03:24:13 2004 +0000 Removed notice in case $lang_map_unix[$locale] is not set web/language.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit b86d7b217 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Mon May 10 21:03:31 2004 +0000 duplicated the 'previous day - current day - next day' navigation bar to the calendar bottom. web/day.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) commit 787d31f4c Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Mon May 10 20:47:04 2004 +0000 updated lang.sv (thanks MissterX). web/lang.sv | 103 +++++++++++++++++++++++++------------------------- 1 file changed, 52 insertions(+), 51 deletions(-) commit 0e37776f8 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Mon May 10 03:36:04 2004 +0000 - Fixed bug #748925 (All day booking misbehaves if a day extends beyond midnight). ChangeLog | 7 +++++++ web/ChangeLog | 14 ++++++++++++++ web/edit_entry_handler.php | 6 ++++-- 3 files changed, 25 insertions(+), 2 deletions(-) commit 1d5b21528 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sat May 8 22:48:39 2004 +0000 Replaced submit button hiding by 'disabled'. web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d28fdcf56 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sat May 8 20:48:01 2004 +0000 + Enhancements to email support: added the option to send a copy of entries details to the 'booker'. Will retrieve users emails from the used auth scheme : email field for auth_db, username + provided domain for all other schemes. ChangeLog | 4 + INSTALL | 71 ++++++++-- web/ChangeLog | 28 ++++ web/config.inc.php | 20 ++- web/edit_entry_handler.php | 4 +- web/functions_mail.inc | 262 +++++++++++++++++++++++++++-------- web/language.inc | 4 +- 7 files changed, 315 insertions(+), 78 deletions(-) commit 0245ddf92 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Thu May 6 22:48:22 2004 +0000 Added details about $morningstarts_minutes INSTALL | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) commit 6c3cc5633 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Thu May 6 22:40:30 2004 +0000 Added $morningstarts_minutes to allow for a day to start at say 8:30 am. Default value is 0. web/config.inc.php | 11 ++++++++++- web/day.php | 10 ++++++++-- web/week.php | 10 ++++++++-- 3 files changed, 26 insertions(+), 5 deletions(-) commit 13ccf14ac Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Thu May 6 21:58:01 2004 +0000 Modified so that capacity is not displayed in brackets next to room name if capacity is 0. This helps where the "room" is a piece of equipment or a person. Thanks to Michael Hellwig. web/day.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 46a69b5a3 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Thu May 6 21:49:32 2004 +0000 Modified week and day to be consistent in the way that they are displayed normally and in print preview if no area/room is defined. web/day.php | 22 +++++++++++----------- web/week.php | 14 +++++++------- 2 files changed, 18 insertions(+), 18 deletions(-) commit 2243627e8 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu May 6 20:33:18 2004 +0000 lang fix (Michael Glaessel) web/lang.de | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c44c61b7b Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu May 6 18:02:26 2004 +0000 - Fixed bug #948246 :SQL syntax error when sending emails for deleted entries. web/ChangeLog | 4 ++ web/functions_mail.inc | 100 ++++++++++++++++++++------------------- 2 files changed, 55 insertions(+), 49 deletions(-) commit fe390df3d Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu May 6 01:23:52 2004 +0000 + added email address validation web/ChangeLog | 4 ++++ web/edit_users.php | 39 ++++++++++++++++++++++++++++++++------- 2 files changed, 36 insertions(+), 7 deletions(-) commit 06aea443b Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu May 6 01:20:43 2004 +0000 enhanced email validation ChangeLog | 22 +++++++++++++++++++++ web/ChangeLog | 35 +++++++++++++++++++++++++++++++++ web/edit_area_room.php | 42 +++++++++++++++++++++++----------------- 3 files changed, 81 insertions(+), 18 deletions(-) commit c51247cde Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed May 5 02:12:34 2004 +0000 * removed duplicated email validation function from function_mail.php. Use one in RFC822.php instead. web/edit_area_room.php | 12 ++++++++---- web/functions_mail.inc | 27 --------------------------- 2 files changed, 8 insertions(+), 31 deletions(-) commit 7b70923c8 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Mon May 3 17:39:49 2004 +0000 Typos fix web/functions_mail.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a558f14f6 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Mon May 3 06:21:32 2004 +0000 + Added/changed features to email support: - Room and/or area administrators. An email field has been added to room and area administration page. Each room/area can have multiple emails. - Configurable options to send emails to these administrators. Emails can be send to MRBS admin and/or area admins and/or room admins. - Configurable options to set what is emailed (either a link to the view page as before or full details) - Configurable option to decide the lang used in emails and the text of subject and body. - Configurable options to decide which events cause an email to be sent (whether only new entries, new and edited entries, or deleted entries) - Full diffing informations between the new state of an edited entry and its previous settings (only if we choose to show details in emails) - Optionale recipients can receives mails in carbon copy - Configurable option to send mails using three mail backends: either the php mail function, an external smtp server (with or without authentication) or unix sendmail program. - upgraded Net::Socket from 1.0.1 to 1.0.2 INSTALL | 55 +++- UPGRADE | 8 + tables.my.sql | 18 +- upgrade3.my.sql (new) | 7 + web/ChangeLog | 55 ++++ web/Net/Socket.php | 151 +++++---- web/config.inc.php | 48 ++- web/del_entry.php | 14 +- web/edit_area_room.php | 46 ++- web/edit_entry.php | 24 +- web/edit_entry_handler.php | 60 +++- web/functions.inc | 106 +----- web/functions_mail.inc (new) | 574 +++++++++++++++++++++++++++++++++ web/lang.en | 5 + web/lang.fr | 13 + web/language.inc | 14 +- web/mrbs_sql.inc | 4 +- 17 files changed, 987 insertions(+), 215 deletions(-) commit 8c9a38842 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu Apr 29 12:02:46 2004 +0000 Updated lang.fi (thanks Tom Ingberg (tom.ingberg@edu.vantaa.fi)) web/lang.fi | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) commit ca91166d5 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Tue Apr 27 20:57:49 2004 +0000 Need to escape double-quotes in room names Thanks to Klavs Bryld web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e0e9e2131 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Tue Apr 27 20:48:05 2004 +0000 added double-quotes around minutes as: "You should always use quotes around a string literal array index" - quote from PHP manual. Thanks Thierry web/functions.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit b1b1f38f6 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Sun Apr 25 18:10:58 2004 +0000 Modified the way edit_users.php gets the user table fields names and types. It now uses the three new routines sql_field_name, sql_field_type, sql_num_fields, defined in mysql.inc and pgsql.inc, which in turn call their corresponding database-specific eponym. Still not tested with PostgreSQL, but much more likely to work. web/edit_users.php | 23 ++++++++++++++--------- web/mysql.inc | 21 +++++++++++++++++++++ web/pgsql.inc | 18 ++++++++++++++++++ 3 files changed, 53 insertions(+), 9 deletions(-) commit e0be25507 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Sun Apr 25 18:01:26 2004 +0000 Localize the message displayed on the status bar when a cell is activated under the cursor. The string is defined as $vocab["click_to_reserve"] in lang.xx. It is passed from PHP to JavaScript as an additional argument to routine InitActiveCell(). web/day.php | 4 +++- web/lang.en | 1 + web/lang.fr | 1 + web/month.php | 4 +++- web/week.php | 4 +++- web/xbLib.js | 8 ++++++-- 6 files changed, 17 insertions(+), 5 deletions(-) commit 6249246c8 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Sun Apr 18 17:14:46 2004 +0000 Added active highlighting of the month view cells. This required an additional parameter in InitActiveCell(), hence the minor changes in the day and week views. Side effect of this change: The (+) sign in the month view is moved after the list of reservations, instead of before. This was necessary, else the list itself was moved to the bottom of the cell, which did not look good. web/day.php | 5 +- web/month.php | 44 +++++++++++---- web/mrbs.css | 4 +- web/week.php | 5 +- web/xbLib.js | 140 +++++++++++++++++++++++++++++++----------------- 5 files changed, 134 insertions(+), 64 deletions(-) commit d70c7f428 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Sun Apr 18 14:37:20 2004 +0000 Include mrbs_auth.inc to allow the display of the logon box in the MRBS top banner. web/month.php | 1 + web/week.php | 1 + 2 files changed, 2 insertions(+) commit 8e6aaccb2 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sat Apr 17 15:28:37 2004 +0000 - fixed bug $typematch, variable undefined web/report.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 2cedb5386 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sat Apr 17 00:50:05 2004 +0000 ChangeLog update ChangeLog | 49 ++++++++++- web/ChangeLog | 218 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 265 insertions(+), 2 deletions(-) commit ac7a561bf Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Apr 16 23:54:53 2004 +0000 Doc fix (it is a greek file, not english) web/lang.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0277c688a Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Fri Apr 16 22:22:48 2004 +0000 I have changed the day and week view so that the colour key is shown in both the "web page" view and "print preview". I believe that it makes sense to include the key in the "print preview" version so that you can understand the colours on a hardcopy. web/day.php | 2 +- web/week.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit dca32dcc8 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Apr 16 21:55:27 2004 +0000 Doc fixes INSTALL | 22 ++++---- web/config.inc.php | 121 ++++++++++++++++++++++--------------------- 2 files changed, 72 insertions(+), 71 deletions(-) commit 22b59e695 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Apr 16 19:10:03 2004 +0000 - Removed PEAR_MAIL constants (never had). web/Mail/mail.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit c490a1fe9 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Apr 16 17:23:32 2004 +0000 + Added email support to MRBS (using PEAR::Mail class for that). MRBS developers, use function sendMail(), with at least the minimal parameters ($recipients, $subject and $body) to send mail from MRBS. + Added the option to notify the administrator (or someone else) with an email on each new entry or new and changed entries) INSTALL | 114 +++- web/Mail.php (new) | 194 +++++++ web/Mail/RFC822.php (new) | 916 ++++++++++++++++++++++++++++++++ web/Mail/mail.php (new) | 126 +++++ web/Mail/null.php (new) | 60 +++ web/Mail/sendmail.php (new) | 131 +++++ web/Mail/smtp.php (new) | 185 +++++++ web/Net/SMTP.php (new) | 970 +++++++++++++++++++++++++++++++++ web/Net/Socket.php (new) | 429 +++++++++++++++ web/PEAR.php (new) | 975 ++++++++++++++++++++++++++++++++++ web/config.inc.php | 85 ++- web/edit_entry_handler.php | 20 +- web/functions.inc | 97 +++- web/lang.en | 5 +- web/mrbs_sql.inc | 4 +- web/view_entry.php | 6 +- 16 files changed, 4300 insertions(+), 17 deletions(-) commit 48306e1ec Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu Apr 15 11:08:00 2004 +0000 - (authValidateUser): add global $tbl_users; web/auth_db.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit cbf3931a8 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Wed Apr 14 22:27:22 2004 +0000 Added instructions about using table name prefix to allow second installations or resolve table name conflicts. INSTALL | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) commit ed457265b Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Wed Apr 14 22:18:35 2004 +0000 Added comment that user needs to fix table names if they have changed the prefix that they wish to use. destroy.pg.sql | 5 +++++ grant.pg.sql | 6 ++++++ purge.my.sql | 5 ++++- purge.pg.sql | 4 ++++ sample-data.sql | 5 +++++ tables.my.sql | 6 ++++++ tables.pg.73and_above.sql | 4 ++++ tables.pg.sql | 4 ++++ 8 files changed, 38 insertions(+), 1 deletion(-) commit c854b7c91 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Wed Apr 14 22:02:27 2004 +0000 Changed the fixed table names to variables. The variables are defined in config.inc.php. testdata.php | 10 +++++----- web/add.php | 8 ++++---- web/admin.php | 8 ++++---- web/auth_db.inc | 4 ++-- web/day.php | 15 +++++++------- web/del.php | 12 ++++++------ web/edit_area_room.php | 12 ++++++------ web/edit_entry.php | 18 ++++++++--------- web/edit_entry_handler.php | 8 ++++---- web/edit_users.php | 26 ++++++++++++------------ web/functions.inc | 12 ++++++++---- web/index.php | 2 +- web/month.php | 10 +++++----- web/mrbs_sql.inc | 35 +++++++++++++++++++++------------ web/report.php | 4 ++-- web/search.php | 4 ++-- web/view_entry.php | 38 ++++++++++++++++++------------------ web/week.php | 12 ++++++------ 18 files changed, 127 insertions(+), 111 deletions(-) commit 77ea555e7 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Wed Apr 14 21:57:24 2004 +0000 Added variables to allow the 'mrbs_' prefix on table names to be changed. This will allow the user to do a second installation when only one database is available or resolve table name conflicts. web/config.inc.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit 6dffaedd6 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Apr 14 16:34:37 2004 +0000 - Correct the \\n new line character in tooltips to . Currently it changes nothing but the HTML spec says \\n in titles should be converted to spaces. So, the current thoughts of the Mozilla developers is that would insert a line break in a title, and a literal \\n would not, but they've not implemented it yet though. However, IE _does_ currently work with and that method seems to fit the specs much more closely. (John Beranek) web/day.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8b17893c7 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Wed Apr 14 14:18:06 2004 +0000 Corrected the errors pointed out by Thierry. (Missing change from his last commit, and authentication default changed by mistake) web/config.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 51c47f835 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Apr 14 10:23:23 2004 +0000 * Slight Unicode fix. Move page title specifier to _after_ page encoding specifier. That way the browser knows what encoding the title is in before it gets to it. web/functions.inc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) commit 21df91dc6 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Wed Apr 14 09:33:33 2004 +0000 Added an optional active cell highlighting, and the ability to make a reservation by clicking anywhere in a cell. The control is done in config.inc.php. Default is highlighting enabled; + signs left in. The highligth color is defined in mrbs.css. Changed the background stripe generation method. Now defined be classes in mrbs.css. web/config.inc.php | 15 +- web/day.php | 47 +++-- web/mrbs.css | 8 +- web/week.php | 40 +++- web/xbLib.js (new) | 471 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 553 insertions(+), 28 deletions(-) commit 149386729 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Wed Apr 14 09:23:07 2004 +0000 Fixed error when the server does not define $HTTP_ACCEPT_LANGUAGE. web/language.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit deadf160e Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Tue Apr 13 21:48:51 2004 +0000 + Doc fix. INSTALL | 7 +++---- web/config.inc.php | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) commit 509044fec Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Tue Apr 13 21:45:11 2004 +0000 + Added the option to show both time slots and brief description. web/config.inc.php | 9 ++++---- web/month.php | 52 +++++++++++++++++++++++++++++++++----------- 2 files changed, 44 insertions(+), 17 deletions(-) commit 92514df39 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Tue Apr 13 03:13:05 2004 +0000 + Added the 'creator' search criteria. web/report.php | 7 +++++++ 1 file changed, 7 insertions(+) commit a3b1b6bd1 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Mon Apr 12 21:22:08 2004 +0000 added '' to minicals function call for room parameter as room is not relevant in day context web/day.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 4e3a779f2 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Mon Apr 12 21:22:07 2004 +0000 added class for highlighting current month/week/day in calendars, used in mincals.inc web/mrbs.css | 1 + 1 file changed, 1 insertion(+) commit b99321263 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Mon Apr 12 21:22:06 2004 +0000 added $room to minicals function call web/month.php | 4 ++-- web/week.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit 8160aa84f Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Mon Apr 12 21:22:05 2004 +0000 mincal changes: - correct week highlight code to correctly highlight where a week crosses into a new month. The problem was when crossing the year boundary, and where only the last day of the week was in the new month and the number of days in the current month was < 31. - week and month now include room in the link thus maintaining the same room when using the calendars for navigation - highlights whole month in month view - highlight colour moved to mrbs.css web/mincals.inc | 63 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 19 deletions(-) commit 0f0f249a3 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Apr 11 22:34:02 2004 +0000 + Add link to user entries for all auth schemes, not only db (thanks Gavin!). web/auth_db.inc | 1 - web/session_cookie.inc | 28 ++++++++-------------------- web/session_php.inc | 28 ++++++++-------------------- 3 files changed, 16 insertions(+), 41 deletions(-) commit 2bc8880dc Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Sun Apr 11 20:32:02 2004 +0000 Added 'plus sign' next to date in month view. This will take the user to an add entry page for that day of the month. web/month.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) commit ce70919ca Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Apr 11 13:12:16 2004 +0000 + If auth_db is used with session_cookie or session_php, the message "you are XXXX" becomes a link to all upcoming entries belonging to XXXX (report page). If auth_db is not used, the previous empty HREF link "you are XXXX" is useless and is now a simple text message. web/auth_db.inc | 2 +- web/lang.en | 1 + web/lang.fr | 5 ++++- web/report.php | 2 ++ web/session_cookie.inc | 26 +++++++++++++++++++++++--- web/session_php.inc | 26 +++++++++++++++++++++++--- 6 files changed, 54 insertions(+), 8 deletions(-) commit 745e2dd14 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sat Apr 10 05:12:53 2004 +0000 - Changed the title displayed when adding new user from 'Edit user' to 'Add a new user'. web/edit_users.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) commit 548f52c6e Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sat Apr 10 04:52:54 2004 +0000 + Hashes passwords in dababase (auth_db). Update 'password' field for this purpose. web/auth_db.inc | 5 +++-- web/edit_users.php | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) commit fa7f8ce21 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sat Apr 10 03:26:17 2004 +0000 Removed punctuation from $vocab["room"] string so that this vocab can be used more often and lessen the number of vocabs (replace $vocab["sort_rep_room"]). This could be done in all vocabs too, as a general rule we should not use punctuation and other things not related to translation in these strings. web/lang.cz | 2 +- web/lang.da | 2 +- web/lang.de | 2 +- web/lang.el | 4 ++-- web/lang.en | 5 ++--- web/lang.es | 2 +- web/lang.fi | 2 +- web/lang.fr | 7 ++++++- web/lang.it | 2 +- web/lang.ja | 2 +- web/lang.nl | 2 +- web/lang.no | 2 +- web/lang.pt | 4 ++-- web/lang.sv | 2 +- web/lang.zh-tw | 2 +- web/month.php | 2 +- web/report.php | 8 ++++---- web/view_entry.php | 4 ++-- web/week.php | 4 ++-- 19 files changed, 32 insertions(+), 28 deletions(-) commit 4653a33ea Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Fri Apr 9 21:19:25 2004 +0000 This change allows multiple pop3 or imap server to be used for authentication. AUTHENTICATION has been updated to explain this and users are referred to AUTHENTICATION from config.inc.php if they wish to use multiple servers. AUTHENTICATION | 80 ++++++++++++++++++++++++++---- web/auth_imap.inc | 81 ++++++++++++++++++++++-------- web/auth_pop3.inc | 115 +++++++++++++++++++++++++++++-------------- web/config.inc.php | 6 ++- 4 files changed, 211 insertions(+), 71 deletions(-) commit c1bd1590f Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Thu Apr 8 21:20:52 2004 +0000 This includes an update to reporting to allow reports to be sorted by Area/Room then Start Date/Time or Start Date/Time then Area/Room. There is also now the option to display Start and End date/time instead of start date/time and duration. A modification has been made to period_date_string in functions.inc to make the display start/end dates and periods clearer. web/functions.inc | 4 +- web/lang.en | 8 ++- web/report.php | 133 ++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 132 insertions(+), 13 deletions(-) commit 99d98ccfd Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Apr 7 04:45:59 2004 +0000 Doc fixes (added DB doc) AUTHENTICATION | 88 ++++++++++++++++++++++++++++++++++++++++---- INSTALL | 23 ++++++++---- web/config.inc.php | 6 ++- 3 files changed, 101 insertions(+), 16 deletions(-) commit 500df3622 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Apr 7 02:02:35 2004 +0000 Updating mrbs version number before next release :-) web/config.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit d7955812e Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Apr 7 01:57:16 2004 +0000 ChangeLog update Doc fixes. ChangeLog | 16 ++++++ web/ChangeLog | 147 ++++++++++++++++++++++++++++++++++++++++++++++++ web/month.php | 4 +- web/week.php | 2 +- 4 files changed, 166 insertions(+), 3 deletions(-) commit cfd21a5dd Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Apr 5 13:16:34 2004 +0000 * Added Greek translation, lang.el * Fixed global variable problem in style.inc, $vocab wasn't being declared as a global. [Translation and fix provided by Stavros Papadakis] web/lang.el (new) | 208 ++++++++++++++++++++++++++++++++++++++++++++ web/style.inc | 1 + 2 files changed, 209 insertions(+) commit 2742d4da7 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Mar 24 21:47:27 2004 +0000 Doc fix INSTALL | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit a9078fb6d Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Mon Mar 15 22:54:05 2004 +0000 This change means that the default room in an area, if none is specified or when changing areas will be the first listed rather than the room with the lowest id. This also affects the choice of area if no room or area is specified then the first listed area will be chosen rather than the one with the lowest id. web/functions.inc | 11 ++++++++++- web/month.php | 2 +- web/week.php | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) commit 39667da1b Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Mon Mar 15 22:24:49 2004 +0000 Added configuration option to allow index.php to redirect to a specific room. web/config.inc.php | 6 ++++++ web/index.php | 33 +++++++++++++++++++++++++++++---- 2 files changed, 35 insertions(+), 4 deletions(-) commit 572e5c493 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Mar 10 04:27:31 2004 +0000 Added specific Room Description showing with a pop up/hover title for each room on the week view link in day.php and room link in week.php. (Valeria Montesi/Gareth T). web/day.php | 4 ++-- web/week.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit 337c3b4a0 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Mon Mar 8 14:24:11 2004 +0000 The last change, to restrict access to the page to identified users, broke the ability to initially enter the first user! Fixed this by avoiding to do this test if the user list is empty. Actually moved the code to a branch that already ran only if the user list was not empty. web/edit_users.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) commit f670832a2 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Feb 27 01:17:49 2004 +0000 (mrbsCheckFree): - corrected 'undefined variable' bug (typo on variable name line 54, $enable_period instead of $enable_periods) web/mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3983fa89b Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Feb 11 13:55:55 2004 +0000 - included grab_globals.inc.php at the top of the file otherwise $HTTP_ACCEPT_LANGUAGE is undefined web/index.php | 1 + 1 file changed, 1 insertion(+) commit 1d9915280 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Feb 4 15:21:29 2004 +0000 * Removed 3 uses of %T format specifier in strftime() calls, as it seems Windows strftime() doesn't support %T. Tested on a Windows MRBS (Apache + MySQL) installation. Problem reported by Reinhold Petrich on the mailing list, and fix also confirmed. web/mrbs_sql.inc | 2 +- web/report.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit 27e0b0c7f Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Wed Feb 4 15:13:39 2004 +0000 Use basename($PHP_SELF) to avoid false hits, if the substrings "day" or "week" or "month" appear in the full URL. web/mincals.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit b823d928e Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Feb 2 17:35:41 2004 +0000 * Fixed JavaScript in functions.inc (for area and room drop-down menus in day/week/month view) to use relative URLs, and better "onChange" handling. web/functions.inc | 71 +++++++++++++++++---------------------------- 1 file changed, 26 insertions(+), 45 deletions(-) commit 3fd357b27 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Sat Jan 31 08:51:20 2004 +0000 Updated the iconv error message, based on the suggestion by David Watts. web/language.inc | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) commit 6d7d82e89 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Sat Jan 31 07:53:03 2004 +0000 Make sure the user is authenticated before giving him access to the list. web/edit_users.php | 7 +++++++ 1 file changed, 7 insertions(+) commit 81ec5967a Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Wed Jan 28 23:01:48 2004 +0000 Added $default_view as suggested by Warren Turkal This can be used to determine the default starting view, i.e. month, week or day, as used by index.php. web/config.inc.php | 6 +++++- web/index.php | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) commit 89ff55895 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Tue Jan 27 22:29:56 2004 +0000 BUG 885333 - fixed - added check to ensure that $typematch_default is an array. web/report.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit 594120388 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Mon Jan 26 06:31:49 2004 +0000 When the user clicks on the "All day" checkbox, use JavaScript to immediately change the time to 00:00 and the duration to 1 day. (Designed for support of periods too, but not tested) web/edit_entry.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) commit af99f481f Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Thu Jan 22 22:33:56 2004 +0000 Removed the paragliding-specific weight field :-) web/edit_users.php | 2 -- 1 file changed, 2 deletions(-) commit d567024ab Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Thu Jan 22 22:28:57 2004 +0000 Added the ability to display horizontal bands of color in the background of the day view, to make the table more readable. This is enabled by changing the new setting $stripe_color in config.inc.php. This value sets the color class for the bands. "white"= no bands (default) For example changing it to "J" display light gray bands. web/config.inc.php | 4 ++++ web/day.php | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) commit a089ac4c9 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Thu Jan 22 21:35:24 2004 +0000 Previous commit truncated file - adding back in missing lines INSTALL | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) commit 18f755b44 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu Jan 22 04:05:51 2004 +0000 + Option to display times on right side in day and week view. + pop-up messages web/config.inc.php | 3 +++ web/day.php | 43 ++++++++++++++++++++++++++++++++++++++----- web/lang.cz | 3 ++- web/lang.da | 3 ++- web/lang.de | 3 ++- web/lang.en | 3 ++- web/lang.es | 3 ++- web/lang.fi | 1 + web/lang.fr | 1 + web/lang.it | 3 ++- web/lang.ja | 3 ++- web/lang.nl | 3 ++- web/lang.no | 3 ++- web/lang.pt | 2 +- web/lang.sv | 3 ++- web/lang.zh-tw | 3 ++- web/week.php | 42 ++++++++++++++++++++++++++++++++++++++---- 17 files changed, 104 insertions(+), 21 deletions(-) commit 98058459a Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Wed Jan 21 22:36:31 2004 +0000 Allows reports to be limited to certain reservation types (eg just 'external'). This is multiple select box. If all are selected or none are selected then all reservation types are included in the report. web/lang.en | 2 ++ web/report.php | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) commit 5dc830e66 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Wed Jan 21 22:16:05 2004 +0000 This update contains all of the code and documentation to support "periods" within mrbs. INSTALL | 156 +++++++++++++++-------------------- web/config.inc.php | 26 +++++- web/day.php | 46 +++++++---- web/edit_entry.php | 38 +++++++-- web/edit_entry_handler.php | 35 +++++++- web/functions.inc | 64 +++++++++++++- web/lang.en | 3 + web/month.php | 59 +++++++++++-- web/mrbs_sql.inc | 17 +++- web/report.php | 53 ++++++++++-- web/search.php | 12 ++- web/view_entry.php | 14 +++- web/week.php | 48 +++++++---- 13 files changed, 419 insertions(+), 152 deletions(-) commit dba99be2a Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Tue Jan 20 19:30:36 2004 +0000 + Added link to rooms heading to display the weekly view for that room. web/day.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit f4342aef1 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Mon Jan 19 23:40:32 2004 +0000 ChangeLog update. ChangeLog | 30 ++++++++++++ web/ChangeLog | 126 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+) commit 900a2ee75 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Mon Jan 19 21:31:15 2004 +0000 Added a new authentication module auth_db.inc. This is a web-based authentication, based on a new table of users in the mrbs database. Implements RFE #665239 "Multiuser, Web based auth". Added module edit_users.php to manage the contents of this table. New English and French strings added in lang.en and lang.fr respectively. Added in session_php.inc and session_cookie.inc logon box an optional link to the user list management page. Finally minor changes to config.inc.php (comment) and mrbs.css (style for buttons inside tables). web/auth_db.inc (new) | 67 +++++++ web/config.inc.php | 2 +- web/edit_users.php (new) | 360 +++++++++++++++++++++++++++++++++++++ web/lang.en | 17 ++ web/lang.fr | 17 ++ web/mrbs.css | 2 +- web/session_cookie.inc | 11 +- web/session_php.inc | 11 +- 8 files changed, 481 insertions(+), 6 deletions(-) commit 0ec748a04 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Thu Jan 15 22:37:59 2004 +0000 Updated the error message displayed in the case where the iconv extension is missing. web/language.inc | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) commit 67157cd2d Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Thu Jan 15 21:01:10 2004 +0000 Changed absolute paths in anchor hrefs and redirection headers from absolute to relative. This should fix the link failures seen by some users, in environments where a proxy makes the user-visible root different from the web-server-visible root. In the unlikely case where some users have a very old browser not supporting relative HTTP relocation headers, then they can use the $url_base in config.inc.php as a workaround: In this case, put in this variable the full URL of the MRBS root, as seen by the users through the proxy. web/config.inc.php | 6 +++--- web/session_cookie.inc | 13 ++++++++----- web/session_php.inc | 14 ++++++++------ web/trailer.inc | 2 +- 4 files changed, 20 insertions(+), 15 deletions(-) commit 26e2bf452 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu Jan 15 20:39:46 2004 +0000 - Fixed bug [ 875782 ]: Month View, Extra carriage return. Text formating problem if $monthly_view_brief_description set to TRUE. web/month.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3d784c255 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Sun Jan 11 21:52:46 2004 +0000 Added a directive to avoid having a blank line below buttons inside tables. This makes the logon cell in the top banner, and the forthcoming user properties editor page, look much better. web/mrbs.css | 2 ++ 1 file changed, 2 insertions(+) commit dffa88e38 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Jan 11 15:26:41 2004 +0000 Doc fix: unlike Apache on Windows, you HAVE to copy iconv.dll in into \\%windir%\\system32\\ if you use Microsoft IIS. INSTALL | 1 + 1 file changed, 1 insertion(+) commit d2885f0d6 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jan 9 09:40:30 2004 +0000 * The MRBS version number hadn't been updated to 1.2-pre2. It has now. web/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 75adb633a Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Mon Dec 22 23:12:52 2003 +0000 Added support for changing area/room in Add/Edit entry form. Added check to ensure that at least one room is selected as edit_entry_handler.php does not catch this. Added wording to lang.en to cover the above check. The first fix requires that javascript is enabled. If it is not then you get the same form as you get currently. If it is enabled and you have more than one area then you get an area select box which controls the rooms displayed in the room select box. web/edit_entry.php | 131 +++++++++++++++++++++++++++++++++++++++---- web/lang.en | 2 + 2 files changed, 123 insertions(+), 10 deletions(-) commit 90c342ad3 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Mon Dec 22 21:52:07 2003 +0000 Minor formatting fix for day view when viewed with Konqueror. web/day.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 0a6c2278f Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Dec 21 17:59:14 2003 +0000 Doc fix: - Updated other doc areas about default administrator since JFL change. - Removed warning in function.inc since it works now with Gavin changes AUTHENTICATION | 2 +- INSTALL | 11 ++++++++--- README | 8 ++++---- web/functions.inc | 6 ------ 4 files changed, 13 insertions(+), 14 deletions(-) commit 325a3c6f4 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Sun Dec 21 11:05:38 2003 +0000 Changed the default administrator list, to be coherent with the explanations in AUTHENTICATION, and also to work out-of-the-box. web/config.inc.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit 108fc0d82 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Sun Dec 21 11:03:39 2003 +0000 Added a few comments from last weeks emails on the list. Changed the information about the default administrator settings, which was incoherent with the default contents of config.inc.php. AUTHENTICATION | 135 ++++++++++++++++++++++++++--------------------- 1 file changed, 75 insertions(+), 60 deletions(-) commit e29c12656 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Wed Dec 17 22:03:51 2003 +0000 Modified Javascript to work with Mozilla 1.5 (Linux) and NS4 (Linux), also tested with Konqueror 3.1.4 and IE 6.0 Days now work for all changes of Month and Year. Added JavaScript to fix days once date selector is displayed so that if a month has < 31 days then the day selector is shortened appropriately. web/functions.inc | 63 ++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 26 deletions(-) commit 7f5e17f33 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Dec 17 00:29:39 2003 +0000 (authValidateUser): - Tried to fix LDAP servers login processes waiting for 'uid' and not for 'cn'. Does an anonymous bind first, tries to find the dn for the user and then binds to it with $pass. (Bernd Oeggl , Philippe Schwarz). web/auth_ldap.inc | 145 +++++++++++++++++++++++++------------------- 1 file changed, 81 insertions(+), 64 deletions(-) commit c29c0d395 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Dec 17 00:01:32 2003 +0000 - Fix URL problems when using a proxy in the environment. web/config.inc.php | 7 +++++++ 1 file changed, 7 insertions(+) commit f84ff4927 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Dec 14 22:45:43 2003 +0000 (print_header): Added JavaScript to insure the integrity of the date entered in three field drop-down menus. Tested with Windows IE 6.0 Tested with Linux Opera 7.21, Mozilla 1.3, Konqueror 3.1.0 WARNING: little bug in Mozilla 1.3. If a month with less than 31 days is selected, the max days number is updated correctly, but if you select a 31 days month again, then max days number is not updated (ie. stays at 30 or 28). Goto a 31 days month to have the 31 days back. Since Mozilla 1.3 is rather not up to date (1.6b current at 2003-11-15), this may be corrected in newer releases. web/functions.inc | 94 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 81 insertions(+), 13 deletions(-) commit 861550dae Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Dec 12 17:51:24 2003 +0000 Compile Gavin Walker and my comments about installing SMB authentication, since previous documentation really lacks details. AUTHENTICATION | 83 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 61 insertions(+), 22 deletions(-) commit c1cf3ca2a Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu Dec 11 00:11:13 2003 +0000 Adding comments about iconv setup. INSTALL | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) commit b92ef66bd Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Dec 7 17:59:21 2003 +0000 ChangeLog update ChangeLog | 147 +++++++++++--------- web/ChangeLog | 358 +++++++++++++++++++++++++++--------------------- 2 files changed, 280 insertions(+), 225 deletions(-) commit 6e2f65784 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Dec 7 17:29:29 2003 +0000 ChangeLog update ChangeLog | 190 ++++++++++++++++++++++++++---------------------- web/ChangeLog | 56 ++++++++++++++ 2 files changed, 159 insertions(+), 87 deletions(-) commit e761e7a1f Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Dec 7 16:39:46 2003 +0000 Doc fixes web/config.inc.php | 2 ++ 1 file changed, 2 insertions(+) commit 21589200b Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Dec 7 16:35:08 2003 +0000 Updated NEWS file for mrbs-1.2-pre2 NEWS | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) commit 8a7b251dd Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Dec 7 01:31:25 2003 +0000 - Fixed bug [ 853410 ]: when changing a non n-weekly entry, field "Number of weeks (for n-weekly)" appear... web/edit_entry.php | 32 ++++++++++++++++++++++---------- web/edit_entry_handler.php | 5 +++-- 2 files changed, 25 insertions(+), 12 deletions(-) commit 2c0276080 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sat Dec 6 13:02:31 2003 +0000 Doc fix (Unicode support). INSTALL | 9 +++++++++ 1 file changed, 9 insertions(+) commit ec6db561d Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sat Dec 6 05:59:20 2003 +0000 Doc fix. README.nwauth | 9 ++++----- UPGRADE | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) commit 2928d63ad Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sat Dec 6 05:45:32 2003 +0000 Fixing typos. Addding some documentation about Unicode. AUTHENTICATION | 2 +- INSTALL | 35 +++++++++++++++++++++++++++++++---- 2 files changed, 32 insertions(+), 5 deletions(-) commit 335db01a4 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu Dec 4 17:49:57 2003 +0000 Fixing typos; doc update. AUTHENTICATION | 9 +++++---- README | 9 ++++----- 2 files changed, 9 insertions(+), 9 deletions(-) commit 99d5e9234 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu Dec 4 16:07:41 2003 +0000 - Fixed bug #846337: We can create rooms with no area web/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1400f0116 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Wed Dec 3 21:52:11 2003 +0000 Daylight Saving Time fixes. This has involved modifying month.php, week.php and day.php, view_entry.php, edit_entry.php, edit_entry_handler.php, mbs_sql.inc and functions.inc For month.php and week.php, I have changed them to handle each week/month on a day by day basis. They and day.php make DST corrections for the start and end of each day. The intervals of time are handled by using the format HHMM with no leading zeros. Events are read in to an array using this format of time as the one of the indices. A day which does not include a DST change is used to loop through all valid hours for that day. The view_entry.php has been altered to modify times that cross DST back to what the user would expect 9pm to 3am is 6 hours but it is stored as either 5 or 7 hours. The edit_entry.php, edit_entry_handler.php and mrbs_sql.inc have been changed to correctly calculate the difference between two timestamps and correct the end time for checking the following: free time, all day events and repeating events. functions.inc includes two new functions: one to check for DST and one to correct for DST. These are used in the fixes above. Where possible, calculations that used to use midnight have been changed to use midday to avoid DST problems. You may still see some "strange" but correct behaviour when scheduling meetings which start and/or end between midnight and 3 am on a day of DST. These may look wrong but should actually be correct if you consider how DST works on that day, i.e in the UK the hour from 1am to 2pm does not exist when entering DST. Backward compatibility: There may be a one hour error for events that start or end between midnight and 3am on the day that DST changes but these can be fixed by editting the entry/series and saving it. web/day.php | 97 ++++++++---- web/edit_entry.php | 4 +- web/edit_entry_handler.php | 20 ++- web/functions.inc | 43 ++++++ web/month.php | 151 ++++++++++--------- web/mrbs_sql.inc | 14 +- web/view_entry.php | 4 +- web/week.php | 285 +++++++++++++++++++---------------- 8 files changed, 371 insertions(+), 247 deletions(-) commit 80769c71e Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Dec 3 18:22:54 2003 +0000 Changelog update. ChangeLog | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ web/ChangeLog | 18 +++++++++++++++ 2 files changed, 79 insertions(+) commit 777fad373 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Dec 3 18:16:25 2003 +0000 ° Updated documentation about new authentication features. ° Updated documentation to add warnings about mrbs not working with postegreSQL version 7.3 and above. Mrbs does not work anymore with postgreSQL dbms since pgsql version 7.3. This is because the following changes : - An empty string ('') is no longer allowed as the input into an integer field. Formerly, it was silently interpreted as 0. If you want a field to be 0 then explicitly use 0, if you want it to be undefined then use NULL. - "INSERT" statements with column lists must specify all values; e.g., INSERT INTO tab (col1, col2) VALUES ('val1') is now invalid. This is a problem since we have to change all sql logic that works fine with mysql just to be compliant with postGreSQL. Since nobody reported this error, I can thinks mrbs users using pgsql are very few. Currently the new tables.pg.73and_above.sql file allow to create mrbs tables with new postgreSQL versions, but is experimental. You can still browse existing mrbs tables with new versions, but you cannot add/edit entries/rooms/areas any more. INSTALL | 6 ++- README | 14 +++--- tables.pg.73and_above.sql (new) | 71 +++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 8 deletions(-) commit b559434d3 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Dec 3 18:05:12 2003 +0000 Updated the postgreSql driver (pgsql.inc) to remove deprecated functions. People which still use a php version less than 4.2 will have to replace the existing pgsql.inc file with pgsql.before_php42.inc file and rename it to pgsql.inc pgsql.before_php42.inc (new) | 239 +++++++++++++++++++++++++++++++++ web/pgsql.inc | 30 ++--- 2 files changed, 254 insertions(+), 15 deletions(-) commit 6a573967f Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Mon Dec 1 22:05:54 2003 +0000 Complete rewrite of the file in html. Converted to text using detagger (http://www.jafsoft.com/detagger/) AUTHENTICATION | 997 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 744 insertions(+), 253 deletions(-) commit c813125e1 Author: Gavin Walker <gwalker@users.sourceforge.net> Date: Mon Nov 24 22:11:56 2003 +0000 Displays "Edit Series" or "Edit Entry" at top of page when editing a series or entry respectively. web/edit_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 7f973290b Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Sat Nov 22 15:11:29 2003 +0000 This file described how to operate the old cookie authentication module. ROXEN (gone) | 43 ------------------------------------------- 1 file changed, 43 deletions(-) commit 83feaa73c Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Sat Nov 22 09:40:57 2003 +0000 As Thierry pointed-out, this file is now useless, as there is a more general implementation in web/session_cookie.inc. auth_cookie_ext.inc (gone) | 248 ----------------------------------- 1 file changed, 248 deletions(-) commit dfe76b26e Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Nov 21 15:27:13 2003 +0000 Since we always forgot for each release to update mrbs version in help.php (this is not a file we open often), I moved the variable to config.inc.php. web/config.inc.php | 3 ++- web/help.php | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) commit 2e028caa3 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Nov 21 04:19:49 2003 +0000 ChangeLog update. web/ChangeLog | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) commit 8a74b9701 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Nov 21 01:34:44 2003 +0000 - fixed not working with error level all. web/session_cookie.inc | 5 +++++ 1 file changed, 5 insertions(+) commit d7fea4b30 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Wed Nov 19 23:18:18 2003 +0000 Removed auth_ip.inc, auth_name.inc, auth_nt.inc, auth_omni.inc, now superseeded by session_ip.inc, session_host.inc, session_nt.inc, and session_omni.inc respectively. web/auth_ip.inc (gone) | 63 -------------------------- web/auth_name.inc (gone) | 67 --------------------------- web/auth_nt.inc (gone) | 86 ----------------------------------- web/auth_omni.inc (gone) | 92 -------------------------------------- 4 files changed, 308 deletions(-) commit 68075946a Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Wed Nov 19 23:09:44 2003 +0000 Created an auth_none.inc authentication, which validates any user. Moved session management code from the old auth_ip, auth_name, auth_nt, auth_omni to the new session_ip, session_host, session_nt, session_omni respectively. Updated config.inc.php comments to reflect the possible choices for session name and authentication types. web/auth_none.inc (new) | 64 ++++++++++++++++++++++++++++++++++++ web/config.inc.php | 4 +-- web/session_host.inc (new) | 39 ++++++++++++++++++++++ web/session_ip.inc (new) | 35 ++++++++++++++++++++ web/session_nt.inc (new) | 42 +++++++++++++++++++++++ web/session_omni.inc (new) | 59 +++++++++++++++++++++++++++++++++ 6 files changed, 241 insertions(+), 2 deletions(-) commit e9c55e6b0 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Tue Nov 18 21:30:57 2003 +0000 Updated the administrator warning message about the iconv package requirement, to fire only if $unicode_encoding is true. web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 204cc7bf0 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Nov 18 10:41:18 2003 +0000 * Added utility to convert text in the database to UTF8, to use MRBS with $unicode_encoding set to 1. The administrator should copy it into the web directory, run it (choosing the encoding to convert from) ONCE, and then move it back out of the web directory. * Added comment to my usage of $vocab["charset"] in style.inc, as ist doesn't match the general usage of get_vocab(). convert_db_to_utf8.php (new) | 130 +++++++++++++++++++++++++++++++++ web/style.inc | 3 + 2 files changed, 133 insertions(+) commit 9a93bb2a4 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Mon Nov 17 03:52:53 2003 +0000 ChangeLog update. ChangeLog | 5 +++++ web/ChangeLog | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) commit e45d244cf Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Mon Nov 17 03:41:11 2003 +0000 Removed unnecessary comment. web/config.inc.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 323fb904a Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Mon Nov 17 03:39:56 2003 +0000 - make admin.php working with error level E_ALL with no area/room defined (previous fix causes an error in case http authentication fail). web/admin.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit e3430608d Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Mon Nov 17 03:30:48 2003 +0000 Changing $vocab language string. web/lang.fr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 7623a66bc Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Nov 16 20:25:21 2003 +0000 - Removed remainings plain text strings by get_vocab() function. web/session_cookie.inc | 6 +++--- web/session_php.inc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) commit 76849dc26 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Nov 16 19:41:42 2003 +0000 - fixed remainings non unicode compliant php functions. web/month.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d45bbd393 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Nov 16 19:30:44 2003 +0000 - (mrbsCheckFree): fixed remainings non unicode php functions. web/mrbs_sql.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 0adde79db Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Nov 16 19:23:27 2003 +0000 - make admin.php working with error level E_ALL with no area/room defined. web/admin.php | 5 ----- 1 file changed, 5 deletions(-) commit 685db19a3 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Nov 16 17:10:08 2003 +0000 Changed my stupid $_MRBS_monthly_view_brief_description variable name to $monthly_view_brief_description web/config.inc.php | 4 ++-- web/month.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit a7cfec8e8 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sat Nov 15 20:37:42 2003 +0000 ChangeLog update. web/ChangeLog | 116 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 89 insertions(+), 27 deletions(-) commit 875df0a61 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Fri Nov 14 22:26:36 2003 +0000 Moved inclusion of mrbs_auth.inc after that of function.inc and $dbsys.inc, as mrbs_auth.inc now uses definitions of the first one, and will use those of the second one eventually. web/day.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 38d6ce502 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Fri Nov 14 22:23:09 2003 +0000 Function authValidateUser() must not call authGet() anymore. In case of failure it just returns 0 as specified in its header comment. web/auth_config.inc | 1 - 1 file changed, 1 deletion(-) commit c2c1349c0 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Fri Nov 14 22:20:24 2003 +0000 Set $auth['session']='http' if it is not specified. This allows to get the same behaviour as before without changing config.inc.php. Moved routines authGet(), getUserName() and getUserPassword() to the new session_http.inc module. Function authValidateUser() must not call authGet() anymore. In case of failure it just returns 0 as specified in its header comment. web/auth_ext.inc | 32 ++------------------------------ web/auth_imap.inc | 32 +++----------------------------- web/auth_ldap.inc | 30 ++---------------------------- web/auth_nis.inc | 30 ++---------------------------- web/auth_nw.inc | 30 ++---------------------------- web/auth_pop3.inc | 33 ++------------------------------- 6 files changed, 13 insertions(+), 174 deletions(-) commit d67d60f30 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Fri Nov 14 22:13:26 2003 +0000 Removed the argument to authGet(). web/auth_ip.inc | 2 +- web/auth_name.inc | 2 +- web/auth_nt.inc | 2 +- web/auth_omni.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) commit 19018c17e Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Fri Nov 14 22:07:23 2003 +0000 Moved routines getAuthUserName() and getAuthUserPassword() to the new session_http.inc module. Function getAuthorized() must not call authGet() anymore. In case of failure it just returns 0 as specified in its header comment. web/mrbs_auth.inc | 42 ++++-------------------------------------- 1 file changed, 4 insertions(+), 38 deletions(-) commit a904388ca Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Fri Nov 14 22:01:19 2003 +0000 Moved $HTTP_HOST setting to grab_globals.inc. Added missing globals declarations. Removed the argument to authGet(). Action "SetName" now validates the user/password pair. This avoids loging on unauthorized users, which would rejected later on. web/session_cookie.inc | 55 +++++++++++++++++++++++----------------- web/session_php.inc | 37 +++++++++++++++------------ 2 files changed, 53 insertions(+), 39 deletions(-) commit 4b5c11348 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Fri Nov 14 21:52:19 2003 +0000 Get the user/password using the HTTP basic authentication. web/session_http.inc (new) | 78 ++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) commit 09cf01110 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Fri Nov 14 21:47:20 2003 +0000 Added the setting of $HTTP_HOST. web/grab_globals.inc.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) commit 9bb764460 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Nov 14 04:10:02 2003 +0000 ChangeLog update. web/ChangeLog | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) commit 181a0a0c3 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Nov 14 04:07:39 2003 +0000 - (printLoginForm): make session_php.inc working with error level E_ALL. web/session_php.inc | 1 + 1 file changed, 1 insertion(+) commit 70de1d3e1 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Nov 12 03:24:56 2003 +0000 Added warning about using php accelerators with mrbs. README | 5 +++++ 1 file changed, 5 insertions(+) commit ba5d25eff Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Tue Nov 11 21:59:14 2003 +0000 Added messages for session handling. web/lang.cz | 7 +++++++ web/lang.da | 7 +++++++ web/lang.de | 7 +++++++ web/lang.es | 7 +++++++ web/lang.fi | 9 ++++++++- web/lang.fr | 7 +++++++ web/lang.it | 7 +++++++ web/lang.ja | 7 +++++++ web/lang.nl | 7 +++++++ web/lang.no | 7 +++++++ web/lang.pt | 7 +++++++ web/lang.sv | 7 +++++++ web/lang.zh-tw | 7 +++++++ 13 files changed, 92 insertions(+), 1 deletion(-) commit eddaea6df Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Sun Nov 9 22:49:02 2003 +0000 Added support for session handling. web/auth_config.inc (new) | 78 ++++++++++++++ web/config.inc.php | 21 +++- web/day.php | 1 + web/functions.inc | 7 ++ web/lang.en | 7 ++ web/mrbs_auth.inc | 1 + web/session_cookie.inc (new) | 169 +++++++++++++++++++++++++++++++ web/session_php.inc (new) | 180 +++++++++++++++++++++++++++++++++ 8 files changed, 459 insertions(+), 5 deletions(-) commit 80a9b17b8 Author: Jean-Francois LARVOIRE <jflarvoire@users.sourceforge.net> Date: Sun Nov 9 10:58:50 2003 +0000 Display an error message when the iconv function is not defined. This message explains what to do to fix the problem on the PHP server. It will help administrators who are likely to encounter the problem the first time they install mrbs. web/language.inc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) commit fe9a33f1a Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sat Nov 1 21:12:14 2003 +0000 ChangeLog update. ChangeLog | 6 ++++++ web/ChangeLog | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) commit e91708721 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sat Nov 1 21:06:20 2003 +0000 + Time slots with an entry now display bubbles when mouse over, showing complete description in day view and week view, and either the short name or start-stop time in month view in accordance with $_MRBS_monthly_view_brief_description value in config.inc.php. web/day.php | 27 +++++++++++++++++++-------- web/month.php | 8 +++++--- web/week.php | 15 ++++++++++----- 3 files changed, 34 insertions(+), 16 deletions(-) commit de2ca4ebe Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sat Nov 1 19:06:07 2003 +0000 Fixing typos web/week.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit a662b9ff0 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Oct 31 20:34:37 2003 +0000 Added warning to avoid specify calendar settings that displays blocks overlaping the next day, since it is not properly handled. INSTALL | 3 +++ web/config.inc.php | 3 +++ 2 files changed, 6 insertions(+) commit 4bef05857 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Oct 31 19:45:42 2003 +0000 - Fixing a bug if we override local in config.inc.php. Variable name was called $override_locale in config file and $locale_override in language.inc. web/language.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 0b053c29f Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Oct 31 19:22:50 2003 +0000 - Fixing The Daylight Savings Time bug (thanks to Tony Fugere (tonyfugere at users.sourceforge.net)). web/week.php | 10 ++++++++++ 1 file changed, 10 insertions(+) commit 17e637441 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Oct 31 01:17:57 2003 +0000 - getting auth_pop3 working even in error_reporting(ALL). web/auth_pop3.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) commit 4619c682b Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sat Oct 11 03:32:00 2003 +0000 ChangeLog update. ChangeLog | 5 +++++ web/ChangeLog | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) commit cc1428de9 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sat Oct 11 02:46:48 2003 +0000 - bug fix: Make testdata compliant to register_global=off (samples entries had no authors) testdata.php | 1 + 1 file changed, 1 insertion(+) commit 5deaa6f57 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Oct 10 19:26:37 2003 +0000 - Changed getenv('HTTP_ACCEPT_LANGUAGE') to $HTTP_ACCEPT_LANGUAGE. getenv() does not work in ISAPI mode, so getenv('HTTP_ACCEPT_LANGUAGE') is always NULL with ISAPI. Global variable seems more reliable. web/language.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ae7cb8c0b Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Oct 10 04:54:12 2003 +0000 + Allow to view weeks in the bottom (trailer.inc) as week numbers (ie. 42) instead of 'first day of the week' (13 Oct). Committing again since John previous commit erased my changes :-) web/ChangeLog | 16 ++++++++++++---- web/config.inc.php | 4 ++++ 2 files changed, 16 insertions(+), 4 deletions(-) commit 0e9893383 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Oct 10 04:31:19 2003 +0000 + new Unicode support (John). web/ChangeLog | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) commit e1c57f630 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Oct 9 20:07:41 2003 +0000 * Just testing new CVS loginfo web/ChangeLog | 1 + 1 file changed, 1 insertion(+) commit f0308e51a Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Oct 9 19:58:43 2003 +0000 * Revamped localisation/internationalisation. MRBS can now be called fulled Unicode, as long as the config variable $unicode_encoding is set to 1. If this is set, then MRBS serves all of it's pages in UTF-8 and stores everything in the database in UTF-8. This means that all languages work together. Other things fixed: - Automatic language determination made much better, works for Windows and Unix servers now, by using different code for each. - There are new configuration variables in config.inc.php now, to configure language/locale settings with much more flexibility. Tested on a Windows+Apache machine, and on a Linux+Apache machine NOTE FOR DEVELOPERS: Whenever you want to access the translations you MUST now use: get_vocab('token') instead of $vocab[token] Additionally, if you use a call to date() or strftime() that could return text, as opposed to just numbers, you MUST use utf8_date() and utf8_strftime() instead. Note: Not filled out ChangeLog, because I don't know how (or if) Thierry does it automatically, and I wasn't gonna do it by hand with all the files I changed :) web/admin.php | 34 ++--- web/config.inc.php | 90 ++++-------- web/day.php | 16 +-- web/del.php | 10 +- web/edit_area_room.php | 30 ++-- web/edit_entry.php | 65 ++++----- web/edit_entry_handler.php | 10 +- web/functions.inc | 48 +++---- web/help.php | 16 +-- web/language.inc (new) | 270 +++++++++++++++++++++++++++++++++++ web/mincals.inc | 4 +- web/month.php | 14 +- web/mrbs_auth.inc | 8 +- web/mrbs_sql.inc | 7 +- web/mysql.inc | 2 +- web/pgsql.inc | 2 +- web/report.php | 68 +++++---- web/search.php | 32 ++--- web/style.inc | 13 +- web/trailer.inc | 14 +- web/view_entry.php | 54 +++---- web/week.php | 18 +-- 22 files changed, 532 insertions(+), 293 deletions(-) commit d3c62c6a6 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Oct 3 17:46:50 2003 +0000 + Allow to view weeks in the bottom (trailer.inc) as week numbers (ie. 42) instead of 'first day of the week' (13 Oct) (Per Wermelin - SKIOLD Sæby A/S" <ela@skiold.dk>). ChangeLog | 6 ++++++ INSTALL | 2 ++ web/ChangeLog | 6 ++++++ web/config.inc.php | 4 ++++ web/trailer.inc | 9 +++++---- 5 files changed, 23 insertions(+), 4 deletions(-) commit 89816f6b8 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Sep 25 23:19:35 2003 +0000 Added a new script for the "ext" authentication scheme that allows you to use a password file with usernames and their crypted passwords. AUTHENTICATION | 28 +++++++++++++++- ChangeLog | 8 +++++ crypt_passwd.example (new) | 2 ++ crypt_passwd.pl (new +x) | 65 ++++++++++++++++++++++++++++++++++++ 4 files changed, 102 insertions(+), 1 deletion(-) commit 6bc6e0266 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Sep 25 18:20:36 2003 +0000 Bug fix for POP3 authentication scheme provided by Jean-Baptiste Lehucher. web/ChangeLog | 5 +++++ web/auth_pop3.inc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) commit cbcb6836e Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Tue Sep 23 06:11:34 2003 +0000 Doc fixes. ChangeLog | 24 ++++++++++++++++++++++++ web/ChangeLog | 17 +++++++++++++++++ 2 files changed, 41 insertions(+) commit f8d03d15a Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Tue Sep 23 06:05:41 2003 +0000 Doc fixes. NEWS | 35 +++++++++++++++++++++++++++++++++++ web/help.php | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) commit c9ce61d01 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Tue Sep 23 05:55:18 2003 +0000 Finally we changed config.inc to config.inc.php for "security" reasons. AUTHENTICATION | 22 ++++++++++---------- INSTALL | 31 ++++++++++++++-------------- LANGUAGE | 4 ++-- README.nwauth | 6 +++--- README.sqlapi | 8 +++---- ROXEN | 6 +++--- grant.pg.sql | 5 ++--- testdata.php | 4 ++-- web/add.php | 4 ++-- web/admin.php | 4 ++-- web/auth_ext.inc | 4 ++-- web/auth_imap.inc | 4 ++-- web/auth_ip.inc | 4 ++-- web/auth_name.inc | 4 ++-- web/auth_nis.inc | 4 ++-- web/auth_nt.inc | 4 ++-- web/auth_omni.inc | 2 +- web/auth_pop3.inc | 4 ++-- web/{config.inc => config.inc.php} | 0 web/day.php | 6 +++--- web/del.php | 4 ++-- web/del_entry.php | 4 ++-- web/edit_area_room.php | 4 ++-- web/edit_entry.php | 4 ++-- web/edit_entry_handler.php | 4 ++-- web/help.php | 4 ++-- web/lang.fi | 2 +- web/month.php | 4 ++-- web/report.php | 4 ++-- web/search.php | 4 ++-- web/view_entry.php | 4 ++-- web/week.php | 4 ++-- 32 files changed, 87 insertions(+), 89 deletions(-) commit a75a99f0c Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Tue Sep 23 05:37:18 2003 +0000 Make sure notice errors are not reported, they can break mrbs code. web/ChangeLog | 5 +++++ web/config.inc | 3 +++ 2 files changed, 8 insertions(+) commit bce5260cf Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu Sep 11 14:52:03 2003 +0000 Updating finish lang file (Tom Ingberg (tom.ingberg@edu.vantaa.fi)). web/ChangeLog | 6 ++++- web/lang.fi | 63 +++++++++++++++++++++++++++---------------------- 2 files changed, 40 insertions(+), 29 deletions(-) commit 906c4dcbc Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Tue Aug 12 16:17:30 2003 +0000 - Fixed bug #748934, do not allow booking descriptions with only spaces (cannot click the slot). web/ChangeLog | 6 ++++++ web/edit_entry.php | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) commit 888715356 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sat Aug 9 20:55:26 2003 +0000 ChangeLog update. ChangeLog | 14 ++++++++++++++ web/ChangeLog | 10 ++++++++++ 2 files changed, 24 insertions(+) commit 4ba9eb0ba Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sat Aug 9 05:23:29 2003 +0000 + Added Windows NT / IIS authentication scheme. AUTHENTICATION | 67 ++++++++++++++++++++++++++++++++ web/auth_nt.inc (new) | 86 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 153 insertions(+) commit 3bfb44c14 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sat Aug 9 03:36:36 2003 +0000 Dox fixes. Update documentation and comments to the current cvs situation. AUTHENTICATION | 9 ++++ INSTALL | 112 ++++++++++++++++++++++++++++------------------- README | 9 ++-- web/config.inc | 6 ++- 4 files changed, 88 insertions(+), 48 deletions(-) commit 26e18f400 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu Aug 7 15:57:29 2003 +0000 * Doc fixes: updated to have a consistent layout. NEWS | 579 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 317 insertions(+), 262 deletions(-) commit 22bd03d59 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu Aug 7 05:32:47 2003 +0000 * New true GNU ChangeLog file. Only changes to this directory (mrbs/web/) should use this ChangeLog. File created with cvs2cl.pl script (http://www.red-bean.com/cvs2cl/) with these parameters : cvs2cl.pl --revisions --branches --tags --gmt --ignore ChangeLog --usermap /path/to/your/username_email_file --file ChangeLog --window 43200 --FSF Note : I did not yet succeeded retrieving username/email automatically from Sourceforge, so they have to be put in a file. I set a 12 hours window to not have 'atomic' entries in the file. web/ChangeLog (new) | 1114 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1114 insertions(+) commit 93da91dcf Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu Aug 7 05:28:07 2003 +0000 * File replaced with a new true GNU ChangeLog file. Previous content moved to the new NEWS file. File created with cvs2cl.pl script (http://www.red-bean.com/cvs2cl/) with these parameters : cvs2cl.pl --revisions --branches --tags --gmt --ignore web/ --ignore ChangeLog --usermap /path/to/your/username_email_file --file ChangeLog --window 43200 --FSF Note : I did not yet succeeded retrieving username/email automatically from Sourceforge, so they have to be put in a file. I did not included /mrbs/web/ entries, because there is a new ChangeLog straight in this directory. I set a 12 hours window to not have 'atomic' entries in the file. ChangeLog | 1544 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 1106 insertions(+), 438 deletions(-) commit 854d9760e Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu Aug 7 05:07:05 2003 +0000 * Added a NEWS file which contains a list of user-visible changes worth mentioning (as per GNU Coding Standards). Content pasted from the previous ChangeLog file which was a NEWS file in fact, except last CVS entries which should go to the ChangeLog file. NEWS (new) | 369 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 369 insertions(+) commit b1219e46d Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu May 29 07:25:57 2003 +0000 - Fixed bug : Always displays "edit entry" instead of "Add Entry" even when adding an entry. (<Ian Duncan>i.duncan@uq.edu.au) web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4898f9d5b Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Mon May 12 03:50:43 2003 +0000 - Changed mrbs_sql.inc so that when a 5th week "Monthly repeat, same day of the week" is selected, subsequent repeated meetings switch to the 5th week when possible after falling back to the 4th week. ChangeLog | 5 +++++ web/mrbs_sql.inc | 46 +++++++++++++++++++++++++++++++++------------- 2 files changed, 38 insertions(+), 13 deletions(-) commit e1b93950b Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Mon May 12 03:31:22 2003 +0000 - fixed bug : monthly repeat, corresponding day not properly booked web/mrbs_sql.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit 812ea4652 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun May 11 00:40:59 2003 +0000 - Fixed bug : when selecting a "Monthly repeat, same day of the week" repeat type in the 5th week, repeated meetings are not properly scheduled. Now if no 5th week exist, the 4th week is selected instead for all subsequen ChangeLog | 6 ++++++ web/mrbs_sql.inc | 32 ++++++++++++++++++++++++-------- 2 files changed, 30 insertions(+), 8 deletions(-) commit 8b655dc8c Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu May 8 12:55:45 2003 +0000 - Fixed bug : when you press on print preview in report.php page, all but the submission form is visible but not the actual report (<sQuare>mrbs@synapse.plus.com). ChangeLog | 9 +++++++++ web/report.php | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) commit 93694a481 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Apr 25 21:20:13 2003 +0000 + in the minicalendar week view, the full week is highlighted instead of the first day of the week (<sQuare>mrbs@synapse.plus.com). web/mincals.inc | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) commit f68dd0b81 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Apr 25 20:56:31 2003 +0000 - converts all 'tabs' to 'space' (the file contains a mix of both) web/mincals.inc | 92 +++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 46 deletions(-) commit b6ffb56a0 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Apr 18 04:47:26 2003 +0000 - Fixed bug : in week view, allow non 'internet explorer' browsers to see links to the corresponding days in column titles (Johan.Schonning@uab.ericsson.se). ChangeLog | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit 14c52b56d Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Apr 18 02:21:56 2003 +0000 - Corrected bug : in week view, allow non 'internet explorer' browsers to see links to the corresponding days in column titles (Johan.Schonning@uab.ericsson.se). web/week.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 068841680 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu Apr 17 03:38:53 2003 +0000 + Entries in monthly view can be shown as start/end slot or brief description ChangeLog | 20 ++- web/config.inc | 4 + web/month.php | 335 ++++++++++++++++++++++++----------------------- 3 files changed, 194 insertions(+), 165 deletions(-) commit f59b1da27 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Tue Apr 15 15:20:31 2003 +0000 + replaced the column titles in the week view to be links to the corresponding days. This makes it easier for users to access the day view from the week view without having to scroll down to the bottom of the page. (<sQuare>mrbs@synapse.plus.com) web/week.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 53991c9f2 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Apr 9 20:10:15 2003 +0000 - Fixed bug : if AM/PM hour format is used, bookings between 12:00 AM and 12:59 AM are stored with a wrong start date. web/edit_entry_handler.php | 230 ++++++++++++++++++----------------- 1 file changed, 117 insertions(+), 113 deletions(-) commit 0247e6368 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Tue Apr 1 05:26:45 2003 +0000 - bug fix : italian vocab with character not properly escaped prevents deleting entries and/or prevent javascript popup to works (Pietro donatini) ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) commit 510285621 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Mon Mar 31 22:19:38 2003 +0000 - bug fix : italian vocab with character not properly escaped prevents deleting entries and/or prevent javascript popup to works (Pietro donatini) web/lang.it | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1b6b8ef07 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Mar 28 18:31:01 2003 +0000 - Fixed bug : if AM/PM hour format is used, bookings between 12:00 PM and 12:59 PM are stored with a wrong start date. ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) commit ee990b419 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Mar 28 15:40:50 2003 +0000 * Fixed bug in escaping of username and password for all authentication schemes that use HTTP authentication. ChangeLog | 4 ++++ web/auth_imap.inc | 6 ++---- web/auth_ldap.inc | 6 ++---- web/auth_nis.inc | 6 ++---- web/auth_nw.inc | 6 ++---- web/mrbs_auth.inc | 37 +++++++++++++++++++++++++++++++++++++ 6 files changed, 49 insertions(+), 16 deletions(-) commit c61634738 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Fri Mar 28 00:29:55 2003 +0000 - Fixed bug : if AM/PM hour format is used, bookings between 12:00 PM and 12:59 PM are stored with a wrong start date. web/edit_entry_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ebf626301 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Tue Mar 11 19:01:10 2003 +0000 + Added translation: Danish (Claes Bolvig Pedersen (cp@dhi.dk)) - Changed mrbs_version in help.php to "MRBS 1.1" ChangeLog | 4 + web/help.php | 2 +- web/lang.da (new) | 202 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 207 insertions(+), 1 deletion(-) commit 890daa4fd Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Mar 5 05:12:31 2003 +0000 + Make MRBS compliant to the 'register_globals = off' directive ChangeLog | 6 +- web/add.php | 1 + web/admin.php | 6 ++ web/day.php | 1 + web/del.php | 1 + web/del_entry.php | 1 + web/edit_area_room.php | 1 + web/edit_entry.php | 1 + web/edit_entry_handler.php | 1 + web/grab_globals.inc.php (new) | 127 +++++++++++++++++++++++++++++++ web/help.php | 1 + web/month.php | 1 + web/report.php | 1 + web/search.php | 1 + web/view_entry.php | 1 + web/week.php | 1 + 16 files changed, 151 insertions(+), 1 deletion(-) commit 2db9689fd Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Mar 5 05:07:53 2003 +0000 + added translation: Portuguese (Lopo Pizarro) web/lang.pt (new) | 202 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) commit cdaf8a00a Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Feb 9 20:03:52 2003 +0000 - minor bug fixes ("Undefined variable" notices...) web/edit_entry.php | 6 ++++++ web/edit_entry_handler.php | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) commit 64ba9723a Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu Jan 30 07:08:57 2003 +0000 - Parse error fix web/lang.fi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 874b96409 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu Jan 30 06:53:49 2003 +0000 + add translation: lang.fi (Finnish, Vesa Palmu) - translations updates in lang.fr, lang.no (Tobias) - 1 vocab added in functions.inc - Bug fix if "select" option is choosen to show areas/rooms ChangeLog | 10 ++++++++++ 1 file changed, 10 insertions(+) commit 561d668ee Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Thu Jan 30 06:50:42 2003 +0000 + add translation: Finnish, Vesa Palmu web/lang.fi (new) | 201 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) commit c77db546e Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Jan 29 05:48:30 2003 +0000 - minor translation update web/lang.no | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ab07ff6d3 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Jan 29 05:43:04 2003 +0000 - Minor translations updates in lang.fr, lang.no (Tobias), 1 vocab added in functions.inc web/functions.inc | 6 ++++-- web/lang.fr | 24 ++++++++++++------------ web/lang.no | 44 ++++++++++++++++++++++---------------------- 3 files changed, 38 insertions(+), 36 deletions(-) commit 99f33fa8d Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Jan 29 00:08:12 2003 +0000 - Bug fix : if "select" is choosen in config.inc to show areas/rooms as a drop-down select box, an sql error occurs when the "change" button is clicked (mostly used for non javascript users). web/functions.inc | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) commit ab5f44194 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Jan 15 04:02:50 2003 +0000 - Changed the tiny size of numbers in calendar to a larger one. There is more room to do this since week day names are displayed with 3 characters now instead of one. web/mrbs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d1ff973ed Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Wed Jan 15 03:49:44 2003 +0000 - Fixed an error in all lang files, $vocab["backadmin"] was defined twice since a recent update. - Added one (hopefully last) missing $vocab (administration). web/admin.php | 2 +- web/lang.cz | 2 +- web/lang.de | 2 +- web/lang.en | 2 +- web/lang.es | 2 +- web/lang.fr | 4 ++-- web/lang.it | 2 +- web/lang.ja | 2 +- web/lang.nl | 2 +- web/lang.no | 2 +- web/lang.sv | 2 +- web/lang.zh-tw | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) commit c2b741ab5 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jan 14 10:22:45 2003 +0000 * Fixed small problem in Daniel's recent minicals change. web/mincals.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit d666b97b0 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Jan 14 09:58:30 2003 +0000 * Added configuration option ($twentyfourhour_format) to allow time formats to be changed to 12 hour format. * Modified ChangeLog in anticipation of 1.1 release. ChangeLog | 18 +++++------------- web/config.inc | 4 ++++ web/day.php | 2 +- web/del.php | 4 ++-- web/edit_entry.php | 13 ++++++++++++- web/edit_entry_handler.php | 7 +++++++ web/functions.inc | 30 ++++++++++++++++++++++++++++++ web/month.php | 8 ++++---- web/report.php | 35 ++++++++++++++++++++++++++++++++--- web/search.php | 2 +- web/view_entry.php | 6 +++--- web/week.php | 2 +- 12 files changed, 102 insertions(+), 29 deletions(-) commit 2a79318c5 Author: Daniel <nambit@users.sourceforge.net> Date: Tue Jan 14 00:38:32 2003 +0000 make all language files consistant ChangeLog | 3 +++ web/lang.cz | 28 +++++++++++++++++++++++++++- web/lang.de | 26 ++++++++++++++++++++++++++ web/lang.en | 1 - web/lang.es | 27 +++++++++++++++++++++++++++ web/lang.fr | 3 +-- web/lang.it | 28 +++++++++++++++++++++++++++- web/lang.ja | 27 ++++++++++++++++++++++++++- web/lang.nl | 26 ++++++++++++++++++++++++++ web/lang.no | 26 ++++++++++++++++++++++++++ web/lang.sv | 26 ++++++++++++++++++++++++++ web/lang.zh-tw | 26 ++++++++++++++++++++++++++ 12 files changed, 241 insertions(+), 6 deletions(-) commit 64852a4d5 Author: Daniel <nambit@users.sourceforge.net> Date: Mon Jan 13 21:41:36 2003 +0000 Change minicals so they point to week when on week view and month when on month view ChangeLog | 4 ++++ web/day.php | 2 +- web/mincals.inc | 8 +++++--- web/month.php | 4 ++-- web/week.php | 4 ++-- 5 files changed, 14 insertions(+), 8 deletions(-) commit 711a1bb79 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jan 13 14:37:53 2003 +0000 - Changed occurences of "<?=" to "<?php echo" which means we still use the long tag form everywhere. ChangeLog | 4 ++++ web/edit_entry.php | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) commit ce8488c18 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Mon Jan 13 01:58:31 2003 +0000 Added new $vocab in order to remove the last plain english strings in the code. web/edit_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0447523fa Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Jan 12 22:54:12 2003 +0000 - Removed all remainings english strings to make MRBS 100% translatable - Modified config.inc language section to choose a site_faq.html file translated in another language - Added auth_name.inc, auth_omni.inc ChangeLog | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit 79825db3b Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Jan 12 22:50:31 2003 +0000 Authentification scheme using own Omnicron OmniHTTPd web server security features. web/auth_omni.inc (new) | 92 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) commit cddf27f81 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Jan 12 22:46:05 2003 +0000 Variant of auth_ip.inc that try to use DNS name instead of IP. web/auth_name.inc (new) | 67 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) commit 25c5a3aa6 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Jan 12 21:54:47 2003 +0000 Added new $vocab in order to remove the last plain english strings in the code. web/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8eb8de06e Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Jan 12 20:34:09 2003 +0000 Minor translation corrections web/site_faq_fr.html | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) commit 55ebc7709 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Jan 12 20:15:56 2003 +0000 Changed : alert ( "<?php= which output a parse error "unneeded =" to alert ( "<?php but the message is not displayed in the window so I come back to my original : alert ( "<?= which seems to work. web/edit_entry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit b68bbe2f0 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Jan 12 19:50:29 2003 +0000 Added new $vocab in order to remove the last plain english strings in the code. web/view_entry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 18e931ef8 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Jan 12 19:39:27 2003 +0000 Added new $vocab in order to remove the last plain english strings in the code. web/mysql.inc | 2 +- web/pgsql.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 3e8f3317f Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Jan 12 19:31:19 2003 +0000 Added site_faq_fr.html (french translation of site_faq.html) web/site_faq_fr.html (new) | 163 +++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) commit 279dbf3eb Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Jan 12 19:26:07 2003 +0000 Added Faq file language selection ($faqfilelang). web/config.inc | 6 ++++++ 1 file changed, 6 insertions(+) commit 37a92ef3c Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Jan 12 19:03:56 2003 +0000 Added new $vocab in order to remove the last plain english strings in the code. Changed Faq file include to use language selection (in config.inc) web/help.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 7b27334f9 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Jan 12 18:54:38 2003 +0000 Added new $vocab in order to remove the last plain english strings in the code. web/edit_entry_handler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 7afc97434 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Jan 12 18:48:54 2003 +0000 Added new $vocab in order to remove the last plain english strings in the code. web/edit_entry.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 91cbfd9dd Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Jan 12 16:45:29 2003 +0000 Added new $vocab in order to remove the last plain english strings in the code. web/edit_area_room.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 0503f1789 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Jan 12 16:39:08 2003 +0000 Added new $vocab in order to remove the last plain english strings in the code. web/del.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 0255645fe Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Jan 12 16:32:50 2003 +0000 Added new $vocab in order to remove the last plain english strings in the code. Minor language corrections web/lang.fr | 127 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 77 insertions(+), 50 deletions(-) commit b9a0651e3 Author: Thierry Bothorel <thierry_bo@users.sourceforge.net> Date: Sun Jan 12 16:04:57 2003 +0000 Added new $vocab in order to remove the last plain english strings in the code. web/lang.en | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) commit 007cca2ff Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Jan 10 12:43:36 2003 +0000 * Corrected ChangeLog. Daniel's 2 latest changes didn't make it into 1.1-pre2. ChangeLog | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit 0d5f91dcc Author: Daniel <nambit@users.sourceforge.net> Date: Fri Jan 10 11:33:43 2003 +0000 Remove warnings about headers in search.php ChangeLog | 1 + web/search.php | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) commit c4d42d23f Author: Daniel <nambit@users.sourceforge.net> Date: Thu Jan 9 18:05:23 2003 +0000 Change trailer.inc to make print preview more likely to work on windows and non-apache servers ChangeLog | 4 +++- web/trailer.inc | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) commit 831562126 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Jan 9 17:48:30 2003 +0000 * Modified ChangeLog to show changes for soon to be released 1.1-pre2 version. ChangeLog | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) commit f4081890f Author: Daniel <nambit@users.sourceforge.net> Date: Thu Jan 9 17:44:55 2003 +0000 Updated spanish translation ChangeLog | 1 + web/lang.es | 116 +++++++++++++++++++++++++------------------------- 2 files changed, 58 insertions(+), 59 deletions(-) commit 0b95290cb Author: Daniel <nambit@users.sourceforge.net> Date: Thu Jan 9 17:39:51 2003 +0000 add a note about using APOP AUTHENTICATION | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit 436aba692 Author: Daniel <nambit@users.sourceforge.net> Date: Thu Jan 9 17:38:25 2003 +0000 New authentication provider which uses a POP3 mail server. Can authenticate using APOP or standard USER/PASS AUTHENTICATION | 23 +++++- ChangeLog | 3 + web/auth_pop3.inc (new +x) | 156 +++++++++++++++++++++++++++++++++++ web/config.inc | 6 ++ 4 files changed, 187 insertions(+), 1 deletion(-) commit ce8f1d5ae Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Nov 28 10:24:05 2002 +0000 * Fix for edit entry page. We now determine the area id of the room the meeting we're editting is in before getting a list of the rooms in that area. This solves a number of errors that occur when editting/creating bookings. [Note: this is the bug that has been reported by multiple people on the mailing list.] ChangeLog | 7 +++++++ web/admin.php | 12 ++++++------ web/edit_entry.php | 12 ++++++++++-- 3 files changed, 23 insertions(+), 8 deletions(-) commit 90c750f91 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Oct 14 15:45:30 2002 +0000 Fixes submitted/suggested by Jean-François Larvoire: - Added closing ?> to index.php - Added "global $refresh_rate;" to style.inc - Fixed all occurences (hopefully) of $vocab[] indices written without surrounding quotes. ChangeLog | 7 +++++++ web/admin.php | 12 ++++++------ web/del.php | 6 +++--- web/edit_area_room.php | 22 +++++++++++----------- web/index.php | 1 + web/style.inc | 2 ++ 6 files changed, 30 insertions(+), 20 deletions(-) commit 298881f4c Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Oct 9 11:44:09 2002 +0000 * Minor change to ChangeLog. ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 269266e52 Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Oct 8 13:19:23 2002 +0000 - Changed all uses of <? to <?php. - Merged change from John Beranek for an Advanced search function, requires 3 more translation tokens, which have been added to each language file, "search_button" should be OK, as I took the text from each language's "search" token. - Fixed 2 problems in edit_entry.php as submitted on the mailing list. - Added small enchancement to smb_auth.c, if you pass a username as group/user, it will change the NT group that is used for authentication. - Improved shell escaping in auth_ext.inc. It now uses escapeshellarg() instead of escapeshellcmd(). If your PHP version is less than 4.0.3, then it includes escapeshellarg.inc which is a local implementation of that function. - Added updated Frech translation, as provided by Thierry Wehr. - Tided all language files again, they all have the same format and number of lines now, and are all missing at least 2 translations because of the new advanced search functionality. - Fixed a number of bugs to make the Taiwanese translation work. The code to include language files based on HTTP_ACCEPT_LANGUAGE has been improved, which ensures lang.zh-tw is included. Additionally, mincals.inc not longer does a substr() on the abbreviated weekday names, as this breaks terribly for any multibyte encoding, as it was only taking the first byte of a multibyte encoding. This has the impact that you now get Mon,Tue,Wed etc instead of M,T,W (using glibc's en_GB locale). - print_header() now outputs a DOCTYPE identifier as well as sending Pragma: no-cache and an Expires: header in the past. This should help ensure the calendar pages don't get cached. ChangeLog | 31 ++++++++++++++ smb_auth.c | 17 +++++++- web/admin.php | 34 +++++++-------- web/auth_ext.inc | 21 +++++++++- web/config.inc | 51 +++++++++++++++++------ web/edit_area_room.php | 22 +++++----- web/edit_entry.php | 75 +++++++++++++++++----------------- web/escapeshellarg.inc (new) | 15 +++++++ web/functions.inc | 43 ++++++++++--------- web/help.php | 2 +- web/index.php | 2 +- web/lang.cz | 10 +++-- web/lang.de | 7 +++- web/lang.en | 7 +++- web/lang.es | 7 +++- web/lang.fr | 51 ++++++++++++----------- web/lang.it | 7 +++- web/lang.ja | 7 +++- web/lang.nl | 7 +++- web/lang.no | 7 +++- web/lang.sv | 7 +++- web/lang.zh-tw | 8 +++- web/mincals.inc | 2 +- web/mrbs_auth.inc | 8 ++-- web/report.php | 44 ++++++++++---------- web/search.php | 28 +++++++++---- web/style.inc | 12 +++--- web/view_entry.php | 52 +++++++++++------------ 28 files changed, 380 insertions(+), 204 deletions(-) commit 352db55a1 Author: Daniel <nambit@users.sourceforge.net> Date: Thu May 30 11:42:44 2002 +0000 update changelog for new release ChangeLog | 74 ++++++++++++++++++++++------------------------------- 1 file changed, 30 insertions(+), 44 deletions(-) commit 7d12f0e5d Author: Daniel <nambit@users.sourceforge.net> Date: Thu May 30 10:59:37 2002 +0000 extra javascript validation around n-weekly bookings https://sourceforge.net/tracker/index.php?func=detail&aid=482145&group_id=5113&atid=105113 web/edit_entry.php | 9 +++++++++ 1 file changed, 9 insertions(+) commit c4a78c94b Author: Daniel <nambit@users.sourceforge.net> Date: Thu May 30 10:53:25 2002 +0000 add area param to some urls https://sourceforge.net/tracker/index.php?func=detail&aid=559655&group_id=5113&atid=105113 web/day.php | 2 +- web/week.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit d673c4084 Author: Daniel <nambit@users.sourceforge.net> Date: Sat May 25 12:27:09 2002 +0000 update lang.no translation (by Tobias Johan Karlsen) web/lang.no | 86 +++++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) commit ea2de24a3 Author: Daniel <nambit@users.sourceforge.net> Date: Thu May 23 10:10:32 2002 +0000 add Czech translation ChangeLog | 3 + web/lang.cz (new +x) | 174 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+) commit 4d8948a1c Author: Daniel <nambit@users.sourceforge.net> Date: Sat May 18 23:04:36 2002 +0000 quote some array indexes to cut down on the number of warnings web/admin.php | 24 ++++++++++++------------ web/report.php | 2 +- web/trailer.inc | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) commit 9e2ecd220 Author: Daniel <nambit@users.sourceforge.net> Date: Sat May 18 18:16:34 2002 +0000 stop using posix_uname and use php_uname instead. should make the help screen work on windows web/help.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 5a54059eb Author: Daniel <nambit@users.sourceforge.net> Date: Sat May 18 16:39:36 2002 +0000 Fixes a problem where $resolution is an odd amount. details here: http://sourceforge.net/tracker/index.php?func=detail&aid=493079&group_id=5113&atid=105113 web/day.php | 4 ++-- web/functions.inc | 24 +++++++++++++----------- web/week.php | 4 ++-- 3 files changed, 17 insertions(+), 15 deletions(-) commit 545990769 Author: Daniel <nambit@users.sourceforge.net> Date: Sat May 18 16:27:29 2002 +0000 some int casts to fix a bug from sourceforge. see here for details: http://sourceforge.net/tracker/index.php?func=detail&aid=522990&group_id=5113&atid=105113 web/week.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit ff32b3b82 Author: Daniel <nambit@users.sourceforge.net> Date: Sat May 18 16:14:49 2002 +0000 add warning about PHP3 web/functions.inc | 6 ++++++ 1 file changed, 6 insertions(+) commit bbd966581 Author: Daniel <nambit@users.sourceforge.net> Date: Sat May 18 15:59:43 2002 +0000 correct typo web/auth_nis.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5923a3ac9 Author: Daniel <nambit@users.sourceforge.net> Date: Sat May 18 15:06:07 2002 +0000 renormalize all of the language files web/lang.de | 3 ++- web/lang.es | 13 +++++++------ web/lang.fr | 34 ++++++++++++++++++++++++++++++++-- web/lang.it | 3 ++- web/lang.ja | 3 ++- web/lang.nl | 3 ++- web/lang.no | 13 +++++++------ web/lang.sv | 13 +++++++------ web/lang.zh-tw | 4 +++- 9 files changed, 64 insertions(+), 25 deletions(-) commit c4672e805 Author: Daniel <nambit@users.sourceforge.net> Date: Tue May 14 16:11:49 2002 +0000 fix bug introduced by drop-down area selection boxes on week and month views. the page header now shows the area and room name again web/month.php | 2 ++ web/week.php | 2 ++ 2 files changed, 4 insertions(+) commit c4ff20577 Author: Daniel <nambit@users.sourceforge.net> Date: Mon May 13 16:56:37 2002 +0000 add dropdown room selectors to week and month views web/day.php | 2 +- web/functions.inc | 38 +++++++++++++++++++++++++++---- web/month.php | 55 +++++++++++++++++++++++++++------------------ web/week.php | 54 ++++++++++++++++++++++++++------------------ 4 files changed, 100 insertions(+), 49 deletions(-) commit 98929e967 Author: Daniel <nambit@users.sourceforge.net> Date: Sat May 11 12:19:57 2002 +0000 add $area to variables passed to edit_entry.php web/day.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bcfd2ab04 Author: Daniel <nambit@users.sourceforge.net> Date: Sat May 11 11:56:39 2002 +0000 stop saying that PHP3 will work INSTALL | 10 ++++------ README | 12 +++++------- 2 files changed, 9 insertions(+), 13 deletions(-) commit 7547f29cc Author: Daniel <nambit@users.sourceforge.net> Date: Sat May 11 11:32:37 2002 +0000 allows multiple rooms to be booked at the same time ChangeLog | 3 ++ web/edit_entry.php | 20 ++++++++++++- web/edit_entry_handler.php | 56 ++++++++++++++++++++---------------- web/lang.en | 1 + 4 files changed, 54 insertions(+), 26 deletions(-) commit 88bce2fc7 Author: Daniel <nambit@users.sourceforge.net> Date: Sat May 11 11:31:38 2002 +0000 change last $lang to $vocab checklang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7ff9d5f2c Author: Daniel <nambit@users.sourceforge.net> Date: Thu May 9 12:50:18 2002 +0000 Change every $lang to $vocab to stop conflicts with other software that's used $lang (lots of people have seen "N" appear everywhere $lang variables should be) ChangeLog | 11 +- LANGUAGE | 4 +- auth_cookie_ext.inc | 2 +- checklang.php | 6 +- web/admin.php | 32 ++--- web/config.inc | 8 +- web/day.php | 12 +- web/del.php | 6 +- web/edit_area_room.php | 22 +-- web/edit_entry.php | 42 +++--- web/edit_entry_handler.php | 8 +- web/functions.inc | 32 ++--- web/help.php | 2 +- web/lang.de | 250 +++++++++++++++++------------------ web/lang.en | 250 +++++++++++++++++------------------ web/lang.es | 250 +++++++++++++++++------------------ web/lang.fr | 204 ++++++++++++++-------------- web/lang.it | 250 +++++++++++++++++------------------ web/lang.ja | 250 +++++++++++++++++------------------ web/lang.nl | 250 +++++++++++++++++------------------ web/lang.no | 250 +++++++++++++++++------------------ web/lang.sv | 250 +++++++++++++++++------------------ web/lang.zh-tw | 250 +++++++++++++++++------------------ web/month.php | 14 +- web/mrbs_auth.inc | 8 +- web/mrbs_sql.inc | 8 +- web/report.php | 58 ++++---- web/search.php | 24 ++-- web/style.inc | 2 +- web/trailer.inc | 8 +- web/view_entry.php | 36 ++--- web/week.php | 14 +- 32 files changed, 1411 insertions(+), 1402 deletions(-) commit cdb4a64ce Author: Daniel <nambit@users.sourceforge.net> Date: Wed May 8 13:04:17 2002 +0000 document need for register_globals INSTALL | 8 ++++++++ 1 file changed, 8 insertions(+) commit d25c7c2d3 Author: Daniel <nambit@users.sourceforge.net> Date: Wed May 8 13:03:29 2002 +0000 updated lang.fr web/lang.fr | 177 +++++++++++++++++++++----------------------------- 1 file changed, 74 insertions(+), 103 deletions(-) commit 3f11b70df Author: Daniel <nambit@users.sourceforge.net> Date: Wed May 8 12:35:20 2002 +0000 allow areas to be shown as a drop-down select box as well as the default html display. option in config.inc to control this behaviour web/config.inc | 4 ++++ web/day.php | 24 ++++++++++++++++-------- web/functions.inc | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 8 deletions(-) commit 47a9c51c1 Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Mar 7 15:29:06 2002 +0000 * Added comments to the top of all the authentication schemes (that I understand) that describes how to change config.inc to use them. This should help new installers. * Added auth_nis.inc, as provided by Jeff Hoover. This is an authentication scheme that uses NIS. ChangeLog | 7 +++ web/auth_ext.inc | 26 ++++++++- web/auth_imap.inc | 17 +++++- web/auth_ip.inc | 17 +++++- web/auth_nis.inc (new) | 117 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 179 insertions(+), 5 deletions(-) commit bb454bceb Author: John Beranek <jberanek@users.sourceforge.net> Date: Thu Feb 7 13:12:46 2002 +0000 * Added instructions into UPGRADE readme for upgrade2.[my|pg].ql scripts that are required to upgrade from an older MRBS installation. * Added new language tokens, using patch supplied by Michael Redinger. * Added new or updated translations for: Italy (Gianni) Netherlands (Marc ter Horst) Norway (Rune Johansen) Sweden (Hakan Nilsson) German (Michael Redinger) * Added auth_imap.inc, an authentication scheme that uses IMAP, this includes a few more (commented out) lines in config.inc * Changed datatype of 'rep_num_weeks' in 'mrbs_repeat' table for PostgreSQL installs. We now use smallint instead of tinyint, as tinyint isn't available. * Changed config.inc to use getenv('HTTP_ACCEPT_LANGUAGE') instead of $HTTP_ACCEPT_LANGUAGE...much tidier. ChangeLog | 20 ++++- UPGRADE | 8 ++ tables.pg.sql | 2 +- upgrade2.pg.sql | 2 +- web/admin.php | 33 ++++---- web/auth_imap.inc (new) | 125 ++++++++++++++++++++++++++++ web/config.inc | 10 ++- web/del.php | 6 +- web/edit_area_room.php | 22 ++--- web/functions.inc | 2 +- web/lang.de | 37 ++++++++- web/lang.en | 31 ++++++- web/lang.es | 31 ++++++- web/lang.fr | 31 ++++++- web/lang.it (new) | 170 ++++++++++++++++++++++++++++++++++++++ web/lang.ja | 31 ++++++- web/lang.nl | 41 +++++++-- web/lang.no (new) | 170 ++++++++++++++++++++++++++++++++++++++ web/lang.sv | 103 ++++++++++++++--------- web/lang.zh-tw | 31 ++++++- web/report.php | 2 +- 21 files changed, 818 insertions(+), 90 deletions(-) commit 48e56af14 Author: John Beranek <jberanek@users.sourceforge.net> Date: Fri Nov 2 12:57:44 2001 +0000 * Fixed problem in config.inc, $HTTP_ACCEPT_LANGUAGE wasn't working for me unless I put a global specification for it. This should improve internationalisation. ChangeLog | 5 +++++ web/config.inc | 2 ++ 2 files changed, 7 insertions(+) commit fb3c0e472 Author: Daniel <nambit@users.sourceforge.net> Date: Thu Aug 30 21:27:52 2001 +0000 updated for 1.0 ChangeLog | 3 +++ 1 file changed, 3 insertions(+) commit 83ceba634 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jul 16 08:44:08 2001 +0000 * Added these upgrade SQL files. Don't know how I forgot to add them! upgrade2.my.sql (new) | 5 +++++ upgrade2.pg.sql (new) | 5 +++++ 2 files changed, 10 insertions(+) commit 7b0bf0990 Author: Daniel <nambit@users.sourceforge.net> Date: Sun Jul 8 12:42:28 2001 +0000 edit for 1.0-pre2 release ChangeLog | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) commit a42f1e969 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jul 2 17:32:20 2001 +0000 * Removed a little debug code that I left in accidentally. web/mrbs_sql.inc | 2 -- 1 file changed, 2 deletions(-) commit fa389274d Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jul 2 16:58:09 2001 +0000 * Missed a bit in previous checkin, because I have multiple MRBS trees, ahem. web/style.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) commit 03cfb6a4e Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Jul 2 15:05:24 2001 +0000 * Incorporated diff from Scott Leonard that allows you to configure a refresh time for roombooker web pages. Set config variable $refresh_rate to the number of seconds to refresh after, or set to 0 to disable. * Implemented "n-weekly" repeat type. Not sure I like the way it's phrased in the lang files, but the code works fine. You can now a meeting that is repeated every 'n' weeks. e.g. every 5th Monday. This required a database change, which I've made available in upgrade2.my.sql and upgrade2.pg.sql * Tidied lang files, and ensured every file has all the required tokens. 'wc -l lang.*' now shows all the files as having the same line count. Quite a few languages now have English bits in them though. * Incorporated diffs from Tim Bell that allow you to configure a filter for LDAP authentication. * Incorporated diffs from Tim Bell that solve problems with bookings made for times that have smaller granularity that the configured booking resolution. ChangeLog | 17 +++++++++ tables.my.sql | 1 + tables.pg.sql | 3 +- web/auth_ldap.inc | 20 +++++++++- web/config.inc | 11 ++++++ web/day.php | 9 +++-- web/edit_entry.php | 13 ++++++- web/edit_entry_handler.php | 6 +-- web/functions.inc | 19 ++++++++++ web/lang.de | 7 ++-- web/lang.en | 6 ++- web/lang.es | 45 ++++++++++++++++++++-- web/lang.fr | 72 +++++++++++++++++++++++++++++++++++- web/lang.ja | 72 +++++++++++++++++++++++++++++++++++- web/lang.nl | 6 ++- web/lang.sv | 38 +++++++++++++++++++ web/lang.zh-tw | 72 +++++++++++++++++++++++++++++++++++- web/mrbs_sql.inc | 32 +++++++++++----- web/style.inc | 7 ++++ web/view_entry.php | 9 ++++- web/week.php | 4 +- 21 files changed, 433 insertions(+), 36 deletions(-) commit 7961471b0 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Mar 26 14:36:54 2001 +0000 * Fixed time in ChangeLog :) ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7bba873d3 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Mar 26 14:34:19 2001 +0000 * Fixed config.inc so that the correct lang.xx is included if HTTP_ACCEPT_LANGUAGE is a comma-seperated list like "sv, en". ChangeLog | 4 ++++ web/config.inc | 12 +++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) commit f8b332dd9 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Mar 26 14:02:12 2001 +0000 * Copied "rep_type_5" language token into Swedish and Spanish language files from English file. Swedish and Spanish users were not able to use "monthly, corresponding day" repeats without the token being present. ChangeLog | 6 ++++++ web/lang.es | 1 + web/lang.sv | 1 + 3 files changed, 8 insertions(+) commit 8a7b0d936 Author: Michael Redinger <mred@users.sourceforge.net> Date: Sun Mar 18 18:07:43 2001 +0000 Added language string for print preview; added it to all lang files, but only german was translated - the rest still has the english string. web/lang.de | 1 + web/lang.en | 1 + web/lang.es | 1 + web/lang.fr | 1 + web/lang.ja | 1 + web/lang.nl | 1 + web/lang.sv | 1 + web/lang.zh-tw | 1 + web/trailer.inc | 2 +- 9 files changed, 9 insertions(+), 1 deletion(-) commit 55beb8add Author: Michael Redinger <mred@users.sourceforge.net> Date: Sun Mar 18 18:02:33 2001 +0000 red: Added print preview for day, week and month. web/day.php | 45 +++++++++++++---------- web/functions.inc | 2 ++ web/month.php | 63 +++++++++++++++++++------------- web/trailer.inc | 7 ++++ web/week.php | 87 +++++++++++++++++++++++++++------------------ 5 files changed, 127 insertions(+), 77 deletions(-) commit bca4de611 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Mar 7 13:57:54 2001 +0000 * Checked in updates to lang.es (received from Pablo Gomez) and lang.de (received by Bernd Oeggl). 2nd attempt, actually the check the files in this time. web/lang.de | 2 +- web/lang.es | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) commit 221955e70 Author: John Beranek <jberanek@users.sourceforge.net> Date: Wed Mar 7 13:52:18 2001 +0000 * Checked in updates to lang.es (received from Pablo Gomez) and lang.de (received by Bernd Oeggl). ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) commit 1a5f4cd55 Author: Daniel <nambit@users.sourceforge.net> Date: Wed Mar 7 00:34:05 2001 +0000 Update lang.nl ChangeLog | 3 ++ web/lang.nl | 80 +++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 77 insertions(+), 6 deletions(-) commit 74af07b29 Author: Daniel <nambit@users.sourceforge.net> Date: Sun Mar 4 23:25:11 2001 +0000 Changes for release 1.0-pre1 ChangeLog | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) commit 9bf6b4e7f Author: Michael Redinger <mred@users.sourceforge.net> Date: Fri Mar 2 13:10:53 2001 +0000 mred: added auth_pam, updated AUTHENTIFICATION AUTHENTICATION | 39 +++++++++++++++++++++++++++++++++++++++ auth_pam.pl (new +x) | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) commit 986587afa Author: John Beranek <jberanek@users.sourceforge.net> Date: Tue Feb 27 09:49:35 2001 +0000 * Added message into ChangeLog, noting change to CVSROOT to make CVS commit logs get sent to the list...mainly to see if it's working. ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) commit 0fa5dcc71 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Feb 26 12:19:35 2001 +0000 * Internationalised functions.inc. "Help", "Admin" and "Search:" are now lang strings. Also, fixed an error in lang.fr, $lang["mrbs"] was defined twice. ChangeLog | 5 +++++ web/functions.inc | 6 +++--- web/lang.de | 6 ++++++ web/lang.en | 6 ++++++ web/lang.es | 6 ++++++ web/lang.fr | 7 ++++++- web/lang.ja | 6 ++++++ web/lang.nl | 6 ++++++ web/lang.sv | 6 ++++++ web/lang.zh-tw | 6 ++++++ 10 files changed, 56 insertions(+), 4 deletions(-) commit ca26e0383 Author: John Beranek <jberanek@users.sourceforge.net> Date: Mon Feb 26 10:51:38 2001 +0000 * Added double quotes around all uses of color and class attributes, as HTML dictates. ChangeLog | 4 ++++ web/day.php | 2 +- web/edit_entry.php | 6 ++--- web/functions.inc | 16 +++++++------- web/mincals.inc | 10 ++++----- web/month.php | 6 ++--- web/report.php | 52 ++++++++++++++++++++++---------------------- web/week.php | 4 ++-- 8 files changed, 52 insertions(+), 48 deletions(-) commit 1fba0a3a5 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Mon Feb 26 01:27:27 2001 +0000 Note new links on search, conflict ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) commit 115f8ab18 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Mon Feb 26 01:24:53 2001 +0000 On conflict, show start time and links to day/week/month views (based on patch from M. Redinger). web/mrbs_sql.inc | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) commit f22b9d059 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Mon Feb 26 01:24:16 2001 +0000 Link each search result start time to a day view of that entry (bernd, beranek). web/search.php | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) commit 7a2636585 Merge: 11c555cbe 8dff23dbe Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sun Feb 25 01:34:20 2001 +0000 Merge branch mrbs-0-9-1xp into trunk commit 8dff23dbe (origin/mrbs-0-9-1xp) Author: Daniel <nambit@users.sourceforge.net> Date: Thu Feb 22 20:11:10 2001 +0000 new -xp tags web/lang.de | 87 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 76 insertions(+), 11 deletions(-) commit 484c76594 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Tue Feb 20 01:34:46 2001 +0000 Bug fix: be sure edit_type is defined web/edit_entry.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 3985e8c81 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Mon Feb 19 02:56:04 2001 +0000 Use lang[] strings for Next/This/Previous goto week link labels. Cast min() and max() args to int if they come from the database - fix for PHP3. Implement fallback colors for entry types for non-CSS browsers. Move color key to new function, shared with day.php, including fallback colors. Move "no rooms" message to language file. web/week.php | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) commit 3e80fd7c2 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Mon Feb 19 02:55:52 2001 +0000 Use lang[] strings for "View Week" and "View Month" labels in trailer. web/trailer.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 84ad5f0a9 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Mon Feb 19 02:55:38 2001 +0000 Change prompts and behavior of date range for report. Instead of reporting on meetings starting on or between the 2 dates, report on meetings with any booked hours between the two dates. Added new cross-tab summary report, new controls on form, moved report and summary processing to functions inside this script. web/report.php | 223 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 177 insertions(+), 46 deletions(-) commit 88c21207a Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Mon Feb 19 02:55:22 2001 +0000 Use lang[] strings for Next/This/Previous goto month link labels. Cast min() and max() args to int if they come from the database - fix for PHP3. Fix use of uninitialized variable d[]["id"] inside debug code. Move "no rooms" message to language file. web/month.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) commit bec6ac601 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Mon Feb 19 02:55:12 2001 +0000 New strings for trailer (viewweek viewmonth). New strings for week view (weekbefore weekafter gotothisweek). New strings for month view (monthbefore monthafter gotothismonth). New string for day/month/week (no_rooms_for_area). Changes string indexes and values for report date range. New strings for report summary function (include report_only summary_only report_and_summary summarize_by sum_by_descrip sum_by_creator entry_found entries_found summary_header total). web/lang.en | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) commit dc3c8fd6e Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Mon Feb 19 02:55:03 2001 +0000 Add PHP version display. web/help.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 658db5b7d Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Mon Feb 19 02:54:54 2001 +0000 Fix possible use of uninitialized $search_str in print_header(). New function tdcell($type) to implement entry type colors for non-CSS browsers. New function show_colour_key(), used by week and day views. web/functions.inc | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) commit f12a3b98d Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Mon Feb 19 02:54:42 2001 +0000 Implement fallback colors for entry types for non-CSS browsers. Move color key to new function, shared with week.php, including fallback colors. Move "no rooms" message to language file. Bug fix: If no rooms in area, unmatched </table> was being output. web/day.php | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) commit 7defb5896 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Mon Feb 19 02:54:30 2001 +0000 Noted that PHP3 seems to work too. README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 536eaaea5 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Mon Feb 19 02:54:16 2001 +0000 Note reports of working with PHP3. Change caution on MySQL 3.23 to reports of success. Add note if using PHP3 to configure it to send *.php files to PHP. INSTALL | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) commit bdae3257a Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Mon Feb 19 02:54:07 2001 +0000 New maintenance script to check language files. checklang.php (new) | 85 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) commit f059fccfe Author: Daniel <nambit@users.sourceforge.net> Date: Fri Feb 16 08:49:11 2001 +0000 move strings from week.php to lang.en web/lang.en | 7 +++++++ web/week.php | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) commit a2a079eb4 Author: Daniel <nambit@users.sourceforge.net> Date: Mon Feb 12 21:37:36 2001 +0000 added $Id$ tags AUTHENTICATION | 3 +-- ChangeLog | 2 ++ INSTALL | 3 +++ LANGUAGE | 10 +--------- README | 2 ++ README.nwauth | 2 ++ README.sqlapi | 2 ++ ROXEN | 2 ++ UPGRADE | 2 ++ auth_cookie_ext.inc | 2 ++ auth_ldap.pl | 2 ++ auth_ldapsearch.pl | 3 +++ badpw.pl | 2 ++ destroy.pg.sql | 1 + grant.pg.sql | 2 ++ purge.my.sql | 2 ++ purge.pg.sql | 2 ++ sample-data.sql | 2 ++ tables.my.sql | 1 + tables.pg.sql | 1 + testdata.php | 3 +++ upgrade.my.sql | 2 ++ 22 files changed, 42 insertions(+), 11 deletions(-) commit 084ff6e41 Author: Daniel <nambit@users.sourceforge.net> Date: Mon Feb 12 21:35:46 2001 +0000 Added $Id$ tag web/add.php | 3 +++ web/admin.php | 3 +++ web/auth_ext.inc | 2 ++ web/auth_ip.inc | 2 ++ web/auth_ldap.inc | 2 ++ web/auth_nw.inc | 2 ++ web/config.inc | 2 ++ web/day.php | 1 + web/del.php | 2 ++ web/del_entry.php | 1 + web/edit_area_room.php | 2 ++ web/edit_entry.php | 2 ++ web/edit_entry_handler.php | 1 + web/functions.inc | 2 ++ web/help.php | 3 +++ web/index.php | 3 +++ web/lang.de | 2 ++ web/lang.en | 2 ++ web/lang.es | 2 ++ web/lang.fr | 2 ++ web/lang.ja | 2 ++ web/lang.nl | 2 ++ web/lang.sv | 2 ++ web/lang.zh-tw | 2 ++ web/mincals.inc | 2 ++ web/month.php | 1 + web/mrbs_auth.inc | 1 + web/mrbs_sql.inc | 1 + web/mysql.inc | 1 + web/pgsql.inc | 1 + web/report.php | 2 ++ web/search.php | 2 ++ web/site_faq.html | 1 + web/style.inc | 1 + web/trailer.inc | 2 ++ web/view_entry.php | 1 + web/week.php | 1 + 37 files changed, 66 insertions(+) commit a47ae9a8c Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:44:46 2001 +0000 New authentication plug-in for Netware; copied from auth_ext but writes the password over a pipe to nwauth rather than using the command line, since the command line is insecure and anyway doesn't work with this version of nwauth. web/auth_nw.inc (new) | 96 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) commit 760eb4fc1 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:44:33 2001 +0000 New script to implement weekly view of 1 room. web/week.php (new) | 311 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 311 insertions(+) commit 3a1e88662 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:44:15 2001 +0000 New script to implement the Report function - select entries based on start date, area name match, room name match, brief description match, and full description match; report results in list format. web/report.php (new) | 195 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) commit dd51cc944 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:44:02 2001 +0000 New module to implement database calls for PostgreSQL. See README.sqlapi. web/pgsql.inc (new) | 238 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 238 insertions(+) commit dd66943ad Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:43:50 2001 +0000 New module to implement database calls for MySQL. See README.sqlapi. web/mysql.inc (new) | 212 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 212 insertions(+) commit 11c147321 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:43:36 2001 +0000 New script to implement monthly view of 1 room. web/month.php (new) | 270 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 270 insertions(+) commit 7d3766aa3 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:43:15 2001 +0000 SQL script for PostgreSQL to create the MRBS tables. tables.pg.sql (new) | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) commit 56cb6d64e Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:43:03 2001 +0000 SQL script for MySQL to create the MRBS tables. tables.my.sql (new) | 59 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) commit 73caba0be Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:42:51 2001 +0000 A few sample buildings and rooms for testing. (This used to be in the table creation script.) sample-data.sql (new) | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) commit ec9b0972e Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:42:39 2001 +0000 SQL script for PostgreSQL to purge old entries from the MRBS tables. purge.pg.sql (new) | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) commit 0c3ea785a Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:42:27 2001 +0000 SQL script for MySQL to purge old entries from the MRBS tables. purge.my.sql (new) | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) commit 0fcda71b9 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:42:15 2001 +0000 SQL script template for PostgreSQL to set protection on MRBS tables. grant.pg.sql (new) | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) commit d80d50f9a Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:42:04 2001 +0000 SQL script for PostgreSQL to destroy the database tables and sequences. destroy.pg.sql (new) | 13 +++++++++++++ 1 file changed, 13 insertions(+) commit d24f5f031 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:41:46 2001 +0000 Documents database issues and the calls written for MRBS to support MySQL and PostgreSQL databases. Mostly for program maintainers, or for anyone brave enough to try porting MRBS to yet another database system. README.sqlapi (new) | 252 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 252 insertions(+) commit 16d06c7a3 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:41:26 2001 +0000 This file has additional information about authentication with Netware, using the ncpfs tools and a new plug-in auth_nw.inc. README.nwauth (new) | 46 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) commit 46157c37d Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:41:15 2001 +0000 renamed from testdata.php3, Use new database calls testdata.php (new) | 64 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) commit 7b0c8cb5a Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:41:09 2001 +0000 renamed to testdata.php testdata.php3 (gone) | 65 ------------------------------------------ 1 file changed, 65 deletions(-) commit 1287bbe93 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:40:53 2001 +0000 renamed from upgrade.sql upgrade.my.sql (new) | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) commit 7f2ce7012 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:40:47 2001 +0000 renamed to upgrade.my.sql upgrade.sql (gone) | 43 ------------------------------------------- 1 file changed, 43 deletions(-) commit 74b271ac1 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:40:30 2001 +0000 Renamed to *.php from *.php3 per recommendations for PHP4. Changes to support new database API for MySQL and PostgreSQL support. SQL change, reword left join as predicate-based join. Don't assume area 1 exists, and don't force area to 0. Better SQL error handling; always present full HTML pages on errors. Don't quote numeric values in SQL. Different but equivalent fix as 0.9pre2 for I18 time units and weekday names. Enhancements to support up to 10 site-configured meeting types. Enhancement to 0.0pre2 fix so week can start on any day. HTML fixups: quote tag attributes where needed by HTML standard. Don't use stripslashes on database records; the extra backslashes this was meant to remove should not have been in there in the first place. Remove code which tried to intelligently report start and end date and time based on duration. Sometimes it omitted the end date when it should have been there, for example a 4 hour meeting which crossed midnight. Now, always report both date and time for both start and end. web/view_entry.php (new) | 172 +++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) commit 3f53b31d9 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:40:23 2001 +0000 Moved to web/view_entry.php view_entry.php3 (gone) | 199 --------------------------------------- 1 file changed, 199 deletions(-) commit 99d47a485 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:40:07 2001 +0000 If $area is supplied to the script, pass it on to the day.php script, so that date changes using the footer do not switch to the first area. Changed to display 14 rather than 15 days (6 back rather than 7), which seems to fit on the screen better. Separate the days with " | " rather than comma, and don't put one after the last date. Moved end of HTML tags into this script instead of all those which include it. Added 2 new rows of links, to new weekly and monthly views. web/trailer.inc (new) | 66 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) commit 805857e2d Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:40:02 2001 +0000 Moved to web/trailer.inc trailer.inc (gone) | 31 ------------------------------- 1 file changed, 31 deletions(-) commit 758ce25b4 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:39:47 2001 +0000 Moved to web/ lang.sv => web/lang.sv | 0 style.inc => web/style.inc | 0 2 files changed, 0 insertions(+), 0 deletions(-) commit 2e3485740 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:39:30 2001 +0000 HTML fixups: quote tag attributes where needed by HTML standard. Fix other HTML syntax errors as reported by weblint. Rewrote authentication section, since not everyone will use LDAP. Add full explanation of repeat types, including new "Monthly, corresponding day" which is not at all obvious. Generalize text on Internal/External to include configurable types. Remove "why are room columns different widths" because they no longer are. Add PostgreSQL info to existing MySQL info. Generalize platform text: might not be running on Linux. web/site_faq.html (new) | 181 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) commit d84ebcc5e Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:39:23 2001 +0000 Moved to web/site_faq.html site_faq.html (gone) | 163 ----------------------------------------- 1 file changed, 163 deletions(-) commit dfe664cfd Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:39:06 2001 +0000 Renamed to *.php from *.php3 per recommendations for PHP4. Changes to support new database API for MySQL and PostgreSQL support. Remove unneeded mrbs_auth.inc - this module does not authenticate. Don't assume area 1 exists. Remove unused load_user_preferences(). Use new slashes/unslashes calls to fix escaping independent of magic_quoting. When search_str is used in next/previous links, use URL encoding. Do HTML escaping on Name and Description in results. Removed extra database connection calls. To just get the match count, use SQL COUNT(*); don't need all the rows and don't need to sort them. HTML syntax fixes (weblint). Let trailer.inc output the end HTML tags. Quote strings used as array subscripts, except within quoted strings. Remove bgcolor from table headers so it is readable without CSS (John Beranek). web/search.php (new) | 137 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) commit 880dffa40 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:38:59 2001 +0000 Moved to web/search.php search.php3 (gone) | 154 ------------------------------------------- 1 file changed, 154 deletions(-) commit 20893fe23 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:38:42 2001 +0000 Added $repignore argument to mrbsCheckFree, for the Repeat ID to ignore if checking a replacement for a series. This avoids mrbsCheckFree from having to look up the repeat id for each entry it checks, when it is asked to check each entry in a proposed series, saving a lot of database queries. Optimize query predicate for checking for overlap, from: ($starttime <= start_time AND $endtime > start_time) OR ($endtime >= end_time AND $starttime < end_time ) OR ($starttime >= start_time AND $endtime <= end_time ) to: start_time < $endtime AND end_time > $starttime This can be proven equivalent except for the regressive case where all four values are equal. Changes to support new database API for MySQL and PostgreSQL support. HTML fixups: quote tag attributes where needed by HTML standard. Use new slashes/unslashes calls to fix escaping independent of magic_quoting. Don't quote numeric values in SQL. New same_day_next_month() for new "monthly, corresponding day" repeat. Added new repeat type 5 for monthly repeat on same weekday and week number. Fix for weekly repeat starting Sat (equivalent but different fix was in 0.9pre2). web/mrbs_sql.inc (new) | 342 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 342 insertions(+) commit 044ebea23 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:38:34 2001 +0000 Moved to web/mrbs_sql.inc mrbs_sql.inc (gone) | 354 ------------------------------------------ 1 file changed, 354 deletions(-) commit f7d253f24 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:38:19 2001 +0000 Quote HTML tag attributes where needed by HTML standard. web/mrbs_auth.inc (new) | 77 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) commit 24923140f Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:38:13 2001 +0000 Moved to web/mrbs_auth.inc mrbs_auth.inc (gone) | 77 ------------------------------------------ 1 file changed, 77 deletions(-) commit 2cbe3801d Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:37:58 2001 +0000 Strip CRs (fromdos). Minor syntax fixes (unneeded ;'s removed) Added new styles for table cells with alternate justification to make better-looking forms: TD.CR TD.CL TD.BR TD.BL TD.TR TD.TL for Center/Bottom/Top+Left/Right. Added new styles for new entry types: TD.A through TD.J for types A-J, (I and E were there before), with new colors chosen from Web Palette. Added generic font family "sans-serif" as alternative to Arial, Verdana. New styles for monthly view; because styles seem to override <big> etc.? web/mrbs.css (new) | 68 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) commit 022d89f9d Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:37:52 2001 +0000 Moved to web/mrbs.css mrbs.css (gone) | 52 ----------------------------------------------- 1 file changed, 52 deletions(-) commit 906a74708 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:37:36 2001 +0000 Changes for other files being renamed *.php3 to *.php. Generalize $weekstarts (added in 0.9pre2) to allow week to start with any day. Fix invalid HTML with <font> not closed on current day's number. web/mincals.inc (new) | 177 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) commit d172c82b2 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:37:29 2001 +0000 Moved to web/mincals.inc mincals.inc (gone) | 176 ------------------------------------------- 1 file changed, 176 deletions(-) commit 6607c023d Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:37:13 2001 +0000 Quote strings used as array subscripts, except within quoted strings. Comments changed per renaming from *.php3 to *.php. Fix typo "lans" => "lang". Strip CRs (fromdos). web/lang.de (new) | 66 ++++++++++++++++++++++++++++++++++++++++++ web/lang.fr (new) | 63 ++++++++++++++++++++++++++++++++++++++++ web/lang.ja (new) | 62 +++++++++++++++++++++++++++++++++++++++ web/lang.nl (new) | 62 +++++++++++++++++++++++++++++++++++++++ web/lang.zh-tw (new) | 62 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 315 insertions(+) commit 6ed6c8e1d Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:37:08 2001 +0000 Moved to web/lang.zh-tw lang.zh-tw (gone) | 62 --------------------------------------------- 1 file changed, 62 deletions(-) commit 1c4e1e275 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:36:27 2001 +0000 Moved to web/lang.nl lang.nl (gone) | 62 ------------------------------------------------ 1 file changed, 62 deletions(-) commit 659c5c3e6 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:36:06 2001 +0000 Moved to web/lang.ja lang.ja (gone) | 62 ------------------------------------------------ 1 file changed, 62 deletions(-) commit 24519990d Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:35:43 2001 +0000 Moved to web/lang.fr lang.fr (gone) | 63 ------------------------------------------------ 1 file changed, 63 deletions(-) commit 33fef66e2 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:35:27 2001 +0000 Quote strings used as array subscripts, except within quoted strings. Comments changed per renaming from *.php3 to *.php. Fix typo "lans" => "lang". Fix typos: missing quotes on a few of the value strings, e.g. rep_type_1. Strip CRs (fromdos). web/lang.es (new) | 90 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) commit c81705935 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:35:20 2001 +0000 Moved to web/lang.es lang.es (gone) | 90 ------------------------------------------------ 1 file changed, 90 deletions(-) commit 0142fb858 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:35:03 2001 +0000 Quote strings used as array subscripts, except within quoted strings. Comments changed per renaming from *.php3 to *.php. New entry: rep_type_5 for new repeat type "Monthly, corresponding day". New entries for new Report function. Strip CRs (fromdos). web/lang.en (new) | 102 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) commit 5b75f40e6 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:34:56 2001 +0000 Moved to web/lang.en lang.en (gone) | 92 ------------------------------------------------ 1 file changed, 92 deletions(-) commit ed6761508 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:34:34 2001 +0000 Moved to web/lang.de lang.de (gone) | 66 ------------------------------------------------ 1 file changed, 66 deletions(-) commit f1988488a Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:34:16 2001 +0000 Account for files renamed from *.php3 to *.php. web/index.php (new) | 9 +++++++++ 1 file changed, 9 insertions(+) commit 812724625 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:34:11 2001 +0000 Moved to web/index.php index.php3 (gone) | 9 --------- 1 file changed, 9 deletions(-) commit 53a09497e Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:33:56 2001 +0000 Renamed to *.php from *.php3 per recommendations for PHP4. Changes to support new database API for MySQL and PostgreSQL support. Remove unused load_user_preferences(). New string variable for MRBS version, for display. No, it doesn't belong in config.inc because that has site customization. Don't assume area 1 exists. Add new "About" section to report MRBS version, database system and version, and host system type. Remove non-standard "subject=" param from mailto: URL. Trailer now does HTML end tags. web/help.php (new) | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) commit 59204aaf5 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:33:50 2001 +0000 Moved to web/help.php help.php3 (gone) | 34 ---------------------------------- 1 file changed, 34 deletions(-) commit 9665f2caf Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:33:33 2001 +0000 Remove include of config.inc, since all main scripts already include it. Account for file renames from *.php3 to *.php. In <TD> valign=center is not legal; removed. HTML fixups: quote tag attributes where needed by HTML standard. Fix other HTML syntax errors as reported by weblint. In print_header: Style sheet must go inside HTML head. Don't pass area ID along if it wasn't supplied in the first place. Add "Report" button. Removed unused functions: get_sunday_before print_date_entries display_unapproved_events display_time mysql_date_to_str hextoint decode_string encode_string load_user_preferences get_web_browser In toTimeString, internationalize time units. Fix to day_name() added at 0.9pre2 - year was missing. New function fatal_error() to report errors in a properly-formed HTML document; this is used only with unexpected errors like bad DBMS returns. New functions slashes() and unslashes(); these are wrappers for addslashes() and stripslashes() which account for PHP magic quoting config. New function get_default_area because there might not be an area with ID 1. web/functions.inc (new) | 197 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 197 insertions(+) commit d0bc41d8b Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:33:26 2001 +0000 Moved to web/functions.inc functions.inc (gone) | 373 ----------------------------------------- 1 file changed, 373 deletions(-) commit c1fe63ec1 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:33:09 2001 +0000 Renamed to *.php from *.php3 per recommendations for PHP4. Changes to support new database API for MySQL and PostgreSQL support. If area isn't defined; don't use 0, get a real area ID. Quote strings used as array subscripts, except within quoted strings. Round up duration to next multiple of $resolution, not 30, minutes. Don't allow 0-minute bookings; make them $resolution minutes. Recode building repeat day list to avoid PHP undefined variable warnings. HTML fixups: quote tag attributes where needed by HTML standard. Trailer now outputs end HTML tags, so remove them. Supply repeat_id to mrbsCheckFree so it doesn't have to do a query for each requested slot in the series. Acquire and hold a mutex database lock while checking that the requested slots are free and then booking them, to prevent double-booking from races. Always set "$all" flag to mrbsDelEntry() to have it delete modified entries in the series too. This fixes one of the "duplicate entry after modification" bugs. web/edit_entry_handler.php (new) | 188 +++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) commit 6dfd8155f Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:33:01 2001 +0000 Moved to web/edit_entry_handler.php edit_entry_handler.php3 (gone) | 187 ------------------------------- 1 file changed, 187 deletions(-) commit 9a42df22a Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:32:43 2001 +0000 Renamed to *.php from *.php3 per recommendations for PHP4. Changes to support new database API for MySQL and PostgreSQL support. Don't assume area 1 exists, and don't force area to 0. Don't use stripslashes on database records. Better SQL error handling; always present full HTML pages on errors. Account for toTimeString now returning dur_units already I18N. Improve form appearance by justifying labels right, entry boxes left. Enhancements to support up to 10 site-configured meeting types. For weekly repeat, honor $weekstarts and display I18N day names (2 places). Trailer now outputs end HTML tags, so remove them. web/edit_entry.php (new) | 316 +++++++++++++++++++++++++++++++++++++ 1 file changed, 316 insertions(+) commit bca7d16ee Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:32:35 2001 +0000 Moved to web/edit_entry.php edit_entry.php3 (gone) | 320 --------------------------------------- 1 file changed, 320 deletions(-) commit 3647a565a Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:32:18 2001 +0000 Renamed to *.php from *.php3 per recommendations for PHP4. Changes to support new database API for MySQL and PostgreSQL support. Don't quote numeric values in SQL. Remove unused load_user_preferences(). Use isset() and empty() to avoid PHP info warnings on undefined vars. If capacity is missing, use zero, to avoid an SQL syntax error. Use new slashes/unslashes calls to fix escaping independent of magic_quoting. Don't assume area 1 exists. HTML fixups: quote tag attributes where needed by HTML standard. Fix other HTML syntax errors as reported by weblint. Use htmlspecialchars to properly handle HTML special chars in names and descriptions. web/edit_area_room.php (new) | 107 +++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) commit 2fcf764cb Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:32:12 2001 +0000 Moved to web/edit_area_room.php edit_area_room.php3 (gone) | 93 ------------------------------------ 1 file changed, 93 deletions(-) commit 2fb82347b Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:31:55 2001 +0000 Renamed to *.php from *.php3 per recommendations for PHP4. Call mrbsDelEntry inside an SQL transaction (if the database supports it) to improve PostgreSQL performance when deleting a series. web/del_entry.php (new) | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) commit dd242abfd Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:31:50 2001 +0000 Moved to web/del_entry.php del_entry.php3 (gone) | 26 -------------------------- 1 file changed, 26 deletions(-) commit 4d0ae476d Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:31:33 2001 +0000 Renamed to *.php from *.php3 per recommendations for PHP4. Changes to support new database API for MySQL and PostgreSQL support. web/del.php (new) | 97 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) commit a96143915 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:31:28 2001 +0000 Moved to web/del.php del.php3 (gone) | 98 ----------------------------------------------- 1 file changed, 98 deletions(-) commit 3f1bce82f Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:31:10 2001 +0000 Renamed to *.php from *.php3 per recommendations for PHP4. Remove unused load_user_preferences(). Changes to support new database API for MySQL and PostgreSQL support. Better SQL error handling; always present full HTML pages on errors. Don't assume area 1 exists; get a real area ID if needed. Order area names alphabetically in the link list. Quote strings used as array subscripts, except within quoted strings. Do HTML escaping of area names in link list to allow special chars. Do HTML escaping of room names in table headers. HTML fixups: quote tag attributes where needed by HTML standard. Fix other HTML syntax errors as reported by weblint. Don't use stripslashes on records read from database. Don't fill in slots in the map before start of day or after end of day. Make room columns equal width. Don't just append timetohighlight to REQUEST_URI or it gets longer each time. Add width & height to new.gif icon, works better with images off (John Beranek). Added current date header above calendar (John Beranek). After the first slot, put a double quote (") ditto mark in all cells below, where the entry continues, to help if colors are off or invisible. Use new config variable $eveningends_minutes to calculate end of day; this also allows full 24-hour days with < 1 hr resolution. Move entry type color key to the bottom. Expand it to allow for up to 10 types, putting no more than 5 on one line. Rewrote the main SQL query (note: baseline was 0.9pre1, not 0.9pre2). Don't ask for fields we aren't going to use. Replace left join with better-supported predicate-based join. Rewrote the predicate to select entries based on date range, from: < start_time BETWEEN $am7 AND $pm7 OR < end_time BETWEEN $am7 AND $pm7 OR < $am7 BETWEEN start_time AND end_time to: > start_time <= $pm7 AND end_time > $am7 which is equivalent but faster. Trailer now outputs end HTML tags, so remove them. web/day.php (new) | 228 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+) commit 13d0a0420 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:31:03 2001 +0000 Moved to web/day.php day.php3 (gone) | 238 ---------------------------------------------- 1 file changed, 238 deletions(-) commit fc508474b Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:30:47 2001 +0000 Moved to web/ auth_ip.inc => web/auth_ip.inc | 0 1 file changed, 0 insertions(+), 0 deletions(-) commit 5eed35847 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:30:28 2001 +0000 Renamed to *.php from *.php3 per recommendations for PHP4. Changes to support new database API for MySQL and PostgreSQL support. Remove unused load_user_preferences(). Get area name from database if an area is selected but name isn't know. Do HTML quoting on area names, room names, room description. Better SQL error handling; always present full HTML pages on errors. Use new unslashes call to fix escaping independent of magic_quoting. web/admin.php (new) | 128 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) commit 7a9089840 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:30:22 2001 +0000 Moved to web/admin.php admin.php3 (gone) | 111 -------------------------------------------- 1 file changed, 111 deletions(-) commit 5d64b4a5b Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:30:05 2001 +0000 Renamed to *.php from *.php3 per recommendations for PHP4. Changes to support new database API for MySQL and PostgreSQL support. Use new slashes/unslashes calls to fix escaping independent of magic_quoting. If capacity is missing, use zero, to avoid an SQL syntax error. Better SQL error handling; always present full HTML pages on errors. web/add.php (new) | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) commit 153fa8278 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:29:59 2001 +0000 Moved to web/add.php add.php3 (gone) | 36 ------------------------------------ 1 file changed, 36 deletions(-) commit 65e05b504 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:29:43 2001 +0000 Replaced with tables.pg.sql and tables.my.sql tables.sql (gone) | 83 --------------------------------------------- 1 file changed, 83 deletions(-) commit 3c0701a8c Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:29:34 2001 +0000 Replaced with per-database system connect script connect.inc (gone) | 18 ------------------ 1 file changed, 18 deletions(-) commit 0eb59350f Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:29:21 2001 +0000 Reorganize into logical sections, marked out my comment blocks. Renamed database parameters from mysql_{host,login,password,database} to db_{host,login,password,database} to generalize, since they are not MySQL specific. Added optional db_nopersist, for persistent connections. Removed unneeded block of code to check range on morningstarts/eveningends. Added eveningends_minutes with comments, needed for full 24 hour view or to end with a slot which does not start at an exact hour. Changed comments on $weekstarts; it now works for any day 0-6. Quote strings used as array subscripts, except within quoted strings. Added default_report_days for default report function date range. Changed default authentication parameters so only localhost is Administrator. Comment out inactive LDAP parameters. Bug fix taking first language from HTTP_ACCEPT_LANGUAGE if only had 1. Add comments and 10 entry types A-J with only E and I available by default. Be sure PHP magic_quotes_runtime isn't on. web/config.inc (new) | 160 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) commit e053ba211 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:29:15 2001 +0000 Moved to web/config.inc config.inc (gone) | 110 -------------------------------------------- 1 file changed, 110 deletions(-) commit 257aab5d9 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:29:00 2001 +0000 Use escapeshellcmd() on username and password to prevent exec fraud. web/auth_ext.inc (new) | 97 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) commit 80a777945 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:28:55 2001 +0000 Moved to web/auth_ext.inc auth_ext.inc (gone) | 97 ------------------------------------------- 1 file changed, 97 deletions(-) commit cb782b23a Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:28:38 2001 +0000 Quote strings used as array subscripts, except within quoted strings. web/auth_ldap.inc (new) | 107 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) commit 21f789f6f Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:28:33 2001 +0000 Moved to web/auth_ldap.inc auth_ldap.inc (gone) | 107 ----------------------------------------- 1 file changed, 107 deletions(-) commit 5d77b55c1 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:28:18 2001 +0000 Remove beta release remark, add info on changes to database quoting. UPGRADE | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) commit f0269820d Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:28:12 2001 +0000 Editorial changes and updates to reflect new packaging and support for PostgreSQL. README | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) commit 3d38c181e Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:28:05 2001 +0000 Changes to reflect file renames from *.php3 to *.php. LANGUAGE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit fa100e171 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:27:57 2001 +0000 Updated with information on PostgreSQL database, versions tested with, connection pooling and database server limits. Changes to describe new web/ subdirectory; don't unpack into web doc root. Add info on preserving config.inc before upgrade. Minor editorial changes. Added info on database maintenance. Updated information on changes to config.inc INSTALL | 228 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 187 insertions(+), 41 deletions(-) commit 570654f12 Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:27:49 2001 +0000 Added changes after 0.9pre1 and 0.9.1 and 0.9.2. ChangeLog | 140 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 123 insertions(+), 17 deletions(-) commit 1e6584a1d Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:27:37 2001 +0000 Quote strings used as array subscripts, except within quoted strings. Explain IP address as "username". Explain new defaults: only localhost is admin. Reference to additional Netware authentication info in new README.nwauth. AUTHENTICATION | 80 +++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 42 deletions(-) commit 4df20cfba Author: L J Bayuk <lbayuk@users.sourceforge.net> Date: Sat Feb 10 22:24:26 2001 +0000 Moved to web/ .htaccess => web/.htaccess | 0 new.gif => web/new.gif | Bin 2 files changed, 0 insertions(+), 0 deletions(-) commit 11c555cbe Author: Daniel <nambit@users.sourceforge.net> Date: Fri Feb 9 20:08:31 2001 +0000 Change release date ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f499e5768 Author: Daniel <nambit@users.sourceforge.net> Date: Thu Feb 8 22:44:45 2001 +0000 remove 'weekstarts' functionality ChangeLog | 3 +++ config.inc | 3 --- mincals.inc | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) commit 23b4b3da5 (tag: mrbs-0-9-1) Author: unknown <devnull@localhost> Date: Sun Feb 4 21:56:56 2001 +0000 This commit was manufactured by cvs2svn to create branch 'mrbs-0-9-1xp'. commit 300b87c52 Author: Daniel <nambit@users.sourceforge.net> Date: Sun Feb 4 21:56:55 2001 +0000 calendar day was off by one ChangeLog | 3 +++ 1 file changed, 3 insertions(+) commit 90b7f9e2c Author: Daniel <nambit@users.sourceforge.net> Date: Sun Feb 4 21:53:23 2001 +0000 Fixed bug where days displayed wrong in mincals mincals.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 302b16c29 Author: Daniel <nambit@users.sourceforge.net> Date: Sun Feb 4 21:40:03 2001 +0000 release 0.9 ChangeLog | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) commit f94a3a9e2 Author: Daniel <nambit@users.sourceforge.net> Date: Sun Jan 28 17:42:33 2001 +0000 small note to say no db changes since 0.8 UPGRADE | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit 97da5088a Author: Daniel <nambit@users.sourceforge.net> Date: Sun Jan 28 17:15:57 2001 +0000 Comments for bo's fixes ChangeLog | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit e1fff411a Author: Bo Kleve <bokleve@users.sourceforge.net> Date: Wed Jan 24 23:37:00 2001 +0000 Add control over start of week day (Sunday or Monday) and how the days are presented (Jul 19 or 19 Jul). Defaults are Sunday and month date. Also fix so that day names are shown in selected language and that the translation of hours, minutes, ... are according to the lang file. config.inc | 34 ++++++++++++++++++++++++---------- edit_entry.php3 | 26 +++++++++++++++++++------- functions.inc | 8 ++++++++ mincals.inc | 14 +++++++++++--- trailer.inc | 3 ++- view_entry.php3 | 20 ++++++++++++-------- 6 files changed, 76 insertions(+), 29 deletions(-) commit 44919c7df Author: Bo Kleve <bokleve@users.sourceforge.net> Date: Wed Jan 24 00:16:08 2001 +0000 Added Swedish language file. Modifications to admin.php3 Add possibility to edit area and room descriptions edit_area_room.php3 used with modified admin.php3 lang.sv Added Swedish language file day.php3 Fix all day bookings, escape characters in text and duplicate mini- calendars when nonexistent date is selected. Show rooms sorted by names. edit_entry.php3 Fix escape characters showing in text edit_entry_handler.php3 Fix duplicate entries when changing a booking mrbs_sql.inc Modifying an entry allowed for intruding on other bookings. Weekly bookings could not be made for Sundays if Saturdays also booked. view_entry.php3 Fix escape characters showing in text admin.php3 | 8 ++-- day.php3 | 12 +++-- edit_area_room.php3 (new) | 93 +++++++++++++++++++++++++++++++++++++ edit_entry.php3 | 6 +-- edit_entry_handler.php3 | 11 +++-- lang.sv (new) | 93 +++++++++++++++++++++++++++++++++++++ mrbs_sql.inc | 4 +- view_entry.php3 | 4 +- 8 files changed, 211 insertions(+), 20 deletions(-) commit 87af1cf59 Author: Daniel <nambit@users.sourceforge.net> Date: Wed Nov 29 20:50:53 2000 +0000 Claus roxen stuff ChangeLog | 3 +++ 1 file changed, 3 insertions(+) commit bf99afd79 Author: Daniel <nambit@users.sourceforge.net> Date: Wed Nov 29 20:42:21 2000 +0000 Claus Jeppesen's roxen stuff ROXEN (new) | 41 ++++++ auth_cookie_ext.inc (new) | 246 ++++++++++++++++++++++++++++++++++++ mrbs.css | 3 + 3 files changed, 290 insertions(+) commit f8f10250a Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Wed Sep 13 10:28:56 2000 +0000 Better text lang.en | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit fcfde2a5e Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Wed Sep 13 09:00:13 2000 +0000 Better searching search.php3 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 54e401561 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Fri Sep 8 08:44:04 2000 +0000 Now displays the room + area view_entry.php3 | 145 +++++++++++++++++++++++++++++++--------------- 1 file changed, 98 insertions(+), 47 deletions(-) commit 05e202090 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Fri Sep 8 08:24:52 2000 +0000 Another bug in the repeat entry code edit_entry_handler.php3 | 2 +- mrbs_sql.inc | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) commit cea928a08 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Fri Sep 8 08:23:47 2000 +0000 Added a "room" entry auth_ext.inc | 1 - lang.en | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) commit e0aab502f Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Tue Sep 5 20:10:21 2000 +0000 Language updates view_entry.php3 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 85f400fa8 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Tue Sep 5 09:33:31 2000 +0000 One less warning mrbs_auth.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 237828103 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Mon Sep 4 08:20:30 2000 +0000 Updated by "Dised Sistemas <dised@arrakis.es>" lang.es | 103 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 65 insertions(+), 38 deletions(-) commit 5bc79f9c4 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Mon Sep 4 08:19:02 2000 +0000 Added some sanity checks config.inc | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) commit 29e05ff67 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Fri Aug 18 11:37:27 2000 +0000 Should work now mrbs_sql.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit c1b30394b Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Fri Aug 18 11:26:04 2000 +0000 Why did I take this outls help.php3 | 1 + 1 file changed, 1 insertion(+) commit 7a925e486 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Fri Aug 18 11:04:08 2000 +0000 Put "<?=" back to "<? echo" for compatibility edit_entry.php3 | 14 +++++++------- functions.inc | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) commit 912d4941c Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Fri Aug 18 10:53:28 2000 +0000 Put "<?=" back to "<? echo" for compatibility edit_entry.php3 | 64 +++++++++++++++++++++++------------------------ functions.inc | 24 +++++++++--------- 2 files changed, 44 insertions(+), 44 deletions(-) commit b82467a54 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Fri Aug 18 08:15:20 2000 +0000 More PHP warning fixes auth_ip.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 03201f268 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Aug 17 20:08:50 2000 +0000 More PHP warning fixes admin.php3 | 6 +++--- search.php3 | 2 +- view_entry.php3 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) commit 3b56d19c9 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Aug 17 20:06:36 2000 +0000 More PHP warning fixes edit_entry_handler.php3 | 5 ++++- search.php3 | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) commit 27fa0c1c0 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Aug 17 19:56:22 2000 +0000 More PHP warning fixes auth_ext.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit c61dcca73 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Aug 17 19:37:05 2000 +0000 More PHP warning fixes edit_entry.php3 | 2 +- edit_entry_handler.php3 | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) commit 4f4480482 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Aug 17 19:30:14 2000 +0000 More PHP waning fixes edit_entry.php3 | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) commit 430c2f7c0 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Aug 17 14:59:54 2000 +0000 Major change to remove most of the warnings from the code admin.php3 | 10 ++- auth_ext.inc | 4 +- config.inc | 18 ++--- day.php3 | 150 +++++++++++++++++++++++--------------- del.php3 | 17 ++++- del_entry.php3 | 9 ++- edit_entry.php3 | 96 ++++++++++++++---------- edit_entry_handler.php3 | 28 ++++--- functions.inc | 24 +++--- help.php3 | 14 +++- lang.en | 130 ++++++++++++++++----------------- mincals.inc | 3 +- mrbs_auth.inc | 10 +-- mrbs_sql.inc | 37 ++++++---- search.php3 | 43 +++++++---- style.inc | 2 +- trailer.inc | 2 +- view_entry.php3 | 15 +++- 18 files changed, 364 insertions(+), 248 deletions(-) commit 4217df975 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Aug 10 12:45:09 2000 +0000 better ldapsearch support AUTHENTICATION | 5 ++++- auth_ldapsearch.pl | 18 ++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) commit efedc9a59 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Aug 10 09:18:47 2000 +0000 Better language support lang.en | 12 ++++++++++++ search.php3 | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 12 deletions(-) commit 8f7675cb7 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Aug 10 09:02:40 2000 +0000 Put "Meeting room booking system" into the subject line automagically help.php3 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 76c735884 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Aug 10 09:01:44 2000 +0000 Get it to behave nicely at the beginning and end of the search search.php3 | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) commit 0d164afeb Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Aug 10 09:00:58 2000 +0000 get the links all working site_faq.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 59a8d13d1 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Wed Aug 9 17:35:34 2000 +0000 a few final updates AUTHENTICATION | 4 ++-- ChangeLog | 4 ++-- README | 9 +++------ 3 files changed, 7 insertions(+), 10 deletions(-) commit f02f31653 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Wed Aug 9 17:24:29 2000 +0000 the ultimate one liner mrbs_auth.inc | 2 ++ 1 file changed, 2 insertions(+) commit c00fa0ba7 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Wed Aug 9 17:04:41 2000 +0000 We have a nice banner now, no need for this head.gif (gone) | Bin 4304 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) commit 2289d621f Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Wed Aug 9 17:02:39 2000 +0000 looks better now mrbs.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit f9004d4f1 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Wed Aug 9 17:00:57 2000 +0000 added help finally help.php3 (new) | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) commit 16e01ef73 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Wed Aug 9 13:13:58 2000 +0000 A big change of most things AUTHENTICATION | 11 ++- ChangeLog | 9 ++ INSTALL | 4 + add.php3 | 19 ++-- admin.php3 | 38 +++++--- auth_ldapsearch.pl (new +x) | 16 ++++ config.inc | 8 ++ day.php3 | 27 ++---- del.php3 | 67 +++++++++----- del_entry.php3 | 17 +--- edit_entry.php3 | 68 +++++--------- edit_entry_handler.php3 | 52 ++--------- functions.inc | 67 ++++++++++++++ lang.en | 1 - mrbs_auth.inc | 33 ++++++- search.php3 (new) | 144 ++++++++++++++++++++++++++++++ site_faq.html (new) | 163 ++++++++++++++++++++++++++++++++++ style.inc | 1 - view_entry.php3 | 18 ++-- 19 files changed, 579 insertions(+), 184 deletions(-) commit 7e9503c24 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Aug 3 15:00:29 2000 +0000 Improved the documentation a bit AUTHENTICATION | 7 ++++--- badpw.pl | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) commit 30a05d9df Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Tue Aug 1 12:25:09 2000 +0000 UI updates day.php3 | 4 ++-- functions.inc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) commit 2f395e0b9 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Tue Aug 1 11:50:04 2000 +0000 Was not passing the correct number of paremeters edit_entry_handler.php3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6f8dd6b2d Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Jul 27 09:54:35 2000 +0000 0.8.1 ChangeLog | 3 +++ 1 file changed, 3 insertions(+) commit 48141b047 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Jul 27 09:48:35 2000 +0000 Better handling of areas day.php3 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 0c4efd014 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Jul 27 09:36:26 2000 +0000 Better handling of areas del_entry.php3 | 3 ++- edit_entry_handler.php3 | 4 +++- mrbs_sql.inc | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) commit 1ada8baf2 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Wed Jul 26 18:35:23 2000 +0000 removed unused parameter mrbs_sql.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 954e3c08d Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Wed Jul 26 17:46:58 2000 +0000 Brings up an error if you try and create too many options config.inc | 4 ++-- edit_entry_handler.php3 | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-) commit 5bca7b1cc Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Wed Jul 26 16:49:20 2000 +0000 version 0.8 ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) commit de61f18c4 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Wed Jul 26 16:42:59 2000 +0000 Better repeat entry handling del_entry.php3 | 2 +- mrbs_sql.inc | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) commit 288da669e Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Wed Jul 26 16:32:18 2000 +0000 "Edit Series" works even if you did not modify the first entry edit_entry.php3 | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) commit 29d255e58 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Wed Jul 26 16:22:26 2000 +0000 Allow "Edit Series" to work. mrbs_sql.inc | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) commit 9ca6cb849 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Fri Jul 21 11:53:43 2000 +0000 Better year chooser. functions.inc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) commit 54dd9801f Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Jul 20 09:56:57 2000 +0000 new release ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) commit 8ce271140 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Jul 20 09:07:11 2000 +0000 Keep it in sync with the creation in "edit_entry_handler" view_entry.php3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bfb59477f Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Jul 20 09:06:03 2000 +0000 Nicer listing of conflicting entrys mrbs_sql.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit 5b520db67 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Jul 20 09:05:10 2000 +0000 Keeping in sync with the rest of the code lang.en | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit d33c1e44f Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Jul 20 09:04:05 2000 +0000 Various date/time handling improvements edit_entry_handler.php3 | 73 +++++++++++---------------------------- 1 file changed, 20 insertions(+), 53 deletions(-) commit 9a6135624 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Wed Jul 19 15:02:15 2000 +0000 Handle HTML chars in the users fields better view_entry.php3 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 7845e483c Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Wed Jul 19 15:01:13 2000 +0000 a few "copy+paste" problems trailer.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 864c04ab2 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Wed Jul 19 14:59:45 2000 +0000 Make small (0 hours) entrys work day.php3 | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) commit c612c9007 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Wed Jul 19 14:30:34 2000 +0000 Stop the repeat days from getting muddled up. edit_entry.php3 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 8559261ce Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Tue Jul 18 10:40:45 2000 +0000 CRLF conversion done commit c2247e067 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Tue Jul 18 10:23:54 2000 +0000 Better cleanup auth_ldap.inc | 5 +++++ 1 file changed, 5 insertions(+) commit cc8aef5cc Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Tue Jul 18 10:22:43 2000 +0000 Nicer page displayed when there is a conflicting entry edit_entry_handler.php3 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) commit b0a9dd2f4 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Tue Jul 18 10:21:30 2000 +0000 removed some old debugging code day.php3 | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) commit 110881924 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Mon Jul 17 13:48:49 2000 +0000 Added a new LDAP authenticatication method. AUTHENTICATION | 27 +++++++++-- auth_ldap.inc (new) | 102 ++++++++++++++++++++++++++++++++++++++++++ config.inc | 8 ++++ 3 files changed, 133 insertions(+), 4 deletions(-) commit 00e871e76 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Mon Jul 17 08:00:13 2000 +0000 Fix for older versions of PHP (PRE 4) mrbs_sql.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 262c60a8f Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Jul 13 10:53:11 2000 +0000 Updated ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) commit 19b3e4679 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Jul 13 10:35:22 2000 +0000 Better colision detection. edit_entry_handler.php3 | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) commit c76fae69f Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Jul 13 10:23:41 2000 +0000 Beginning of database independence mrbs_sql.inc (new) | 329 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 329 insertions(+) commit d09e7ff74 Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Thu Jul 13 10:22:00 2000 +0000 General time/date handling updates. day.php3 | 17 +++++++++-------- mincals.inc | 8 ++++---- trailer.inc | 33 ++++++++++++++++++--------------- 3 files changed, 31 insertions(+), 27 deletions(-) commit 3a081720b Author: Sam Mason <sam_mason@users.sourceforge.net> Date: Wed Jul 12 15:25:16 2000 +0000 A nice big change to implement "Repeat bookings". + a few other minor changes. AUTHENTICATION | 5 +- ChangeLog | 10 +- LANGUAGE | 3 + README | 44 ++++---- UPGRADE | 11 +- config.inc | 5 +- day.php3 | 8 +- del_entry.php3 | 39 ++----- edit_entry.php3 | 211 ++++++++++++++++++++++++++++---------- edit_entry_handler.php3 | 181 +++++++++++++++++++------------- functions.inc | 41 +++++++- lang.de | 9 +- lang.en | 17 +++ lang.fr (new) | 63 ++++++++++++ mincals.inc | 12 +-- mrbs_auth.inc | 7 +- tables.sql | 134 ++++++++++++------------ view_entry.php3 | 108 ++++++++++++++----- 18 files changed, 610 insertions(+), 298 deletions(-) commit 43bed0edb Author: Daniel <nambit@users.sourceforge.net> Date: Thu Jun 22 11:30:49 2000 +0000 Fixed bug where the wrong months would be shown sometimes ChangeLog | 3 +++ mincals.inc | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) commit 23c0ebb9f Author: Daniel <nambit@users.sourceforge.net> Date: Wed Jun 21 13:53:35 2000 +0000 LDAP Auth AUTHENTICATION | 24 ++++++++++++++++++++++++ ChangeLog | 3 +++ auth_ldap.pl (new +x) | 13 +++++++++++++ 3 files changed, 40 insertions(+) commit fb34ab421 Author: Daniel <nambit@users.sourceforge.net> Date: Wed Jun 21 11:43:31 2000 +0000 Release 0.8-pre2 ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b25c2246c Author: Daniel <nambit@users.sourceforge.net> Date: Wed Jun 21 11:42:08 2000 +0000 Changes for netware auth AUTHENTICATION | 35 ++++++++++++++++++++++++++++++----- ChangeLog | 1 + auth_ext.inc | 4 +++- 3 files changed, 34 insertions(+), 6 deletions(-) commit e22b0b59d Author: Daniel <nambit@users.sourceforge.net> Date: Wed Jun 21 10:53:33 2000 +0000 Updated for 0.8-pre1 lang.zh-tw | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) commit 09b56b9d4 Author: Daniel <nambit@users.sourceforge.net> Date: Wed Jun 21 07:18:25 2000 +0000 Added Spanish language file ChangeLog | 1 + LANGUAGE | 1 + lang.es (new) | 63 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+) commit 87df7979a Author: Daniel <nambit@users.sourceforge.net> Date: Wed Jun 21 07:14:31 2000 +0000 Added Dutch language file ChangeLog | 1 + LANGUAGE | 1 + lang.nl (new) | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+) commit c63ea8c37 Author: Daniel <nambit@users.sourceforge.net> Date: Tue Jun 20 08:46:33 2000 +0000 Rename auth.inc to mrbs_auth.inc to stop conflicts with phplib AUTHENTICATION | 2 +- ChangeLog | 1 + del_entry.php3 | 2 +- edit_entry.php3 | 2 +- edit_entry_handler.php3 | 2 +- auth.inc => mrbs_auth.inc | 0 view_entry.php3 | 2 +- 7 files changed, 6 insertions(+), 5 deletions(-) commit 6ddcc16b2 Author: Daniel <nambit@users.sourceforge.net> Date: Mon Jun 19 08:30:05 2000 +0000 Added German language ChangeLog | 1 + LANGUAGE | 3 ++- lang.de (new) | 63 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) commit e8bf1a6af Author: Daniel <nambit@users.sourceforge.net> Date: Fri Jun 16 17:23:47 2000 +0000 Added Chinese language file ChangeLog | 4 ++++ LANGUAGE | 5 +++-- lang.en | 3 +++ lang.ja | 3 +++ lang.zh-tw (new) | 52 ++++++++++++++++++++++++++++++++++++++++++++++ style.inc | 1 + 6 files changed, 66 insertions(+), 2 deletions(-) commit 95f9806f6 Author: Daniel <nambit@users.sourceforge.net> Date: Fri Jun 16 08:36:54 2000 +0000 User-based authentication supported (see AUTHENTICATION) Better support for bookings spanning multiple days User can specify "Whole Day" bookings Units other than "Hours" are supported (Mins, Hours, Days, Weeks) Thanks to Sam Mason <smason@mtc.ricardo.com> for much of this AUTHENTICATION (new) | 179 ++++++++++++++++++++++++++++++++++++++ ChangeLog | 14 +-- FAQ (gone) | 28 ------ INSTALL | 2 + README | 2 + auth.inc (new) | 47 ++++++++++ auth_ext.inc (new) | 96 ++++++++++++++++++++ auth_ip.inc (new) | 47 ++++++++++ badpw.pl (new +x) | 25 ++++++ config.inc | 12 +++ del_entry.php3 | 53 ++++++++++- edit_entry.php3 | 91 ++++++++++++++----- edit_entry_handler.php3 | 54 ++++++++++-- functions.inc | 38 ++++++++ help_trailer.inc (gone) | 2 - lang.en | 12 ++- lang.ja | 14 ++- smb_auth.c (new) | 21 +++++ trailer.inc | 13 +-- view_entry.php3 | 42 ++++----- 20 files changed, 692 insertions(+), 100 deletions(-) commit 404d54edf Author: Daniel <nambit@users.sourceforge.net> Date: Wed Jun 14 09:07:31 2000 +0000 Meetings longer than one day show the name on following days ChangeLog | 3 +++ day.php3 | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) commit 40aaa1609 Author: Daniel <nambit@users.sourceforge.net> Date: Tue Jun 13 09:02:21 2000 +0000 Removed unused circle.gif circle.gif (gone) | Bin 58 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) commit 4031051d2 Author: Daniel <nambit@users.sourceforge.net> Date: Tue Jun 13 09:00:03 2000 +0000 Removed unused login.php3 login.php3 (gone) | 82 --------------------------------------------- 1 file changed, 82 deletions(-) commit 110d6f15a Author: Daniel <nambit@users.sourceforge.net> Date: Mon Jun 12 12:50:20 2000 +0000 0.7 release ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a0a6c50a7 Author: Daniel <nambit@users.sourceforge.net> Date: Mon Jun 12 12:43:45 2000 +0000 DB uses unixtime ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit bd48b14be Author: Daniel <nambit@users.sourceforge.net> Date: Mon Jun 12 12:42:04 2000 +0000 Changed DB to use unixtime rather than mysql date/time datatype. INSTALL | 6 ++++++ UPGRADE (new) | 7 +++++++ day.php3 | 8 ++++---- edit_entry.php3 | 2 +- edit_entry_handler.php3 | 12 +++++------ tables.sql | 11 +++++----- testdata.php3 | 13 ++++++------ upgrade.sql (new) | 43 +++++++++++++++++++++++++++++++++++++++ view_entry.php3 | 4 ++-- 9 files changed, 81 insertions(+), 25 deletions(-) commit b75e51785 Author: Daniel <nambit@users.sourceforge.net> Date: Mon Jun 12 10:28:22 2000 +0000 Support for strftime() ChangeLog | 1 + 1 file changed, 1 insertion(+) commit 860bd4c0c Author: Daniel <nambit@users.sourceforge.net> Date: Mon Jun 12 09:13:41 2000 +0000 Changes to strftime() rather than date() for some strings, so that locale support can be used. INSTALL | 12 +++++++++++- LANGUAGE | 17 +++++++++++------ config.inc | 10 ++++++++-- day.php3 | 7 ++++--- lang.en | 1 + mincals.inc | 18 +++++++++++------- trailer.inc | 2 +- view_entry.php3 | 16 ++++++++-------- 8 files changed, 55 insertions(+), 28 deletions(-) commit fb27204c7 Author: Daniel <nambit@users.sourceforge.net> Date: Fri Jun 9 18:16:31 2000 +0000 start move to locale-based time strings (strftime) config.inc | 13 +++++++++++++ day.php3 | 3 ++- mincals.inc | 6 +++--- 3 files changed, 18 insertions(+), 4 deletions(-) commit 609d3af3a Author: Daniel <nambit@users.sourceforge.net> Date: Tue Jun 6 16:55:38 2000 +0000 Change external meeting colour to something darker. The old one can only just be seen on an LCD panel mrbs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 035cfd68f Author: Daniel <nambit@users.sourceforge.net> Date: Mon Jun 5 15:23:43 2000 +0000 New code for three month calendars. Thanks to David Wilkinson, see http://www.cascade.org.uk/software/php/calendar/ ChangeLog | 4 +- mincals.inc | 230 ++++++++++++++++++++++++++++++++------------------ mrbs.css | 3 + 3 files changed, 154 insertions(+), 83 deletions(-) commit ecfd2bd8b Author: Daniel <nambit@users.sourceforge.net> Date: Mon Jun 5 11:31:16 2000 +0000 Fixed a couple of small bugs with the Internal/External colour support day.php3 | 3 ++- mrbs.css | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) commit fd54762fa Author: Daniel <nambit@users.sourceforge.net> Date: Sat Jun 3 18:56:09 2000 +0000 Internal and External meetings show in different colours ChangeLog | 5 +++-- day.php3 | 23 ++++++++++++++--------- mrbs.css | 5 +++-- 3 files changed, 20 insertions(+), 13 deletions(-) commit b05457926 Author: Daniel <nambit@users.sourceforge.net> Date: Wed May 31 21:47:38 2000 +0000 Update [time] lang.en | 1 - 1 file changed, 1 deletion(-) commit c10238345 Author: Daniel <nambit@users.sourceforge.net> Date: Tue May 30 18:49:50 2000 +0000 Japanese support lang.ja (new) | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) commit e6d3f9856 Author: Daniel <nambit@users.sourceforge.net> Date: Tue May 30 18:49:06 2000 +0000 Moved "resolution" to config file - so length of booking displayed can be varied ChangeLog | 1 + config.inc | 4 +++- day.php3 | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) commit d7ec5e62b Author: Daniel <nambit@users.sourceforge.net> Date: Tue May 30 18:41:33 2000 +0000 Japanese support ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit df3770c75 Author: Daniel <nambit@users.sourceforge.net> Date: Tue May 30 18:40:11 2000 +0000 Updates for Japanese lang.en | 1 + view_entry.php3 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) commit b036288cb Author: Daniel <nambit@users.sourceforge.net> Date: Mon May 29 17:16:43 2000 +0000 Moved language-specific strings into external file. ChangeLog | 1 + INSTALL | 8 +++++++ LANGUAGE (new) | 17 ++++++++++++++ admin.php3 | 5 ++-- config.inc | 13 +++++++++++ day.php3 | 12 +++++----- edit_entry.php3 | 25 ++++++++++---------- edit_entry_handler.php3 | 8 +++---- lang.en (new) | 48 +++++++++++++++++++++++++++++++++++++++ style.inc | 2 +- trailer.inc | 2 +- view_entry.php3 | 22 +++++++++--------- 12 files changed, 126 insertions(+), 37 deletions(-) commit 724d9dd16 Author: Daniel <nambit@users.sourceforge.net> Date: Sun May 28 19:28:06 2000 +0000 Added stuff about mySQL 3.23 not working INSTALL | 4 ++++ 1 file changed, 4 insertions(+) commit d220a8d37 Author: Daniel <nambit@users.sourceforge.net> Date: Sun May 28 15:22:29 2000 +0000 Removed useless TODO file TODO (gone) | 4 ---- 1 file changed, 4 deletions(-) commit b4fb1c123 Author: Daniel <nambit@users.sourceforge.net> Date: Sun May 28 15:12:56 2000 +0000 Fixed areas with no rooms causing major error messages ChangeLog | 4 ++ day.php3 | 109 ++++++++++++++++++++++++++++------------------------ 2 files changed, 63 insertions(+), 50 deletions(-) commit 5d2c03ba4 Author: Daniel <nambit@users.sourceforge.net> Date: Sun May 28 13:15:01 2000 +0000 Documentation update FAQ (new) | 28 ++++++++++++++++++++++++++++ README | 11 +++++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) commit 706863590 Author: Daniel <nambit@users.sourceforge.net> Date: Sat May 27 08:29:30 2000 +0000 Fixed bug in edit_entry_handler.php3 which made any booking made between the 1st and 9th of the month actually happen on the 1st of Jan for that year Fixed bug in day.php3 where any booking past midnight would not show up Related bug which meant that bookings longer than one day wouldn't be displayed. Fixed bug where editing a booking would default to today's date, not the booking's date Added .htaccess to protect .inc files Moved start and end of day config variables to config.inc .htaccess (new) | 4 ++++ ChangeLog | 16 +++++++++++++++- INSTALL | 7 +------ config.inc | 4 ++++ day.php3 | 9 +++++---- edit_entry.php3 | 22 +++++++++++----------- edit_entry_handler.php3 | 4 ++-- needed_files (gone) | 19 ------------------- 8 files changed, 42 insertions(+), 43 deletions(-) commit 8e0891ae1 Author: Daniel <nambit@users.sourceforge.net> Date: Sun May 21 11:08:40 2000 +0000 Admin added. Now OK to use ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) commit 31b349086 Author: Daniel <nambit@users.sourceforge.net> Date: Sun May 21 11:03:29 2000 +0000 First version of files needed for admin add.php3 (new) | 29 +++++++++++++++++++++ del.php3 (new) | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) commit 86a28f2ab Author: Daniel <nambit@users.sourceforge.net> Date: Sun May 21 11:02:10 2000 +0000 Various fixes and doc updates INSTALL | 35 +++---------- README | 74 ++++++++++++++------------- admin.php3 (new) | 90 +++++++++++++++++++++++++++++++++ edit_entry_handler.php3 | 14 ++--- meetingroomsystem.gif (gone) | Bin 710 -> 0 bytes tables.sql | 39 -------------- testdata.php3 | 2 +- 7 files changed, 146 insertions(+), 108 deletions(-) commit 6e9e854b5 Author: Daniel <nambit@users.sourceforge.net> Date: Sat May 20 21:43:29 2000 +0000 The system now works! There's no administration stuff, but the user pages are OK ChangeLog | 3 + TODO (new) | 4 + config.inc | 21 +---- day.php3 | 6 +- del_entry.php3 | 16 +--- edit_entry.php3 | 139 +++++---------------------- edit_entry_handler.php3 | 194 ++++++++++++-------------------------- 7 files changed, 98 insertions(+), 285 deletions(-) commit c53eabea8 Merge: 5d2350b99 50650434f Author: Daniel <nambit@users.sourceforge.net> Date: Wed May 3 22:41:26 2000 +0000 This commit was generated by cvs2svn to compensate for changes in r2, which included commits to RCS files with non-trunk default branches. commit 5d2350b99 Author: unknown <devnull@localhost> Date: Wed May 3 22:41:26 2000 +0000 Standard project directories initialized by cvs2svn. commit 50650434f (tag: start, origin/vendor) Author: Daniel <nambit@users.sourceforge.net> Date: Wed May 3 22:41:26 2000 +0000 Initial Import COPYING (new) | 339 ++++++++++++++++++++++++++++++++ ChangeLog (new) | 2 + INSTALL (new) | 87 ++++++++ README (new) | 51 +++++ circle.gif (new) | Bin 0 -> 58 bytes config.inc (new) | 36 ++++ connect.inc (new) | 18 ++ day.php3 (new) | 185 +++++++++++++++++ del_entry.php3 (new) | 23 +++ edit_entry.php3 (new) | 269 +++++++++++++++++++++++++ edit_entry_handler.php3 (new) | 224 +++++++++++++++++++++ functions.inc (new) | 226 +++++++++++++++++++++ head.gif (new) | Bin 0 -> 4304 bytes help_trailer.inc (new) | 2 + index.php3 (new) | 9 + login.php3 (new) | 82 ++++++++ meetingroomsystem.gif (new) | Bin 0 -> 710 bytes mincals.inc (new) | 97 +++++++++ mrbs.css (new) | 45 +++++ needed_files (new) | 19 ++ new.gif (new) | Bin 0 -> 93 bytes style.inc (new) | 2 + tables.sql (new) | 119 +++++++++++ testdata.php3 (new) | 64 ++++++ trailer.inc (new) | 32 +++ view_entry.php3 (new) | 83 ++++++++ 26 files changed, 2014 insertions(+)