--- loncom/publisher/lonupload.pm	2001/05/25 16:36:36	1.3
+++ loncom/publisher/lonupload.pm	2001/06/24 18:40:58	1.6
@@ -15,7 +15,7 @@
 #
 # 03/31,04/03 Gerd Kortemeyer)
 #
-# 04/05,04/09,05/25 Gerd Kortemeyer
+# 04/05,04/09,05/25,06/23,06/24 Gerd Kortemeyer
 
 package Apache::lonupload;
 
@@ -45,13 +45,15 @@ sub upfile_store {
 
 
 sub phaseone {
-    my ($r,$fn,$uname,$udom)=@_;
+   my ($r,$fn,$uname,$udom)=@_;
+   $ENV{'form.upfile.filename'}=~s/\\/\//g;
+   $ENV{'form.upfile.filename'}=~s/^.*\/([^\/]+)$/$1/;
+   if ($ENV{'form.upfile.filename'}) {
     $fn=~s/\/[^\/]+$//;
     $fn=~s/([^\/])$/$1\//;
     $fn.=$ENV{'form.upfile.filename'};
     $fn=~s/^\///;
     $fn=~s/(\/)+/\//g;
-
     if (($fn) && ($fn!~/\/$/)) {
       $r->print(
  '<form action=/adm/upload method=post>'.
@@ -64,10 +66,14 @@ sub phaseone {
   } else {
       $r->print('<font color=red>Illegal filename.</font>');
   }
+ } else {
+     $r->print('<font color=red>No upload file specified.</font>');
+ }
 }
 
 sub phasetwo {
-    my ($r,$fn,$uname,$udom)=@_;
+   my ($r,$fn,$uname,$udom)=@_;
+   if ($fn=~/^\/priv\/$uname\//) { 
     my $tfn=$fn;
     $tfn=~s/^\/(\~|priv)\/(\w+)//;
     my $target='/home/'.$uname.'/public_html'.$tfn;
@@ -97,6 +103,11 @@ sub phasetwo {
    '<font size=+1 color=red>Please pick a filename</font><p>');
        &phaseone($r,$fn,$uname,$udom);
     }
+  } else {
+    $r->print(
+   '<font size=+1 color=red>Please pick a filename</font><p>');
+    &phaseone($r,$fn,$uname,$udom);
+  }
 }
 
 sub handler {
@@ -106,9 +117,10 @@ sub handler {
   my $uname;
   my $udom;
 
-  unless (($uname,$udom)=
+  ($uname,$udom)=
     &Apache::loncacc::constructaccess(
-             $ENV{'form.filename'},$r->dir_config('lonDefDomain'))) {
+			 $ENV{'form.filename'},$r->dir_config('lonDefDomain'));
+  unless (($uname) && ($udom)) {
      $r->log_reason($uname.' at '.$udom.
          ' trying to publish file '.$ENV{'form.filename'}.
          ' - not authorized',