--- loncom/interface/lonwhatsnew.pm	2017/05/19 19:55:09	1.105.2.14
+++ loncom/interface/lonwhatsnew.pm	2017/09/13 23:35:07	1.125
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.105.2.14 2017/05/19 19:55:09 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.125 2017/09/13 23:35:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -80,7 +80,7 @@ sub handler {
     }
     unless ($isadhoc) {
         %checkallowed = ( coursenormalmail => 1,
-                          coursecritmail => 1,);
+			  coursecritmail => 1,);
     }
     foreach my $perm_check (['whn','whatsnew',1],
 			    ['pch','coursediscussion',1],
@@ -670,7 +670,7 @@ sub display_actions_box {
 #    my $halfway = int($totalboxes/2) + $totalboxes%2;
     foreach my $actionitem (@actionorder) {
         if ($checkallowed->{$actionitem}) {
-            if (($actioncolumn{$actionitem} eq 'right') && ($currcolumn eq 'left')) { 
+            if (($actioncolumn{$actionitem} eq 'right') && ($currcolumn eq 'left')) {
                 $r->print('</td><td>&nbsp;</td><td class="LC_right_col" >');
                 $currcolumn = 'right'; 
             }
@@ -1325,19 +1325,20 @@ sub getnormalmail {
             if ($emailstatus{$msgid} eq 'new') {
                 $skipstatus = 1;
             }
+            my $esc_msgid = &escape($msgid);
             my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
-                &Apache::lonmsg::unpackmsgid($msgid,undef,$skipstatus,undef,
+                &Apache::lonmsg::unpackmsgid($esc_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 ++;
+		        $msgcount ++;
                         if ($shortsubj eq '') {
                             $shortsubj = &mt('No subject');
                         }
                         push(@{$newmsgs}, {
-                            msgid    => $msgid,
+                            msgid    => $esc_msgid,
                             sendtime => $sendtime,
                             shortsub => $shortsubj,
                             from     => $fromname,
@@ -1358,8 +1359,9 @@ sub getcritmail {
     my $result = '';
     my $critmsgcount = 0;
     foreach my $msgid (sort(keys(%what))) {
+        my $esc_msgid = &escape($msgid);
         my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
-            &Apache::lonmsg::unpackmsgid($msgid,undef,1,undef,
+            &Apache::lonmsg::unpackmsgid($esc_msgid,undef,1,undef,
                                          $env{'request.course.id'});
         if (($fromcid) && ($fromcid eq  $env{'request.course.id'})) {
             if (defined($sendtime) && $sendtime!~/error/) {
@@ -1369,7 +1371,7 @@ sub getcritmail {
                     $shortsubj = &mt('No subject');
                 }
                 push(@{$critmsgs}, {
-                        msgid    => $msgid,
+                        msgid    => $esc_msgid,
                         sendtime => $sendtime,
                         shortsub => $shortsubj,
                         from     => $fromname,
@@ -1669,13 +1671,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) {
@@ -2002,7 +2004,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';
             }