--- loncom/interface/lonmsgdisplay.pm	2006/12/24 22:13:19	1.59
+++ loncom/interface/lonmsgdisplay.pm	2007/01/04 20:58:26	1.63
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.59 2006/12/24 22:13:19 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.63 2007/01/04 20:58:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1072,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.$fsqs.'">'.
+                          '<a href="/adm/email?display='.$origID.$sqs.'">'.
                           $item.(($status eq 'new')?'</b>':'').'</td>');
             }
             my $showstatus;
@@ -2045,25 +2045,36 @@ sub displaymessage {
         if (defined($content{'courseid'}) && defined($env{'request.course.id'})) {
             if ($content{'courseid'} eq $env{'request.course.id'}) {
                 my $symblink;
+                my $showsymb = &Apache::lonenc::check_decrypt($symb);
+                my $showurl = &Apache::lonenc::check_decrypt($baseurl);
+                my $encrypturl = &Apache::lonnet::EXT('resource.0.encrypturl',
+                              $showsymb,$env{'user.domain'},$env{'user.name'});
                 if ($symb) {
-                    &Apache::lonenc::check_decrypt(\$symb);
-                    $symblink = '?symb='.$symb;
+                    if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) {
+                        $showsymb = &Apache::lonenc::check_encrypt($symb);
+                    }
+                    $symblink = '?symb='.$showsymb;
+                }
+                if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) {
+                    $showurl = $baseurl;
                 }
-                &Apache::lonenc::check_decrypt(\$baseurl);
-                $r->print('<br /><b>'.&mt('Refers to').':</b> <a href="'.$baseurl.$symblink.'">'.$restitle.'</a>');
+                $r->print('<br /><b>'.&mt('Refers to').':</b> <a href="'.$showurl.$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>');
+                    if (!$env{'request.course.id'}) {
+                        my $unencurl =
+                           &Apache::lonenc::unencrypted($baseurl,
+                                                        $content{'courseid'});
+                        if ($unencurl ne '') {
+                            if (&Apache::lonnet::allowed('bre',$unencurl)) {
+                                $r->print('<br /><b>'.&mt('Refers to').
+                                          ':</b> <a href="'.$unencurl.'">'.
+                                          $restitle.'</a>');
+                            }
                         }
                     }
                 }
@@ -2289,11 +2300,9 @@ sub sendoffmail {
             my $msgtxt = $savemsg;
 	    if ($toaddr{$address}) { $msgtxt.='<hr />'.$toaddr{$address}; }
 	    my @thismsg;
-	    if ((($env{'form.critmsg'}) || ($env{'form.sendbck'})) && 
-		(&Apache::lonnet::allowed('srm',$env{'request.course.id'})
-		 || &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
-					     '/'.$env{'request.course.sec'}))) {
-		$r->print(&mt('Sending critical message').' '.$recuname.':'.$recdomain.': ');
+	    if ($msgtype eq 'critical') {
+		$r->print(&mt('Sending critical message').' '.
+                              $recuname.':'.$recdomain.': ');
 		@thismsg=
 		    &Apache::lonmsg::user_crit_msg($recuname,$recdomain,
 						   $msgsubj,$msgtxt,
@@ -2315,7 +2324,7 @@ sub sendoffmail {
 	        $specialmsg_status{$recuname.':'.$recdomain} =
 		    join(' ',@thismsg);
 		foreach my $result (@thismsg) {
-		    if ($result eq 'ok') {
+		    if ($result eq 'ok' || $result eq 'con_delayed') {
 			$numspecial++;
 		    }
 		}