--- rat/lonpageflip.pm	2017/03/08 02:51:18	1.95
+++ rat/lonpageflip.pm	2018/12/29 23:24:58	1.100
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.95 2017/03/08 02:51:18 raeburn Exp $
+# $Id: lonpageflip.pm,v 1.100 2018/12/29 23:24:58 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,16 +313,44 @@ 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;
 }
 
+sub reinited_js {
+    my ($url,$cid,$timeout) = @_;
+    if (!$timeout) {
+        $timeout = 0;
+    }
+    return <<"END";
+<script type="text/javascript">
+// <![CDATA[
+setTimeout(function() {
+    var newurl = '$url';
+    if (document.getElementById('LC_update_$cid')) {
+        document.getElementById('LC_update_$cid').style.display = 'none';
+    }
+    if ((newurl !== null) && (newurl !== '') && (newurl !== 'undefined')) {
+        window.location.href = "$url";
+    }
+}, $timeout);
+// ]]>
+</script>
+END
+}
+
 # ================================================================ Main Handler
 
 sub handler {
@@ -315,7 +367,8 @@ sub handler {
   my %cachehash=(); 
   my $multichoice=0;
   my %multichoicehash=();
-  my ($redirecturl,$redirectsymb,$enc,$anchor);
+  my %prog_state=();
+  my ($redirecturl,$redirectsymb,$enc,$anchor,$deeplinklevel);
   my $next='';
   my $hostname = $r->hostname();
   my @possibilities=();
@@ -372,8 +425,20 @@ sub handler {
                       untie(%hash);
                   }
               }
+              &Apache::loncommon::content_type($r,'text/html');
+              $r->send_http_header;
+              $r->print(&Apache::loncommon::start_page('Content Changed'));
+              my $preamble = '<div id="LC_update_'.$env{'request.course.id'}.'" class="LC_info">'.
+                             '<br />'.
+                             &mt('Your course session is being updated because of recent changes by course personnel.').
+                             ' '.&mt('Please be patient.').'<br /></div>'.
+                             '<div style="padding:0;clear:both;margin:0;border:0"></div>';
+              %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble);
+              &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course'));
               my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
+              &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished'));
               if ($ferr) {
+                  &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
                   my $requrl = $r->uri;
                   $env{'user.error.msg'}="$requrl:bre:0:0:Course not initialized";
                   $env{'user.reinit'} = 1;
@@ -396,9 +461,16 @@ sub handler {
           } else {
               $furl=&Apache::lonnet::absolute_url().$furl;
           }
-	  &Apache::loncommon::content_type($r,'text/html');
-	  $r->header_out(Location => $furl);
-	  return REDIRECT;
+          if ($reinitcheck eq 'update') {
+              &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+              $r->print(&reinited_js($furl,$env{'request.course.id'},100));
+              $r->print(&Apache::loncommon::end_page());
+              return OK;
+          } else {
+	      &Apache::loncommon::content_type($r,'text/html');
+	      $r->header_out(Location => $furl);
+	      return REDIRECT;
+          }
       }
       if ($direction eq 'return') { 
 # -------------------------------------------------------- Return to last known
@@ -412,8 +484,11 @@ 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;
+                } elsif ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)(?:|\#([^\#]+))$}) {
+                    my ($url,$anchor) = ($1,$2);
+                    if ($anchor) {
+                        $newloc = $url.(($url=~/\?/)?'&':'?').'symb='.&escape($last);
+                    }
                 }
 	    } else {
 		$newloc='/adm/navmaps';
@@ -427,9 +502,15 @@ sub handler {
          } else {
              $newloc=&Apache::lonnet::absolute_url().$newloc
          }
-	 &Apache::loncommon::content_type($r,'text/html');
-	 $r->header_out(Location => $newloc);
-	 return REDIRECT;
+         if ($reinitcheck eq 'update') {
+             $r->print(&reinited_js($newloc,$env{'request.course.id'},100));
+             $r->print(&Apache::loncommon::end_page());
+             return OK;
+         } else {
+	     &Apache::loncommon::content_type($r,'text/html');
+	     $r->header_out(Location => $newloc);
+	     return REDIRECT;
+         }
       }
 #
 # Is the current URL on the map? If not, start with last known URL
@@ -447,11 +528,18 @@ sub handler {
          if ($last) {
 	     $currenturl=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($last))[2]);
 	 } else {
-	     &Apache::loncommon::content_type($r,'text/html');
-	     $r->header_out(Location => 
-			    &Apache::lonnet::absolute_url().
-			    '/adm/navmaps');
-	     return REDIRECT;
+             my $newloc = &Apache::lonnet::absolute_url().
+                          '/adm/navmaps'; 
+             if ($reinitcheck eq 'update') {
+                 &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+                 $r->print(&reinited_js($newloc,$env{'request.course.id'},100));
+                 $r->print(&Apache::loncommon::end_page());
+                 return OK;
+             } else {
+	         &Apache::loncommon::content_type($r,'text/html');
+	         $r->header_out(Location => $newloc); 
+	         return REDIRECT;
+             }
          }
       }
 # ------------------------------------------- Do we have any idea where we are?
@@ -509,6 +597,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);
@@ -530,7 +621,7 @@ sub handler {
                      &Apache::lonnet::linklog($redirecturl,$currenturl);
 		  }
 # ------------------------------------- Check for and display critical messages
-                  my ($redirect, $url) = &Apache::loncommon::critical_redirect(300);
+                  my ($redirect, $url) = &Apache::loncommon::critical_redirect(300,'flip');
                   unless ($redirect) {
                       my $usehttp = &check_http_req(\$redirecturl);
                       if (($usehttp) && ($hostname ne '')) {
@@ -548,14 +639,26 @@ sub handler {
                           $url .= $anchor;
                       }
                   }
-                  &Apache::loncommon::content_type($r,'text/html');
-                  $r->header_out(Location => $url);
-                  return REDIRECT;
+                  if ($reinitcheck eq 'update') {
+                      &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+                      $r->print(&reinited_js($url,$env{'request.course.id'},100)); 
+                      $r->print(&Apache::loncommon::end_page());
+                      return OK;
+                  } else {
+                      &Apache::loncommon::content_type($r,'text/html');
+                      $r->header_out(Location => $url);
+                      return REDIRECT;
+                  }
 	      } else {
 # --------------------------------------------------------- There was a problem
                   &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',
@@ -623,17 +726,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>'
@@ -653,12 +768,23 @@ ENDSTART
 	      }
 	  } else {
 # ------------------------------------------------- Problem, could not tie hash
+              if ($reinitcheck eq 'update') {
+                  &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+                  $r->print(&Apache::loncommon::end_page());
+              } 
               $env{'user.error.msg'}="/adm/flip:bre:0:1:Course Data Missing";
               return HTTP_NOT_ACCEPTABLE; 
           }
       } else {
 # ---------------------------------------- No, could not determine where we are
-	  $r->internal_redirect('/adm/ambiguous');
+          my $newloc = '/adm/ambiguous';
+          if ($reinitcheck eq 'update') {
+              &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+              $r->print(&reinited_js($newloc,$env{'request.course.id'},100));
+              $r->print(&Apache::loncommon::end_page());
+          } else {
+	      $r->internal_redirect($newloc);
+          }
           return OK;
       }
   } else {