--- loncom/homework/inputtags.pm	2005/03/31 21:24:29	1.160
+++ loncom/homework/inputtags.pm	2005/03/31 21:32:52	1.162
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.160 2005/03/31 21:24:29 albertel Exp $
+# $Id: inputtags.pm,v 1.162 2005/03/31 21:32:52 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -306,8 +306,11 @@ sub file_selector {
     if (!$uploadedfiletypes) { return ''; }
     my $result;
     
-    $result.='<tr><td>'.
-	&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />';
+    $result.='<tr><td>';
+    if ($uploadedfiletypes ne '*') {
+	$result.=
+	    &mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />';
+    }
     if ($which eq 'uploadonly' || $which eq 'both') { 
 	$result.=&mt('Submit a file: (only one file can be uploaded)').
 	    ' <br /><input type="file" size="50" name="HWFILE'.
@@ -335,15 +338,15 @@ sub file_selector {
 	    '<input type="text" size="50" name="HWPORT'.$part.'_'.$id.'" value="" />'.
 	    '<br />';
 	if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
-	    my $filelist;
+	    my @filelist;
 	    foreach my $file (split(',',&Apache::lonnet::unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) {
 		my (undef,undef,$domain,$user)=&Apache::lonxml::whichuser();
 		my $url="/uploaded/$domain/$user/portfolio$file";
 		my $icon=&Apache::loncommon::icon($url);
-		$filelist.='<a href="'.$url.'"><img src="'.$icon.
-		    '" border="0" />'.$file.'</a>';
+		push(@filelist,'<a href="'.$url.'"><img src="'.$icon.
+		     '" border="0" />'.$file.'</a>');
 	    }
-	    $result.=&mt("Portfolio files previously selected: <strong>[_1]</strong>",$filelist);
+	    $result.=&mt("Portfolio files previously selected: <strong>[_1]</strong>",join(', ',@filelist));
 	}
     }
     $result.='</td></tr>';