1 files changed, 7 insertions, 8 deletions
diff --git a/lib/Fripost/Schema/List.pm b/lib/Fripost/Schema/List.pm
index 58d198c..7753bd1 100644
--- a/lib/Fripost/Schema/List.pm
+++ b/lib/Fripost/Schema/List.pm
@@ -17,10 +17,9 @@ use warnings;
 use utf8;
 
 use parent 'Fripost::Schema';
-use Fripost::Schema::Misc qw/concat explode must_attrs email_valid
+use Fripost::Schema::Util qw/concat explode must_attrs email_valid
                              split_addr canonical_dn ldap_explode_dn/;
-use Net::IDN::Encode qw/domain_to_ascii
-                        email_to_ascii email_to_unicode/;
+use Net::IDN::Encode qw/domain_to_ascii email_to_ascii email_to_unicode/;
 use Mail::GnuPG;
 use MIME::Entity;
 
@@ -85,7 +84,7 @@ sub replace {
         if defined $l->{description};
 
     eval {
-        my ($l2,$d) = split_addr( $l->{list}, -encoding => 'ascii' );
+        my ($l2,$d) = split_addr( $l->{list}, -encode => 'ascii' );
         &_is_valid($l);
         my $l3 = { fripostIsStatusActive => $l->{isactive} ? 'TRUE' : 'FALSE'
                  , description => $l->{description} };
@@ -117,7 +116,7 @@ sub add {
 
     eval {
         die "Missing list name\n" unless $l->{list} =~ /^.+\@.+$/;
-        my ($l2,$d) = split_addr ( $l->{list}, -encoding => 'ascii' );
+        my ($l2,$d) = split_addr ( $l->{list}, -encode => 'ascii' );
         must_attrs( $l, 'transport' );
         &_is_valid($l);
         die "‘".$l->{list}."’ already exists\n"
@@ -177,7 +176,7 @@ the ListCreator entity, and the list is not known by the list manager.
 
 sub is_pending {
     my $self = shift;
-    my ($l,$d) = split_addr( shift, -encoding => 'ascii' );
+    my ($l,$d) = split_addr( shift, -encode => 'ascii' );
     my %options = @_;
 
     my $dn = canonical_dn({fvl => $l}, {fvd => $d}, @{$self->suffix});
@@ -209,7 +208,7 @@ Add the lists commands, and remove the pending status.
 
 sub add_commands {
     my $self = shift;
-    my ($l,$d) = split_addr( shift, -encoding => 'ascii' );
+    my ($l,$d) = split_addr( shift, -encode => 'ascii' );
     my $cmds = shift;
     my %options = @_;
 
@@ -243,7 +242,7 @@ disk, but merely delete the list entry in the LDAP directory.
 
 sub delete {
     my $self = shift;
-    my ($l,$d) = split_addr( shift, -encoding => 'ascii' );
+    my ($l,$d) = split_addr( shift, -encode => 'ascii' );
     my %options = @_;
 
     my $dn = canonical_dn( {fvl => $l}, {fvd => $d}, @{$self->suffix} );