aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Fripost/Schema/Alias.pm
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Fripost/Schema/Alias.pm')
-rw-r--r--lib/Fripost/Schema/Alias.pm11
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/Fripost/Schema/Alias.pm b/lib/Fripost/Schema/Alias.pm
index d121929..817f4a6 100644
--- a/lib/Fripost/Schema/Alias.pm
+++ b/lib/Fripost/Schema/Alias.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/;
-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/;
=head1 METHODS
@@ -80,7 +79,7 @@ sub replace {
}
eval {
- my ($l,$d) = split_addr( $a->{alias}, -encoding => 'ascii' );
+ my ($l,$d) = split_addr( $a->{alias}, -encode => 'ascii' );
&_is_valid($a);
my $mesg = $self->ldap->modify(
canonical_dn({fva => $l}, {fvd => $d}, @{$self->suffix}),
@@ -113,7 +112,7 @@ sub add {
eval {
die "Missing alias name\n" unless $a->{alias} =~ /^.+\@.+$/;
- my ($l,$d) = split_addr( $a->{alias}, -encoding => 'ascii' );
+ my ($l,$d) = split_addr( $a->{alias}, -encode => 'ascii' );
&_is_valid($a);
die "‘".$a->{alias}."’ already exists\n"
if $self->local->exists($a->{alias},%options);
@@ -145,7 +144,7 @@ Delete the given alias.
sub delete {
my $self = shift;
- my ($l,$d) = split_addr( shift, -encoding => 'ascii' );
+ my ($l,$d) = split_addr( shift, -encode => 'ascii' );
my %options = @_;
my $mesg = $self->ldap->delete( canonical_dn( {fva => $l}, {fvd => $d},