--- loncom/publisher/loncfile.pm 2003/06/19 20:49:13 1.31
+++ loncom/publisher/loncfile.pm 2003/08/01 20:32:05 1.35
@@ -9,7 +9,7 @@
# and displays a page showing the results of the action.
#
#
-# $Id: loncfile.pm,v 1.31 2003/06/19 20:49:13 albertel Exp $
+# $Id: loncfile.pm,v 1.35 2003/08/01 20:32:05 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -92,6 +92,7 @@ use Apache::Constants qw(:common :http :
use Apache::loncacc;
use Apache::Log ();
use Apache::lonnet;
+use Apache::loncommon();
my $DEBUG=0;
my $r; # Needs to be global for some stuff RF.
@@ -172,8 +173,9 @@ Global References
sub URLToPath {
my $Url = shift;
&Debug($r, "UrlToPath got: $Url");
- $Url=~ s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
$Url=~ s/^http\:\/\/[^\/]+//;
+ $Url=~ s/^\///;
+ $Url=~ s/(\~|priv\/)(\w+)\//\/home\/$2\/public_html\//;
&Debug($r, "Returning $Url \n");
return $Url;
}
@@ -387,6 +389,17 @@ sub checksuffix {
}
return $result;
}
+
+sub cleanDest {
+ my ($request,$dest)=@_;
+ #remove bad characters
+ if ($dest=~/[\#\?&]/) {
+ $request->print("Invalid characters in requested name have been removed.
");
+ $dest=~s/[\#\?&]//g;
+ }
+ return $dest;
+}
+
=pod
=item CloseForm1($request, $user, $file)
@@ -778,12 +791,6 @@ sub NewFile1 {
}
}
- #remove bad characters
- if ($newfilename=~/[\#\?&]/) {
- $request->print("Invalid characters in requested filename have been removed.
");
- $newfilename=~s/[\#\?&]//g;
- }
-
my $fullpath = $dir.'/'.$newfilename;
&Debug($request, "Full path is : ".$fullpath);
@@ -842,7 +849,8 @@ sub phaseone {
# my $conspace=ConstructionPathFromRelative($uname, $fn);
-
+ $ENV{'form.newfilename'}=&cleanDest($r,$ENV{'form.newfilename'});
+
$r->print('