Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-13 03:12:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enhancements for doliwamp

Browse Source
This commit is contained in:
Laurent Destailleur
2008-05-17 14:56:06 +00:00
parent f21557f4c7
commit 2a0e021382
6 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,16 @@
<?php
$force_install_main_data_root='WAMPROOT/dolibarr_documents';
$force_install_type='mysqli';
$force_install_port='WAMPMYSQLPORT';
$force_install_database='dolibarr';
$force_install_createdatabase='1';
$force_install_databaselogin='root';
$force_install_databasepass='WAMPMYSQLNEWPASSWORD';
$force_install_databaserootlogin='root';
$force_install_databaserootpass='WAMPMYSQLNEWPASSWORD';
$force_install_dolibarrlogin='admin';
$force_install_nophpinfo='1';
$force_install_renamedir='1';
<?php
$force_install_message_doliwamp='1';
$force_install_main_data_root='WAMPROOT/dolibarr_documents';
$force_install_type='mysqli';
$force_install_port='WAMPMYSQLPORT';
$force_install_database='dolibarr';
$force_install_createdatabase='1';
$force_install_databaselogin='dolibarrmysql';
$force_install_databasepass='WAMPMYSQLNEWPASSWORD';
$force_install_createuser='1';
$force_install_databaserootlogin='root';
$force_install_databaserootpass='WAMPMYSQLNEWPASSWORD';
$force_install_dolibarrlogin='admin';
$force_install_nophpinfo='1';
$force_install_lockinstall='1';
?>

4
build/exe/doliwamp/mysqlinitpassword.bat.install
View File

@@ -9,8 +9,8 @@ REM type .\mysqlinitpassword.bat >> doliwamp.log 2>>&1
sleep 3
REM sleep 20
echo ---- Execute script to init mysql password >> doliwamp.log 2>>&1
echo If an error is shown here, rerun this script manually. >> doliwamp.log 2>>&1
echo ---- Execute script mysqlinitpassword.bat to init mysql password >> doliwamp.log 2>>&1
echo If an error is shown here, rerun the script manually. >> doliwamp.log 2>>&1
.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqladmin -v -w6 -P WAMPMYSQLPORT -u root password WAMPMYSQLNEWPASSWORD >> doliwamp.log 2>>&1
echo ---- End script >> doliwamp.log 2>>&1

6
htdocs/install/etape5.php
View File

@@ -46,7 +46,7 @@ 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_renamedir)) $force_install_renamedir='';
if (! isset($force_install_lockinstall)) $force_install_lockinstall='';
if (file_exists("./install.forced.php")) include_once("./install.forced.php");
dolibarr_install_syslog("etape5: Entering etape5.php page", LOG_INFO);
@@ -208,7 +208,7 @@ if ($_POST["action"] == "set")
{
// Fin install
print $langs->trans("SystemIsInstalled")."<br>";
if (empty($force_install_renamedir))
if (empty($force_install_lockinstall))
{
print '<div class="warning">'.$langs->trans("WarningRemoveInstallDir")."</div>";
}
@@ -230,7 +230,7 @@ if ($_POST["action"] == "upgrade")
{
// Fin install
print $langs->trans("SystemIsUpgraded")."<br>";
if (empty($force_install_renamedir))
if (empty($force_install_lockinstall))
{
print '<div class="warning">'.$langs->trans("WarningRemoveInstallDir")."</div>";
}

7
htdocs/install/fileconf.php
View File

@@ -56,6 +56,11 @@ dolibarr_install_syslog("Fileconf: Entering fileconf.php page");
pHeader($langs->trans("ConfigurationFile"),"etape0");
if ($force_install_message_doliwamp)
{
print $langs->trans("KeepDefaultValues").'<br>';
}
print '<table border="0" cellpadding="1" cellspacing="0">';
@@ -335,7 +340,7 @@ while (($file = readdir($handle))!==false)
<?php echo $langs->trans("CreateUser"); ?>
</td>
<td class="label" valign="top"><input type="checkbox" name="db_create_user"></td>
<td class="label" valign="top"><input type="checkbox" name="db_create_user"<?php if ($force_install_createuser) print ' checked="on"'; ?>></td>
<td class="comment">
<?php echo $langs->trans("CheckToCreateUser"); ?>
</td>

1
htdocs/langs/en_US/install.lang
View File

@@ -121,6 +121,7 @@ YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%
BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
OrphelinsPaymentsDetectedByMethod=Orphelins payment detected by method %s
RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
KeepDefaultValues=You use the Doliwamp setup wizard, so values proposed here are already optimized. Change them only if you know what you do.
#########
# upgrade

1
htdocs/langs/fr_FR/install.lang
View File

@@ -122,6 +122,7 @@ YouAskLoginCreationSoDolibarrNeedToConnect=Vous avez demand
BecauseConnectionFailedParametersMayBeWrong=La connexion ayant <20>chou<6F>, les param<61>tres du serveur ou du super utilisateur sont peut-etre incorrects.
OrphelinsPaymentsDetectedByMethod=Paiement orphelins detect<63>s par la m<>thode %s
RemoveItManuallyAndPressF5ToContinue=Supprimer le manuellement et appuyez sur F5 pour continuer.
KeepDefaultValues=Comme vous utilisez l'assistant d'installation depuis DoliWamp, les valeurs propos<6F>es aux param<61>tres sont d<>j<EFBFBD> optimis<69>es. Ne les modifier qu'en connaissance de cause.
#########
# upgrade