diff options
Diffstat (limited to 'lib/Fripost')
| -rw-r--r-- | lib/Fripost/Panel/Interface.pm | 9 | ||||
| -rw-r--r-- | lib/Fripost/Schema/Alias.pm | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/Fripost/Panel/Interface.pm b/lib/Fripost/Panel/Interface.pm index b9a9500..f102a21 100644 --- a/lib/Fripost/Panel/Interface.pm +++ b/lib/Fripost/Panel/Interface.pm @@ -17,7 +17,7 @@ use Fripost::Schema; use Fripost::Password; use HTML::Entities 'encode_entities'; use URI::Escape::XS 'encodeURIComponent'; -use Net::IDN::Encode qw/email_to_unicode domain_to_ascii/; +use Net::IDN::Encode qw/email_to_unicode email_to_ascii/; # This method is called right before the 'setup' method below. It @@ -136,8 +136,8 @@ sub ListLocals : Runmode { , isactive => $_->{isactive} , ispending => $_->{ispending} , transport => $_->{transport} - , listURL => $CFG{'listurl_'.$_->{transport}}.$_->{list}. - '@'.domain_to_ascii($d) + , listURL => $CFG{'listurl_'.$_->{transport}}. + email_to_ascii($_->{list}.'@'.$d) }; } @lists @@ -325,7 +325,8 @@ sub EditLocal : Runmode { $template->param( newChanges => $news ); $template->param( error => encode_entities ($error) ) if $error; $template->param( canDelete => 1 ) if $t eq 'alias'; - $template->param( listURL => $CFG{'listurl_'.$local{transport}}.$l.'@'.$d ) + $template->param( listURL => $CFG{'listurl_'.$local{transport}}. + email_to_ascii($l.'@'.$d) ) if $t eq 'list'; $q->delete('a'); return $template->output; diff --git a/lib/Fripost/Schema/Alias.pm b/lib/Fripost/Schema/Alias.pm index 51bf98f..7d729f0 100644 --- a/lib/Fripost/Schema/Alias.pm +++ b/lib/Fripost/Schema/Alias.pm @@ -177,7 +177,6 @@ sub _is_valid { must_attrs( $a, qw/alias isactive maildrop/ ); $a->{alias} = email_valid( $a->{alias}, -exact => 1 ); $a->{maildrop} = [ map { email_valid($_) } @{$a->{maildrop}} ]; - # TODO: check for cycles? } |