--- rat/lonpageflip.pm	2015/03/23 12:49:10	1.80.8.8
+++ rat/lonpageflip.pm	2018/09/10 19:17:39	1.80.8.10
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.80.8.8 2015/03/23 12:49:10 raeburn Exp $
+# $Id: lonpageflip.pm,v 1.80.8.10 2018/09/10 19:17:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -83,11 +83,18 @@ sub hash_src {
     my ($mapid,$resid)=split(/\./,$id);
     my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},
 					  $resid,$hash{'src_'.$id});
+    my $anchor;
+    if ($hash{'ext_'.$id} eq 'true:') {
+        if ($hash{'src_'.$id} =~ /(\#.+)$/) {
+            $anchor = $1;
+        }
+    }
     if ($hash{'encrypted_'.$id}) {
 	return (&Apache::lonenc::encrypted($hash{'src_'.$id}),
-		&Apache::lonenc::encrypted($symb));
+		&Apache::lonenc::encrypted($symb),
+                $hash{'encrypted_'.$id},$anchor);
     }
-    return ($hash{'src_'.$id},$symb);
+    return ($hash{'src_'.$id},$symb,$hash{'encrypted_'.$id},$anchor);
 }
 
 sub move {
@@ -248,6 +255,28 @@ sub first_accessible_resource {
     }
 }
 
+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 {
@@ -264,7 +293,8 @@ sub handler {
   my %cachehash=(); 
   my $multichoice=0;
   my %multichoicehash=();
-  my ($redirecturl,$redirectsymb);
+  my %prog_state=(); 
+  my ($redirecturl,$redirectsymb,$enc,$anchor);
   my $next='';
   my @possibilities=();
    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['postdata']);
@@ -304,8 +334,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;
@@ -322,11 +364,17 @@ sub handler {
       }
       if ($direction eq 'firstres') {
 	  my $furl=&first_accessible_resource();
-	  &Apache::loncommon::content_type($r,'text/html');
-	  $r->header_out(Location => 
-			 &Apache::lonnet::absolute_url().$furl);
-	     
-	  return REDIRECT;
+          $furl=&Apache::lonnet::absolute_url().$furl;
+          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
@@ -345,11 +393,16 @@ sub handler {
          } else {
 	    $newloc='/adm/navmaps';
          }
-	 &Apache::loncommon::content_type($r,'text/html');
-	 $r->header_out(Location => 
-			&Apache::lonnet::absolute_url().$newloc);
-	     
-	 return REDIRECT;
+         $newloc=&Apache::lonnet::absolute_url().$newloc;
+         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
@@ -363,15 +416,21 @@ sub handler {
              $last=$hash{'last_known'};
              untie(%hash);
          }
-         my $newloc;
          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?
@@ -404,7 +463,7 @@ sub handler {
                   @possibilities=split(/\,/,$next);
                   if ($#possibilities==0) {
 # ---------------------------------------------- Only one possibility, redirect
-	              ($redirecturl,$redirectsymb)=&hash_src($next);
+	              ($redirecturl,$redirectsymb,$enc,$anchor)=&hash_src($next);
                       $cachehash{$endupmap}{$redirecturl}=
 			  [$redirecturl,(split(/\./,$next))[1]];
                   } else {
@@ -453,11 +512,26 @@ sub handler {
                   my ($redirect, $url) = &Apache::loncommon::critical_redirect(300);
                   unless ($redirect) {
                       $url=&Apache::lonnet::absolute_url().$redirecturl;
+                      my $addanchor;
+                      if (($anchor ne '') && (!$enc || $env{'request.role.adv'})) {
+                          $addanchor = 1;
+                          $url =~ s/\#.+$//;
+                      }
                       $url = &add_get_param($url, { 'symb' => $redirectsymb});
+                      if ($addanchor) {
+                          $url .= $anchor;
+                      }
+                  }
+                  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;
                   }
-                  &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');
@@ -540,12 +614,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 {