--- trunk/sender.pl	2005/05/15 21:35:15	21
+++ trunk/sender.pl	2005/05/15 22:12:31	23
@@ -120,26 +120,7 @@
 		chomp;
 		next if (/^#/ || /^\s*$/);
 		my ($email, $name) = split(/\s+/,$_, 2);
-		$name ||= '';
-		if (! Email::Valid->address($email)) {
-			print "SKIPPING $name <$email>\n";
-			next;
-		}
-		print "# $name <$email>\n";
-		my $this_user = $users->find_or_create({
-			email => $email,
-			full_name => $name,
-		}) || die "can't find or create member\n";
-		my $user_on_list = $user_list->find_or_create({
-			user_id => $this_user->id,
-			list_id => $list->id,
-		}) || die "can't add user to list";
-		$added++;
-	}
-
-	foreach my $c_name ($loader->tables) {
-		my $c = $loader->find_class($c_name)|| die "can't find $c_name";
-		$c->dbi_commit();
+		$added++ if ($nos->add_member_to_list( email => $email, name => $name, list => $add_opt ));
 	}
 
 	print "list ",$list->name," has $added users\n";
@@ -215,46 +196,7 @@
 
 } elsif (defined($send_opt)) {
 
-	my $my_q;
-	if ($send_opt ne '') {
-		my $l_id = $lists->search_like( name => $send_opt )->first ||
-			die "can't find list $send_opt";
-		$my_q = $queue->search_like( list_id => $l_id ) ||
-			die "can't find list $send_opt";
-	} else {
-		$my_q = $queue->retrieve_all;
-	}
-
-	while (my $m = $my_q->next) {
-		next if ($m->all_sent);
-
-		print "sending message ",$m->message_id," enqueued on ",$m->date," to list ",$m->list_id->name,"\n";
-		my $msg = $m->message_id->message;
-
-		foreach my $u ($user_list->search(list_id => $m->list_id)) {
-
-			if ($sent->search( message_id => $m->message_id, user_id => $u->user_id )) {
-				print "SKIP ",$u->user_id->email," message allready sent\n";
-			} else {
-				print "\t",$u->user_id->email,"\n";
-
-				my $hdr = "From: " . $u->list_id->name . " <" . $u->list_id->email . ">\n" .
-					"To: " . $u->user_id->full_name . " <". $u->user_id->email. ">\n";
-
-				# FIXME do real sending :-)
-				$nos->send_email("$hdr\n$msg");
-
-				$sent->create({
-					message_id => $m->message_id,
-					user_id => $u->user_id,
-				});
-				$sent->dbi_commit;
-			}
-		}
-		$m->all_sent(1);
-		$m->update;
-		$m->dbi_commit;
-	}
+	$nos->send_queued_messages($send_opt);
 
 } else  {
 	die "see perldoc $0 for help";