diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php index 86fbad561ff..6bd4e8b3af5 100644 --- a/htdocs/admin/system/database.php +++ b/htdocs/admin/system/database.php @@ -1,8 +1,8 @@ - * Copyright (C) 2004 Laurent Destailleur - * Copyright (C) 2004 Sebastien Di Cintio - * Copyright (C) 2004 Benoit Mortier + * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,7 +36,7 @@ accessforbidden(); /* - * Afficahge page + * View */ $html=new Form($db); @@ -44,9 +44,21 @@ $html=new Form($db); llxHeader(); print_fiche_titre($langs->trans("DatabaseConfiguration"),'','setup'); - print '
'; -print $langs->trans("DatabaseName").' : '.$dolibarr_main_db_name.'
'; + +// Database +print ''; +print "\n"; +print "\n"; +print "\n"; +print "\n"; +print "\n"; +print "\n"; +print "\n"; +print "\n"; +print "\n"; +print "\n"; +print '
".$langs->trans("Database")."
".$langs->trans("Version")."" . $db->getVersion() . "
".$langs->trans("DatabaseServer")."" . $conf->db->host . "
".$langs->trans("DatabasePort")."" . $conf->db->port . "
".$langs->trans("DatabaseName")."" . $conf->db->name . "
".$langs->trans("DriverType")."" . $conf->db->type . "
".$langs->trans("User")."" . $conf->db->user . "
".$langs->trans("Password")."" . eregi_replace('.','*',$dolibarr_main_db_pass) . "
".$langs->trans("DBStoringCharset")."" . $db->getDefaultCharacterSetDatabase() . "
".$langs->trans("DBSortingCharset")."" . $db->getDefaultCollationDatabase() . "
'; $base=0; @@ -77,7 +89,7 @@ else foreach($sqls as $sql) { print '
'; - print ''; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php index 7624782b1a7..e02cad037ba 100644 --- a/htdocs/admin/system/index.php +++ b/htdocs/admin/system/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2007 Laurent Destailleur + * Copyright (C) 2004-2009 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,10 +18,10 @@ */ /** - \file htdocs/admin/system/index.php - \brief Page accueil infos système - \version $Id$ -*/ + * \file htdocs/admin/system/index.php + * \brief Page accueil infos système + * \version $Id$ + */ require("./pre.inc.php"); include_once(DOL_DOCUMENT_ROOT."/lib/databases/".$conf->db->type.".lib.php"); @@ -80,17 +80,10 @@ print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'; print "
\n"; -// Base de donnée +// Database print ''; print "\n"; print "\n"; -print "\n"; -print "\n"; -print "\n"; -print "\n"; -print "\n"; -print "\n"; -print "\n"; print '
".$langs->trans("Database")."
".$langs->trans("Version")."" . $db->getVersion() . "
".$langs->trans("DatabaseServer")."" . $conf->db->host . "
".$langs->trans("DatabaseName")."" . $conf->db->name . "
".$langs->trans("DriverType")."" . $conf->db->type . "
".$langs->trans("User")."" . $conf->db->user . "
".$langs->trans("Password")."" . eregi_replace('.','*',$dolibarr_main_db_pass) . "
".$langs->trans("DBStoringCharset")."" . $db->getDefaultCharacterSetDatabase() . "
".$langs->trans("DBSortingCharset")."" . $db->getDefaultCollationDatabase() . "
'; print '
';