--- rat/lonwrapper.pm 2002/03/06 15:00:55 1.5 +++ rat/lonwrapper.pm 2003/04/15 03:53:03 1.12 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Wrapper for external and binary files as standalone resources # -# $Id: lonwrapper.pm,v 1.5 2002/03/06 15:00:55 matthew Exp $ +# $Id: lonwrapper.pm,v 1.12 2003/04/15 03:53:03 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,6 +39,7 @@ use strict; use Apache::Constants qw(:common); use Apache::lonnet(); use Apache::lonxml(); +use Apache::lonmenu; # ================================================================ Main Handler @@ -49,13 +50,59 @@ sub handler { return OK if $r->header_only; - my $url=$r->uri; + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['wrapperdisplay']); + my $orgurl=$r->uri; + my $url=$orgurl; $url=~s/^\/adm\/wrapper//; $url=~s/^\/ext\//http\:\/\//; - my $events='onLoad="'.&Apache::lonxml::loadevents. - '" onUnload="'.&Apache::lonxml::unloadevents.'"'; - my $script=&Apache::lonxml::registerurl(1,undef); - $r->print(<print(''. + &Apache::lonmenu::menubuttons(1,'web',1).''); + } else { +# +# 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 ($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') { +# +# This is inline remote +# + $r->print(< + +$script + + + + + + +ENDDOCUMENTINL + } else { +# +# frame-based rendering for graphical interface +# + $r->print(< $script @@ -66,6 +113,8 @@ $script ENDDOCUMENT + } + } return OK; }