Ajout info pour aide support

htdocs/admin/index.php

@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id$
- * $Source$
  */
 
 /**

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")).'<br>';
 
 print '<table class="noborder" width="100%">';
 print "<tr class=\"liste_titre\"><td colspan=\"2\">Dolibarr</td></tr>\n";
-print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>" . DOL_VERSION . "</td></tr>\n";
+print "<tr $bc[0]><td width=\"280\">".$langs->trans("Version")."</td><td>" . DOL_VERSION . "</td></tr>\n";
 print '</table>';
 
 print "<br>\n";
@@ -59,7 +58,7 @@ phpinfo();
 $chaine = ob_get_contents(); 
 ob_end_clean(); 
 eregi('System </td><td class="v">([^\/]*)</td>',$chaine,$reg);
-print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>".$reg[1]."</td></tr>\n";
+print "<tr $bc[0]><td width=\"280\">".$langs->trans("Version")."</td><td>".$reg[1]."</td></tr>\n";
 print '</table>';
 
 print "<br>\n";
@@ -67,7 +66,7 @@ print "<br>\n";
 // Serveur web
 print '<table class="noborder" width="100%">';
 print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("WebServer")."</td></tr>\n";
-print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>".$_SERVER["SERVER_SOFTWARE"]."</td></tr>\n";
+print "<tr $bc[0]><td width=\"280\">".$langs->trans("Version")."</td><td>".$_SERVER["SERVER_SOFTWARE"]."</td></tr>\n";
 print '</table>';
 
 print "<br>\n";
@@ -75,7 +74,7 @@ print "<br>\n";
 // Php
 print '<table class="noborder" width="100%">';
 print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("Php")."</td></tr>\n";
-print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>".phpversion()."</td></tr>\n";
+print "<tr $bc[0]><td width=\"280\">".$langs->trans("Version")."</td><td>".phpversion()."</td></tr>\n";
 print "<tr $bc[1]><td>".$langs->trans("PhpWebLink")."</td><td>".php_sapi_name()."</td></tr>\n";
 print '</table>';
 
@@ -89,7 +88,7 @@ print "<tr $bc[1]><td>".$langs->trans("DatabaseServer")."</td><td>" . $conf->db-
 print "<tr $bc[0]><td>".$langs->trans("DatabaseName")."</td><td>" . $conf->db->name . "</td></tr>\n";
 print "<tr $bc[1]><td>".$langs->trans("User")."</td><td>" . $conf->db->user . "&nbsp;</td></tr>\n";
 print "<tr $bc[0]><td>".$langs->trans("Password")."</td><td>" . ereg_replace(".","*",$conf->db->pass) . "&nbsp;</td></tr>\n";
-print "<tr $bc[1]><td width=\"240\">".$langs->trans("DriverType")."</td><td>" . $conf->db->type . "</td></tr>\n";
+print "<tr $bc[1]><td width=\"280\">".$langs->trans("DriverType")."</td><td>" . $conf->db->type . "</td></tr>\n";
 print '</table>';
 print '<br>';
 
@@ -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 '<table class="noborder" width="100%">';
-print '<tr class="liste_titre"><td width="240">'.$langs->trans("ConfigurationFile").'</td>';
+print '<tr class="liste_titre"><td width="280">'.$langs->trans("ConfigurationFile").'</td>';
 print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print '</tr>'."\n";
@@ -171,6 +174,12 @@ foreach($configfileparameters as $key)
 		print "<td>";
 		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 "</td>";
 	}
 	print "</tr>\n";

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="latin1";
-#
-$dolibarr_main_db_character_set="";
 
 
-#
+# 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="";
 
-?>
+?>

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

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 <b>%s</b> must be enabled
 DolibarrSetup=Dolibarr setup
 DolibarrUser=Dolibarr user

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 <b>%s</b> non actif
 DolibarrSetup=Installation de Dolibarr
 DolibarrUser=Utilisateur Dolibarr

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.