merge r7390:7411 from trunk

* number normalization for adm block lists
  * Fix fetching of voicebox/faxserver preferences.

debian/changelog

@@ -1,3 +1,13 @@
+ngcp-www-admin (3.3.2) unstable; urgency=low
+
+  [ agranig ]
+  * Fix fetching of voicebox/faxserver preferences.
+
+  [ dtiefnig ]
+  * number normalization for adm block lists
+
+ -- Andrew Pogrebennyk <apogrebennyk@sipwise.com>  Wed, 01 Feb 2012 16:54:39 +0100
+
 ngcp-www-admin (3.3.1) unstable; urgency=low
 
   [ agranig ]

lib/admin/Controller/subscriber.pm

@@ -618,7 +618,7 @@ sub preferences : Local {
                                                           { username => $$subscriber{username},
                                                             domain   => $$subscriber{domain},
                                                           },
-                                                          $$subscriber{voicebox_preferences}
+                                                          \$$subscriber{voicebox_preferences}
                                                         );
     }
 
@@ -634,7 +634,7 @@ sub preferences : Local {
                                                             { username => $$subscriber{username},
                                                               domain   => $$subscriber{domain},
                                                             },
-                                                            $$subscriber{fax_preferences}
+                                                            \$$subscriber{fax_preferences}
                                                           );
     }
 
@@ -735,7 +735,9 @@ sub preferences : Local {
                                                               \$rules
                                                             );
           $c->stash->{rewrite_rule_sets} = $rules if eval { @$rules };
-        } elsif($$pref{preference} eq 'block_in_list' or $$pref{preference} eq 'block_out_list') {
+        } elsif($$pref{preference} eq 'block_in_list' or $$pref{preference} eq 'block_out_list' or
+                $$pref{preference} eq 'adm_block_in_list' or $$pref{preference} eq 'adm_block_out_list')
+        {
           eval { @{$$preferences{$$pref{preference}}} = map { s/^([1-9])/+$1/; $_ } @{$$preferences{$$pref{preference}}} };
         }