[interchange-cvs] interchange - heins modified dist/lib/UI/pages/admin/customer_mailing.html

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2004-01-08 17:53:45 GMT
Modified:  dist/lib/UI/pages/admin customer_mailing.html
Log:
* Add full path for sendmail in batch, using $Config->{SendMailProgram}.

* Weed duplicate email addresses.

* Sort by email instead of last name.

Revision  Changes    Path
1.9       +18 -4     interchange/dist/lib/UI/pages/admin/customer_mailing.html


rev 1.9, prev_rev 1.8
Index: customer_mailing.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/customer_mailing.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- customer_mailing.html	5 May 2003 14:58:49 -0000	1.8
+++ customer_mailing.html	8 Jan 2004 17:53:45 -0000	1.9
@@ -248,8 +248,10 @@
 		co=yes
 		op=rm
 		ml=1000
+		tf=email
+		sf=email
+		se=@
 		sf=mail_list
-		tf=lname
 		se=[cgi target_list]
 		rf=username,fname,lname,company,email,mail_list
 	"] 
@@ -263,6 +265,14 @@
 	my $row = shift;
 	my $list = $CGI->{target_list};
 	my $user = $row->[0];
+	my $email = $row->[4];
+	$email = lc $email;
+	$email =~ s/^\s+//;
+	$email =~ s/\s+$//;
+	if($user_done{$email}++) {
+		Log("Weeded duplicate $email, user $user.");
+		return;
+	}
 	if (my $s = $tmp_struct->{$user}) {
 		 return if $s =~ /\s$list\s/;
 	}
@@ -329,6 +339,8 @@
 		my @out;
 		my $list = $CGI->{target_list};
 
+		my %done;
+
 		my $opt = { table => 'userdb', hash => 1};
 		my $body = $Values->{mail_template};
 		$body =~ s/\r\n/\n/g;
@@ -344,6 +356,8 @@
 			$opt->{key} = $user;
 			my $record = $Tag->data($opt);
 			next unless $record;
+			next unless $record->{email} =~ /\S/;
+			next if $done{$record->{email}}++;
 			$record->{mv_base_url} = $burl;
 			$record->{mv_email}    = $Tag->filter('urlencode', $record->{email});
 			$record->{mv_list}     = $list;
@@ -396,8 +410,8 @@
 		}
 		elsif($CGI->{download_batch}) {
 			@out = map { $_->[1] } @messages;
-			$out = "#!/bin/sh\n\ncat <<EOF | sendmail -t\n";
-			$out .= join "EOF\n\ncat <<EOF | sendmail -t\n", @out;
+			$out = "#!/bin/sh\n\ncat <<EOF | $Config->{SendMailProgram} -t\n";
+			$out .= join "EOF\n\ncat <<EOF | $Config->{SendMailProgram} -t\n", @out;
 			$out .= "EOF\n\n";
 			$Tag->deliver( { body => \$out } );
 			$Tag->tmpn('delivered_mail_batch');
@@ -427,4 +441,4 @@
 <!-- ----- END REAL STUFF ----- -->
 
 @_UI_STD_FOOTER_@
-<!-- page: @@MV_PAGE@@ -->
+<!-- page: @@MV_PAGE@@ version: $Id: customer_mailing.html,v 1.9 2004/01/08 17:53:45 mheins Exp $ -->