--- rat/lonpage.pm	2020/11/13 02:46:48	1.111.2.10.2.3
+++ rat/lonpage.pm	2023/01/19 17:23:33	1.111.2.13.2.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.111.2.10.2.3 2020/11/13 02:46:48 raeburn Exp $
+# $Id: lonpage.pm,v 1.111.2.13.2.5 2023/01/19 17:23:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -102,7 +102,9 @@ sub tracetable {
             } else {
                 $sofar++;
                 if ($hash{'src_'.$rid}) {
-                    my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$rid});
+                    my ($mapid,$resid)=split(/\./,$rid);
+                    my $symb = &Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid});
+                    my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$rid},$symb);
                     if (($brepriv eq '2') || ($brepriv eq 'F')) {
                         if (defined($rows[$sofar])) {
                             $rows[$sofar].='&'.$rid;
@@ -202,7 +204,7 @@ sub handler {
                   my ($pagesymb,$courseid,$domain,$name)=&Apache::lonnet::whichuser();
                   unless ($pagesymb) {
                       $pagesymb=&Apache::lonnet::symbread($requrl);
-                  }                  
+                  }
                   if ($pagesymb && ($courseid ne '') && ($domain ne '') && ($name ne '')) {
                       my %times=&Apache::lonnet::get('firstaccesstimes',
                                                      [$courseid."\0".$pagesymb],
@@ -684,7 +686,7 @@ ENDEXT
 # ---------------------------------------------------------------- End SSI cell
                           }
                       }
-                     } 
+                     }
                   }
                   unless ($contents) {
                       &Apache::loncommon::content_type($r,'text/html');
@@ -743,7 +745,7 @@ ENDEXT
                                       $uniquetimes{$item} = 1;
                                   }
                               }
-                              if (scalar(keys(%uniquetimes)) == 1) {
+                              if (scalar(keys(%uniquetimes)) == 1) { 
                                   my (%uniquedisplays,%uniquedones,$currdisp,$donebuttontime,
                                       $donebuttonextras);
                                   if (keys(%countdowndisp)) {
@@ -966,9 +968,26 @@ ENDEXT
                   }                  
 # ------------------------------------------------------------- End render page
               } else {
-                  &Apache::loncommon::content_type($r,'text/html');
-                  $r->send_http_header;
-                  &Apache::lonsequence::viewmap($r,$requrl);
+                  if ($hash{'map_type_'.$hash{'map_pc_'.$requrl}} eq 'none') {
+                      &Apache::loncommon::content_type($r,'text/html');
+                      $r->send_http_header;
+                      $r->print(&Apache::loncommon::start_page(undef,undef,
+                                                               {'force_register' => 1,}));
+                      my $crstype = &Apache::loncommon::course_type();
+                      if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+                          $r->print('<span class="LC_warning">'.&mt('Missing composite page file.').'</span><br />'.
+                                    &mt("You may want to use the $crstype Editor to remove this item."));
+                      } else {
+                          $r->print('<span class="LC_info">'.
+                                    &mt('This resource was unavailable when your '.lc($crstype).' session was loaded').'<br />'.
+                                    &mt("Please use 'Contents' to list items available in the $crstype.").'</span>');
+                      }
+                      $r->print(&Apache::loncommon::end_page());
+                  } else {
+                      &Apache::loncommon::content_type($r,'text/html');
+                      $r->send_http_header;
+                      &Apache::lonsequence::viewmap($r,$requrl);
+                  }
               }
 # ------------------------------------------------------------------ Untie hash
               unless (untie(%hash)) {
@@ -994,16 +1013,18 @@ sub get_buttons {
     my $symb=&Apache::lonnet::encode_symb($hash->{'map_id_'.$mapid},
 					  $resid,
 					  $hash->{'src_'.$rid});
-    my $aname;
+    my ($aname,$shownsymb);
     if (($hash->{'encrypted_'.$rid}) && (!$env{'request.role.adv'})) {
         $aname = 'LC_'.$rid;
+        $shownsymb = &Apache::lonenc::encrypted($symb);
     } else {
-        my $shownsymb = $symb;
+        $shownsymb = $symb;
+        my $dispsymb = $symb;
         if ($symb =~ /\#([^\#]+)$/) {
             my $escan = &escape('#');
-            $shownsymb =~ s/#([^\#]+)$/$escan$1/;
+            $dispsymb =~ s/#([^\#]+)$/$escan$1/;
         }
-        $aname = &escape($shownsymb);
+        $aname = &escape($dispsymb);
     }
     my $metainfo = '<a name="'.$aname.'"></a>';
     unless ($env{'request.role.adv'}) {
@@ -1043,7 +1064,7 @@ sub get_buttons {
     if (($hash->{'src_'.$rid}=~/$LONCAPA::assess_re/) &&
 	($hash->{'src_'.$rid} !~ m-^/uploaded/-)) {
 
-        if ((&Apache::lonnet::allowed('mgr',$crs_sec)) ||
+	if ((&Apache::lonnet::allowed('mgr',$crs_sec)) ||
             (&Apache::lonnet::allowed('vgr',$crs_sec))) {
 	    $metainfo.=
 		'<a href="/adm/grades?symb='.&escape($symb).
@@ -1056,15 +1077,15 @@ sub get_buttons {
         }
         if (&Apache::lonnet::allowed('mgr',$crs_sec)) {
             $metainfo.=
-                '<a href="/adm/grades?symb='.&escape($symb).
+		'<a href="/adm/grades?symb='.&escape($symb).
 #               '&command=gradingmenu" target="LONcatInfo">'.
 		'&command=gradingmenu">'.
                 '<img src="/res/adm/pages/pgrd.png" class="LC_icon"'.
                 ' alt="'.&mt('Content Grades').'"'.
                 ' title="'.&mt('Content Grades').'" />'.
-                '</a>';
-        }
-        if ((&Apache::lonnet::allowed('opa',$crs_sec)) ||
+		'</a>';
+	}
+	if ((&Apache::lonnet::allowed('opa',$crs_sec)) ||
             (&Apache::lonnet::allowed('vpa',$crs_sec))) {
 	    $metainfo.=
 		'<a href="/adm/parmset?symb='.&escape($symb).
@@ -1086,8 +1107,8 @@ sub get_buttons {
                 &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,$hash->{'src_'.$rid},$symb);
             if ($cfile ne '') {
                 my $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver,
-                                                                     $forceedit,1,$symb,undef,
-                                                                     &escape($env{'form.title'}),
+                                                                     $forceedit,1,$symb,$shownsymb,
+                                                                     undef,&escape($env{'form.title'}),
                                                                      $hostname);
                 if ($jscall) {
                     $editbutton = 1;