| '.$status.' | '."\n");
} elsif ($status eq 'deleted') {
# purge
- my ($result,$msg) =
- &movemsg(&Apache::lonnet::unescape($origID),$folder,'trash');
-
+ &movemsg(&Apache::lonnet::unescape($origID),$folder,'trash');
}
}
$r->print("\n".
@@ -1473,17 +1436,29 @@ sub disfacetoface {
} elsif ($content{'subject'}=~/^Broadcast/) {
$result .='
'.&mt('Broadcast Message').'
';
if ($content{'subject'}=~/^Broadcast\./) {
- %content=&unpackagemsg($content{'message'});
- $content{'message'}=
+ if (defined($content{'coursemsgid'})) {
+ my $crsmsgid = &Apache::lonnet::escape($content{'coursemsgid'});
+ my $broadcast_message = &general_message($crsmsgid);
+ $content{'message'} = ''.&mt('Subject').': '.$content{'message'}.'
'.$broadcast_message;
+ } else {
+ %content=&unpackagemsg($content{'message'});
+ $content{'message'} =
''.&mt('Subject').': '.$content{'subject'}.'
'.
$content{'message'};
+ }
}
} else {
$result.=''.&mt('Critical Message').'
';
- %content=&unpackagemsg($content{'message'});
- $content{'message'}=
+ if (defined($content{'coursemsgid'})) {
+ my $crsmsgid=&Apache::lonnet::escape($content{'coursemsgid'});
+ my $critical_message = &general_message($crsmsgid);
+ $content{'message'} = ''.&mt('Subject').': '.$content{'message'}.'
'.$critical_message;
+ } else {
+ %content=&unpackagemsg($content{'message'});
+ $content{'message'}=
''.&mt('Subject').': '.$content{'subject'}.'
'.
$content{'message'};
+ }
}
$result.=&mt('By').': '.
&Apache::loncommon::aboutmewrapper(
@@ -1506,6 +1481,18 @@ $content{'sendername'}.'@'.
}
}
+sub general_message {
+ my ($crsmsgid) = @_;
+ my %general_content;
+ if ($crsmsgid) {
+ my %course_content = &Apache::lonnet::get('nohist_email',[$crsmsgid],
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
+ $env{'course.'.$env{'request.course.id'}.'.num'});
+ %general_content = &unpackagemsg($course_content{$crsmsgid});
+ }
+ return $general_content{'message'};
+}
+
# ---------------------------------------------------------------- Face to face
sub facetoface {
@@ -1556,9 +1543,13 @@ ENDTREC
($env{'form.recdomain'}) && ($env{'form.recuname'})) {
chomp($env{'form.newrecord'});
if ($env{'form.newrecord'}) {
- &Apache::lonmsg::store_instructor_comment($env{'form.newrecord'},
- $env{'form.recuname'},
- $env{'form.recdomain'});
+ my $recordtxt = $env{'form.newrecord'};
+ &user_normal_msg_raw(
+ $env{'course.'.$env{'request.course.id'}.'.num'},
+ $env{'course.'.$env{'request.course.id'}.'.domain'},
+ &mt('Record').
+ ' ['.$env{'form.recuname'}.':'.$env{'form.recdomain'}.']',
+ $recordtxt);
}
$r->print(''.&Apache::loncommon::plainname($env{'form.recuname'},
$env{'form.recdomain'}).'
');
@@ -2205,6 +2196,7 @@ sub sendoffmail {
my $savemsg;
my $msgtype;
my %sentmessage;
+ my $msgsubj=&Apache::lonfeedback::clear_out_html($env{'form.subject'});
if ((($env{'form.critmsg'}) || ($env{'form.sendbck'})) &&
(&Apache::lonnet::allowed('srm',$env{'request.course.id'})
|| &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
@@ -2226,15 +2218,12 @@ sub sendoffmail {
|| &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
'/'.$env{'request.course.sec'}))) {
$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'},$env{'form.permanent'},\$sentmessage{$_});
+ $thismsg=&user_crit_msg($recuname,$recdomain,$msgsubj,$msgtxt,
+ $env{'form.sendbck'},$env{'form.permanent'},
+ \$sentmessage{$_});
} else {
$r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': ');
- $thismsg=&user_normal_msg($recuname,$recdomain,
- &Apache::lonfeedback::clear_out_html($env{'form.subject'}),
- $msgtxt,
+ $thismsg=&user_normal_msg($recuname,$recdomain,$msgsubj,$msgtxt,
$content{'citation'},undef,undef,$env{'form.permanent'},\$sentmessage{$_});
}
if (($env{'request.course.id'}) && (($msgtype eq 'critical') ||
@@ -2270,7 +2259,7 @@ sub sendoffmail {
my $record_sent;
my @recusers = ();
my @recudoms = ();
- my ($stamp,$msgsubj,$msgname,$msgdom,$msgcount,$context,$pid) =
+ my ($stamp,$crssubj,$msgname,$msgdom,$msgcount,$context,$pid) =
split(/\:/,&Apache::lonnet::unescape($specialmsgid));
foreach my $recipient (sort(keys(%toaddr))) {
if ($specialmsg_status{$recipient} eq 'ok') {
@@ -2278,8 +2267,8 @@ sub sendoffmail {
my $usermsgid = &buildmsgid($stamp,$usersubj,$msgname,
$msgdom,$msgcount,$context,$pid);
&user_normal_msg_raw($cnum,$cdom,$subj_prefix.
- ' ['.$recipient.']',$sentmessage{$recipient},
- undef,undef,undef,undef,$usermsgid);
+ ' ['.$recipient.']',$msgsubj,undef,
+ undef,undef,undef,$usermsgid,undef,undef,$specialmsgid);
my ($uname,$udom) = split/:/,$recipient;
push(@recusers,$uname);
push(@recudoms,$udom);
@@ -2288,14 +2277,12 @@ sub sendoffmail {
if (@recusers) {
my $specialmessage;
my $sentsubj = $subj_prefix.' ('.$numspecial.' sent) '.
- &Apache::lonfeedback::clear_out_html($env{'form.subject'});
+ $msgsubj;
$sentsubj = &HTML::Entities::encode($sentsubj,'<>&"');
my $sentmsgid = &buildmsgid($stamp,$sentsubj,$msgname,
$msgdom,$msgcount,$context,$pid);
- ($specialmsgid,$specialmessage) =
- &packagemsg(&Apache::lonfeedback::clear_out_html(
- $env{'form.subject'}),$savemsg,undef,undef,undef,
- \@recusers,\@recudoms,$sentmsgid);
+ ($specialmsgid,$specialmessage) = &packagemsg($msgsubj,$savemsg,
+ undef,undef,undef,\@recusers,\@recudoms,$sentmsgid);
$record_sent = &store_sent_mail($specialmsgid,$specialmessage);
}
} else {
@@ -2423,63 +2410,31 @@ sub handler {
&compout($r,$env{'form.forward'},undef,undef,undef,$folder);
} elsif ($env{'form.markdel'}) {
&printheader($r,'','Deleted Message');
- my ($result,$msg) =
- &statuschange($env{'form.markdel'},'deleted',$folder);
- if (!$result) {
- $r->print('Failed to delete the message.
'.
- ''.$msg."
\n");
- }
+ &statuschange($env{'form.markdel'},'deleted',$folder);
&Apache::loncommunicate::menu($r);
&disall($r,($folder?$folder:$dismode));
} elsif ($env{'form.markedmove'}) {
- my ($total,$failed,@failed_msg)=(0,0);
- foreach my $key (keys(%env)) {
- if ($key=~/^form\.delmark_(.*)$/) {
- my ($result,$msg) =
- &movemsg(&Apache::lonnet::unescape($1),$folder,
- $env{'form.movetofolder'});
- if ($result) {
- $total++;
- } else {
- $failed++;
- push(@failed_msg,$msg);
- }
+ my $total=0;
+ foreach (keys %env) {
+ if ($_=~/^form\.delmark_(.*)$/) {
+ &movemsg(&Apache::lonnet::unescape($1),$folder,
+ $env{'form.movetofolder'});
+ $total++;
}
}
&printheader($r,'','Moved Messages');
- if ($failed) {
- $r->print('
- Failed to move '.$failed.' message(s)
');
- $r->print(''.
- join("
\n",@failed_msg).
- "
\n");
- }
$r->print('Moved '.$total.' message(s)');
&Apache::loncommunicate::menu($r);
&disall($r,($folder?$folder:$dismode));
} elsif ($env{'form.markeddel'}) {
- my ($total,$failed,@failed_msg)=(0,0);
- foreach my $key (keys(%env)) {
- if ($key=~/^form\.delmark_(.*)$/) {
- my ($result,$msg) =
- &statuschange(&Apache::lonnet::unescape($1),'deleted',
- $folder);
- if ($result) {
- $total++;
- } else {
- $failed++;
- push(@failed_msg,$msg);
- }
+ my $total=0;
+ foreach (keys %env) {
+ if ($_=~/^form\.delmark_(.*)$/) {
+ &statuschange(&Apache::lonnet::unescape($1),'deleted',$folder);
+ $total++;
}
}
&printheader($r,'','Deleted Messages');
- if ($failed) {
- $r->print('
- Failed to delete '.$failed.' message(s)
');
- $r->print(''.
- join("
\n",@failed_msg).
- "
\n");
- }
$r->print('Deleted '.$total.' message(s)');
&Apache::loncommunicate::menu($r);
&disall($r,($folder?$folder:$dismode));