diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index ff1cce52ee7..26ed4bb8c92 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -96,6 +96,14 @@ $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.
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index f1da07fa947..fe3278fb81d 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -84,6 +84,11 @@ if (empty($_POST["db_name"]))
print ''.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DatabaseName")).'
';
$error++;
}
+if (empty($_POST["db_prefix"]))
+{
+ print ''.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DatabasePrefix")).'
';
+ $error++;
+}
if (empty($_POST["db_user"]))
{
print ''.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Login")).'
';
@@ -365,12 +370,15 @@ if (! $error && $db->connected && $action == "set")
}
}
}
+
+ // Table prefix
+ $main_db_prefix = ((GETPOST("db_prefix") && GETPOST("db_prefix") != '') ? GETPOST("db_prefix") : 'llx_');
// Force https
- $main_force_https = ((GETPOST("main_force_https") && ( GETPOST("main_force_https") == "on" || GETPOST("main_force_https") == 1) ) ? '1' : '0');
+ $main_force_https = ((GETPOST("main_force_https") && (GETPOST("main_force_https") == "on" || GETPOST("main_force_https") == 1)) ? '1' : '0');
// Use alternative directory
- $main_use_alt_dir = ((GETPOST("main_use_alt_dir") && ( GETPOST("main_use_alt_dir") == "on" || GETPOST("main_use_alt_dir") == 1) ) ? '' : '#');
+ $main_use_alt_dir = ((GETPOST("main_use_alt_dir") && (GETPOST("main_use_alt_dir") == "on" || GETPOST("main_use_alt_dir") == 1)) ? '' : '#');
// Alternative root directory name
$main_alt_dir_name = ((GETPOST("main_alt_dir_name") && GETPOST("main_alt_dir_name") != '') ? GETPOST("main_alt_dir_name") : 'custom');
@@ -724,7 +732,7 @@ function write_master_file($masterfile,$main_dir)
function write_conf_file($conffile)
{
global $conf,$langs;
- global $_POST,$main_dir,$main_data_dir,$main_force_https,$main_use_alt_dir,$main_alt_dir_name;
+ global $_POST,$main_dir,$main_data_dir,$main_force_https,$main_use_alt_dir,$main_alt_dir_name,$main_db_prefix;
global $dolibarr_main_url_root,$dolibarr_main_document_root,$dolibarr_main_data_root,$dolibarr_main_db_host;
global $dolibarr_main_db_port,$dolibarr_main_db_name,$dolibarr_main_db_user,$dolibarr_main_db_pass;
global $dolibarr_main_db_type,$dolibarr_main_db_character_set,$dolibarr_main_db_collation,$dolibarr_main_authentication;
@@ -777,6 +785,9 @@ function write_conf_file($conffile)
fputs($fp, '$dolibarr_main_db_name=\''.addslashes($_POST["db_name"]).'\';');
fputs($fp,"\n");
+
+ fputs($fp, '$dolibarr_main_db_prefix=\''.addslashes($main_db_prefix).'\';');
+ fputs($fp,"\n");
fputs($fp, '$dolibarr_main_db_user=\''.addslashes($_POST["db_user"]).'\';');
fputs($fp,"\n");
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 9c5e21fbf3e..b32d0e54a0a 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -40,16 +40,17 @@ $langs->load("errors");
// install.forced.php into directory htdocs/install (This is the case with some wizard
// installer like DoliWamp, DoliMamp or DoliBuntu).
// We first init "forced values" to nothing.
-if (! isset($force_install_noedit)) $force_install_noedit='';
-if (! isset($force_install_type)) $force_install_type='';
-if (! isset($force_install_dbserver)) $force_install_dbserver='';
-if (! isset($force_install_port)) $force_install_port='';
-if (! isset($force_install_database)) $force_install_database='';
-if (! isset($force_install_createdatabase)) $force_install_createdatabase='';
-if (! isset($force_install_databaselogin)) $force_install_databaselogin='';
-if (! isset($force_install_databasepass)) $force_install_databasepass='';
-if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin='';
-if (! isset($force_install_databaserootpass)) $force_install_databaserootpass='';
+if (! isset($force_install_noedit)) $force_install_noedit='';
+if (! isset($force_install_type)) $force_install_type='';
+if (! isset($force_install_dbserver)) $force_install_dbserver='';
+if (! isset($force_install_port)) $force_install_port='';
+if (! isset($force_install_database)) $force_install_database='';
+if (! isset($force_install_prefix)) $force_install_prefix='';
+if (! isset($force_install_createdatabase)) $force_install_createdatabase='';
+if (! isset($force_install_databaselogin)) $force_install_databaselogin='';
+if (! isset($force_install_databasepass)) $force_install_databasepass='';
+if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin='';
+if (! isset($force_install_databaserootpass)) $force_install_databaserootpass='';
// Now we load forced value from install.forced.php file.
$useforcedwizard=false;
if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
@@ -80,8 +81,7 @@ if (! empty($force_install_message))
}
?>
-