--- loncom/publisher/lonupload.pm 2002/08/24 03:56:58 1.13
+++ loncom/publisher/lonupload.pm 2003/07/05 10:07:12 1.17
@@ -2,7 +2,7 @@
# The LearningOnline Network with CAPA
# Handler to upload files into construction space
#
-# $Id: lonupload.pm,v 1.13 2002/08/24 03:56:58 foxr Exp $
+# $Id: lonupload.pm,v 1.17 2003/07/05 10:07:12 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -44,7 +44,6 @@
#
# 04/05,04/09,05/25,06/23,06/24,08/22 Gerd Kortemeyer
# 11/29 Matthew Hall
-# 12/16 Scott Harrison
#
###
@@ -59,6 +58,7 @@ use Apache::loncacc;
use Apache::loncommon();
use Apache::Log();
use Apache::lonnet;
+use HTML::Entities();
my $DEBUG=0;
@@ -159,7 +159,7 @@ sub phasetwo {
# target is the full filesystem path of the destination file.
my $base = &File::Basename::basename($fn);
my $path = &File::Basename::dirname($fn);
- $base = Apache::lonnet::escape($base);
+ $base = &HTML::Entities::encode($base);
my $url = $path."/".$base;
&Debug($r, "URL is now ".$url);
my $datatoken=$ENV{'form.datatoken'};
@@ -195,6 +195,8 @@ sub phasetwo {
$r->print('File copied.');
$r->print('<p><font size=+2><a href="'.$url.
'">View file</a></font>');
+ $r->print('<p><font size=+2><a href="'.$path.
+ '">Back to Directory</a></font>');
} else {
$r->print('Failed to copy: '.$!);
}
@@ -249,11 +251,7 @@ sub handler {
$r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
- $r->print(
- '<body bgcolor="#FFFFFF"><img align=right src=/adm/lonIcons/lonlogos.gif>');
-
-
- $r->print('<h1>Upload file to Construction Space</h1>');
+ $r->print(&Apache::loncommon::bodytag('Upload file to Construction Space'));
if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
$r->print('<h3><font color=red>Co-Author: '.$uname.' at '.$udom.