From 469c495a73aae0559c78ef0a9fedff890947fa81 Mon Sep 17 00:00:00 2001
From: wrongecho <marcus@itflow.org>
Date: Mon, 30 Dec 2024 12:58:50 +0000
Subject: [PATCH] Add versioning/release system - December 2024 / 24.12

---
 admin_debug.php   | 10 +++++++---
 app_version.php   |  8 ++++++++
 footer.php        |  2 +-
 inc_all_admin.php |  4 +++-
 4 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 app_version.php

diff --git a/admin_debug.php b/admin_debug.php
index 894151c3..c125504f 100644
--- a/admin_debug.php
+++ b/admin_debug.php
@@ -519,12 +519,16 @@ $mysqli->close();
 
         <table class="table table-bordered mb-3">
             <tr>
-                <td>Current App Version</td>
-                <th><?php echo $commitHash; ?></th>
+                <th>ITFlow release version</th>
+                <th><?php echo APP_VERSION; ?></th>
+            </tr>
+            <tr>
+                <td>Current Code Commit</td>
+                <td><?php echo $commitHash; ?></td>
             </tr>
             <tr>
                 <td>Current DB Version</td>
-                <th><?php echo CURRENT_DATABASE_VERSION; ?></th>
+                <td><?php echo CURRENT_DATABASE_VERSION; ?></td>
             </tr>
         </table>
 
diff --git a/app_version.php b/app_version.php
new file mode 100644
index 00000000..3514b48b
--- /dev/null
+++ b/app_version.php
@@ -0,0 +1,8 @@
+<?php
+/*
+ * ITFlow
+ * This file defines the current ITFlow release/version
+ * Update this file each time we merge develop into master. Format is YY.M (add a .v if there is more than one release a month.
+ */
+
+DEFINE("APP_VERSION", "24.12");
diff --git a/footer.php b/footer.php
index 8ff3ae42..67e6cdb9 100644
--- a/footer.php
+++ b/footer.php
@@ -4,7 +4,7 @@ require_once "inc_confirm_modal.php";
 
 <?php
 if (str_contains(basename($_SERVER["PHP_SELF"]), "admin_")) { ?>
-    <p class="text-right font-weight-light">ITFlow /versioning coming soon/ &nbsp; · &nbsp; <a target="_blank" href="https://docs.itflow.org">Docs</a> &nbsp; · &nbsp; <a target="_blank" href="https://forum.itflow.org">Forum</a> &nbsp; · &nbsp; <a target="_blank" href="https://services.itflow.org">Services</a></p>
+    <p class="text-right font-weight-light">ITFlow <?php echo APP_VERSION ?> &nbsp; · &nbsp; <a target="_blank" href="https://docs.itflow.org">Docs</a> &nbsp; · &nbsp; <a target="_blank" href="https://forum.itflow.org">Forum</a> &nbsp; · &nbsp; <a target="_blank" href="https://services.itflow.org">Services</a></p>
     <br>
 <?php } ?>
 
diff --git a/inc_all_admin.php b/inc_all_admin.php
index 0d2e1f61..186fd77a 100644
--- a/inc_all_admin.php
+++ b/inc_all_admin.php
@@ -9,7 +9,7 @@ require_once "check_login.php";
 validateAdminRole();
 
 // TODO: Change this to enforceAdminPermission();
-//  We can't do this until everyone has the new database fields added in 1.4.9 on Sept 14th 2024
+//  We can't do this until everyone has the new database fields added in db 1.4.9 on Sept 14th 2024
 
 require_once "header.php";
 
@@ -22,3 +22,5 @@ require_once "inc_wrapper.php";
 require_once "inc_alert_feedback.php";
 
 require_once "filter_header.php";
+
+require_once "app_version.php";