loncom/publisher/loncfile.pm - diff

Return to loncfile.pm CVS log

Up to [LON-CAPA] / loncom / publisher

version 1.19, 2002/10/28 23:23:41	version 1.20, 2002/11/27 17:05:50
Line 1017 sub phasetwo {	Line 1017 sub phasetwo {
# Once a resource is deleted, we just list the directory that	# Once a resource is deleted, we just list the directory that
# previously held it.	# previously held it.
#	#
$dest = $dir."/"; # Parent dir.	$dest = $dir."/."; # Parent dir.
} elsif ($ENV{'form.action'} eq 'copy') {	} elsif ($ENV{'form.action'} eq 'copy') {
if($ENV{'form.newfilename'}) {	if($ENV{'form.newfilename'}) {
if(!&Copy2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {	if(!&Copy2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {
Line 1046 sub phasetwo {	Line 1046 sub phasetwo {
# construction space path.	# construction space path.
#	#
&Debug($r, "Final url is: $dest");	&Debug($r, "Final url is: $dest");
$dest =~ s/\/home\//\/priv\//;	$dest =~ s\|/home/\|/priv/\|;
$dest =~ s/\/public_html//;	$dest =~ s\|/public_html\|\|;

my $base = &File::Basename::basename($dest);	my $base = &File::Basename::basename($dest);
my $dpath= &File::Basename::dirname($dest);	my $dpath= &File::Basename::dirname($dest);
	if ($base eq '.') { $base=''; }
$dest = &HTML::Entities::encode($dpath.'/'.$base);	$dest = &HTML::Entities::encode($dpath.'/'.$base);