--- rat/lonpageflip.pm 2009/04/23 17:31:25 1.79
+++ rat/lonpageflip.pm 2013/05/10 23:24:19 1.80.8.2
@@ -2,7 +2,7 @@
#
# Page flip handler
#
-# $Id: lonpageflip.pm,v 1.79 2009/04/23 17:31:25 bisitz Exp $
+# $Id: lonpageflip.pm,v 1.80.8.2 2013/05/10 23:24:19 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -222,15 +222,15 @@ sub navlaunch {
&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(&Apache::loncommon::start_page('Launched'));
$r->print(<Goto first resource
Collapse external navigation window
ENDNAV
@@ -248,7 +248,8 @@ sub first_accessible_resource {
my ($name,$value) = split(/=/,$pair);
$args{&unescape($name)} = &unescape($value);
}
- if (!&Apache::lonnet::allowed('bre',$url,$args{'symb'})) {
+ if ((($env{'environment.remotenavmap'} eq 'on') && ($furl =~ m{^/adm/navmaps})) ||
+ (!&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
@@ -325,17 +326,17 @@ sub handler {
untie %hash;
} else {
$newloc='/adm/navmaps';
- }
- if ($newloc eq '/adm/navmaps' && $direction eq 'navlaunch') {
- &navlaunch($r);
- return OK;
- } else {
+ }
+ 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);
return REDIRECT;
- }
+ }
}
$currenturl=~s/^https?\:\/\///;
$currenturl=~s/^[^\/]+//;
@@ -352,16 +353,16 @@ sub handler {
if ($last) {
$currenturl=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($last))[2]);
} else {
- if ($direction eq 'return') {
+ 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;
- }
+ } else {
+ &navlaunch($r);
+ return OK;
+ }
}
}
# ------------------------------------------- Do we have any idea where we are?
@@ -449,6 +450,11 @@ sub handler {
&Apache::lonnet::appenv({'user.criticalcheck.time'=>time});
}
+ if (($redirecturl =~ m{^/adm/navmaps}) &&
+ ($env{'environment.remotenavmap'} eq 'on')) {
+ &navlaunch($r);
+ return OK;
+ }
&Apache::loncommon::content_type($r,'text/html');
my $url=&Apache::lonnet::absolute_url().$redirecturl;
$url = &add_get_param($url, { 'symb' => $redirectsymb});
@@ -519,6 +525,7 @@ ENDMENU
} else {
# ---------------------------------------- No, could not determine where we are
$r->internal_redirect('/adm/ambiguous');
+ return OK;
}
} else {
# -------------------------- Class was not initialized or page fliped strangely