--- rat/lonpage.pm	2019/08/11 12:27:15	1.127
+++ rat/lonpage.pm	2020/03/03 01:16:31	1.134
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.127 2019/08/11 12:27:15 raeburn Exp $
+# $Id: lonpage.pm,v 1.134 2020/03/03 01:16:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -304,22 +304,38 @@ sub handler {
                       foreach (@colcont) {
                           my $src=$hash{'src_'.$_};
                           my $plainsrc = $src;
+                          if ($hash{'ext_'.$_} eq 'true:') {
+                              $cellexternal{$_}=($hash{'ext_'.$_} eq 'true:');
+                              $src =~ s{^/ext/}{http://};
+                              $src =~ s{http://https://}{https://};
+                          }
                           my ($extension)=($src=~/\.(\w+)$/);
-			  $cellexternal{$_}=($hash{'ext_'.$_} eq 'true:');
 			  if ($hash{'encrypted_'.$_}) {
 			      $src=&Apache::lonenc::encrypted($src);
 			  }
                           my ($mapid,$resid)=split(/\./,$_);
-                          my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src);
+                          my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$plainsrc);
                           unless ($env{'request.role.adv'}) {
                               $buttonshide{$symb} = &Apache::lonnet::EXT("resource.0.buttonshide",$symb);
                           }
                           $cellemb{$_}=
 			      &Apache::loncommon::fileembstyle($extension);
                           if ($cellexternal{$_}) {
-                              unless (($target eq 'tex') || ($target eq 'tex_answer')) {
+                              if (($target eq 'tex') || ($target eq 'tex_answer')) {
+                                  my $shown = $src;
+                                  if ($hash{'encrypted_'.$_}) {
+                                      $shown = &mt('URL not shown (encrypted)');
+                                  }
+                                  my $title=&Apache::lonnet::gettitle($symb);
+                                  $title = &Apache::lonxml::latex_special_symbols($title);
+                                  $ssibody{$_} = ' \strut \\\\ \textit{'.$title.'} \strut \\\\ '.$shown.'\\\\';
+                              } else {
+                                  my $showsrc = $src;
+                                  if (($hash{'encrypted_'.$_}) && ($symb)) {
+                                      $showsrc .= '?symb='.&Apache::lonenc::encrypted($symb);
+                                  }
                                   $ssibody{$_} = <<ENDEXT;
-<iframe src="$src" width="100%">No iframe support!</iframe>
+<iframe src="$showsrc" width="100%">No iframe support!</iframe>
 ENDEXT
                               }
                           } elsif ($cellemb{$_} eq 'ssi') {
@@ -360,7 +376,9 @@ ENDEXT
 				  if ($env{'form.all_submit_pressed'}) {
 				      $posthash{'all_submit'}='yes';
 				  }
-			      }
+			      } elsif ($env{'form.'.$prefix.'markaccess'} eq 'yes') {
+		                  $posthash{'markaccess'} = $env{'form.'.$prefix.'markaccess'};
+		              }
                               my $output=Apache::lonnet::ssi($src,%posthash);
 			      $output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s*(-->)?\s||gs;
                               if (($target eq 'tex') || ($target eq 'tex_answer')) {
@@ -621,7 +639,9 @@ ENDEXT
 				  "\n</script>\n";
 			  }
                           if (($nforms) && ($nuploads)) {
-                              $allscript .= &Apache::lonhtmlcommon::file_submissionchk_js(\%turninpaths,\%multiresps);
+                              $allscript .= &Apache::lonhtmlcommon::file_submissionchk_js(\%turninpaths,\%multiresps).
+                                            '<script type="text/javascript" '.
+                                            'src="/res/adm/includes/file_upload.js"></script>';
                           }
                           if (($nforms) && (&Apache::lonhtmlcommon::htmlareabrowser())) {
                               my %textarea_args = (
@@ -639,6 +659,7 @@ ENDEXT
                                             '// ]]>'.
                                             "\n</script>\n";
                           }
+                          &Apache::lonhtmlcommon::clear_breadcrumb_tools();
                           if (keys(%hastimeleft)) {
                               my (%uniquetimes,%uniquedisplays);
                               foreach my $item (values(%hastimeleft)) {
@@ -894,16 +915,18 @@ sub get_buttons {
             return;
         }
     }
+    my $crs_sec = $env{'request.course.id'} . (($env{'request.course.sec'} ne '')
+                                               ? "/$env{'request.course.sec'}"
+                                               : '');
     if ($hash->{'encrypted_'.$rid}) {
-	$symb=&Apache::lonenc::encrypted($symb);
 	$esrc=&Apache::lonenc::encrypted($esrc);
     }
     if ($hash->{'src_'.$rid} !~ m-^/uploaded/-
-        && $hash->{'src_'.$rid} !~ m{^https?://}
+        && $hash->{'src_'.$rid} !~ m{^/ext/}
 	&& !$env{'request.enc'}
 	&& ($env{'request.role.adv'}
 	    || !$hash->{'encrypted_'.$rid})) { 
-	$metainfo .='<a name="'.&escape($symb).'" />'.
+	$metainfo .='<a name="'.&escape($symb).'"></a>'.
 	    '<a href="'.$hash->{'src_'.$rid}.'.meta'.'" target="LONcatInfo">'.
             '<img src="/res/adm/pages/catalog.png" class="LC_icon"'.
             ' alt="'.&mt('Show Metadata').'"'.
@@ -911,7 +934,7 @@ sub get_buttons {
 	    '</a>';
     }
     if (($hash->{'src_'.$rid} !~ m{^/uploaded/}) &&
-        ($hash->{'src_'.$rid} !~ m{^https?://})) {
+        ($hash->{'src_'.$rid} !~ m{^/ext/})) {
         $metainfo .= '<a href="/adm/evaluate?postdata='.
 	    &escape($esrc).
 	    '" target="LONcatInfo">'.
@@ -923,7 +946,8 @@ sub get_buttons {
     if (($hash->{'src_'.$rid}=~/$LONCAPA::assess_re/) &&
 	($hash->{'src_'.$rid} !~ m-^/uploaded/-)) {
 
-	if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) {
+	if ((&Apache::lonnet::allowed('mgr',$crs_sec)) ||
+            (&Apache::lonnet::allowed('vgr',$crs_sec))) {
 	    $metainfo.=
 		'<a href="/adm/grades?symb='.&escape($symb).
 #               '&command=submission" target="LONcatInfo">'.
@@ -931,7 +955,10 @@ sub get_buttons {
                 '<img src="/adm/lonMisc/subm_button.png" class="LC_icon"'.
                 ' alt="'.&mt('View Submissions for a Student or a Group of Students').'"'.
                 ' title="'.&mt('View Submissions for a Student or a Group of Students').'" />'.
-		'</a>'.
+		'</a>';
+        }
+        if (&Apache::lonnet::allowed('mgr',$crs_sec)) {
+            $metainfo.=
 		'<a href="/adm/grades?symb='.&escape($symb).
 #               '&command=gradingmenu" target="LONcatInfo">'.
 		'&command=gradingmenu">'.
@@ -940,7 +967,8 @@ sub get_buttons {
                 ' title="'.&mt('Content Grades').'" />'.
 		'</a>';
 	}
-	if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
+	if ((&Apache::lonnet::allowed('opa',$crs_sec)) ||
+            (&Apache::lonnet::allowed('vpa',$crs_sec))) {
 	    $metainfo.=
 		'<a href="/adm/parmset?symb='.&escape($symb).
 #               '" target="LONcatInfo">'.
@@ -981,12 +1009,15 @@ sub get_buttons {
             if ((&Apache::lonnet::allowed('cre','/')) &&
                 (&Apache::lonnet::metadata($url,'sourceavail') eq 'open')) {
                 $viewsrcbutton = 1;
-            } elsif (&Apache::lonnet::allowed('vxc',$env{'request.course.id'})) {
+            } elsif (&Apache::lonnet::allowed('vxc',$crs_sec)) {
                 if ($url =~ m{^\Q/res/$cdom/\E($LONCAPA::match_username)/}) {
                     my $auname = $1;
                     if (($env{'request.course.adhocsrcaccess'} ne '') &&
                         (grep(/^\Q$auname\E$/,split(/,/,$env{'request.course.adhocsrcaccess'})))) {
                         $viewsrcbutton = 1;
+                    } elsif ((&Apache::lonnet::metadata($url,'sourceavail') eq 'open') &&
+                             (&Apache::lonnet::allowed('bre',$crs_sec))) {
+                        $viewsrcbutton = 1;
                     }
                 }
             }
@@ -1049,7 +1080,6 @@ $collapse
 <span id="ddcountexpand" class="LC_menubuttons_inline_text" >$expand</span>
 <img src="/res/adm/pages/timer.png" title="$desc" class="LC_icon" alt="$alttxt" /><span class="LC_menubuttons_inline_text">$title</span></a>
 END
-    &Apache::lonhtmlcommon::clear_breadcrumb_tools();
     &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$output);
     return;
 }