Enhance DoliWamp install
This commit is contained in:
parent
66463fd007
commit
da5ccc6e38
@ -349,9 +349,6 @@ begin
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
if MsgBox('DoliWamp installer will now start or restart Apache and Mysql, this may last from several seconds to one minute after this confirmation...',mbConfirmation,MB_YESNO) = IDYES then
|
|
||||||
begin
|
|
||||||
|
|
||||||
// Check if parameters already defined in conf.php file
|
// Check if parameters already defined in conf.php file
|
||||||
srcFile := pathWithSlashes+'/www/dolibarr/htdocs/conf/conf.php';
|
srcFile := pathWithSlashes+'/www/dolibarr/htdocs/conf/conf.php';
|
||||||
if not FileExists (srcFile) then
|
if not FileExists (srcFile) then
|
||||||
@ -384,37 +381,46 @@ begin
|
|||||||
begin
|
begin
|
||||||
|
|
||||||
// Test serveur SMTP
|
// Test serveur SMTP
|
||||||
|
// if paramok then
|
||||||
|
// begin
|
||||||
// batFile := pathWithSlashes+'/UsedPort.exe';
|
// batFile := pathWithSlashes+'/UsedPort.exe';
|
||||||
// MsgBox('batFile = '+batFile,mbConfirmation,MB_YESNO)
|
// MsgBox('batFile = '+batFile,mbConfirmation,MB_YESNO)
|
||||||
// Exec(batFile, '-s '+smtpServer+' -p 25', path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
|
// Exec(batFile, '-s '+smtpServer+' -p 25', path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
|
||||||
//themessage := 'Le serveur '+smtpServer+' semble ne pas etre joignable pour l envoi de mail SMTP (port 25). Si vous avez un firewall, verifiez sa configuration. Sinon, revenez en arriere pour choisir une autre valeur pour le serveur SMTP sortant d envoi de mail (Cette information est doit etre fournie par votre fournisseur d acces Internet).';
|
//themessage := 'Le serveur '+smtpServer+' semble ne pas etre joignable pour l envoi de mail SMTP (port 25). Si vous avez un firewall, verifiez sa configuration. Sinon, revenez en arriere pour choisir une autre valeur pour le serveur SMTP sortant d envoi de mail (Cette information est doit etre fournie par votre fournisseur d acces Internet).';
|
||||||
// themessage := 'The server '+smtpServer+' seems to be unreachable to send outgoing SMTP emails (port 25). If you have a firewall, check its setup. Otherwise, go back to choose another value for the SMTP server (This information shoud be given by your Internet Service Provider) or click "No" to ignore error.';
|
// themessage := 'The server '+smtpServer+' seems to be unreachable to send outgoing SMTP emails (port 25). If you have a firewall, check its setup. Otherwise, go back to choose another value for the SMTP server (This information shoud be given by your Internet Service Provider) or click "No" to ignore error. Cancel choice to choose another value ?';
|
||||||
// if ((IntToStr(myResult) <> '0') and (MsgBox(themessage,mbConfirmation,MB_YESNO) = IDYES)) then
|
// if ((IntToStr(myResult) <> '0') and (MsgBox(themessage,mbConfirmation,MB_YESNO) = IDYES)) then
|
||||||
// begin
|
// begin
|
||||||
// paramok := False;
|
// paramok := False;
|
||||||
|
// end;
|
||||||
// end;
|
// end;
|
||||||
|
|
||||||
|
if paramok then
|
||||||
|
begin
|
||||||
// Test port Apache
|
// Test port Apache
|
||||||
batFile := pathWithSlashes+'/UsedPort.exe';
|
batFile := pathWithSlashes+'/UsedPort.exe';
|
||||||
MsgBox('batFile = '+batFile,mbConfirmation,MB_YESNO)
|
//MsgBox('batFile = '+batFile,mbConfirmation,MB_YESNO)
|
||||||
Exec(batFile, '-s localhost -p '+myporta, path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
|
Exec(batFile, '-s localhost -p '+myporta, path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
|
||||||
//themessage := 'Le port '+myporta+' semble deja pris. Revenez en arriere pour choisir une autre valeur pour le port Apache.';
|
//themessage := 'Le port '+myporta+' semble deja pris. Revenez en arriere pour choisir une autre valeur pour le port Apache.';
|
||||||
themessage := 'Port '+myporta+' seems to be already in use. Go back to choose another value for Apache port or click "No" to ignore error.';
|
themessage := 'Port '+myporta+' seems to be already in use. Go back to choose another value for Apache port. Cancel choice and choose another value ?';
|
||||||
if ((IntToStr(myResult) <> '0') and (MsgBox(themessage,mbConfirmation,MB_YESNO) = IDYES)) then
|
if ((IntToStr(myResult) = '0') and (MsgBox(themessage,mbConfirmation,MB_YESNO) = IDYES)) then
|
||||||
begin
|
begin
|
||||||
paramok := False;
|
paramok := False;
|
||||||
end;
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
|
if paramok then
|
||||||
|
begin
|
||||||
// Test port Mysql
|
// Test port Mysql
|
||||||
batFile := pathWithSlashes+'/UsedPort.exe';
|
batFile := pathWithSlashes+'/UsedPort.exe';
|
||||||
MsgBox('batFile = '+batFile,mbConfirmation,MB_YESNO)
|
//MsgBox('batFile = '+batFile,mbConfirmation,MB_YESNO)
|
||||||
Exec(batFile, '-s localhost -p '+myport, path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
|
Exec(batFile, '-s localhost -p '+myport, path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
|
||||||
//themessage := 'Le port '+myport+' semble deja pris. Revenez en arriere pour choisir une autre valeur pour le port MySQL.';
|
//themessage := 'Le port '+myport+' semble deja pris. Revenez en arriere pour choisir une autre valeur pour le port MySQL.';
|
||||||
themessage := 'Port '+myport+' seems to be already in use. Go back to choose another value for MySQL port or click "No" to ignore error.';
|
themessage := 'Port '+myport+' seems to be already in use. Go back to choose another value for MySQL port. Cancel choice and choose another value ?';
|
||||||
if ((IntToStr(myResult) <> '0') and (MsgBox(themessage,mbConfirmation,MB_YESNO) = IDYES)) then
|
if ((IntToStr(myResult) = '0') and (MsgBox(themessage,mbConfirmation,MB_YESNO) = IDYES)) then
|
||||||
begin
|
begin
|
||||||
paramok := False;
|
paramok := False;
|
||||||
end;
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
@ -468,7 +474,6 @@ begin
|
|||||||
browser := 'C:/Program Files/Mozilla Firefox/firefox.exe';
|
browser := 'C:/Program Files/Mozilla Firefox/firefox.exe';
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
if browser = 'explorer.exe' then
|
if browser = 'explorer.exe' then
|
||||||
begin
|
begin
|
||||||
GetOpenFileName('Please choose your default browser. If you are not sure, just click Open :', browser, winPath,'exe files (*.exe)|*.exe|All files (*.*)|*.*' ,'exe');
|
GetOpenFileName('Please choose your default browser. If you are not sure, just click Open :', browser, winPath,'exe files (*.exe)|*.exe|All files (*.*)|*.*' ,'exe');
|
||||||
@ -494,6 +499,9 @@ begin
|
|||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
if MsgBox('DoliWamp installer will now start or restart Apache and Mysql, this may last from several seconds to one minute after this confirmation. Start to install the web server and database server ?',mbConfirmation,MB_YESNO) = IDYES then
|
||||||
|
begin
|
||||||
|
|
||||||
|
|
||||||
//----------------------------------------------
|
//----------------------------------------------
|
||||||
// Fichier alias phpmyadmin
|
// Fichier alias phpmyadmin
|
||||||
@ -850,7 +858,7 @@ begin
|
|||||||
else
|
else
|
||||||
begin
|
begin
|
||||||
|
|
||||||
MsgBox('Selected values seems to be already used. Please choose other values.',mbInformation,MB_OK);
|
// MsgBox('Apache and Mysql installation has been canceled. Please select parameters to start their installation.',mbInformation,MB_OK)
|
||||||
|
|
||||||
res := False;
|
res := False;
|
||||||
|
|
||||||
@ -860,7 +868,7 @@ begin
|
|||||||
else
|
else
|
||||||
begin
|
begin
|
||||||
|
|
||||||
// MsgBox('Apache and Mysql installation has been canceled. Please select parameters to start their installation.',mbInformation,MB_OK)
|
//MsgBox('Selected values seems to be already used. Please choose other values.',mbInformation,MB_OK);
|
||||||
|
|
||||||
res := False;
|
res := False;
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user