diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php index e1db5b57d9c..d1f6cf52ab8 100644 --- a/htdocs/admin/system/database.php +++ b/htdocs/admin/system/database.php @@ -55,6 +55,13 @@ print ''.$langs->trans("DBStoringCharset").' print ''.$langs->trans("DBSortingCharset").''.$db->getDefaultCollationDatabase().''."\n"; print ''; +// Tables +print '
'; +print ''; +print ''."\n"; +print ''."\n"; +print '
'.$langs->trans("Tables").'
'.$langs->trans("List").'
'; + $base=0; $sqls = array(); @@ -86,7 +93,7 @@ else print '
'; print ''; print ''; - print ''; + print ''; print ''; print ''."\n"; diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 0d1ac9e17c9..b164d5a0d13 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -685,26 +685,20 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after) $newmenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"),1); } - // System info - $newmenu->add("/admin/system/index.php?mainmenu=home&leftmenu=system", $langs->trans("SystemInfo"), 0, 1, '', $mainmenu, 'system'); - if ($leftmenu == 'system') - { - $newmenu->add('/admin/system/dolibarr.php?mainmenu=home', $langs->trans('Dolibarr'), 1); - $newmenu->add('/admin/system/constall.php?mainmenu=home', $langs->trans('AllParameters'), 2); - $newmenu->add('/admin/system/modules.php?mainmenu=home', $langs->trans('Modules'), 2); - $newmenu->add('/admin/triggers.php?mainmenu=home', $langs->trans('Triggers'), 2); - $newmenu->add('/admin/system/about.php?mainmenu=home', $langs->trans('About'), 2); - $newmenu->add('/admin/system/os.php?mainmenu=home', $langs->trans('OS'), 1); - $newmenu->add('/admin/system/web.php?mainmenu=home', $langs->trans('WebServer'), 1); - $newmenu->add('/admin/system/phpinfo.php?mainmenu=home', $langs->trans('PHP'), 1); - //if (function_exists('xdebug_is_enabled')) $newmenu->add('/admin/system/xdebug.php', $langs->trans('XDebug'),1); - $newmenu->add('/admin/system/database.php?mainmenu=home', $langs->trans('Database'), 1); - $newmenu->add('/admin/system/database-tables.php?mainmenu=home', $langs->trans('Tables'), 2); - } - // Admin tools + // System tools $newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=admintools", $langs->trans("SystemTools"), 0, 1, '', $mainmenu, 'admintools'); if ($leftmenu=="admintools") { + $newmenu->add('/admin/system/dolibarr.php?mainmenu=home', $langs->trans('InfoDolibarr'), 1); + $newmenu->add('/admin/system/constall.php?mainmenu=home', $langs->trans('AllParameters'), 2); + $newmenu->add('/admin/system/modules.php?mainmenu=home', $langs->trans('Modules'), 2); + $newmenu->add('/admin/triggers.php?mainmenu=home', $langs->trans('Triggers'), 2); + $newmenu->add('/admin/system/os.php?mainmenu=home', $langs->trans('InfoOS'), 1); + $newmenu->add('/admin/system/web.php?mainmenu=home', $langs->trans('InfoWebServer'), 1); + $newmenu->add('/admin/system/phpinfo.php?mainmenu=home', $langs->trans('InfoPHP'), 1); + //if (function_exists('xdebug_is_enabled')) $newmenu->add('/admin/system/xdebug.php', $langs->trans('XDebug'),1); + $newmenu->add('/admin/system/database.php?mainmenu=home', $langs->trans('InfoDatabase'), 1); + $newmenu->add("/admin/tools/dolibarr_export.php?mainmenu=home", $langs->trans("Backup"),1); $newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home", $langs->trans("Restore"),1); $newmenu->add("/admin/tools/update.php?mainmenu=home", $langs->trans("MenuUpgrade"),1); @@ -713,9 +707,10 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after) $newmenu->add("/admin/tools/listsessions.php?mainmenu=home", $langs->trans("Sessions"),1); $newmenu->add("/admin/tools/purge.php?mainmenu=home", $langs->trans("Purge"),1); $newmenu->add("/support/index.php?mainmenu=home", $langs->trans("HelpCenter"),1,1,'targethelp'); + $newmenu->add('/admin/system/about.php?mainmenu=home', $langs->trans('About'), 1); } // Modules system tools - if (($conf->global->MAIN_FEATURES_LEVEL >= 1) && (! empty($conf->product->enabled) || ! empty($conf->service->enabled))) + if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) { $langs->load("products"); $newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=modulesadmintools", $langs->trans("ModulesSystemTools"), 0, 1, '', $mainmenu, 'modulesadmintools'); diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index c22863729bb..6220087e201 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -814,6 +814,11 @@ SetupDescription5=Other menu entries manage optional parameters. EventsSetup=Setup for events logs LogEvents=Security audit events Audit=Audit +InfoDolibarr=Infos Dolibarr +InfoOS=Infos OS +InfoWebServer=Infos web server +InfoDatabase=Infos database +InfoPHP=Infos PHP ListEvents=Audit events ListOfSecurityEvents=List of Dolibarr security events SecurityEventsPurged=Security events purged diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 4f7be5890d8..2d9d0357f81 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -823,6 +823,11 @@ SetupDescription5= Les autres entrées de configuration gèrent des paramètres EventsSetup= Configuration du traçage des événements LogEvents= Événements d'audit de sécurité Audit= Audit +InfoDolibarr=Infos Dolibarr +InfoOS=Infos OS +InfoWebServer=Infos web server +InfoDatabase=Infos base de donnée +InfoPHP=Infos PHP ListEvents= Audit événements ListOfSecurityEvents= Liste des événements de sécurité Dolibarr SecurityEventsPurged=Evenement de sécurité purgés
'.$langs->trans("Parameter").''.$langs->trans("Parameters").''.$langs->trans("Value").'