From 86cd618b0387aa52a979e7a21b0e49d36e38f3dd Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Fri, 7 Jun 2024 20:36:18 -0400
Subject: [PATCH] Add Force Update Button

---
 admin_update.php |  1 +
 post/setting.php | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/admin_update.php b/admin_update.php
index b97a0adc..75e32556 100644
--- a/admin_update.php
+++ b/admin_update.php
@@ -34,6 +34,7 @@ $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format
 
             <?php if (!empty($git_log)) { ?>
                 <a class="btn btn-primary btn-lg my-4" href="post.php?update"><i class="fas fa-fw fa-4x fa-download mb-1"></i><h5>Update App</h5></a>
+                <a class="btn btn-primary" href="post.php?update&force_update=1"><i class="fas fa-fw fa-4x fa-download mb-1"></i><h5>FORCE Update App</h5></a>
                 <hr>
 
             <?php } else {
diff --git a/post/setting.php b/post/setting.php
index 7e9b03b6..b698340d 100644
--- a/post/setting.php
+++ b/post/setting.php
@@ -762,14 +762,14 @@ if (isset($_GET['update'])) {
 
     validateAdminRole();
 
-    exec("git pull");
-
-    //FORCE UPDATE FUNCTION (Will be added later as a checkbox)
     //git fetch downloads the latest from remote without trying to merge or rebase anything. Then the git reset resets the master branch to what you just fetched. The --hard option changes all the files in your working tree to match the files in origin/master
 
-    //exec("git fetch --all");
-    //exec("git reset --hard origin/master");
-
+    if(isset($_GET['force_update'] == 1)) {
+        exec("git fetch --all");
+        exec("git reset --hard origin/master");
+    } else {
+        exec("git pull");
+    }
     //header("Location: post.php?update_db");