diff --git a/lib/csc/Controller/addressbook.pm b/lib/csc/Controller/addressbook.pm index b02906b..2f4cda0 100644 --- a/lib/csc/Controller/addressbook.pm +++ b/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; diff --git a/lib/csc/Model/Provisioning.pm b/lib/csc/Model/Provisioning.pm index 37806b2..f15538d 100644 --- a/lib/csc/Model/Provisioning.pm +++ b/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}) { diff --git a/root/css/sipwise.css b/root/css/sipwise.css index 2133cc1..21c20ed 100644 --- a/root/css/sipwise.css +++ b/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; diff --git a/root/tt/callblock.tt b/root/tt/callblock.tt index 9556a60..d755bcf 100644 --- a/root/tt/callblock.tt +++ b/root/tt/callblock.tt @@ -41,7 +41,7 @@ [% FOREACH blockentry = subscriber.block_in_list %] - +
[% blockentry.number %]
 [% blockentry.number %] 
@@ -114,7 +114,7 @@ [% FOREACH blockentry = subscriber.block_out_list %] - +
[% blockentry.number %]
 [% blockentry.number %]