Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix installers

Browse Source
This commit is contained in:
Laurent Destailleur
2017-06-24 21:36:51 +02:00
parent e79f3715b4
commit ab9be29356
7 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/exe/doliwamp/install.forced.php.install
View File

@@ -5,7 +5,7 @@
// during install process to be used. // during install process to be used.
// //
// //
$force_install_noedit=2; $force_install_noedit=2; // 1=To block vars specific to distrib, 2 to block all technical parameters
$force_install_message='KeepDefaultValuesWamp'; $force_install_message='KeepDefaultValuesWamp';
$force_install_main_data_root='WAMPROOT/dolibarr_documents'; $force_install_main_data_root='WAMPROOT/dolibarr_documents';
$force_install_type='mysqli'; $force_install_type='mysqli';

2
build/rpm/install.forced.php.fedora
View File

@@ -1,7 +1,7 @@
<?php <?php
$force_install_packager='rpmfedora'; $force_install_packager='rpmfedora';
$force_install_noedit=1; # 1 to block var specific to distrib, 2 to block every technical parameters $force_install_noedit=1; // 1 to block var specific to distrib, 2 to block every technical parameters
$force_install_message='KeepDefaultValuesDeb'; $force_install_message='KeepDefaultValuesDeb';
$force_install_main_data_root='/var/lib/dolibarr/documents'; $force_install_main_data_root='/var/lib/dolibarr/documents';
$force_install_type='mysqli'; $force_install_type='mysqli';

2
build/rpm/install.forced.php.generic
View File

@@ -1,7 +1,7 @@
<?php <?php
$force_install_packager='rpmgeneric'; $force_install_packager='rpmgeneric';
$force_install_noedit=1; # 1 to block var specific to distrib, 2 to block every technical parameters $force_install_noedit=1; // 1 to block var specific to distrib, 2 to block every technical parameters
$force_install_message='KeepDefaultValuesDeb'; $force_install_message='KeepDefaultValuesDeb';
$force_install_main_data_root='/var/lib/dolibarr/documents'; $force_install_main_data_root='/var/lib/dolibarr/documents';
$force_install_type='mysqli'; $force_install_type='mysqli';

2
build/rpm/install.forced.php.mandriva
View File

@@ -1,7 +1,7 @@
<?php <?php
$force_install_packager='rpmmandriva'; $force_install_packager='rpmmandriva';
$force_install_noedit=1; # 1 to block var specific to distrib, 2 to block every technical parameters $force_install_noedit=1; // 1 to block var specific to distrib, 2 to block every technical parameters
$force_install_message='KeepDefaultValuesDeb'; $force_install_message='KeepDefaultValuesDeb';
$force_install_main_data_root='/var/lib/dolibarr/documents'; $force_install_main_data_root='/var/lib/dolibarr/documents';
$force_install_type='mysqli'; $force_install_type='mysqli';

2
build/rpm/install.forced.php.opensuse
View File

@@ -1,7 +1,7 @@
<?php <?php
$force_install_packager='rpmopensuse'; $force_install_packager='rpmopensuse';
$force_install_noedit=1; # 1 to block var specific to distrib, 2 to block every technical parameters $force_install_noedit=1; // 1 to block var specific to distrib, 2 to block every technical parameters
$force_install_message='KeepDefaultValuesDeb'; $force_install_message='KeepDefaultValuesDeb';
$force_install_main_data_root='/var/lib/dolibarr/documents'; $force_install_main_data_root='/var/lib/dolibarr/documents';
$force_install_type='mysqli'; $force_install_type='mysqli';

26
htdocs/install/fileconf.php
View File

