[Noalyss-commit] [noalyss] 07/16: Administration : add information about system update all the databases + account_repository

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 3ffcb4ea260a3a8393bbe7a60490ce06b0416c32
Author: Dany De Bontridder <address@hidden>
Date:   Mon Oct 19 16:14:29 2015 +0200

    Administration : add information about system
    update all the databases + account_repository
---
 html/admin/setup.php       |    2 +-
 include/admin_repo.inc.php |    4 ++++
 include/lib/user_menu.php  |   11 +++++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/html/admin/setup.php b/html/admin/setup.php
index 12d895a..fc2c906 100644
--- a/html/admin/setup.php
+++ b/html/admin/setup.php
@@ -591,7 +591,7 @@ for ($e=0;$e < $MaxDossier;$e++) {
   {
       echo_warning(_("Dossier inexistant")." $name");
   }
- }
+ } 
 
 //----------------------------------------------------------------------
 // Upgrade the template
diff --git a/include/admin_repo.inc.php b/include/admin_repo.inc.php
index f292347..8fcd420 100644
--- a/include/admin_repo.inc.php
+++ b/include/admin_repo.inc.php
@@ -94,6 +94,9 @@ if ($action== 'audit_log')
     /* List the connexion successfull and failed */
     require_once NOALYSS_INCLUDE."/audit_log.php";
 }
+/*
+ * Display information about current installation
+ */
 if ( $action == "info") {
     echo "<h2>"._('Variables').":".NOALYSS_INCLUDE.'/config.inc.php </h2>';
     echo '<ul style="list-style:square">';
@@ -103,6 +106,7 @@ if ( $action == "info") {
     echo "<li>"."DEBUG".":".DEBUG."</li>";
     echo "<li>"."LOGINPUT".":".LOGINPUT."</li>";
     echo "<li>"."LOCALE".":".LOCALE."</li>";
+    echo "<li>"."MULTI".":".MULTI."</li>";
     echo "<li>"."DOMAINE".":".domaine."</li>";
     echo "<li>"."PG_PATH".":".PG_PATH."</li>";
     echo "<li>"."PG_DUMP".":".PG_DUMP."</li>";
diff --git a/include/lib/user_menu.php b/include/lib/user_menu.php
index 82134f7..94c48d3 100644
--- a/include/lib/user_menu.php
+++ b/include/lib/user_menu.php
@@ -100,9 +100,15 @@ function MenuAdmin()
        case 'audit_log':
          $def=4;
          break;
-        case 'restore';
+        case 'restore':
             $def=3;
             break;
+        case 'upgrade':
+            $def = 5;
+            break;
+        case 'info':
+            $def=6;
+            break;
         }
     }
        if (!defined("MULTI")||(defined("MULTI")&&MULTI==1))
@@ -111,8 +117,9 @@ function MenuAdmin()
                  
array("admin-noalyss.php?action=dossier_mgt",_("Dossiers"),_('Gestion des 
dossiers'),1),
                  
array("admin-noalyss.php?action=modele_mgt",_("Modèles"),_('Gestion des 
modèles'),2),
                  
array("admin-noalyss.php?action=restore",_("Restaure"),_("Restaure une base de 
données"),3),
+                 array("admin-noalyss.php?action=upgrade",_("Mise à 
jour"),_("Mise à jour du système et des bases de données"),5),
                  
array("admin-noalyss.php?action=audit_log",_("Audit"),_("Utilisateurs qui se 
sont connectés"),4),
-                 array("admin-noalyss.php?action=info",_("Information 
système")),
+                 array("admin-noalyss.php?action=info",_("Information 
système"),('Information à propos de votre installation'),6),
                  array("login.php",_("Accueil")),
                  array("logout.php",_("Sortie"))
                 );