--- loncom/interface/lonmsgdisplay.pm 2006/11/23 16:40:17 1.42 +++ loncom/interface/lonmsgdisplay.pm 2006/11/29 05:54:34 1.43 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging display # -# $Id: lonmsgdisplay.pm,v 1.42 2006/11/23 16:40:17 raeburn Exp $ +# $Id: lonmsgdisplay.pm,v 1.43 2006/11/29 05:54:34 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1039,7 +1039,7 @@ sub compout { my $latexHelp = Apache::loncommon::helpLatexCheatsheet(); if ($broadcast ne 'upload') { $r->print(<<"ENDCOMP"); -
-username1\@domain1: text -username2\@domain2: text -username3\@domain1: text +username1:domain1: text +username2:domain2: text +username3:domain1: text
The messages will be assembled from all lines with the respective -username\@domain, and appended to the general message text.
+username:domain, and appended to the general message text.
$dispcrit @@ -1906,9 +1906,10 @@ sub sendoffmail { } } elsif ($env{'form.sendmode'} eq 'upload') { foreach my $line (split(/[\n\r\f]+/,$env{'form.upfile'})) { - my ($rec,$txt)=split(/\s*\:\s*/,$line); + my ($rec,$txt) = ($line =~ /^([^:]+:[^:]+):(.*)$/); if ($txt) { - $rec=~s/\@/\:/; + $rec =~ s/^\s+//; + $rec =~ ~s/\s+$//; $toaddr{$rec}.=$txt."\n"; } } @@ -1919,7 +1920,7 @@ sub sendoffmail { } if ($env{'form.additionalrec'}) { foreach my $rec (split(/\,/,$env{'form.additionalrec'})) { - my ($auname,$audom)=split(/\@/,$rec); + my ($auname,$audom)=split(/:/,$rec); if (($auname ne "") && ($audom ne "")) { $toaddr{$auname.':'.$audom}=''; }