@@ -66,6 +66,7 @@ if (@file_exists($forcedfile)) {
} }
/* /*
* View * View
*/ */
@@ -426,8 +427,8 @@ if (! empty($force_install_message))
<input type="password" id="db_pass" autocomplete="off" <input type="password" id="db_pass" autocomplete="off"
name="db_pass" name="db_pass"
value="<?php value="<?php
// We don't want to set password. It will be extracted from the forced install file at step1. // If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1.
$autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : ''); $autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*'));
if (!empty($dolibarr_main_prod)) { if (!empty($dolibarr_main_prod)) {
$autofill = ''; $autofill = '';
} }
@@ -479,7 +480,7 @@ if (! empty($force_install_message))
name="db_user_root" name="db_user_root"
class="needroot" class="needroot"
value="<?php print (!empty($force_install_databaserootlogin)) ? $force_install_databaserootlogin : @$db_user_root; ?>" value="<?php print (!empty($force_install_databaserootlogin)) ? $force_install_databaserootlogin : @$db_user_root; ?>"
<?php if ($force_install_noedit == 2 && $force_install_databaserootlogin !== null) { <?php if ($force_install_noedit > 0 && ! empty($force_install_databaserootlogin)) {
print ' disabled'; print ' disabled';
} ?> } ?>
> >
@@ -499,26 +500,28 @@ if (! empty($force_install_message))
<td class="label" valign="top"><b><?php echo $langs->trans("Password"); ?></b> <td class="label" valign="top"><b><?php echo $langs->trans("Password"); ?></b>
</td> </td>
<td class="label" valign="top"> <td class="label" valign="top">
<input type="password" <input type="password"
autocomplete="off" autocomplete="off"
id="db_pass_root" id="db_pass_root"
name="db_pass_root" name="db_pass_root"
class="needroot" class="needroot"
value="<?php value="<?php
// We don't want to set password. It will be extracted from the forced install file at step1. // If $force_install_databaserootpass is on, we don't want to set password here, we just show '***'. Real value will be extracted from the forced install file at step1.
$autofill = ((!empty($force_install_database_rootpass)) ? '' : @$db_pass_root); $autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : @$db_pass_root);
if (!empty($dolibarr_main_prod)) { if (!empty($dolibarr_main_prod)) {
$autofill = ''; $autofill = '';
} // Do not autofill password if instance is a production instance }
// Do not autofill password if instance is a production instance
if (!empty($_SERVER["SERVER_NAME"]) && !in_array($_SERVER["SERVER_NAME"], if (!empty($_SERVER["SERVER_NAME"]) && !in_array($_SERVER["SERVER_NAME"],
array('127.0.0.1', 'localhost')) array('127.0.0.1', 'localhost', 'localhostgit'))
) { ) {
$autofill = ''; $autofill = '';
} // Do not autofill password for remote access } // Do not autofill password for remote access
print dol_escape_htmltag($autofill); print dol_escape_htmltag($autofill);
?>" ?>"
<?php if ($force_install_noedit == 2 && $force_install_databaserootpass !== null) { <?php if ($force_install_noedit > 0 && ! empty($force_install_databaserootpass)) {
print ' disabled'; print ' disabled'; // May be removed by javascript
} ?> } ?>
> >
</td> </td>
@@ -561,7 +564,10 @@ jQuery(document).ready(function() {
if (jQuery("#db_create_database").is(":checked") || jQuery("#db_create_user").is(":checked")) if (jQuery("#db_create_database").is(":checked") || jQuery("#db_create_user").is(":checked"))
{ {
jQuery(".hideroot").show(); jQuery(".hideroot").show();
jQuery(".needroot").removeAttr('disabled'); <?php
if ($force_install_noedit == 0) { ?>
jQuery(".needroot").removeAttr('disabled');
<?php } ?>
} }
else else
{ {

5
htdocs/install/step1.php
View File

@@ -88,6 +88,7 @@ if (@file_exists($forcedfile)) {
$main_data_dir = detect_dolibarr_main_data_root($main_dir); $main_data_dir = detect_dolibarr_main_data_root($main_dir);
} }
$main_url = detect_dolibarr_main_url_root(); $main_url = detect_dolibarr_main_url_root();
if (!empty($force_install_databaserootlogin)) { if (!empty($force_install_databaserootlogin)) {
$userroot = parse_database_login($force_install_databaserootlogin); $userroot = parse_database_login($force_install_databaserootlogin);
} }
@@ -542,7 +543,7 @@ if (! $error && $db->connected && $action == "set")
if ($db->connected) if ($db->connected)
{ {
$resultbis = 1; $resultbis = 1;
// Create user // Create user
$result=$db->DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name); $result=$db->DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
// Create user bis // Create user bis
@@ -553,7 +554,7 @@ if (! $error && $db->connected && $action == "set")
$resultbis=$db->DDLCreateUser('%', $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name); $resultbis=$db->DDLCreateUser('%', $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name);
} }
} }
if ($result > 0 && $resultbis > 0) if ($result > 0 && $resultbis > 0)
{ {