diff --git a/CHANGELOG b/CHANGELOG index 259e40c..26a1f96 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,5 @@ OpenDRS - Online Discrepancy Reporting System - Copyright (C) 2025 Rod Wright + Copyright (C) 2026 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 @@ -206,3 +206,10 @@ Changelog - Changed the install.sh script to align with the standardized installation process used by other applications. +1.4.6 - 2026-02-06 + - Fixed bug in group_detail() function in common.php where the link + members were being sorted by linkid instead of writeupid. This + caused the group writeup table to be ordered based on when the + writeup was added to the group instead of in the logical writeup + order. + diff --git a/boilerplate.php b/boilerplate.php index 0006ed6..e6970d4 100644 --- a/boilerplate.php +++ b/boilerplate.php @@ -2,7 +2,7 @@ /* boilerplate.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2025 Rod Wright + Copyright (C) 2026 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/database-initial.sql b/database-initial.sql index da4ba51..eb54481 100644 --- a/database-initial.sql +++ b/database-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.4.5','1.4.5'), +(1,'drs_version','1.4.6','1.4.6'), (5,'app_name','OpenDRS - Discrepancy Reporting System','OpenDRS Discrepancy Reporting System'), (6,'banner','1','1'), (7,'background_color','0B3144','0B3144'), diff --git a/database-update.sh b/database-update.sh index 9daf2e1..4ef2bc1 100644 --- a/database-update.sh +++ b/database-update.sh @@ -2,7 +2,7 @@ # database-update.sh # OpenLog Online Logbook -# Copyright (C) 2025 Rod Wright +# Copyright (C) 2026 Rod Wright # SPDX-License-Identifier: GPL-2.0 @@ -29,3 +29,7 @@ margs="--defaults-extra-file=$mysql_opt_file" # ---------- version 1.4.5 ---------- # Nothing to be done # ----------------------------------- + +# ---------- version 1.4.6 ---------- +# Nothing to be done +# ----------------------------------- diff --git a/database-update.sql b/database-update.sql index d1fbbe3..c76a70a 100644 --- a/database-update.sql +++ b/database-update.sql @@ -276,3 +276,8 @@ UPDATE config SET value="1.4.4",defaultvalue="1.4.4" WHERE name="drs_version"; UPDATE config SET value="1.4.5",defaultvalue="1.4.5" WHERE name="drs_version"; -- -------------------------------------- +-- ---------- version 1.4.6 ------------- +-- Update version number +UPDATE config SET value="1.4.6",defaultvalue="1.4.6" WHERE name="drs_version"; +-- -------------------------------------- + diff --git a/db.php.template b/db.php.template index fb4974d..95706be 100644 --- a/db.php.template +++ b/db.php.template @@ -3,7 +3,7 @@ /* db.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2025 Rod Wright + Copyright (C) 2026 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/CHANGELOG b/distfiles/CHANGELOG index 259e40c..8869c09 100644 --- a/distfiles/CHANGELOG +++ b/distfiles/CHANGELOG @@ -1,5 +1,5 @@ OpenDRS - Online Discrepancy Reporting System - Copyright (C) 2025 Rod Wright + Copyright (C) 2026 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 @@ -206,3 +206,9 @@ Changelog - Changed the install.sh script to align with the standardized installation process used by other applications. +1.4.6 - 2026-02-06 + - Fixed bug in group_detail() function in common.php where the link + members were being sorted by linkid instead of writeupid. This + caused the group writeup table to be ordered based on when the + writeup was added to the group instead of in the logical writeup + order. diff --git a/distfiles/about.php b/distfiles/about.php index d3ee03a..f8a3a20 100644 --- a/distfiles/about.php +++ b/distfiles/about.php @@ -2,7 +2,7 @@ /* about.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2025 Rod Wright + Copyright (C) 2026 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/changelog.php b/distfiles/changelog.php index fd76dcc..e46b13e 100644 --- a/distfiles/changelog.php +++ b/distfiles/changelog.php @@ -2,7 +2,7 @@ /* changelog.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2025 Rod Wright + Copyright (C) 2026 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/common.php b/distfiles/common.php index 5ea0e1e..8e5e8e9 100644 --- a/distfiles/common.php +++ b/distfiles/common.php @@ -2,7 +2,7 @@ /* common.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2025 Rod Wright + Copyright (C) 2026 Rod Wright SPDX-License-Identifier: GPL-2.0 */ @@ -785,7 +785,7 @@ function group_detail($groupid,$role=false,$mode="view",$selection="none") { "; } - $writeup_qry=mysqli_query($drs_db,"select writeupid from links where linkgroup=$groupid"); + $writeup_qry=mysqli_query($drs_db,"select writeupid from links where linkgroup=$groupid order by writeupid asc"); while ($writeup=mysqli_fetch_row($writeup_qry)) { // get writeup data $writeupdata=mysqli_fetch_assoc(mysqli_query($drs_db,"select * from writeups where id={$writeup[0]}")); diff --git a/distfiles/config.php b/distfiles/config.php index 98cd0d2..67df051 100644 --- a/distfiles/config.php +++ b/distfiles/config.php @@ -2,7 +2,7 @@ /* config.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2025 Rod Wright + Copyright (C) 2026 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/create.php b/distfiles/create.php index 6a774a6..e2e7dcf 100644 --- a/distfiles/create.php +++ b/distfiles/create.php @@ -2,7 +2,7 @@ /* create.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2025 Rod Wright + Copyright (C) 2026 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/dbadmin.php b/distfiles/dbadmin.php index 2921931..57b59f3 100644 --- a/distfiles/dbadmin.php +++ b/distfiles/dbadmin.php @@ -2,7 +2,7 @@ /* dbadmin.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2025 Rod Wright + Copyright (C) 2026 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/gpl.php b/distfiles/gpl.php index a2a5237..9bb8271 100644 --- a/distfiles/gpl.php +++ b/distfiles/gpl.php @@ -2,7 +2,7 @@ /* gpl.php OpenMTS Online Maintenance Tracking System - Copyright (C) 2025 Rod Wright + Copyright (C) 2026 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/groups.php b/distfiles/groups.php index 4da5865..1b6c3df 100644 --- a/distfiles/groups.php +++ b/distfiles/groups.php @@ -2,7 +2,7 @@ /* groups.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2025 Rod Wright + Copyright (C) 2026 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/login.php b/distfiles/login.php index 6b125d6..2d45bda 100644 --- a/distfiles/login.php +++ b/distfiles/login.php @@ -2,7 +2,7 @@ /* login.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2025 Rod Wright + Copyright (C) 2026 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/profile.php b/distfiles/profile.php index 1f4c26d..1724d9e 100644 --- a/distfiles/profile.php +++ b/distfiles/profile.php @@ -2,7 +2,7 @@ /* profile.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2025 Rod Wright + Copyright (C) 2026 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/search.php b/distfiles/search.php index 74344ad..cf0446b 100644 --- a/distfiles/search.php +++ b/distfiles/search.php @@ -2,7 +2,7 @@ /* search.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2025 Rod Wright + Copyright (C) 2026 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/settings.php b/distfiles/settings.php index bfe3f74..d646e8c 100644 --- a/distfiles/settings.php +++ b/distfiles/settings.php @@ -2,7 +2,7 @@ /* settings.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2025 Rod Wright + Copyright (C) 2026 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/writeupdetail.php b/distfiles/writeupdetail.php index 8b6e5c1..2c6f7a4 100644 --- a/distfiles/writeupdetail.php +++ b/distfiles/writeupdetail.php @@ -2,7 +2,7 @@ /* writeupdetail.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2025 Rod Wright + Copyright (C) 2026 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/distfiles/writeups.php b/distfiles/writeups.php index 197f6bb..1278301 100644 --- a/distfiles/writeups.php +++ b/distfiles/writeups.php @@ -2,7 +2,7 @@ /* writeups.php OpenDRS Online Discrepancy Reporting System - Copyright (C) 2025 Rod Wright + Copyright (C) 2026 Rod Wright SPDX-License-Identifier: GPL-2.0 */ diff --git a/files-update.sh b/files-update.sh index 8f545f5..b2d2a37 100644 --- a/files-update.sh +++ b/files-update.sh @@ -76,4 +76,6 @@ then fi # -------------------------------------- - +# ---------- version 1.4.6 ------------- +# Nothing to do for this version +# -------------------------------------- diff --git a/install.sh b/install.sh index b125daa..f869816 100644 --- a/install.sh +++ b/install.sh @@ -2,13 +2,13 @@ # install.sh # OpenDRS Online Discrepancy Reporting System -# Copyright (C) 2025 Rod Wright +# Copyright (C) 2026 Rod Wright # SPDX-License-Identifier: GPL-2.0 APP_NAME="OpenDRS" DEFAULT_DB_NAME="opendrs" -APP_VERSION="1.4.5" +APP_VERSION="1.4.6" DOC_ROOT="/var/www" INSTALL_LOC="opendrs" APACHE_CONF_DIR="/etc/apache2/conf-available"