tyler.durden
/
squidanalyzer
mirror of https://github.com/darold/squidanalyzer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed all absolete code related to FooterFile and HeaderFile.

This commit is contained in:
Darold Gilles 2012-12-10 22:30:39 +01:00
parent 510e831ef6
commit 6e1a88a214
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
SquidAnalyzer.pm
View File

@ -405,8 +405,6 @@ sub _init
$self->{WebUrl} .= '/' if ($self->{WebUrl} && ($self->{WebUrl} !~ /\/$/));
$self->{DateFormat} = $options{DateFormat} || '%y-%m-%d';
$self->{Lang} = $options{Lang} || '';
$self->{HeaderFile} = $options{HeaderFile} || '';
$self->{FooterFile} = $options{FooterFile} || '';
$self->{AnonymizeLogin} = $options{AnonymizeLogin} || 0;
$self->{SiblingHit} = $options{SiblingHit} || 1;
$self->{ImgFormat} = $options{ImgFormat} || 'png';
@ -421,22 +419,6 @@ sub _init
}
close(IN);
}
if ($self->{HeaderFile}) {
open(IN, "$self->{HeaderFile}") or die "ERROR: can't open header file $self->{HeaderFile}, $!\n";
$self->{HeaderFile} = '';
while (my $l = <IN>) {
$self->{HeaderFile} .= $l;
}
close(IN);
}
if ($self->{FooterFile}) {
open(IN, "$self->{FooterFile}") or die "ERROR: can't open footer file $self->{FooterFile}, $!\n";
$self->{FooterFile} = '';
while (my $l = <IN>) {
$self->{FooterFile} .= $l;
}
close(IN);
}
if (!$self->{Output}) {
die "ERROR: 'Output' configuration option must be set.\n";
}
@ -2812,10 +2794,6 @@ sub parse_config
print STDERR "Error: can't find translation file $opt{Lang}. See option: Lang\n";
exit 0;
}
if ($opt{FooterFile} && !-e $opt{FooterFile}) {
print STDERR "Error: can't find custom footer file $opt{FooterFile}. See option: FooterFile\n";
exit 0;
}
if ($opt{ImgFormat} && !grep(/^$opt{ImgFormat}$/, 'png','jpg')) {
print STDERR "Error: unknown image format. See option: ImgFormat\n";
exit 0;