--- loncom/interface/lonmsg.pm	2004/06/02 20:40:07	1.102
+++ 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.102 2004/06/02 20:40:07 raeburn Exp $
+# $Id: lonmsg.pm,v 1.111 2004/10/26 19:50:15 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -117,11 +117,14 @@ use Apache::loncommunicate;
 
 # Querystring component with sorting type
 my $sqs;
+my $startdis;
+my $interdis;
 
 # ===================================================================== Package
 
 sub packagemsg {
-    my ($subject,$message,$citation,$baseurl,$attachmenturl)=@_;
+    my ($subject,$message,$citation,$baseurl,$attachmenturl,
+	$recuser,$recdomain)=@_;
     $message =&HTML::Entities::encode($message,'<>&"');
     $citation=&HTML::Entities::encode($citation,'<>&"');
     $subject =&HTML::Entities::encode($subject,'<>&"');
@@ -156,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>';
@@ -201,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});
@@ -219,10 +226,14 @@ sub sendemail {
     my $msg = new Mail::Send;
     $msg->to($to);
     $msg->subject('[LON-CAPA] '.$subject);
+    my %oldENV=%ENV;
+    undef(%ENV);
     if (my $fh = $msg->open()) {
 	print $fh $body;
 	$fh->close;
     }
+    %ENV=%oldENV;
+    undef(%oldENV);
 }
 
 # ==================================================== Send notification emails
@@ -441,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';
     }
@@ -494,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',
@@ -559,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">}.('&nbsp;'x2).
+                  $fullname.'</td><td>'.$sname.'@'.$sdom.'</td><td>'.$section.
+                  '</td></tr>');
     }
+    $r->print('</table>');
 }
 
 # ==================================================== Display Critical Message
@@ -607,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').
@@ -625,23 +705,25 @@ $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 ($blocked,$startblock,$endblock,$numblocked) = @_;
-    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);
         # Check whether message was sent during blocking period.
@@ -691,7 +773,7 @@ sub sortedmessages {
 # ======================================================== Display all messages
 
 sub disall {
-    my $r=shift;
+    my ($r,$folder)=@_;
     my %blocked = ();
     my %setters = ();
     my $startblock;
@@ -719,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>&nbsp</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">&nbsp</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(\%blocked,$startblock,$endblock,\$numblocked);
-    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">');
@@ -765,21 +855,35 @@ 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'):'&nbsp').'</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>&nbsp;'.
-              '<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>');
+  '<a href="javascript:checkall()">'.&mt('Check All').'</a>&nbsp;'.
+  '<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);
@@ -787,13 +891,12 @@ ENDDISHEADER
                   $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);
     }
-    $r->print('</body></html>');
 }
 
 # ============================================================== Compose output
 
 sub compout {
-    my ($r,$forwarding,$replying,$broadcast,$replycrit)=@_;
+    my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder)=@_;
 
     if ($broadcast eq 'individual') {
 	&printheader($r,'/adm/email?compose=individual',
@@ -845,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');
@@ -856,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'};
@@ -867,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"'.
@@ -907,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);
@@ -945,6 +1050,31 @@ 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'};
@@ -1433,7 +1563,8 @@ END
 # ----------------------------------------------------------- Display a message
 
 sub displaymessage {
-    my ($r,$msgid)=@_;
+    my ($r,$msgid,$folder)=@_;
+    my $suffix=&foldersuffix($folder);
     my %blocked = ();
     my %setters = ();
     my $startblock = 0;
@@ -1441,16 +1572,17 @@ sub displaymessage {
     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);
+    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');
-    my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
+    &statuschange($msgid,'read',$folder);
+    my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);
     my %content=&unpackagemsg($message{$msgid});
+
     my $counter=0;
     $r->print('<pre>');
     my $escmsgid=&Apache::lonnet::escape($msgid);
@@ -1476,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.
@@ -1487,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 {
@@ -1544,8 +1716,11 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
         ['display','replyto','forward','markread','markdel','markunread',
          'sendreply','compose','sendmail','critical','recname','recdom',
-         'recordftf','sortedby','block']);
-    $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
     unless ($ENV{'form.block'}) {
         &Apache::lonnet::put('email_status',{'recnewemail'=>0});
@@ -1559,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) {
@@ -1587,23 +1778,35 @@ 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'}) {
@@ -1625,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') {
@@ -1696,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;