--- loncom/publisher/loncfile.pm 2006/12/20 22:41:08 1.80 +++ loncom/publisher/loncfile.pm 2007/03/30 20:37:31 1.81 @@ -9,7 +9,7 @@ # and displays a page showing the results of the action. # # -# $Id: loncfile.pm,v 1.80 2006/12/20 22:41:08 albertel Exp $ +# $Id: loncfile.pm,v 1.81 2007/03/30 20:37:31 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -749,16 +749,16 @@ sub NewFile1 { return; } if ($newfilename !~ /\Q.$extension\E$/) { - if ($newfilename =~ m|^[^\.]*\.([^\.]+)$|) { + if ($newfilename =~ m|/[^/.]*\.(?:[^/.]+)$|) { #already has an extension strip it and add in expected one - $newfilename =~ s|.([^\.]+)$||; + $newfilename =~ s|(/[^./])\.(?:[^.]+)$|$1|; } $newfilename.=".$extension"; } } my $result=&exists($user,$domain,$newfilename); if($result) { - $request->print(''.$result.''); + $request->print(''.$result.''); } else { $request->print('

'.&mt('Make new file').' '.&display($newfilename).'?

'); $request->print('');