--- loncom/publisher/lonupload.pm	2008/11/20 16:32:34	1.41
+++ loncom/publisher/lonupload.pm	2008/12/19 03:57:24	1.43
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Handler to upload files into construction space
 #
-# $Id: lonupload.pm,v 1.41 2008/11/20 16:32:34 bisitz Exp $
+# $Id: lonupload.pm,v 1.43 2008/12/19 03:57:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -290,8 +290,8 @@ sub check_extension {
     if ($fn=~/\.(\w+)$/ &&
         (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
         $result .= &mt('File [_1] could not be copied.',
-                      '<p class="LC_filename">'.$fn.'</span> ').
-                  '<span class="LC_error">'.
+                      '<span class="LC_filename">'.$fn.'</span> ').
+                  '<p class="LC_error">'.
                   &mt('The extension on this file is reserved internally by LON-CAPA.').
                   '</p>';
     } elsif ($fn=~/\.(\w+)$/ &&
@@ -421,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;