--- loncom/publisher/loncfile.pm 2007/10/18 21:58:21 1.87 +++ loncom/publisher/loncfile.pm 2008/09/24 17:30:18 1.90 @@ -9,7 +9,7 @@ # and displays a page showing the results of the action. # # -# $Id: loncfile.pm,v 1.87 2007/10/18 21:58:21 albertel Exp $ +# $Id: loncfile.pm,v 1.90 2008/09/24 17:30:18 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -109,6 +109,17 @@ sub Debug { } } +sub done { + my ($url)=@_; + my $done=&mt("Done"); + return(<$done + +ENDDONE +} + =pod =item URLToPath($url) @@ -435,7 +446,7 @@ Parameters: sub CloseForm2 { my ($request, $user, $fn) = @_; - $request->print('

'.&mt('Done').'

'); + $request->print(&done(&url($fn))); } =pod @@ -1128,8 +1139,8 @@ sub NewDir2 { sub decompress2 { my ($r, $user, $dir, $file) = @_; - &Apache::lonnet::appenv('cgi.file' => $file); - &Apache::lonnet::appenv('cgi.dir' => $dir); + &Apache::lonnet::appenv({'cgi.file' => $file}); + &Apache::lonnet::appenv({'cgi.dir' => $dir}); my $result=&Apache::lonnet::ssi_body('/cgi-bin/decompress.pl'); $r->print($result); &Apache::lonnet::delenv('cgi.file'); @@ -1256,7 +1267,7 @@ sub phasetwo { $r->print('

'.&mt('Return to Directory').'

'); $r->print('

'.$disp_newname.'

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

'.&mt('Done').'

'); + $r->print(&done(&url($dest))); } } } @@ -1330,10 +1341,9 @@ sub handler { $js = qq| |;