--- loncom/publisher/loncfile.pm	2003/01/09 22:11:52	1.21
+++ loncom/publisher/loncfile.pm	2003/08/04 17:45:06	1.37
@@ -7,10 +7,9 @@
 #  presents a page that describes the proposed action to the user
 #  and requests confirmation.  The second phase commits the action
 #  and displays a page showing the results of the action.
-# 
-
 #
-# $Id: loncfile.pm,v 1.21 2003/01/09 22:11:52 albertel Exp $
+#
+# $Id: loncfile.pm,v 1.37 2003/08/04 17:45:06 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,27 +33,6 @@
 #
 # http://www.lon-capa.org/
 #
-#
-# (Handler to retrieve an old version of a file
-#
-# (Publication Handler
-# 
-# (TeX Content Handler
-#
-# 05/29/00,05/30,10/11 Gerd Kortemeyer)
-#
-# 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
-# 03/23 Guy Albertelli
-# 03/24,03/29 Gerd Kortemeyer)
-#
-# 03/31,04/03,05/02,05/09,06/23,06/24 Gerd Kortemeyer)
-#
-# 06/23 Gerd Kortemeyer
-# 05/07/02 Ron Fox:
-#           - Added Debug log output so that I can trace what the heck this
-#             undocumented thingy does.
-# 05/28/02  Ron Fox:
-#           - Started putting in pod in standard format.
 =pod
 
 =head1 NAME
