--- rat/lonpageflip.pm	2021/12/14 21:34:45	1.80.8.13
+++ rat/lonpageflip.pm	2015/03/14 22:26:50	1.88
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.80.8.13 2021/12/14 21:34:45 raeburn Exp $
+# $Id: lonpageflip.pm,v 1.88 2015/03/14 22:26:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -83,18 +83,11 @@ 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),
-                $hash{'encrypted_'.$id},$anchor);
+		&Apache::lonenc::encrypted($symb));
     }
-    return ($hash{'src_'.$id},$symb,$hash{'encrypted_'.$id},$anchor);
+    return ($hash{'src_'.$id},$symb);
 }
 
 sub move {
@@ -231,13 +224,9 @@ sub first_accessible_resource {
     if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'.db',
 	    &GDBM_READER(),0640)) {
 	$furl=$hash{'first_url'};
-	my (%args,$url,$argstr);
-	if ($furl =~ m{^/enc/}) {
-	    ($url,$argstr) = split(/\?/,&Apache::lonenc::unencrypted($furl));
-	} else {
-	    ($url,$argstr) = split(/\?/,$furl);
-	}
-	foreach my $pair (split(/\&/,$argstr)) {
+	my %args;
+	my ($url,$args) = split(/\?/,$furl);
+	foreach my $pair (split(/\&/,$args)) {
 	    my ($name,$value) = split(/=/,$pair);
 	    $args{&unescape($name)} = &unescape($value);
 	}
@@ -245,17 +234,13 @@ sub first_accessible_resource {
 # Wow, we cannot see this ... move forward to the next one that we can see
 	    my ($newrid,$newmap)=&move($hash{'first_rid'},$hash{'first_mapurl'},'forward');
 # Build the new URL
-            if ($newrid eq '') {
-                $furl = '/adm/navmaps';
-            } else {
-	        my ($newmapid,$newresid)=split(/\./,$newrid);
-	        my $symb=&Apache::lonnet::encode_symb($newmap,$newresid,$hash{'src_'.$newrid});
-	        $furl=&add_get_param($hash{'src_'.$newrid},{ 'symb' => $symb });
-	        if ($hash{'encrypted_'.$newrid}) {
-		    $furl=&Apache::lonenc::encrypted($furl);
-	        }
+	    my ($newmapid,$newresid)=split(/\./,$newrid);
+	    my $symb=&Apache::lonnet::encode_symb($newmap,$newresid,$hash{'src_'.$newrid});
+	    $furl=&add_get_param($hash{'src_'.$newrid},{ 'symb' => $symb });
+	    if ($hash{'encrypted_'.$newrid}) {
+		$furl=&Apache::lonenc::encrypted($furl);
 	    }
-        }
+	}
 	untie(%hash);
 	return $furl;
     } else {
@@ -263,56 +248,6 @@ sub first_accessible_resource {
     }
 }
 
-sub check_http_req {
-    my ($srcref,$hostname) = @_;
-    return unless (ref($srcref) eq 'SCALAR');
-    my $usehttp;
-    if ($env{'request.course.id'}) {
-        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        if (($$srcref =~ m{^\Q/public/$cdom/$cnum/syllabus\E($|\?)}) &&
-            ($ENV{'SERVER_PORT'} == 443) &&
-            ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
-            unless ((&Apache::lonnet::uses_sts()) ||
-                    (&Apache::lonnet::waf_allssl($hostname))) {
-                $$srcref .= (($$srcref =~/\?/)? '&':'?') . 'usehttp=1';
-                $usehttp = 1;
-            }
-        } elsif (($$srcref =~ m{^\Q/adm/wrapper/ext/\E(?!https:)}) &&
-                 ($ENV{'SERVER_PORT'} == 443)) {
-            unless ((&Apache::lonnet::uses_sts()) ||
-                    (&Apache::lonnet::waf_allssl($hostname))) {
-                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 {
@@ -329,173 +264,102 @@ sub handler {
   my %cachehash=(); 
   my $multichoice=0;
   my %multichoicehash=();
-  my %prog_state=(); 
-  my ($redirecturl,$redirectsymb,$enc,$anchor);
+  my ($redirecturl,$redirectsymb);
   my $next='';
-  my $hostname = $r->hostname();
   my @possibilities=();
    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['postdata']);
   if (($env{'form.postdata'})&&($env{'request.course.fn'})) {
       my ($direction,$currenturl) = ($env{'form.postdata'}=~/(\w+)\:(.*)/);
-      if ($currenturl=~m|^/enc/|) {
-          $currenturl=&Apache::lonenc::unencrypted($currenturl);
-      }
-      $currenturl=~s/\.\d+\.(\w+)$/\.$1/;
-      $currenturl=~s/^https?\:\/\///;
-      $currenturl=~s/^[^\/]+//;
-      my ($preupdatepos,$last,$reinitcheck);
-      if ($direction eq 'return') {
-          if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
-                    &GDBM_READER(),0640)) {
-              $last=$hash{'last_known'};
-              untie(%hash);
-          }
-      }
+
       if ($env{'request.course.id'}) {
           # Check if course needs to be re-initialized
           my $loncaparev = $r->dir_config('lonVersion');
-          ($reinitcheck,my @reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
-          if ($reinitcheck eq 'switch') {
+          my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
+          if ($result eq 'switch') {
               &Apache::loncommon::content_type($r,'text/html');
               $r->send_http_header;
               $r->print(&Apache::loncommon::check_release_result(@reinit));
               return OK;
-          } elsif ($reinitcheck eq 'update') {
+          } elsif ($result eq 'update') {
               my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
               my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-              $preupdatepos = &Apache::lonnet::symbread($currenturl);
-              unless ($direction eq 'return') {
-                  if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
-                                &GDBM_READER(),0640)) {
-                      $last=$hash{'last_known'};
-                      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;
                   return HTTP_NOT_ACCEPTABLE;
-              } else {
-                  if ($last) {
-                      my ($murl,$id,$fn)=&Apache::lonnet::decode_symb($last);
-                      unless (&Apache::lonnet::symbverify($last,$fn)) {
-                          undef($last);
-                      }
-                  }
               }
           }
       }
+
+      if ($currenturl=~m|^/enc/|) {
+	  $currenturl=&Apache::lonenc::unencrypted($currenturl);
+      }
+      $currenturl=~s/\.\d+\.(\w+)$/\.$1/;
       if ($direction eq 'firstres') {
 	  my $furl=&first_accessible_resource();
-          my $usehttp = &check_http_req(\$furl,$hostname);
-          if (($usehttp) && ($hostname ne '')) {
-              $furl='http://'.$hostname.$furl;
-          } else {
-              $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;
-          }
+	  &Apache::loncommon::content_type($r,'text/html');
+	  $r->header_out(Location => 
+			 &Apache::lonnet::absolute_url().$furl);
+	     
+	  return REDIRECT;
       }
       if ($direction eq 'return') {
 # -------------------------------------------------------- Return to last known
-         my ($newloc,$usehttp);
+         my $last;
+         if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
+                    &GDBM_READER(),0640)) {
+	     $last=$hash{'last_known'};
+             untie(%hash);
+         }
+         my $newloc;
          if (($last) && (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'.db',
                         &GDBM_READER(),0640))) {
             my ($murl,$id,$fn)=&Apache::lonnet::decode_symb($last);
 	    $id=$hash{'map_pc_'.&Apache::lonnet::clutter($murl)}.'.'.$id;
 	    $newloc=$hash{'src_'.$id};
 	    if ($newloc) {
-                $usehttp = &check_http_req(\$newloc,$hostname);
-                if ($hash{'encrypted_'.$id}) {
-                    $newloc=&Apache::lonenc::encrypted($newloc);
-                }
-                if ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)(?:|(\#[^\#]+))$}) {
-                    my ($url,$anchor) = ($1,$2);
-                    if ($anchor) {
-                        $newloc = $url.(($url=~/\?/)?'&':'?').'symb='.&escape($last).$anchor;
-                    }
-                }
+		if ($hash{'encrypted_'.$id}) { $newloc=&Apache::lonenc::encrypted($newloc); }
+			      
 	    } else {
 		$newloc='/adm/navmaps';
 	    }
             untie %hash;
          } else {
 	    $newloc='/adm/navmaps';
-         }
-         if (($usehttp) && ($hostname ne '')) {
-             $newloc='http://'.$hostname.$newloc;
-         } else {
-             $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;
-         }
+         }  
+	     &Apache::loncommon::content_type($r,'text/html');
+	     $r->header_out(Location => 
+			    &Apache::lonnet::absolute_url().$newloc);
+	     
+	     return REDIRECT;
       }
+      $currenturl=~s/^https?\:\/\///;
+      $currenturl=~s/^[^\/]+//;
 #
 # Is the current URL on the map? If not, start with last known URL
 #
-
       unless (&Apache::lonnet::is_on_map($currenturl)) {
-         if ($preupdatepos) {
-             undef($preupdatepos);
-         } elsif (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
-                            &GDBM_READER(),0640)) {
-             $last=$hash{'last_known'};
+	 my $last;
+         if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
+                    &GDBM_READER(),0640)) {
+	     $last=$hash{'last_known'};
              untie(%hash);
          }
          if ($last) {
 	     $currenturl=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($last))[2]);
 	 } else {
-             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;
-             }
+		 &Apache::loncommon::content_type($r,'text/html');
+		 $r->header_out(Location => 
+				&Apache::lonnet::absolute_url().
+				'/adm/noidea.html');
+		 return REDIRECT;
          }
       }
 # ------------------------------------------- Do we have any idea where we are?
       my $position;
