--- rat/lonwrapper.pm 2003/05/13 15:13:17 1.13 +++ rat/lonwrapper.pm 2006/03/19 23:06:00 1.20 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Wrapper for external and binary files as standalone resources # -# $Id: lonwrapper.pm,v 1.13 2003/05/13 15:13:17 www Exp $ +# $Id: lonwrapper.pm,v 1.20 2006/03/19 23:06:00 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,19 +25,12 @@ # # http://www.lon-capa.org/ # -# (Edit Handler for RAT Maps -# (TeX Content Handler -# -# 05/29/00,05/30 Gerd Kortemeyer) -# 7/1,6/30 Gerd Kortemeyer) -# -# 7/5 Gerd Kortemeyer package Apache::lonwrapper; use strict; use Apache::Constants qw(:common); -use Apache::lonnet(); +use Apache::lonnet; use Apache::lonxml(); use Apache::lonmenu; @@ -45,7 +38,7 @@ use Apache::lonmenu; sub handler { my $r=shift; - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; @@ -54,9 +47,13 @@ sub handler { ['wrapperdisplay']); my $orgurl=$r->uri; my $url=$orgurl; + $orgurl.=(($orgurl=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; + $orgurl.=(($orgurl=~/\?/)?'&':'?').'wrapperdisplay=menu'; $url=~s/^\/adm\/wrapper//; + my $is_ext = $url =~ m|^/ext/|; $url=~s/^\/ext\//http\:\/\//; - if ($ENV{'form.wrapperdisplay'} eq 'menu') { + $url=~s|:|:|g; + if ($env{'form.wrapperdisplay'} eq 'menu') { # # Producing the menu buttons # @@ -70,14 +67,14 @@ sub handler { # # This is uploaded homework # - $ENV{'request.state'}='uploaded'; + $env{'request.state'}='uploaded'; &Apache::lonhomework::renderpage($r,$url); } else { # # This is not homework # - if ($url=~/^\/uploaded\//) { - $url=&Apache::lonnet::tokenwrapper($url); + if ($is_ext) { + $ENV{'QUERY_STRING'}=~s/(^|\&)symb=[^\&]*/$1/; } $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; # reappend the query arguments @@ -85,7 +82,7 @@ sub handler { '" onUnload="'.&Apache::lonmenu::unloadevents.'"'; my $script=&Apache::lonmenu::registerurl(1,undef); - if ($ENV{'browser.interface'} eq 'textual') { + if ($env{'browser.interface'} eq 'textual') { # # ssi-based rendering for text-based interface # @@ -94,7 +91,7 @@ sub handler { ''. &Apache::lonmenu::menubuttons(1). &Apache::lonnet::ssi_body($url).''); - } elsif ($ENV{'environment.remote'} eq 'off') { + } elsif ($env{'environment.remote'} eq 'off') { # # This is inline remote # @@ -103,8 +100,8 @@ sub handler { $script - - + + @@ -118,7 +115,7 @@ ENDDOCUMENTINL $script - +