New: add prefix field in install form and in conf.php

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.

htdocs/install/etape1.php

@@ -84,6 +84,11 @@ if (empty($_POST["db_name"]))
     print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DatabaseName")).'</div>';
     $error++;
 }
+if (empty($_POST["db_prefix"]))
+{
+	print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DatabasePrefix")).'</div>';
+	$error++;
+}
 if (empty($_POST["db_user"]))
 {
     print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Login")).'</div>';
@@ -366,6 +371,9 @@ 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');
 
@@ -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;
@@ -778,6 +786,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");
 

htdocs/install/fileconf.php

@@ -45,6 +45,7 @@ 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='';
@@ -80,8 +81,7 @@ if (! empty($force_install_message))
 }
 
 ?>
-<table
+<table border="0" cellpadding="1" cellspacing="0">
-	border="0" cellpadding="1" cellspacing="0">
 
 	<tr>
 		<td colspan="3" class="label" align="center">
@@ -349,6 +349,16 @@ if (! empty($force_install_message))
 		<td class="comment"><?php echo $langs->trans("DatabaseName"); ?></td>
 	</tr>
 	
+	<tr>
+		<td class="label" valign="top"><b> <?php echo $langs->trans("DatabasePrefix"); ?>
+		</b></td>
+
+		<td class="label" valign="top"><input type="text" id="db_prefix"
+			name="db_prefix"
+			value="<?php echo (! empty($dolibarr_main_db_prefix))?$dolibarr_main_db_prefix:($force_install_prefix?$force_install_prefix:'llx_'); ?>"></td>
+		<td class="comment"><?php echo $langs->trans("DatabasePrefix"); ?></td>
+	</tr>
+
 	<tr>
 		<td class="label" valign="top"><?php echo $langs->trans("CreateDatabase"); ?>
 		</td>