pass through regex evaluation error to user

3.4
Christian Veigl 14 years ago
parent cc1bdae3e6
commit 0c468a5fb0

@ -2341,8 +2341,10 @@ sub save_trusted_source : Local {
$messages{protocol_err} = 'Client.Syntax.UnknownProtocol' unless $checkresult;
if (length $ts{from_pattern}) { # allow empty sipuri
$messages{from_pattern_err} = 'Client.Syntax.MalformedUri'
unless ($c->model('Provisioning')->call_prov( $c, 'voip', 'check_sip_uri_pattern', $ts{from_pattern}, \$checkresult));
unless ($c->model('Provisioning')->call_prov( $c, 'voip', 'check_sip_uri_pattern', $ts{from_pattern}, \$checkresult)) {
$messages{from_pattern_err} = 'Client.Syntax.MalformedUri';
$c->flash->{from_pattern_err_detail} = $c->session->{prov_error_object} if ($c->session->{prov_error_object});
}
}
else {
$ts{from_pattern} = undef;

@ -5,7 +5,14 @@
[% IF messages.tsrc_msg %]<div class="msgor">[% messages.tsrc_msg %]</div>[% END %]
[% IF messages.src_ip_err %]<div class="error">[% messages.src_ip_err %]</div>[% END %]
[% IF messages.protocol_err %]<div class="error">[% messages.protocol_err %]</div>[% END %]
[% IF messages.from_pattern_err %]<div class="error">[% messages.from_pattern_err %]</div>[% END %]
[% IF messages.from_pattern_err %]
<div class="error">[% messages.from_pattern_err %]
[% IF from_pattern_err_detail %]
<br />
[% from_pattern_err_detail %]
[% END %]
</div>
[% END %]
<ul class="cleanlist">
<li class="ui-state-default">

Loading…
Cancel
Save