From 01ef0a8d608dd3f25d9eac080d48cb6b565d887f Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Fri, 15 Jan 2021 17:12:15 +0100
Subject: [PATCH] Redirect if DB version not correct

---
 html/login.php | 52 ++++++++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/html/login.php b/html/login.php
index face7be1a..713142081 100644
--- a/html/login.php
+++ b/html/login.php
@@ -48,30 +48,33 @@ if (  isset ($_POST["p_user"] ) )
      * Check repository version
      */
 
-	if ($version != DBVERSIONREPO)
-	{
-		echo alert(_('Version de base de données incorrectes, vous devez mettre à jour'));
-		echo "<META HTTP-EQUIV=\"REFRESH\" content=\"0;url=admin-noalyss.php\">";
-		exit();
-	}
+    if ($version != DBVERSIONREPO)
+    {
+        echo html_page_start();
+        echo h1(_("Version base de donneés incorrecte"));
+        echo span(_('Un instant svp'));
+        echo alert(_('Version de base de données incorrectes, vous devez mettre à jour'));
+        echo "<META HTTP-EQUIV=\"REFRESH\" content=\"3;url=admin-noalyss.php??action=upgrade&sb=database\">";
+        exit();
+    }
     require_once NOALYSS_INCLUDE."/class/user.class.php";
     $User=new User($rep);
     $User->Check(false,'LOGIN');
     if ($g_captcha == true)
-      {
-	include("securimage/securimage.php");
-	$img = new Securimage();
-	$valid = $img->check($_POST['captcha_code']);
-	if ( $valid == false )
-	  {
-	    echo alert(_('Code invalide'));
-	    echo "<META HTTP-EQUIV=\"REFRESH\" content=\"0;url=index.php\">";
-	    exit();
-	  }
+    {
+          include("securimage/securimage.php");
+          $img = new Securimage();
+          $valid = $img->check($_POST['captcha_code']);
+          if ( $valid == false )
+          {
+          echo alert(_('Code invalide'));
+          echo "<META HTTP-EQUIV=\"REFRESH\" content=\"0;url=index.php\">";
+          exit();
       }
-      // force the nocache
-      $backurl='user_login.php?v='.microtime(true);
-      if ( isset ($_POST['backurl'])) {
+      }
+    // force the nocache
+    $backurl='user_login.php?v='.microtime(true);
+    if ( isset ($_POST['backurl'])) {
           $backurl=urldecode($_POST['backurl']);
       }
     echo "<META HTTP-EQUIV=\"REFRESH\" content=\"0;url={$backurl}\">";
@@ -86,10 +89,13 @@ else
      */
 
     if ( $version != DBVERSIONREPO)
-      {
-	echo alert(_('Version de base de données incorrectes, vous devez mettre à jour'));
-	echo "<META HTTP-EQUIV=\"REFRESH\" content=\"1;url=admin-noalyss.php\">";
-	exit();
+    {
+          echo html_page_start();
+          echo h1(_("Version base de donneés incorrecte"));
+          echo span(_('Un instant svp'));
+          echo alert(_('Version de base de données incorrectes, vous devez mettre à jour'));
+	    echo "<META HTTP-EQUIV=\"REFRESH\" content=\"3;url=admin-noalyss.php?action=upgrade&sb=database\">";
+	    exit();
 
       }