[LON-CAPA-cvs] cvs: loncom /interface lonnavmaps.pm lonwhatsnew.pm

[raeburn]

raeburn		Wed Sep 13 23:35:08 2017 EDT

  Modified files:              
    /loncom/interface	lonwhatsnew.pm lonnavmaps.pm 
  Log:
  - Display of links to messages in which subjects contain : requires escaping
    the $msgid.
  
  
Index: loncom/interface/lonwhatsnew.pm
diff -u loncom/interface/lonwhatsnew.pm:1.124 loncom/interface/lonwhatsnew.pm:1.125
--- loncom/interface/lonwhatsnew.pm:1.124	Wed Sep 13 22:30:20 2017
+++ loncom/interface/lonwhatsnew.pm	Wed Sep 13 23:35:07 2017
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.124 2017/09/13 22:30:20 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.125 2017/09/13 23:35:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1327,7 +1327,7 @@
             }
             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/) {
@@ -1359,8 +1359,9 @@
     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/) {
@@ -1370,7 +1371,7 @@
                     $shortsubj = &mt('No subject');
                 }
                 push(@{$critmsgs}, {
-                        msgid    => $msgid,
+                        msgid    => $esc_msgid,
                         sendtime => $sendtime,
                         shortsub => $shortsubj,
                         from     => $fromname,
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.535 loncom/interface/lonnavmaps.pm:1.536
--- loncom/interface/lonnavmaps.pm:1.535	Sun Sep 10 00:11:27 2017
+++ loncom/interface/lonnavmaps.pm	Wed Sep 13 23:35:07 2017
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.535 2017/09/10 00:11:27 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.536 2017/09/13 23:35:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2290,7 +2290,7 @@
     foreach my $msgid (@keys) {
 	if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
             my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,
-                $symb,$error) = &Apache::lonmsg::unpackmsgid($msgid);
+                $symb,$error) = &Apache::lonmsg::unpackmsgid(&LONCAPA::escape($msgid));
             &Apache::lonenc::check_decrypt(\$symb); 
             if (($fromcid ne '') && ($fromcid ne $cid)) {
                 next;