fixed number normalization for addressbook and call barrings

lib/csc/Controller/addressbook.pm

@@ -148,10 +148,10 @@ sub save : Local {
                     or $contact{$_} =~ /^00[1-9][0-9]+$/
                     or $contact{$_} =~ /^0[1-9][0-9]+$/
                     or $contact{$_} =~ /^[1-9][0-9]+$/;
-            if($contact{$_} =~ s/^00// or $contact{$_} =~ s/^\+//) {
-            } elsif($contact{$_} =~ s/^0/$user_cc/) {
+            if($contact{$_} =~ /^\+/ or $contact{$_} =~ s/^00/+/) {
+            } elsif($contact{$_} =~ s/^0/+$user_cc/) {
             } else {
-                $contact{$_} = $user_cc . $c->session->{user}{data}{ac} . $contact{$_};
+                $contact{$_} = '+'. $user_cc . $c->session->{user}{data}{ac} . $contact{$_};
             }
         } else {
             $contact{$_} = undef;

lib/csc/Model/Provisioning.pm

@@ -891,8 +891,7 @@ sub get_formatted_contacts {
             if(defined $$contact{$_} and
                length $$contact{$_})
             {
-                $$contact{$_} = '00'.$$contact{$_};
-                $$contact{$_} =~ s/^00$user_cc/0/;
+                $$contact{$_} =~ s/^\+$user_cc/0/;
             }
         }
         if(defined $$contact{firstname} and length $$contact{firstname}) {

root/css/sipwise.css

@@ -195,6 +195,11 @@
    white-space: nowrap;
 }
 
+/* mark block entry as disabled */
+.blockentry_inactive {
+   text-decoration: line-through;
+}
+
 /* call block save alignment */
 .sperre .sperresave {
    width: 90px;

root/tt/callblock.tt

@@ -41,7 +41,7 @@
           <table class="anrufliste sperre">
             [% FOREACH blockentry = subscriber.block_in_list %]
               <tr class="[% blockentry.background %]">
-                <td class="sperrenummer"> [% blockentry.number %] </td>
+                <td class="sperrenummer"><div [% UNLESS blockentry.active %]class="blockentry_inactive"[% END %]>&nbsp;[% blockentry.number %]&nbsp;</div></td>
                 <td class="sperresave">
                   <form action="/callblock/save" method="post">
                     <div class="save">
@@ -114,7 +114,7 @@
           <table class="anrufliste sperre">
             [% FOREACH blockentry = subscriber.block_out_list %]
               <tr class="[% blockentry.background %]">
-                <td class="sperrenummer"> [% blockentry.number %] </td>
+                <td class="sperrenummer"><div [% UNLESS blockentry.active %]class="blockentry_inactive"[% END %]>&nbsp;[% blockentry.number %]&nbsp;</div></td>
                 <td class="sperresave">
                   <form action="/callblock/save" method="post">
                     <div class="save">