version 1.71, 2005/08/16 15:52:08
|
version 1.74, 2005/11/09 09:06:59
|
Line 69 use File::Copy;
|
Line 69 use File::Copy;
|
use HTML::Entities(); |
use HTML::Entities(); |
use Apache::Constants qw(:common :http :methods); |
use Apache::Constants qw(:common :http :methods); |
use Apache::loncacc; |
use Apache::loncacc; |
use Apache::Log (); |
|
use Apache::lonnet; |
use Apache::lonnet; |
use Apache::loncommon(); |
use Apache::loncommon(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
Line 101 my $r; # Needs to be global for some
|
Line 100 my $r; # Needs to be global for some
|
=cut |
=cut |
|
|
sub Debug { |
sub Debug { |
|
|
# Marshall the parameters. |
|
|
|
my $r = shift; |
|
my $log = $r->log; |
|
my $message = shift; |
|
|
|
# Put out the indicated message butonly if DEBUG is true. |
# Put out the indicated message butonly if DEBUG is true. |
|
|
if ($DEBUG) { |
if ($DEBUG) { |
|
my ($r,$message) = @_; |
$r->log_reason($message); |
$r->log_reason($message); |
} |
} |
} |
} |
Line 195 sub obsolete_unpub {
|
Line 187 sub obsolete_unpub {
|
} |
} |
|
|
# see if directory is empty |
# see if directory is empty |
# ignores any .meta, .save and .log files created for a previously |
# ignores any .meta, .save, .bak, and .log files created for a previously |
# published file, which has since been marked obsolete and deleted. |
# published file, which has since been marked obsolete and deleted. |
sub empty_directory { |
sub empty_directory { |
my ($dirname,$phase) = @_; |
my ($dirname,$phase) = @_; |
if (opendir DIR, $dirname) { |
if (opendir DIR, $dirname) { |
my @files = grep(!/^\.\.?$/, readdir(DIR)); # ignore . and .. |
my @files = grep(!/^\.\.?$/, readdir(DIR)); # ignore . and .. |
if (@files) { |
if (@files) { |
my @orphans = grep(/\.(meta|save|log)$/,@files); |
my @orphans = grep(/\.(meta|save|log|bak)$/,@files); |
if (scalar(@files) - scalar(@orphans) > 0) { |
if (scalar(@files) - scalar(@orphans) > 0) { |
return 0; |
return 0; |
} else { |
} else { |
if (($phase eq 'Delete2') && (@orphans > 0)) { |
if (($phase eq 'Delete2') && (@orphans > 0)) { |
foreach my $file (@orphans) { |
foreach my $file (@orphans) { |
if ($file =~ /\.(meta|save|log)$/) { |
if ($file =~ /\.(meta|save|log|bak)$/) { |
unlink($dirname.$file); |
unlink($dirname.$file); |
} |
} |
} |
} |
Line 321 sub cleanDest {
|
Line 313 sub cleanDest {
|
$foundbad=1; |
$foundbad=1; |
$dest=~s/\.//g; |
$dest=~s/\.//g; |
} |
} |
if ($dest=~/[\#\?&%\"]/) { |
if ($dest=~/[\#\?&%\":]/) { |
$foundbad=1; |
$foundbad=1; |
$dest=~s/[\#\?&%\"]//g; |
$dest=~s/[\#\?&%\":]//g; |
} |
} |
if ($dest=~m|/|) { |
if ($dest=~m|/|) { |
my ($newpath)=($dest=~m|(.*)/|); |
my ($newpath)=($dest=~m|(.*)/|); |