From 59158f77401e7db7a27b713331e70972890bf173 Mon Sep 17 00:00:00 2001 From: Daniel Tiefnig Date: Thu, 11 Mar 2010 14:58:11 +0000 Subject: [PATCH] applying standard number localization rules to cli preference --- lib/admin/Controller/subscriber.pm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/admin/Controller/subscriber.pm b/lib/admin/Controller/subscriber.pm index de28d56..ef805de 100644 --- a/lib/admin/Controller/subscriber.pm +++ b/lib/admin/Controller/subscriber.pm @@ -733,7 +733,16 @@ sub update_preferences : Local { $$preferences{cli} = $c->request->params->{cli} or undef; if(defined $$preferences{cli} and $$preferences{cli} =~ /^\+?\d+$/) { - $$preferences{cli} =~ s/^\++//; + if($$preferences{cli} =~ /^\+[1-9][0-9]+$/) { + } elsif($$preferences{cli} =~ /^00[1-9][0-9]+$/) { + $$preferences{cli} =~ s/^00/+/; + } elsif($$preferences{cli} =~ /^0[1-9][0-9]+$/) { + $$preferences{cli} =~ s/^0/'+'.$c->session->{subscriber}{cc}/e; + } elsif($$preferences{cli} =~ /^[1-9][0-9]+$/) { + $$preferences{cli} = '+' . $c->session->{subscriber}{cc} . $c->session->{subscriber}{ac} . $$preferences{cli}; + } else { + $messages{cli} = 'Client.Voip.MalformedNumber'; + } } $$preferences{clir} = $c->request->params->{clir} ? 1 : undef;