--- loncom/publisher/loncfile.pm 2004/01/05 16:48:50 1.50 +++ loncom/publisher/loncfile.pm 2004/03/02 16:48:27 1.52 @@ -9,7 +9,7 @@ # and displays a page showing the results of the action. # # -# $Id: loncfile.pm,v 1.50 2004/01/05 16:48:50 www Exp $ +# $Id: loncfile.pm,v 1.52 2004/03/02 16:48:27 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -406,13 +406,15 @@ new filename relative to the current dir =cut sub Rename1 { - my ($request, $user, $domain, $fn, $newfilename) = @_; + my ($request, $user, $domain, $fn, $newfilename, $style) = @_; if(-e $fn) { if($newfilename) { # is dest a dir - if (-d $newfilename) { - if ($fn =~ m|/([^/]*)$|) { $newfilename .= '/'.$1; } + if ($style eq 'move') { + if (-d $newfilename) { + if ($fn =~ m|/([^/]*)$|) { $newfilename .= '/'.$1; } + } } if ($newfilename =~ m|/[^\.]+$|) { #no extension add on original extension @@ -441,9 +443,15 @@ sub Rename1 { '
'.&mt('Cancel').''); return; } + my $action; + if ($style eq 'rename') { + $action=&mt('Rename'); + } else { + $action=&mt('Move'); + } $request->print('

'.&mt('Rename').' '.&display($fn). + '" />

'.$action.' '.&display($fn). '
to '.&display($newfilename).'?

'); &CloseForm1($request, $fn); } else { @@ -599,12 +607,17 @@ causes the newdir operation to transitio sub NewDir1 { - my ($request, $username, $domain, $fn, $newfilename) = @_; + my ($request, $username, $domain, $fn, $newfilename, $mode) = @_; my $result=&exists($username,$domain,$newfilename); if ($result) { $request->print(''.$result.''); } else { + if ($mode eq 'testbank') { + $request->print(''); + } elsif ($mode eq 'imsimport') { + $request->print(''); + } $request->print('

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

'); @@ -737,7 +750,9 @@ sub phaseone { ''); if ($ENV{'form.action'} eq 'rename') { - &Rename1($r, $uname, $udom, $fn, $newfilename); + &Rename1($r, $uname, $udom, $fn, $newfilename, 'rename'); + } elsif ($ENV{'form.action'} eq 'move') { + &Rename1($r, $uname, $udom, $fn, $newfilename, 'move'); } elsif ($ENV{'form.action'} eq 'delete') { &Delete1($r, $uname, $udom, $fn); } elsif ($ENV{'form.action'} eq 'decompress') { @@ -749,7 +764,11 @@ sub phaseone { $r->print('

'.&mt('No new filename specified.').'

'); } } elsif ($ENV{'form.action'} eq 'newdir') { - &NewDir1($r, $uname, $udom, $fn, $newfilename); + my $mode = ''; + if (exists($ENV{'form.callingmode'}) ) { + $mode = $ENV{'form.callingmode'}; + } + &NewDir1($r, $uname, $udom, $fn, $newfilename, $mode); } elsif ($ENV{'form.action'} eq 'newfile' || $ENV{'form.action'} eq 'newhtmlfile' || $ENV{'form.action'} eq 'newproblemfile' || @@ -1121,7 +1140,11 @@ sub phasetwo { } $dest = $newdir."/" } - $r->print('

'.&mt('Done').'

'); + if ( ($ENV{'form.action'} eq 'newdir') && ($ENV{'form.phase'} eq 'two') && ( ($ENV{'form.callingmode'} eq 'testbank') || ($ENV{'form.callingmode'} eq 'imsimport') ) ) { + $r->print('

'.&mt('Done').'

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

'.&mt('Done').'

'); + } } sub handler { @@ -1189,9 +1212,24 @@ sub handler { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - $r->print('LON-CAPA Construction Space'); - - $r->print(&Apache::loncommon::bodytag('Construction Space File Operation')); + if ( ($ENV{'form.action'} eq 'newdir') && ($ENV{'form.phase'} eq 'two') && ( ($ENV{'form.callingmode'} eq 'testbank') || ($ENV{'form.callingmode'} eq 'imsimport') ) ) { + my $newdirname = $ENV{'form.newfilename'}; + $r->print('LON-CAPA Construction Space + |); + my $loaditem = 'onLoad="writeDone()"'; + $r->print(&Apache::loncommon::bodytag('Construction Space File Operation','',$loaditem)); + } else { + $r->print('LON-CAPA Construction Space'); + $r->print(&Apache::loncommon::bodytag('Construction Space File Operation')); + } $r->print('

'.&mt('Location').': '.&display($fn).'

'); @@ -1208,6 +1246,8 @@ sub handler { $r->print('

'.&mt('Delete').'

'); } elsif ($ENV{'form.action'} eq 'rename') { $r->print('

'.&mt('Rename').'

'); + } elsif ($ENV{'form.action'} eq 'move') { + $r->print('

'.&mt('Move').'

'); } elsif ($ENV{'form.action'} eq 'newdir') { $r->print('

'.&mt('New Directory').'

'); } elsif ($ENV{'form.action'} eq 'decompress') {