--- loncom/publisher/loncfile.pm	2003/06/20 15:30:13	1.33
+++ 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.33 2003/06/20 15:30:13 www Exp $
+# $Id: loncfile.pm,v 1.35 2003/08/01 20:32:05 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -173,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;
 }
@@ -879,6 +880,8 @@ sub phaseone {
 	    $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'};
@@ -1239,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'}.
@@ -1309,6 +1307,8 @@ sub handler {
 	   $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 {