Thanks to the great work of Nathanael Bonin, SquidAnalyzer has now a new design. Source tree has been reordered.

This commit is contained in:
Darold 2012-12-02 16:18:42 +01:00
parent eb242d7110
commit 2c56aae234
18 changed files with 150 additions and 7757 deletions

View File

@ -62,15 +62,21 @@ if [ ! -d "$DESTDIR$MANDIR" ]; then
mkdir -p $DESTDIR$MANDIR
fi
# Copy files that must not be overriden
install -m 644 squidanalyzer.conf $DESTDIR$CONFDIR/squidanalyzer.conf.orig
install -m 644 network-aliases $DESTDIR$CONFDIR/network-aliases.orig
install -m 644 user-aliases $DESTDIR$CONFDIR/user-aliases.orig
install -m 644 excluded $DESTDIR$CONFDIR/excluded.orig
install -m 644 etc/squidanalyzer.conf $DESTDIR$CONFDIR/squidanalyzer.conf.orig
install -m 644 etc/network-aliases $DESTDIR$CONFDIR/network-aliases.orig
install -m 644 etc/user-aliases $DESTDIR$CONFDIR/user-aliases.orig
install -m 644 etc/excluded $DESTDIR$CONFDIR/excluded.orig
install -m 755 squid-analyzer $DESTDIR$BINDIR/
install -m 644 sorttable.js $DESTDIR$HTMLDIR/
install -m 644 logo-squidanalyzer.png $DESTDIR$HTMLDIR/
install -m 644 squidanalyzer.css $DESTDIR$HTMLDIR/
install -m 644 flotr2.js $DESTDIR$HTMLDIR/
install -m 644 resources/sorttable.js $DESTDIR$HTMLDIR/
install -m 644 resources/logo-squidanalyzer.png $DESTDIR$HTMLDIR/
install -m 644 resources/squidanalyzer.css $DESTDIR$HTMLDIR/
install -m 644 resources/flotr2.js $DESTDIR$HTMLDIR/
install -m 644 resources/cursor.png $DESTDIR$HTMLDIR/
install -m 644 resources/domain.png $DESTDIR$HTMLDIR/
install -m 644 resources/back-arrow.png $DESTDIR$HTMLDIR/
install -m 644 resources/info.png $DESTDIR$HTMLDIR/
install -m 644 resources/network.png $DESTDIR$HTMLDIR/
install -m 644 resources/user.png $DESTDIR$HTMLDIR/
install -m 644 lang/* $DESTDIR$CONFDIR/lang/
pod2man doc/SquidAnalyzer.pod doc/squidanalyzer.3
install -m 644 doc/squidanalyzer.3 $DESTDIR$MANDIR/squidanalyzer.3

View File

@ -116,6 +116,9 @@ my %Translate = (
'Domain_graph_bytes_title' => 'Domain Bytes Statistiques on',
'First_visit' => 'First visit',
'Last_visit' => 'Last visit',
'Globals_Statistics' => 'Globals Statistics',
'Legende' => 'Legende',
'File_Generated' => 'File generated by',
);
@ -498,45 +501,42 @@ sub _init
$self->{menu} = qq{
<div id="menu">
<table>
<tr>
<th><a href="mime_type.html">[ $Translate{'Mime_link'} ]</a></th>
<th><a href="network.html">[ $Translate{'Network_link'} ]</a></th>
<th><a href="user.html">[ $Translate{'User_link'} ]</a></th>
<ul>
<li><a href="../index.html"><span class="iconArrow">$Translate{'Back_link'}</span></a></li>
};
if ($self->{UrlReport}) {
$self->{menu} .= qq{
<th><a href="url.html">[ $Translate{'Top_url_link'} ]</a></th>
<th><a href="domain.html">[ $Translate{'Top_domain_link'} ]</a></th>};
<li><a href="domain.html"><span class="iconDomain">$Translate{'Top_domain_link'}</span></a></li>
<li><a href="url.html"><span class="iconUrl">$Translate{'Top_url_link'}</span></a></li>
};
}
$self->{menu} .= qq{
<th><a href="../index.html">[ $Translate{'Back_link'} ]</a></th>
</tr>
</table>
<li><a href="user.html"><span class="iconUser">$Translate{'User_link'}</span></a></li>
<li><a href="network.html"><span class="iconNetwork">$Translate{'Network_link'}</span></a></li>
<li><a href="mime_type.html"><span class="iconMime">$Translate{'Mime_link'}</span></a></li>
</ul>
</div>
};
$self->{menu2} = qq{
<div id="menu">
<table>
<tr>
<th><a href="../../mime_type.html">[ $Translate{'Mime_link'} ]</a></th>
<th><a href="../../network.html">[ $Translate{'Network_link'} ]</a></th>
<th><a href="../../user.html">[ $Translate{'User_link'} ]</a></th>
<ul>
<li><a href="../../index.html"><span class="iconArrow">$Translate{'Back_link'}</span></a></li>
};
if ($self->{UrlReport}) {
$self->{menu2} .= qq{
<th><a href="../../url.html">[ $Translate{'Top_url_link'} ]</a></th>
<th><a href="../../domain.html">[ $Translate{'Top_domain_link'} ]</a></th>};
<li><a href="../../domain.html"><span class="iconDomain">$Translate{'Top_domain_link'}</span></a></li>
<li><a href="../../url.html"><span class="iconUrl">$Translate{'Top_url_link'}</span></a></li>A
};
}
$self->{menu2} .= qq{
<th><a href="../../index.html">[ $Translate{'Back_link'} ]</a></th>
</tr>
</table>
<li><a href="../../user.html"><span class="iconUser">$Translate{'User_link'}</span></a></li>
<li><a href="../../network.html"><span class="iconNetwork">$Translate{'Network_link'}</span></a></li>
<li><a href="../../mime_type.html"><span class="iconMime">$Translate{'Mime_link'}</span></a></li>
</ul>
</div>
};
}
sub _parseData
@ -1090,7 +1090,7 @@ sub _read_stat
sub _print_header
{
my ($self, $fileout, $str, $cal) = @_;
my ($self, $fileout, $menu, $calendar) = @_;
my $now = strftime("%a %b %e %H:%M:%S %Y", localtime);
@ -1111,6 +1111,7 @@ sub _print_header
<link rel="stylesheet" type="text/css" href="$self->{WebUrl}squidanalyzer.css" media="screen" />
<!-- javascript to sort table -->
<script type="text/javascript" src="$self->{WebUrl}sorttable.js"></script>
<!-- javascript to draw graphics -->
<script type="text/javascript" src="$self->{WebUrl}flotr2.js"></script>
<style>
#code_requests, #code_bytes, #network_hits, #network_bytes, #user_hits, #user_bytes, #domain_hits, #domain_bytes {
@ -1144,41 +1145,39 @@ function toggle(idButton, idDiv, label) {
/* ]]> */
</script>
</head>
<body text="black" bgcolor="white">
<body>
<div id="conteneur">
<a name="atop"></a>
<table>
<tr><td>
<div id="logo">
<a href="$self->{WebUrl}"><img src="$self->{WebUrl}logo-squidanalyzer.png" title="SquidAnalyzer $VERSION" border="0"></a><br>
<i><b>$Translate{'Generation'} $now.</b></i>
</div>
</td>
<td align="right" valign="top">
$str
<br />
$cal
</td>
</tr>
</table>
<div id="header">
<div id="alignLeft">
<h1>
<a href="$self->{WebUrl}"><img src="$self->{WebUrl}logo-squidanalyzer.png" title="SquidAnalyzer $VERSION" border="0"></a>
SquidAnalyzer
</h1>
<p class="sous-titre">
$Translate{'Generation'} $now.
</p>
</div>
$calendar
</div>
$menu
<div id="contenu">
};
}
sub _print_footer
{
my ($self, $fileout) = @_;
if ($self->{FooterFile}) {
$self->{FooterFile} =~ s/\%VERSION\%/v$VERSION/gs;
print $$fileout qq{ $self->{FooterFile} };
} else {
print $$fileout qq{
<hr>
This file was generated by <a href="http://squidanalyzer.darold.net/">SquidAnalyzer v$VERSION</a>
};
}
print $$fileout qq{
</div>
<div id="footer">
<h4>
$Translate{'File_Generated'} <a href="http://squidanalyzer.darold.net/">SquidAnalyzer v$VERSION</a>
</h4>
</div>
</div>
</body>
</html>
};
@ -1394,8 +1393,6 @@ sub _print_cache_stat
@hit = ();
@miss = ();
@total = ();
print $out qq{<table><tr><td>$code_requests</td>};
$code_requests = '';
for ("$first" .. "$last") {
my $tot = 0;
@ -1426,15 +1423,13 @@ sub _print_cache_stat
@miss = ();
@total = ();
print $out qq{<td>$code_bytes</td></tr></table>};
$code_bytes = '';
print $out qq{
<div id="stata">
<table>
<tr>
<th colspan="2">$Translate{'Requests'}</th>
<th colspan="2">$Translate{'Bytes'}</th>
<th colspan="$colspn">$Translate{'Total'}</th>
<th colspan="2" class="headerBlack">$Translate{'Requests'}</th>
<th colspan="2" class="headerBlack">$Translate{'Bytes'}</th>
<th colspan="$colspn" class="headerBlack">$Translate{'Total'}</th>
</tr>
<tr>
<th>$Translate{'Hit'}</th>
@ -1470,15 +1465,20 @@ sub _print_cache_stat
</tr>
</table>
</div>
<pre>
<b>$Translate{'Hit'}:</b> $Translate{'Hit_help'}
<b>$Translate{'Miss'}:</b> $Translate{'Miss_help'}
<b>$Translate{'Users'}:</b> $Translate{'Users_help'}
<b>$Translate{'Sites'}:</b> $Translate{'Sites_help'}
<b>$Translate{'Domains'}:</b> $Translate{'Domains_help'}
<table><tr><td>$code_requests</td><td>$code_bytes</td></tr></table>
<h4>$Translate{'Legende'}</h4>
<div class="line-separator"></div>
<pre>
<span class="legendeTitle">$Translate{'Hit'}:</span> <span class="descLegende">$Translate{'Hit_help'}</span>
<span class="legendeTitle">$Translate{'Miss'}:</span> <span class="descLegende">$Translate{'Miss_help'}</span>
<span class="legendeTitle">$Translate{'Users'}:</span> <span class="descLegende">$Translate{'Users_help'}</span>
<span class="legendeTitle">$Translate{'Sites'}:</span> <span class="descLegende">$Translate{'Sites_help'}</span>
<span class="legendeTitle">$Translate{'Domains'}:</span> <span class="descLegende">$Translate{'Domains_help'}</span>
};
print $out qq{
<b>$Translate{'Cost'}:</b> $Translate{'Cost_help'} $self->{CostPrice} $self->{Currency}
<span class="legendeTitle">$Translate{'Cost'}:</span> <span class="descLegende">$Translate{'Cost_help'} $self->{CostPrice} $self->{Currency}</span>
} if ($self->{CostPrice});
print $out qq{
</pre>
@ -1532,7 +1532,7 @@ sub _print_mime_stat
# Print title and calendar view
print $out $self->_print_title($Translate{'Mime_title'}, $stat_date);
print $out "<b>$Translate{'Mime_number'}:</b> $ntype<br>\n";
print $out "<h3>$Translate{'Mime_number'}: $ntype</h3>\n";
print $out qq{
<div id="stata">
<table class="sortable" cellpadding=1 cellspacing=1 align=center>
@ -1720,7 +1720,7 @@ sub _print_network_stat
print $out qq{<td>$network_bytes</td></tr></table>};
$network_bytes = '';
print $out "<b>$Translate{'Network_number'}:</b> $nnet<br>\n";
print $out "<h3>$Translate{'Network_number'}: $nnet</h3>\n";
print $out qq{
<div id="stata">
<table class="sortable" cellpadding=1 cellspacing=1 align=center>
@ -1964,6 +1964,8 @@ sub _print_user_stat
print $out $self->_print_title($Translate{'User_title'}, $stat_date);
print $out "<h3>$Translate{'User_number'}: $nuser</h3>\n";
my $t1 = $Translate{'Graph_cache_hit_title'};
$t1 =~ s/\%s/$title/;
$t1 = "$t1 $stat_date";
@ -1986,7 +1988,6 @@ sub _print_user_stat
print $out qq{<td>$user_bytes</td></tr></table>};
$user_bytes = '';
print $out "<b>$Translate{'User_number'}:</b> $nuser<br>\n";
print $out qq{
<div id="stata">
<table class="sortable">
@ -2398,9 +2399,9 @@ sub _print_top_url_stat
$t1 =~ s/\%d/$self->{TopNumber}/;
if ($tpe eq 'Hits') {
print $out $self->_print_title($t1, $stat_date);
print $out "<b>$Translate{'Url_number'}:</b> $nurl<br>\n";
print $out "<h3>$Translate{'Url_number'}: $nurl</h3>\n";
} else {
print $out "<h3>$t1 $stat_date <div id=\"uplink\"><a href=\"#atop\">[ $Translate{'Up_link'} ]</a></div></h3>\n";
print $out "<h4>$t1 $stat_date <div id=\"uplink\"><a href=\"#atop\">[ $Translate{'Up_link'} ]</a></div></h4>\n";
}
print $out qq{
<div id="stata">
@ -2582,7 +2583,7 @@ sub _print_top_domain_stat
if ($tpe eq 'Hits') {
print $out $self->_print_title($t1, $stat_date);
print $out "<b>$Translate{'Domain_number'}:</b> $nurl<br>\n";
print $out "<h3>$Translate{'Domain_number'}: $nurl</h3>\n";
my %data = ();
foreach my $dom (keys %perdomain) {
@ -2602,7 +2603,7 @@ sub _print_top_domain_stat
$domain_bytes = '';
%data = ();
} else {
print $out "<h3>$t1 $stat_date <div id=\"uplink\"><a href=\"#atop\">[ $Translate{'Up_link'} ]</a></div></h3>\n";
print $out "<h4>$t1 $stat_date <div id=\"uplink\"><a href=\"#atop\">[ $Translate{'Up_link'} ]</a></div></h4>\n";
}
print $out qq{
<div id="stata">
@ -2744,28 +2745,33 @@ sub _gen_summary
my $colspn = 2;
$colspn = 3 if ($self->{CostPrice});
print $out qq{
<div id="statb">
<table>
<tr>
<th>&nbsp;</th>
<th colspan="2">$Translate{'Requests'}</th>
<th colspan="2">$Translate{'Bytes'}</th>
<th colspan="$colspn">$Translate{'Total'}</th>
</tr>
<tr>
<th nowrap>$Translate{'Years'}</th>
<th>$Translate{'Hit'}</th>
<th>$Translate{'Miss'}</th>
<th>$Translate{'Hit'}</th>
<th>$Translate{'Miss'}</th>
<th>$Translate{'Requests'}</th>
<th>$Translate{'Bytes'}</th>
<div id="contenu">
<h4>$Translate{'Globals_Statistics'}</h4>
<div class="line-separator"></div>
<div id="stata">
<table>
<thead>
<tr>
<th class="nobg"></th>
<th colspan="2" scope="col" class="headerBlack">$Translate{'Requests'}</th>
<th colspan="2" scope="col" class="headerBlack">$Translate{'Bytes'}</th>
<th colspan="$colspn" scope="col" class="headerBlack">$Translate{'Total'}</th>
</tr>
<tr>
<th scope="col">$Translate{'Years'}</th>
<th scope="col">$Translate{'Hit'}</th>
<th scope="col">$Translate{'Miss'}</th>
<th scope="col">$Translate{'Hit'}</th>
<th scope="col">$Translate{'Miss'}</th>
<th scope="col">$Translate{'Requests'}</th>
<th scope="col">$Translate{'Bytes'}</th>
};
print $out qq{
<th nowrap>$Translate{'Cost'} $self->{Currency}</th>
<th scope="col">$Translate{'Cost'} $self->{Currency}</th>
} if ($self->{CostPrice});
print $out qq{
</tr>
</tr>
</thead>
};
foreach my $year (sort {$b <=> $a} keys %code_stat) {
my $comma_bytes = &format_bytes($total_bytes{$year});
@ -2773,33 +2779,33 @@ sub _gen_summary
my $miss_bytes = &format_bytes($code_stat{$year}{MISS}{bytes});
my $total_cost = sprintf("%2.2f", int($total_bytes{$year}/1000000) * $self->{CostPrice});
print $out qq{
<tr>
<td nowrap><a href="$year/index.html">$Translate{'Stat_label'} $year</a></td>
<td>$code_stat{$year}{HIT}{request}</td>
<td>$code_stat{$year}{MISS}{request}</td>
<td>$hit_bytes</td>
<td>$miss_bytes</td>
<td>$total_request{$year}</td>
<td>$comma_bytes</td>
<tbody>
<tr>
<td><a href="$year/index.html">$Translate{'Stat_label'} $year</a></td>
<td>$code_stat{$year}{HIT}{request}</td>
<td>$code_stat{$year}{MISS}{request}</td>
<td>$hit_bytes</td>
<td>$miss_bytes</td>
<td>$total_request{$year}</td>
<td>$comma_bytes</td>
};
print $out qq{
<td>$total_cost</td>
} if ($self->{CostPrice});
print $out qq{
</tr>};
print $out qq{<td>$total_cost</td>} if ($self->{CostPrice});
print $out qq{</tr>};
}
print $out qq{
</table>
</div>
<pre>
<b>$Translate{'Hit'}:</b> $Translate{'Hit_help'}
<b>$Translate{'Miss'}:</b> $Translate{'Miss_help'}
</tbody>
</table>
</div>
<h4>$Translate{'Legende'}</h4>
<div class="line-separator"></div>
<pre>
<span class="legendeTitle">$Translate{'Hit'}</span>: <span class="descLegende">$Translate{'Hit_help'}</span>
<span class="legendeTitle">$Translate{'Miss'}</span>: <span class="descLegende">$Translate{'Miss_help'}</span>
};
print $out qq{<span class="legendeTitle">$Translate{'Cost'}</span>: <span class="descLegende">$Translate{'Cost_help'} $self->{CostPrice} $self->{Currency}</span>} if ($self->{CostPrice});
print $out qq{
<b>$Translate{'Cost'}:</b> $Translate{'Cost_help'} $self->{CostPrice} $self->{Currency}
} if ($self->{CostPrice});
print $out qq{
</pre>
</pre>
</div>
};
$self->_print_footer(\$out);
$out->close();
@ -2976,9 +2982,10 @@ sub _print_title
{
my ($self, $title, $stat_date) = @_;
my $para = "<table><tr><td>\n";
$para .= "<h3>$title $stat_date</h3>\n";
$para .= "</td></tr></table>\n";
my $para = qq{
<h4>$title $stat_date</h4>
<div class="line-separator"></div>
};
return $para;
}
@ -3221,7 +3228,6 @@ document.writeln('<input type="button" class="dldButton" value="To Image" id="to
grid: {
verticalLines: false,
horizontalLines: false,
backgroundColor: '#ffffff',
outline: '',
},
xaxis: {

View File

@ -1,15 +0,0 @@
#------------------------------------------------------------------------------
# File used to defined which client ip address, network regex address and auth
# login and URI to exclude from report.
# You can define one by line exclusion by specifying first the type of the
# exclusion (USER, CLIENT or URI) and a space separated list of valid regex.
#
# See example bellow:
#------------------------------------------------------------------------------
#CLIENT 192\.168\.1\.2
#CLIENT 10\.169\.1\.\d+ 192\.168\.10\..*
#USER myloginstr
#USER guestlogin\d+ guestdemo
#URI http:\/\/myinternetdomain.dom.*
#URI .*\.webmail\.com\/.*\/login\.php.*

6995
flotr2.js

File diff suppressed because it is too large Load Diff

View File

@ -88,7 +88,8 @@ Domain_Duration_title Top %d Domain Dauer
Domain_number Anzahl der Domains
Domain_graph_hits_title Domain Treffer Statistik
Domain_graph_bytes_title Domain Bytes Statistik
First_time Erster Treffer
Last_time Letzter Treffer
First_visit Erster Besuch
Last_visit Letzter Besuch
Globals_Statistics Globals Statistics
Legende Legende
File_Generated File generated by

View File

@ -1,3 +0,0 @@
<hr>
Diese Datei wurde von <a href="http://squidanalyzer.darold.net/">SquidAnalyzer %VERSION%</a> erstellt.

View File

@ -88,5 +88,8 @@ Domain_Duration_title Top %d Domain duration on
Domain_number Number of domain
Domain_graph_hits_title Domain Hits Statistics on
Domain_graph_bytes_title Domain Bytes Statistiques on
First_time First hit
Last_time Last hit
First_visit First visit
Last_visit Last visit
Globals_Statistics Globals Statistics
Legende Legende
File_Generated File generated by

View File

@ -1,3 +0,0 @@
<hr>
This file was generated by <a href="http://squidanalyzer.darold.net/">SquidAnalyzer %VERSION%</a>

View File

@ -88,5 +88,8 @@ Domain_Duration_title Domaines Top %d par dur
Domain_number Nombre de domaines
Domain_graph_hits_title Statistiques des requêtes par domaines pour
Domain_graph_bytes_title Statistiques des transferts par domaines pour
First_time Première visite
Last_time Dernière visite
First_visit Première visite
Last_visit Dernière visite
Globals_Statistics Statistiques Globales
Legende Legende
File_Generated Fichier généré par

View File

@ -1,3 +0,0 @@
<hr>
Ce fichier a été généré par <a href="http://squidanalyzer.darold.net/">SquidAnalyzer %VERSION%</a>

View File

@ -89,5 +89,8 @@ Domain_Duration_title Os Top %d dom&iacute;nios por tempo de transfer&ecirc;nci
Domain_number N&uacute;mero de dom&iacute;nios
Domain_graph_hits_title Acessos a Domínios em
Domain_graph_bytes_title Bytes Transferidos de Domínios em
First_time Primeira visita
Last_time Ultima visita
First_visit Primeira visita
Last_visit Ultima visita
Globals_Statistics Globales Statistiques
Legende Legende
File_Generated File generated by

View File

@ -1,2 +0,0 @@
<hr>
Este arquivo foi gerado por <a href="http://squidanalyzer.darold.net/">SquidAnalyzer %VERSION%</a>.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

View File

@ -1,10 +0,0 @@
#-------------------------------------------------------------------------------
# Squid Analyzer Network Alias configuration file
# FORMAT : NETWORK_NAME NETWORK_REGEX1,NETWORK_REGEX2,...
# Field separator must be one or more tabulation. See examples below.
#
#-------------------------------------------------------------------------------
#Home Network 192\.168\.1\.
#Associated Networks ^10\.169\.[2-4]\.,^10\.169\.[7-9]\.
#ClassB Network ^10\.172\.

View File

@ -1,493 +0,0 @@
/*
SortTable
version 2
7th April 2007
Stuart Langridge, http://www.kryogenix.org/code/browser/sorttable/
Instructions:
Download this file
Add <script src="sorttable.js"></script> to your HTML
Add class="sortable" to any table you'd like to make sortable
Click on the headers to sort
Thanks to many, many people for contributions and suggestions.
Licenced as X11: http://www.kryogenix.org/code/browser/licence.html
This basically means: do what you want with it.
*/
var stIsIE = /*@cc_on!@*/false;
sorttable = {
init: function() {
// quit if this function has already been called
if (arguments.callee.done) return;
// flag this function so we don't do the same thing twice
arguments.callee.done = true;
// kill the timer
if (_timer) clearInterval(_timer);
if (!document.createElement || !document.getElementsByTagName) return;
sorttable.DATE_RE = /^(\d\d?)[\/\.-](\d\d?)[\/\.-]((\d\d)?\d\d)$/;
forEach(document.getElementsByTagName('table'), function(table) {
if (table.className.search(/\bsortable\b/) != -1) {
sorttable.makeSortable(table);
}
});
},
makeSortable: function(table) {
if (table.getElementsByTagName('thead').length == 0) {
// table doesn't have a tHead. Since it should have, create one and
// put the first table row in it.
the = document.createElement('thead');
the.appendChild(table.rows[0]);
table.insertBefore(the,table.firstChild);
}
// Safari doesn't support table.tHead, sigh
if (table.tHead == null) table.tHead = table.getElementsByTagName('thead')[0];
if (table.tHead.rows.length != 1) return; // can't cope with two header rows
// Sorttable v1 put rows with a class of "sortbottom" at the bottom (as
// "total" rows, for example). This is B&R, since what you're supposed
// to do is put them in a tfoot. So, if there are sortbottom rows,
// for backwards compatibility, move them to tfoot (creating it if needed).
sortbottomrows = [];
for (var i=0; i<table.rows.length; i++) {
if (table.rows[i].className.search(/\bsortbottom\b/) != -1) {
sortbottomrows[sortbottomrows.length] = table.rows[i];
}
}
if (sortbottomrows) {
if (table.tFoot == null) {
// table doesn't have a tfoot. Create one.
tfo = document.createElement('tfoot');
table.appendChild(tfo);
}
for (var i=0; i<sortbottomrows.length; i++) {
tfo.appendChild(sortbottomrows[i]);
}
delete sortbottomrows;
}
// work through each column and calculate its type
headrow = table.tHead.rows[0].cells;
for (var i=0; i<headrow.length; i++) {
// manually override the type with a sorttable_type attribute
if (!headrow[i].className.match(/\bsorttable_nosort\b/)) { // skip this col
mtch = headrow[i].className.match(/\bsorttable_([a-z0-9]+)\b/);
if (mtch) { override = mtch[1]; }
if (mtch && typeof sorttable["sort_"+override] == 'function') {
headrow[i].sorttable_sortfunction = sorttable["sort_"+override];
} else {
headrow[i].sorttable_sortfunction = sorttable.guessType(table,i);
}
// make it clickable to sort
headrow[i].sorttable_columnindex = i;
headrow[i].sorttable_tbody = table.tBodies[0];
dean_addEvent(headrow[i],"click", function(e) {
if (this.className.search(/\bsorttable_sorted\b/) != -1) {
// if we're already sorted by this column, just
// reverse the table, which is quicker
sorttable.reverse(this.sorttable_tbody);
this.className = this.className.replace('sorttable_sorted',
'sorttable_sorted_reverse');
this.removeChild(document.getElementById('sorttable_sortfwdind'));
sortrevind = document.createElement('span');
sortrevind.id = "sorttable_sortrevind";
sortrevind.innerHTML = stIsIE ? '&nbsp<font face="webdings">5</font>' : '&nbsp;&#x25B4;';
this.appendChild(sortrevind);
return;
}
if (this.className.search(/\bsorttable_sorted_reverse\b/) != -1) {
// if we're already sorted by this column in reverse, just
// re-reverse the table, which is quicker
sorttable.reverse(this.sorttable_tbody);
this.className = this.className.replace('sorttable_sorted_reverse',
'sorttable_sorted');
this.removeChild(document.getElementById('sorttable_sortrevind'));
sortfwdind = document.createElement('span');
sortfwdind.id = "sorttable_sortfwdind";
sortfwdind.innerHTML = stIsIE ? '&nbsp<font face="webdings">6</font>' : '&nbsp;&#x25BE;';
this.appendChild(sortfwdind);
return;
}
// remove sorttable_sorted classes
theadrow = this.parentNode;
forEach(theadrow.childNodes, function(cell) {
if (cell.nodeType == 1) { // an element
cell.className = cell.className.replace('sorttable_sorted_reverse','');
cell.className = cell.className.replace('sorttable_sorted','');
}
});
sortfwdind = document.getElementById('sorttable_sortfwdind');
if (sortfwdind) { sortfwdind.parentNode.removeChild(sortfwdind); }
sortrevind = document.getElementById('sorttable_sortrevind');
if (sortrevind) { sortrevind.parentNode.removeChild(sortrevind); }
this.className += ' sorttable_sorted';
sortfwdind = document.createElement('span');
sortfwdind.id = "sorttable_sortfwdind";
sortfwdind.innerHTML = stIsIE ? '&nbsp<font face="webdings">6</font>' : '&nbsp;&#x25BE;';
this.appendChild(sortfwdind);
// build an array to sort. This is a Schwartzian transform thing,
// i.e., we "decorate" each row with the actual sort key,
// sort based on the sort keys, and then put the rows back in order
// which is a lot faster because you only do getInnerText once per row
row_array = [];
col = this.sorttable_columnindex;
rows = this.sorttable_tbody.rows;
for (var j=0; j<rows.length; j++) {
row_array[row_array.length] = [sorttable.getInnerText(rows[j].cells[col]), rows[j]];
}
/* If you want a stable sort, uncomment the following line */
//sorttable.shaker_sort(row_array, this.sorttable_sortfunction);
/* and comment out this one */
row_array.sort(this.sorttable_sortfunction);
tb = this.sorttable_tbody;
for (var j=0; j<row_array.length; j++) {
tb.appendChild(row_array[j][1]);
}
delete row_array;
});
}
}
},
guessType: function(table, column) {
// guess the type of a column based on its first non-blank row
sortfn = sorttable.sort_alpha;
for (var i=0; i<table.tBodies[0].rows.length; i++) {
text = sorttable.getInnerText(table.tBodies[0].rows[i].cells[column]);
if (text != '') {
if (text.match(/^-?[£$¤]?[\d,.]+%?$/)) {
return sorttable.sort_numeric;
}
// check for a date: dd/mm/yyyy or dd/mm/yy
// can have / or . or - as separator
// can be mm/dd as well
possdate = text.match(sorttable.DATE_RE)
if (possdate) {
// looks like a date
first = parseInt(possdate[1]);
second = parseInt(possdate[2]);
if (first > 12) {
// definitely dd/mm
return sorttable.sort_ddmm;
} else if (second > 12) {
return sorttable.sort_mmdd;
} else {
// looks like a date, but we can't tell which, so assume
// that it's dd/mm (English imperialism!) and keep looking
sortfn = sorttable.sort_ddmm;
}
}
}
}
return sortfn;
},
getInnerText: function(node) {
// gets the text we want to use for sorting for a cell.
// strips leading and trailing whitespace.
// this is *not* a generic getInnerText function; it's special to sorttable.
// for example, you can override the cell text with a customkey attribute.
// it also gets .value for <input> fields.
hasInputs = (typeof node.getElementsByTagName == 'function') &&
node.getElementsByTagName('input').length;
if (node.getAttribute("sorttable_customkey") != null) {
return node.getAttribute("sorttable_customkey");
}
else if (typeof node.textContent != 'undefined' && !hasInputs) {
return node.textContent.replace(/^\s+|\s+$/g, '');
}
else if (typeof node.innerText != 'undefined' && !hasInputs) {
return node.innerText.replace(/^\s+|\s+$/g, '');
}
else if (typeof node.text != 'undefined' && !hasInputs) {
return node.text.replace(/^\s+|\s+$/g, '');
}
else {
switch (node.nodeType) {
case 3:
if (node.nodeName.toLowerCase() == 'input') {
return node.value.replace(/^\s+|\s+$/g, '');
}
case 4:
return node.nodeValue.replace(/^\s+|\s+$/g, '');
break;
case 1:
case 11:
var innerText = '';
for (var i = 0; i < node.childNodes.length; i++) {
innerText += sorttable.getInnerText(node.childNodes[i]);
}
return innerText.replace(/^\s+|\s+$/g, '');
break;
default:
return '';
}
}
},
reverse: function(tbody) {
// reverse the rows in a tbody
newrows = [];
for (var i=0; i<tbody.rows.length; i++) {
newrows[newrows.length] = tbody.rows[i];
}
for (var i=newrows.length-1; i>=0; i--) {
tbody.appendChild(newrows[i]);
}
delete newrows;
},
/* sort functions
each sort function takes two parameters, a and b
you are comparing a[0] and b[0] */
sort_numeric: function(a,b) {
aa = parseFloat(a[0].replace(/[^0-9.-]/g,''));
if (isNaN(aa)) aa = 0;
bb = parseFloat(b[0].replace(/[^0-9.-]/g,''));
if (isNaN(bb)) bb = 0;
return aa-bb;
},
sort_alpha: function(a,b) {
if (a[0]==b[0]) return 0;
if (a[0]<b[0]) return -1;
return 1;
},
sort_ddmm: function(a,b) {
mtch = a[0].match(sorttable.DATE_RE);
y = mtch[3]; m = mtch[2]; d = mtch[1];
if (m.length == 1) m = '0'+m;
if (d.length == 1) d = '0'+d;
dt1 = y+m+d;
mtch = b[0].match(sorttable.DATE_RE);
y = mtch[3]; m = mtch[2]; d = mtch[1];
if (m.length == 1) m = '0'+m;
if (d.length == 1) d = '0'+d;
dt2 = y+m+d;
if (dt1==dt2) return 0;
if (dt1<dt2) return -1;
return 1;
},
sort_mmdd: function(a,b) {
mtch = a[0].match(sorttable.DATE_RE);
y = mtch[3]; d = mtch[2]; m = mtch[1];
if (m.length == 1) m = '0'+m;
if (d.length == 1) d = '0'+d;
dt1 = y+m+d;
mtch = b[0].match(sorttable.DATE_RE);
y = mtch[3]; d = mtch[2]; m = mtch[1];
if (m.length == 1) m = '0'+m;
if (d.length == 1) d = '0'+d;
dt2 = y+m+d;
if (dt1==dt2) return 0;
if (dt1<dt2) return -1;
return 1;
},
shaker_sort: function(list, comp_func) {
// A stable sort function to allow multi-level sorting of data
// see: http://en.wikipedia.org/wiki/Cocktail_sort
// thanks to Joseph Nahmias
var b = 0;
var t = list.length - 1;
var swap = true;
while(swap) {
swap = false;
for(var i = b; i < t; ++i) {
if ( comp_func(list[i], list[i+1]) > 0 ) {
var q = list[i]; list[i] = list[i+1]; list[i+1] = q;
swap = true;
}
} // for
t--;
if (!swap) break;
for(var i = t; i > b; --i) {
if ( comp_func(list[i], list[i-1]) < 0 ) {
var q = list[i]; list[i] = list[i-1]; list[i-1] = q;
swap = true;
}
} // for
b++;
} // while(swap)
}
}
/* ******************************************************************
Supporting functions: bundled here to avoid depending on a library
****************************************************************** */
// Dean Edwards/Matthias Miller/John Resig
/* for Mozilla/Opera9 */
if (document.addEventListener) {
document.addEventListener("DOMContentLoaded", sorttable.init, false);
}
/* for Internet Explorer */
/*@cc_on @*/
/*@if (@_win32)
document.write("<script id=__ie_onload defer src=javascript:void(0)><\/script>");
var script = document.getElementById("__ie_onload");
script.onreadystatechange = function() {
if (this.readyState == "complete") {
sorttable.init(); // call the onload handler
}
};
/*@end @*/
/* for Safari */
if (/WebKit/i.test(navigator.userAgent)) { // sniff
var _timer = setInterval(function() {
if (/loaded|complete/.test(document.readyState)) {
sorttable.init(); // call the onload handler
}
}, 10);
}
/* for other browsers */
window.onload = sorttable.init;
// written by Dean Edwards, 2005
// with input from Tino Zijdel, Matthias Miller, Diego Perini
// http://dean.edwards.name/weblog/2005/10/add-event/
function dean_addEvent(element, type, handler) {
if (element.addEventListener) {
element.addEventListener(type, handler, false);
} else {
// assign each event handler a unique ID
if (!handler.$$guid) handler.$$guid = dean_addEvent.guid++;
// create a hash table of event types for the element
if (!element.events) element.events = {};
// create a hash table of event handlers for each element/event pair
var handlers = element.events[type];
if (!handlers) {
handlers = element.events[type] = {};
// store the existing event handler (if there is one)
if (element["on" + type]) {
handlers[0] = element["on" + type];
}
}
// store the event handler in the hash table
handlers[handler.$$guid] = handler;
// assign a global event handler to do all the work
element["on" + type] = handleEvent;
}
};
// a counter used to create unique IDs
dean_addEvent.guid = 1;
function removeEvent(element, type, handler) {
if (element.removeEventListener) {
element.removeEventListener(type, handler, false);
} else {
// delete the event handler from the hash table
if (element.events && element.events[type]) {
delete element.events[type][handler.$$guid];
}
}
};
function handleEvent(event) {
var returnValue = true;
// grab the event object (IE uses a global event object)
event = event || fixEvent(((this.ownerDocument || this.document || this).parentWindow || window).event);
// get a reference to the hash table of event handlers
var handlers = this.events[event.type];
// execute each event handler
for (var i in handlers) {
this.$$handleEvent = handlers[i];
if (this.$$handleEvent(event) === false) {
returnValue = false;
}
}
return returnValue;
};
function fixEvent(event) {
// add W3C standard event methods
event.preventDefault = fixEvent.preventDefault;
event.stopPropagation = fixEvent.stopPropagation;
return event;
};
fixEvent.preventDefault = function() {
this.returnValue = false;
};
fixEvent.stopPropagation = function() {
this.cancelBubble = true;
}
// Dean's forEach: http://dean.edwards.name/base/forEach.js
/*
forEach, version 1.0
Copyright 2006, Dean Edwards
License: http://www.opensource.org/licenses/mit-license.php
*/
// array-like enumeration
if (!Array.forEach) { // mozilla already supports this
Array.forEach = function(array, block, context) {
for (var i = 0; i < array.length; i++) {
block.call(context, array[i], i, array);
}
};
}
// generic enumeration
Function.prototype.forEach = function(object, block, context) {
for (var key in object) {
if (typeof this.prototype[key] == "undefined") {
block.call(context, object[key], key, object);
}
}
};
// character enumeration
String.forEach = function(string, block, context) {
Array.forEach(string.split(""), function(chr, index) {
block.call(context, chr, index, string);
});
};
// globally resolve forEach enumeration
var forEach = function(object, block, context) {
if (object) {
var resolve = Object; // default
if (object instanceof Function) {
// functions have a "length" property
resolve = Function;
} else if (object.forEach instanceof Function) {
// the object implements a custom forEach method so use that
object.forEach(block, context);
return;
} else if (typeof object == "string") {
// the object is a string
resolve = String;
} else if (typeof object.length == "number") {
// the object is array-like
resolve = Array;
}
resolve.forEach(object, block, context);
}
};

View File

@ -1,81 +0,0 @@
####
# This file is the default configuration file for SquidAnalyzer
# Edit it to match your needs and copy it under /etc/squidanalyzer.conf
#####
# Path where SquidAnalyzer should dump all HTML and images files.
# Choose a path that can be read by a Web browser
Output /var/www/squidanalyzer
# The URL of the SquidAnalyzer javascript, HTML and images files.
WebUrl /squidreport
# Set the path to the Squid log file
LogFile /var/log/squid3/access.log
# Set the file containing network alias name. Network are
# show as Ip addresses so if you want to display name instead
# create a file with this format :
# LOCATION_NAME IP_NETWORK_ADDRESS
# Separator must be a tabulation
NetworkAlias /etc/squidanalyzer/network-aliases
# Set the file containing user alias name. If you don't have auth_proxy
# enable user are seen as Ip addresses, or if you want to replace login
# name by full user name, create a file with this format :
# FULL_USERNAME IP_ADDRESS || LOGIN_NAME
# Separator must be a tabulation
UserAlias /etc/squidanalyzer/user-aliases
# How do we sort Network, User and Url report screen
# Value can be: bytes, hits or duration. Default is bytes.
OrderNetwork bytes
OrderUser bytes
OrderUrl bytes
# How do we sort Mime types report screen
# Value can be: bytes or hits. Default is bytes.
OrderMime bytes
# Should we display user details. This will show all URL read
# by user. Take care to have enougth space disk for large user.
UrlReport 1
# Run in quiet mode or print debug information
QuietMode 1
# Cost of the bandwith per Mb. If you want to generate invoice per Mb
# for bandwith traffic this can help you. Value 0 mean no cost.
CostPrice 0.5
# Currency of the bandwith cost
Currency &euro;
# Top number of url to show
TopNumber 100
# Path to the file containing client ip addresses, network ip address,
# and/or auth login to exclude from report
Exclude /etc/squidanalyzer/excluded
# Translation Language file to use (fr_FR.txt, pt_BR.txt and en_US.txt).
# Default to en_US.txt
#Lang /etc/squidanalyzer/lang/fr_FR.txt
# Date format use to display date (year = %y, month = %m and day = %d)
# You can also use %M to replace month by its 3 letters abbreviation.
DateFormat %y-%m-%d
#Set this to 1 if you want to anonymize all user login. The username
# will be replaced by an unique id that change at each squid-analyzer
# run. Default disable.
AnonymizeLogin 0
# Adds peer cache hit (CD_SIBLING_HIT) to be taken has local cache hit.
# Enabled by default, you must disabled it if you don't want to report
# peer cache hit onto your stats.
SiblingHit 1
# Set the image format that should be used in graphics download. Values
# can be png or jpg. Default is png.
ImgFormat png

View File

@ -1,16 +0,0 @@
body {font-family:arial,helvetica,verdana;font-size:10pt;background-color: beige;}
table {margin: 1px; align: center; width: 100%; white-space: nowrap}
td {font-family:arial,helvetica,verdana;font-size:10pt;color:black;background-color: beige;}
th {font-family:arial,helvetica,verdana;font-weight:bold;font-size:12pt;color:white; background-color: green;}
a { text-decoration: none; font-family:arial,helvetica,verdana;font-weight:bold;font-size:12pt;color: #888888}
a:hover { text-decoration: none; font-family:arial,helvetica,verdana;font-weight:bold;font-size:12pt;color: black}
#logo a {font-family:arial,helvetica,verdana;font-weight:bold;font-size:24pt;color:green;text-decoration: none;}
#calendar th {color: white; background-color: green;}
#calendar table {width: 200px; position: right;}
#menu table {position: right; width: auto;}
#menu th {background-color: beige;}
#stata table {position: center; width: auto;}
#stata td {border-bottom: thin solid red; text-align: center; width: 100px}
#statb table {position: center; width: auto;}
#statb td {border-bottom: thin solid red; text-align: center; width: 100px}
#uplink th {background-color: beige;}

View File

@ -1,8 +0,0 @@
#-------------------------------------------------------------------------------
# Squid Analyzer User Alias configuration file
# FORMAT : FULL_USER_NAME IP_ADDRESS|LOGIN_NAME,LOGIN_REGEX
# Field separator must be one or more tabulation. Space in user name are not
# allowed. See example bellow
#-------------------------------------------------------------------------------
#MyFirstName mylogin,192.168.1.12
#MyOtherNames logon\d+