--- trunk/Nos.pm	2005/08/26 06:13:44	81
+++ trunk/Nos.pm	2005/09/06 11:14:49	86
@@ -556,7 +556,7 @@
 				my $m_obj = Email::Simple->new($msg) || croak "can't parse message";
 
 				$m_obj->header_set('Return-Path', $from_email_only) || croak "can't set Return-Path: header";
-				$m_obj->header_set('Sender', $from_email_only) || croak "can't set Sender: header";
+				#$m_obj->header_set('Sender', $from_email_only) || croak "can't set Sender: header";
 				$m_obj->header_set('Errors-To', $from_email_only) || croak "can't set Errors-To: header";
 				$m_obj->header_set('From', $from_addr) || croak "can't set From: header";
 				$m_obj->header_set('To', $to) || croak "can't set To: header";
@@ -866,7 +866,10 @@
 	$self_path =~ s#/[^/]+$##;
 	$self_path =~ s#/t/*$#/#;
 
-	$target .= qq#| cd $self_path && ./sender.pl --inbox="$list"#;
+	$target .= qq#"| cd $self_path && ./sender.pl --inbox='$list'"#;
+
+	# remove hostname from email to make Postfix's postalias happy
+	$email =~ s/@.+//;
 
 	if ($a->exists($email)) {
 		$a->update($email, $target) or croak "can't update alias ".$a->error_check;
@@ -1116,7 +1119,7 @@
 
 	if ($_[0] !~ m/^HASH/) {
 		return $nos->add_member_to_list(
-			list => $_[0], email => $_[1], name => $_[2], ext_id => $_[4],
+			list => $_[0], email => $_[1], name => $_[2], ext_id => $_[3],
 		);
 	} else {
 		return $nos->add_member_to_list( %{ shift @_ } );
@@ -1216,15 +1219,15 @@
 
 	if ($_[0] !~ m/^HASH/) {
 		die "need at least list or email" unless (scalar @_ < 2);
-		return $nos->received_messages(
+		return \@{ $nos->received_messages(
 			list => $_[0], email => $_[1],
 			from_date => $_[2], to_date => $_[3],
 			message => $_[4]
-		);
+		) };
 	} else {
 		my $arg = shift;
 		die "need list or email argument" unless ($arg->{'list'} || $arg->{'email'});
-		return $nos->received_messages( $arg );
+		return \@{ $nos->received_messages( %{ $arg } ) };
 	}
 }