--- loncom/publisher/loncfile.pm 2003/02/10 23:13:17 1.24 +++ loncom/publisher/loncfile.pm 2003/02/10 23:19:45 1.25 @@ -9,7 +9,7 @@ # and displays a page showing the results of the action. # # -# $Id: loncfile.pm,v 1.24 2003/02/10 23:13:17 albertel Exp $ +# $Id: loncfile.pm,v 1.25 2003/02/10 23:19:45 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -776,7 +776,7 @@ sub NewFile1 { $request->print('

File exists.

'); } else { - $request->print('

Make new file '.$newfilename.'?

'); + $request->print('

Make new file '.$dir.'/'.$newfilename.'?

'); my $dest=&MakeFinalUrl($request,$fullpath); &Debug($request, "Cancel url is: ".$cancelurl); &Debug($request, "Dest url is: ".$dest); @@ -852,16 +852,16 @@ sub phaseone { } elsif ($ENV{'form.action'} eq 'newfile' || $ENV{'form.action'} eq 'newhtmlfile' || $ENV{'form.action'} eq 'newproblemfile') { - if($ENV{'form.newfilename'}) { - my $newfilename = $ENV{'form.newfilename'}; - if (!defined($dir)) { - $fn=~m:(.*)/:; - $dir=$1; + if($ENV{'form.newfilename'}) { + my $newfilename = $ENV{'form.newfilename'}; + if (!defined($dir)) { + $fn=~m:(.*)/:; + $dir=$1; + } + &NewFile1($r, $uname, $udom, $dir, $newfilename); + } else { + $r->print('

No new filename specified.

'); } - &NewFile1($r, $uname, $udom, $dir, $fn, $newfilename); - }else { - $r->print('

No new filename specified.

'); - } } }