--- loncom/interface/lonmsg.pm 2004/03/01 18:30:50 1.90 +++ loncom/interface/lonmsg.pm 2004/05/07 12:03:53 1.99 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging # -# $Id: lonmsg.pm,v 1.90 2004/03/01 18:30:50 www Exp $ +# $Id: lonmsg.pm,v 1.99 2004/05/07 12:03:53 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -101,6 +101,7 @@ use Apache::lontexconvert(); use HTML::Entities(); use Mail::Send; use Apache::lonlocal; +use Apache::loncommunicate; # Querystring component with sorting type my $sqs; @@ -109,15 +110,15 @@ my $sqs; sub packagemsg { my ($subject,$message,$citation,$baseurl,$attachmenturl)=@_; - $message =&HTML::Entities::encode($message); - $citation=&HTML::Entities::encode($citation); - $subject =&HTML::Entities::encode($subject); + $message =&HTML::Entities::encode($message,'<>&"'); + $citation=&HTML::Entities::encode($citation,'<>&"'); + $subject =&HTML::Entities::encode($subject,'<>&"'); #remove machine specification $baseurl =~ s|^http://[^/]+/|/|; - $baseurl =&HTML::Entities::encode($baseurl); + $baseurl =&HTML::Entities::encode($baseurl,'<>&"'); #remove machine specification $attachmenturl =~ s|^http://[^/]+/|/|; - $attachmenturl =&HTML::Entities::encode($attachmenturl); + $attachmenturl =&HTML::Entities::encode($attachmenturl,'<>&"'); my $now=time; $msgcount++; @@ -175,9 +176,11 @@ sub unpackagemsg { if ($notoken) { $content{'message'}.='

'.&mt('Attachment').': '.$fname.'.'.$ft.''; } else { - $content{'message'}.='

'.&mt('Attachment').': '.$fname.'.'.$ft.''; + &Apache::lonnet::allowuploaded('/adm/msg', + $content{'attachmenturl'}); + $content{'message'}.='

'.&mt('Attachment'). + ': '. + $fname.'.'.$ft.''; } } return %content; @@ -204,7 +207,7 @@ sub sendemail { my $msg = new Mail::Send; $msg->to($to); $msg->subject('[LON-CAPA] '.$subject); - if (my $fh = $msg->open('smtp',Server => 'localhost')) { + if (my $fh = $msg->open()) { print $fh $body; $fh->close; } @@ -508,7 +511,7 @@ sub discourse { 'cfs' => 'Check for Section/Group', 'cfn' => 'Check for None'); $r->print(< + -  - -  - +  + +  +

ENDDISHEADER my %coursepersonnel= @@ -618,51 +621,6 @@ $content{'sendername'}.'@'. $r->print(''); } -# =============================================================== Compose reply - -sub comprep { - my ($r,$msgid)=@_; - my %message=&Apache::lonnet::get('nohist_email',[$msgid]); - my %content=&unpackagemsg($message{$msgid},1); - my $quotemsg='> '.$content{'message'}; - $quotemsg=~s/\r/\n/g; - $quotemsg=~s/\f/\n/g; - $quotemsg=~s/\n+/\n\> /g; - my $torepl=&Apache::loncommon::aboutmewrapper( - &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('. -$content{'sendername'}.'@'. - $content{'senderdomain'}.')'; - my $subject=&mt('Re').': '.$content{'subject'}; - my $dispcrit=''; - if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { - my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message"); - $dispcrit= - ' '.&mt('Send as critical message').' ' . $crithelp . - '
'. - ' '.&mt('Send as critical message').' ' . - &mt('and return receipt') . $crithelp . '

'; - } - my %lt=&Apache::lonlocal::texthash( - 'to' => 'To', - 'sb' => 'Subject', - 'sr' => 'Send Reply', - 'ca' => 'Cancel' - ); - $r->print(<<"ENDREPLY"); -

- -$lt{'to'}: $torepl
-$lt{'sb'}:

-


