Incorporated changes for release 1.4.6

2026-02-24 21:13:48 -05:00
23 changed files with 48 additions and 24 deletions
--- a/9
+++ b/9
@@ -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.
+
--- 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
 */
--- 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'),
--- 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
+#  -----------------------------------
--- 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";
+-- --------------------------------------
+
--- 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
 */
--- 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.
--- 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
 */
--- 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
 */
--- 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]}"));
--- 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
 */
--- 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
 */
--- 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
 */
--- 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
 */
--- 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
 */
--- 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
 */
--- 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
 */
--- 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
 */
--- 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
 */
--- 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
 */
--- 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
 */
--- a/files-update.sh
+++ b/files-update.sh
@@ -76,4 +76,6 @@ then
 fi
 # --------------------------------------

-
+# ---------- version 1.4.6 -------------
+# Nothing to do for this version
+# --------------------------------------
--- 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"