--- loncom/publisher/lonupload.pm	2001/11/29 21:51:40	1.8
+++ loncom/publisher/lonupload.pm	2001/12/04 18:13:06	1.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to upload files into construction space
 #
-# $Id: lonupload.pm,v 1.8 2001/11/29 21:51:40 matthew Exp $
+# $Id: lonupload.pm,v 1.9 2001/12/04 18:13:06 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -90,7 +90,7 @@ sub phaseone {
  '<input type=text size=50 name=filename value="/priv/'.
   $uname.'/'.$fn.'"><br>'.
  '<input type=submit value="Store"></form>');
-      # Check for bad extension
+      # Check for bad extension and warn user
       if ($fn=~/\.(\w+)$/ && 
 	  (&Apache::lonnet::fileembstyle($1) eq 'hdn')) {
 	  $r->print(
@@ -99,7 +99,15 @@ sub phaseone {
  '", is reserved internally by LON-CAPA. <br \>'.
  'Please change the extension.'.
  '</font>');
-      }  
+      } elsif($fn=~/\.(\w+)$/ && 
+	      !defined(&Apache::lonnet::fileembstyle($1))) {
+	  $r->print(
+ '<font color=red>'.
+ 'The extension on this file, "'.$1.
+ '", is not recognized by LON-CAPA. <br \>'.
+ 'Please change the extension.'.
+ '</font>');
+      }
   } else {
       $r->print('<font color=red>Illegal filename.</font>');
   }
@@ -127,7 +135,7 @@ sub phasetwo {
        } else {
            my $source=$r->dir_config('lonDaemons').
 	                             '/tmp/'.$datatoken.'.tmp';
-           # Check for bad extension
+           # Check for bad extension and disallow upload
 	   if ($fn=~/\.(\w+)$/ && 
 	       (&Apache::lonnet::fileembstyle($1) eq 'hdn')) {
 	       $r->print(
@@ -135,6 +143,13 @@ sub phasetwo {
  '<font color=red>'.
  'The extension on this file is reserved internally by LON-CAPA.'.
  '</font>');
+	   } elsif ($fn=~/\.(\w+)$/ && 
+		    !defined(&Apache::lonnet::fileembstyle($1))) {
+	       $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.'.
+ '</font>');
 	   } elsif (copy($source,$target)) {
 	      $r->print('File copied.');
               $r->print('<p><font size=+2><a href="'.$fn.