--- loncom/publisher/lonupload.pm	2003/07/05 10:07:12	1.17
+++ loncom/publisher/lonupload.pm	2003/08/04 17:45:06	1.18
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Handler to upload files into construction space
 #
-# $Id: lonupload.pm,v 1.17 2003/07/05 10:07:12 www Exp $
+# $Id: lonupload.pm,v 1.18 2003/08/04 17:45:06 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,25 +26,6 @@
 #
 # http://www.lon-capa.org/
 #
-# (Handler to retrieve an old version of a file
-#
-# (Publication Handler
-# 
-# (TeX Content Handler
-#
-# YEAR=2000
-# 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
-# YEAR=2001
-# 03/23 Guy Albertelli
-# 03/24,03/29 Gerd Kortemeyer)
-#
-# 03/31,04/03 Gerd Kortemeyer)
-#
-# 04/05,04/09,05/25,06/23,06/24,08/22 Gerd Kortemeyer
-# 11/29 Matthew Hall
-#
 ###
 
 package Apache::lonupload;
@@ -83,7 +64,7 @@ sub upfile_store {
     my $fname=$ENV{'form.upfile.filename'};
     $fname=~s/\W//g;
     
-    chop($ENV{'form.upfile'});
+    chomp($ENV{'form.upfile'});
   
     my $datatoken=$ENV{'user.name'}.'_'.$ENV{'user.domain'}.
 		  '_upload_'.$fname.'_'.time.'_'.$$;
@@ -116,9 +97,9 @@ sub phaseone {
  '<form action=/adm/upload method=post>'.
  '<input type=hidden name=phase value=two>'.
  '<input type=hidden name=datatoken value="'.&upfile_store.'">'.
+ '<input type=hidden name=uploaduname value="'.$uname.'">'.
  'Store uploaded file as '.
- '<input type=text size=50 name=filename value="/priv/'.
-  $uname.'/'.$fn.'"><br>'.
+ '<input type=text size=50 name=filename value="'.$fn.'"><br>'.
  '<input type=submit value="Store"></form>');
       # Check for bad extension and warn user
       if ($fn=~/\.(\w+)$/ && 
@@ -147,12 +128,11 @@ sub phaseone {
 }
 
 sub phasetwo {
-   my ($r,$fn,$uname,$udom)=@_;
-   &Debug($r, "Filename is ".$fn);
-   if ($fn=~/^\/priv\/$uname\//) {
-    &Debug($r, "Filename after priv substitution: ".$fn);
-    my $tfn=$fn;
-    $tfn=~s/^\/(\~|priv)\/(\w+)//;
+   my ($r,$tfn,$uname,$udom)=@_;
+   my $fn='/priv/'.$uname.'/'.$tfn;
+   $fn=~s/\/+/\//g;
+   &Debug($r, "Filename is ".$tfn);
+   if ($tfn) {
     &Debug($r, "Filename for tfn = ".$tfn);
     my $target='/home/'.$uname.'/public_html'.$tfn;
     &Debug($r, "target -> ".$target);
@@ -220,6 +200,14 @@ sub handler {
 
   my $uname;
   my $udom;
+#
+# phase two: re-attach user
+#
+  if ($ENV{'form.uploaduname'}) {
+      $ENV{'form.filename'}='/priv/'.$ENV{'form.uploaduname'}.'/'.
+	  $ENV{'form.filename'};
+  }
+#
 
   ($uname,$udom)=
     &Apache::loncacc::constructaccess(
@@ -233,10 +221,12 @@ sub handler {
   }
 
   my $fn;
-
   if ($ENV{'form.filename'}) {
       $fn=$ENV{'form.filename'};
-      $fn=~s/^http\:\/\/[^\/]+\/(\~|priv\/)(\w+)//;
+      $fn=~s/^http\:\/\/[^\/]+\///;
+      $fn=~s/^\///;
+      $fn=~s/(\~|priv\/)(\w+)//;
+      $fn=~s/\/+/\//g;
   } else {
      $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
          ' unspecified filename for upload', $r->filename);