--- rat/lonpageflip.pm 2008/11/20 13:11:43 1.76
+++ rat/lonpageflip.pm 2013/05/10 12:49:39 1.81
@@ -2,7 +2,7 @@
#
# Page flip handler
#
-# $Id: lonpageflip.pm,v 1.76 2008/11/20 13:11:43 jms Exp $
+# $Id: lonpageflip.pm,v 1.81 2013/05/10 12:49:39 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -27,46 +27,6 @@
# http://www.lon-capa.org/
#
-=pod
-
-=head1 NAME
-
-Apache::lonpageflip
-
-=head1 SYNOPSIS
-
-Deals with forward, backward, and other page flips.
-
-This is part of the LearningOnline Network with CAPA project
-described at http://www.lon-capa.org.
-
-=head1 OVERVIEW
-
-(empty)
-
-=head1 SUBROUTINES
-
-=over cleanup()
-
-=item addrid()
-
-=item fullmove()
-
-=item hash_src()
-
-=item move()
-
-=item get_next_possible_move()
-
-=item navlaunch()
-
-=item first_accessible_resource()
-
-=item handler()
-
-=back
-
-=cut
package Apache::lonpageflip;
@@ -257,26 +217,6 @@ sub get_next_possible_move {
return ($next,$mapurl);
}
-sub navlaunch {
- my ($r)=@_;
- &Apache::loncommon::content_type($r,'text/html');
- &Apache::loncommon::no_cache($r);
- $r->send_http_header;
- $r->print(&Apache::loncommon::start_page('Launched'));
- $r->print(<
Collapse external navigation window
-ENDNAV - $r->print(&Apache::loncommon::end_page()); -} - sub first_accessible_resource { my $furl; if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'.db', @@ -342,7 +282,7 @@ sub handler { return REDIRECT; } - if ($direction eq 'return' || $direction eq 'navlaunch') { + if ($direction eq 'return') { # -------------------------------------------------------- Return to last known my $last; if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db', @@ -366,18 +306,13 @@ sub handler { } else { $newloc='/adm/navmaps'; } - if ($newloc eq '/adm/navmaps' && $direction eq 'navlaunch') { - &navlaunch($r); - return OK; - } else { &Apache::loncommon::content_type($r,'text/html'); $r->header_out(Location => &Apache::lonnet::absolute_url().$newloc); return REDIRECT; - } } - $currenturl=~s/^http\:\/\///; + $currenturl=~s/^https?\:\/\///; $currenturl=~s/^[^\/]+//; # # Is the current URL on the map? If not, start with last known URL @@ -392,16 +327,11 @@ sub handler { if ($last) { $currenturl=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($last))[2]); } else { - if ($direction eq 'return') { &Apache::loncommon::content_type($r,'text/html'); $r->header_out(Location => &Apache::lonnet::absolute_url(). '/adm/noidea.html'); return REDIRECT; - } else { - &navlaunch($r); - return OK; - } } } # ------------------------------------------- Do we have any idea where we are? @@ -518,7 +448,7 @@ $start_page$lt{'pick'}:
-
$lt{'titleheader'} | $lt{'type'} |
---|