--- rat/lonpageflip.pm 2015/03/14 22:29:25 1.80.8.7 +++ rat/lonpageflip.pm 2014/12/11 13:16:49 1.86 @@ -2,7 +2,7 @@ # # Page flip handler # -# $Id: lonpageflip.pm,v 1.80.8.7 2015/03/14 22:29:25 raeburn Exp $ +# $Id: lonpageflip.pm,v 1.86 2014/12/11 13:16:49 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,7 +36,6 @@ use LONCAPA; use Apache::Constants qw(:common :http REDIRECT); use Apache::lonnet; use Apache::loncommon(); -use Apache::lonuserstate; use Apache::lonlocal; use HTML::TokeParser; use GDBM_File; @@ -269,30 +268,9 @@ sub handler { my @possibilities=(); &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['postdata']); if (($env{'form.postdata'})&&($env{'request.course.fn'})) { - my ($direction,$currenturl) = ($env{'form.postdata'}=~/(\w+)\:(.*)/); - - if ($env{'request.course.id'}) { - # Check if course needs to be re-initialized - my $loncaparev = $r->dir_config('lonVersion'); - my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev); - if ($result eq 'switch') { - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - $r->print(&Apache::loncommon::check_release_result(@reinit)); - return OK; - } elsif ($result eq 'update') { - my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum"); - if ($ferr) { - my $requrl = $r->uri; - $env{'user.error.msg'}="$requrl:bre:0:0:Course not initialized"; - $env{'user.reinit'} = 1; - return HTTP_NOT_ACCEPTABLE; - } - } - } - + $env{'form.postdata'}=~/(\w+)\:(.*)/; + my $direction=$1; + my $currenturl=$2; if ($currenturl=~m|^/enc/|) { $currenturl=&Apache::lonenc::unencrypted($currenturl); } @@ -305,7 +283,7 @@ sub handler { return REDIRECT; } - if ($direction eq 'return') { + if ($direction eq 'return') { # -------------------------------------------------------- Return to last known my $last; if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db', @@ -328,12 +306,12 @@ sub handler { untie %hash; } else { $newloc='/adm/navmaps'; - } - &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/^[^\/]+//; @@ -350,11 +328,11 @@ sub handler { if ($last) { $currenturl=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($last))[2]); } else { - &Apache::loncommon::content_type($r,'text/html'); - $r->header_out(Location => - &Apache::lonnet::absolute_url(). - '/adm/noidea.html'); - return REDIRECT; + &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? @@ -429,11 +407,11 @@ sub handler { } # ------------------------------------- Check for and display critical messages my ($redirect, $url) = &Apache::loncommon::critical_redirect(300); - unless ($redirect) { + unless ($redirect) { $url=&Apache::lonnet::absolute_url().$redirecturl; - $url = &add_get_param($url, { 'symb' => $redirectsymb}); + $url = &add_get_param($url, { 'symb' => $redirectsymb}); } - &Apache::loncommon::content_type($r,'text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->header_out(Location => $url); return REDIRECT; } else { @@ -483,7 +461,7 @@ ENDSTART &Apache::loncommon::start_page('No Resource') .'

'.$lt{'title'}.'

' .'

'.$lt{'explain'}.'

'); - } + } $r->print( &Apache::lonhtmlcommon::actionbox( [''.$lt{'back'}.'',