--- rat/lonwrapper.pm 2006/03/21 21:50:39 1.21 +++ rat/lonwrapper.pm 2009/10/21 23:47:11 1.36 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Wrapper for external and binary files as standalone resources # -# $Id: lonwrapper.pm,v 1.21 2006/03/21 21:50:39 albertel Exp $ +# $Id: lonwrapper.pm,v 1.36 2009/10/21 23:47:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,13 +26,15 @@ # http://www.lon-capa.org/ # + package Apache::lonwrapper; use strict; use Apache::Constants qw(:common); use Apache::lonnet; use Apache::lonxml(); -use Apache::lonmenu; +use Apache::lonenc(); +use Apache::lonmenu(); # ================================================================ Main Handler @@ -40,60 +42,55 @@ sub simple_menu { # # Producing the menu buttons # - return ''. - &Apache::lonmenu::menubuttons(1,'web',1).''; - + return &Apache::loncommon::start_page('Menu',undef, + {'only_body' => 1, + 'bgcolor' => '#FFFFFF',}). + &Apache::lonmenu::menubuttons(1,'web',1). + &Apache::loncommon::end_page(); } sub wrapper { my ($topurl,$bottomurl) = @_; - if ($env{'browser.interface'} eq 'textual') { -# -# ssi-based rendering for text-based interface -# - return ''. - &Apache::lonmenu::registerurl(1). - ''. - &Apache::lonmenu::menubuttons(1). - &Apache::lonnet::ssi_body($bottomurl).''; + my %layout = ('border' => 0); + if ($env{'environment.remote'} eq 'off') { + if ($env{'environment.icons'} eq 'iconsonly') { + $layout{'rows'} = "140,*"; + } else { + $layout{'rows'} = "220,*"; + } + } else { + $layout{'rows'} = "1,*"; + $topurl = "/adm/rat/empty.html"; } - my $events='onLoad="'.&Apache::lonmenu::loadevents. - '" onUnload="'.&Apache::lonmenu::unloadevents.'"'; - my $script=&Apache::lonmenu::registerurl(1,undef); - - my $result = < - -$script - -ENDDOCUMENTINL + my $start_page = + &Apache::loncommon::start_page(undef,undef, + {'force_register' => 1, + 'frameset' => 1, + 'add_entries' => \%layout, }); - if ($env{'environment.remote'} eq 'off') { -# -# This is inline remote -# - $result .= < - - - -ENDDOCUMENTINL - } else { + my $end_page = + &Apache::loncommon::end_page({'frameset' => 1}); + + foreach my $url ($topurl,$bottomurl) { + if ($url !~ /^https?\:/) { + $url = &Apache::lonenc::check_encrypt($url); + } + } # # frame-based rendering for graphical interface # - $result .=< - - - + my $result =< + +$end_page ENDDOCUMENT - } - $result .= "\n\n"; + return $result; } sub handler { @@ -116,7 +113,8 @@ sub handler { $orgurl.=(($orgurl=~/\?/)?'&':'?').'wrapperdisplay=menu'; $url=~s/^\/adm\/wrapper//; my $is_ext = $url =~ m|^/ext/|; - $url=~s/^\/ext\//http\:\/\//; + $url=~s{^/ext/}{http://}; + $url=~s|http://https://|https://|; $url=~s|:|:|g; # # Actual URL @@ -133,8 +131,11 @@ sub handler { # if ($is_ext) { $ENV{'QUERY_STRING'}=~s/(^|\&)symb=[^\&]*/$1/; + $ENV{'QUERY_STRING'} =~ s/\&$//; } - $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; + unless ($ENV{'QUERY_STRING'} eq '') { + $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; + } # reappend the query arguments $r->print(&wrapper($orgurl,$url)); } # not just the menu @@ -144,6 +145,33 @@ sub handler { 1; __END__ +=pod + +=head1 NAME + +Apache::lonwrapper - External and binary file management. + +=head1 SYNOPSIS + +Wrapper for external and binary files as standalone resources. Edit handler for rat maps; TeX content handler. + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 Subroutines + +=over + +=item simple_menu() + +=item wrapper() + +=item handler() + +=back + +=cut +