-$dispcrit - - -
-ENDREPLY -} - sub sortedmessages { my @messages = &Apache::lonnet::getkeys('nohist_email'); #unpack the varibles and repack into temp for sorting @@ -783,7 +741,7 @@ ENDDISHEADER } $r->print(''.&mt('Open').''.&mt('Delete').''. + '">'.&mt('Delete').''. ''.&Apache::lonlocal::locallocaltime($sendtime).''. $fromname.''.$fromdomain.''. &Apache::lonnet::unescape($shortsubj).''. @@ -794,16 +752,41 @@ ENDDISHEADER ''.&mt('Check All').' '. ''.&mt('Uncheck All').'

'. ''. - ''. + ''. ''); } # ============================================================== Compose output sub compout { - my ($r,$forwarding,$broadcast)=@_; - &printheader($r,'/adm/email?compose=upload', - 'Distribute from uploaded file'); + my ($r,$forwarding,$replying,$broadcast,$replycrit)=@_; + + if ($broadcast eq 'individual') { + &printheader($r,'/adm/email?compose=individual', + 'Send a Message'); + } elsif ($broadcast) { + &printheader($r,'/adm/email?compose=group', + 'Broadcast Message'); + } elsif ($forwarding) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/email?display=".&Apache::lonnet::escape($forwarding), + text=>"Display Message"}); + &printheader($r,'/adm/email?forward='.&Apache::lonnet::escape($forwarding), + 'Forwarding a Message'); + } elsif ($replying) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/email?display=".&Apache::lonnet::escape($replying), + text=>"Display Message"}); + &printheader($r,'/adm/email?replyto='.&Apache::lonnet::escape($replying), + 'Replying to a Message'); + } elsif ($replycrit) { + $r->print('

'.&mt('Replying to a Critical Message').'

'); + $replying=$replycrit; + } else { + &printheader($r,'/adm/email?compose=upload', + 'Distribute from Uploaded File'); + } + my $dispcrit=''; my $dissub=''; my $dismsg=''; @@ -818,50 +801,75 @@ sub compout { if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message"); $dispcrit= - ' '.&mt('Send as critical message').' ' . $crithelp . + ' '.&mt('Send as critical message').' ' . $crithelp . '
'. - ' '.&mt('Send as critical message').' ' . + ' '.&mt('Send as critical message').' ' . &mt('and return receipt') . $crithelp . '

'; - } + } + my %message; + my %content; + my $defdom=$ENV{'user.domain'}; if ($forwarding) { - $dispcrit.=''; - $func=&mt('Forward'); - my %message=&Apache::lonnet::get('nohist_email',[$forwarding]); - my %content=&unpackagemsg($message{$forwarding}); - - $dissub=&mt('Forwarding').': '.$content{'subject'}; - $dismsg=&mt('Forwarded message from').' '. - $content{'sendername'}.' '.&mt('at').' '.$content{'senderdomain'}; + %message=&Apache::lonnet::get('nohist_email',[$forwarding]); + %content=&unpackagemsg($message{$forwarding}); + $dispcrit.=''; + $func=&mt('Forward'); + + $dissub=&mt('Forwarding').': '.$content{'subject'}; + $dismsg=&mt('Forwarded message from').' '. + $content{'sendername'}.' '.&mt('at').' '.$content{'senderdomain'}; + } + if ($replying) { + %message=&Apache::lonnet::get('nohist_email',[$replying]); + %content=&unpackagemsg($message{$replying}); + $dispcrit.=''; + $func=&mt('Replying to'); + + $dissub=&mt('Reply').': '.$content{'subject'}; + $dismsg='> '.$content{'message'}; + $dismsg=~s/\r/\n/g; + $dismsg=~s/\f/\n/g; + $dismsg=~s/\n+/\n\> /g; } - my $defdom=$ENV{'user.domain'}; if ($ENV{'form.recdom'}) { $defdom=$ENV{'form.recdom'}; } $r->print( '

'."\n". - ''."\n". + ''."\n". ''); unless (($broadcast eq 'group') || ($broadcast eq 'upload')) { - my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain'); - my $selectlink=&Apache::loncommon::selectstudent_link + if ($replying) { + $r->print(''); + } else { + my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain'); + my $selectlink=&Apache::loncommon::selectstudent_link ('compemail','recuname','recdomain'); - $r->print(<<"ENDREC"); -
'.&mt('Replying to').' '. + &Apache::loncommon::aboutmewrapper( + &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('. + $content{'sendername'}.'@'. + $content{'senderdomain'}.')'. + ''. + ''. + '
+ $r->print(<<"ENDREC"); ENDREC + } } my $latexHelp = Apache::loncommon::helpLatexCheatsheet(); if ($broadcast ne 'upload') { $r->print(<<"ENDCOMP"); - +
$lt{'us'}:$selectlink
$lt{'do'}: $domform
$lt{'ad'}
username\@domain,username\@domain, ... 		-
$lt{'sb'}: +
$lt{'sb'}:
$latexHelp -


$dispcrit @@ -869,14 +877,14 @@ $dispcrit ENDCOMP } else { # $broadcast is 'upload' $r->print(< +

Generate messages from a file

-Subject: +Subject:

General message text
-

The file format for the uploaded portion of the message is: @@ -890,9 +898,9 @@ username3\@domain1: text The messages will be assembled from all lines with the respective username\@domain, and appended to the general message text.

-

+

$dispcrit - +

ENDUPLOAD } if ($broadcast eq 'group') { @@ -905,6 +913,7 @@ ENDUPLOAD sub disfacetoface { my ($r,$user,$domain)=@_; + my $target=$ENV{'form.grade_target'}; unless ($ENV{'request.course.id'}) { return; } unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { return; @@ -924,7 +933,7 @@ sub disfacetoface { $result.='

'.&mt('Sent Message').'

'; %content=&unpackagemsg($content{'message'}); $content{'message'}= - 'Subject: '.$content{'subject'}.'
'. + ''.&mt('Subject').': '.$content{'subject'}.'
'. $content{'message'}; } $result.=&mt('By').': '. @@ -932,13 +941,17 @@ sub disfacetoface { &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('. $content{'sendername'}.'@'. $content{'senderdomain'}.') '.$content{'time'}. - '
'. + '
'. &Apache::lontexconvert::msgtexconverted($content{'message'}). '
'; } # Check to see if there were any messages. if ($result eq '') { - $r->print("

No notes, face-to-face discussion records, or critical messages in this course.

"); + if ($target ne 'tex') { + $r->print("

".&mt("No notes, face-to-face discussion records, or critical messages in this course.")."

"); + } else { + $r->print('\textbf{'.&mt("No notes, face-to-face discussion records, or critical messages in this course.").'}\\\\'); + } } else { $r->print($result); } @@ -1016,6 +1029,7 @@ ENDRHEAD ENDBFORM } } + # ----------------------------------------------------------- Display a message sub displaymessage { @@ -1037,7 +1051,7 @@ sub displaymessage { $r->print(''); my $number_of_messages = scalar(@messages); #subtract 1 for last index # start output - &printheader($r,'/adm/email?display='.$msgid,'Display a Message','',$content{'baseurl'}); + &printheader($r,'/adm/email?display='.&Apache::lonnet::escape($msgid),'Display a Message','',$content{'baseurl'}); my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'}); # Functions $r->print(''. @@ -1136,53 +1150,29 @@ sub handler { if ($ENV{'form.display'}) { &displaymessage($r,$ENV{'form.display'}); } elsif ($ENV{'form.replyto'}) { - &comprep($r,$ENV{'form.replyto'}); - } elsif ($ENV{'form.sendreply'}) { - if ($ENV{'form.send'}) { - my $msgid=$ENV{'form.sendreply'}; - my %message=&Apache::lonnet::get('nohist_email',[$msgid]); - my %content=&unpackagemsg($message{$msgid},1); - &statuschange($msgid,'replied'); - if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && - (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) { - $r->print(&mt('Sending critical message').': '. - &user_crit_msg($content{'sendername'}, - $content{'senderdomain'}, - &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}), - &Apache::lonfeedback::clear_out_html($ENV{'form.message'}), - $ENV{'form.sendbck'})); - } else { - $r->print(&mt('Sending').': '.&user_normal_msg($content{'sendername'}, - $content{'senderdomain'}, - &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}), - &Apache::lonfeedback::clear_out_html($ENV{'form.message'}))); - } - } - if ($ENV{'form.displayedcrit'}) { - &discrit($r); - } else { - &disall($r); - } + &compout($r,'',$ENV{'form.replyto'}); } elsif ($ENV{'form.confirm'}) { + &printheader($r,'','Confirmed Receipt'); foreach (keys %ENV) { if ($_=~/^form\.rec\_(.*)$/) { - $r->print('Confirming Receipt: '. + $r->print(''.&mt('Confirming Receipt').': '. &user_crit_received($1).'
'); } if ($_=~/^form\.reprec\_(.*)$/) { my $msgid=$1; - $r->print('Confirming Receipt: '. + $r->print(''.&mt('Confirming Receipt').': '. &user_crit_received($msgid).'
'); - &comprep($r,$msgid); + &compout($r,'','','',$msgid); } } &discrit($r); } elsif ($ENV{'form.critical'}) { + &printheader($r,'','Displaying Critical Messages'); &discrit($r); } elsif ($ENV{'form.forward'}) { &compout($r,$ENV{'form.forward'}); - } elsif ($ENV{'form.markread'}) { } elsif ($ENV{'form.markdel'}) { + &printheader($r,'','Deleted Message'); &statuschange($ENV{'form.markdel'},'deleted'); &disall($r); } elsif ($ENV{'form.markeddel'}) { @@ -1193,18 +1183,22 @@ sub handler { $total++; } } + &printheader($r,'','Deleted Messages'); $r->print('Deleted '.$total.' message(s)

'); &disall($r); } elsif ($ENV{'form.markunread'}) { + &printheader($r,'','Marked Message as Unread'); &statuschange($ENV{'form.markunread'},'new'); &disall($r); } elsif ($ENV{'form.compose'}) { - &compout($r,'',$ENV{'form.compose'}); + &compout($r,'','',$ENV{'form.compose'}); } elsif ($ENV{'form.recordftf'}) { &facetoface($r,$ENV{'form.recordftf'}); } elsif ($ENV{'form.sendmail'}) { my $sendstatus=''; if ($ENV{'form.send'}) { + &printheader($r,'','Messages being sent.'); + $r->rflush(); my %content=(); undef %content; if ($ENV{'form.forwid'}) { @@ -1240,33 +1234,38 @@ sub handler { $toaddr{$auname.':'.$audom}=''; } } + foreach (keys %toaddr) { my ($recuname,$recdomain)=split(/\:/,$_); my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'}); - if ($toaddr{$_}) { $msgtxt.='

'.$toaddr{$_}; } + if ($toaddr{$_}) { $msgtxt.='
'.$toaddr{$_}; } + my $thismsg; if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) { - $r->print(&mt('Sending critical message').' ...'); - $sendstatus.=' '.&user_crit_msg($recuname,$recdomain, + $r->print(&mt('Sending critical message').' '.$recuname.'@'.$recdomain.': '); + $thismsg=&user_crit_msg($recuname,$recdomain, &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}), $msgtxt, $ENV{'form.sendbck'}); } else { - $r->print(&mt('Sending').' ...'); - $sendstatus.=' '.&user_normal_msg($recuname,$recdomain, + $r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': '); + $thismsg=&user_normal_msg($recuname,$recdomain, &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}), $msgtxt, $content{'citation'}); } - $r->print('
'); + $r->print($thismsg.'
'); + $sendstatus.=' '.$thismsg; } + } else { + &printheader($r,'','No messages sent.'); } if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) { $r->print('
'.&mt('Completed.').''); if ($ENV{'form.displayedcrit'}) { &discrit($r); } else { - &disall($r); + &Apache::loncommunicate::menu($r); } } else { $r->print( @@ -1275,6 +1274,7 @@ sub handler { ); } } else { + &printheader($r,'','Display All Messages'); &disall($r); } $r->print('');
'.&mt('Functions').':