--- trunk/Nos.pm	2005/08/25 00:56:06	78
+++ trunk/Nos.pm	2006/09/21 10:49:00	87
@@ -421,10 +421,7 @@
 
 	my $m = Email::Simple->new($message_text) || croak "can't parse message";
 
-	unless( $m->header('Subject') ) {
-		warn "message doesn't have Subject header\n";
-		return;
-	}
+	warn "message doesn't have Subject header\n" unless( $m->header('Subject') );
 
 	my $lists = $self->{'loader'}->find_class('lists');
 
@@ -556,7 +553,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";
@@ -709,14 +706,42 @@
 
 Returns all received messages for given list or user.
 
- my @received = $nos->received_message(
+ my @received = $nos->received_messages(
  	list => 'My list',
 	email => "john.doe@example.com",
+	from_date => '2005-01-01 10:15:00',
+	to_date => '2005-01-01 12:00:00',
+	message => 0,
  );
 
+If don't specify C<list> or C<email> it will return all received messages.
+Results will be sorted by received date, oldest first.
+
+Other optional parametars include:
+
+=over 10
+
+=item from_date
+
+Date (in ISO format) for lower limit of dates received
+
+=item to_date
+
+Return just messages older than this date
+
+=item message
+
+Include whole received message in result. This will probably make result
+array very large. Use with care.
+
+=back
+
+Date ranges are inclusive, so results will include messages sent on
+particular date specified with C<date_from> or C<date_to>.
+
 Each element in returned array will have following structure:
 
- {
+ my $row = {
 	id => 42,			# unique ID of received message
 	list => 'My list',		# useful if filtering by email
 	ext_id => 9999,			# ext_id from message sender
@@ -725,6 +750,8 @@
 	date => '2005-08-24 18:57:24',	# date of receival in ISO format
  }
 
+If you specified C<message> option, this hash will also have C<message> key
+which will contain whole received message.
 
 =cut
 
@@ -741,23 +768,30 @@
 				lists.name as list,
 				users.ext_id as ext_id,
 				users.email as email,
+	};
+	$sql .= qq{		message,} if ($arg->{'message'});
+	$sql .= qq{
 				bounced,received.date as date
 			from received
 			join lists on lists.id = list_id
 			join users on users.id = user_id
 	};
 
+	my $order = qq{	order by date asc };
+
 	my $where;
 
 	$where->{'lists.name'} = lc($arg->{'list'}) if ($arg->{'list'});
 	$where->{'users.email'} = lc($arg->{'email'}) if ($arg->{'email'});
+	$where->{'received.date'} = { '>=', $arg->{'date_from'} } if ($arg->{'date_from'});
+	$where->{'received.date'} = { '<=', $arg->{'date_to'} } if ($arg->{'date_to'});
 
 	# hum, yammy one-liner
 	my($stmt, @bind)  = SQL::Abstract->new->where($where);
 
 	my $dbh = $self->{'loader'}->find_class('received')->db_Main;
 
-	my $sth = $dbh->prepare($sql . $stmt);
+	my $sth = $dbh->prepare($sql . $stmt . $order);
 	$sth->execute(@bind);
 	return $sth->fetchall_hash;
 }
@@ -829,7 +863,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;
@@ -1079,7 +1116,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 @_ } );
@@ -1162,9 +1199,13 @@
  my @result = MessagesReceived(
  	list => 'My list',
 	email => 'jdoe@example.com',
+	from_date => '2005-01-01 10:15:00',
+	to_date => '2005-01-01 12:00:00',
+	message => 0,
  );
 
-You must specify C<list> or C<email> or any combination of those.
+You must specify C<list> or C<email> or any combination of those two. Other
+parametars are optional.
 
 For format of returned array element see C<received_messages>.
 
@@ -1174,36 +1215,21 @@
 	my $self = shift;
 
 	if ($_[0] !~ m/^HASH/) {
-		die "need both list and email" unless (scalar @_ < 2);
-		return $nos->received_messages(
+		die "need at least list or email" unless (scalar @_ < 2);
+		return \@{ $nos->received_messages(
 			list => $_[0], email => $_[1],
-		);
+			from_date => $_[2], to_date => $_[3],
+			message => $_[4]
+		) };
 	} else {
-		my $arg = {@_};
-		die "need both list and email" unless ($arg->{'list'} && $arg->{'email'});
-		return $nos->received_messages( $arg );
+		my $arg = shift;
+		die "need list or email argument" unless ($arg->{'list'} || $arg->{'email'});
+		return \@{ $nos->received_messages( %{ $arg } ) };
 	}
 }
 
 ###
 
-=head1 UNIMPLEMENTED SOAP FUNCTIONS
-
-This is a stub for documentation of unimplemented functions.
-
-=head2 MessagesReceivedByDate
-
-=head2 MessagesReceivedByDateWithContent
-
-=head2 ReceivedMessageContent
-
-Return content of received message.
-
- my $mail_body = ReceivedMessageContent( id => 42 );
-
-
-
-
 =head1 NOTE ON ARRAYS IN SOAP
 
 Returning arrays from SOAP calls is somewhat fuzzy (at least to me). It