--- rat/lonpageflip.pm 2010/12/30 21:15:40 1.79.6.1
+++ 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.6.1 2010/12/30 21:15:40 raeburn 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
@@ -327,16 +327,16 @@ sub handler {
} else {
$newloc='/adm/navmaps';
}
- if (($newloc =~ m{^/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/^[^\/]+//;
@@ -353,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?
@@ -525,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