From 70f49ace6fd9a471958bc448c4ac4b26c19e61e7 Mon Sep 17 00:00:00 2001
From: objecttothis <objecttothis@gmail.com>
Date: Tue, 31 Jan 2023 01:56:55 +0400
Subject: [PATCH] Fixed migration version check - Login now checks the current
 db version against the latest migration available and displays the migration
 update message before login.

---
 app/Controllers/Login.php | 6 +++---
 app/Views/login.php       | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/Controllers/Login.php b/app/Controllers/Login.php
index 8b4cb5997..e40b624a8 100644
--- a/app/Controllers/Login.php
+++ b/app/Controllers/Login.php
@@ -24,8 +24,8 @@ class Login extends BaseController
 			$migration = new MY_Migration(config('Migrations'));
 			$data = [
 				'validation' => Services::validation(),
-				'latest_version' => $migration->is_latest(),
-				'application_version' => $migration->get_current_version()
+				'is_latest' => $migration->is_latest(),
+				'latest_version' => $migration->get_last_migration()
 			];
 
 			if($this->request->getMethod() != 'post')
@@ -129,4 +129,4 @@ class Login extends BaseController
 
 		return $result;
 	}
-}
\ No newline at end of file
+}
diff --git a/app/Views/login.php b/app/Views/login.php
index 61d28af53..b4000c417 100644
--- a/app/Views/login.php
+++ b/app/Views/login.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @var object $validation
+ * @var bool $is_latest
+ * @var string $latest_version
  */
 helper('form');
 ?>
@@ -47,11 +49,11 @@ helper('form');
 						</div>
 					<?php endif; ?>
 
-					<?php /*if(!$latest_version):*/ //TODO: This needs to be uncommented and fixed. CI4 does the latest version check differently, so we need to create a function that assigns a bool to $latest_version and includes it in view $data ?>
+					<?php if(!$is_latest): ?>
 					<div class="alert alert-info mt-3">
-						<?php echo lang('Login.migration_needed', ['version' => config('OSPOS')->settings['application_version']]) ?>
+						<?php echo lang('Login.migration_needed', ['version' => $latest_version]) ?>
 					</div>
-					<?php /*endif;*/ ?>
+					<?php endif; ?>
 
 					<?php if (empty(config('OSPOS')->settings['login_form']) || 'floating_labels'==(config('OSPOS')->settings['login_form'])): ?>
 						<div class="form-floating mt-3">