diff --git a/admin_update.php b/admin_update.php index 21229d82f..b97a0adcb 100644 --- a/admin_update.php +++ b/admin_update.php @@ -3,19 +3,12 @@ require_once "database_version.php"; -require_once "config.php"; +$updates = fetchUpdates(); -// Fetch the latest code changes but don't apply them -exec("git fetch", $output, $result); -$latest_version = exec("git rev-parse origin/$repo_branch"); -$current_version = exec("git rev-parse HEAD"); - -if ($current_version == $latest_version) { - $update_message = "No Updates available"; -} else { - $update_message = "New Updates are Available [$latest_version]"; -} +$latest_version = $updates->latest_version; +$current_version = $updates->current_version; +$result = $updates->result; $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format:'%h%ar%s'"); diff --git a/cron.php b/cron.php index 8ea474b99..093af55b8 100644 --- a/cron.php +++ b/cron.php @@ -979,6 +979,19 @@ mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Cron', log_action = 'Telemetry', log_description = 'Cron sent telemetry results to ITFlow Developers'"); } + +// Fetch Updates +$updates = fetchUpdates(); + +$update_message = $updates->update_message; + +if ($updates->current_version !== $updates->latest_version) { + // Send Alert to inform Updates Available + mysqli_query($mysqli, "INSERT INTO notifications SET notification_type = 'Updates', notification = '$update_message', notification_action = 'admin_update.php'"); +} + + + /* * ############################################################################################################### * FINISH UP diff --git a/functions.php b/functions.php index 7bfb1debc..ccae03520 100644 --- a/functions.php +++ b/functions.php @@ -1186,3 +1186,34 @@ function getTicketStatusName($ticket_status) { return "Unknown"; } + + +function fetchUpdates() { + + global $mysqli, $repo_branch; + + // Fetch the latest code changes but don't apply them + exec("git fetch", $output, $result); + $latest_version = exec("git rev-parse origin/$repo_branch"); + $current_version = exec("git rev-parse HEAD"); + + if ($current_version == $latest_version) { + $update_message = "No Updates available"; + } else { + $update_message = "New Updates are Available [$latest_version]"; + } + + + + $updates = new stdClass(); + $updates->output = $output; + $updates->result = $result; + $updates->current_version = $current_version; + $updates->latest_version = $latest_version; + $updates->update_message = $update_message; + + + + return $updates; + +} \ No newline at end of file