[LON-CAPA-cvs] cvs: rat / lonwrapper.pm
raeburn
lon-capa-cvs@mail.lon-capa.org
Thu, 01 Apr 2004 18:14:24 -0000
raeburn Thu Apr 1 13:14:24 2004 EDT
Modified files:
/rat lonwrapper.pm
Log:
Changes to wrapping of uploaded documents.
Now that /uploaded files are copied from the course's home server to the server hosting the session, lonwrapper no longer needs to use lontokacc to build a home server url to be put in the contents of the main frame.
Index: rat/lonwrapper.pm
diff -u rat/lonwrapper.pm:1.14 rat/lonwrapper.pm:1.15
--- rat/lonwrapper.pm:1.14 Mon Sep 29 12:09:21 2003
+++ rat/lonwrapper.pm Thu Apr 1 13:14:24 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Wrapper for external and binary files as standalone resources
#
-# $Id: lonwrapper.pm,v 1.14 2003/09/29 16:09:21 www Exp $
+# $Id: lonwrapper.pm,v 1.15 2004/04/01 18:14:24 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -54,6 +54,8 @@
['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') {
@@ -76,9 +78,6 @@
#
# This is not homework
#
- if ($url=~/^\/uploaded\//) {
- $url=&Apache::lonnet::tokenwrapper($url);
- }
$url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'};
# reappend the query arguments
my $events='onLoad="'.&Apache::lonmenu::loadevents.
@@ -104,7 +103,7 @@
$script
</head>
<frameset rows="180,*" border=0 $events>
-<frame src="$orgurl?wrapperdisplay=menu">
+<frame src="$orgurl">
<frame src="$url">
</frameset>
</html>