--- loncom/publisher/loncfile.pm	2003/02/10 23:19:45	1.25
+++ 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.25 2003/02/10 23:19:45 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("<p><font color=\"red\">Invalid characters in requested name have been removed.</font></p>");
+	$dest=~s/[\#\?&]//g;
+    }
+    return $dest;
+}
+
 =pod
 
 =item CloseForm1($request, $user, $file)
@@ -412,7 +425,7 @@ sub CloseForm1 {
    &Debug($request, "Cancel url is: ".$cancelurl);
    $request->print('<p><input type="submit" value="Continue" /></p></form>');
    $request->print('<form action="'.$cancelurl.
-		   '" method="GET"><p><input type="submit" value="Cancel" /></p></form>');
+		   '" method="POST"><p><input type="submit" value="Cancel" /></p></form>');
 
 }
 
@@ -494,13 +507,19 @@ sub Rename1 {
     if(-e $conspace) {
 	if($ENV{'form.newfilename'}) {
 	    my $newfilename = $ENV{'form.newfilename'};
-	    if ($newfilename =~ m|^[^\.]+$|) {
+	    if ($newfilename =~ m|/[^\.]+$|) {
 		#no extension add on orignal extension
 		if ($filename =~ m|/[^\.]*\.([^\.]+)$|) {
 		    $newfilename.='.'.$1;
 		}
 	    }
 	    $request->print(&checksuffix($filename, $newfilename));
+	    #renaming a dir, delete the trailing /
+            #remove last element for current dir
+	    if ($filename =~ m|/$|) {
+		$filename =~ s|/$||;
+		$dir =~ s|/[^/]*$||;
+	    }
 	    my $return=&exists($user, $domain, $dir, $newfilename);
 	    $request->print($return);
 	    if ($return =~/^Error:/) {
@@ -764,6 +783,10 @@ sub NewFile1 {
     if ($ENV{'form.action'} =~ /new(.+)file/) {
 	my $extension=$1;
 	if ($newfilename !~ /\Q.$extension\E$/) {
+	    if ($newfilename =~ m|^[^\.]*\.([^\.]+)$|) {
+		#already has an extension strip it and add in expected one
+		$newfilename =~ s|.([^\.]+)$||;
+	    }
 	    $newfilename.=".$extension";
 	}
     }
@@ -782,9 +805,9 @@ sub NewFile1 {
 	&Debug($request, "Dest url is: ".$dest);
 	$request->print('</form>');
 	$request->print('<form action="'.$dest.
-			'" method="GET"><p><input type="submit" value="Continue" /></p></form>');
+			'" method="POST"><p><input type="submit" value="Continue" /></p></form>');
 	$request->print('<form action="'.$cancelurl.
-			'" method="GET"><p><input type="submit" value="Cancel" /></p></form>');
+			'" method="POST"><p><input type="submit" value="Cancel" /></p></form>');
     }
 }
 
@@ -826,16 +849,19 @@ sub phaseone {
   
   #  my $conspace=ConstructionPathFromRelative($uname, $fn);
   
-  
+  $ENV{'form.newfilename'}=&cleanDest($r,$ENV{'form.newfilename'});
+
   $r->print('<form action="/adm/cfile" method="post">'.
 	    '<input type="hidden" name="filename" value="/~'.$uname.$fn.'" />'.
 	    '<input type="hidden" name="phase" value="two" />'.
 	    '<input type="hidden" name="action" value="'.$ENV{'form.action'}.'" />');
   
   if ($ENV{'form.action'} eq 'rename') {
-    
-    &Rename1($r, $fn, $uname, $udom, $dir);
-    
+      if (!defined($dir)) {
+	  $fn=~m:(.*)/:;
+	  $dir=$1;
+      }
+      &Rename1($r, $fn, $uname, $udom, $dir);
   } elsif ($ENV{'form.action'} eq 'delete') { 
     
     &Delete1($r, $uname, $fn);
@@ -851,7 +877,12 @@ sub phaseone {
     &NewDir1($r, $uname, $dir, $ENV{'form.newfilename'});
   }  elsif ($ENV{'form.action'} eq 'newfile' ||
 	    $ENV{'form.action'} eq 'newhtmlfile' ||
-	    $ENV{'form.action'} eq 'newproblemfile') {
+	    $ENV{'form.action'} eq 'newproblemfile' ||
+            $ENV{'form.action'} eq 'newpagefile' ||
+            $ENV{'form.action'} eq 'newsequencefile' ||
+            $ENV{'form.action'} eq 'newrightsfile' ||
+            $ENV{'form.action'} eq 'newstyfile' ||
+            $ENV{'form.action'} eq 'Select Action') {
       if($ENV{'form.newfilename'}) {
 	  my $newfilename = $ENV{'form.newfilename'};
 	  if (!defined($dir)) {
@@ -909,8 +940,19 @@ sub Rename2 {
 	 $newfile);
 
   if(-e $oldfile) {
-      unless(rename($oldfile,
-		    $directory.'/'.$newfile)) {
+      my $dest;
+
+      if ($oldfile =~ m|/$|) {
+	  #renaming a dir
+	  $oldfile =~ s|/$||;
+	  $dest=$directory;
+	  $dest=~s|(/)([^/]*)$|$1|;
+	  $dest.='/'.$newfile;
+      } else {
+	  $dest=$directory.'/'.$newfile;
+      }
+
+      unless(rename($oldfile,$dest)) {
 	  $request->print('<font color="red">Error: '.$!.'</font>');
 	  return 0;
       } else {}
@@ -1088,11 +1130,16 @@ sub phasetwo {
     
     # Break down the file into it's component pieces.
     
-    $fn=~/(.*)\/([^\/]+)\.(\w+)$/;
-    my $dir=$1;			# Directory path
-    my $main=$2;		# Filename.
-    my $suffix=$3;		# Extension.
-    
+    my $dir;		# Directory path
+    my $main;		# Filename.
+    my $suffix;		# Extension.
+
+    if ($fn=~m:(.*)/([^/]+)\.(\w+)$:) {
+	$dir=$1;		# Directory path
+	$main=$2;		# Filename.
+	$suffix=$3;		# Extension.
+    }
+        
     my $dest;                   # On success this is where we'll go.
     
     &Debug($r, 
@@ -1112,12 +1159,19 @@ sub phasetwo {
     
     if ($ENV{'form.action'} eq 'rename') { # Rename.
 	if($ENV{'form.newfilename'}) {
+	    if (!defined($dir)) {
+		$fn=~m:^(.*)/:;
+		$dir=$1;
+	    }
 	    if(!&Rename2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {
 		return;
 	    }
 	    # Prepend the directory to the new name to form the basis of the
 	    # url of the new resource.
 	    #
+	    #renaming a dir
+            #remove last element for current dir
+	    if ($fn =~ m|/$|) { $dir =~ s|/[^/]*$||; }
 	    $dest = $dir."/".$ENV{'form.newfilename'};
 	}
     } elsif ($ENV{'form.action'} eq 'delete') { 
@@ -1188,12 +1242,7 @@ sub handler {
 
   if ($ENV{'form.filename'}) {
       $fn=&Apache::lonnet::unescape($ENV{'form.filename'});
-      &Debug($r, "loncfile::handler - raw url: $fn");
-#      $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
-#      $fn=~s/^http\:\/\/[^\/]+//;
-      $fn=URLToPath($fn);
-      &Debug($r, "loncfile::handler - doctored url: $fn");
-
+      $fn=&URLToPath($fn);
   } else {
       &Debug($r, "loncfile::handler - no form.filename");
      $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
@@ -1232,8 +1281,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(&Apache::loncommon::bodytag('File Operation'));
 
   
   $r->print('<h1>Construction Space <tt>'.$fn.'</tt></h1>');
@@ -1256,10 +1304,15 @@ sub handler {
       $r->print('<h3>Copy</h3>');
   } elsif ($ENV{'form.action'} eq 'newfile' ||
 	   $ENV{'form.action'} eq 'newhtmlfile' ||
-	   $ENV{'form.action'} eq 'newproblemfile') {
+	   $ENV{'form.action'} eq 'newproblemfile' ||
+           $ENV{'form.action'} eq 'newpagefile' ||
+           $ENV{'form.action'} eq 'newsequencefile' ||
+	   $ENV{'form.action'} eq 'newrightsfile' ||
+	   $ENV{'form.action'} eq 'newstyfile' ||
+           $ENV{'form.action'} eq 'Select Action' ) {
       $r->print('<h3>New Resource</h3>');
   } else {
-     $r->print('<p>Unknown Action</p></body></html>');
+     $r->print('<p>Unknown Action '.$ENV{'form.action'}.' </p></body></html>');
      return OK;  
   }
   if ($ENV{'form.phase'} eq 'two') {