--- loncom/interface/lonmsg.pm	2004/09/20 15:01:56	1.108
+++ loncom/interface/lonmsg.pm	2004/11/11 18:24:44	1.113
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.108 2004/09/20 15:01:56 www Exp $
+# $Id: lonmsg.pm,v 1.113 2004/11/11 18:24:44 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -523,6 +523,7 @@ sub folderlist {
 	&mt('Folder').': '.
 	&Apache::loncommon::select_form($folder,'folder',
 			     ('' => &mt('INBOX'),'trash' => &mt('TRASH'),
+                              'critical' => &mt('Critical'),
 			      'sent' => &mt('Sent Messages'),
 			      map { $_ => $_ } @allfolders)).
 			      ' '.&mt('Show').' '.
@@ -568,6 +569,9 @@ sub statuschange {
 
 sub makefolder {
     my ($newfolder)=@_;
+    if (($newfolder eq 'sent')
+     || ($newfolder eq 'critical')
+     || ($newfolder eq 'trash')) { return; }
     &Apache::lonnet::put('email_folders',{$newfolder => time});
 }
 
@@ -600,10 +604,7 @@ sub movemsg {
 
 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',
@@ -645,39 +646,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
@@ -776,10 +774,102 @@ sub sortedmessages {
     return @temp;
 }
 
+# ======================================================== Display new messages
+
+
+sub disnew {
+    my $r=shift;
+    my %lt=&Apache::lonlocal::texthash(
+				       'nm' => 'New Messages',
+				       'su' => 'Subject',
+				       'da' => 'Date',
+				       'us' => 'Username',
+				       'op' => 'Open',
+				       'do' => 'Domain'
+				       );
+    my @msgids = sort split(/\&/,&Apache::lonnet::reply
+                            ('keys:'.$ENV{'user.domain'}.':'.
+                             $ENV{'user.name'}.':nohist_email',
+                             $ENV{'user.home'}));
+    my @newmsgs;
+    my %setters = ();
+    my $startblock = 0;
+    my $endblock = 0;
+    my %blocked = ();
+    my $numblocked = 0;
+    # Check for blocking of display because of scheduled online exams.
+    &blockcheck(\%setters,\$startblock,\$endblock);
+    foreach (@msgids) {
+        my ($sendtime,$shortsubj,$fromname,$fromdom,$status)=
+	    &Apache::lonmsg::unpackmsgid($_);
+        if (defined($sendtime) && $sendtime!~/error/) {
+            my $numsendtime = $sendtime;
+            $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
+            if ($status eq 'new') {
+                if ($numsendtime >= $startblock && ($numsendtime <= $endblock && $endblock > 0) ) {
+                    $blocked{$_} = 'ON';
+                    $numblocked ++;
+                } else {
+                    push @newmsgs, { 
+                        msgid    => $_,
+                        sendtime => $sendtime,
+                        shortsub => &Apache::lonnet::unescape($shortsubj),
+                        from     => $fromname,
+                        fromdom  => $fromdom 
+                        }
+                }
+            }
+        }
+    }
+    if ($#newmsgs >= 0) {
+        $r->print(<<TABLEHEAD);
+<h2>$lt{'nm'}</h2>
+<table border=2><tr><th>&nbsp</th>
+<th>$lt{'da'}</th><th>$lt{'us'}</th><th>$lt{'do'}</th><th>$lt{'su'}</th></tr>
+TABLEHEAD
+        foreach my $msg (@newmsgs) {
+            $r->print(<<"ENDLINK");
+<tr bgcolor="#FFBB77">
+<td><a href="/adm/email?display=$msg->{'msgid'}">$lt{'op'}</a></td>
+ENDLINK
+            foreach ('sendtime','from','fromdom','shortsub') {
+                $r->print("<td>$msg->{$_}</td>");
+            }
+            $r->print("</td></tr>");
+        }
+        $r->print('</table></body></html>');
+    } elsif ($numblocked == 0) {
+        $r->print("<h3>".&mt('You have no unread messages')."</h3>");
+    }
+    if ($numblocked > 0) {
+        my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
+        my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
+        if ($numblocked == 1) {
+            $r->print("<h3>".&mt('You have').' '.$numblocked.' '.&mt('blocked unread message').".</h3>");
+            $r->print(&mt('This message is not viewable because').' ');
+        } else {
+            $r->print("<h3>".&mt('You have').' '.$numblocked.' '.&mt('blocked unread messages').".</h3>");
+            $r->print(&mt('These').' '.$numblocked.' '.&mt('messages are not viewable because '));
+        }
+        $r->print(
+&mt('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);
+    }
+}
+
+
 # ======================================================== Display all messages
 
 sub disall {
     my ($r,$folder)=@_;
+    $r->print(&folderlist($folder));
+    unless ($folder) {
+	&disnew();
+	return;
+    }
+    if ($folder eq 'critical') {
+	&discrit();
+    }
     my %blocked = ();
     my %setters = ();
     my $startblock;
@@ -815,9 +905,7 @@ ENDDISHEADER
     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">'.
+    $r->print('<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'.$fsqs.'">'.&mt('Date').'</a></th>');
@@ -976,6 +1064,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"'.
@@ -1016,7 +1105,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);
@@ -1640,10 +1730,44 @@ sub displaymessage {
 	      '<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 {