@@ -93,6 +71,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.
@@ -128,7 +107,7 @@ sub Debug {
   my $log     = $r->log;
   my $message = shift;
   
-  # Put out the indicated message butonly if DEBUG is false.
+  # Put out the indicated message butonly if DEBUG is true.
   
   if ($DEBUG) {
     $log->debug($message);
@@ -173,12 +152,26 @@ Global References
 sub URLToPath {
   my $Url = shift;
   &Debug($r, "UrlToPath got: $Url");
-  $Url=~ s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
+  $Url=~ s/\/+/\//g;
   $Url=~ s/^http\:\/\/[^\/]+//;
+  $Url=~ s/^\///;
+  $Url=~ s/(\~|priv\/)(\w+)\//\/home\/$2\/public_html\//;
   &Debug($r, "Returning $Url \n");
   return $Url;
 }
 
+sub url {
+    my $fn=shift;
+    $fn=~s/^\/home\/(\w+)\/public\_html/\/priv\/$1/;
+    return $fn;
+}
+
+sub display {
+    my $fn=shift;
+    $fn=~s/^\/home\/(\w+)\/public\_html//;
+    return '<tt>'.$fn.'</tt>';
+}
+
 =pod
 
 =item PublicationPath($domain, $user, $dir, $file)
@@ -248,41 +241,6 @@ sub ConstructionPath {
   return '/home/'.$user.'/public_html/'.$dir.'/'.$file;
 
 }
-=pod
-
-=item  ConstructionPathFromRelative($user, $relname)
-
-   Determines the path to a construction space file given
-the username and the path relative to the root of construction space.
-
-Parameters:
-
-=over 4
-
-=item  $user  - string [in] Name of the user in whose construction space the
-           file [will] live.
-
-=item  $relname - string[in] Path to the file relative to the root of the
-            construction space.
-
-=back
-
-Returns:
-
-=over 4   
-
-=item  string - Full path to the file.
-
-=back
-
-=cut
-
-sub ConstructionPathFromRelative {
-
-  my ($user, $relname) = @_;
-  return '/home/'.$user.'/public_html'.$relname;
-
-}
 
 =pod
 
@@ -336,10 +294,9 @@ sub exists {
       return 'Error: destination for operation is a directory.';
   }
   if ( -e $published) {
-      $result.='<p><font color=red>Warning: target file exists, and has been published!</font></p>';
-  }
-  elsif ( -e $construct) {
-      $result.='<p><font color=red>Warning: target file exists!</font></p>';
+      $result.='<p><font color="red">Warning: target file exists, and has been published!</font></p>';
+  } elsif ( -e $construct) {
+      $result.='<p><font color="red">Warning: target file exists!</font></p>';
   }
 
   return $result;
@@ -384,10 +341,38 @@ sub checksuffix {
     if ($old=~m:(.*)/+([^/]+)\.(\w+)$:) { $oldsuffix=$3; }
     if ($oldsuffix ne $newsuffix) {
 	$result.=
-            '<p><font color=red>Warning: change of MIME type!</font></p>';
+            '<p><font color="red">Warning: change of MIME type!</font></p>';
     }
     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;
+}
+
+sub relativeDest {
+    my ($fn,$newfilename,$uname)=@_;
+    if ($newfilename=~/^\//) {
+# absolute, simply add path
+	$newfilename='/home/'.$uname.'/public_html/';
+    } else {
+	my $dir=$fn;
+	$dir=~s/\/[^\/]+$//;
+	$newfilename=$dir.'/'.$newfilename;
+    }
+    $newfilename=~s://+:/:g; # remove duplicate /
+    while ($newfilename=~m:/\.\./:) {
+	$newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/..
+    }
+    return $newfilename;
+}
+
 =pod
 
 =item CloseForm1($request, $user, $file)
@@ -407,14 +392,10 @@ Parameters:
 =cut
 
 sub CloseForm1 {
-   my ($request,  $cancelurl) = @_;
-
-
-   &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>');
-
+   my ($request,  $fn) = @_;
+   $request->print('<p><input type="submit" value="Continue" /></p></form>');
+   $request->print('<form action="'.&url($fn).
+     '" method="POST"><p><input type="submit" value="Cancel" /></p></form>');
 }
 
 
@@ -443,9 +424,8 @@ Parameters:
 =cut
 
 sub CloseForm2 {
-  my ($request, $user, $directory) = @_;
-
-  $request->print('<h3><a=href="/priv/'.$user.$directory.'/">Done </a> </h3>');
+  my ($request, $user, $fn) = @_;
+  $request->print('<h3><a href="'.&url($fn).'/">Done</a></h3>');
 }
 
 =pod
@@ -484,36 +464,41 @@ new filename relative to the current dir
 =cut  
 
 sub Rename1 {
-    my ($request, $filename, $user, $domain, $dir) = @_;
-    &Debug($request, "Username - ".$user." filename: ".$filename."\n");
-    my $conspace = $filename;
-
-    my $cancelurl = "/priv/".$filename;
-    $cancelurl    =~ s/\/home\///;
-    $cancelurl    =~ s/\/public_html//;
-    
-    if(-e $conspace) {
-	if($ENV{'form.newfilename'}) {
-	    my $newfilename = $ENV{'form.newfilename'};
-	    $request->print(&checksuffix($filename, $newfilename));
+    my ($request, $user, $domain, $fn, $newfilename) = @_;
+
+    if(-e $fn) {
+	if($newfilename) {
+	    if ($newfilename =~ m|/[^\.]+$|) {
+		#no extension add on original extension
+		if ($fn =~ m|/[^\.]*\.([^\.]+)$|) {
+		    $newfilename.='.'.$1;
+		}
+	    }
+	    $request->print(&checksuffix($fn, $newfilename));
+	    #renaming a dir, delete the trailing /
+            #remove last element for current dir
+	    my $dir=$fn;
+	    if ($fn =~ m|/$|) {
+		$fn =~ s|/$||;
+		$dir =~ s|/[^/]*$||;
+	    }
 	    my $return=&exists($user, $domain, $dir, $newfilename);
 	    $request->print($return);
 	    if ($return =~/^Error:/) {
-		$request->print('<br /><a href="'.$cancelurl.'">Cancel</a>');
+		$request->print('<br /><a href="'.&url($fn).'">Cancel</a>');
 		return;
 	    }
-	    my $dest=&SimplifyDir($dir,$newfilename);
-	    $request->print('<input type=hidden name=newfilename value="'.
+	    $request->print('<input type="hidden" name="newfilename" value="'.
 			    $newfilename.
-			    '"><p>Rename <tt>'.$filename.'</tt><br /> to <tt>'.
-			    $dest.'</tt>?</p>');
-	    &CloseForm1($request, $cancelurl);
+			    '" /><p>Rename '.&display($fn).
+			    '</tt><br />to '.&display($newfilename).'?</p>');
+	    &CloseForm1($request, $fn);
 	} else {
-	    $request->print('<p>No new filename specified</p></form>');
+	    $request->print('<p>No new filename specified.</p></form>');
 	    return;
 	}
     } else {
-	$request->print('<p> No such File </p> </form>');
+	$request->print('<p> No such file: '.&display($fn).'</p></form>');
 	return;
     }
     
@@ -529,34 +514,29 @@ Parameters:
 
 =over 4
 
-=item   $request   - Apache Request Object [in] request object for the current
+=item   $request   - Apache Request Object [in] request object for the current 
                 request.
 
-=item   $user      - string [in] Name of session user.
+=item   $user      - string [in]  Name of the user initiating the request.
 
+=item   $domain    - string [in]  Domain the initiating user is logged in as
 
-=item   $filename  - string [in] Name fo the file to be deleted:
-                Filename is the full filesystem path to the file.
+=item   $filename  - string [in]  Source filename.
 
 =back
 
 =cut
 
 sub Delete1 {
-  my ($request, $user,  $filename) = @_;
+  my ($request, $user, $domain, $fn) = @_;
 
-  my $cancelurl = '/priv/'.$filename;
-  $cancelurl    =~ s/\/home\///;
-  $cancelurl    =~ s/\/public_html//;
-  
-
-  if( -e $filename) {
-    $request->print('<input type=hidden name=newfilename value="'.
-		    $filename.'">');
-    $request->print('<p> Delete <tt>'.$filename.'</tt>?</p>');
-    &CloseForm1($request, $cancelurl);
+  if( -e $fn) {
+    $request->print('<input type="hidden" name="newfilename" value="'.
+		    $fn.'"/>');
+    $request->print('<p>Delete '.&display($fn).'?</p>');
+    &CloseForm1($request, $fn);
   } else {
-    $request->print('<p> No Such file: <tt>'.$filename.'</tt></p></form>');
+    $request->print('<p>No such file: '.&display($fn).'</p></form>');
   }
 }
 
@@ -579,9 +559,7 @@ Parameters:
 
 =item   $domain    - string [in]  Domain the initiating user is logged in as
 
-=item   $dir       - string [in]  Directory path.
-
-=item   $filename  - string [in]  Source filename.
+=item   $fn  - string [in]  Source filename.
 
 =item   $newfilename-string [in]  Destination filename.
 
@@ -590,67 +568,89 @@ Parameters:
 =cut
 
 sub Copy1 {
-  my ($request, $user, $domain, $dir, $filename, $newfilename) = @_;
-
-  my $cancelurl = "/priv/".$filename;
-  $cancelurl    =~ s/\/home\///;
-  $cancelurl    =~ s/\/public_html//;
-    
+  my ($request, $user, $domain, $fn, $newfilename) = @_;
 
-  if(-e $filename) {
-    $request->print(&checksuffix($filename,$newfilename));
-    my $return=&exists($user, $domain, $dir, $newfilename);
+  if(-e $fn) {
+    $request->print(&checksuffix($fn,$newfilename));
+    my $return=&exists($user, $domain, $fn, $newfilename);
     $request->print($return);
     if ($return =~/^Error:/) {
-	$request->print('<br /><a href="'.$cancelurl.'">Cancel</a>');
+	$request->print('<br /><a href="'.&url($fn).'">Cancel</a>');
 	return;
     }
-    my $dest=&SimplifyDir($dir,$newfilename);
-    $request->print('<input type = hidden name = newfilename value = "'.
-		    $dir.'/'.$newfilename.
-		    '"><p>Copy <tt>'.$filename.'</tt><br />  to '.
-		    '<tt>'.$dest.'</tt>?</p>');
-    &CloseForm1($request, $cancelurl);
+    $request->print('<input type = "hidden" name = "newfilename" value = "'.
+		    $newfilename.
+		    '" /><p>Copy '.&display($fn).'<br />to '.
+		    &display($newfilename).'?</p>');
+    &CloseForm1($request, $fn);
   } else {
-    $request->print('<p>No such file <tt>'.$filename.'</p></form>');
+    $request->print('<p>No such file: '.&display($fn).'</p></form>');
   }
 }
 
 =pod
 
-=item SimplifyDir
-
-  Removes all extra / and all .. references
+=item NewDir1
+ 
+  Does all phase 1 processing of directory creation:
+  Ensures that the user provides a new directory name,
+  and that the directory does not already exist.
 
 Parameters:
 
 =over 4
 
-=item $dir - string [in] a directory name
+=item   $request  - Apache Request Object [in] - Server request object for the
+               current url.
+
+=item   $username - Name of the user that is requesting the directory creation.
 
-=item $file - string [in] a file reference relative to $dir
+=item $domain - Domain user is in
 
+=item   $fn     - source file.
+
+=item   $newdir   - Name of the directory to be created; path relative to the 
+               top level of construction space.
 =back
 
-Results: the concatenated path.
+Side Effects:
+
+=over 4
+
+=item A new form is displayed.  Clicking on the confirmation button
+causes the newdir operation to transition into phase 2.  The hidden field
+"newfilename" is set with the construction space path to the new directory.
+
+
+=back
 
 =cut
 
-sub SimplifyDir {
-    my ($dir,$file) = @_;
-    my $location = $dir. '/'.$file;
-    $location=~s://+:/:g; # remove duplicate /
-    while ($location=~m:/\.\./:) {$location=~s:/[^/]+/\.\./:/:g;}#remove dir/..
-    return $location;
+
+sub NewDir1
+{
+  my ($request, $username, $domain, $fn, $newfilename) = @_;
+
+  if(-e $newfilename) {
+    $request->print('<p>Directory exists.</p></form>');
+  }
+  else {
+    $request->print('<input type="hidden" name="newfilename" value="'.
+		    $newfilename.'" /><p>Make new directory '.
+		    &display($newfilename).'?</p>');
+    &CloseForm1($request, $fn);
+  }
 }
 
 =pod
 
-=item NewDir1
+=item NewFile1
  
-  Does all phase 1 processing of directory creation:
-  Ensures that the user provides a new directory name,
-  and that the directory does not already exist.
+  Does all phase 1 processing of file creation:
+  Ensures that the user provides a new filename, adds proper extension
+  if needed and that the file does not already exist, if it is a html,
+  problem, page, or sequence, it then creates a form link to hand the
+  actual creation off to the proper handler.
 
 Parameters:
 
@@ -661,47 +661,53 @@ Parameters:
 
 =item   $username - Name of the user that is requesting the directory creation.
 
-=item   $path     - current directory relative to construction space.
+=item   $domain   - Name of the domain of the user
 
-=item   $newdir   - Name of the directory to be created; path relative to the 
-               top level of construction space.
+=item   $fn      - Source file name
+
+=item   $newfilename
+                  - Name of the file to be created; no path information
 =back
 
 Side Effects:
 
 =over 4
 
-=item A new form is displayed.  Clicking on the confirmation button
-causes the newdir operation to transition into phase 2.  The hidden field
-"newfilename" is set with the construction space path to the new directory.
-
+=item 2 new forms are displayed.  Clicking on the confirmation button
+causes the browser to attempt to load the specfied URL, allowing the
+proper handler to take care of file creation. There is also a Cancel
+button which returns you to the driectory listing you came from
 
 =back
 
 =cut
 
 
-sub NewDir1
-{
-  my ($request, $username, $path, $newdir) = @_;
+sub NewFile1 {
+    my ($request, $user, $domain, $fn, $newfilename) = @_;
 
-  my $fullpath = '/home/'.$username.'/public_html/'.
-    $path.'/'.$newdir;
-
-  my $cancelurl = '/priv/'.$username.'/'.$path;
-
-  &Debug($request, "Full path is : ".$fullpath);
-
-  if(-e $fullpath) {
-    $request->print('<p>Directory exists.</p></form>');
-  }
-  else {
-    $request->print('<input type=hidden name=newfilename value="'.
-		    $newdir.'"><p>Make new directory <tt>'.
-		    $path."/".$newdir.'</tt>?</p>');
-    &CloseForm1($request, $cancelurl);
+    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";
+	}
+    }
 
-  }
+    if(-e $newfilename) {
+	$request->print('<p>File exists.</p></form>');
+    }
+    else {
+	$request->print('<p>Make new file '.&display($newfilename).'?</p>');
+	$request->print('</form>');
+	$request->print('<form action="'.&url($newfilename).
+			'" method="POST"><p><input type="submit" value="Continue" /></p></form>');
+	$request->print('<form action="'.&url($fn).
+			'" method="POST"><p><input type="submit" value="Cancel" /></p></form>');
+    }
 }
 
 =pod
@@ -735,38 +741,40 @@ performed and reported to the user.
 sub phaseone {
   my ($r,$fn,$uname,$udom)=@_;
   
-  $fn=~m:(.*)/([^/]+)\.(\w+)$:;
-  my $dir=$1;
-  my $main=$2;
-  my $suffix=$3;
-  
-  #  my $conspace=ConstructionPathFromRelative($uname, $fn);
-  
-  
-  $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'}.'>');
+  my $newfilename=&cleanDest($r,$ENV{'form.newfilename'});
+  $newfilename=&relativeDest($fn,$newfilename,$uname);
+
+  $r->print('<form action="/adm/cfile" method="post">'.
+      '<input type="hidden" name="qualifiedfilename" value="'.$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);
-    
+      &Rename1($r, $uname, $udom, $fn, $newfilename);
   } elsif ($ENV{'form.action'} eq 'delete') { 
-    
-    &Delete1($r, $uname, $fn);
-    
+      &Delete1($r, $uname, $udom, $fn);
   } elsif ($ENV{'form.action'} eq 'copy') { 
-    if($ENV{'form.newfilename'}) {
-      my $newfilename = $ENV{'form.newfilename'};
-      &Copy1($r, $uname, $udom, $dir, $fn, $newfilename);
-    }else {
-      $r->print('<p>No new filename specified.</p></form>');
-    }
+      if($newfilename) {
+	  &Copy1($r, $uname, $udom, $fn, $newfilename);
+      } else {
+	  $r->print('<p>No new filename specified.</p></form>');
+      }
   } elsif ($ENV{'form.action'} eq 'newdir') {
-    &NewDir1($r, $uname, $dir, $ENV{'form.newfilename'});
+      &NewDir1($r, $uname, $udom, $fn, $newfilename);
+  }  elsif ($ENV{'form.action'} eq 'newfile' ||
+	    $ENV{'form.action'} eq 'newhtmlfile' ||
+	    $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 ($newfilename) {
+	  &NewFile1($r, $uname, $udom, $fn, $newfilename);
+      } else {
+	  $r->print('<p>No new filename specified.</p></form>');
+      }
   }
-  
 }
 
 =pod
@@ -813,9 +821,20 @@ sub Rename2 {
 	 $newfile);
 
   if(-e $oldfile) {
-      unless(rename($oldfile,
-		    $directory.'/'.$newfile)) {
-	  $request->print('<font color=red>Error: '.$!.'</font>');
+      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 {}
   } else {
@@ -859,11 +878,11 @@ sub Delete2 {
 
   if(-e $filename) {
     unless(unlink($filename)) {
-      $request->print('<font color=red>Error: '.$!.'</font>');
+      $request->print('<font color="red">Error: '.$!.'</font>');
       return 0;
     }
   } else {
-    $request->print('<p> No such file. </form');
+    $request->print('<p> No such file. </p></form');
     return 0;
   }
   return 1;
@@ -902,11 +921,11 @@ sub Copy2 {
     &Debug($request ,"Will try to copy $oldfile to $newfile");
     if(-e $oldfile) {
 	unless (copy($oldfile, $newfile)) {
-	    $request->print('<font color=red> copy Error: '.$!.'</font>');
+	    $request->print('<font color="red"> copy Error: '.$!.'</font>');
 	    return 0;
 	} else {
 	    unless (chmod(0660, $newfile)) {
-		$request->print('<font color=red> chmod error: '.$!.'</font>');
+		$request->print('<font color="red"> chmod error: '.$!.'</font>');
 		return 0;
 	    }
 	    return 1;
@@ -943,11 +962,11 @@ sub NewDir2 {
   my ($request, $user, $newdirectory) = @_;
   
   unless(mkdir($newdirectory, 02770)) {
-    $request->print('<font color=red>Error: '.$!.'</font>');
+    $request->print('<font color="red">Error: '.$!.'</font>');
     return 0;
   }
   unless(chmod(02770, ($newdirectory))) {
-      $request->print('<font color=red> Error: '.$!.'</font>');
+      $request->print('<font color="red"> Error: '.$!.'</font>');
       return 0;
   }
   return 1;
@@ -992,11 +1011,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, 
@@ -1016,12 +1040,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') { 
@@ -1040,7 +1071,7 @@ sub phasetwo {
 	    $dest = $ENV{'form.newfilename'};
      
 	} else {
-	    $r->print('<p>No New filename specified</form>');
+	    $r->print('<p>No New filename specified</p></form>');
 	    return;
 	}
 	
@@ -1059,19 +1090,24 @@ sub phasetwo {
     #  Substitute for priv for the first home in $dir to get our
     # construction space path.
     #
+    $dest=&MakeFinalUrl($r,$dest);
+
+    $r->print('<h3><a href="'.$dest.'">Done</a></h3>');
+}
+
+sub MakeFinalUrl {
+    my($r,$dest)=@_;
     &Debug($r, "Final url is: $dest");
     $dest =~ s|/home/|/priv/|;
     $dest =~ s|/public_html||;
-    
+
     my $base = &File::Basename::basename($dest);
     my $dpath= &File::Basename::dirname($dest);
     if ($base eq '.') { $base=''; }
     $dest = &HTML::Entities::encode($dpath.'/'.$base);
 
-
     &Debug($r, "Final url after rewrite: $dest");
-
-    $r->print('<h3><a href="'.$dest.'">Done</a></h3>');
+    return $dest;
 }
 
 sub handler {
@@ -1082,17 +1118,18 @@ sub handler {
   &Debug($r, "loncfile.pm - handler entered");
   &Debug($r, " filename: ".$ENV{'form.filename'});
   &Debug($r, " newfilename: ".$ENV{'form.newfilename'});
-
+#
+# Determine the root filename
+# This could come in as "filename", which actually is a URL, or
+# as "qualifiedfilename", which is indeed a real filename in filesystem
+#
   my $fn;
 
   if ($ENV{'form.filename'}) {
-      $fn=$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=&Apache::lonnet::unescape($ENV{'form.filename'});
+      $fn=&URLToPath($fn);
+  } elsif ($ENV{'form.qualifiedfilename'}) {
+      $fn=$ENV{'form.qualifiedfilename'};
   } else {
       &Debug($r, "loncfile::handler - no form.filename");
      $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
@@ -1123,22 +1160,19 @@ sub handler {
      return HTTP_NOT_ACCEPTABLE;
   }
 
-  $fn=~s/\/\~(\w+)//;
-  &Debug($r, "loncfile::handler ~ removed filename: $fn");
 
   $r->content_type('text/html');
   $r->send_http_header;
 
   $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('Construction Space File Operation'));
 
   
-  $r->print('<h1>Construction Space <tt>'.$fn.'</tt></h1>');
+  $r->print('<h3>Location: '.&display($fn).'</h3>');
   
   if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
-          $r->print('<h3><font color=red>Co-Author: '.$uname.' at '.$udom.
+          $r->print('<h3><font color="red">Co-Author: '.$uname.' at '.$udom.
                '</font></h3>');
   }
 
@@ -1153,8 +1187,17 @@ sub handler {
       $r->print('<h3>New Directory</h3>');
   } elsif ($ENV{'form.action'} eq 'copy') {
       $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 '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</body></html>');
+     $r->print('<p>Unknown Action '.$ENV{'form.action'}.' </p></body></html>');
      return OK;  
   }
   if ($ENV{'form.phase'} eq 'two') {