Add a waiting message for Kerberos/SSL workflow (#1670)
This commit is contained in:
parent
145db1cf60
commit
8cd579f19f
|
@ -114,6 +114,7 @@ sub extractFormInfo {
|
||||||
#$self->p->setHiddenFormValue( $req, kerberos => 0, '', 0 );
|
#$self->p->setHiddenFormValue( $req, kerberos => 0, '', 0 );
|
||||||
eval( $self->InitCmd );
|
eval( $self->InitCmd );
|
||||||
die 'Unable to launch init commmand ' . $self->{InitCmd} if ($@);
|
die 'Unable to launch init commmand ' . $self->{InitCmd} if ($@);
|
||||||
|
$req->data->{waitingMessage} = 1;
|
||||||
return PE_FIRSTACCESS;
|
return PE_FIRSTACCESS;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,6 +51,7 @@ sub extractFormInfo {
|
||||||
$req->data->{customScript} .= $self->{AjaxInitScript};
|
$req->data->{customScript} .= $self->{AjaxInitScript};
|
||||||
$self->logger->debug(
|
$self->logger->debug(
|
||||||
"Send init/script -> " . $req->data->{customScript} );
|
"Send init/script -> " . $req->data->{customScript} );
|
||||||
|
$req->data->{waitingMessage} = 1;
|
||||||
return PE_FIRSTACCESS;
|
return PE_FIRSTACCESS;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
|
@ -113,7 +113,7 @@ sub display {
|
||||||
&& $req->data->{login},
|
&& $req->data->{login},
|
||||||
ASK_LOGINS => $req->param('checkLogins') || 0,
|
ASK_LOGINS => $req->param('checkLogins') || 0,
|
||||||
CONFIRMKEY => $self->stamp(),
|
CONFIRMKEY => $self->stamp(),
|
||||||
LIST => $req->data->{list} || [],
|
LIST => $req->data->{list} || [],
|
||||||
REMEMBER => $req->data->{confirmRemember},
|
REMEMBER => $req->data->{confirmRemember},
|
||||||
(
|
(
|
||||||
$req->data->{customScript}
|
$req->data->{customScript}
|
||||||
|
@ -420,6 +420,10 @@ sub display {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( $req->data->{waitingMessage} ) {
|
||||||
|
$templateParams{WAITING_MESSAGE} = 1;
|
||||||
|
}
|
||||||
|
|
||||||
$self->logger->debug("Skin returned: $skinfile");
|
$self->logger->debug("Skin returned: $skinfile");
|
||||||
return ( $skinfile, \%templateParams );
|
return ( $skinfile, \%templateParams );
|
||||||
}
|
}
|
||||||
|
|
|
@ -242,6 +242,7 @@
|
||||||
"verify":"التحقق",
|
"verify":"التحقق",
|
||||||
"VHnotFound":"Virtual Host not found",
|
"VHnotFound":"Virtual Host not found",
|
||||||
"wait":"انتظر",
|
"wait":"انتظر",
|
||||||
|
"waitingmessage":"Authentication in progress, please wait",
|
||||||
"warning":"تحذير",
|
"warning":"تحذير",
|
||||||
"welcomeOnPortal":"مرحبا بك على بوابة إثبات الهوية الآمنة.",
|
"welcomeOnPortal":"مرحبا بك على بوابة إثبات الهوية الآمنة.",
|
||||||
"yesResendMail":"نعم، أعد إرسال البريد",
|
"yesResendMail":"نعم، أعد إرسال البريد",
|
||||||
|
|
|
@ -242,6 +242,7 @@
|
||||||
"verify":"Verify",
|
"verify":"Verify",
|
||||||
"VHnotFound":"Virtual Host not found",
|
"VHnotFound":"Virtual Host not found",
|
||||||
"wait":"Warten",
|
"wait":"Warten",
|
||||||
|
"waitingmessage":"Authentication in progress, please wait",
|
||||||
"warning":"Warnung",
|
"warning":"Warnung",
|
||||||
"welcomeOnPortal":"Willkommen in Ihrem gesicherten Authentifizierungsportal.",
|
"welcomeOnPortal":"Willkommen in Ihrem gesicherten Authentifizierungsportal.",
|
||||||
"yesResendMail":"Ja, Mail erneut senden.",
|
"yesResendMail":"Ja, Mail erneut senden.",
|
||||||
|
|
|
@ -242,6 +242,7 @@
|
||||||
"verify": "Verify",
|
"verify": "Verify",
|
||||||
"VHnotFound":"Virtual Host not found",
|
"VHnotFound":"Virtual Host not found",
|
||||||
"wait":"Wait",
|
"wait":"Wait",
|
||||||
|
"waitingmessage":"Authentication in progress, please wait",
|
||||||
"warning":"Warning",
|
"warning":"Warning",
|
||||||
"welcomeOnPortal":"Welcome on your secured authentication portal.",
|
"welcomeOnPortal":"Welcome on your secured authentication portal.",
|
||||||
"yesResendMail":"Yes, resend the mail",
|
"yesResendMail":"Yes, resend the mail",
|
||||||
|
|
|
@ -242,6 +242,7 @@
|
||||||
"verify":"Verify",
|
"verify":"Verify",
|
||||||
"VHnotFound":"Virtual Host not found",
|
"VHnotFound":"Virtual Host not found",
|
||||||
"wait":"Wait",
|
"wait":"Wait",
|
||||||
|
"waitingmessage":"Authentication in progress, please wait",
|
||||||
"warning":"Warning",
|
"warning":"Warning",
|
||||||
"welcomeOnPortal":"Welcome on your secured authentication portal.",
|
"welcomeOnPortal":"Welcome on your secured authentication portal.",
|
||||||
"yesResendMail":"Yes, resend the mail",
|
"yesResendMail":"Yes, resend the mail",
|
||||||
|
|
|
@ -242,6 +242,7 @@
|
||||||
"verify": "Vérifier",
|
"verify": "Vérifier",
|
||||||
"VHnotFound":"Hôte virtuel erroné ou inexistant",
|
"VHnotFound":"Hôte virtuel erroné ou inexistant",
|
||||||
"wait":"Attendre",
|
"wait":"Attendre",
|
||||||
|
"waitingmessage":"Authentification en cours, merci de patienter",
|
||||||
"warning":"Attention",
|
"warning":"Attention",
|
||||||
"welcomeOnPortal":"Bienvenue sur votre portail d'authentification sécurisée.",
|
"welcomeOnPortal":"Bienvenue sur votre portail d'authentification sécurisée.",
|
||||||
"yesResendMail":"Oui, renvoyer le mail",
|
"yesResendMail":"Oui, renvoyer le mail",
|
||||||
|
|
|
@ -242,6 +242,7 @@
|
||||||
"verify":"Verifica",
|
"verify":"Verifica",
|
||||||
"VHnotFound":"Virtual Host not found",
|
"VHnotFound":"Virtual Host not found",
|
||||||
"wait":"Attendere",
|
"wait":"Attendere",
|
||||||
|
"waitingmessage":"Authentication in progress, please wait",
|
||||||
"warning":"Avvertimento",
|
"warning":"Avvertimento",
|
||||||
"welcomeOnPortal":"Benvenuto sul tuo portale di autenticazione protetta.",
|
"welcomeOnPortal":"Benvenuto sul tuo portale di autenticazione protetta.",
|
||||||
"yesResendMail":"Sì, rinvia e-mail",
|
"yesResendMail":"Sì, rinvia e-mail",
|
||||||
|
|
|
@ -242,6 +242,7 @@
|
||||||
"verify":"Verify",
|
"verify":"Verify",
|
||||||
"VHnotFound":"Virtual Host not found",
|
"VHnotFound":"Virtual Host not found",
|
||||||
"wait":"Wait",
|
"wait":"Wait",
|
||||||
|
"waitingmessage":"Authentication in progress, please wait",
|
||||||
"warning":"Warning",
|
"warning":"Warning",
|
||||||
"welcomeOnPortal":"Welcome on your secured authentication portal.",
|
"welcomeOnPortal":"Welcome on your secured authentication portal.",
|
||||||
"yesResendMail":"Yes, resend the mail",
|
"yesResendMail":"Yes, resend the mail",
|
||||||
|
|
|
@ -242,6 +242,7 @@
|
||||||
"verify":"Verify",
|
"verify":"Verify",
|
||||||
"VHnotFound":"Virtual Host not found",
|
"VHnotFound":"Virtual Host not found",
|
||||||
"wait":"Wait",
|
"wait":"Wait",
|
||||||
|
"waitingmessage":"Authentication in progress, please wait",
|
||||||
"warning":"Warning",
|
"warning":"Warning",
|
||||||
"welcomeOnPortal":"Welcome on your secured authentication portal.",
|
"welcomeOnPortal":"Welcome on your secured authentication portal.",
|
||||||
"yesResendMail":"Yes, resend the mail",
|
"yesResendMail":"Yes, resend the mail",
|
||||||
|
|
|
@ -242,6 +242,7 @@
|
||||||
"verify":"Verify",
|
"verify":"Verify",
|
||||||
"VHnotFound":"Virtual Host not found",
|
"VHnotFound":"Virtual Host not found",
|
||||||
"wait":"Wait",
|
"wait":"Wait",
|
||||||
|
"waitingmessage":"Authentication in progress, please wait",
|
||||||
"warning":"Warning",
|
"warning":"Warning",
|
||||||
"welcomeOnPortal":"Welcome on your secured authentication portal.",
|
"welcomeOnPortal":"Welcome on your secured authentication portal.",
|
||||||
"yesResendMail":"Yes, resend the mail",
|
"yesResendMail":"Yes, resend the mail",
|
||||||
|
|
|
@ -242,6 +242,7 @@
|
||||||
"verify":"Xác minh",
|
"verify":"Xác minh",
|
||||||
"VHnotFound":"Virtual Host not found",
|
"VHnotFound":"Virtual Host not found",
|
||||||
"wait":"Hãy đợi",
|
"wait":"Hãy đợi",
|
||||||
|
"waitingmessage":"Authentication in progress, please wait",
|
||||||
"warning":"Cảnh báo",
|
"warning":"Cảnh báo",
|
||||||
"welcomeOnPortal":"Chào mừng bạn đến với cổng thông tin xác thực được bảo mật của bạn.",
|
"welcomeOnPortal":"Chào mừng bạn đến với cổng thông tin xác thực được bảo mật của bạn.",
|
||||||
"yesResendMail":"Có, gửi lại thư",
|
"yesResendMail":"Có, gửi lại thư",
|
||||||
|
|
|
@ -242,6 +242,7 @@
|
||||||
"verify":"验证",
|
"verify":"验证",
|
||||||
"VHnotFound":"Virtual Host not found",
|
"VHnotFound":"Virtual Host not found",
|
||||||
"wait":"等待",
|
"wait":"等待",
|
||||||
|
"waitingmessage":"Authentication in progress, please wait",
|
||||||
"warning":"警告",
|
"warning":"警告",
|
||||||
"welcomeOnPortal":"欢迎来到您的加密认证 portal",
|
"welcomeOnPortal":"欢迎来到您的加密认证 portal",
|
||||||
"yesResendMail":"好的,重新发送邮件",
|
"yesResendMail":"好的,重新发送邮件",
|
||||||
|
|
|
@ -1,3 +1,10 @@
|
||||||
|
<TMPL_IF NAME="TOKEN">
|
||||||
|
<input type="hidden" name="token" value="<TMPL_VAR NAME="TOKEN">" />
|
||||||
|
</TMPL_IF>
|
||||||
|
|
||||||
|
<TMPL_IF NAME="WAITING_MESSAGE">
|
||||||
|
<div class="alert alert-info"><span trspan="waitingmessage" /></div>
|
||||||
|
<TMPL_ELSE>
|
||||||
<div class="form">
|
<div class="form">
|
||||||
<div class="input-group mb-3">
|
<div class="input-group mb-3">
|
||||||
<div class="input-group-prepend">
|
<div class="input-group-prepend">
|
||||||
|
@ -24,9 +31,6 @@
|
||||||
<input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" trplaceholder="captcha" required aria-required="true" autocomplete="off" />
|
<input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" trplaceholder="captcha" required aria-required="true" autocomplete="off" />
|
||||||
</div>
|
</div>
|
||||||
</TMPL_IF>
|
</TMPL_IF>
|
||||||
<TMPL_IF NAME="TOKEN">
|
|
||||||
<input type="hidden" name="token" value="<TMPL_VAR NAME="TOKEN">" />
|
|
||||||
</TMPL_IF>
|
|
||||||
|
|
||||||
<TMPL_INCLUDE NAME="impersonation.tpl">
|
<TMPL_INCLUDE NAME="impersonation.tpl">
|
||||||
<TMPL_INCLUDE NAME="checklogins.tpl">
|
<TMPL_INCLUDE NAME="checklogins.tpl">
|
||||||
|
@ -36,6 +40,7 @@
|
||||||
<span trspan="connect">Connect</span>
|
<span trspan="connect">Connect</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
</TMPL_IF>
|
||||||
|
|
||||||
<div class="actions">
|
<div class="actions">
|
||||||
<TMPL_IF NAME="DISPLAY_RESETPASSWORD">
|
<TMPL_IF NAME="DISPLAY_RESETPASSWORD">
|
||||||
|
|
Loading…
Reference in New Issue
Block a user