--- rat/lonpageflip.pm	2017/11/16 13:42:01	1.97
+++ rat/lonpageflip.pm	2018/12/30 19:47:06	1.101
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.97 2017/11/16 13:42:01 raeburn Exp $
+# $Id: lonpageflip.pm,v 1.101 2018/12/30 19:47:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -102,6 +102,9 @@ sub move {
     my ($next,$endupmap,$direction) = @_;
     my $safecount=0;
     my $allowed=0;
+    my $deeplinkonly=0;
+    my $prev=$next;
+    my ($prevmapid)=split(/\./,$next);
     do {
 	($next,$endupmap)=&get_next_possible_move($next,$endupmap,$direction);
 
@@ -115,14 +118,35 @@ sub move {
 	    my $priv = &Apache::lonnet::allowed('bre',$url,$symb);
 	    $allowed = (($priv eq 'F') || ($priv eq '2'));
 	}
+        $deeplinkonly = 0;
+        if ($hash{'deeplinkonly_'.$next}) {
+            my ($value,$level) = split(/:/,$hash{'deeplinkonly_'.$next});
+            if ($level eq 'resource') {
+                $deeplinkonly = 1;
+            } elsif ($level eq 'map') {
+                if ($mapid != $prevmapid) {
+                    $deeplinkonly = 1;
+                }
+            }
+        } elsif ($hash{'deeplinkonly_'.$prev}) {
+            my ($value,$level) = split(/:/,$hash{'deeplinkonly_'.$prev});
+            if ($level eq 'resource') {
+                $deeplinkonly = 1;
+            } elsif ($level eq 'map') {
+                if ($mapid != $prevmapid) {
+                    $deeplinkonly = 1;
+                }
+            }
+        }
 	$safecount++;
     } while (   ($next)
 	     && ($next!~/\,/)
 	     && (
 		    (!$hash{'src_'.$next})
 		 || (
-		        (!$env{'request.role.adv'})
-		     &&  $hash{'randomout_'.$next}
+                        (!$env{'request.role.adv'})
+                     && (($hash{'randomout_'.$next})
+                     ||  ($deeplinkonly))
 		    )
 		 || (!$allowed)
 		)
@@ -289,11 +313,17 @@ sub check_http_req {
         if (($$srcref =~ m{^\Q/public/$cdom/$cnum/syllabus\E($|\?)}) &&
             ($ENV{'SERVER_PORT'} == 443) &&
             ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
-            $$srcref .= (($$srcref =~/\?/)? '&':'?') . 'usehttp=1';
-            $usehttp = 1;
+            unless (&Apache::lonnet::uses_sts()) {
+                $$srcref .= (($$srcref =~/\?/)? '&':'?') . 'usehttp=1';
+                $usehttp = 1;
+            }
         } elsif (($$srcref =~ m{^\Q/adm/wrapper/ext/\E(?!https:)}) &&
                  ($ENV{'SERVER_PORT'} == 443)) {
-            $usehttp = 1;
+            unless (&Apache::lonnet::uses_sts()) {
+                my ($url,$anchor) = ($$srcref =~ /^([^\#]+)(?:|(\#[^\#]+))$/);
+                $$srcref = $url . (($$srcref =~/\?/)? '&':'?') . 'usehttp=1' .$anchor; 
+                $usehttp = 1;
+            }
         }
     }
     return $usehttp;
@@ -338,7 +368,7 @@ sub handler {
   my $multichoice=0;
   my %multichoicehash=();
   my %prog_state=();
-  my ($redirecturl,$redirectsymb,$enc,$anchor);
+  my ($redirecturl,$redirectsymb,$enc,$anchor,$deeplinklevel);
   my $next='';
   my $hostname = $r->hostname();
   my @possibilities=();
@@ -442,7 +472,7 @@ sub handler {
 	      return REDIRECT;
           }
       }
-      if ($direction eq 'return') { 
+      if ($direction eq 'return') {
 # -------------------------------------------------------- Return to last known
          my ($newloc,$usehttp);
          if (($last) && (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'.db',
@@ -454,8 +484,12 @@ sub handler {
                 $usehttp = &check_http_req(\$newloc);
 		if ($hash{'encrypted_'.$id}) { 
                     $newloc=&Apache::lonenc::encrypted($newloc);
-                } elsif ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)\#([^\#]+)$}) {
-                    $newloc = $1.&escape('#').$2;
+                }
+                if ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)(?:|(\#[^\#]+))$}) {
+                    my ($url,$anchor) = ($1,$2);
+                    if ($anchor) {
+                        $newloc = $url.(($url=~/\?/)?'&':'?').'symb='.&escape($last).$anchor;
+                    }
                 }
 	    } else {
 		$newloc='/adm/navmaps';
@@ -564,6 +598,9 @@ sub handler {
 	      } else {
 # -------------------------------------------------------------- No place to go
                   $multichoice=-1;
+                  if ($hash{'deeplinkonly_'.$rid}) {
+                      (my $value,$deeplinklevel) = split(/:/,$hash{'deeplinkonly_'.$rid});
+                  }
               }
 # ----------------- The program must come past this point to untie the big hash
 	      untie(%hash);
@@ -618,6 +655,11 @@ sub handler {
                   &Apache::loncommon::content_type($r,'text/html');
                   $r->send_http_header;
 		  my %lt=&Apache::lonlocal::texthash('title' => 'End of Sequence',
+                                                     'deeplink' => 'No link available',
+                                                     'deeplinkres' =>
+                                                     'Navigation to other content is unavailable when accessing content via deep-linking',
+                                                     'deeplinkmap' =>
+                                                     'You have reached the end of the sequence of available materials for access via deep-linking',
 						     'explain' =>
 						     'You have reached the end of the sequence of materials.',
 						     'back' => 'Go Back',
@@ -685,17 +727,29 @@ ENDSTART
                               } else {
                                   $r->print(&Apache::lonplacementtest::showresult(1));
                               }
-                          } else {  
+                          } else {
                               $r->print(
-                                  &Apache::loncommon::start_page('No Resource')
-                                 .'<h2>'.$lt{'title'}.'</h2>'
-                                 .'<p>'.$lt{'explain'}.'</p>');
+                                  &Apache::loncommon::start_page('No Resource'));
+                              if ($deeplinklevel eq 'resource') {
+                                  $r->print('<h2>'.$lt{'deeplink'}.'</h2>'
+                                           .'<p>'.$lt{'deeplinkres'}.'</p>');
+                              } elsif ($deeplinklevel eq 'map') {
+                                  $r->print('<h2>'.$lt{'title'}.'</h2>'
+                                           .'<p>'.$lt{'deeplinkmap'}.'</p>');
+                              } else {
+                                  $r->print('<h2>'.$lt{'title'}.'</h2>'
+                                           .'<p>'.$lt{'explain'}.'</p>');
+                              }
                           }
                       }
 		  }
                   unless (($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') ||
                           ($env{'request.role.adv'})) {
-                      if ((!@possibilities) && ($reinitcheck))  {
+                      if ($deeplinklevel) {
+                          $r->print(
+                              &Apache::lonhtmlcommon::actionbox(
+                                  ['<a href="/adm/flip?postdata=return:">'.$lt{'back'}.'</a>']));
+                      } elsif ((!@possibilities) && ($reinitcheck))  {
                           $r->print(
                               &Apache::lonhtmlcommon::actionbox(
                                   ['<a href="/adm/navmaps">'.$lt{'nav'}.'</a></li>'