--- rat/lonpageflip.pm 2014/06/26 18:21:24 1.80.8.5
+++ rat/lonpageflip.pm 2014/06/26 18:28:25 1.80.8.6
@@ -2,7 +2,7 @@
#
# Page flip handler
#
-# $Id: lonpageflip.pm,v 1.80.8.5 2014/06/26 18:21:24 raeburn Exp $
+# $Id: lonpageflip.pm,v 1.80.8.6 2014/06/26 18:28:25 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -218,26 +218,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(<Goto first resource
-
- 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',
@@ -249,8 +229,7 @@ sub first_accessible_resource {
my ($name,$value) = split(/=/,$pair);
$args{&unescape($name)} = &unescape($value);
}
- if ((($env{'environment.remotenavmap'} eq 'on') && ($furl =~ m{^/adm/navmaps})) ||
- (!&Apache::lonnet::allowed('bre',$url,$args{'symb'}))) {
+ if (!&Apache::lonnet::allowed('bre',$url,$args{'symb'})) {
# 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
@@ -304,7 +283,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',
@@ -328,16 +307,11 @@ sub handler {
} else {
$newloc='/adm/navmaps';
}
- if (($newloc =~ m{^/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);
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->header_out(Location =>
+ &Apache::lonnet::absolute_url().$newloc);
- return REDIRECT;
- }
+ return REDIRECT;
}
$currenturl=~s/^https?\:\/\///;
$currenturl=~s/^[^\/]+//;
@@ -354,16 +328,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;
- }
+ &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?
@@ -552,8 +521,6 @@ described at http://www.lon-capa.org.
=item get_next_possible_move()
-=item navlaunch()
-
=item first_accessible_resource()
=item handler()