diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index 133bc458fd2..976eed1f942 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -17,7 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Id$ - * $Source$ */ /** diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php index 3048cb691a6..fd574ce0d72 100644 --- a/htdocs/admin/system/index.php +++ b/htdocs/admin/system/index.php @@ -17,7 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Id$ - * $Source$ */ /** @@ -46,7 +45,7 @@ print info_admin($langs->trans("SystemInfoDesc")).'
'; print ''; print "\n"; -print "\n"; +print "\n"; print '
Dolibarr
".$langs->trans("Version")."" . DOL_VERSION . "
".$langs->trans("Version")."" . DOL_VERSION . "
'; print "
\n"; @@ -59,7 +58,7 @@ phpinfo(); $chaine = ob_get_contents(); ob_end_clean(); eregi('System ([^\/]*)',$chaine,$reg); -print "".$langs->trans("Version")."".$reg[1]."\n"; +print "".$langs->trans("Version")."".$reg[1]."\n"; print ''; print "
\n"; @@ -67,7 +66,7 @@ print "
\n"; // Serveur web print ''; print "\n"; -print "\n"; +print "\n"; print '
".$langs->trans("WebServer")."
".$langs->trans("Version")."".$_SERVER["SERVER_SOFTWARE"]."
".$langs->trans("Version")."".$_SERVER["SERVER_SOFTWARE"]."
'; print "
\n"; @@ -75,7 +74,7 @@ print "
\n"; // Php print ''; print "\n"; -print "\n"; +print "\n"; print "\n"; print '
".$langs->trans("Php")."
".$langs->trans("Version")."".phpversion()."
".$langs->trans("Version")."".phpversion()."
".$langs->trans("PhpWebLink")."".php_sapi_name()."
'; @@ -89,7 +88,7 @@ print "".$langs->trans("DatabaseServer")."" . $conf->db- print "".$langs->trans("DatabaseName")."" . $conf->db->name . "\n"; print "".$langs->trans("User")."" . $conf->db->user . " \n"; print "".$langs->trans("Password")."" . ereg_replace(".","*",$conf->db->pass) . " \n"; -print "".$langs->trans("DriverType")."" . $conf->db->type . "\n"; +print "".$langs->trans("DriverType")."" . $conf->db->type . "\n"; print ''; print '
'; @@ -104,6 +103,8 @@ $configfileparameters=array( 'dolibarr_main_db_user', 'dolibarr_main_db_pass', 'dolibarr_main_db_type', + 'dolibarr_main_db_character_set', + 'collation_connection', 'separator', 'character_set_client', 'separator', @@ -132,8 +133,10 @@ $configfilelib=array( $langs->trans("Login"), $langs->trans("Password"), $langs->trans("DriverType"), + $langs->trans("DBStoringCharset"), + $langs->trans("DBSortingCharset"), 'separator', - $langs->trans("Charset"), + $langs->trans("HTMLCharset"), 'separator', $langs->trans("AuthenticationMode"), 'separator', @@ -152,7 +155,7 @@ $configfilelib=array( ); $var=true; print ''; -print ''; +print ''; print ''; print ''; print ''."\n"; @@ -171,6 +174,12 @@ foreach($configfileparameters as $key) print ""; } print "\n"; diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example index a4fad4acf1c..d1268495b2b 100644 --- a/htdocs/conf/conf.php.example +++ b/htdocs/conf/conf.php.example @@ -94,14 +94,16 @@ $dolibarr_main_db_pass=""; $dolibarr_main_db_type=""; +# dolibarr_main_db_character_set +# Database character set used to store data. # -# -# -$dolibarr_main_db_character_set=""; +$dolibarr_main_db_character_set="latin1"; -# -# +# character_set_client +# Page code for HTML outputs. +# Default value: ISO-8859-1 +# Possible values: ISO-8859-1 # $character_set_client="ISO-8859-1"; @@ -141,4 +143,4 @@ $dolibarr_smarty_libs_dir=""; $dolibarr_smarty_compile=""; $dolibarr_smarty_cache=""; -?> \ No newline at end of file +?> diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index b6e5e00feae..b10793b6408 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -135,6 +135,7 @@ if ($_POST["action"] == "set" || $_POST["action"] == "upgrade") if ($success) { + dolibarr_install_syslog('install/etape5.php Remove MAIN_NOT_INSTALLED const', LOG_ERR); $db->query("DELETE FROM llx_const WHERE name='MAIN_NOT_INSTALLED'"); // Si install non Français, on configure pour fonctionner en mode internationnal diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 31cc8a6f56a..a81b98000f8 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -5,6 +5,9 @@ VersionDevelopment=Development VersionUnknown=Unknown VersionRecommanded=Recommanded SessionId=Session id +HTMLCharset=Charset for HTML pages +DBStoringCharset=Database charset to store data +DBSortingCharset=Database charset to sort data WarningModuleNotActive=Module %s must be enabled DolibarrSetup=Dolibarr setup DolibarrUser=Dolibarr user diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 68abf6ba230..69a1b32e469 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -5,6 +5,9 @@ VersionDevelopment=D VersionUnknown=Inconnue VersionRecommanded=Recommandé SessionId=ID Session +HTMLCharset=Charset des pages HTML +DBStoringCharset=Charset base pour stockage données +DBSortingCharset=Charset base pour tri données WarningModuleNotActive=Module %s non actif DolibarrSetup=Installation de Dolibarr DolibarrUser=Utilisateur Dolibarr diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 2cc7107a11c..a0457a60cce 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -31,7 +31,7 @@ \version $Revision$ */ -define('DOL_VERSION','2.2-beta4'); +define('DOL_VERSION','2.2-beta5'); define('EURO',chr(128)); // La fonction clearstatcache ne doit pas etre appelée de manière globale car ralenti.
'.$langs->trans("ConfigurationFile").'
'.$langs->trans("ConfigurationFile").''.$langs->trans("Parameter").''.$langs->trans("Value").'
"; if ($key == 'dolibarr_main_db_pass') print eregi_replace('.','*',${$key}); else print ${$key}; + // TODO Afficher charset effectif de base $db + if ($key == 'dolibarr_main_db_charset') + { + + + } print "