diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index e4e7e3d14cd..5a2c8ea396b 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -48,32 +48,7 @@ print "".$langs->trans("Version")." print ''; print '
'; -// conf.php file -$configfileparameters=array('dolibarr_main_url_root', - 'dolibarr_main_document_root', - 'dolibarr_main_data_root', - 'dolibarr_main_db_host', - 'dolibarr_main_db_name', - 'dolibarr_main_db_user', - 'dolibarr_main_db_pass', - 'dolibarr_main_db_type' - ); -$var=true; -print ''; -print ''."\n"; -foreach($configfileparameters as $key) -{ - $var=!$var; - print ""; - print ""; - print "\n"; -} -print '
'.$langs->trans("ConfigurationFile").''.$langs->trans("Value").'
".$key.""; - if ($key == 'dolibarr_main_db_pass') print eregi_replace('.','*',${$key}); - else print ${$key}; - print "
'; -print '
'; - +// Language $var=true; print ''; print ''."\n"; diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php index 369974e8622..d9d11dc4b41 100644 --- a/htdocs/admin/system/index.php +++ b/htdocs/admin/system/index.php @@ -31,10 +31,12 @@ include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".li $langs->load("admin"); $langs->load("user"); +$langs->load("install"); if (!$user->admin) accessforbidden(); + llxHeader(); print_fiche_titre($langs->trans("SummarySystem"),'','setup'); @@ -66,8 +68,6 @@ print "
\n"; print '
'.$langs->trans("LanguageDolibarrParameter").''.$langs->trans("Value").'
'; print "\n"; print "\n"; -print "\n"; -print "\n"; print '
".$langs->trans("WebServer")."
".$langs->trans("Version")."".$_SERVER["SERVER_SOFTWARE"]."
".$langs->trans("DocumentRootServer")."" . DOL_DOCUMENT_ROOT . "
".$langs->trans("DataRootServer")."" . DOL_DATA_ROOT . "
'; print "
\n"; @@ -77,9 +77,6 @@ print ''; print "\n"; print "\n"; print "\n"; -print "\n"; -print "\n"; -print "\n"; print '
".$langs->trans("Php")."
".$langs->trans("Version")."".phpversion()."
".$langs->trans("PhpWebLink")."".php_sapi_name()."
".$langs->trans("SmartyLibs")."".$dolibarr_smarty_libs_dir."
".$langs->trans("SmartyCompile")."".$dolibarr_smarty_compile."
".$langs->trans("SmartyCache")."".$dolibarr_smarty_cache."
'; print "
\n"; @@ -88,13 +85,60 @@ print "
\n"; 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("DriverType")."" . $conf->db->type . "
".$langs->trans("Host")."" . $conf->db->host . "
".$langs->trans("DatabaseServer")."" . $conf->db->host . "
".$langs->trans("DatabaseName")."" . $conf->db->name . "
".$langs->trans("User")."" . $conf->db->user . " 
".$langs->trans("Password")."" . ereg_replace(".","*",$conf->db->pass) . " 
".$langs->trans("DatabaseName")."" . $conf->db->name . "
".$langs->trans("DriverType")."" . $conf->db->type . "
'; +print '
'; + +// conf.php file +$configfileparameters=array('dolibarr_main_url_root', + 'dolibarr_main_document_root', + 'dolibarr_main_data_root', + 'dolibarr_main_db_host', + 'dolibarr_main_db_name', + 'dolibarr_main_db_user', + 'dolibarr_main_db_pass', + 'dolibarr_main_db_type', + 'dolibarr_smarty_libs_dir', + 'dolibarr_smarty_compile', + 'dolibarr_smarty_cache' + ); +$configfilelib=array($langs->trans("URLRoot"), + $langs->trans("DocumentRootServer"), + $langs->trans("DataRootServer"), + $langs->trans("DatabaseServer"), + $langs->trans("DatabaseName"), + $langs->trans("Login"), + $langs->trans("Password"), + $langs->trans("DriverType"), + $langs->trans("SmartyLibs"), + $langs->trans("SmartyCompile"), + $langs->trans("SmartyCache") + ); +$var=true; +print ''; +print ''; +print ''; +print ''; +print ''."\n"; +$i=0; +foreach($configfileparameters as $key) +{ + $var=!$var; + print "'; + print ""; + print "\n"; + $i++; +} +print '
'.$langs->trans("ConfigurationFile").''.$langs->trans("Parameter").''.$langs->trans("Value").'
".$configfilelib[$i].''.$key.'"; + if ($key == 'dolibarr_main_db_pass') print eregi_replace('.','*',${$key}); + else print ${$key}; + print "
'; +print '
'; + llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang index 2b6c2d9c4eb..3e2e2dbc74c 100644 --- a/htdocs/langs/en_US/install.lang +++ b/htdocs/langs/en_US/install.lang @@ -33,6 +33,7 @@ DatabaseType=Database type DriverType=Driver type Server=Server ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server +DatabaseServer=Database server DatabaseName=Database name Login=Login AdminLogin=Login for Dolibarr database administrator. Keep empty if you connect in anonymous diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang index 91f8cbefdd1..31b24efc279 100644 --- a/htdocs/langs/fr_FR/install.lang +++ b/htdocs/langs/fr_FR/install.lang @@ -33,6 +33,7 @@ DatabaseType=Type de la base de donn DriverType=Type du driver Server=Serveur ServerAddressDescription=Nom ou adresse ip du serveur de base de données, généralement 'localhost' quand le serveur est installé sur la même machine que le serveur web +DatabaseServer=Serveur de la base de données DatabaseName=Nom de la base de données Login=Login AdminLogin=Login de l'administrateur de la base de données Dolibarr. Laissez vide si vous vous connectez en anonymous