[LON-CAPA-cvs] cvs: loncom /interface lonmsg.pm lonmsgdisplay.pm lonnotify.pm lonwhatsnew.pm

[albertel]

albertel		Sun Apr 23 00:04:38 2006 EDT

  Modified files:              
    /loncom/interface	lonmsgdisplay.pm lonmsg.pm lonnotify.pm 
                     	lonwhatsnew.pm 
  Log:
  - more properly hadle the bmsgiid subject (it is normally enocded then escaped, take care of undoing tat in the unpackmsgid now)
  
  
Index: loncom/interface/lonmsgdisplay.pm
diff -u loncom/interface/lonmsgdisplay.pm:1.7 loncom/interface/lonmsgdisplay.pm:1.8
--- loncom/interface/lonmsgdisplay.pm:1.7	Sat Apr 22 23:50:54 2006
+++ loncom/interface/lonmsgdisplay.pm	Sun Apr 23 00:04:38 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.7 2006/04/23 03:50:54 albertel Exp $
+# $Id: lonmsgdisplay.pm,v 1.8 2006/04/23 04:04:38 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -478,7 +478,7 @@
                     push @newmsgs, { 
                         msgid    => $msgid,
                         sendtime => $sendtime,
-                        shortsub => &Apache::lonnet::unescape($shortsubj),
+                        shortsub => $shortsubj,
                         from     => $fromname,
                         fromdom  => $fromdom,
                         course   => $description 
@@ -653,7 +653,7 @@
 		      '">'.&mt('Delete'):'&nbsp').'</a></td>'.
 		      '<td>'.&Apache::lonlocal::locallocaltime($sendtime).'</td><td>'.
 		      $dis_name.'</td><td>'.$dis_domain.'</td><td>'.
-		      &Apache::lonnet::unescape($shortsubj).'</td><td>'.
+		      $shortsubj.'</td><td>'.
                       $description.'</td><td>'.$status.'</td></tr>'."\n");
 	} elsif ($status eq 'deleted') {
 # purge
Index: loncom/interface/lonmsg.pm
diff -u loncom/interface/lonmsg.pm:1.181 loncom/interface/lonmsg.pm:1.182
--- loncom/interface/lonmsg.pm:1.181	Tue Apr 11 10:17:23 2006
+++ loncom/interface/lonmsg.pm	Sun Apr 23 00:04:38 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.181 2006/04/11 14:17:23 albertel Exp $
+# $Id: lonmsg.pm,v 1.182 2006/04/23 04:04:38 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -188,6 +188,8 @@
     $msgid=&Apache::lonnet::unescape($msgid);
     my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$fromcid,
                      $processid)=split(/\:/,&Apache::lonnet::unescape($msgid));
+    $shortsubj = &Apache::lonnet::unescape($shortsubj);
+    $shortsubj = &HTML::Entities::decode($shortsubj);
     if (!defined($processid)) { $fromcid = ''; }
     my %status=();
     unless ($skipstatus) {
Index: loncom/interface/lonnotify.pm
diff -u loncom/interface/lonnotify.pm:1.16 loncom/interface/lonnotify.pm:1.17
--- loncom/interface/lonnotify.pm:1.16	Mon Apr 10 17:40:08 2006
+++ loncom/interface/lonnotify.pm	Sun Apr 23 00:04:38 2006
@@ -294,9 +294,8 @@
                     $rowColor = $rowColor2;
                 }
                 my $recipients = '';
-                my ($date,$subj,$sname,$sdom) =
+                my ($date,undef,$sname,$sdom) =
                                   &Apache::lonmsg::unpackmsgid($msgid,undef,1);
-                $subj = &Apache::lonnet::escape($subj);
                 $date = &Apache::lonlocal::locallocaltime($date);
                 foreach my $user (sort(keys(%{$dcmail{$msgid}{recipient}}))) {
                     $recipients .= $dcmail{$msgid}{recipient}{$user}.', ';
@@ -307,9 +306,8 @@
             }
         } else {
             foreach my $msgid (sort(keys(%dcmail))) {
-                my ($date,$subj,$sname,$sdom) =
+                my ($date,undef,$sname,$sdom) =
                                    &Apache::lonmsg::unpackmsgid($msgid,undef,1);
-                $subj = &Apache::lonnet::escape($subj);
                 if ($env{'form.sortby'} eq 'subject') {
                     push @{$Sortby{$dcmail{$msgid}{subject}}},$msgid;
                 } elsif ($env{'form.sortby'} eq 'message') {
@@ -343,9 +341,8 @@
                         }
                         $recipients =~ s/,\s$//;
                     }
-                    my ($date,$subj,$sname,$sdom) =
+                    my ($date,undef,$sname,$sdom) =
                                    &Apache::lonmsg::unpackmsgid($msgid,undef,1);
-                    $subj = &Apache::lonnet::escape($subj);
                     $date = &Apache::lonlocal::locallocaltime($date);
                     $output .=  '<tr bgcolor="'.$rowColor.'"><td><small>'.$date.'</small></td><td><small>'.&cr_to_br($dcmail{$msgid}{subject}).'</small></td><td><small>'.$sname.':'.$sdom.'</small></td><td><small>'.&cr_to_br($dcmail{$msgid}{message}).'</small></td><td><small>'.$recipients.'</small></td></tr>'."\n";
                     $rowNum ++;
Index: loncom/interface/lonwhatsnew.pm
diff -u loncom/interface/lonwhatsnew.pm:1.52 loncom/interface/lonwhatsnew.pm:1.53
--- loncom/interface/lonwhatsnew.pm:1.52	Wed Mar 15 14:41:26 2006
+++ loncom/interface/lonwhatsnew.pm	Sun Apr 23 00:04:38 2006
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.52 2006/03/15 19:41:26 albertel Exp $
+# $Id: lonwhatsnew.pm,v 1.53 2006/04/23 04:04:38 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1029,7 +1029,6 @@
                     if ($shortsubj eq '') {
                         $shortsubj = &mt('No subject');
                     }
-                    $shortsubj = &Apache::lonnet::unescape($shortsubj);
                     push(@{$newmsgs}, {
                         msgid    => $msgid,
                         sendtime => $sendtime,
@@ -1061,7 +1060,6 @@
                 if ($shortsubj eq '') {
                     $shortsubj = &mt('No subject');
                 }
-                $shortsubj = &Apache::lonnet::unescape($shortsubj);
                 push(@{$critmsgs}, {
                         msgid    => $msgid,
                         sendtime => $sendtime,