--- rat/lonwrapper.pm 2003/04/15 03:53:03 1.12 +++ rat/lonwrapper.pm 2005/04/07 06:56:27 1.18 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Wrapper for external and binary files as standalone resources # -# $Id: lonwrapper.pm,v 1.12 2003/04/15 03:53:03 www Exp $ +# $Id: lonwrapper.pm,v 1.18 2005/04/07 06:56:27 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,12 @@ sub handler { ['wrapperdisplay']); my $orgurl=$r->uri; my $url=$orgurl; + $orgurl.=(($orgurl=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; + $orgurl.=(($orgurl=~/\?/)?'&':'?').'wrapperdisplay=menu'; $url=~s/^\/adm\/wrapper//; $url=~s/^\/ext\//http\:\/\//; - if ($ENV{'form.wrapperdisplay'} eq 'menu') { + $url=~s|:|:|g; + if ($env{'form.wrapperdisplay'} eq 'menu') { # # Producing the menu buttons # @@ -66,39 +62,47 @@ sub handler { # # Actual URL # - if ($url=~/^\/uploaded\//) { - $url=&Apache::lonnet::tokenwrapper($url); - } - $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; #reappend the query arguments - my $events='onLoad="'.&Apache::lonmenu::loadevents. - '" onUnload="'.&Apache::lonmenu::unloadevents.'"'; - my $script=&Apache::lonmenu::registerurl(1,undef); + if ($url=~/\.(problem|exam|quiz|assess|survey|form|library)$/) { +# +# This is uploaded homework +# + $env{'request.state'}='uploaded'; + &Apache::lonhomework::renderpage($r,$url); + } else { +# +# This is not homework +# + $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; + # reappend the query arguments + my $events='onLoad="'.&Apache::lonmenu::loadevents. + '" 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 # - $r->print('
'. - &Apache::lonmenu::registerurl(1). - ''. - &Apache::lonmenu::menubuttons(1). - &Apache::lonnet::ssi_body($url).''); - } elsif ($ENV{'environment.remote'} eq 'off') { + $r->print(''. + &Apache::lonmenu::registerurl(1). + ''. + &Apache::lonmenu::menubuttons(1). + &Apache::lonnet::ssi_body($url).''); + } elsif ($env{'environment.remote'} eq 'off') { # # This is inline remote # - $r->print(<