--- loncom/interface/lonwhatsnew.pm	2013/10/21 23:31:24	1.105.2.7
+++ loncom/interface/lonwhatsnew.pm	2015/07/21 21:26:32	1.118
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.105.2.7 2013/10/21 23:31:24 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.118 2015/07/21 21:26:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -799,7 +799,7 @@ function toggle_countunread(choice) {
              .'<br />'
              .&mt("This can increase the time taken to gather data for the [_1]What's New Page[_2] by a few seconds.",'<i>','</i>')
              .'&nbsp;&nbsp;'
-             .&mt('Currently set to [_1].','<b>'.$current.'</b>.')
+             .&mt('Currently set to [_1].','<b>'.$current.'</b>')
     );
     $r->print('<br /><br />
 <form method="post" name="discussionswitch" action="/adm/whatsnew">
@@ -1164,7 +1164,7 @@ sub get_curr_thresholds {
     my $thresholdcount = 0;
     my ($tmp) = %thresholdsettings;
     unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
-        foreach my $item (keys %{$threshold}) { 
+        foreach my $item (keys(%{$threshold})) { 
             if (exists($thresholdsettings{$cid.':threshold_'.$item})) {
                 $$threshold{$item} = 
                              $thresholdsettings{$cid.':threshold_'.$item};
@@ -1179,7 +1179,7 @@ sub get_curr_thresholds {
                                               $cdom,$crs,'internal.threshold');
     my ($temp) = %coursesettings;
     unless ($temp =~ /^(con_lost|error|no_such_host)/i) {  
-        foreach my $item (keys %{$threshold}) {
+        foreach my $item (keys(%{$threshold})) {
             unless (exists($thresholdsettings{$cid.':threshold_'.$item})) {
                 if (exists($coursesettings{'internal.threshold_'.$item})) {
                     $$threshold{$item} = 
@@ -1246,9 +1246,13 @@ sub process_reset {
 sub process_update {
     my ($uname,$udom,$threshold_titles) = @_;
     my $setoutput = '<b>'.&mt('Changes to threshold(s) for problem tracking:').'</b><br/><br />';
-    foreach (keys %env) {
-        next if ($_!~/^form\.(.+)\_setparmval$/);
-        my $name  = $1;
+    foreach my $key (keys(%env)) {
+        my $name;
+        if ($key =~/^form\.(.+)\_setparmval$/) {
+            $name  = $1;
+        } else {
+            next;
+        }
         my $value = $env{'form.'.$name.'_value'};
         if ($name && defined($value) && ($value ne '')) {
             my $put_result = &Apache::lonnet::put('nohist_whatsnew',
@@ -1271,29 +1275,36 @@ sub process_update {
 
 sub getnormalmail {
     my ($newmsgs) = @_;
-# Check for unread mail in course
+# Check for unread messages in user's INBOX (which were sent in context of current course).
     my $msgcount = 0;
-
-    my @messages = sort(&Apache::lonnet::getkeys('nohist_email'));
-    foreach my $message (@messages) {
-	my $msgid=&escape($message);
-        my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
-            &Apache::lonmsg::unpackmsgid($msgid);
-        if (($fromcid) && ($fromcid eq $env{'request.course.id'})) {
-            if (defined($sendtime) && $sendtime!~/error/) {
-                if ($status eq 'new') {
-                $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
-		    $msgcount ++;
-                    if ($shortsubj eq '') {
-                        $shortsubj = &mt('No subject');
+    my @messages = &Apache::lonnet::getkeys('nohist_email');
+    return $msgcount if (!@messages);
+    my %emailstatus = &Apache::lonnet::dump('email_status');
+    foreach my $msgid (sort(@messages)) {
+        if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
+            my $skipstatus;
+            if ($emailstatus{$msgid} eq 'new') {
+                $skipstatus = 1;
+            }
+            my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
+                &Apache::lonmsg::unpackmsgid($msgid,undef,$skipstatus,undef,
+                                             $env{'request.course.id'});
+            if (($fromcid) && ($fromcid eq $env{'request.course.id'})) {
+                if (defined($sendtime) && $sendtime!~/error/) {
+                    if (($emailstatus{$msgid} eq 'new') || ($status eq 'new')) {
+                        $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
+		        $msgcount ++;
+                        if ($shortsubj eq '') {
+                            $shortsubj = &mt('No subject');
+                        }
+                        push(@{$newmsgs}, {
+                            msgid    => $msgid,
+                            sendtime => $sendtime,
+                            shortsub => $shortsubj,
+                            from     => $fromname,
+                            fromdom  => $fromdom
+                            });
                     }
-                    push(@{$newmsgs}, {
-                        msgid    => $msgid,
-                        sendtime => $sendtime,
-                        shortsub => $shortsubj,
-                        from     => $fromname,
-                        fromdom  => $fromdom
-                        });
                 }
             }
         }
@@ -1303,13 +1314,14 @@ sub getnormalmail {
 
 sub getcritmail {
     my ($critmsgs) = @_; 
-# Check for critical messages in course
+# Check for critical messages which were sent in context of current course.
     my %what=&Apache::lonnet::dump('critical');
     my $result = '';
     my $critmsgcount = 0;
     foreach my $msgid (sort(keys(%what))) {
         my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
-            &Apache::lonmsg::unpackmsgid($msgid);
+            &Apache::lonmsg::unpackmsgid($msgid,undef,1,undef,
+                                         $env{'request.course.id'});
         if (($fromcid) && ($fromcid eq  $env{'request.course.id'})) {
             if (defined($sendtime) && $sendtime!~/error/) {
                 $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
@@ -1618,13 +1630,13 @@ sub display_handgrade {
         foreach my $res (@{$tograde}) {
             $rowNum ++;
             my $css_class = $rowNum%2?' class="LC_odd_row"':'';
-            my ($map,$id,$url)=&Apache::lonnet::decode_symb($res);
-            my $linkurl=&Apache::lonnet::clutter($url);
-            $linkurl .= '?symb='.&escape($res);
+            my $linkurl='/adm/grades';
             if ($$ungraded{$res}{'enclink'}) {
-                $linkurl =
-                    $$ungraded{$res}{'enclink'}.'?symb='.$$ungraded{$res}{'encsymb'};
+                $linkurl.='?symb='.$$ungraded{$res}{'encsymb'};
+            } else {
+                $linkurl.='?symb='.&escape($res);
             }
+            $linkurl.='&amp;command=ungraded';
             $r->print('<tr'.$css_class.'><td><a href="'.$linkurl.'">'.$$ungraded{$res}{title}.'</a></td><td class="LC_right_item">'.$$ungraded{$res}{count}.'</td></tr>');
         }
     } elsif ($itemserror) {
@@ -1866,7 +1878,7 @@ sub display_crslogins {
                             my $udom = $user->{'udom'};
                             my $fullname;
                             if (ref($classlist->{$uname.':'.$udom}) eq 'ARRAY') {
-                                $fullname = $classlist->{$user}->[$fullnameidx];
+                                $fullname = $classlist->{$uname.':'.$udom}->[$fullnameidx];
                             } else {
                                 $fullname = &Apache::loncommon::plainname($uname,$udom,'lastname');
                             }
@@ -1946,7 +1958,7 @@ sub display_coursediscussion {
             my $forum_title = $$unread{$ressymb}{'title'};
             my $type = 'Resource';
             my $feedurl=&Apache::lonfeedback::get_feedurl($ressymb);
-            my $disclink = $feedurl.'?symb='.&escape($$unread{$ressymb}{symb});
+            my $disclink = $feedurl.'?symb='. &escape($$unread{$ressymb}{symb});
             if ($feedurl =~ /bulletinboard/) {
                 $type = 'Discussion Board';
             }