--- loncom/interface/lonmsgdisplay.pm	2007/01/04 02:02:36	1.61
+++ loncom/interface/lonmsgdisplay.pm	2007/01/29 20:07:44	1.66
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.61 2007/01/04 02:02:36 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.66 2007/01/29 20:07:44 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -924,19 +924,11 @@ sub disfolder {
                       nome => 'No messages have been selected to apply ths action to.',
                       chec => 'Check the checkbox for at least one message.',  
     );
+    my $jscript = &Apache::loncommon::check_uncheck_jscript();
     $r->print(<<ENDDISHEADER);
 <script type="text/javascript">
-    function checkall() {
-	for (i=0; i<document.forms.disall.delmark.length; i++) {
-	    document.forms.disall.delmark[i].checked=true;
-        }
-    }
+    $jscript
 
-    function uncheckall() {
-	for (i=0; i<document.forms.disall.delmark.length; i++) {
-	    document.forms.disall.delmark[i].checked=false;
-        }
-    }
     function checkfoldermove() {
         if (document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value == 'markedmove') {
             if (document.disall.movetofolder.options[document.disall.movetofolder.selectedIndex].value == "") {
@@ -956,11 +948,17 @@ sub disfolder {
             } 
         }
         var checktotal = 0;
-        for (var i=0; i<document.forms.disall.delmark.length; i++) {
-            if (document.forms.disall.delmark[i].checked) {
+        if (document.forms.disall.delmark.length > 0) {
+            for (var i=0; i<document.forms.disall.delmark.length; i++) {
+                if (document.forms.disall.delmark[i].checked) {
+                    checktotal ++;
+                }
+            }
+        } else {
+            if (document.forms.disall.delmark.checked) {
                 checktotal ++;
             }
-        }
+        }   
         if (checktotal == 0) {
             alert("$lt{'nome'}\\n$lt{'chec'}");
             return;
@@ -982,6 +980,10 @@ ENDDISHEADER
         } else { 
             $r->print('<h2>'.&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.').'</h2>');
         }
+        if ($numblocked > 0) {
+            $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
+                                         \%setters));
+        }
 	return;
     }
     my $interdis = $env{'form.interdis'};
@@ -1097,8 +1099,8 @@ ENDDISHEADER
     $r->print('<table border="0" cellspacing="2" cellpadding="2">
  <tr>
   <td>'.
-  '<input type="button" onclick="javascript:checkall()" value="'.&mt('Check All').'" /><br />'."\n".
-  '<input type="button" onclick="javascript:uncheckall()" value="'.&mt('Uncheck All').'" />'."\n".
+  '<input type="button" onclick="javascript:checkAll(document.disall.delmark)" value="'.&mt('Check All').'" /><br />'."\n".
+  '<input type="button" onclick="javascript:uncheckAll(document.disall.delmark)" value="'.&mt('Uncheck All').'" />'."\n".
   '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" /></td><td>&nbsp;</td>'."\n".
   '<td align="center"><b>'.&mt('Action').'</b><br />'."\n".
   '  <select name="checkedaction" onchange="javascript:checkfoldermove()">'."\n");
@@ -1138,15 +1140,22 @@ ENDDISHEADER
     my $postedstartdis=$startdis+1;
     $r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$env{'form.interdis'}.'" /><input type="hidden" name="msgstatus" value="'.$msgstatus.'" ><input type="hidden" name="markedaction" value="" /></form>');
     if ($numblocked > 0) {
-        my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
-        my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
-        $r->print('<br /><br />'.
-                  &mt('[quant,_1,message is, messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.',$numblocked,$beginblock,$finishblock));
-        $r->print(&Apache::loncommon::build_block_table($startblock,$endblock,
-                                                        \%setters));
+        $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
+                                     \%setters));
     }
 }
 
+sub blocked_in_folder {
+    my ($numblocked,$startblock,$endblock,$setters) = @_;
+    my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
+    my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
+    my $output = '<br /><br />'.
+                  &mt('[quant,_1,message is, messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.',$numblocked,$beginblock,$finishblock);
+    $output .= &Apache::loncommon::build_block_table($startblock,$endblock,
+                                                     $setters);
+    return $output;
+}
+
 # ============================================================== Compose output
 
 sub compout {
@@ -2045,25 +2054,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>');
+                            }
                         }
                     }
                 }
@@ -2260,7 +2280,7 @@ sub sendoffmail {
 	    }
 	}
 	if ($env{'form.additionalrec'}) {
-	    foreach my $rec (split(/\,/,$env{'form.additionalrec'})) {
+	    foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec'})) {
 		my ($auname,$audom)=split(/:/,$rec);
 		if (($auname ne "") && ($audom ne "")) {
 		    $toaddr{$auname.':'.$audom}='';
@@ -2707,6 +2727,7 @@ sub handler {
         my $delresult = &deletefolder($folder);
         if ($delresult eq 'ok') {
             $r->print(&mt('Mail folder "[_1]" deleted.',$folder).'<br />');
+            $env{'form.folder'} = '';
         } else {
             $r->print(&mt('Deletion failed.').' '.$delresult.'<br />');
             $showfolder = $folder;