version 1.77, 2006/05/30 12:47:41
|
version 1.79, 2006/11/23 01:50:57
|
Line 1138 sub phasetwo {
|
Line 1138 sub phasetwo {
|
|
|
&Debug($r, "loncfile - Entering phase 2 for $fn"); |
&Debug($r, "loncfile - Entering phase 2 for $fn"); |
|
|
# Break down the file into it's component pieces. |
# Break down the file into its component pieces. |
|
|
my $dir; # Directory path |
my $dir; # Directory path |
my $main; # Filename. |
my $main; # Filename. |
Line 1151 sub phasetwo {
|
Line 1151 sub phasetwo {
|
$suffix=$1; #This is the actually filename extension if it exists |
$suffix=$1; #This is the actually filename extension if it exists |
$main=~s/\.\w+$//; #strip the extension |
$main=~s/\.\w+$//; #strip the extension |
} |
} |
my $dest; # On success this is where we'll go. |
my $dest; # |
|
my $dest_dir; # On success this is where we'll go. |
|
my $disp_newname; # |
|
my $dest_newname; # |
&Debug($r,"loncfile::phase2 dir = $dir main = $main suffix = $suffix"); |
&Debug($r,"loncfile::phase2 dir = $dir main = $main suffix = $suffix"); |
&Debug($r," newfilename = ".$env{'form.newfilename'}); |
&Debug($r," newfilename = ".$env{'form.newfilename'}); |
|
|
Line 1179 sub phasetwo {
|
Line 1181 sub phasetwo {
|
if(!&Rename2($r, $uname, $dir, $fn, $env{'form.newfilename'})) { |
if(!&Rename2($r, $uname, $dir, $fn, $env{'form.newfilename'})) { |
return; |
return; |
} |
} |
$dest = $env{'form.newfilename'}; |
$dest = $dir."/"; |
|
$dest_newname = $env{'form.newfilename'}; |
|
$env{'form.newfilename'} =~ /.+(\/.+$)/; |
|
$disp_newname = $1; |
|
$disp_newname =~ s/\///; |
} |
} |
} elsif ($env{'form.action'} eq 'delete') { |
} elsif ($env{'form.action'} eq 'delete') { |
if(!&Delete2($r, $uname, $env{'form.newfilename'})) { |
if(!&Delete2($r, $uname, $env{'form.newfilename'})) { |
Line 1210 sub phasetwo {
|
Line 1216 sub phasetwo {
|
if ( ($env{'form.action'} eq 'newdir') && ($env{'form.phase'} eq 'two') && ( ($env{'form.callingmode'} eq 'testbank') || ($env{'form.callingmode'} eq 'imsimport') ) ) { |
if ( ($env{'form.action'} eq 'newdir') && ($env{'form.phase'} eq 'two') && ( ($env{'form.callingmode'} eq 'testbank') || ($env{'form.callingmode'} eq 'imsimport') ) ) { |
$r->print('<h3><a href="javascript:self.close()">'.&mt('Done').'</a></h3>'); |
$r->print('<h3><a href="javascript:self.close()">'.&mt('Done').'</a></h3>'); |
} else { |
} else { |
$r->print('<h3><a href="'.&url($dest).'">'.&mt('Done').'</a></h3>'); |
if ($env{'form.action'} eq 'rename') { |
|
$r->print('<h3><a href="'.&url($dest).'">'.&mt('Return to Directory').'</a></h3>'); |
|
$r->print('<h3><a href="'.&url($dest_newname).'">'.$disp_newname.'</a></h3>'); |
|
} else { |
|
$r->print('<h3><a href="'.&url($dest).'">'.&mt('Done').'</a></h3>'); |
|
} |
} |
} |
} |
} |
|
|