From 8c3ea6404e82ae24e5e3318364f6c2bee7f542d4 Mon Sep 17 00:00:00 2001
From: wrongecho <marcus@itflow.org>
Date: Mon, 30 Dec 2024 14:24:56 +0000
Subject: [PATCH] Add versioning/release system - December 2024 / 24.12

---
 admin_update.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/admin_update.php b/admin_update.php
index 01bd4325..b17ea004 100644
--- a/admin_update.php
+++ b/admin_update.php
@@ -3,7 +3,6 @@ require_once "inc_all_admin.php";
 
 require_once "database_version.php";
 
-
 $updates = fetchUpdates();
 
 $latest_version = $updates->latest_version;
@@ -43,8 +42,6 @@ $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format
                 <br>
                 <small class="text-secondary">Latest DB Version: <?php echo LATEST_DATABASE_VERSION; ?></small>
                 <br>
-                <small class="text-secondary">Branch: <?php echo $repo_branch; ?></small>
-
                 <hr>
 
             <?php } else {
@@ -54,9 +51,9 @@ $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format
                     <a class="btn btn-danger btn-lg" href="post.php?update&force_update=1"><i class="fas fa-fw fa-4x fa-hammer mb-1"></i><h5>FORCE Update App</h5></a>
 
                 <?php } else { ?>
-                    <p class="text-secondary">Current Database Version:<br><strong class="text-dark"><?php echo CURRENT_DATABASE_VERSION; ?></strong></p>
-                    <p class="text-secondary">Current App Version:<br><strong class="text-dark"><?php echo $current_version; ?></strong></p>
-                    <p class="text-secondary">Branch:<br><strong class="text-dark"><?php echo $repo_branch; ?></strong></p>
+                    <p><strong>Application Release Version:<br><strong class="text-dark"><?php echo APP_VERSION; ?></strong></p>
+                    <p class="text-secondary">Database Version:<br><strong class="text-dark"><?php echo CURRENT_DATABASE_VERSION; ?></strong></p>
+                    <p class="text-secondary">Code Commit:<br><strong class="text-dark"><?php echo $current_version; ?></strong></p>
                     <p class="text-muted">You are up to date!<br>Everything is going to be alright</p>
                     <i class="far fa-3x text-dark fa-smile-wink"></i><br>
                 <?php }