--- loncom/interface/lonmsg.pm 2005/01/31 11:27:14 1.132 +++ loncom/interface/lonmsg.pm 2005/02/17 04:02:47 1.135 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging # -# $Id: lonmsg.pm,v 1.132 2005/01/31 11:27:14 www Exp $ +# $Id: lonmsg.pm,v 1.135 2005/02/17 04:02:47 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -414,7 +414,7 @@ sub user_crit_msg_raw { =cut sub user_crit_msg { - my ($user,$domain,$subject,$message,$sendback)=@_; + my ($user,$domain,$subject,$message,$sendback,$toperm)=@_; my $status=''; my %userenv = &Apache::lonnet::get('environment',['msgforward'], $domain,$user); @@ -424,10 +424,10 @@ sub user_crit_msg { my ($forwuser,$forwdomain)=split(/\:/,$_); $status.= &user_crit_msg_raw($forwuser,$forwdomain,$subject,$message, - $sendback).' '; + $sendback,$toperm).' '; } } else { - $status=&user_crit_msg_raw($user,$domain,$subject,$message,$sendback); + $status=&user_crit_msg_raw($user,$domain,$subject,$message,$sendback,$toperm); } return $status; } @@ -693,7 +693,15 @@ ENDDISHEADER } } $r->print('
'); if ($ENV{'form.sortedby'} eq "revstatus") { - $r->print(''.&mt('Status').' | '); + $r->print(''.&mt('Status').''); } else { - $r->print(''.&mt('Status').''); + $r->print(''.&mt('Status').''); } $r->print("\n"); for (my $n=$firstdis;$n<=$lastdis;$n++) { @@ -996,10 +1004,10 @@ ENDDISHEADER } else { $r->print('||||||||
---|---|---|---|---|---|---|---|---|
'.&mt('Open').' | '. ($folder ne 'trash'?''.&mt('Delete'):' ').' | '. + '">'.&mt('Delete'):' ').''. ''.&Apache::lonlocal::locallocaltime($sendtime).' | '. $fromname.' | '.$fromdomain.' | '. &Apache::lonnet::unescape($shortsubj).' | '.
@@ -1083,9 +1091,11 @@ sub compout {
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 . ' ';
+ &mt('and return receipt') . $crithelp .
+ ' '; } my %message; my %content; @@ -1960,13 +1970,13 @@ sub sendoffmail { $thismsg=&user_crit_msg($recuname,$recdomain, &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}), $msgtxt, - $ENV{'form.sendbck'}); + $ENV{'form.sendbck'},$ENV{'form.permanent'}); } else { $r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': '); $thismsg=&user_normal_msg($recuname,$recdomain, &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}), $msgtxt, - $content{'citation'}); + $content{'citation'},undef,undef,$ENV{'form.permanent'}); if (($ENV{'request.course.id'}) && ($ENV{'form.sendmode'} eq 'group')) { &user_normal_msg_raw( $ENV{'course.'.$ENV{'request.course.id'}.'.num'}, |