--- loncom/publisher/loncfile.pm	2004/08/24 21:21:41	1.62
+++ loncom/publisher/loncfile.pm	2005/03/10 03:50:49	1.65
@@ -9,7 +9,7 @@
 #  and displays a page showing the results of the action.
 #
 #
-# $Id: loncfile.pm,v 1.62 2004/08/24 21:21:41 albertel Exp $
+# $Id: loncfile.pm,v 1.65 2005/03/10 03:50:49 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -289,7 +289,7 @@ sub checksuffix {
 }
 
 sub cleanDest {
-    my ($request,$dest,$subdir)=@_;
+    my ($request,$dest,$subdir,$fn,$uname)=@_;
     #remove bad characters
     my $foundbad=0;
     if ($subdir && $dest =~/\./) {
@@ -300,6 +300,14 @@ sub cleanDest {
 	$foundbad=1;
 	$dest=~s/[\#\?&%\"]//g;
     }
+    if ($dest=~m|/|) {
+	my ($newpath)=($dest=~m|(.*)/|);
+	$newpath=&relativeDest($fn,$newpath,$uname);
+	if (! -d "$newpath") {
+	    $request->print("<p><font color=\"red\">".&mt('You have requested to create file in directory [_1] which doesn\'t exist. The requested directory path has been removed from the requested file name.','"<tt>'.$newpath.'</tt>"')."</font></p>");
+	    $dest=~s|.*/||;
+	}
+    }
     if ($foundbad) {
 	$request->print("<p><font color=\"red\">".&mt('Invalid characters in requested name have been removed.')."</font></p>");
     }
@@ -760,7 +768,7 @@ sub phaseone {
   
     my $doingdir=0;
     if ($ENV{'form.action'} eq 'newdir') { $doingdir=1; }
-    my $newfilename=&cleanDest($r,$ENV{'form.newfilename'},$doingdir);
+    my $newfilename=&cleanDest($r,$ENV{'form.newfilename'},$doingdir,$fn,$uname);
     $newfilename=&relativeDest($fn,$newfilename,$uname);
     $r->print('<form action="/adm/cfile" method="post">'.
 	      '<input type="hidden" name="qualifiedfilename" value="'.$fn.'" />'.
@@ -794,8 +802,10 @@ sub phaseone {
 	      $ENV{'form.action'} eq 'newsequencefile' ||
 	      $ENV{'form.action'} eq 'newrightsfile' ||
 	      $ENV{'form.action'} eq 'newstyfile' ||
+              $ENV{'form.action'} eq 'newlibraryfile' ||
 	      $ENV{'form.action'} eq 'Select Action') {
-	if ($newfilename) {
+        my $empty=&mt('Type Name Here');
+	if (($newfilename!~/\/$/) && ($newfilename!~/$empty$/)) {
 	    &NewFile1($r, $uname, $udom, $fn, $newfilename);
 	} else {
 	    $r->print('<p>'.&mt('No new filename specified.').'</p></form>');
@@ -1278,6 +1288,7 @@ function writeDone() {
 	     $ENV{'form.action'} eq 'newsequencefile' ||
 	     $ENV{'form.action'} eq 'newrightsfile' ||
 	     $ENV{'form.action'} eq 'newstyfile' ||
+             $ENV{'form.action'} eq 'newlibraryfile' ||
 	     $ENV{'form.action'} eq 'Select Action' ) {
 	$r->print('<h3>'.&mt('New Resource').'</h3>');
     } else {