--- loncom/interface/lonmsgdisplay.pm	2022/09/17 23:38:51	1.198
+++ loncom/interface/lonmsgdisplay.pm	2025/01/29 09:11:10	1.202
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.198 2022/09/17 23:38:51 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.202 2025/01/29 09:11:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -111,6 +111,7 @@ use Apache::loncommunicate;
 use Apache::lonfeedback;
 use Apache::lonrss();
 use Apache::lonselstudent();
+use Apache::lonenc();
 use lib '/home/httpd/lib/perl/';
 use LONCAPA qw(:DEFAULT :match);
 
@@ -228,41 +229,39 @@ function folder_choice(targetform,caller
 <form method="post" action="/adm/email" name="folderlist">
    <div class="LC_columnSection"><fieldset>
    <legend>'.&mt('Folder Actions').'</legend>
-   <table border="0" cellspacing="2" cellpadding="8">
-    <tr>
-     <td><b>'.$html_lt{'fold'}.'</b><br />'."\n".
-         &Apache::loncommon::select_form($folder,'folder',\%formhash).'
-     </td>
-     <td><b>'.$html_lt{'show'}.'</b><br />'."\n".
+   <div class="LC_columnSection">
+     <div class="LC_mail_actions"><label><b>'.$html_lt{'fold'}.'</b><br />'."\n".
+         &Apache::loncommon::select_form($folder,'folder',\%formhash).'</label>
+     </div>
+     <div class="LC_mail_actions"><label><b>'.$html_lt{'show'}.'</b><br />'."\n".
          &Apache::loncommon::select_form($env{'form.interdis'},'interdis',
-					 \%show).'
-     </td>
-     <td><b>'.$html_lt{'status'}.'</b><br />'."\n".
-       &Apache::loncommon::select_form($msgstatus,'msgstatus',\%statushash).'
-     </td>
-     <td style="padding-right: 40px;">
-         <b>'.$html_lt{'actn'}.'</b><br />'."\n".'
+					 \%show).'</label>
+     </div>
+     <div class="LC_mail_actions"><label><b>'.$html_lt{'status'}.'</b><br />'."\n".
+       &Apache::loncommon::select_form($msgstatus,'msgstatus',\%statushash).'</label>
+     </div>
+     <div class="LC_mail_actions" style="padding-right: 1em">
+         <label><b>'.$html_lt{'actn'}.'</b><br />'."\n".'
          <span class="LC_nobreak">'.
-         &Apache::loncommon::select_form('view','folderaction',\%actions).
+         &Apache::loncommon::select_form('view','folderaction',\%actions).'</label>'.
          ' <input type="button" value="'.$html_lt{'go'}.
          '" onclick="javascript:folder_choice(this.form,'."'change'".');" />
          </span>
-     </td>
-     <td style="border-left: 1px solid;padding-left: 40px;">
-         <b>'.&mt('New Folder').'</b><br />'."\n".'
+     </div>
+     <div class="LC_vertical_line" style="padding: 0; height: 4em; margin: 0">
+     </div>
+     <div class="LC_mail_actions" style="padding-left: 3em">
          <span class="LC_nobreak">
-         <input type="text" size="15" name="newfolder" value="" />
+         <label><b>'.&mt('New Folder').'</b><br />'."\n".'
+         <input type="text" size="15" name="newfolder" value="" /></label>
          <input type="button" value="'.$html_lt{'go'}.
          '" onclick="javascript:folder_choice(this.form,'."'new'".');" />
          </span>
-     </td>
-    </tr>
-   </table>
+     </div>
    </fieldset></div>
 '."\n".
     '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />'.
-    '<input type="hidden" name="renamed" value="" />'.
-        ($folder=~/^critical/?'</form>':'');
+    '<input type="hidden" name="renamed" value="" />';
     return $output;
 }
 
@@ -1134,6 +1133,7 @@ ENDDISHEADER
             $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,$by_ip,$clientip,$blockdom,
                                          \%setters));
         }
+        $r->print('</form>');
         return;
     }
     my $interdis = $env{'form.interdis'};
@@ -1151,7 +1151,7 @@ ENDDISHEADER
     $r->print('<form method="post" name="disall" action="/adm/email">'.
 	      &Apache::loncommon::start_data_table().
           &Apache::loncommon::start_data_table_row().
-          '<th colspan="1">&nbsp;</th><th>');
+          '<th colspan="1">#</th><th>');
     if ($env{'form.sortedby'} eq "revdate") {
 	$r->print('<a href = "/adm/email?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
     } else {
@@ -1230,10 +1230,10 @@ ENDDISHEADER
 		}
 	    }
             my $localsenttime = &Apache::lonlocal::locallocaltime($sendtime);
