From 215725033385234862e35d9094fa2fab80f8c601 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 22 May 2018 00:33:40 +0100 Subject: [PATCH] Fix error message output --- blocks/ORB/Login.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blocks/ORB/Login.pm b/blocks/ORB/Login.pm index 92e65ae..22860a6 100755 --- a/blocks/ORB/Login.pm +++ b/blocks/ORB/Login.pm @@ -340,7 +340,8 @@ sub _validate_signin { } # limiting not supported, or username is bunk - return the failure message as-is - return ($self -> {"template"} -> load_template("error/error.tem", { "%(reason)" => $failmsg }), $args); + return ($self -> {"template"} -> load_template("error/error.tem", { "%(message)s" => "{L_LOGIN_ERR_MESSAGE}", + "%(reason)s" => $failmsg }), $args); } @@ -778,7 +779,6 @@ sub _validate_passchange { # Now apply policy if needed my $policy_fails = $self -> {"session"} -> {"auth"} -> apply_policy($user -> {"username"}, $args -> {"newpass"}); - if($policy_fails) { foreach my $name (@{$policy_fails -> {"policy_order"}}) { next if(!$policy_fails -> {$name});