--- loncom/interface/lonmsg.pm 2004/03/02 02:51:09 1.92
+++ loncom/interface/lonmsg.pm 2004/10/26 19:50:15 1.111
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging
#
-# $Id: lonmsg.pm,v 1.92 2004/03/02 02:51:09 www Exp $
+# $Id: lonmsg.pm,v 1.111 2004/10/26 19:50:15 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -74,6 +74,18 @@ email program, so they have full access
interface, or other features they may wish to use in response to the
student's query.
+=item * B<Blocking>: LON-CAPA can block display of e-mails that are
+sent to a student during an online exam. A course coordinator or
+instructor can set an open and close date/time for scheduled online
+exams in a course. If a user uses the LON-CAPA internal messaging
+system to display e-mails during the scheduled blocking event,
+display of all e-mail sent during the blocking period will be
+suppressed, and a message of explanation, including details of the
+currently active blocking periods will be displayed instead. A user
+who has a course coordinator or instructor role in a course will be
+unaffected by any blocking periods for the course, unless the user
+also has a student role in the course, AND has selected the student role.
+
=back
Users can ask LON-CAPA to forward messages to conventional e-mail
@@ -101,23 +113,27 @@ use Apache::lontexconvert();
use HTML::Entities();
use Mail::Send;
use Apache::lonlocal;
+use Apache::loncommunicate;
# Querystring component with sorting type
my $sqs;
+my $startdis;
+my $interdis;
# ===================================================================== Package
sub packagemsg {
- my ($subject,$message,$citation,$baseurl,$attachmenturl)=@_;
- $message =&HTML::Entities::encode($message);
- $citation=&HTML::Entities::encode($citation);
- $subject =&HTML::Entities::encode($subject);
+ my ($subject,$message,$citation,$baseurl,$attachmenturl,
+ $recuser,$recdomain)=@_;
+ $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++;
@@ -143,6 +159,8 @@ sub packagemsg {
'<role>'.$ENV{'request.role'}.'</role>'.
'<resource>'.$ENV{'request.filename'}.'</resource>'.
'<msgid>'.$msgid.'</msgid>'.
+ '<recuser>'.$recuser.'</recuser>'.
+ '<recdomain>'.$recdomain.'</recdomain>'.
'<message>'.$message.'</message>';
if (defined($citation)) {
$result.='<citation>'.$citation.'</citation>';
@@ -171,13 +189,15 @@ sub unpackagemsg {
}
}
if ($content{'attachmenturl'}) {
- my ($fname,$ft)=($content{'attachmenturl'}=~/\/(\w+)\.(\w+)$/);
+ my ($fname)=($content{'attachmenturl'}=~m|/([^/]+)$|);
if ($notoken) {
- $content{'message'}.='<p>'.&mt('Attachment').': <tt>'.$fname.'.'.$ft.'</tt>';
+ $content{'message'}.='<p>'.&mt('Attachment').': <tt>'.$fname.'</tt>';
} else {
- $content{'message'}.='<p>'.&mt('Attachment').': <a href="'.
- &Apache::lonnet::tokenwrapper($content{'attachmenturl'}).
- '"><tt>'.$fname.'.'.$ft.'</tt></a>';
+ &Apache::lonnet::allowuploaded('/adm/msg',
+ $content{'attachmenturl'});
+ $content{'message'}.='<p>'.&mt('Attachment').
+ ': <a href="'.$content{'attachmenturl'}.'"><tt>'.
+ $fname.'</tt></a>';
}
}
return %content;
@@ -186,10 +206,12 @@ sub unpackagemsg {
# ======================================================= Get info out of msgid
sub unpackmsgid {
- my $msgid=&Apache::lonnet::unescape(shift);
+ my ($msgid,$folder)=@_;
+ $msgid=&Apache::lonnet::unescape($msgid);
+ my $suffix=&foldersuffix($folder);
my ($sendtime,$shortsubj,$fromname,$fromdomain)=split(/\:/,
&Apache::lonnet::unescape($msgid));
- my %status=&Apache::lonnet::get('email_status',[$msgid]);
+ my %status=&Apache::lonnet::get('email_status'.$suffix,[$msgid]);
if ($status{$msgid}=~/^error\:/) { $status{$msgid}=''; }
unless ($status{$msgid}) { $status{$msgid}='new'; }
return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid});
@@ -204,10 +226,14 @@ sub sendemail {
my $msg = new Mail::Send;
$msg->to($to);
$msg->subject('[LON-CAPA] '.$subject);
- if (my $fh = $msg->open('smtp',Server => 'localhost')) {
+ my %oldENV=%ENV;
+ undef(%ENV);
+ if (my $fh = $msg->open()) {
print $fh $body;
$fh->close;
}
+ %ENV=%oldENV;
+ undef(%oldENV);
}
# ==================================================== Send notification emails
@@ -426,13 +452,21 @@ sub user_normal_msg_raw {
my $homeserver=&Apache::lonnet::homeserver($user,$domain);
if ($homeserver ne 'no_host') {
($msgid,$message)=&packagemsg($subject,$message,$citation,$baseurl,
- $attachmenturl);
+ $attachmenturl,$user,$domain);
+# Store in user folder
$status=&Apache::lonnet::critical(
'put:'.$domain.':'.$user.':nohist_email:'.
&Apache::lonnet::escape($msgid).'='.
&Apache::lonnet::escape($message),$homeserver);
+# Save new message received time
&Apache::lonnet::put
('email_status',{'recnewemail'=>time},$domain,$user);
+# Into sent-mail folder
+ $status.=' '.&Apache::lonnet::critical(
+ 'put:'.$ENV{'user.domain'}.':'.$ENV{'user.name'}.
+ ':nohist_email_sent:'.
+ &Apache::lonnet::escape($msgid).'='.
+ &Apache::lonnet::escape($message),$ENV{'user.home'});
} else {
$status='no_host';
}
@@ -479,30 +513,94 @@ sub user_normal_msg {
}
+# ============================================================ List all folders
+
+sub folderlist {
+ my $folder=shift;
+ my @allfolders=&Apache::lonnet::getkeys('email_folders');
+ if ($allfolders[0]=~/^error:/) { @allfolders=(); }
+ return '<form method="post" action="/adm/email">'.
+ &mt('Folder').': '.
+ &Apache::loncommon::select_form($folder,'folder',
+ ('' => &mt('INBOX'),'trash' => &mt('TRASH'),
+ 'sent' => &mt('Sent Messages'),
+ map { $_ => $_ } @allfolders)).
+ ' '.&mt('Show').' '.
+ &Apache::loncommon::select_form($interdis,'interdis',
+(' 10' => '10', ' 20' => '20', ' 50' => '50', '100' => '100', '200' => '200')).
+ '<input type="submit" value="'.&mt('View Folder').'" /><br />'.
+ '<input type="submit" name="firstview" value="'.&mt('First').'" />'.
+ '<input type="submit" name="prevview" value="'.&mt('Previous').'" />'.
+ '<input type="text" size="5" name="startdis" value="'.$startdis.'" />'.
+ '<input type="submit" name="nextview" value="'.&mt('Next').'" />'.
+ '<input type="submit" name="lastview" value="'.&mt('Last').'" />'.
+ '<a href="/adm/email?critical=display'.$sqs.'">'.
+ &mt('View Critical Messages').'</a>'.
+ '</form>';
+}
+
+# =============================================================== Folder suffix
+
+sub foldersuffix {
+ my $folder=shift;
+ unless ($folder) { return ''; }
+ return '_'.&Apache::lonnet::escape($folder);
+}
+
# =============================================================== Status Change
sub statuschange {
- my ($msgid,$newstatus)=@_;
- my %status=&Apache::lonnet::get('email_status',[$msgid]);
+ my ($msgid,$newstatus,$folder)=@_;
+ my $suffix=&foldersuffix($folder);
+ my %status=&Apache::lonnet::get('email_status'.$suffix,[$msgid]);
if ($status{$msgid}=~/^error\:/) { $status{$msgid}=''; }
unless ($status{$msgid}) { $status{$msgid}='new'; }
unless (($status{$msgid} eq 'replied') ||
($status{$msgid} eq 'forwarded')) {
- &Apache::lonnet::put('email_status',{$msgid => $newstatus});
+ &Apache::lonnet::put('email_status'.$suffix,{$msgid => $newstatus});
}
if (($newstatus eq 'deleted') || ($newstatus eq 'new')) {
- &Apache::lonnet::put('email_status',{$msgid => $newstatus});
+ &Apache::lonnet::put('email_status'.$suffix,{$msgid => $newstatus});
+ }
+}
+
+# ============================================================= Make new folder
+
+sub makefolder {
+ my ($newfolder)=@_;
+ &Apache::lonnet::put('email_folders',{$newfolder => time});
+}
+
+# ======================================================== Move between folders
+
+sub movemsg {
+ my ($msgid,$srcfolder,$trgfolder)=@_;
+ my $unmsgid=&Apache::lonnet::unescape($msgid);
+ my $srcsuffix=&foldersuffix($srcfolder);
+ my $trgsuffix=&foldersuffix($trgfolder);
+
+# Copy message
+ my %message=&Apache::lonnet::get('nohist_email'.$srcsuffix,[$msgid]);
+ &Apache::lonnet::put('nohist_email'.$trgsuffix,{$msgid => $message{$msgid}});
+
+# Copy status
+ my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$unmsgid]);
+ &Apache::lonnet::put('email_status'.$trgsuffix,{$unmsgid => $status{$unmsgid}});
+# See if was deleted -> becomes "read" in trash
+ my $currentstatus=(&unpackmsgid($status{$unmsgid}),$srcfolder);
+ if ($currentstatus eq 'deleted') {
+ &statuschange($msgid,'read',$trgfolder);
}
+# Delete orginals
+ &Apache::lonnet::del('nohist_email'.$srcsuffix,[$msgid]);
+ &Apache::lonnet::del('email_status'.$srcsuffix,[$unmsgid]);
}
# ======================================================= Display a course list
sub discourse {
my $r=shift;
- my %courselist=&Apache::lonnet::dump(
- 'classlist',
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ my $classlist = &Apache::loncoursedata::get_classlist();
my $now=time;
my %lt=&Apache::lonlocal::texthash('cfa' => 'Check for All',
'cfs' => 'Check for Section/Group',
@@ -544,39 +642,36 @@ sub discourse {
<input type="button" onClick="uncheckall()" value="$lt{'cfn'}" />
<p>
ENDDISHEADER
- my %coursepersonnel=
- &Apache::lonnet::get_course_adv_roles();
+ my %coursepersonnel=&Apache::lonnet::get_course_adv_roles();
+ $r->print('<table>');
foreach my $role (sort keys %coursepersonnel) {
- foreach (split(/\,/,$coursepersonnel{$role})) {
- my ($puname,$pudom)=split(/\:/,$_);
- $r->print(
- '<br /><input type="checkbox" name="send_to_&&&&&&_'.
- $puname.':'.$pudom.'" /> '.
- &Apache::loncommon::plainname($puname,
- $pudom).' ('.$_.'), <i>'.$role.'</i>');
- }
+ foreach (split(/\,/,$coursepersonnel{$role})) {
+ my ($puname,$pudom)=split(/\:/,$_);
+ $r->print('<tr><td><label>'.
+ '<input type="checkbox" name="send_to_&&&&&&_'.
+ $puname.':'.$pudom.'" /> '.
+ &Apache::loncommon::plainname($puname,$pudom).
+ '</label></td>'.
+ '<td>('.$_.'),</td><td><i>'.$role.'</i></td></tr>');
+ }
}
-
- foreach (sort keys %courselist) {
- my ($end,$start)=split(/\:/,$courselist{$_});
- my $active=1;
- if (($end) && ($now>$end)) { $active=0; }
- if ($active) {
- my ($sname,$sdom)=split(/\:/,$_);
- my %reply=&Apache::lonnet::get('environment',
- ['firstname','middlename','lastname','generation'],
- $sdom,$sname);
- my $section=&Apache::lonnet::usection
- ($sdom,$sname,$ENV{'request.course.id'});
- $r->print(
- '<br><input type=checkbox name="send_to_&&&'.$section.'&&&_'.$_.'"> '.
- $reply{'firstname'}.' '.
- $reply{'middlename'}.' '.
- $reply{'lastname'}.' '.
- $reply{'generation'}.
- ' ('.$_.') '.$section);
- }
+ $r->print('</table><table>');
+ while (my ($student,$info) = each(%$classlist)) {
+ my ($sname,$sdom,$status,$fullname,$section) =
+ (@{$info}[&Apache::loncoursedata::CL_SNAME(),
+ &Apache::loncoursedata::CL_SDOM(),
+ &Apache::loncoursedata::CL_STATUS(),
+ &Apache::loncoursedata::CL_FULLNAME(),
+ &Apache::loncoursedata::CL_SECTION()]);
+ next if ($status ne 'Active');
+ my $key = 'send_to_&&&'.$section.'&&&'.$student;
+ if (! defined($fullname) || $fullname eq '') { $fullname = $sname; }
+ $r->print('<tr><td><label>'.
+ qq{<input type="checkbox" name="$key">}.(' 'x2).
+ $fullname.'</td><td>'.$sname.'@'.$sdom.'</td><td>'.$section.
+ '</td></tr>');
}
+ $r->print('</table>');
}
# ==================================================== Display Critical Message
@@ -592,13 +687,13 @@ sub discrit {
my %content=&unpackagemsg($what{$_});
next if ($content{'senderdomain'} eq '');
$content{'message'}=~s/\n/\<br\>/g;
- $result.='<hr>'.&mt('From').': <b>'.
+ $result.='<hr />'.&mt('From').': <b>'.
&Apache::loncommon::aboutmewrapper(
&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
$content{'sendername'}.'@'.
$content{'senderdomain'}.') '.$content{'time'}.
- '<br>'.&mt('Subject').': '.$content{'subject'}.
- '<br><blockquote>'.
+ '<br />'.&mt('Subject').': '.$content{'subject'}.
+ '<br /><blockquote>'.
&Apache::lontexconvert::msgtexconverted($content{'message'}).
'</blockquote><small>'.
&mt('You have to confirm that you received this message. After confirmation, this message will be moved to your regular inbox').
@@ -610,25 +705,35 @@ $content{'sendername'}.'@'.
# Check to see if there were any messages.
if ($result eq '') {
$result = "<h2>".&mt('You have no critical messages.')."</h2>".
- '<a href="/adm/roles">'.&mt('Select a course').'</a>';
+ '<a href="/adm/roles">'.&mt('Select a course').'</a><br />'.
+ '<a href="/adm/email">'.&mt('Communicate').'</a>';
} else {
$r->print($header);
}
$r->print($result);
- $r->print('<input type=hidden name="displayedcrit" value="true"></form>');
+ $r->print('<input type="hidden" name="displayedcrit" value="true" /></form>');
}
sub sortedmessages {
- my @messages = &Apache::lonnet::getkeys('nohist_email');
+ my ($blocked,$startblock,$endblock,$numblocked,$folder) = @_;
+ my $suffix=&foldersuffix($folder);
+ my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix);
#unpack the varibles and repack into temp for sorting
my @temp;
foreach (@messages) {
my $msgid=&Apache::lonnet::escape($_);
my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
- &Apache::lonmsg::unpackmsgid($msgid);
+ &Apache::lonmsg::unpackmsgid($msgid,$folder);
my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status,
$msgid);
- push @temp ,\@temp1;
+ # Check whether message was sent during blocking period.
+ if ($sendtime >= $startblock && ($sendtime <= $endblock && $endblock > 0) ) {
+ my $escid = &Apache::lonnet::unescape($msgid);
+ $$blocked{$escid} = 'ON';
+ $$numblocked ++;
+ } else {
+ push @temp ,\@temp1;
+ }
}
#default sort
@temp = sort {$a->[0] <=> $b->[0]} @temp;
@@ -668,8 +773,14 @@ sub sortedmessages {
# ======================================================== Display all messages
sub disall {
- my $r=shift;
- $r->print(<<ENDDISHEADER);
+ my ($r,$folder)=@_;
+ my %blocked = ();
+ my %setters = ();
+ my $startblock;
+ my $endblock;
+ my $numblocked = 0;
+ &blockcheck(\%setters,\$startblock,\$endblock);
+ $r->print(<<ENDDISHEADER);
<script>
function checkall() {
for (i=0; i<document.forms.disall.elements.length; i++) {
@@ -690,42 +801,50 @@ sub disall {
}
</script>
ENDDISHEADER
- $r->print('<h1>'.&mt('Display All Messages').'</h1><form method=post name=disall '.
- 'action="/adm/email">'.
- '<table border=2><tr><th colspan=2> </th><th>');
+ my $fsqs='&folder='.$folder;
+ my @temp=sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder);
+ my $totalnumber=$#temp+1;
+ my $number=int($totalnumber/$interdis)+1;
+ my $firstdis=$interdis*$startdis;
+ if ($firstdis>$#temp) { $firstdis=$#temp-$interdis+1; }
+ my $lastdis=$firstdis+$interdis-1;
+ if ($lastdis>$#temp) { $lastdis=$#temp; }
+ $r->print('<h2>'.&mt('Display All Messages').'</h2>'.
+ &folderlist($folder).
+ '<form method="post" name="disall" action="/adm/email">'.
+ '<table border=2><tr><th colspan="3"> </th><th>');
if ($ENV{'form.sortedby'} eq "revdate") {
- $r->print('<a href = "?sortedby=date">'.&mt('Date').'</a></th>');
+ $r->print('<a href = "?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
} else {
- $r->print('<a href = "?sortedby=revdate">'.&mt('Date').'</a></th>');
+ $r->print('<a href = "?sortedby=revdate'.$fsqs.'">'.&mt('Date').'</a></th>');
}
$r->print('<th>');
if ($ENV{'form.sortedby'} eq "revuser") {
- $r->print('<a href = "?sortedby=user">'.&mt('Username').'</a>');
+ $r->print('<a href = "?sortedby=user'.$fsqs.'">'.&mt('Username').'</a>');
} else {
- $r->print('<a href = "?sortedby=revuser">'.&mt('Username').'</a>');
+ $r->print('<a href = "?sortedby=revuser'.$fsqs.'">'.&mt('Username').'</a>');
}
$r->print('</th><th>');
if ($ENV{'form.sortedby'} eq "revdomain") {
- $r->print('<a href = "?sortedby=domain">'.&mt('Domain').'</a>');
+ $r->print('<a href = "?sortedby=domain'.$fsqs.'">'.&mt('Domain').'</a>');
} else {
- $r->print('<a href = "?sortedby=revdomain">'.&mt('Domain').'</a>');
+ $r->print('<a href = "?sortedby=revdomain'.$fsqs.'">'.&mt('Domain').'</a>');
}
$r->print('</th><th>');
if ($ENV{'form.sortedby'} eq "revsubject") {
- $r->print('<a href = "?sortedby=subject">'.&mt('Subject').'</a>');
+ $r->print('<a href = "?sortedby=subject'.$fsqs.'">'.&mt('Subject').'</a>');
} else {
- $r->print('<a href = "?sortedby=revsubject">'.&mt('Subject').'</a>');
+ $r->print('<a href = "?sortedby=revsubject'.$fsqs.'">'.&mt('Subject').'</a>');
}
$r->print('</th><th>');
if ($ENV{'form.sortedby'} eq "revstatus") {
- $r->print('<a href = "?sortedby=status">'.&mt('Status').'</th>');
+ $r->print('<a href = "?sortedby=status'.$fsqs.'">'.&mt('Status').'</th>');
} else {
- $r->print('<a href = "?sortedby=revstatus">'.&mt('Status').'</th>');
+ $r->print('<a href = "?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</th>');
}
$r->print('</tr>');
- my @temp=sortedmessages();
- foreach (@temp){
- my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID)= @$_;
+ for (my $n=$firstdis;$n<=$lastdis;$n++) {
+ my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID)= @{$temp[$n]};
if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
if ($status eq 'new') {
$r->print('<tr bgcolor="#FFBB77">');
@@ -736,27 +855,48 @@ ENDDISHEADER
} else {
$r->print('<tr bgcolor="#99BBBB">');
}
- $r->print('<td><a href="/adm/email?display='.$origID.$sqs.
- '">'.&mt('Open').'</a></td><td><a href="/adm/email?markdel='.$origID.$sqs.
- '">'.&mt('Delete').'</a><input type=checkbox name="delmark_'.$origID.'" /></td>'.
+ $r->print('<td></a><input type=checkbox name="delmark_'.$origID.'" /></td><td><a href="/adm/email?display='.$origID.$sqs.
+ '">'.&mt('Open').'</a></td><td>'.
+ ($folder ne 'trash'?'<a href="/adm/email?markdel='.$origID.$sqs.
+ '">'.&mt('Delete'):' ').'</td>'.
'<td>'.&Apache::lonlocal::locallocaltime($sendtime).'</td><td>'.
$fromname.'</td><td>'.$fromdomain.'</td><td>'.
&Apache::lonnet::unescape($shortsubj).'</td><td>'.
$status.'</td></tr>');
+ } elsif ($status eq 'deleted') {
+# purge
+ &movemsg(&Apache::lonnet::unescape($origID),$folder,'trash');
}
}
$r->print('</table><p>'.
- '<a href="javascript:checkall()">'.&mt('Check All').'</a> '.
- '<a href="javascript:uncheckall()">'.&mt('Uncheck All').'</a><p>'.
- '<input type="hidden" name="sortedby" value="'.$ENV{'form.sortedby'}.'" />'.
- '<input type="submit" name="markeddel" value="'.&mt('Delete Checked').'" />'.
- '</form></body></html>');
+ '<a href="javascript:checkall()">'.&mt('Check All').'</a> '.
+ '<a href="javascript:uncheckall()">'.&mt('Uncheck All').'</a></p>'.
+ '<input type="hidden" name="sortedby" value="'.$ENV{'form.sortedby'}.'" />');
+ if ($folder ne 'trash') {
+ $r->print(
+ '<p><input type="submit" name="markeddel" value="'.&mt('Delete Checked').'" /></p>');
+ }
+$r->print('<p><input type="submit" name="markedmove" value="'.&mt('Move Checked to Folder').'" />');
+ my @allfolders=&Apache::lonnet::getkeys('email_folders');
+ if ($allfolders[0]=~/^error:/) { @allfolders=(); }
+ $r->print(
+ &Apache::loncommon::select_form('','movetofolder',
+ ( map { $_ => $_ } @allfolders))
+ );
+ $r->print('<input type="hidden" name="folder" value="'.$folder.'" /></form>');
+ if ($numblocked > 0) {
+ my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
+ my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
+ $r->print('<br /><br />'.
+ $numblocked.' '.&mt('message(s) is/are not viewable because display of LON-CAPA messages sent to you by other students between').' '.$beginblock.' '.&mt('and').' '.$finishblock.' '.&mt('is currently being blocked because of online exams.'));
+ &build_block_table($r,$startblock,$endblock,\%setters);
+ }
}
# ============================================================== Compose output
sub compout {
- my ($r,$forwarding,$replying,$broadcast)=@_;
+ my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder)=@_;
if ($broadcast eq 'individual') {
&printheader($r,'/adm/email?compose=individual',
@@ -776,6 +916,9 @@ sub compout {
text=>"Display Message"});
&printheader($r,'/adm/email?replyto='.&Apache::lonnet::escape($replying),
'Replying to a Message');
+ } elsif ($replycrit) {
+ $r->print('<h3>'.&mt('Replying to a Critical Message').'</h3>');
+ $replying=$replycrit;
} else {
&printheader($r,'/adm/email?compose=upload',
'Distribute from Uploaded File');
@@ -805,7 +948,7 @@ sub compout {
my $defdom=$ENV{'user.domain'};
if ($forwarding) {
%message=&Apache::lonnet::get('nohist_email',[$forwarding]);
- %content=&unpackagemsg($message{$forwarding});
+ %content=&unpackagemsg($message{$forwarding},$folder);
$dispcrit.='<input type="hidden" name="forwid" value="'.
$forwarding.'" />';
$func=&mt('Forward');
@@ -816,10 +959,10 @@ sub compout {
}
if ($replying) {
%message=&Apache::lonnet::get('nohist_email',[$replying]);
- %content=&unpackagemsg($message{$replying});
- $dispcrit.='<input type="hidden" name="forwid" value="'.
- $forwarding.'" />';
- $func=&mt('Replying to');
+ %content=&unpackagemsg($message{$replying},$folder);
+ $dispcrit.='<input type="hidden" name="replyid" value="'.
+ $replying.'" />';
+ $func=&mt('Send Reply to');
$dissub=&mt('Reply').': '.$content{'subject'};
$dismsg='> '.$content{'message'};
@@ -827,6 +970,7 @@ sub compout {
$dismsg=~s/\f/\n/g;
$dismsg=~s/\n+/\n\> /g;
}
+ my $citation=&displayresource(%content);
if ($ENV{'form.recdom'}) { $defdom=$ENV{'form.recdom'}; }
$r->print(
'<form action="/adm/email" name="compemail" method="post"'.
@@ -867,7 +1011,8 @@ $latexHelp
</textarea></p><br />
$dispcrit
<input type="submit" name="send" value="$func $lt{'ma'}" />
-<input type="submit" name="cancel" value="$lt{'ca'}" />
+<input type="submit" name="cancel" value="$lt{'ca'}" /><hr />
+$citation
ENDCOMP
} else { # $broadcast is 'upload'
$r->print(<<ENDUPLOAD);
@@ -905,8 +1050,34 @@ ENDUPLOAD
# ---------------------------------------------------- Display all face to face
+sub retrieve_instructor_comments {
+ my ($user,$domain)=@_;
+ my $target=$ENV{'form.grade_target'};
+ if (! $ENV{'request.course.id'}) { return; }
+ if (! &Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+ return;
+ }
+ my %records=&Apache::lonnet::dump('nohist_email',
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
+ '%255b'.$user.'%253a'.$domain.'%255d');
+ my $result='';
+ foreach (sort(keys(%records))) {
+ my %content=&unpackagemsg($records{$_});
+ next if ($content{'senderdomain'} eq '');
+ next if ($content{'subject'} !~ /^Record/);
+ # $content{'message'}=~s/\n/\<br\>/g;
+ $result.='Recorded by '.
+ $content{'sendername'}.'@'.$content{'senderdomain'}."\n";
+ $result.=
+ &Apache::lontexconvert::msgtexconverted($content{'message'})."\n";
+ }
+ return $result;
+}
+
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;
@@ -922,8 +1093,10 @@ sub disfacetoface {
$content{'message'}=~s/\n/\<br\>/g;
if ($content{'subject'}=~/^Record/) {
$result.='<h3>'.&mt('Record').'</h3>';
+ } elsif ($content{'subject'}=~/^Broadcast/) {
+ $result .='<h3>'.&mt('Broadcast Message').'</h3>';
} else {
- $result.='<h3>'.&mt('Sent Message').'</h3>';
+ $result.='<h3>'.&mt('Critical Message').'</h3>';
%content=&unpackagemsg($content{'message'});
$content{'message'}=
'<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br />'.
@@ -940,7 +1113,11 @@ $content{'sendername'}.'@'.
}
# Check to see if there were any messages.
if ($result eq '') {
- $r->print("<p><b>".&mt("No notes, face-to-face discussion records, or critical messages in this course.")."</b></p>");
+ if ($target ne 'tex') {
+ $r->print("<p><b>".&mt("No notes, face-to-face discussion records, critical messages, or broadcast messages in this course.")."</b></p>");
+ } else {
+ $r->print('\textbf{'.&mt("No notes, face-to-face discussion records, critical messages or broadcast messages in this course.").'}\\\\');
+ }
} else {
$r->print($result);
}
@@ -955,7 +1132,7 @@ sub facetoface {
}
&printheader($r,
'/adm/email?recordftf=query',
- "User Notes, Face-to-Face, Critical Messages");
+ "User Notes, Face-to-Face, Critical Messages, Broadcast Messages");
# from query string
if ($ENV{'form.recname'}) { $ENV{'form.recuname'}=$ENV{'form.recname'}; }
@@ -970,7 +1147,7 @@ sub facetoface {
('stdselect','recuname','recdomain');
my %lt=&Apache::lonlocal::texthash('user' => 'Username',
'dom' => 'Domain',
- 'head' => 'User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course',
+ 'head' => 'User Notes, Records of Face-To-Face Discussions, Critical Messages, and Broadcast Messages in Course',
'subm' => 'Retrieve discussion and message records',
'newr' => 'New Record (record is visible to course faculty and staff)',
'post' => 'Post this Record');
@@ -1019,15 +1196,393 @@ ENDBFORM
}
}
+# ----------------------------------------------------------- Blocking during exams
+
+sub examblock {
+ my ($r,$action) = @_;
+ unless ($ENV{'request.course.id'}) { return;}
+ unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { $r->print('Not allowed'); }
+ my %lt=&Apache::lonlocal::texthash(
+ 'comb' => 'Communication Blocking',
+ 'cbds' => 'Communication blocking during scheduled exams',
+ 'desc' => 'You can use communication blocking to prevent students enrolled in this course from displaying LON-CAPA messages sent by other students during an online exam. As blocking of communication could potentially interrupt legitimate communication between students who are also both enrolled in a different LON-CAPA course, please be careful that you select the correct start and end times for your scheduled exam when setting or modifying these parameters.',
+ 'mecb' => 'Modify existing communication blocking periods',
+ 'ncbc' => 'No communication blocks currently stored'
+ );
+
+ my %ltext = &Apache::lonlocal::texthash(
+ 'dura' => 'Duration',
+ 'setb' => 'Set by',
+ 'even' => 'Event',
+ 'actn' => 'Action',
+ 'star' => 'Start',
+ 'endd' => 'End'
+ );
+
+ &printheader($r,'/adm/email?block=display',$lt{'comb'});
+ $r->print('<h3>'.$lt{'cbds'}.'</h3>');
+
+ if ($action eq 'store') {
+ &blockstore($r);
+ }
+
+ $r->print($lt{'desc'}.'<br /><br />
+ <form name="blockform" method="post" action="/adm/email?block=store">
+ ');
+
+ $r->print('<h4>'.$lt{'mecb'}.'</h4>');
+ my %records = ();
+ my $blockcount = 0;
+ my $parmcount = 0;
+ &get_blockdates(\%records,\$blockcount);
+ if ($blockcount > 0) {
+ $parmcount = &display_blocker_status($r,\%records,\%ltext);
+ } else {
+ $r->print($lt{'ncbc'}.'<br /><br />');
+ }
+ &display_addblocker_table($r,$parmcount,\%ltext);
+ $r->print(<<"END");
+<br />
+<input type="hidden" name="blocktotal" value="$blockcount" />
+<input type ="submit" value="Save Changes" />
+</form>
+</body>
+</html>
+END
+ return;
+}
+
+sub blockstore {
+ my $r = shift;
+ my %lt=&Apache::lonlocal::texthash(
+ 'tfcm' => 'The following changes were made',
+ 'cbps' => 'communication blocking period(s)',
+ 'werm' => 'was/were removed',
+ 'wemo' => 'was/were modified',
+ 'wead' => 'was/were added',
+ 'ncwm' => 'No changes were made.'
+ );
+ my %adds = ();
+ my %removals = ();
+ my %cancels = ();
+ my $modtotal = 0;
+ my $canceltotal = 0;
+ my $addtotal = 0;
+ my %blocking = ();
+ $r->print('<h3>'.$lt{'head'}.'</h3>');
+ foreach (keys %ENV) {
+ if ($_ =~ m/^form\.modify_(\w+)$/) {
+ $adds{$1} = $1;
+ $removals{$1} = $1;
+ $modtotal ++;
+ } elsif ($_ =~ m/^form\.cancel_(\d+)$/) {
+ $cancels{$1} = $1;
+ unless ( defined($removals{$1}) ) {
+ $removals{$1} = $1;
+ $canceltotal ++;
+ }
+ } elsif ($_ =~ m/^form\.add_(\d+)$/) {
+ $adds{$1} = $1;
+ $addtotal ++;
+ }
+ }
+
+ foreach (keys %removals) {
+ my $hashkey = $ENV{'form.key_'.$_};
+ &Apache::lonnet::del('comm_block',["$hashkey"],
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'}
+ );
+ }
+ foreach (keys %adds) {
+ unless ( defined($cancels{$_}) ) {
+ my ($newstart,$newend) = &get_dates_from_form($_);
+ my $newkey = $newstart.'____'.$newend;
+ $blocking{$newkey} = $ENV{'user.name'}.'@'.$ENV{'user.domain'}.':'.$ENV{'form.title_'.$_};
+ }
+ }
+ if ($addtotal + $modtotal > 0) {
+ &Apache::lonnet::put('comm_block',\%blocking,
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'}
+ );
+ }
+ my $chgestotal = $canceltotal + $modtotal + $addtotal;
+ if ($chgestotal > 0) {
+ $r->print($lt{'tfcm'}.'<ul>');
+ if ($canceltotal > 0) {
+ $r->print('<li>'.$canceltotal.' '.$lt{'cbps'},' '.$lt{'werm'}.'</li>');
+ }
+ if ($modtotal > 0) {
+ $r->print('<li>'.$modtotal.' '.$lt{'cbps'},' '.$lt{'wemo'}.'</li>');
+ }
+ if ($addtotal > 0) {
+ $r->print('<li>'.$addtotal.' '.$lt{'cbps'},' '.$lt{'wead'}.'</li>');
+ }
+ $r->print('</ul>');
+ } else {
+ $r->print($lt{'ncwm'});
+ }
+ $r->print('<br />');
+ return;
+}
+
+sub get_dates_from_form {
+ my $item = shift;
+ my $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate_'.$item);
+ my $enddate = &Apache::lonhtmlcommon::get_date_from_form('enddate_'.$item);
+ return ($startdate,$enddate);
+}
+
+sub get_blockdates {
+ my ($records,$blockcount) = @_;
+ $$blockcount = 0;
+ %{$records} = &Apache::lonnet::dump('comm_block',
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'}
+ );
+ $$blockcount = keys %{$records};
+
+ foreach (keys %{$records}) {
+ if ($_ eq 'error: 2 tie(GDBM) Failed while attempting dump') {
+ $$blockcount = 0;
+ last;
+ }
+ }
+}
+
+sub display_blocker_status {
+ my ($r,$records,$ltext) = @_;
+ my $parmcount = 0;
+ my @bgcols = ("#eeeeee","#dddddd");
+ my $function = &Apache::loncommon::get_users_function();
+ my $color = &Apache::loncommon::designparm($function.'.tabbg',
+ $ENV{'user.domain'});
+ my %lt = &Apache::lonlocal::texthash(
+ 'modi' => 'Modify',
+ 'canc' => 'Cancel',
+ );
+ $r->print(<<"END");
+<table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td width="100%" bgcolor="#000000">
+ <table width="100%" border="0" cellpadding="1" cellspacing="0">
+ <tr>
+ <td width="100%" bgcolor="#000000">
+ <table border="0" cellpadding="3" cellspacing="3" bgcolor="#FFFFFF">
+ <tr bgcolor="$color">
+ <td><b>$$ltext{'dura'}</b></td>
+ <td><b>$$ltext{'setb'}</b></td>
+ <td><b>$$ltext{'even'}</b></td>
+ <td><b>$$ltext{'actn'}?</b></td>
+ </tr>
+END
+ foreach (sort keys %{$records}) {
+ my $iter = $parmcount%2;
+ my $onchange = 'onFocus="javascript:window.document.forms['.
+ "'blockform'].elements['modify_".$parmcount."'].".
+ 'checked=true;"';
+ my ($start,$end) = split/____/,$_;
+ my $startform = &Apache::lonhtmlcommon::date_setter('blockform','startdate_'.$parmcount,$start,$onchange);
+ my $endform = &Apache::lonhtmlcommon::date_setter('blockform','enddate_'.$parmcount,$end,$onchange);
+ my ($setter,$title) = split/:/,$$records{$_};
+ my ($setuname,$setudom) = split/@/,$setter;
+ my $settername = &Apache::loncommon::plainname($setuname,$setudom);
+ $r->print(<<"END");
+ <tr bgcolor="$bgcols[$iter]">
+ <td>$$ltext{'star'}: $startform<br/>$$ltext{'endd'}: $endform</td>
+ <td>$settername</td>
+ <td><input type="text" name="title_$parmcount" size="15" value="$title"/><input type="hidden" name="key_$parmcount" value="$_"></td>
+ <td>$lt{'modi'}? <input type="checkbox" name="modify_$parmcount"/><br />$lt{'canc'}? <input type="checkbox" name="cancel_$parmcount"/>
+ </tr>
+END
+ $parmcount ++;
+ }
+ $r->print(<<"END");
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+<br />
+<br />
+END
+ return $parmcount;
+}
+
+sub display_addblocker_table {
+ my ($r,$parmcount,$ltext) = @_;
+ my $start = time;
+ my $end = $start + (60 * 60 * 2); #Default is an exam of 2 hours duration.
+ my $onchange = 'onFocus="javascript:window.document.forms['.
+ "'blockform'].elements['add_".$parmcount."'].".
+ 'checked=true;"';
+ my $startform = &Apache::lonhtmlcommon::date_setter('blockform','startdate_'.$parmcount,$start,$onchange);
+ my $endform = &Apache::lonhtmlcommon::date_setter('blockform','enddate_'.$parmcount,$end,$onchange);
+ my $function = &Apache::loncommon::get_users_function();
+ my $color = &Apache::loncommon::designparm($function.'.tabbg',
+ $ENV{'user.domain'});
+ my %lt = &Apache::lonlocal::texthash(
+ 'addb' => 'Add block',
+ 'exam' => 'e.g., Exam 1',
+ 'addn' => 'Add new communication blocking periods'
+ );
+ $r->print(<<"END");
+<h4>$lt{'addn'}</h4>
+<table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td width="100%" bgcolor="#000000">
+ <table width="100%" border="0" cellpadding="1" cellspacing="0">
+ <tr>
+ <td width="100%" bgcolor="#000000">
+ <table border="0" cellpadding="3" cellspacing="3" bgcolor="#FFFFFF">
+ <tr bgcolor="#CCCCFF">
+ <td><b>$$ltext{'dura'}</b></td>
+ <td><b>$$ltext{'even'} $lt{'exam'}</b></td>
+ <td><b>$$ltext{'actn'}?</b></td>
+ </tr>
+ <tr bgcolor="#eeeeee">
+ <td>$$ltext{'star'}: $startform<br />$$ltext{'endd'}: $endform</td>
+ <td><input type="text" name="title_$parmcount" size="15" value=""/></td>
+ <td>$lt{'addb'}? <input type="checkbox" name="add_$parmcount" value="1"/></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+END
+ return;
+}
+
+sub blockcheck {
+ my ($setters,$startblock,$endblock) = @_;
+ # Retrieve active student roles and active course coordinator/instructor roles
+ my @livecses = ();
+ my @staffcses = ();
+ $$startblock = 0;
+ $$endblock = 0;
+ foreach (keys %ENV) {
+ if ($_ =~ m-^user\.role\.(st|cc|in)\./(.+)$-) {
+ my $role = $1;
+ my $cse = $2;
+ $cse =~ s|/|_|;
+ if ($ENV{$_} =~ m/^(\d*)\.(\d*)$/) {
+ unless (($2 > 0 && $2 < time) || ($1 > time)) {
+ if ($role eq 'st') {
+ push @livecses, $cse;
+ } else {
+ unless (grep/^$cse$/,@staffcses) {
+ push @staffcses, $cse;
+ }
+ }
+ }
+ }
+ } elsif ($_ =~ m-user\.role\.cr/(\w+)/(\w+)/([^/]+)\./(.+)$- ) {
+ my $rolepriv = $ENV{'user.role..rolesdef_'.$3};
+ }
+ }
+ # Retrieve blocking times and identity of blocker for active courses for students.
+ if (@livecses > 0) {
+ foreach my $cse (@livecses) {
+ my ($cdom,$crs) = split/_/,$cse;
+ if ( (grep/^$cse$/,@staffcses) && ($ENV{'request.role'} !~ m-^st\./$cdom/$crs$-) ) {
+ next;
+ } else {
+ %{$$setters{$cse}} = ();
+ @{$$setters{$cse}{'staff'}} = ();
+ @{$$setters{$cse}{'times'}} = ();
+ my %records = &Apache::lonnet::dump('comm_block',$cdom,$crs);
+ foreach (keys %records) {
+ if ($_ =~ m/^(\d+)____(\d+)$/) {
+ if ($1 <= time && $2 >= time) {
+ my ($staff,$title) = split/:/,$records{$_};
+ push @{$$setters{$cse}{'staff'}}, $staff;
+ push @{$$setters{$cse}{'times'}}, $_;
+ if ( ($$startblock == 0) || ($$startblock > $1) ) {
+ $$startblock = $1;
+ }
+ if ( ($$endblock == 0) || ($$endblock < $2) ) {
+ $$endblock = $2;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
+sub build_block_table {
+ my ($r,$startblock,$endblock,$setters) = @_;
+ my $function = &Apache::loncommon::get_users_function();
+ my $color = &Apache::loncommon::designparm($function.'.tabbg',
+ $ENV{'user.domain'});
+ my %lt = &Apache::lonlocal::texthash(
+ 'cacb' => 'Currently active communication blocks',
+ 'cour' => 'Course',
+ 'dura' => 'Duration',
+ 'blse' => 'Block set by'
+ );
+ $r->print(<<"END");
+<br /<br />$lt{'cacb'}:<br /><br />
+<table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td width="100%" bgcolor="#000000">
+ <table width="100%" border="0" cellpadding="1" cellspacing="0">
+ <tr>
+ <td width="100%" bgcolor="#000000">
+ <table border="0" cellpadding="3" cellspacing="3" bgcolor="#FFFFFF">
+ <tr bgcolor="$color">
+ <td><b>$lt{'cour'}</b></td>
+ <td><b>$lt{'dura'}</b></td>
+ <td><b>$lt{'blse'}</b></td>
+ </tr>
+END
+ foreach (keys %{$setters}) {
+ my %courseinfo=&Apache::lonnet::coursedescription($_);
+ for (my $i=0; $i<@{$$setters{$_}{staff}}; $i++) {
+ my ($uname,$udom) = split/\@/,$$setters{$_}{staff}[$i];
+ my $fullname = &Apache::loncommon::plainname($uname,$udom);
+ my ($openblock,$closeblock) = split/____/,$$setters{$_}{times}[$i];
+ $openblock = &Apache::lonlocal::locallocaltime($openblock);
+ $closeblock= &Apache::lonlocal::locallocaltime($closeblock);
+ $r->print('<tr><td>'.$courseinfo{'description'}.'</td>'.
+ '<td>'.$openblock.' to '.$closeblock.'</td>'.
+ '<td>'.$fullname.' ('.$uname.'@'.$udom.
+ ')</td></tr>');
+ }
+ }
+ $r->print('</table></td></tr></table></td></tr></table>');
+}
+
# ----------------------------------------------------------- Display a message
sub displaymessage {
- my ($r,$msgid)=@_;
- &statuschange($msgid,'read');
- my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
+ my ($r,$msgid,$folder)=@_;
+ my $suffix=&foldersuffix($folder);
+ my %blocked = ();
+ my %setters = ();
+ my $startblock = 0;
+ my $endblock = 0;
+ my $numblocked = 0;
+# info to generate "next" and "previous" buttons and check if message is blocked
+ &blockcheck(\%setters,\$startblock,\$endblock);
+ my @messages=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder);
+ if ( $blocked{$msgid} eq 'ON' ) {
+ &printheader($r,'/adm/email',&mt('Display a Message'));
+ $r->print(&mt('You attempted to display a message that is currently blocked because you are enrolled in one or more courses for which there is an ongoing online exam.'));
+ &build_block_table($r,$startblock,$endblock,\%setters);
+ return;
+ }
+ &statuschange($msgid,'read',$folder);
+ my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);
my %content=&unpackagemsg($message{$msgid});
-# info to generate "next" and "previous" buttons
- my @messages=&sortedmessages();
+
my $counter=0;
$r->print('<pre>');
my $escmsgid=&Apache::lonnet::escape($msgid);
@@ -1053,6 +1608,7 @@ sub displaymessage {
'<td><a href="/adm/email?markdel='.&Apache::lonnet::escape($msgid).$sqs.
'"><b>Delete</b></a></td>'.
'<td><a href="/adm/email?sortedby='.$ENV{'form.sortedby'}.
+ '&folder='.&Apache::lonnet::escape($folder).
'"><b>'.&mt('Display all Messages').'</b></a></td>');
if ($counter > 0){
$r->print('<td><a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.
@@ -1064,21 +1620,60 @@ sub displaymessage {
}
$r->print('</tr></table>');
$r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}.
- '<br /><b>'.&mt('From').':</b> '.
+ ($folder ne 'sent'?'<br /><b>'.&mt('From').':</b> '.
&Apache::loncommon::aboutmewrapper(
&Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
$content{'sendername'},$content{'senderdomain'}).' ('.
$content{'sendername'}.' at '.
- $content{'senderdomain'}.') '.
+ $content{'senderdomain'}.') ':'<br /><b>'.&mt('To').':</b> '.
+ &Apache::loncommon::aboutmewrapper(
+ &Apache::loncommon::plainname($content{'recuser'},$content{'recdomain'}),
+ $content{'recuser'},$content{'recdomain'}).' ('.
+ $content{'recuser'}.' at '.
+ $content{'recdomain'}.') ').
($content{'courseid'}?'<br /><b>'.&mt('Course').':</b> '.$courseinfo{'description'}.
($content{'coursesec'}?' ('.&mt('Group/Section').': '.$content{'coursesec'}.')':''):'').
'<br /><b>'.&mt('Time').':</b> '.$content{'time'}.
'<p><pre>'.
&Apache::lontexconvert::msgtexconverted($content{'message'},1).
- '</pre><hr />'.$content{'citation'}.'</p>');
+ '</pre><hr />'.&displayresource(%content).'</p>');
return;
}
+# =========================================================== Show the citation
+
+sub displayresource {
+ my %content=@_;
+#
+# If the recipient is in the same course that the message was sent from and
+# has sufficient privileges, show "all details," else show citation
+#
+ if (($ENV{'request.course.id'} eq $content{'courseid'})
+ && (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) {
+ my $symb=&Apache::lonnet::symbread($content{'baseurl'});
+# Could not get a symb, give up
+ unless ($symb) { return $content{'citation'}; }
+# Have a symb, can render
+ return '<h2>'.&mt('Current attempts of student (if applicable)').'</h2>'.
+ &Apache::loncommon::get_previous_attempt($symb,
+ $content{'sendername'},
+ $content{'senderdomain'},
+ $content{'courseid'}).
+ '<hr /><h2>'.&mt('Current screen output (if applicable)').'</h2>'.
+ &Apache::loncommon::get_student_view($symb,
+ $content{'sendername'},
+ $content{'senderdomain'},
+ $content{'courseid'}).
+ '<h2>'.&mt('Correct Answer(s) (if applicable)').'</h2>'.
+ &Apache::loncommon::get_student_answers($symb,
+ $content{'sendername'},
+ $content{'senderdomain'},
+ $content{'courseid'});
+ } else {
+ return $content{'citation'};
+ }
+}
+
# ================================================================== The Header
sub header {
@@ -1121,10 +1716,15 @@ sub handler {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['display','replyto','forward','markread','markdel','markunread',
'sendreply','compose','sendmail','critical','recname','recdom',
- 'recordftf','sortedby']);
- $sqs='&sortedby='.$ENV{'form.sortedby'};
+ 'recordftf','sortedby','block','folder','startdis','interdis']);
+ $sqs='&sortedby='.$ENV{'form.sortedby'}.
+ '&startdis='.$ENV{'form.startdis'}.
+ '&interdis='.$ENV{'form.interdis'};
+
# ------------------------------------------------------ They checked for email
- &Apache::lonnet::put('email_status',{'recnewemail'=>0});
+ unless ($ENV{'form.block'}) {
+ &Apache::lonnet::put('email_status',{'recnewemail'=>0});
+ }
# ----------------------------------------------------------------- Breadcrumbs
@@ -1134,12 +1734,28 @@ sub handler {
text=>"Communication/Messages",
faq=>12,bug=>'Communication Tools',});
+# ------------------------------------------------------------------ Get Folder
+
+ my $folder=$ENV{'form.folder'};
+ unless ($folder) {
+ $folder='';
+ } else {
+ $sqs='&folder='.&Apache::lonnet::escape($folder);
+ }
+
+# --------------------------------------------------------------------- Display
+
+ $startdis=$ENV{'form.startdis'};
+ unless ($startdis) { $startdis=0; }
+ $interdis=$ENV{'form.interdis'};
+ unless ($interdis) { $interdis=20; }
+
# --------------------------------------------------------------- Render Output
if ($ENV{'form.display'}) {
- &displaymessage($r,$ENV{'form.display'});
+ &displaymessage($r,$ENV{'form.display'},$folder);
} elsif ($ENV{'form.replyto'}) {
- &compout($r,'',$ENV{'form.replyto'});
+ &compout($r,'',$ENV{'form.replyto'},undef,undef,$folder);
} elsif ($ENV{'form.confirm'}) {
&printheader($r,'','Confirmed Receipt');
foreach (keys %ENV) {
@@ -1151,7 +1767,7 @@ sub handler {
my $msgid=$1;
$r->print('<b>'.&mt('Confirming Receipt').':</b> '.
&user_crit_received($msgid).'<br>');
- &comprep($r,$msgid);
+ &compout($r,'','','',$msgid);
}
}
&discrit($r);
@@ -1162,27 +1778,41 @@ sub handler {
&compout($r,$ENV{'form.forward'});
} elsif ($ENV{'form.markdel'}) {
&printheader($r,'','Deleted Message');
- &statuschange($ENV{'form.markdel'},'deleted');
- &disall($r);
+ &statuschange($ENV{'form.markdel'},'deleted',$folder);
+ &disall($r,$folder);
+ } elsif ($ENV{'form.markedmove'}) {
+ my $total=0;
+ foreach (keys %ENV) {
+ if ($_=~/^form\.delmark_(.*)$/) {
+ &movemsg(&Apache::lonnet::unescape($1),$folder,
+ $ENV{'form.movetofolder'});
+ $total++;
+ }
+ }
+ &printheader($r,'','Moved Messages');
+ $r->print('Moved '.$total.' message(s)<p>');
+ &disall($r,$folder);
} elsif ($ENV{'form.markeddel'}) {
my $total=0;
foreach (keys %ENV) {
if ($_=~/^form\.delmark_(.*)$/) {
- &statuschange(&Apache::lonnet::unescape($1),'deleted');
+ &statuschange(&Apache::lonnet::unescape($1),'deleted',$folder);
$total++;
}
}
&printheader($r,'','Deleted Messages');
$r->print('Deleted '.$total.' message(s)<p>');
- &disall($r);
+ &disall($r,$folder);
} elsif ($ENV{'form.markunread'}) {
&printheader($r,'','Marked Message as Unread');
&statuschange($ENV{'form.markunread'},'new');
- &disall($r);
+ &disall($r,$folder);
} elsif ($ENV{'form.compose'}) {
&compout($r,'','',$ENV{'form.compose'});
} elsif ($ENV{'form.recordftf'}) {
&facetoface($r,$ENV{'form.recordftf'});
+ } elsif ($ENV{'form.block'}) {
+ &examblock($r,$ENV{'form.block'});
} elsif ($ENV{'form.sendmail'}) {
my $sendstatus='';
if ($ENV{'form.send'}) {
@@ -1198,6 +1828,12 @@ sub handler {
$ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
$content{'message'};
}
+ if ($ENV{'form.replyid'}) {
+ my $msgid=$ENV{'form.replyid'};
+ my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
+ %content=&unpackagemsg($message{$msgid},1);
+ &statuschange($msgid,'replied');
+ }
my %toaddr=();
undef %toaddr;
if ($ENV{'form.sendmode'} eq 'group') {
@@ -1242,17 +1878,26 @@ sub handler {
&Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
$msgtxt,
$content{'citation'});
+ if (($ENV{'request.course.id'}) && ($ENV{'form.sendmode'} eq 'group')) {
+ &user_normal_msg_raw(
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ 'Broadcast ['.$recuname.':'.$recdomain.']',
+ $msgtxt);
+ }
}
$r->print($thismsg.'<br />');
$sendstatus.=' '.$thismsg;
}
+ } else {
+ &printheader($r,'','No messages sent.');
}
if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
$r->print('<br /><font color="green">'.&mt('Completed.').'</font>');
if ($ENV{'form.displayedcrit'}) {
&discrit($r);
} else {
- &disall($r);
+ &Apache::loncommunicate::menu($r);
}
} else {
$r->print(
@@ -1260,9 +1905,13 @@ sub handler {
&mt('Please use the browser "Back" button and correct the recipient addresses')
);
}
+ } elsif ($ENV{'form.newfolder'}) {
+ &printheader($r,'','New Folder');
+ &makefolder($ENV{'form.newfolder'});
+ &disall($r,$ENV{'form.newfolder'});
} else {
&printheader($r,'','Display All Messages');
- &disall($r);
+ &disall($r,$folder);
}
$r->print('</body></html>');
return OK;