diff --git a/CHANGELOG b/CHANGELOG index a2b1f27..2b4a3d8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,5 @@ OpenDRS - Online Discrepancy Reporting System - Copyright (C) 2022 Rod Wright + Copyright (C) 2023 Rod Wright This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -123,3 +123,15 @@ Changelog - Chromium browser will use the printer designated as the local default if it is selected as such in the Cups printer configuration. + +1.3.3 - 2023-10-03 + - Restricted the ability to change the report date and time when + creating or editing a writeup to only logged in users. This is to + prevent reporters from backdating writeups, causing them to possibly + be missed. + - For Raspberry Pi: + - Updated the Webmin custom command scripts to use whatever user is + logged into Webmin instead of the user "pi" which may not exist + if rpi-imager options were used to set a different initial user + when the SD card was created. + diff --git a/RPiSetup/apsetup/etc/webmin/custom/1630026603.cmd b/RPiSetup/apsetup/etc/webmin/custom/1630026603.cmd index f5a4235..4abfe65 100644 --- a/RPiSetup/apsetup/etc/webmin/custom/1630026603.cmd +++ b/RPiSetup/apsetup/etc/webmin/custom/1630026603.cmd @@ -1,3 +1,3 @@ sudo wap-enable Enable Wireless Access Point -pi 0 1 0 0 0 0 0 - +* 0 1 0 0 0 0 0 - diff --git a/RPiSetup/apsetup/etc/webmin/custom/1630026756.cmd b/RPiSetup/apsetup/etc/webmin/custom/1630026756.cmd index 516f1a0..bc5c3ea 100644 --- a/RPiSetup/apsetup/etc/webmin/custom/1630026756.cmd +++ b/RPiSetup/apsetup/etc/webmin/custom/1630026756.cmd @@ -1,3 +1,3 @@ sudo wap-disable Disable Wireless Access Point -pi 0 1 0 0 0 0 0 - +* 0 1 0 0 0 0 0 - diff --git a/RPiSetup/usr/local/bin/updatedrs b/RPiSetup/usr/local/bin/updatedrs deleted file mode 100644 index 87687da..0000000 --- a/RPiSetup/usr/local/bin/updatedrs +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -host=$1 - -rsync -rlptDvz rwright@$host:/home/rwright/ownCloud/Software_Projects/OpenDRS-1.1.0/distfiles/ /var/www/opendrs/ && chown -R www-data:www-data /var/www/opendrs/* - diff --git a/boilerplate.php b/boilerplate.php index 47890d5..e41fa55 100644 --- a/boilerplate.php +++ b/boilerplate.php @@ -2,7 +2,7 @@ /* boilerplate.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2022 Rod Wright + Copyright (C) 2023 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/db.php.template b/db.php.template index ff0f24d..cb6c1d6 100644 --- a/db.php.template +++ b/db.php.template @@ -3,7 +3,7 @@ /* db.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2022 Rod Wright + Copyright (C) 2023 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/CHANGELOG b/distfiles/CHANGELOG index ce3c49c..59dd741 100644 --- a/distfiles/CHANGELOG +++ b/distfiles/CHANGELOG @@ -1,5 +1,5 @@ OpenDRS - Online Discrepancy Reporting System - Copyright (C) 2022 Rod Wright + Copyright (C) 2023 Rod Wright This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -123,3 +123,15 @@ Changelog - Chromium browser will use the printer designated as the local default if it is selected as such in the Cups printer configuration. + +1.3.3 - 2023-10-03 + - Restricted the ability to change the report date and time when + creating or editing a writeup to only logged in users. This is to + prevent reporters from backdating writeups, causing them to possibly + be missed. + - For Raspberry Pi: + - Updated the Webmin custom command scripts to use whatever user is + logged into Webmin instead of the user "pi" which may not exist + if rpi-imager options were used to set a different initial user + when the SD card was created. + diff --git a/distfiles/about.php b/distfiles/about.php index cb683e3..e451fb0 100644 --- a/distfiles/about.php +++ b/distfiles/about.php @@ -2,7 +2,7 @@ /* about.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2022 Rod Wright + Copyright (C) 2023 Rod Wright SPDX-License-Identifier: GPL-2.0 */ @@ -80,10 +80,10 @@ echo " OpenDRS $drs_version Discrepancy Reporting System

This program is licensed under the terms of the GNU General Public License. Click on the link -or see the LICENSE file in the distribution to read it. OpenDRS is Copyright (C) 2022 by Rod Wright. +or see the LICENSE file in the distribution to read it. OpenDRS is Copyright (C) 2023 by Rod Wright.

