--- loncom/interface/lonwhatsnew.pm	2013/10/21 22:34:33	1.114
+++ loncom/interface/lonwhatsnew.pm	2016/10/23 21:50:55	1.120
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.114 2013/10/21 22:34:33 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.120 2016/10/23 21:50:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -73,6 +73,7 @@ sub handler {
                             ['vcl','newroles',1],
                             ['vcl','oldroles',1],
                             ['whn','crslogin',1],
+                            ['mgr','resetcounters',1],
 			    ) {
 	my ($perm,$key,$check_section) = @{ $perm_check };
 	my $scope = $env{'request.course.id'};
@@ -441,7 +442,7 @@ sub display_actions_box {
     $r->print(&Apache::loncommon::head_subbox($header));
 
     if ($command eq 'reset') {
-        $result = &process_reset($cdom,$crs);
+        $result = &process_reset($cdom,$crs,$checkallowed);
     } elsif ($command eq 'update') {
         $result = &process_update($uname,$udom,$threshold_titles);
     } elsif ($command eq 'newinterval') {
@@ -596,11 +597,11 @@ sub display_actions_box {
 
     my $itemserror;
     if ($needitems) {
-        $itemserror = &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread);
+        $itemserror = &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread,$checkallowed);
     }
     my $classlist;
     if ($show{'oldroles'} || $show{'newroles'} || $show{'crslogin'}) {
-        $classlist = &Apache::loncoursedata::get_classlist(); 
+        $classlist = &Apache::loncoursedata::get_classlist();
     }
     if ($show{'coursenormalmail'}) {
         $msgcount = &getnormalmail(\@newmsgs);
@@ -799,7 +800,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">
@@ -914,7 +915,7 @@ sub display_launcher {
                 &display_versionchanges($r,$changed,$res_title,$interval->{'versions'},$itemserror);
             } elsif ($action eq 'abovethreshold') { # DEGDIFF/AV. TRIES TRIGGERS
                 &display_abovethreshold($r,$refpage,$warnings,$triggered,
-					$res_title,$itemserror);
+					$res_title,$itemserror,$checkallowed);
             } elsif ($action eq 'coursediscussion') { # UNREAD COURSE DISCUSSION
                 &display_coursediscussion($r,$newdiscussions,$unread,
                                 $countunread,$res_title,$itemserror);
@@ -941,7 +942,7 @@ sub display_launcher {
 sub getitems {
     my ($unread,$ungraded,$bombed,$triggered,$changed,$newdiscussions,
         $tograde,$bombs,$warnings,$threshold,$cdom,$crs,$res_title,$show,
-        $starttime,$countunread) = @_;
+        $starttime,$countunread,$checkallowed) = @_;
     my $navmap = Apache::lonnavmaps::navmap->new();
     if (!defined($navmap)) {
         my $itemserror = '<span class="LC_warning">'.&mt('An error occurred retrieving information about the course.').'<br />'.&mt('It is recommended that you [_1]re-select the course[_2].','<a href="/adm/roles">','</a>').'</span>';
@@ -1001,7 +1002,8 @@ sub getitems {
 # Maxtries and degree of difficulty for problem parts, unless handgradeable
         if ($$show{'abovethreshold'}) {  
             &check_thresholds($resource,$symb,\%resourcetracker,
-			      $triggered,$threshold,$warnings);
+			      $triggered,$threshold,$warnings,
+                              $checkallowed);
         }
 
     }
@@ -1075,7 +1077,8 @@ sub check_bombed {
 }
 
 sub check_thresholds {
-    my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings) = @_;
+    my ($resource,$symb,$resourcetracker,$triggered,$threshold,$warnings,
+        $checkallowed) = @_;
 # Compile maxtries and degree of difficulty for problem parts, unless handgradeable
     my @parts = @{$resource->parts()};
     my %stats;
@@ -1141,8 +1144,12 @@ sub check_thresholds {
                      <td>'.$stats{$part}{users}.'</td>
                      <td>'.$stats{$part}{attempts}.'</td>
                      <td>'.$stats{$part}{degdiff}.'</td>
-                     <td>'.$lastreset{$part}.'</td>
-                     <td><input type="checkbox" name="'.$resetname.'" /><input type="hidden" name="'.$resettitle.'" value="'.&escape($$triggered{$symb}{title}).'" /></td>';
+                     <td>'.$lastreset{$part}.'</td>';
+                if ($checkallowed->{'resetcounters'}) {
+                    $$triggered{$symb}{text}[$partcount] .=
+                        '<td><input type="checkbox" name="'.$resetname.'" />'.
+                        '<input type="hidden" name="'.$resettitle.'" value="'.&escape($$triggered{$symb}{title}).'" /></td>';
+                }
                 $partcount ++;
             }
             $$triggered{$symb}{numparts} = $partcount;
@@ -1164,7 +1171,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 +1186,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} = 
@@ -1204,7 +1211,11 @@ sub get_current {
 }
 
 sub process_reset {
-    my ($dom,$crs) = @_;
+    my ($dom,$crs,$checkallowed) = @_;
+    if (!$checkallowed->{'resetcounters'}) {
+        return '<b>'.&mt('You do not the required privileges to reset counters').
+               '</b><br />';
+    }
     my $result = '<b>'.&mt('Counters reset for following problems (and parts):').
                            '</b><br />';
     my @agg_types = ('attempts','users','correct');
@@ -1246,9 +1257,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 +1286,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 +1325,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);
@@ -1663,7 +1686,7 @@ sub display_haserrors {
 }
 
 sub display_abovethreshold {
-    my ($r,$refpage,$warnings,$triggered,$res_title,$itemserror) = @_;
+    my ($r,$refpage,$warnings,$triggered,$res_title,$itemserror,$checkallowed) = @_;
     my %lt = &Apache::lonlocal::texthash(
                  reso => 'Resource',
                  part => 'Part',
@@ -1682,8 +1705,11 @@ sub display_abovethreshold {
                   '<input type="hidden" name="command" value="" /></td>'.
 		  '<td>'.$lt{'part'}.'</td><td>'.$lt{'nust'}.'</td>'.
 		  '<td>'.$lt{'avat'}.'</td><td>'.$lt{'dedi'}.'</td>'.
-		  '<td>'.$lt{'lare'}.'</td><td  class="LC_right_item">'.
-                  $lt{'reco'}.'</td></tr>');
+		  '<td>'.$lt{'lare'}.'</td>');
+        if ($checkallowed->{'resetcounters'}) {
+            $r->print('<td  class="LC_right_item">'.$lt{'reco'}.'</td>');
+        }
+        $r->print('</tr>');
 	my $row;
         foreach my $res (@{$warnings}) {
 	    $row++;
@@ -1715,7 +1741,9 @@ sub display_abovethreshold {
                 }
             }
         }
-        $r->print('<tr class="LC_info_row"><td colspan="7" class="LC_right_item"><br /><input type="button" name="counters" value="'.$lt{'rese'}.'" onclick="javascript:thresholdreset();" /></td></tr>');
+        if ($checkallowed->{'resetcounters'}) {
+            $r->print('<tr class="LC_info_row"><td colspan="7" class="LC_right_item"><br /><input type="button" name="counters" value="'.$lt{'rese'}.'" onclick="javascript:thresholdreset();" /></td></tr>');
+        }
     } elsif ($itemserror) {
         $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>');
     } else {
@@ -1866,7 +1894,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');
                             }