--- loncom/publisher/loncfile.pm	2004/05/26 22:31:30	1.56
+++ loncom/publisher/loncfile.pm	2004/09/10 20:05:03	1.63
@@ -9,7 +9,7 @@
 #  and displays a page showing the results of the action.
 #
 #
-# $Id: loncfile.pm,v 1.56 2004/05/26 22:31:30 albertel Exp $
+# $Id: loncfile.pm,v 1.63 2004/09/10 20:05:03 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -289,11 +289,26 @@ sub checksuffix {
 }
 
 sub cleanDest {
-    my ($request,$dest)=@_;
+    my ($request,$dest,$subdir,$fn)=@_;
     #remove bad characters
-    if  ($dest=~/[\#\?&%]/) {
+    my $foundbad=0;
+    if ($subdir && $dest =~/\./) {
+	$foundbad=1;
+	$dest=~s/\.//g;
+    }
+    if  ($dest=~/[\#\?&%\"]/) {
+	$foundbad=1;
+	$dest=~s/[\#\?&%\"]//g;
+    }
+    if ($dest=~m|/|) {
+	my ($newpath)=($dest=~m|(.*)/|);
+	if (! -d "$fn/$newpath") {
+	    $request->print("<p><font color=\"red\">".&mt('You request to create file in directory [_1] which doesn\'t exist. The requested directory path has been removed from the requested file name.','"<tt>'.$newpath.'</tt>"')."</font></p>");
+	    $dest=~s|.*/||;
+	}
+    }
+    if ($foundbad) {
 	$request->print("<p><font color=\"red\">".&mt('Invalid characters in requested name have been removed.')."</font></p>");
-	$dest=~s/[\#\?&%]//g;
     }
     return $dest;
 }
@@ -750,7 +765,9 @@ performed and reported to the user.
 sub phaseone {
     my ($r,$fn,$uname,$udom)=@_;
   
-    my $newfilename=&cleanDest($r,$ENV{'form.newfilename'});
+    my $doingdir=0;
+    if ($ENV{'form.action'} eq 'newdir') { $doingdir=1; }
+    my $newfilename=&cleanDest($r,$ENV{'form.newfilename'},$doingdir,$fn);
     $newfilename=&relativeDest($fn,$newfilename,$uname);
     $r->print('<form action="/adm/cfile" method="post">'.
 	      '<input type="hidden" name="qualifiedfilename" value="'.$fn.'" />'.
@@ -978,11 +995,16 @@ sub Copy2 {
 	unless (copy($oldfile, $newfile)) {
 	    $request->print('<font color="red"> '.&mt('copy Error').': '.$!.'</font>');
 	    return 0;
+	} elsif (!chmod(0660, $newfile)) {
+	    $request->print('<font color="red"> '.&mt('chmod error').': '.$!.'</font>');
+	    return 0;
+	} elsif (-e $oldfile.'.meta' && 
+		 !copy($oldfile.'.meta', $newfile.'.meta') &&
+		 !chmod(0660, $newfile.'.meta')) {
+	    $request->print('<font color="red"> '.&mt('copy metadata error').
+			    ': '.$!.'</font>');
+	    return 0;
 	} else {
-	    unless (chmod(0660, $newfile)) {
-		$request->print('<font color="red"> '.&mt('chmod error').': '.$!.'</font>');
-		return 0;
-	    }
 	    return 1;
 	}
     } else {
@@ -1108,7 +1130,8 @@ sub phasetwo {
 	    return ;
 	}
 	$dest = $dir."/.";
-    } elsif ($ENV{'form.action'} eq 'rename') { # Rename.
+    } elsif ($ENV{'form.action'} eq 'rename' ||
+	     $ENV{'form.action'} eq 'move') {
 	if($ENV{'form.newfilename'}) {
 	    if (!defined($dir)) {
 		$fn=~m:^(.*)/:;
@@ -1156,6 +1179,7 @@ sub handler {
 
     $r=shift;
 
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress','action','filename','newfilename']);
 
     &Debug($r, "loncfile.pm - handler entered");
     &Debug($r, " filename: ".$ENV{'form.filename'});
@@ -1174,7 +1198,6 @@ sub handler {
     }  elsif($ENV{'QUERY_STRING'} && $ENV{'form.phase'} ne 'two') {  
 	#Just hijack the script only the first time around to inject the
 	#correct information for further processing
-	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress']);
 	$fn=&Apache::lonnet::unescape($ENV{'form.decompress'});
 	$fn=&URLToPath($fn);
 	$ENV{'form.action'}="decompress";