--- rat/lonambiguous.pm 2006/03/19 23:09:07 1.19 +++ rat/lonambiguous.pm 2008/11/20 15:19:05 1.23 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to resolve ambiguous file locations # -# $Id: lonambiguous.pm,v 1.19 2006/03/19 23:09:07 albertel Exp $ +# $Id: lonambiguous.pm,v 1.23 2008/11/20 15:19:05 jms Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,6 +26,8 @@ # http://www.lon-capa.org/ # + + package Apache::lonambiguous; use strict; @@ -95,7 +97,7 @@ sub handler { $resurl => [$resurl,$resid]); untie(%bighash); $r->header_out(Location => - 'http://'.$ENV{'HTTP_HOST'}.$resurl); + &Apache::lonnet::absolute_url().$resurl); return REDIRECT; } } @@ -134,7 +136,7 @@ sub handler { # ----------------------------------- Okay, this should have appeared on a page &Apache::loncommon::content_type($r,'text/html'); $r->header_out(Location => - 'http://'.$ENV{'HTTP_HOST'}. + &Apache::lonnet::absolute_url(). &Apache::lonnet::clutter($page)); return REDIRECT; } else { @@ -146,7 +148,8 @@ sub handler { # ------------------------------------Encrypted requests go straight to navmaps if ($env{'request.enc'}) { &Apache::loncommon::content_type($r,'text/html'); - $r->header_out(Location => 'http://'.$ENV{'HTTP_HOST'}.'/adm/navmaps'); + $r->header_out(Location => + &Apache::lonnet::absolute_url().'/adm/navmaps'); return REDIRECT; } # ------------------------------------------------ Would be standalone resource @@ -178,9 +181,9 @@ sub handler { my $mapurl=$bighash{'map_id_'.(split(/\./,$id))[0]}; my $symb=&make_symb($id); &Apache::loncommon::content_type($r,'text/html'); - &Apache::lonnet::logthis('http://'.$ENV{'HTTP_HOST'}.$resurl.'?symb='.$symb); $r->header_out(Location => - 'http://'.$ENV{'HTTP_HOST'}.$resurl.'?symb='.$symb); + &Apache::lonnet::absolute_url(). + $resurl.'?symb='.$symb); return REDIRECT; } if ($#possibilities>0) { @@ -229,6 +232,40 @@ __END__ +=head1 NAME + +Apache::lonambiguous + +=head1 SYNOPSIS + +Handler to resolve ambiguous file locations. + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 HANDLER SUBROUTINE + +make_symb() + +and + +handler() + +=head1 OTHER SUBROUTINES + +=over + +=item * + +cleanup() + +=item * + +getlost() + +=back + +=cut