--- loncom/interface/londocs.pm	2004/06/27 16:43:28	1.131
+++ loncom/interface/londocs.pm	2004/07/08 19:58:29	1.135
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.131 2004/06/27 16:43:28 www Exp $
+# $Id: londocs.pm,v 1.135 2004/07/08 19:58:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -157,7 +157,7 @@ sub dumpcourse {
 	$crs=~s/\_/\//g;
 	foreach (keys %replacehash) {
 	    my $newfilename=$title.'/'.$replacehash{$_};
-	    $newfilename=~s/[^\w\/\.]+/\_/g;
+	    $newfilename=~s/[^\w\/\.\/]+/\_/g;
 	    my @dirs=split(/\//,$newfilename);
 	    my $path='/home/'.$ca.'/public_html';
 	    my $makepath=$path;
@@ -201,7 +201,8 @@ sub dumpcourse {
 		    $r->print(
 		  '<input type="hidden" name="authorspace" value="'.$1.'" />');
 		} else {
-		    $r->print('<option value="'.$1.'">'.$_.'</option>');
+		    $r->print('<option value="'.$1.'">'.$1.' - '.
+			      &Apache::loncommon::plainname(split(/\@/,$1)).'</option>');
 		}
 	    }
 	}
@@ -224,7 +225,7 @@ sub dumpcourse {
 		$title=$_;
 	    }
 	    $title=~s/\.(\w+)$//;
-	    $title=~s/\W+/\_/gs;
+	    $title=~s/[^\w\/]+/\_/gs;
 	    $title.='.'.$ext;
 	    $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td></tr>\n");
 	}
@@ -574,13 +575,15 @@ END
     my $isfolder=0;
     my $folderarg;
     if ($uploaded) {
-       if ($extension eq 'sequence') {
-	  $icon=$iconpath.'/folder_closed.gif';
-          $url=~/$coursenum\/([\/\w]+)\.sequence$/;
-          $url='/adm/coursedocs?';
-	  $folderarg=$1;
-          $isfolder=1;
-       }
+	if ($extension eq 'sequence') {
+	    $icon=$iconpath.'/folder_closed.gif';
+	    $url=~/$coursenum\/([\/\w]+)\.sequence$/;
+	    $url='/adm/coursedocs?';
+	    $folderarg=$1;
+	    $isfolder=1;
+	} else {
+	    &Apache::lonnet::allowuploaded('/adm/coursedoc',$url);
+	}
     }
     $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
     if ((!$isfolder) && ($residx) && ($folder!~/supplemental/)) {
@@ -1223,8 +1226,7 @@ ENDNEWSCRIPT
   $r->print('</head>'.
             &Apache::loncommon::bodytag('Course Documents','',$events,
 					'','',$showdoc).
-	    &Apache::loncommon::help_open_faq(273).
-	    &Apache::loncommon::help_open_bug('RAT'));
+	    &Apache::loncommon::help_open_menu('','','','',273,'RAT'));
   unless ($showdoc) {
 # -----------------------------------------------------------------------------
        my %lt=&Apache::lonlocal::texthash(