--- loncom/interface/lonmsgdisplay.pm	2006/12/23 07:21:00	1.57
+++ loncom/interface/lonmsgdisplay.pm	2006/12/24 22:13:19	1.59
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.57 2006/12/23 07:21:00 albertel Exp $
+# $Id: lonmsgdisplay.pm,v 1.59 2006/12/24 22:13:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -774,7 +774,6 @@ sub sortedmessages {
     my ($blocked,$startblock,$endblock,$numblocked,$folder,$msgstatus) = @_;
     my $suffix=&Apache::lonmsg::foldersuffix($folder);
     my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix);
-
     #unpack the varibles and repack into temp for sorting
     my @temp;
     my %descriptions;
@@ -789,7 +788,7 @@ sub sortedmessages {
 
     foreach my $msgid (@messages) {
 	my $esc_msgid=&escape($msgid);
-	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid)=
+	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,$processid,$symb,$error) =
 	    &Apache::lonmsg::unpackmsgid($esc_msgid,$folder,undef,
 					 \%status_cache);
         next if ($msgstatus ne '' && $msgstatus ne $status);
@@ -1073,7 +1072,7 @@ ENDDISHEADER
                       ' value="'.$origID.'" /></nobr></td>');
             foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) {
                 $r->print('<td>'.(($status eq 'new')?'<b>':'').
-                          '<a href="/adm/email?display='.$origID.$sqs.'">'.
+                          '<a href="/adm/email?display='.$origID.$sqs.$fsqs.'">'.
                           $item.(($status eq 'new')?'</b>':'').'</td>');
             }
             my $showstatus;
@@ -1950,7 +1949,9 @@ sub displaymessage {
         &build_block_table($r,$startblock,$endblock,\%setters);
         return;
     }
-    &statuschange($msgid,'read',$folder);
+    if ($msgstatus eq '') {
+        &statuschange($msgid,'read',$folder);
+    }
     my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);
     my %content=&Apache::lonmsg::unpackagemsg($message{$msgid});
 
@@ -1989,9 +1990,14 @@ sub displaymessage {
 		  '"><b>'.&mt('Next').'</b></a></td>');
     }
     $r->print('</tr></table>');
+    my $symb;
+    if (defined($content{'symb'})) {
+        $symb = $content{'symb'};
+    } elsif (defined($content{'baseurl'})) {
+        $symb=&Apache::lonnet::symbread($content{'baseurl'});
+    }
     if ($env{'user.adv'}) {
 	$r->print('<table border="2" width="100%"><tr bgcolor="#FFAAAA"><td>'.&mt('Currently available actions (will open extra window)').':</td>');
-	my $symb=&Apache::lonnet::symbread($content{'baseurl'});      
 	if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
 		$r->print('<td><b>'.&Apache::loncommon::track_student_link(&mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check').'</b></td>');
 	    }
@@ -2013,6 +2019,17 @@ sub displaymessage {
        ' ('.$content{'recuser'}[$i].' at '.$content{'recdomain'}[$i].') ';
     }
     $tolist = join(', ',@recipients);
+    my ($restitle,$baseurl,$refers_to);
+    if (defined($content{'resource_title'})) {
+        $restitle = $content{'resource_title'};
+    } else {
+        if (defined($content{'baseurl'})) {
+            $restitle = &Apache::lonnet::gettitle($content{'baseurl'});
+        }
+    }
+    if (defined($content{'baseurl'})) {
+        $baseurl = &Apache::lonenc::check_encrypt($content{'baseurl'});
+    }
     $r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}.
 	      ($folder ne 'sent'?'<br /><b>'.&mt('From').':</b> '.
 	      &Apache::loncommon::aboutmewrapper(
@@ -2023,13 +2040,46 @@ sub displaymessage {
               $tolist).
 	      ($content{'courseid'}?'<br /><b>'.&mt($crstype).':</b> '.$courseinfo{'description'}.
 	       ($content{'coursesec'}?' ('.&mt('Section').': '.$content{'coursesec'}.')':''):'').
-	      '<br /><b>'.&mt('Time').':</b> '.$content{'time'}.
-	      ($content{'baseurl'}?'<br /><b>'.&mt('Refers to').':</b> <a href="'.$content{'baseurl'}.'">'.
-	       $content{'baseurl'}.' ('.&Apache::lonnet::gettitle($content{'baseurl'}).')</a>':'').
-	      '<p><pre>'.
+	      '<br /><b>'.&mt('Time').':</b> '.$content{'time'});
+    if ($baseurl) {
+        if (defined($content{'courseid'}) && defined($env{'request.course.id'})) {
+            if ($content{'courseid'} eq $env{'request.course.id'}) {
+                my $symblink;
+                if ($symb) {
+                    &Apache::lonenc::check_decrypt(\$symb);
+                    $symblink = '?symb='.$symb;
+                }
+                &Apache::lonenc::check_decrypt(\$baseurl);
+                $r->print('<br /><b>'.&mt('Refers to').':</b> <a href="'.$baseurl.$symblink.'">'.$restitle.'</a>');
+                $refers_to = 1;
+            }
+        }
+        if (!$refers_to) {
+            if ($baseurl =~ m-^/enc/-) {
+                if (defined($content{'courseid'})) {
+                    my $unencurl = 
+                       &Apache::lonenc::unencrypted($baseurl,
+                                                    $content{'courseid'}); 
+                    if (defined($unencurl)) {
+                        if (&Apache::lonnet::allowed('bre',$unencurl)) {
+                            $r->print('<br /><b>'.&mt('Refers to').
+                                      ':</b> <a href="'.$unencurl.'">'.$restitle.'</a>');
+                        }
+                    }
+                }
+            } else {
+                if (&Apache::lonnet::allowed('bre',$baseurl)) {
+                    $r->print('<br /><b>'.&mt('Refers to').
+                              ':</b> <a href="'.$baseurl.
+                              '">'.$restitle.'</a>');
+                }
+            }
+        }
+    }
+    $r->print('<p><pre>'.
 	      &Apache::lontexconvert::msgtexconverted($content{'message'},1).
 	      '</pre><hr />'.&displayresource(%content).'</p>');
-    return;   
+    return;
 }
 
 # =========================================================== Show the citation
@@ -2042,7 +2092,12 @@ sub displayresource {
 #
     if (($env{'request.course.id'} eq $content{'courseid'})
      && (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) {
-	my $symb=&Apache::lonnet::symbread($content{'baseurl'});
+        my $symb;
+        if (defined($content{'symb'})) {
+            $symb = $content{'symb'};
+        } else { 
+	    $symb=&Apache::lonnet::symbread($content{'baseurl'});
+        }
 # Could not get a symb, give up
 	unless ($symb) { return $content{'citation'}; }
 # Have a symb, can render