Apply commit 6513 to trunk (#1218)
This commit is contained in:
parent
0ce55136ad
commit
56254f1d4f
|
@ -160,6 +160,7 @@ sub defaultValues {
|
|||
'portalDisplayLoginHistory' => 1,
|
||||
'portalDisplayLogout' => 1,
|
||||
'portalDisplayRegister' => 1,
|
||||
'portalErrorOnExpiredSession' => 1,
|
||||
'portalForceAuthnInterval' => 5,
|
||||
'portalPingInterval' => 60000,
|
||||
'portalRequireOldPassword' => 1,
|
||||
|
|
|
@ -27,7 +27,7 @@ sub types {
|
|||
|
||||
BEGIN {
|
||||
${^WARNING_BITS} =
|
||||
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55";
|
||||
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x05";
|
||||
}
|
||||
eval "$s $val";
|
||||
my $err = join(
|
||||
|
@ -651,7 +651,7 @@ sub attributes {
|
|||
|
||||
BEGIN {
|
||||
${^WARNING_BITS} =
|
||||
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55";
|
||||
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x05";
|
||||
}
|
||||
eval "$s $val";
|
||||
my $err = join(
|
||||
|
@ -1004,7 +1004,7 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
|
|||
|
||||
BEGIN {
|
||||
${^WARNING_BITS} =
|
||||
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55";
|
||||
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x05";
|
||||
}
|
||||
eval $s;
|
||||
my $err = join(
|
||||
|
@ -1086,7 +1086,7 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
|
|||
|
||||
BEGIN {
|
||||
${^WARNING_BITS} =
|
||||
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55";
|
||||
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x05";
|
||||
}
|
||||
eval "$s $val";
|
||||
my $err = join(
|
||||
|
@ -1109,7 +1109,7 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
|
|||
|
||||
BEGIN {
|
||||
${^WARNING_BITS} =
|
||||
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55";
|
||||
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x05";
|
||||
}
|
||||
eval "$s $val";
|
||||
my $err = join(
|
||||
|
@ -1432,7 +1432,7 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
|
|||
|
||||
BEGIN {
|
||||
${^WARNING_BITS} =
|
||||
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55";
|
||||
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x05";
|
||||
}
|
||||
eval $s;
|
||||
my $err = join(
|
||||
|
@ -1469,7 +1469,7 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
|
|||
|
||||
BEGIN {
|
||||
${^WARNING_BITS} =
|
||||
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55";
|
||||
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x05";
|
||||
}
|
||||
eval "$s $val";
|
||||
my $err = join(
|
||||
|
@ -1817,7 +1817,7 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
|
|||
|
||||
BEGIN {
|
||||
${^WARNING_BITS} =
|
||||
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55";
|
||||
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x05";
|
||||
}
|
||||
eval "$s $val";
|
||||
my $err = join(
|
||||
|
@ -2073,6 +2073,10 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
|
|||
'default' => 0,
|
||||
'type' => 'bool'
|
||||
},
|
||||
'portalErrorOnExpiredSession' => {
|
||||
'default' => 1,
|
||||
'type' => 'bool'
|
||||
},
|
||||
'portalForceAuthnInterval' => {
|
||||
'default' => 5,
|
||||
'type' => 'int'
|
||||
|
@ -2142,7 +2146,7 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
|
|||
|
||||
BEGIN {
|
||||
${^WARNING_BITS} =
|
||||
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55";
|
||||
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x05";
|
||||
}
|
||||
eval "$s $val";
|
||||
my $err = join(
|
||||
|
@ -2812,7 +2816,7 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
|
|||
|
||||
BEGIN {
|
||||
${^WARNING_BITS} =
|
||||
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55";
|
||||
"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55\x05";
|
||||
}
|
||||
eval "$s $val";
|
||||
my $err = join(
|
||||
|
|
|
@ -351,7 +351,6 @@ sub attributes {
|
|||
|
||||
# Menu
|
||||
activeTimer => {
|
||||
default => 0,
|
||||
type => 'bool',
|
||||
default => 1,
|
||||
documentation => 'Enable timers on portal pages',
|
||||
|
@ -365,6 +364,11 @@ sub attributes {
|
|||
},
|
||||
documentation => 'Applications list',
|
||||
},
|
||||
portalErrorOnExpiredSession => {
|
||||
type => 'bool',
|
||||
default => 1,
|
||||
documentation => 'Show error if session is expired',
|
||||
},
|
||||
portalOpenLinkInNewWindow => {
|
||||
type => 'bool',
|
||||
default => 0,
|
||||
|
|
|
@ -78,7 +78,8 @@ sub tree {
|
|||
'portalUserAttr',
|
||||
'portalOpenLinkInNewWindow',
|
||||
'portalAntiFrame',
|
||||
'portalPingInterval'
|
||||
'portalPingInterval',
|
||||
'portalErrorOnExpiredSession'
|
||||
]
|
||||
}
|
||||
]
|
||||
|
|
|
@ -556,6 +556,7 @@
|
|||
"portalDisplayLogout": "Logout",
|
||||
"portalDisplayRegister": "Register new account",
|
||||
"portalDisplayResetPassword": "Reset password",
|
||||
"portalErrorOnExpiredSession": "Show error on expired session",
|
||||
"portalForceAuthn": "Force authentication",
|
||||
"portalForceAuthnInterval": "Force authentication interval",
|
||||
"portalMenu": "Menu",
|
||||
|
|
|
@ -556,6 +556,7 @@
|
|||
"portalDisplayLogout": "Déconnexion",
|
||||
"portalDisplayRegister": "Création d'un nouveau compte",
|
||||
"portalDisplayResetPassword": "Réinitialisation de mot de passe",
|
||||
"portalErrorOnExpiredSession": "Affiche une erreur si la session est expirée",
|
||||
"portalForceAuthn": "Authentication forcée",
|
||||
"portalForceAuthnInterval": "Interval d'authentication forcée",
|
||||
"portalMenu": "Menu",
|
||||
|
|
|
@ -556,6 +556,7 @@
|
|||
"portalDisplayLogout": "Đăng xuất",
|
||||
"portalDisplayRegister": "Đăng ký tài khoản mới",
|
||||
"portalDisplayResetPassword": "Đặt lại mật khẩu",
|
||||
"portalErrorOnExpiredSession": "Show error on expired session",
|
||||
"portalForceAuthn": "Bắt buộc xác thực",
|
||||
"portalForceAuthnInterval": "Khoảng thời gian bắt buộc xác thực",
|
||||
"portalMenu": "Menu",
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -264,7 +264,9 @@ sub extractFormInfo {
|
|||
expires => 'Wed, 21 Oct 2015 00:00:00 GMT'
|
||||
)
|
||||
);
|
||||
return PE_SESSIONEXPIRED;
|
||||
if ( $self->conf->{portalErrorOnExpiredSession} ) {
|
||||
$ret = PE_SESSIONEXPIRED;
|
||||
}
|
||||
}
|
||||
return $ret;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user