commit 3d97ccee5f4f056d9b638c40f24bc1bae465c6c2
parent 35bc44474ada856ff4208861d8faa4dbcb37fa28
Author: Leayawi <lea.oualli@outlook.fr>
Date: Mon, 2 Jun 2025 15:17:42 +0200
loop ok for https
Diffstat:
2 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/logo-header.ico b/logo-header.ico
Binary files differ.
diff --git a/taler-installer-taler.nsi b/taler-installer-taler.nsi
@@ -104,10 +104,13 @@ LangString MSG_REVERSE_PROXY_TITLE ${LANG_FRENCH} "Choisissez le mode du reverse
LangString MSG_HTTP_ONLY ${LANG_ENGLISH} "HTTP only"
LangString MSG_HTTP_ONLY ${LANG_FRENCH} "HTTP uniquement"
-LangString MSG_HTTPS ${LANG_ENGLISH} "HTTPS with Let's Encrypt "
-LangString MSG_HTTPS ${LANG_FRENCH} "HTTPS avec Let's Encrypt "
+LangString MSG_HTTPS ${LANG_ENGLISH} "HTTPS"
+LangString MSG_HTTPS ${LANG_FRENCH} "HTTPS"
+
+LangString MSG_DOMAIN_PING_FAIL ${LANG_FRENCH} "Le domaine '$0' ne repond pas au ping.$\r$\n$\r$\nCliquez sur Retry pour reessayer ce domaine, ou Cancel pour utiliser 'localhost'. Pour changer de domaine, cliquez sur Precedent."
+LangString MSG_DOMAIN_PING_FAIL ${LANG_ENGLISH} "The domain '$0' did not respond to ping.$\r$\n$\r$\nClick Retry to try this domain again, or Cancel to use 'localhost'. To change domain, click Previous."
+
-; ----------- NE PAS REMETTRE MSG_FINISH_LINK ICI ! -------------
Function DistroPage
nsDialogs::Create 1018
@@ -155,16 +158,40 @@ FunctionEnd
Function DomainPageLeave
${NSD_GetText} $DOMAIN_INPUT $0
+
${If} $0 == ""
MessageBox MB_OK|MB_ICONEXCLAMATION $(MSG_DOMAIN_REQUIRED)
Abort
${EndIf}
+
${If} $0 == "localhost"
MessageBox MB_OK $(MSG_LOCALHOST_WARN)
+ StrCpy $DOMAIN_INPUT $0
+ Return
${EndIf}
- StrCpy $DOMAIN_INPUT $0
+
+ StrCpy $1 0
+ loop_ping:
+ nsExec::ExecToStack 'ping -n 1 -w 1000 $0'
+ Pop $2
+ ${If} $2 == 0
+ StrCpy $DOMAIN_INPUT $0
+ Return
+ ${Else}
+ Push $0
+ MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION "$(MSG_DOMAIN_PING_FAIL)" IDRETRY retry_ping IDCANCEL use_localhost
+ retry_ping:
+ IntOp $1 $1 + 1
+ ${If} $1 < 3
+ Goto loop_ping
+ ${EndIf}
+ use_localhost:
+ StrCpy $DOMAIN_INPUT "localhost"
+ MessageBox MB_OK $(MSG_LOCALHOST_WARN)
+ ${EndIf}
FunctionEnd
+
Function ReverseProxyPage
nsDialogs::Create 1018
Pop $0