Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop

htdocs/admin/system/constall.php

@@ -43,9 +43,8 @@ print_fiche_titre($langs->trans("SummaryConst"),'','setup');
 
 
 print_titre($langs->trans("ConfigurationFile").' ('.$conffiletoshowshort.')');
-// Parameters in conf.php file
+// Parameters in conf.php file (when a parameter start with ?, it is shown only if defined)
 $configfileparameters=array(
-//							'separator',
 							'dolibarr_main_url_root',
 							'dolibarr_main_url_root_alt',
 							'dolibarr_main_document_root',
@@ -60,6 +59,7 @@ $configfileparameters=array(
 							'dolibarr_main_db_pass',
 							'dolibarr_main_db_character_set',
 							'dolibarr_main_db_collation',
+							'?dolibarr_main_db_prefix',
 							'separator',
 							'dolibarr_main_authentication',
 							'separator',
@@ -85,7 +85,10 @@ $configfileparameters=array(
 						    '?dolibarr_js_JQUERY_UI',
 						    '?dolibarr_js_JQUERY_FLOT',
 							'?dolibarr_font_DOL_DEFAULT_TTF',
-                            '?dolibarr_font_DOL_DEFAULT_TTF_BOLD'
+                            '?dolibarr_font_DOL_DEFAULT_TTF_BOLD',
+							'separator',
+							'?dolibarr_mailing_limit_sendbyweb',
+							'?dolibarr_strict_mode'
 						);
 $configfilelib=array(
 //					'separator',
@@ -103,6 +106,7 @@ $configfilelib=array(
 					$langs->trans("DatabasePassword"),
 					$langs->trans("DBStoringCharset"),
 					$langs->trans("DBSortingCharset"),
+					$langs->trans("Prefix"),
 					'separator',
 					$langs->trans("AuthenticationMode"),
 					'separator',
@@ -128,7 +132,10 @@ $configfilelib=array(
                     'dolibarr_js_JQUERY_UI',
                     'dolibarr_js_JQUERY_FLOT',
 					'dolibarr_font_DOL_DEFAULT_TTF',
-                    'dolibarr_font_DOL_DEFAULT_TTF_BOLD'
+                    'dolibarr_font_DOL_DEFAULT_TTF_BOLD',
+					'separator',
+					'Limit nb of email sent by page',
+					'Strict mode is on/off'
 					);
 $var=true;
 print '<table class="noborder" width="100%">';

htdocs/conf/conf.php.example

@@ -96,14 +96,6 @@ $dolibarr_main_db_port='';
 $dolibarr_main_db_name='';
 
 
-// dolibarr_main_db_prefix
-// This parameter contains prefix of Dolibarr database.
-// Examples:
-// $dolibarr_main_db_prefix='llx_';
-//
-$dolibarr_main_db_prefix='';
-
-
 // dolibarr_main_db_user
 // This parameter contains user name used to read and write into
 // Dolibarr database.
@@ -242,6 +234,13 @@ $dolibarr_main_prod='0';
 // Other
 //##################
 
+// dolibarr_main_db_prefix
+// This parameter contains prefix of Dolibarr database. 'llx_' if not defined.
+// Examples:
+// $dolibarr_main_db_prefix='llx_';
+//
+$dolibarr_main_db_prefix='';
+
 // dolibarr_main_limit_users
 // Can set a limit on the number of users it will be possible to create
 // (the superadmin not included). Can be used for a restricted mode.
@@ -255,6 +254,12 @@ $dolibarr_main_prod='0';
 // Examples:
 // $dolibarr_mailing_limit_sendbyweb='0';
 
+// dolibarr_strict_mode
+// Set this to 1 to enable the PHP strict mode. For dev environment only.
+// Default value: 0 (use database value if exist)
+// Examples:
+// $dolibarr_strict_mode=0;
+
 
 //#################################
 // Path to external libraries/fonts