--- loncom/publisher/lonupload.pm	2008/11/10 13:20:04	1.39
+++ loncom/publisher/lonupload.pm	2009/03/26 16:50:12	1.44
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Handler to upload files into construction space
 #
-# $Id: lonupload.pm,v 1.39 2008/11/10 13:20:04 jms Exp $
+# $Id: lonupload.pm,v 1.44 2009/03/26 16:50:12 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -83,30 +83,30 @@ html file).
 
 =head1 OTHER SUBROUTINES
 
-=over 4
+=over
 
-=item *
+=item phaseone()
 
-phaseone() : Interface for specifying file to upload.
+Interface for specifying file to upload.
 
-=item *
+=item phasetwo()
 
-phasetwo() : Interface for handling post-conditions about uploading (such
+Interface for handling post-conditions about uploading (such
 as overwriting an existing file).
 
-=item *
+=item phasethree()
 
-phasethree() : Interface for handling secondary uploads of embedded objects
+Interface for handling secondary uploads of embedded objects
 in an html file.
 
-=item *
+=item upfile_store()
 
-upfile_store() : Store contents of uploaded file into temporary space.  Invoked
+Store contents of uploaded file into temporary space.  Invoked
 by phaseone subroutine.
 
-=item *
+=item check_extension()
 
-check_extension() : Checks if filename extension is permitted and checks type
+Checks if filename extension is permitted and checks type
  of file - if html file, calls parser to check for embedded objects.
  Invoked by phasetwo subroutine.
 
@@ -184,10 +184,11 @@ sub phaseone {
 		      '<input type="hidden" name="datatoken" value="'.
 		      &upfile_store.'" />'.
 		      '<input type="hidden" name="uploaduname" value="'.$uname.
-		      '" />'.&mt('Save uploaded file as ').
+		      '" />'.&mt('Save uploaded file as [_1]',
                       "<span class='LC_filename'>/priv/$uname/</span>".
                       '<input type="text" size="50" name="filename" value="'.$fn.
-                      '" /><br />'.
+                      '" />').
+                      '<br />'.
 		      '<br />'.&mt('Choose file type:').'
 <select name="filetype">
  <option value="standard" selected>'.&mt('Regular file').'
@@ -201,15 +202,16 @@ sub phaseone {
 	    # Check for bad extension and warn user
 	    if ($fn=~/\.(\w+)$/ && 
 		(&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
-		$r->print('<span class="LC_error">'.&mt('The extension on this file,').
-			  ' "'.$1.'"'.&mt(', is reserved internally by LON-CAPA.').
-			  ' <br />'.&mt('Please change the extension.').'</span>');
+                $r->print('<p class="LC_error">'
+                          .&mt('The extension on this file, [_1], is reserved internally by LON-CAPA.','"'.$1.'"')
+                          .' <br />'.&mt('Please change the extension.')
+                          .'</p>');
 	    } elsif($fn=~/\.(\w+)$/ && 
 		    !defined(&Apache::loncommon::fileembstyle($1))) {
-		$r->print('<span class="LC_error">'.&mt('The extension on this file,').
-			  ' "'.$1.'"'.&mt(', is not recognized by LON-CAPA.').
-			  ' <br />'.&mt('Please change the extension.').
-			  '</span>');
+                $r->print('<p class="LC_error">'
+                         .&mt('The extension on this file, [_1], is not recognized by LON-CAPA.','"'.$1.'"')
+                         .' <br />'.&mt('Please change the extension.')
+                         .'</p>');
 	    }
 	} else {
 	    $r->print('<span class="LC_error">'.&mt('Illegal filename.').'</span>');
@@ -289,22 +291,22 @@ sub check_extension {
         (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
         $result .= &mt('File [_1] could not be copied.',
                       '<span class="LC_filename">'.$fn.'</span> ').
-                  '<br /><span class="LC_error">'.
+                  '<p class="LC_error">'.
                   &mt('The extension on this file is reserved internally by LON-CAPA.').
-                  '</span>';
+                  '</p>';
     } elsif ($fn=~/\.(\w+)$/ &&
              !defined(&Apache::loncommon::fileembstyle($1))) {
         $result .= &mt('File [_1] could not be copied.',
                       '<span class="LC_filename">'.$fn.'</span> ').
-                  '<br /><span class="LC_error">'.
+                  '<p class="LC_error">'.
                   &mt('The extension on this file is not recognized by LON-CAPA.').
-                  '</span>';
+                  '</p>';
     } elsif (-d $target) {
         $result .= &mt('File [_1] could not be copied.',
                       '<span class="LC_filename">'.$fn.'</span>').
-                  '<br /><span class="LC_error">'.
+                  '<p class="LC_error">'.
                   &mt('The target is an existing directory.').
-                  '</span>';
+                  '</p>';
     } elsif (copy($source,$target)) {
         chmod(0660, $target); # Set permissions to rw-rw---.
         if ($mode eq 'testbank' || $mode eq 'imsimport') {
@@ -419,7 +421,7 @@ function verifyForm() {
     my $fn;
     if ($env{'form.filename'}) {
 	$fn=$env{'form.filename'};
-	$fn=~s/^http\:\/\/[^\/]+\///;
+	$fn=~s/^https?\:\/\/[^\/]+\///;
 	$fn=~s/^\///;
 	$fn=~s{(~|priv/)($LONCAPA::username_re)}{};
 	$fn=~s/\/+/\//g;
@@ -442,8 +444,10 @@ function verifyForm() {
 					     $javascript));
   
     if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
-	$r->print('<h3><span class="LC_error">'.&mt('Co-Author').': '.$uname.
-		  &mt(' at ').$udom.'</span></h3>');
+        $r->print('<p class="LC_warning">'
+                 .&mt('Co-Author [_1]:[_2]',$uname,$udom)
+                 .'</p>'
+        );
     }
 
     if ($env{'form.phase'} eq 'three') {