/[notice-sender]/trunk/Nos.pm
This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!
ViewVC logotype

Diff of /trunk/Nos.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 67 by dpavlin, Fri Jul 8 17:00:20 2005 UTC revision 71 by dpavlin, Mon Aug 22 19:25:24 2005 UTC
# Line 164  Delete list from database. Line 164  Delete list from database.
164    
165   my $ok = delete_list(   my $ok = delete_list(
166          list => 'My list'          list => 'My list'
167            aliases => '/etc/mail/mylist',
168   );   );
169    
170  Returns false if list doesn't exist.  Returns false if list doesn't exist.
# Line 179  sub delete_list { Line 180  sub delete_list {
180    
181          $args->{'list'} = lc($args->{'list'});          $args->{'list'} = lc($args->{'list'});
182    
183            my $aliases = $args->{'aliases'} || croak "need path to aliases file";
184    
185          my $lists = $self->{'loader'}->find_class('lists');          my $lists = $self->{'loader'}->find_class('lists');
186    
187          my $this_list = $lists->search( name => $args->{'list'} )->first || return;          my $this_list = $lists->search( name => $args->{'list'} )->first || return;
188    
189            $self->_remove_alias( email => $this_list->email, aliases => $aliases);
190    
191          $this_list->delete || croak "can't delete list\n";          $this_list->delete || croak "can't delete list\n";
192    
193          return $lists->dbi_commit || croak "can't commit";          return $lists->dbi_commit || croak "can't commit";
# Line 694  Beware of dragons! You shouldn't need to Line 699  Beware of dragons! You shouldn't need to
699    
700  =head2 _add_aliases  =head2 _add_aliases
701    
702  Add new list to C</etc/aliases> (or equivavlent) file  Add or update alias in C</etc/aliases> (or equivalent) file for selected list
703    
704   my $ok = $nos->add_aliases(   my $ok = $nos->add_aliases(
705          list => 'My list',          list => 'My list',
# Line 715  sub _add_aliases { Line 720  sub _add_aliases {
720    
721          my $arg = {@_};          my $arg = {@_};
722    
723          croak "need list and email options" unless ($arg->{'list'} && $arg->{'email'});          foreach my $o (qw/list email aliases/) {
724                    croak "need $o option" unless ($arg->{$o});
725            }
726    
727          my $aliases = $arg->{'aliases'} || croak "need aliases";          my $aliases = $arg->{'aliases'};
728            my $email = $arg->{'email'};
729            my $list = $arg->{'list'};
730    
731          unless (-e $aliases) {          unless (-e $aliases) {
732                  warn "aliases file $aliases doesn't exist, creating empty\n";                  warn "aliases file $aliases doesn't exist, creating empty\n";
# Line 726  sub _add_aliases { Line 735  sub _add_aliases {
735                  chmod 0777, $aliases || warn "can't change permission to 0777";                  chmod 0777, $aliases || warn "can't change permission to 0777";
736          }          }
737    
738            die "FATAL: aliases file $aliases is not writable\n" unless (-w $aliases);
739    
740          my $a = new Mail::Alias($aliases) || croak "can't open aliases file $aliases: $!";          my $a = new Mail::Alias($aliases) || croak "can't open aliases file $aliases: $!";
741    
742          my $target = '';          my $target = '';
# Line 747  sub _add_aliases { Line 758  sub _add_aliases {
758          $self_path =~ s#/[^/]+$##;          $self_path =~ s#/[^/]+$##;
759          $self_path =~ s#/t/*$#/#;          $self_path =~ s#/t/*$#/#;
760    
761          $target .= qq#| cd $self_path && ./sender.pl --inbox="$arg->{'list'}"#;          $target .= qq#| cd $self_path && ./sender.pl --inbox="$list"#;
762    
763          unless ($a->append($arg->{'email'}, $target)) {          if ($a->exists($email)) {
764                  croak "can't add alias ".$a->error_check;                  $a->update($email, $target) or croak "can't update alias ".$a->error_check;
765            } else {
766                    $a->append($email, $target) or croak "can't add alias ".$a->error_check;
767          }          }
768    
769            #$a->write($aliases) or croak "can't save aliases $aliases ".$a->error_check;
770    
771          return 1;          return 1;
772  }  }
773    
# Line 793  sub _add_list { Line 808  sub _add_list {
808                  list => $name,                  list => $name,
809                  email => $email,                  email => $email,
810                  aliases => $aliases,                  aliases => $aliases,
811          ) || croak "can't add alias $email for list $name";          ) || warn "can't add alias $email for list $name";
812    
813          my $l = $lists->find_or_create({          my $l = $lists->find_or_create({
814                  name => $name,                  name => $name,
# Line 835  sub _get_list { Line 850  sub _get_list {
850          return $lists->search({ name => lc($name) })->first;          return $lists->search({ name => lc($name) })->first;
851  }  }
852    
853    
854    =head2 _remove_alias
855    
856    Remove list alias
857    
858     my $ok = $nos->_remove_alias(
859            email => 'mylist@example.com',
860            aliases => '/etc/mail/mylist',
861     );
862    
863    Returns true if list is removed or false if list doesn't exist. Dies in case of error.
864    
865    =cut
866    
867    sub _remove_alias {
868            my $self = shift;
869    
870            my $arg = {@_};
871    
872            my $email = lc($arg->{'email'}) || confess "can't remove alias without email";
873            my $aliases = lc($arg->{'aliases'}) || confess "can't remove alias without list";
874    
875            my $a = new Mail::Alias($aliases) || croak "can't open aliases file $aliases: $!";
876    
877            if ($a->exists($email)) {
878                    $a->delete($email) || croak "can't remove alias $email";
879            } else {
880                    return 0;
881            }
882    
883            return 1;
884    
885    }
886    
887  ###  ###
888  ### SOAP  ### SOAP
889  ###  ###
# Line 903  sub new { Line 952  sub new {
952  sub NewList {  sub NewList {
953          my $self = shift;          my $self = shift;
954    
955          croak "self is not Nos::SOAP object" unless (ref($self) eq 'Nos::SOAP');          my $aliases = $nos->{'aliases'} || croak "need 'aliases' argument to new constructor";
   
         my $aliases = $self->{'aliases'} || croak "need 'aliases' argument to new constructor";  
956    
957          if ($_[0] !~ m/^HASH/) {          if ($_[0] !~ m/^HASH/) {
958                  return $nos->new_list(                  return $nos->new_list(
# Line 929  sub NewList { Line 976  sub NewList {
976  sub DeleteList {  sub DeleteList {
977          my $self = shift;          my $self = shift;
978    
979            my $aliases = $nos->{'aliases'} || croak "need 'aliases' argument to new constructor";
980    
981          if ($_[0] !~ m/^HASH/) {          if ($_[0] !~ m/^HASH/) {
982                  return $nos->delete_list(                  return $nos->delete_list(
983                          list => $_[0],                          list => $_[0],
984                            aliases => $aliases,
985                  );                  );
986          } else {          } else {
987                  return $nos->delete_list( %{ shift @_ } );                  return $nos->delete_list( %{ shift @_ }, aliases => $aliases );
988          }          }
989  }  }
990    
Legend:
Removed from v.67  
changed lines
  Added in v.71
  ViewVC Help
Powered by ViewVC 1.1.26