--- rat/lonwrapper.pm 2005/04/07 06:56:27 1.18
+++ rat/lonwrapper.pm 2006/09/29 18:35:42 1.24
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Wrapper for external and binary files as standalone resources
#
-# $Id: lonwrapper.pm,v 1.18 2005/04/07 06:56:27 albertel Exp $
+# $Id: lonwrapper.pm,v 1.24 2006/09/29 18:35:42 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -32,95 +32,119 @@ use strict;
use Apache::Constants qw(:common);
use Apache::lonnet;
use Apache::lonxml();
-use Apache::lonmenu;
+use Apache::lonenc();
+use Apache::lonmenu();
# ================================================================ Main Handler
-sub handler {
- my $r=shift;
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
-
- return OK if $r->header_only;
-
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['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\:\/\//;
- $url=~s|:|:|g;
- if ($env{'form.wrapperdisplay'} eq 'menu') {
+sub simple_menu {
#
# Producing the menu buttons
#
- $r->print(''.
- &Apache::lonmenu::menubuttons(1,'web',1).'');
- } else {
+ 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') {
#
-# Actual URL
+# ssi-based rendering for text-based interface
#
- if ($url=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+ return
+ &Apache::loncommon::start_page('Menu',undef,
+ {'bgcolor' => '#FFFFFF',
+ 'force_register' => 1,
+ }).
+ &Apache::lonnet::ssi_body($bottomurl).
+ &Apache::loncommon::end_page();
+ }
+
+
+ my %layout = ('border' => 0);
+ if ($env{'environment.remote'} eq 'off') {
+ $layout{'rows'} = "180,*";
+ } else {
+ $layout{'rows'} = "1,*";
+ $topurl = "/adm/rat/empty.html";
+ }
+
+ my $start_page =
+ &Apache::loncommon::start_page(undef,undef,
+ {'force_register' => 1,
+ 'frameset' => 1,
+ 'add_entries' => \%layout, });
+
+ my $end_page =
+ &Apache::loncommon::end_page({'frameset' => 1});
+
+ foreach my $url ($topurl,$bottomurl) {
+ if ($url !~ /^http:/) {
+ $url = &Apache::lonenc::check_encrypt($url);
+ }
+ }
#
-# This is uploaded homework
+# frame-based rendering for graphical interface
#
- $env{'request.state'}='uploaded';
- &Apache::lonhomework::renderpage($r,$url);
- } else {
+ my $result =<
+
+$end_page
+ENDDOCUMENT
+
+ return $result;
+}
+
+sub handler {
+ my $r=shift;
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+
+ return OK if $r->header_only;
+
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['wrapperdisplay']);
+ if ($env{'form.wrapperdisplay'} eq 'menu') {
+ $r->print(&simple_menu());
+ return OK;
+ }
+
+ 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\:\/\//;
+ $url=~s|:|:|g;
#
-# This is not homework
+# Actual 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') {
+ if ($url=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
#
-# ssi-based rendering for text-based interface
+# This is uploaded homework
#
- $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
-
-
-