--- rat/lonpageflip.pm 2009/04/23 17:31:25 1.79 +++ rat/lonpageflip.pm 2010/12/30 21:15:40 1.79.6.1 @@ -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.79.6.1 2010/12/30 21:15:40 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -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,8 +326,8 @@ sub handler { untie %hash; } else { $newloc='/adm/navmaps'; - } - if ($newloc eq '/adm/navmaps' && $direction eq 'navlaunch') { + } + if (($newloc =~ m{^/adm/navmaps}) && ($direction eq 'navlaunch')) { &navlaunch($r); return OK; } else { @@ -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});