--- loncom/publisher/lonupload.pm	2003/08/04 17:45:06	1.18
+++ loncom/publisher/lonupload.pm	2003/09/22 15:39:53	1.20
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Handler to upload files into construction space
 #
-# $Id: lonupload.pm,v 1.18 2003/08/04 17:45:06 www Exp $
+# $Id: lonupload.pm,v 1.20 2003/09/22 15:39:53 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,6 +40,7 @@ use Apache::loncommon();
 use Apache::Log();
 use Apache::lonnet;
 use HTML::Entities();
+use Apache::lonlocal;
 
 my $DEBUG=0;
 
@@ -98,32 +99,32 @@ sub phaseone {
  '<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 '.
+ &mt('Store uploaded file as ').
  '<input type=text size=50 name=filename value="'.$fn.'"><br>'.
- '<input type=submit value="Store"></form>');
+ '<input type=submit value="'.&mt('Store').'"></form>');
       # Check for bad extension and warn user
       if ($fn=~/\.(\w+)$/ && 
 	  (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
 	  $r->print(
  '<font color=red>'.
- 'The extension on this file, "'.$1.
- '", is reserved internally by LON-CAPA. <br \>'.
- 'Please change the extension.'.
+ &mt('The extension on this file,').' "'.$1.
+ '"'.&mt(', is reserved internally by LON-CAPA.').' <br \>'.
+ &mt('Please change the extension.').
  '</font>');
       } elsif($fn=~/\.(\w+)$/ && 
 	      !defined(&Apache::loncommon::fileembstyle($1))) {
 	  $r->print(
  '<font color=red>'.
- 'The extension on this file, "'.$1.
- '", is not recognized by LON-CAPA. <br \>'.
- 'Please change the extension.'.
+ &mt('The extension on this file,').' "'.$1.
+ '"'.&mt(', is not recognized by LON-CAPA.').' <br \>'.
+ &mt('Please change the extension.').
  '</font>');
       }
   } else {
-      $r->print('<font color=red>Illegal filename.</font>');
+      $r->print('<font color=red>'.&mt('Illegal filename.').'</font>');
   }
  } else {
-     $r->print('<font color=red>No upload file specified.</font>');
+     $r->print('<font color=red>'.&mt('No upload file specified.').'</font>');
  }
 }
 
@@ -147,11 +148,11 @@ sub phasetwo {
 	if ((-e $target) && ($ENV{'form.override'} ne 'Yes')) {
            $r->print(
  '<form action=/adm/upload method=post>'.
- 'File <tt>'.$fn.'</tt> exists. Overwrite? '.
+ &mt('File').' <tt>'.$fn.'</tt> '.&mt('exists. Overwrite?').' '.
  '<input type=hidden name=phase value=two>'.
  '<input type=hidden name=filename value="'."$url".'">'.
  '<input type=hidden name=datatoken value="'.$datatoken.'">'.
- '<input type=submit name=override value="Yes"></form>');
+ '<input type=submit name=override value="'.&mt('Yes').'"></form>');
        } else {
            my $source=$r->dir_config('lonDaemons').
 	                             '/tmp/'.$datatoken.'.tmp';
@@ -159,37 +160,50 @@ sub phasetwo {
 	   if ($fn=~/\.(\w+)$/ && 
 	       (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
 	       $r->print(
- 'File <tt>'.$fn.'</tt> could not be copied.<br />'.
+ &mt('File').' <tt>'.$fn.'</tt> '.&mt('could not be copied.').'<br />'.
  '<font color=red>'.
- 'The extension on this file is reserved internally by LON-CAPA.'.
+ &mt('The extension on this file is reserved internally by LON-CAPA.').
  '</font>');
+              $r->print('<p><font size=+2><a href="'.$path.
+                        '">'.&mt('Back to Directory').'</a></font>');
 	   } elsif ($fn=~/\.(\w+)$/ && 
 		    !defined(&Apache::loncommon::fileembstyle($1))) {
 	       $r->print(
+ &mt('File').' <tt>'.$fn.'</tt> '.&mt('could not be copied.').'<br />'.
+ '<font color=red>'.
+ &mt('The extension on this file is not recognized by LON-CAPA.').
+ '</font>');
+	       $r->print('<p><font size=+2><a href="'.$path.
+                        '">'.&mt('Back to Directory').'</a></font>');
+	   } elsif (-d $target) {
+	       $r->print(
  'File <tt>'.$fn.'</tt> could not be copied.<br />'.
  '<font color=red>'.
- 'The extension on this file is not recognized by LON-CAPA.'.
+ &mt('The target is an existing directory.').
  '</font>');
+	       $r->print('<p><font size=+2><a href="'.$path.
+                        '">'.&mt('Back to Directory').'</a></font>');
 	   } elsif (copy($source,$target)) {
 	       chmod(0660, $target); # Set permissions to rw-rw---.
-	      $r->print('File copied.');
+	      $r->print(&mt('File copied.'));
               $r->print('<p><font size=+2><a href="'.$url.
-                        '">View file</a></font>');
+                        '">'.&mt('View file').'</a></font>');
               $r->print('<p><font size=+2><a href="'.$path.
-                        '">Back to Directory</a></font>');
+                        '">'.&mt('Back to Directory').'</a></font>');
 	   } else {
               $r->print('Failed to copy: '.$!);
+              $r->print('<p><font size=+2><a href="'.$path.
+                        '">'.&mt('Back to Directory').'</a></font>');
 	   }
        }
     } else {
        $r->print(
-   '<font size=+1 color=red>Please pick a filename</font><p>');
-       &phaseone($r,$fn,$uname,$udom);
+   '<font size=+1 color=red>'.
+&mt('Please use browser "Back" button and pick a filename').'</font><p>');
     }
   } else {
     $r->print(
-   '<font size=+1 color=red>Please pick a filename</font><p>');
-    &phaseone($r,$fn,$uname,$udom);
+   '<font size=+1 color=red>'.&mt('Please use browser "Back" button and pick a filename').'</font><p>');
   }
 }
 
@@ -236,7 +250,7 @@ sub handler {
 # ----------------------------------------------------------- Start page output
 
 
-  $r->content_type('text/html');
+  &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;
 
   $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
@@ -244,7 +258,8 @@ sub handler {
   $r->print(&Apache::loncommon::bodytag('Upload file to Construction Space'));
   
   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>'&mt('Co-Author').': '.$uname.
+&mt(' at ').$udom.
                '</font></h3>');
   }