From 79addae3ef399b00ae337d6d19e1c3d97187ad91 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Mon, 14 Dec 2015 17:36:09 +0100
Subject: [PATCH] Improve upgrade : display the real database name and
 user_login : search by dos_id

---
 html/user_login.php     | 2 +-
 include/upgrade.inc.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/user_login.php b/html/user_login.php
index 055faeef7..35cb3cf1d 100644
--- a/html/user_login.php
+++ b/html/user_login.php
@@ -163,7 +163,7 @@ echo '</div>';
                         echo _('Cherche').HtmlInput::infobulle(23);
 ?>
 <?php
-	echo HtmlInput::filter_table("folder", '1,2',1);
+	echo HtmlInput::filter_table("folder", '0,1,2',1);
 ?>
 </span>
 <?php
diff --git a/include/upgrade.inc.php b/include/upgrade.inc.php
index bb4b23da4..dc406f2d7 100644
--- a/include/upgrade.inc.php
+++ b/include/upgrade.inc.php
@@ -62,9 +62,9 @@ if ($sb === "upg_all" && (!defined('MULTI')||(defined('MULTI')&&MULTI==1)))
     for ($e=0; $e<$MaxDossier; $e++)
     {
         $db_row=Database::fetch_array($Resdossier, $e);
-        echo "<h3>Patching ".$db_row['dos_name'].'</h3>';
-
         $name=$rep->format_name($db_row['dos_id'], 'dos');
+        echo "<h3>Patching ".$name.':'.$db_row['dos_name'].'</h3>';
+
 
         if ($rep->exist_database($name)>0)
         {
@@ -88,8 +88,8 @@ if ($sb === "upg_all" && (!defined('MULTI')||(defined('MULTI')&&MULTI==1)))
     for ($e=0; $e<$MaxDossier; $e++)
     {
         $db_row=Database::fetch_array($Resdossier, $e);
-        echo "<h3>Patching ".$db_row['mod_name']."</h3>";
         $name=$rep->format_name($db_row['mod_id'], 'mod');
+        echo "<h3>Patching ".$name.":".$db_row['mod_name']."</h3>";
 
         if ($rep->exist_database($name)>0)
         {