--- trunk/Nos.pm	2005/07/08 17:00:20	67
+++ trunk/Nos.pm	2005/08/22 20:24:04	72
@@ -16,7 +16,7 @@
 our @EXPORT = qw( 
 );
 
-our $VERSION = '0.6';
+our $VERSION = '0.7';
 
 use Class::DBI::Loader;
 use Email::Valid;
@@ -120,12 +120,12 @@
 }
 
 
-=head2 new_list
+=head2 create_list
 
 Create new list. Required arguments are name of C<list>, C<email> address
 and path to C<aliases> file.
 
- $nos->new_list(
+ $nos->create_list(
  	list => 'My list',
 	from => 'Outgoing from comment',
 	email => 'my-list@example.com',
@@ -139,7 +139,7 @@
 
 =cut
 
-sub new_list {
+sub create_list {
 	my $self = shift;
 
 	my $arg = {@_};
@@ -158,19 +158,20 @@
 }
 
 
-=head2 delete_list
+=head2 drop_list
 
 Delete list from database.
 
- my $ok = delete_list(
+ my $ok = drop_list(
  	list => 'My list'
+	aliases => '/etc/mail/mylist',
  );
 
 Returns false if list doesn't exist.
 
 =cut
 
-sub delete_list {
+sub drop_list {
 	my $self = shift;
 
 	my $args = {@_};
@@ -179,10 +180,14 @@
 
 	$args->{'list'} = lc($args->{'list'});
 
+	my $aliases = $args->{'aliases'} || croak "need path to aliases file";
+
 	my $lists = $self->{'loader'}->find_class('lists');
 
 	my $this_list = $lists->search( name => $args->{'list'} )->first || return;
 
+	$self->_remove_alias( email => $this_list->email, aliases => $aliases);
+
 	$this_list->delete || croak "can't delete list\n";
 
 	return $lists->dbi_commit || croak "can't commit";
@@ -694,7 +699,7 @@
 
 =head2 _add_aliases
 
-Add new list to C</etc/aliases> (or equivavlent) file
+Add or update alias in C</etc/aliases> (or equivalent) file for selected list
 
  my $ok = $nos->add_aliases(
  	list => 'My list',
@@ -715,9 +720,13 @@
 
 	my $arg = {@_};
 
-	croak "need list and email options" unless ($arg->{'list'} && $arg->{'email'});
+	foreach my $o (qw/list email aliases/) {
+		croak "need $o option" unless ($arg->{$o});
+	}
 
-	my $aliases = $arg->{'aliases'} || croak "need aliases";
+	my $aliases = $arg->{'aliases'};
+	my $email = $arg->{'email'};
+	my $list = $arg->{'list'};
 
 	unless (-e $aliases) {
 		warn "aliases file $aliases doesn't exist, creating empty\n";
@@ -726,6 +735,8 @@
 		chmod 0777, $aliases || warn "can't change permission to 0777";
 	}
 
+	die "FATAL: aliases file $aliases is not writable\n" unless (-w $aliases);
+
 	my $a = new Mail::Alias($aliases) || croak "can't open aliases file $aliases: $!";
 
 	my $target = '';
@@ -747,12 +758,16 @@
 	$self_path =~ s#/[^/]+$##;
 	$self_path =~ s#/t/*$#/#;
 
-	$target .= qq#| cd $self_path && ./sender.pl --inbox="$arg->{'list'}"#;
+	$target .= qq#| cd $self_path && ./sender.pl --inbox="$list"#;
 
-	unless ($a->append($arg->{'email'}, $target)) {
-		croak "can't add alias ".$a->error_check;
+	if ($a->exists($email)) {
+		$a->update($email, $target) or croak "can't update alias ".$a->error_check;
+	} else {
+		$a->append($email, $target) or croak "can't add alias ".$a->error_check;
 	}
 
+	#$a->write($aliases) or croak "can't save aliases $aliases ".$a->error_check;
+
 	return 1;
 }
 
@@ -793,7 +808,7 @@
 		list => $name,
 		email => $email,
 		aliases => $aliases,
-	) || croak "can't add alias $email for list $name";
+	) || warn "can't add alias $email for list $name";
 
 	my $l = $lists->find_or_create({
 		name => $name,
@@ -835,6 +850,40 @@
 	return $lists->search({ name => lc($name) })->first;
 }
 
+
+=head2 _remove_alias
+
+Remove list alias
+
+ my $ok = $nos->_remove_alias(
+ 	email => 'mylist@example.com',
+	aliases => '/etc/mail/mylist',
+ );
+
+Returns true if list is removed or false if list doesn't exist. Dies in case of error.
+
+=cut
+
+sub _remove_alias {
+	my $self = shift;
+
+	my $arg = {@_};
+
+	my $email = lc($arg->{'email'}) || confess "can't remove alias without email";
+	my $aliases = lc($arg->{'aliases'}) || confess "can't remove alias without list";
+
+	my $a = new Mail::Alias($aliases) || croak "can't open aliases file $aliases: $!";
+
+	if ($a->exists($email)) {
+		$a->delete($email) || croak "can't remove alias $email";
+	} else {
+		return 0;
+	}
+
+	return 1;
+
+}
+
 ###
 ### SOAP
 ###
@@ -890,9 +939,9 @@
 }
 
 
-=head2 NewList
+=head2 CreateList
 
- $message_id = NewList(
+ $message_id = CreateList(
 	list => 'My list',
 	from => 'Name of my list',
 	email => 'my-list@example.com'
@@ -900,41 +949,42 @@
 
 =cut
 
-sub NewList {
+sub CreateList {
 	my $self = shift;
 
-	croak "self is not Nos::SOAP object" unless (ref($self) eq 'Nos::SOAP');
-
-	my $aliases = $self->{'aliases'} || croak "need 'aliases' argument to new constructor";
+	my $aliases = $nos->{'aliases'} || croak "need 'aliases' argument to new constructor";
 
 	if ($_[0] !~ m/^HASH/) {
-		return $nos->new_list(
+		return $nos->create_list(
 			list => $_[0], from => $_[1], email => $_[2],
 			aliases => $aliases,
 		);
 	} else {
-		return $nos->new_list( %{ shift @_ }, aliases => $aliases );
+		return $nos->create_list( %{ shift @_ }, aliases => $aliases );
 	}
 }
 
 
-=head2 DeleteList
+=head2 DropList
 
- $ok = DeleteList(
+ $ok = DropList(
 	list => 'My list',
  ); 
 
 =cut
 
-sub DeleteList {
+sub DropList {
 	my $self = shift;
 
+	my $aliases = $nos->{'aliases'} || croak "need 'aliases' argument to new constructor";
+
 	if ($_[0] !~ m/^HASH/) {
-		return $nos->delete_list(
+		return $nos->drop_list(
 			list => $_[0],
+			aliases => $aliases,
 		);
 	} else {
-		return $nos->delete_list( %{ shift @_ } );
+		return $nos->drop_list( %{ shift @_ }, aliases => $aliases );
 	}
 }