-OpenDRS is a simple online maintenance tracking/discrepancy reporting application. It allows anyone with a web browser to create , +OpenDRS is a simple online maintenance tracking/discrepancy reporting application. It allows anyone with a web browser to create, view, and search writeups. The look and feel of the OpenDRS pages are easily changed. Settings that affect all users can be changed in the Admin Functions menu. User specific settings can be changed in the My Profile menu. No browser specific HTML is used in OpenDRS, so it should be useable in any browser, and it has been diff --git a/distfiles/changelog.php b/distfiles/changelog.php index c103fce..6d987b3 100644 --- a/distfiles/changelog.php +++ b/distfiles/changelog.php @@ -2,7 +2,7 @@ /* changelog.php OpenMTS Online Maintenance Tracking System - Copyright (C) 2022 Rod Wright + Copyright (C) 2023 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/common.php b/distfiles/common.php index eff1008..b20758a 100644 --- a/distfiles/common.php +++ b/distfiles/common.php @@ -2,7 +2,7 @@ /* common.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2022 Rod Wright + Copyright (C) 2023 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/config.php b/distfiles/config.php index 442eb33..ba8ef01 100644 --- a/distfiles/config.php +++ b/distfiles/config.php @@ -2,7 +2,7 @@ /* config.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2022 Rod Wright + Copyright (C) 2023 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/create.php b/distfiles/create.php index b099f81..dae56da 100644 --- a/distfiles/create.php +++ b/distfiles/create.php @@ -2,7 +2,7 @@ /* create.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2022 Rod Wright + Copyright (C) 2023 Rod Wright SPDX-License-Identifier: GPL-2.0 */ @@ -225,12 +225,20 @@ if ($preserve) { $funcyesstate="checked"; } +echo ""; +if (!$role) { + $timedatedisable="disabled"; +} else { + $timedatedisable=""; +} echo " - Report Date
- + Report Time
- + +"; + +echo " diff --git a/distfiles/dbadmin.php b/distfiles/dbadmin.php index c532301..3578d85 100644 --- a/distfiles/dbadmin.php +++ b/distfiles/dbadmin.php @@ -2,7 +2,7 @@ /* dbadmin.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2022 Rod Wright + Copyright (C) 2023 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/gpl.php b/distfiles/gpl.php index 1fb3b42..5983fc6 100644 --- a/distfiles/gpl.php +++ b/distfiles/gpl.php @@ -2,7 +2,7 @@ /* gpl.php OpenMTS Online Maintenance Tracking System - Copyright (C) 2022 Rod Wright + Copyright (C) 2023 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/groups.php b/distfiles/groups.php index 9c732b5..9f48a8c 100644 --- a/distfiles/groups.php +++ b/distfiles/groups.php @@ -2,7 +2,7 @@ /* groups.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2022 Rod Wright + Copyright (C) 2023 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/login.php b/distfiles/login.php index d8908a8..00a1ba8 100644 --- a/distfiles/login.php +++ b/distfiles/login.php @@ -2,7 +2,7 @@ /* login.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2022 Rod Wright + Copyright (C) 2023 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/profile.php b/distfiles/profile.php index 2cd5a86..b2bd8f5 100644 --- a/distfiles/profile.php +++ b/distfiles/profile.php @@ -2,7 +2,7 @@ /* profile.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2022 Rod Wright + Copyright (C) 2023 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/search.php b/distfiles/search.php index a930ac9..a3341f8 100644 --- a/distfiles/search.php +++ b/distfiles/search.php @@ -2,7 +2,7 @@ /* search.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2022 Rod Wright + Copyright (C) 2023 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/settings.php b/distfiles/settings.php index af105bd..046052b 100644 --- a/distfiles/settings.php +++ b/distfiles/settings.php @@ -2,7 +2,7 @@ /* settings.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2022 Rod Wright + Copyright (C) 2023 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/writeupdetail.php b/distfiles/writeupdetail.php index ea68975..f87aee1 100644 --- a/distfiles/writeupdetail.php +++ b/distfiles/writeupdetail.php @@ -2,7 +2,7 @@ /* writeupdetail.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2022 Rod Wright + Copyright (C) 2023 Rod Wright SPDX-License-Identifier: GPL-2.0 */ @@ -331,7 +331,7 @@ if($status==3) $deferredstate="selected"; echo " Report Date
"; -if ($useredit) { +if ($useredit && $role) { echo " "; @@ -343,7 +343,7 @@ if ($useredit) { echo " Report Time
"; -if ($useredit) { +if ($useredit && $role) { echo " "; diff --git a/distfiles/writeups.php b/distfiles/writeups.php index f5bc1d7..4a06973 100644 --- a/distfiles/writeups.php +++ b/distfiles/writeups.php @@ -2,7 +2,7 @@ /* writeups.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2022 Rod Wright + Copyright (C) 2023 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/install.sh b/install.sh index 56a489b..a7d0aee 100644 --- a/install.sh +++ b/install.sh @@ -2,12 +2,12 @@ # install.sh # OpenDRS Online Discrepancy Reporting System -# Copyright (C) 2022 Rod Wright +# Copyright (C) 2023 Rod Wright # SPDX-License-Identifier: GPL-2.0 -DRS_VERSION="1.3.2" +DRS_VERSION="1.3.3" DOC_ROOT="/var/www" INSTALL_LOC="opendrs" APACHE_USER="www-data" diff --git a/opendrs-initial.sql b/opendrs-initial.sql index 65b06e2..0ce59f1 100644 --- a/opendrs-initial.sql +++ b/opendrs-initial.sql @@ -69,7 +69,7 @@ CREATE TABLE `config` ( LOCK TABLES `config` WRITE; /*!40000 ALTER TABLE `config` DISABLE KEYS */; INSERT INTO `config` VALUES -(1,'drs_version','1.3.2','1.3.2'), +(1,'drs_version','1.3.3','1.3.3'), (5,'app_name','OpenDRS - Discrepancy Reporting System','OpenDRS Discrepancy Reporting System'), (6,'banner','1','1'), (7,'background_color','0B3144','0B3144'), diff --git a/opendrs-update.sql b/opendrs-update.sql index 88bb195..cc3936f 100644 --- a/opendrs-update.sql +++ b/opendrs-update.sql @@ -226,3 +226,8 @@ UPDATE config SET value="1.3.1",defaultvalue="1.3.1" WHERE name="drs_version"; -- Update version number UPDATE config SET value="1.3.2",defaultvalue="1.3.2" WHERE name="drs_version"; -- -------------------------------------- + +-- ---------- version 1.3.3 ------------- +-- Update version number +UPDATE config SET value="1.3.3",defaultvalue="1.3.3" WHERE name="drs_version"; +-- --------------------------------------