--- rat/lonpageflip.pm	2005/08/31 07:38:29	1.56
+++ rat/lonpageflip.pm	2006/01/09 18:39:31	1.61
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.56 2005/08/31 07:38:29 albertel Exp $
+# $Id: lonpageflip.pm,v 1.61 2006/01/09 18:39:31 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -96,25 +96,25 @@ sub move {
                   while ($hash{'type_'.$rid} eq 'finish') {
 	             $rid=$hash{'ids_'.$hash{'map_id_'.(split(/\./,$rid))[0]}};
                   }
-                  map {
-                      my $thiscond=
-      &Apache::lonnet::directcondval($hash{'condid_'.$hash{'undercond_'.$_}});
+		  foreach my $id (split(/\,/,$hash{'to_'.$rid})) {
+		      my $thiscond=
+      &Apache::lonnet::directcondval($hash{'condid_'.$hash{'undercond_'.$id}});
                       if ($thiscond>=$mincond) {
 		          if ($posnext) {
-		             $posnext.=','.$_.':'.$thiscond;
+		             $posnext.=','.$id.':'.$thiscond;
                           } else {
-                             $posnext=$_.':'.$thiscond;
+                             $posnext=$id.':'.$thiscond;
 		          }
                           if ($thiscond>$mincond) { $mincond=$thiscond; }
 	              }
-                  } split(/\,/,$hash{'to_'.$rid});
-                  map {
-                      my ($linkid,$condval)=split(/\:/,$_);
+                  } 
+		  foreach my $id (split(/\,/,$posnext))  {
+                      my ($linkid,$condval)=split(/\:/,$id);
                       if ($condval>=$mincond) {
 		          $next=&addrid($next,$hash{'goesto_'.$linkid},
                                 $hash{'condid_'.$hash{'undercond_'.$linkid}});
                       }
-                  } split(/\,/,$posnext);
+                  }
                   if ($hash{'is_map_'.$next}) {
 # This jumps to the beginning of a new map (going down level)
                       if (
@@ -130,7 +130,7 @@ sub move {
                     ((split(/\./,$startoutrid))[0]!=(split(/\./,$next))[0]) {
 # This comes up from a map (coming up one level);
 		      $mapurl=$hash{'map_id_'.(split(/\./,$next))[0]};
-                  }
+		  }
               } elsif ($direction eq 'back') {
 # ------------------------------------------------------------------- Backwards
                  while ($hash{'type_'.$rid} eq 'start') {
@@ -256,13 +256,13 @@ sub handler {
 		if ($hash{'encrypted_'.$id}) { $newloc=&Apache::lonenc::encrypted($newloc); }
 			      
 	    } else {
-		$newloc='/adm/noidea.html';
+		$newloc='/adm/navmaps';
 	    }
             untie %hash;
          } else {
-	    $newloc='/adm/noidea.html';
+	    $newloc='/adm/navmaps';
          }  
-	 if ($newloc eq '/adm/noidea.html' && $direction eq 'navlaunch') {
+	 if ($newloc eq '/adm/navmaps' && $direction eq 'navlaunch') {
 	     &navlaunch($r);
 	     return OK;
 	 } else {
@@ -394,25 +394,36 @@ sub handler {
 
 		  &Apache::loncommon::content_type($r,'text/html');
 		  my $url='http://'.$ENV{'HTTP_HOST'}.$redirecturl;
-		  if ($redirectsymb ne '') { $url.='?symb='.$redirectsymb; }
+		  if ($redirectsymb ne '') { $url.='?symb='.&Apache::lonnet::escape($redirectsymb); }
                   $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',
+						     'explain' =>
+						     'You have reached the end of the sequence of materials.',
+						     'back' => 'Go Back',
+						     'nav' => 'Navigate Course Content',
+						     'wherenext' =>
+						     'There are several possibilities of where to go next',
+						     'pick' =>
+						     'Please click on the the resource you intend to access',
+						     'titleheader' => 'Title',
+						     'type' => 'Type');
                   if ($#possibilities>0) {
 		      my $bodytag=
                              &Apache::loncommon::bodytag('Multiple Resources');
                      $r->print(<<ENDSTART);
 <head><title>Choose Next Location</title></head>
 $bodytag
-<h3>There are several possibilities of where to go next</h3>
+<h3>$lt{'wherenext'}</h3>
 <p>
-Please click on the the resource you intend to access:
+$lt{'pick'}:
 <p>
 <table border=2>
-<tr><th>Title</th><th>Type</th></tr>
+<tr><th>$lt{'titleheader'}</th><th>$lt{'type'}</th></tr>
 ENDSTART
                      foreach (@possibilities) {
                         $r->print(
@@ -423,26 +434,24 @@ ENDSTART
                               '</a></td><td>'.$multichoicehash{'type_'.$_}.
 			      '</td></tr>');
                      }
-                     $r->print('</table></body></html>');
-		     return OK;
+                     $r->print('</table>');
                   } else {
 		      my $bodytag=&Apache::loncommon::bodytag('No Resource');
-                     $r->print(<<ENDNONE);
+		      $r->print(<<ENDNONE);
 <head><title>No Resource</title></head>
 $bodytag
-<h3>Next resource could not be identified.</h3>
-<p>You probably are at the <b>beginning</b> or the <b>end</b> of the 
-course.</p>
-<ul>
-<li><a href="/adm/flip?postdata=return:">Go Back</a></li>
-<li><a href="/adm/navmaps">Navigate Course Content</a></li>
-</ul>
-</body>
-</html>
+<h3>$lt{'title'}</h3>
+<p>$lt{'explain'}</p>
 ENDNONE
-                     return OK;
-	         }
-	     }
+		  }
+		  $r->print(<<ENDMENU);
+<ul>
+<li><a href="/adm/flip?postdata=return:">$lt{'back'}</a></li>
+<li><a href="/adm/navmaps">$lt{'nav'}</a></li>
+</ul></body></html>
+ENDMENU
+                  return OK;
+	      }
 	  } else {
 # ------------------------------------------------- Problem, could not tie hash
               $env{'user.error.msg'}="/adm/flip:bre:0:1:Course Data Missing";
@@ -450,9 +459,6 @@ ENDNONE
           }
       } else {
 # ---------------------------------------- No, could not determine where we are
-	  if ( &Apache::lonnet::mod_perl_version() == 2 ) {
-	      &Apache::lonnet::cleanenv();
-	  }
 	  $r->internal_redirect('/adm/ambiguous');
       }
   } else {