--- CVSROOT/loginfo.pl	2007/08/18 00:36:56	1.5
+++ CVSROOT/loginfo.pl	2011/07/04 18:32:49	1.10
@@ -25,6 +25,7 @@ my $cvsroot    = $ENV{CVSROOT}."/";
 # remove double trailing slash
 $cvsroot =~ s/\/\/$/\//;
 my $cvsusers   = "/repository/CVSROOT/cvsusers";
+my $cvshost = "source.lon-capa.org";
 
 # get the id of this process group for use in figuring out
 # whether this is the last directory with checkins or not
@@ -33,8 +34,7 @@ my $id = getpgrp();
 # the command line looks something like this for a normal commit:
 #  ("user@example.com", "cvsuser",
 #   "module changedfile,1.1,1.2 addedfile,NONE,1.1 removedfile,1.1,NONE")
-my $mailfrom = shift;
-my $mailto = $mailfrom;
+my $mailto = shift;
 my $envaddr = $mailto;
 
 my $cvsuser = shift;
@@ -121,7 +121,9 @@ foreach my $info (@modified_files_info)
 	my ($file, $old, $new) = @$info;
         if ($file =~ m|TexConvert/tt.dynamic|  ||
 	    $file =~ m|foxr/londtest| ||
-	    $file =~ m|purdue| ) {
+	    $file =~ m|purdue| ||
+            $file =~ m|vcu/| ||
+            $file =~ m|modules/[^/]+/private/| ) {
 		$diffmsg='Diffs for '.$file.' not shown.'."\n";
 		next;
 	}
@@ -135,6 +137,14 @@ foreach my $info (@modified_files_info)
 foreach my $file (@added_files) {
 	next if $file =~ /\.(gif|jpe|jpe?g|pdf|png|exe|class|tgz|tar.gz|jar)$/i
 		or $file !~ /\./;
+        if ($file =~ m|TexConvert/tt.dynamic|  ||
+            $file =~ m|foxr/londtest| ||
+            $file =~ m|purdue|  ||
+            $file =~ m|vcu/| ||
+            $file =~ m|modules/[^/]+/private/| ) {
+                $diffmsg='Contents of added file: '.$file.' not shown.'."\n";
+                next;
+        }
 	$diffmsg .= "\nIndex: $file\n+++ $file\n";
 	open(LOG, "$cvs -Qn checkout -p -r1.1 $file |") || die;
 	while(<LOG>) { s/\r\n/\n/; $diffmsg .= $_; }
@@ -185,7 +195,7 @@ if (open FD, $cvsusers) {
 	close(FD);
 }
 
-$from ||= "$cvsuser <$mailfrom>";
+$from ||= "$cvsuser <$cvsuser\@$cvshost>";
 
 # "Reply-to: $mailto\n".
 # "Date: ".localtime()."\n".
@@ -223,17 +233,18 @@ if (length($diffmsg) > 8000) {
 		"\n".
 		"This is a MIME encoded message\n\n".
 		"--$boundary\n".
-		"Content-Type: text/plain\n".
+		'Content-Type: text/plain; charset="us-ascii"'."\n".
 		"\n".
 		$common_body.
 		"--$boundary\n".
-		"Content-Type: text/plain\n".
+		'Content-Type: text/plain; charset="us-ascii"'."\n".
 		"Content-Disposition: attachment; filename=\"$cvsuser-$now.txt\"\n".
 		"\n".
 		"$diffmsg\n".
 		"--$boundary--\n";
 } else {
 	$email = $common_header.
+                'Content-Type: text/plain; charset="us-ascii"'."\n".
 		"\n".
 		$common_body.
 		"$diffmsg\n";