-      if ($preupdatepos) {
-          $position = $preupdatepos;
-      } else {
-          $position=Apache::lonnet::symbread($currenturl);
-      }
-      if ($position) {
+      if ($position=Apache::lonnet::symbread($currenturl)) {
 # ------------------------------------------------------------------------- Yes
 	  my ($startoutmap,$mapnum,$thisurl)=&Apache::lonnet::decode_symb($position);
           $cachehash{$startoutmap}{$thisurl}=[$thisurl,$mapnum];
@@ -518,7 +382,7 @@ sub handler {
                   @possibilities=split(/\,/,$next);
                   if ($#possibilities==0) {
 # ---------------------------------------------- Only one possibility, redirect
-	              ($redirecturl,$redirectsymb,$enc,$anchor)=&hash_src($next);
+	              ($redirecturl,$redirectsymb)=&hash_src($next);
                       $cachehash{$endupmap}{$redirecturl}=
 			  [$redirecturl,(split(/\./,$next))[1]];
                   } else {
@@ -565,33 +429,13 @@ sub handler {
 		  }
 # ------------------------------------- Check for and display critical messages
                   my ($redirect, $url) = &Apache::loncommon::critical_redirect(300);
-                  unless ($redirect) {
-                      my $usehttp = &check_http_req(\$redirecturl,$hostname);
-                      if (($usehttp) && ($hostname ne '')) {
-                          $url='http://'.$hostname.$redirecturl;
-                      } else {
-                          $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;
+                  unless ($redirect) { 
+                      $url=&Apache::lonnet::absolute_url().$redirecturl;
+		      $url = &add_get_param($url, { 'symb' => $redirectsymb});
                   }
+		  &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');
@@ -606,10 +450,7 @@ sub handler {
 						     'pick' =>
 						     'Please click on the the resource you intend to access',
 						     'titleheader' => 'Title',
-						     'type' => 'Type',
-                                                     'update' => 'Content updated',
-                                                     'expupdate' => 'As a result of a recent update to the sequence of materials, it is not possible to complete the page flip.',
-                                                     'gonav' => 'Go to the Contents page to select a resource to display.');
+						     'type' => 'Type');
                   if (&Apache::loncommon::course_type() eq 'Community') {
                       $lt{'nav'} = &mt('Community Contents');
                   }
@@ -626,14 +467,9 @@ $lt{'pick'}:
 <tr><th>$lt{'titleheader'}</th><th>$lt{'type'}</th></tr>
 ENDSTART
                      foreach my $id (@possibilities) {
-                        my $src = $multichoicehash{'src_'.$id};
-                        my $usehttp = &check_http_req(\$src,$hostname);
-                        if (($usehttp) && ($hostname ne '')) {
-                            $src = 'http://'.$hostname.$src;
-                        }
                         $r->print(
                               '<tr><td><a href="'.
-				  &add_get_param($src,
+				  &add_get_param($multichoicehash{'src_'.$id},
 						 {'symb' =>
 						      $multichoicehash{'symb_'.$id},
 						  }).'">'.
@@ -643,59 +479,27 @@ ENDSTART
                      }
                      $r->print('</table>');
                   } else {
-                      if ($reinitcheck) {
-                          if (&Apache::loncommon::course_type() eq 'Community') {
-                              $r->print(
-                                  &Apache::loncommon::start_page('Community Contents Updated'));
-                          } else { 
-                              $r->print(
-                                  &Apache::loncommon::start_page('Course Contents Updated'));
-                          }
-                          $r->print('<h2>'.$lt{'update'}.'</h2>'
-                                  .'<p>'.$lt{'expupdate'}.'<br />'
-                                  .$lt{'gonav'}.'</p>');
-                      } else {
-                          $r->print(
-                              &Apache::loncommon::start_page('No Resource')
-                             .'<h2>'.$lt{'title'}.'</h2>'
-                             .'<p>'.$lt{'explain'}.'</p>');
-                      }
-		  }
-                  if ((!@possibilities) && ($reinitcheck))  {
                       $r->print(
-                          &Apache::lonhtmlcommon::actionbox(
-                              ['<a href="/adm/navmaps">'.$lt{'nav'}.'</a></li>'
-                              ]));
-                  } else {
-                      $r->print(
-                          &Apache::lonhtmlcommon::actionbox(
-                              ['<a href="/adm/flip?postdata=return:">'.$lt{'back'}.'</a></li>',
-                               '<a href="/adm/navmaps">'.$lt{'nav'}.'</a></li>'
-                              ]));
+                          &Apache::loncommon::start_page('No Resource')
+                         .'<h2>'.$lt{'title'}.'</h2>'
+                         .'<p>'.$lt{'explain'}.'</p>');
                   }
-                  $r->print(&Apache::loncommon::end_page());
-      
+                  $r->print(
+                      &Apache::lonhtmlcommon::actionbox(
+                          ['<a href="/adm/flip?postdata=return:">'.$lt{'back'}.'</a></li>',
+                           '<a href="/adm/navmaps">'.$lt{'nav'}.'</a></li>'
+                          ])
+                     .&Apache::loncommon::end_page());
                   return OK;
 	      }
 	  } 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
-          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);
-          }
+	  $r->internal_redirect('/adm/ambiguous');
           return OK;
       }
   } else {