diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Fripost/Panel/Interface.pm | 45 | ||||
| -rw-r--r-- | lib/Fripost/Schema.pm | 14 | ||||
| -rw-r--r-- | lib/Fripost/Schema/Local.pm | 14 | ||||
| -rw-r--r-- | lib/Fripost/Schema/User.pm (renamed from lib/Fripost/Schema/Mailbox.pm) | 54 |
4 files changed, 63 insertions, 64 deletions
diff --git a/lib/Fripost/Panel/Interface.pm b/lib/Fripost/Panel/Interface.pm index 4e5b48e..02f3f4b 100644 --- a/lib/Fripost/Panel/Interface.pm +++ b/lib/Fripost/Panel/Interface.pm @@ -55,7 +55,7 @@ sub ListDomains : StartRunmode { } -# This Run Mode lists the known mailboxes, aliases and lists under the current +# This Run Mode lists the known users, aliases and lists under the current # domain. sub ListLocals : Runmode { my $self = shift; @@ -68,12 +68,11 @@ sub ListLocals : Runmode { # Query *the* matching domain my %domain = $fp->domain->get( $d, -die => 404 ); - # Query the mailboxes, aliases and lists under the given domain. We - # don't die with a HTTP error code here, as it is not supposed to - # crash. - my @mailboxes = $fp->mailbox->search( $d ); - my @aliases = $fp->alias->search( $d ); - my @lists = $fp->list->search( $d ); + # Query the users, aliases and lists under the given domain. We don't + # die with a HTTP error code here, as it is not supposed to crash. + my @users = $fp->user->search( $d ); + my @aliases = $fp->alias->search( $d ); + my @lists = $fp->list->search( $d ); $fp->done; @@ -88,12 +87,12 @@ sub ListLocals : Runmode { # activation, modify catchalls?) $template->param( canEditDomain => $domain{permissions} =~ /[op]/ ); - # Can the user add mailboxes? - $template->param( canAddMailbox => $domain{permissions} =~ /p/ ); - # Should we list mailboxes? - $template->param( listMailboxes => $#mailboxes >= 0 || + # Can the user add users? + $template->param( canAddUser => $domain{permissions} =~ /p/ ); + # Should we list users? + $template->param( listUsers => $#users >= 0 || $domain{permissions} =~ /p/ ); - $template->param( mailboxes => [ + $template->param( users => [ map { { &mkLink(user => $_->{user}) , description => join ("\n", @{$_->{description}}) , isactive => $_->{isactive} @@ -102,7 +101,7 @@ sub ListLocals : Runmode { , quota => $_->{quota} }; } - @mailboxes + @users ]); # Can the user add aliases? @@ -217,12 +216,12 @@ sub EditLocal : Runmode { my $fp = Fripost::Schema::->SASLauth( $self->authen->username, %CFG ); - # Search for *the* matching mailbox, alias or list. + # Search for *the* matching user, alias or list. my ($d,$l) = ($self->split_path)[1,2]; my %local = $fp->local->get ($l.'@'.$d, -die => 404, -concat => "\x{0D}\x{0A}" ); die "Unknown type" unless grep { $local{type} eq $_ } - qw/mailbox alias list/; + qw/user alias list/; die "404\n" if $local{ispending}; my $error; # Tells whether the change submission has failed. @@ -239,7 +238,7 @@ sub EditLocal : Runmode { if (defined $q->param('submit')) { # Changes have been submitted: process them my %entry; - if ($t eq 'mailbox') { + if ($t eq 'user') { $entry{user} = $l.'@'.$d; $entry{forwards} = $q->param('forwards'); @@ -268,7 +267,7 @@ sub EditLocal : Runmode { ldap_suffix => $CFG{ldap_suffix}, -die => "Wrong password (for ‘".$u."’)." ); }; - $error = $@ || $fp->mailbox->passwd( + $error = $@ || $fp->user->passwd( $entry{user}, Fripost::Password::hash($q->param('newpw')) ); @@ -296,7 +295,7 @@ sub EditLocal : Runmode { if ($error and defined $q->param('submit')) { # Preserve the (incorrect) form, except the passwords - if ($t eq 'mailbox') { + if ($t eq 'user') { $template->param( user => encode_entities($l) , forwards => $q->param('forwards') ); } @@ -313,7 +312,7 @@ sub EditLocal : Runmode { else { %local = $fp->local->get ($l.'@'.$d, -die => 404, -concat => "\x{0D}\x{0A}" ); - if ($t eq 'mailbox') { + if ($t eq 'user') { $template->param( user => encode_entities($local{user}) , forwards => encode_entities($local{forwards}) ); } @@ -341,8 +340,8 @@ sub EditLocal : Runmode { } -# In this Run Mode authenticated users can add mailboxes, aliases and -# lists (if they have the permission). +# In this Run Mode authenticated users can add users, aliases and lists +# (if they have the permission). sub AddLocal : Runmode { my $self = shift; my %CFG = $self->cfg; @@ -357,7 +356,7 @@ sub AddLocal : Runmode { # Changes have been submitted: process them my %entry; my %rest; - if ($t eq 'mailbox') { + if ($t eq 'user') { $entry{user} = $q->param('user').'@'.$d; $entry{forwards} = $q->param('forwards'); if ($q->param('password') ne $q->param('password2')) { @@ -417,7 +416,7 @@ sub AddLocal : Runmode { $template->param( domain => encode_entities($d) ); if ($error) { # Preserve the (incorrect) form, except the passwords - if ($t eq 'mailbox') { + if ($t eq 'user') { $template->param( user => $q->param('user') , forwards => $q->param('forwards') ); } diff --git a/lib/Fripost/Schema.pm b/lib/Fripost/Schema.pm index ad88c82..909a92c 100644 --- a/lib/Fripost/Schema.pm +++ b/lib/Fripost/Schema.pm @@ -9,7 +9,7 @@ Schema.pm - =head1 DESCRIPTION Schema.pm abstracts the LDAP schema definition and provides methods to -add, list or delete virtual domains, mailboxes, aliases or lists. +add, list or delete virtual domains, users, aliases or lists. =cut @@ -21,7 +21,7 @@ use utf8; use Net::LDAP; use Authen::SASL 'Cyrus'; use Fripost::Schema::Domain; -use Fripost::Schema::Mailbox; +use Fripost::Schema::User; use Fripost::Schema::Alias; use Fripost::Schema::List; use Fripost::Schema::Local; @@ -141,14 +141,14 @@ domain-specific methods. sub domain { bless shift, 'Fripost::Schema::Domain'; } -=item B<mailbox> +=item B<user> -Bless the object to C<Fripost::Schema::Mailbox>, to access -mailbox-specific methods. +Bless the object to C<Fripost::Schema::User>, to access +user-specific methods. =cut -sub mailbox { bless shift, 'Fripost::Schema::Mailbox'; } +sub user { bless shift, 'Fripost::Schema::User'; } =item B<alias> @@ -174,7 +174,7 @@ sub list { bless shift, 'Fripost::Schema::List'; } =item B<local> Bless the object to C<Fripost::Schema::Local>, to access -local-specific (mailboxes, aliases and lists) methods. +local-specific (users, aliases and lists) methods. =cut diff --git a/lib/Fripost/Schema/Local.pm b/lib/Fripost/Schema/Local.pm index 49c3d68..400b4e5 100644 --- a/lib/Fripost/Schema/Local.pm +++ b/lib/Fripost/Schema/Local.pm @@ -7,7 +7,7 @@ Local.pm - =head1 DESCRIPTION Local.pm abstracts the LDAP schema definition and provides methods to -search for virtual mailboxes, aliases or lists alltogether. +search for virtual users, aliases or lists alltogether. =cut @@ -29,7 +29,7 @@ use Net::IDN::Encode qw/email_to_ascii email_to_unicode/; Returns a hash with all the (visible) attributes for the given entry. An additional 'type' attribute gives the type of *the* found entry -(possible values are 'mailbox', 'alias', and 'list'). +(possible values are 'user', 'alias', and 'list'). =cut @@ -44,14 +44,14 @@ sub get { base => "fvd=$d,".$self->suffix, scope => 'one', deref => 'never', - filter => "(|(&(objectClass=FripostVirtualMailbox)(fvu=$l)) + filter => "(|(&(objectClass=FripostVirtualUser)(fvu=$l)) (&(objectClass=FripostVirtualAlias)(fva=$l)) (&(objectClass=FripostVirtualList)(fvl=$l)))", attrs => [ qw/fvu description fripostIsStatusActive fripostIsStatusPending fripostOptionalMaildrop - fripostMailboxQuota + fripostUserQuota fva fripostMaildrop fvl fripostListManager/ ] ); @@ -62,7 +62,7 @@ sub get { # The following is not supposed to happen. Note that there is # nothing in the LDAP schema to prevent that, but it's not too - # critical as Postfix search for mailboxes, aliases and lists in + # critical as Postfix searchs for user, aliases and lists in # that order. die "Error: Multiple matching entries found." if $locals->count > 1; my $local = $locals->pop_entry; @@ -74,7 +74,7 @@ sub get { my %ret; if ($local->dn =~ /^fvu=/) { - $ret{type} = 'mailbox'; + $ret{type} = 'user'; $ret{user} = $local->get_value('fvu'); $ret{forwards} = concat($concat, map { email_to_unicode($_) } $local->get_value('fripostOptionalMaildrop')) @@ -113,7 +113,7 @@ sub exists { # We may not have read access to the list commands # The trick is somewhat dirty, but it's safe enough since postfix - # delivers to mailboxes, aliases, and lists with different + # delivers to users, aliases, and lists with different # priorities (and lists have the lowest). my @cmds = qw/admin bounces confirm join leave owner request subscribe unsubscribe bounce sendkey/; my @tests = ( 'fvu='.$l, 'fva='.$l, 'fvl='.$l ); diff --git a/lib/Fripost/Schema/Mailbox.pm b/lib/Fripost/Schema/User.pm index ce23d98..11f5e28 100644 --- a/lib/Fripost/Schema/Mailbox.pm +++ b/lib/Fripost/Schema/User.pm @@ -1,13 +1,13 @@ -package Fripost::Schema::Mailbox; +package Fripost::Schema::User; =head1 NAME -Mailbox.pm - +User.pm - =head1 DESCRIPTION -Mailbox.pm abstracts the LDAP schema definition and provides methods to -add, list or delete virtual mailboxes. +User.pm abstracts the LDAP schema definition and provides methods to +add, list or delete virtual users. =cut @@ -28,8 +28,8 @@ use Net::IDN::Encode qw/domain_to_ascii =item B<search> (I<domain>, I<OPTIONS>) -List every known (and visible) mailbox under the given domain. The -output is a array of hash references, sorted by mailbox. +List every known (and visible) user under the given domain. The +output is a array of hash references, sorted by user. =cut @@ -39,32 +39,32 @@ sub search { my %options = @_; my $concat = $options{'-concat'}; - my $mailboxes = $self->ldap->search( - base => "fvd=$d,".$self->suffix, - scope => 'one', - deref => 'never', - filter => 'objectClass=FripostVirtualMailbox', - attrs => [ qw/fvu description fripostIsStatusActive - fripostOptionalMaildrop - fripostMailboxQuota/ ] - ); - if ($mailboxes->code) { + my $users = $self->ldap->search( + base => "fvd=$d,".$self->suffix, + scope => 'one', + deref => 'never', + filter => 'objectClass=FripostVirtualUser', + attrs => [ qw/fvu description fripostIsStatusActive + fripostOptionalMaildrop + fripostUserQuota/ ] + ); + if ($users->code) { die $options{'-die'}."\n" if defined $options{'-die'}; - die $mailboxes->error."\n"; + die $users->error."\n"; } return map { { user => email_to_unicode($_->get_value('fvu')) , isactive => $_->get_value('fripostIsStatusActive') eq 'TRUE' , description => concat($concat, $_->get_value('description')) , forwards => concat($concat, map { email_to_unicode($_) } $_->get_value('fripostOptionalMaildrop')) - , quota => $_->get_value('fripostMailboxQuota') // undef + , quota => $_->get_value('fripostUserQuota') // undef } } - $mailboxes->sorted('fvu') + $users->sorted('fvu') } -=item B<replace> (I<mailbox>, I<OPTIONS>) +=item B<replace> (I<user>, I<OPTIONS>) Replace an existing account with the given one. @@ -117,7 +117,7 @@ sub passwd { -=item B<add> (I<mailbox>, I<OPTIONS>) +=item B<add> (I<user>, I<OPTIONS>) Add the given account. @@ -140,13 +140,13 @@ sub add { die "‘".$m->{user}."’ already exists\n" if $self->local->exists($m->{user},%options); - my %attrs = ( objectClass => 'FripostVirtualMailbox' + my %attrs = ( objectClass => 'FripostVirtualUser' , fripostIsStatusActive => $m->{isactive} ? 'TRUE' : 'FALSE' , userPassword => $m->{password} ); $attrs{description} = $m->{description} if defined $m->{description} and @{$m->{description}}; - $attrs{fripostMailboxQuota} = $m->{quota} if defined $m->{quota}; + $attrs{fripostUserQuota} = $m->{quota} if defined $m->{quota}; $attrs{fripostOptionalMaildrop} = $m->{forwards} if defined $m->{forwards} and @{$m->{forwards}}; @@ -161,10 +161,10 @@ sub add { } -=item B<delete> (I<mailbox>, I<OPTIONS>) +=item B<delete> (I<user>, I<OPTIONS>) -Delete the given mailbox. Note: this will NOT wipe the mailbox off the -disk, but merely delete its entry in the LDAP directory. +Delete the given user. Note: this will NOT wipe the user off the disk, +but merely delete its entry in the LDAP directory. =cut @@ -197,7 +197,7 @@ The B<-die> option, if present, overides LDAP croaks and errors. =cut -# Ensure that the given mailbox is valid. +# Ensure that the given user is valid. sub _is_valid { my $m = shift; must_attrs( $m, qw/user isactive/ ); |