version 1.37, 2003/08/04 17:45:06
|
version 1.38, 2003/08/04 20:08:23
|
Line 819 sub Rename2 {
|
Line 819 sub Rename2 {
|
" new file ".$newfile."\n"); |
" new file ".$newfile."\n"); |
&Debug($request, "Target is: ".$directory.'/'. |
&Debug($request, "Target is: ".$directory.'/'. |
$newfile); |
$newfile); |
|
if (-e $oldfile) { |
if(-e $oldfile) { |
unless (rename($oldfile,$newfile)) { |
my $dest; |
|
|
|
if ($oldfile =~ m|/$|) { |
|
#renaming a dir |
|
$oldfile =~ s|/$||; |
|
$dest=$directory; |
|
$dest=~s|(/)([^/]*)$|$1|; |
|
$dest.='/'.$newfile; |
|
} else { |
|
$dest=$directory.'/'.$newfile; |
|
} |
|
|
|
unless(rename($oldfile,$dest)) { |
|
$request->print('<font color="red">Error: '.$!.'</font>'); |
$request->print('<font color="red">Error: '.$!.'</font>'); |
return 0; |
return 0; |
} else {} |
} |
} else { |
} else { |
$request->print("<p> No such file: /home".$user.'/public_html'. |
$request->print("<p> No such file: ".&display($oldfile).'</p></form>'); |
$oldfile.' </p></form>'); |
|
return 0; |
return 0; |
} |
} |
return 1; |
return 1; |
Line 1047 sub phasetwo {
|
Line 1033 sub phasetwo {
|
if(!&Rename2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) { |
if(!&Rename2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) { |
return; |
return; |
} |
} |
# Prepend the directory to the new name to form the basis of the |
$dest = &url($ENV{'form.newfilename'}); |
# url of the new resource. |
|
# |
|
#renaming a dir |
|
#remove last element for current dir |
|
if ($fn =~ m|/$|) { $dir =~ s|/[^/]*$||; } |
|
$dest = $dir."/".$ENV{'form.newfilename'}; |
|
} |
} |
} 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 1076 sub phasetwo {
|
Line 1056 sub phasetwo {
|
} |
} |
|
|
} elsif ($ENV{'form.action'} eq 'newdir') { |
} elsif ($ENV{'form.action'} eq 'newdir') { |
# |
my $newdir= $ENV{'form.newfilename'}; |
# Since the newfilename form field is construction space |
|
# relative, ew need to prepend the current path; now in $fn. |
|
# |
|
my $newdir= $fn.$ENV{'form.newfilename'}; |
|
if(!&NewDir2($r, $uname, $newdir)) { |
if(!&NewDir2($r, $uname, $newdir)) { |
return; |
return; |
} |
} |
$dest = $newdir."/" |
$dest = $newdir."/" |
} |
} |
# |
$r->print('<h3><a href="'.&url($dest).'">Done</a></h3>'); |
# Substitute for priv for the first home in $dir to get our |
|
# construction space path. |
|
# |
|
$dest=&MakeFinalUrl($r,$dest); |
|
|
|
$r->print('<h3><a href="'.$dest.'">Done</a></h3>'); |
|
} |
|
|
|
sub MakeFinalUrl { |
|
my($r,$dest)=@_; |
|
&Debug($r, "Final url is: $dest"); |
|
$dest =~ s|/home/|/priv/|; |
|
$dest =~ s|/public_html||; |
|
|
|
my $base = &File::Basename::basename($dest); |
|
my $dpath= &File::Basename::dirname($dest); |
|
if ($base eq '.') { $base=''; } |
|
$dest = &HTML::Entities::encode($dpath.'/'.$base); |
|
|
|
&Debug($r, "Final url after rewrite: $dest"); |
|
return $dest; |
|
} |
} |
|
|
sub handler { |
sub handler { |