-	    $r->print('<td align="right"><span class="LC_nobreak">'.(($status eq 'new')?'<b>':'').
+	    $r->print('<td align="right"><span class="LC_nobreak"><label>'.(($status eq 'new')?'<b>':'').
                       $count.'.'.(($status eq 'new')?'</b>':'').'&nbsp;'.
                       '<input type="checkbox" name="delmark"'. 
-                      ' value="'.$origID.'" /></span></td>');
+                      ' value="'.$origID.'" /></label></span></td>');
             foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) {
                 $r->print('<td>'.(($status eq 'new')?'<b>':'').
                           '<a href="/adm/email?display='.$origID.$sqs.'">'.
@@ -1271,16 +1271,15 @@ ENDDISHEADER
     $r->print('
 <div class="LC_columnSection"><fieldset>
 <legend>'.&mt('Message Actions').'</legend>
-<table border="0" cellspacing="2" cellpadding="8">
- <tr>
-  <td><b>'.&mt('Select Messages').'</b><br />
+<div class="LC_mail_actions">
+   <b>'.&mt('Select Messages').'</b><br />
    <span class="LC_nobreak">
    <input type="button" onclick="javascript:checkAll(document.disall.delmark)" value="'.&mt('Check All').'" />'."\n".
   ' <input type="button" onclick="javascript:uncheckAll(document.disall.delmark)" value="'.&mt('Uncheck All').'" />'."\n".
   '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />
   </span>
-  </td>'."\n".
-  '<td><b>'.&mt('Action').'</b><br />'."\n".
+  </div>'."\n".
+  '<div class="LC_mail_actions"><label><b>'.&mt('Action').'</b><br />'."\n".
   '  <select name="checkedaction">'."\n");
 
     if ($folder ne 'trash') {
@@ -1299,7 +1298,7 @@ ENDDISHEADER
         $r->print('   <option value="markedmove">'.&mt('Move to Folder ->').
                   '</option>');
     }
-    $r->print("\n".'</select></td>'."\n");
+    $r->print("\n".'</select></label></div>'."\n");
 
     if (keys(%gotfolders) > 0) {
         $r->print('<td><b>'.&mt('Destination folder').'</b><br />');
@@ -1311,10 +1310,9 @@ ENDDISHEADER
         $r->print(&Apache::loncommon::select_form('','movetofolder',\%userfolders).
                   '</td>');
     }
-    $r->print('<td style="vertical-align:bottom;">'.
-              '<input type="button" name="go" value="'.&mt('Go').
-              '" onclick="javascript:validate_checkedaction()"/></td>'."\n".
-              '</tr></table>'."\n".
+    $r->print('<div class="LC_mail_actions">'.
+              '<br /><input type="button" name="go" value="'.&mt('Go').
+              '" onclick="javascript:validate_checkedaction()"/></div>'."\n".
               '</fieldset></div>'."\n"
     );
     my $postedstartdis=$startdis+1;
@@ -2503,12 +2501,16 @@ sub displaymessage {
                               $showsymb,$env{'user.domain'},$env{'user.name'});
                 if ($symb) {
                     if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) {
-                        $showsymb = &Apache::lonenc::check_encrypt($symb);
+                        unless ($showsymb =~ m{^/enc/}) {
+                            $showsymb = &Apache::lonenc::encrypted($showsymb);
+                        }
                     }
                     $symblink = '?symb='.$showsymb;
                 }
                 if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) {
-                    $showurl = $baseurl;
+                    unless ($showurl =~ m{^/enc/}) {
+                        $showurl = &Apache::lonenc::encrypted($showurl);
+                    }
                 }
                 $r->print(&Apache::lonhtmlcommon::row_title(&mt('Refers to'))
                          .'<a href="'.$showurl.$symblink.'">'.$restitle.'</a>'
@@ -2702,9 +2704,10 @@ sub displayresource {
      && (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) {
         my $symb;
         if (defined($content{'symb'})) {
-            $symb = $content{'symb'};
-        } else { 
-	    $symb=&Apache::lonnet::symbread($content{'baseurl'});
+            $symb = &Apache::lonenc::check_decrypt($content{'symb'});
+        } elsif (defined($content{'baseurl'})) {
+            $symb =
+                &Apache::lonnet::symbread(&Apache::lonenc::check_decrypt($content{'baseurl'}));
         }
 # Could not get a symb, give up
 	unless ($symb) { return $content{'citation'}; }