@@ -58,7 +58,7 @@
'title' => "$Lang::tr{'hardware graphs'}",
'enabled' => 1,
};
- $substatus->{'61.entropy'} = {
+ $substatus->{'62.entropy'} = {
'caption' => "$Lang::tr{'entropy'}",
'uri' => '/cgi-bin/entropy.cgi',
'title' => "$Lang::tr{'entropy graphs'}",
new file mode 100644
@@ -0,0 +1,17 @@
+etc/fcron.cyclic/update-squid-graph
+srv/web/ipfire/cgi-bin/sgraph.cgi
+srv/web/ipfire/html/sgraph
+srv/web/ipfire/html/sgraph/logo.png
+usr/bin/squid-graph
+usr/local/bin/update-squid-graph.sh
+var/ipfire/addon-lang/squid-graph.de.pl
+var/ipfire/addon-lang/squid-graph.en.pl
+var/ipfire/addon-lang/squid-graph.es.pl
+var/ipfire/addon-lang/squid-graph.fr.pl
+var/ipfire/addon-lang/squid-graph.it.pl
+var/ipfire/addon-lang/squid-graph.nl.pl
+var/ipfire/addon-lang/squid-graph.pl.pl
+var/ipfire/addon-lang/squid-graph.ru.pl
+var/ipfire/addon-lang/squid-graph.tr.pl
+var/ipfire/menu.d/20-status.menu
+var/ipfire/menu.d/EX-squid-graph.menu
@@ -1692,7 +1692,6 @@
'no filter pass' => 'Legen Sie hier die Standardklassen fest durch die nicht-gefilterte Pakete gehen.',
'no fritzdsl driver' => 'Kein Fritz!DSL-Treiber vorhanden. Bitte hochladen.',
'no hardware random number generator' => 'Dieses System hat keine Entropiequelle.',
-'no information available' => 'Keine Informationen verfügbar.',
'no log selected' => 'kein Protokoll ausgewählt',
'no modem selected' => 'Kein Modem ausgewählt',
'no set selected' => 'Es wurde kein Satz ausgewählt',
@@ -1934,7 +1933,6 @@
'proto' => 'Proto',
'protocol' => 'Protokoll:',
'proxy' => 'Proxy',
-'proxy access graphs' => 'Diagramme zur Proxyauslastung',
'proxy admin password' => 'Cache Administrator Passwort',
'proxy cachemgr' => 'Cachemanager aktivieren',
'proxy errmsg filedescriptors' => 'Ungültiger Anzahl Filedescriptoren',
@@ -2157,7 +2155,6 @@
'ssnetwork status' => 'Netzwerk-Status',
'sspasswords' => 'Passwörter',
'ssport forwarding' => 'Port-Weiterleitung',
-'ssproxy graphs' => 'Proxy-Diagramme',
'sssystem status' => 'System-Status',
'sstraffic' => 'Net-Traffic',
'sstraffic graphs' => 'Netzwerk-Diagramme',
@@ -1724,7 +1724,6 @@
'no filter pass' => 'Enter the standard class for non-filtered packets.',
'no fritzdsl driver' => 'No Fritz!DSL driver. Please upload.',
'no hardware random number generator' => 'This system has no source for entropy.',
-'no information available' => 'No information available.',
'no log selected' => 'No log selected',
'no modem selected' => 'No modem selected',
'no set selected' => 'No set was selected',
@@ -1970,7 +1969,6 @@
'proto' => 'Proto',
'protocol' => 'Protocol:',
'proxy' => 'Proxy',
-'proxy access graphs' => 'Proxy access graphs',
'proxy admin password' => 'Cache administrator password',
'proxy cachemgr' => 'Activate cachemanager',
'proxy errmsg filedescriptors' => 'Wrong amount of filedescriptors',
@@ -2199,7 +2197,6 @@
'ssnetwork status' => 'Network Status',
'sspasswords' => 'Passwords',
'ssport forwarding' => 'Port Forwarding',
-'ssproxy graphs' => 'Proxy Graphs',
'sssystem status' => 'System Status',
'sstraffic' => 'Net-Traffic',
'sstraffic graphs' => 'Traffic Graphs',
@@ -1256,7 +1256,6 @@
'no eciadsl synch.bin file' => 'No existe archi ECI ADSL synch.bin. Favor de cargarlo',
'no filter pass' => 'Introduzca la clase estándar para paquetes no filtrados.',
'no fritzdsl driver' => 'No hay drivers Fritz!DSL. Favor de cargarlos',
-'no information available' => 'No hay información disponible',
'no log selected' => 'No ha seleccionado registro log',
'no modem selected' => 'No ha seleccionado módem',
'no set selected' => 'Ningún conjunto se ha seleccionado',
@@ -1437,7 +1436,6 @@
'proto' => 'Proto',
'protocol' => 'Protocolo:',
'proxy' => 'Proxy',
-'proxy access graphs' => 'Gráficas de acceso al proxy',
'proxy admin password' => 'Password Administrador de Caché',
'proxy cachemgr' => 'Activar Cachemanager',
'proxy errmsg filedescriptors' => 'Cantidad incorrecta de descriptores de archivos',
@@ -1647,7 +1645,6 @@
'ssnetwork status' => 'Estado de la red',
'sspasswords' => 'Contraseñas',
'ssport forwarding' => 'Reenvío de puertos',
-'ssproxy graphs' => 'Gráficas de proxy',
'sssystem status' => 'Status del sistema',
'sstraffic' => 'Net-traffic',
'sstraffic graphs' => 'Gráficas de tráfico',
@@ -1247,7 +1247,6 @@
'no eciadsl synch.bin file' => 'aucunfichier ECI ADSL synch.bin. Veuillez le charger.',
'no filter pass' => 'Entrez la classe standard pour les paquets non filtrés.',
'no fritzdsl driver' => 'Aucun pilote Fritz!DSL. Veuillez le charger.',
-'no information available' => 'Aucune information disponible.',
'no log selected' => 'Aucun rapport sélectionné',
'no modem selected' => 'Aucun modem sélectionné',
'no set selected' => 'Aucun jeu sélectionné',
@@ -1443,7 +1442,6 @@
'proto' => 'Proto',
'protocol' => 'Protocole',
'proxy' => 'Proxy',
-'proxy access graphs' => 'Graphiques des accès proxy',
'proxy admin password' => 'Mot de passe admnistrateur du Cache',
'proxy cachemgr' => 'Activer le gestionnaire de cache',
'proxy errmsg filedescriptors' => 'Mauvais montant de fichier descripteurs',
@@ -1652,7 +1650,6 @@
'ssnetwork status' => 'Statut réseau',
'sspasswords' => 'Mots de passe',
'ssport forwarding' => 'Transfert de port',
-'ssproxy graphs' => 'Graphiques du proxy',
'sssystem status' => 'Statut système',
'sstraffic' => 'Trafic réseau',
'sstraffic graphs' => 'Graphiques du trafic',
@@ -1592,7 +1592,6 @@
'no filter pass' => 'Enter the standard class for non-filtered packets.',
'no fritzdsl driver' => 'No Fritz!DSL driver. Please upload.',
'no hardware random number generator' => 'This system has no source for entropy.',
-'no information available' => 'No information available.',
'no log selected' => 'No log selected',
'no modem selected' => 'No modem selected',
'no set selected' => 'No set was selected',
@@ -1827,7 +1826,6 @@
'proto' => 'Proto',
'protocol' => 'Protocolo',
'proxy' => 'Proxy',
-'proxy access graphs' => 'Proxy access graphs',
'proxy admin password' => 'Cache administrator password',
'proxy cachemgr' => 'Attiva cachemanager',
'proxy errmsg filedescriptors' => 'Wrong amount of filedescriptors',
@@ -2052,7 +2050,6 @@
'ssnetwork status' => 'Network Status',
'sspasswords' => 'Passwords',
'ssport forwarding' => 'Port Forwarding',
-'ssproxy graphs' => 'Proxy Graphs',
'sssystem status' => 'Stato del sistema',
'sstraffic' => 'Traffico di rete',
'sstraffic graphs' => 'Traffic Graphs',
@@ -1555,7 +1555,6 @@
'no filter pass' => 'Geef de standaard-klasse voor niet-gefilterde pakketten.',
'no fritzdsl driver' => 'Geen Fritz!DSL driver. Bestand uploaden a.u.b.',
'no hardware random number generator' => 'Dit systeem heeft geen mogelijkheden voor entropie.',
-'no information available' => 'Geen informatie beschikbaar.',
'no log selected' => 'Geen log geselecteerd',
'no modem selected' => 'Geen modem geselecteerd',
'no set selected' => 'Geen set geselecteerd',
@@ -1780,7 +1779,6 @@
'proto' => 'Proto',
'protocol' => 'Protocol:',
'proxy' => 'Proxy',
-'proxy access graphs' => 'Proxy toegangsgrafieken',
'proxy admin password' => 'Cache beheerder wachtwoord',
'proxy cachemgr' => 'Activeer cachebeheer',
'proxy errmsg filedescriptors' => 'Verkeerd aantal bestandsindicators',
@@ -2000,7 +1998,6 @@
'ssnetwork status' => 'Netwerkstatus',
'sspasswords' => 'Wachtwoorden',
'ssport forwarding' => 'Poort doorsturen',
-'ssproxy graphs' => 'Proxy grafieken',
'sssystem status' => 'Systeemstatus',
'sstraffic' => 'Netwerkgebruik',
'sstraffic graphs' => 'Verkeersgrafieken',
@@ -1255,7 +1255,6 @@
'no eciadsl synch.bin file' => 'Brak pliku ECI ADSL synch.bin. Proszę o jego wgranie.',
'no filter pass' => 'Proszę wprowadzić standardową klasę dla pakietów niefiltrowanych.',
'no fritzdsl driver' => 'Brak sterownika Fritz!DSL. Proszę o jego wgranie.',
-'no information available' => 'Brak dostępnych informacji.',
'no log selected' => 'Nie wybrano logu',
'no modem selected' => 'Nie wybrano modemu',
'no set selected' => 'Nie wybrano ustawienia',
@@ -1449,7 +1448,6 @@
'proto' => 'Proto',
'protocol' => 'Protokół:',
'proxy' => 'Proxy',
-'proxy access graphs' => 'Wykresy dostępu do Proxy',
'proxy admin password' => 'Hasło administratora Cache',
'proxy cachemgr' => 'Aktywuj cachemanager',
'proxy errmsg filedescriptors' => 'Niepoprawna wartość w polu filedescriptors',
@@ -1659,7 +1657,6 @@
'ssnetwork status' => 'Stan sieci',
'sspasswords' => 'Hasła',
'ssport forwarding' => 'Przekierowanie portów',
-'ssproxy graphs' => 'Wykresy Proxy',
'sssystem status' => 'Stan systemu',
'sstraffic' => 'Net-Traffic',
'sstraffic graphs' => 'Wykresy ruchu',
@@ -1247,7 +1247,6 @@
'no eciadsl synch.bin file' => 'No ECI ADSL synch.bin file. Please upload.',
'no filter pass' => 'Задайте стандартный класс для нефильтруемых пакетов.',
'no fritzdsl driver' => 'No Fritz!DSL driver. Please upload.',
-'no information available' => 'No information available.',
'no log selected' => 'No log selected',
'no modem selected' => 'No modem selected',
'no set selected' => 'No set was selected',
@@ -1444,7 +1443,6 @@
'proto' => 'Proto',
'protocol' => 'Протокол:',
'proxy' => 'Proxy',
-'proxy access graphs' => 'Proxy access graphs',
'proxy admin password' => 'Cache administrator password',
'proxy cachemgr' => 'Включить менеджер кэша',
'proxy errmsg filedescriptors' => 'Wrong amount of filedescriptors',
@@ -1654,7 +1652,6 @@
'ssnetwork status' => 'Статус сети',
'sspasswords' => 'Пароли',
'ssport forwarding' => 'Перенаправление портов',
-'ssproxy graphs' => 'Proxy Graphs',
'sssystem status' => 'Статус системы',
'sstraffic' => 'Сетевой трафик',
'sstraffic graphs' => 'Traffic Graphs',
@@ -1660,7 +1660,6 @@
'no filter pass' => 'Olmayan filtre paketleri için standart sınıfı girin.',
'no fritzdsl driver' => 'Fritz!DSL sürücüsü yok. Lütfen yükleyin.',
'no hardware random number generator' => 'Bu sistemin entropi için kaynağı yok.',
-'no information available' => 'Herhangi bir bilgi bulunmamaktadır.',
'no log selected' => 'Günlük seçilmedi',
'no modem selected' => 'Modem seçilmedi',
'no set selected' => 'Hiçbir ayar seçilmedi',
@@ -1902,7 +1901,6 @@
'proto' => 'Kural',
'protocol' => 'Kural ',
'proxy' => 'Vekil sunucu',
-'proxy access graphs' => 'Vekil sunucu erişim grafiği',
'proxy admin password' => 'Önbellek yönetici parolası',
'proxy cachemgr' => 'Önbellek yöneticisini aktifleştir',
'proxy errmsg filedescriptors' => 'Dosya tanimlayıcı sayısı yanlış miktarda',
@@ -2131,7 +2129,6 @@
'ssnetwork status' => 'Ağ Durumu',
'sspasswords' => 'Parola',
'ssport forwarding' => 'Bağlantı Noktası Yönlendirme',
-'ssproxy graphs' => 'Vekil Sunucu Grafikleri',
'sssystem status' => 'Sistem Durumu',
'sstraffic' => 'Ağ-Trafiği',
'sstraffic graphs' => 'Trafik Grafiği',
new file mode 100644
@@ -0,0 +1,112 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2017 IPFire Team <info@ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 3.2
+
+THISAPP = squid-graph-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/squid-graph
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = squid-graph
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 7ed7d187f87bde1ec9dabe05f07053b5
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ $(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid-graph/squid-graph-for-ipfire.patch
+
+# Install GUI
+ install -v -m 755 ../src/squid-graph/sgraph.cgi \
+ /srv/web/ipfire/cgi-bin/sgraph.cgi
+
+# Create sgraph dir, install logo.png
+ -mkdir -p /srv/web/ipfire/html/sgraph
+ install -v -m 644 ../src/squid-graph/logo.png \
+ /srv/web/ipfire/html/sgraph/logo.png
+
+# Install main program
+ install -v -m 755 $(DIR_APP)/squid-graph \
+ /usr/bin/squid-graph
+
+# Install update script
+ install -v -m 755 ../src/squid-graph/update-squid-graph.sh \
+ /usr/local/bin/update-squid-graph.sh
+
+# Create symlink for five-minute-update-interval
+ ln -sf /usr/local/bin/update-squid-graph.sh /etc/fcron.cyclic/update-squid-graph
+
+# Install language files
+ install -v -m 004 ../src/squid-graph/squid-graph.*.pl \
+ /var/ipfire/addon-lang/
+
+# Install menu entry
+ install -v -m 644 ../src/squid-graph/EX-squid-graph.menu \
+ /var/ipfire/menu.d/EX-squid-graph.menu
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
@@ -877,6 +877,7 @@ buildipfire() {
lfsmake2 perl-Net-IP
lfsmake2 wio
lfsmake2 iftop
+ lfsmake2 squid-graph
}
buildinstaller() {
new file mode 100644
@@ -0,0 +1,31 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+
+extract_files
+
+# Update language-cache
+/usr/local/bin/update-lang-cache
+
+chown nobody.nobody /var/ipfire/menu.d/EX-squid-graph.menu
new file mode 100644
@@ -0,0 +1,28 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+
+remove_files
+
+/usr/local/bin/update-lang-cache
new file mode 100644
@@ -0,0 +1,26 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+./uninstall.sh
+./install.sh
new file mode 100644
@@ -0,0 +1,238 @@
+--- a/squid-graph Mon Oct 02 20:46:43 2006
++++ b/squid-graph Tue Nov 14 12:53:03 2017
+@@ -13,11 +13,14 @@
+ use strict;
+ use GD;
+
++require '/var/ipfire/general-functions.pl';
++require "${General::swroot}/lang.pl";
++
+ # Program version (DO NOT TOUCH THIS)
+ my $VER = "3.2 release";
+
+ # Enable console logging? (1 = on, 0 = off)
+-my $CONSOLELOG = 1;
++my $CONSOLELOG = 0;
+
+ # "Global" variables (DO NOT TOUCH THESE)
+ my %config; # configuration details here
+@@ -26,10 +29,10 @@
+ # Define graph colours [RRR,GGG,BBB]
+ $color{'bg'} = ['F5','F5','F5']; # graph background color
+ $color{'fg'} = ['00','00','00']; # graph foreground color
+-$color{'gr'} = ['00','00','FF']; # graph total line color
+-$color{'hit'} = ['FF','00','00']; # graph hit line color
+-$color{'miss'} = ['00','FF','00']; # graph miss line color
+-$color{'ims'} = ['FF','00','FF']; # graph ims hit line color
++$color{'gr'} = ['33','33','99']; # graph total line color
++$color{'hit'} = ['99','33','33']; # graph hit line color
++$color{'miss'} = ['33','99','33']; # graph miss line color
++$color{'ims'} = ['99','33','99']; # graph ims hit line color
+ $color{'hbg'} = ['FF','FF','FF']; # html report background color
+
+ ############ DO NOT EDIT ANYTHING BELOW THIS LINE ##############
+@@ -319,7 +322,7 @@
+ $progSpeed = dec_truncate($lineCounter/$duration,2);
+
+ # Do some console logging
+- console_log("Done reading $lineCounter lines from logfile on STDIN. ($errorLines errors)");
++ console_log("Done reading $lineCounter lines from logfile on STDIN. ($errorLines $Lang::tr{'errors'})");
+ console_log("Analysis duration is $duration seconds, $progSpeed lines/sec.");
+
+ # Create image objects
+@@ -612,13 +615,13 @@
+ print IDX "<BR>\n";
+
+ print IDX "<TABLE BORDER=0>\n";
+- print IDX "<TR><TD><B>Generated:</B></TD><TD>$progStartTime</TD></TR>\n";
+- print IDX "<TR><TD><B>Lines Analyzed:</B></TD><TD>$lineCounter lines ($errorLines errors)</TD></TR>\n";
+- print IDX "<TR><TD><B>Analysis Duration:</B></TD><TD>$duration seconds</TD></TR>\n";
+- print IDX "<TR><TD><B>Analysis Speed:</B></TD><TD>$progSpeed lines/sec</TD></TR>\n";
+- print IDX "<TR><TD><B>Graph Start:</B></TD><TD>$logStartTime</TD></TR>\n";
+- print IDX "<TR><TD><B>Graph End:</B></TD><TD>$logEndTime</TD></TR>\n";
+- print IDX "<TR><TD><B>Graph Domain:</B></TD><TD>24 hours (86400 seconds)</TD></TR>\n";
++ print IDX "<TR><TD><B>$Lang::tr{'generated'}:</B></TD><TD style=padding-left:5px>$progStartTime</TD></TR>\n";
++ print IDX "<TR><TD><B>$Lang::tr{'lines analyzed'}:</B></TD><TD style=padding-left:5px>$lineCounter $Lang::tr{'lines'} ($errorLines $Lang::tr{'errors'})</TD></TR>\n";
++ print IDX "<TR><TD><B>$Lang::tr{'analysis duration'}:</B></TD><TD style=padding-left:5px>$duration $Lang::tr{'seconds'}</TD></TR>\n";
++ print IDX "<TR><TD><B>$Lang::tr{'analysis speed'}:</B></TD><TD style=padding-left:5px>$progSpeed $Lang::tr{'lines sec'}</TD></TR>\n";
++ print IDX "<TR><TD><B>$Lang::tr{'graph start'}:</B></TD><TD style=padding-left:5px>$logStartTime</TD></TR>\n";
++ print IDX "<TR><TD><B>$Lang::tr{'graph end'}:</B></TD><TD style=padding-left:5px>$logEndTime</TD></TR>\n";
++ print IDX "<TR><TD><B>$Lang::tr{'graph domain'}:</B></TD><TD style=padding-left:5px>24 $Lang::tr{'hours'} ($Lang::tr{'24hseconds'})</TD></TR>\n";
+ print IDX "</TABLE>\n";
+
+ sub generate_html_row($$$) {
+@@ -629,7 +632,7 @@
+
+ $ret = "<TR>";
+ $ret .= "<TD ALIGN=RIGHT><FONT SIZE=-1 COLOR=#$color><B>$key:</B></FONT></TD>";
+- $ret .= "<TD ALIGN=LEFT><FONT SIZE=-1>$value</FONT></TD>";
++ $ret .= "<TD style=padding-left:5px ALIGN=LEFT><FONT SIZE=-1>$value</FONT></TD>";
+ $ret .= "</TR>\n";
+
+ undef $color;
+@@ -641,58 +644,58 @@
+
+ if ($have_tcp) {
+ print IDX "<BR><HR><BR>\n";
+- print IDX "<H3>Graph of TCP Accesses (5 minute total)</H3>\n" if (!$have_cumulative);
+- print IDX "<H3>Cumulative graph of TCP Accesses</H3>\n" if ($have_cumulative);
++ print IDX "<H3>$Lang::tr{'graph of tcp accesses'}</H3>\n" if (!$have_cumulative);
++ print IDX "<H3>$Lang::tr{'cumulative graph of tcp accesses'}</H3>\n" if ($have_cumulative);
+ print IDX "<TABLE BORDER=0>\n";
+ print IDX "<TR>\n";
+ print IDX "<TD><IMG SRC=tcp-access.png></TD>\n";
+ print IDX "<TD>\n";
+ print IDX "<TABLE BORDER=0>\n";
+- print IDX generate_html_row($grcolor,"Total Accesses",$tcpAccessTotals);
+- print IDX generate_html_row($grcolor,"Average Accesses","$tcpAccessAverage per hour");
+- print IDX generate_html_row($hitcolor,"Total Cache Hits",$tcpAccessHitTotals);
+- print IDX generate_html_row($hitcolor,"Average Cache Hits","$tcpAccessHitAverage per hour");
+- print IDX generate_html_row($hitcolor,"% Cache Hits","$tcpAccessHitPercentage %");
+- print IDX generate_html_row($imscolor,"Total Cache IMS Hits",$tcpAccessIMSTotals);
+- print IDX generate_html_row($imscolor,"Average Cache IMS Hits","$tcpAccessIMSAverage per hour");
+- print IDX generate_html_row($misscolor,"Total Cache Misses",$tcpAccessMissTotals);
+- print IDX generate_html_row($misscolor,"Average Cache Misses","$tcpAccessMissAverage per hour");
+- print IDX generate_html_row($misscolor,"% Cache Misses","$tcpAccessMissPercentage %");
++ print IDX generate_html_row($grcolor,"$Lang::tr{'total accesses'}",$tcpAccessTotals);
++ print IDX generate_html_row($grcolor,"$Lang::tr{'average accesses'}","$tcpAccessAverage $Lang::tr{'per hour'}");
++ print IDX generate_html_row($hitcolor,"$Lang::tr{'total cache hits'}",$tcpAccessHitTotals);
++ print IDX generate_html_row($hitcolor,"$Lang::tr{'average cache hits'}","$tcpAccessHitAverage $Lang::tr{'per hour'}");
++ print IDX generate_html_row($hitcolor,"$Lang::tr{'percent cache hits'}","$tcpAccessHitPercentage %");
++ print IDX generate_html_row($imscolor,"$Lang::tr{'total cache ims hits'}",$tcpAccessIMSTotals);
++ print IDX generate_html_row($imscolor,"$Lang::tr{'average cache ims hits'}","$tcpAccessIMSAverage $Lang::tr{'per hour'}");
++ print IDX generate_html_row($misscolor,"$Lang::tr{'total cache misses'}",$tcpAccessMissTotals);
++ print IDX generate_html_row($misscolor,"$Lang::tr{'average cache misses'}","$tcpAccessMissAverage $Lang::tr{'per hour'}");
++ print IDX generate_html_row($misscolor,"$Lang::tr{'percent cache misses'}","$tcpAccessMissPercentage %");
+ print IDX "</TABLE>\n";
+ print IDX "</TD>\n";
+ print IDX "</TR>\n";
+ print IDX "</TABLE>\n";
+- print IDX "<H3>Graph of TCP Transfers (5 minute total)</H3>\n" if (!$have_cumulative);
+- print IDX "<H3>Cumulative graph of TCP Transfers</H3>\n" if ($have_cumulative);
++ print IDX "<H3>$Lang::tr{'graph of tcp transfers'}</H3>\n" if (!$have_cumulative);
++ print IDX "<H3>$Lang::tr{'cumulative graph of tcp transfers'}</H3>\n" if ($have_cumulative);
+ print IDX "<TABLE BORDER=0>\n";
+ print IDX "<TR>\n";
+ print IDX "<TD><IMG SRC=tcp-transfer.png></TD>\n";
+ print IDX "<TD>\n";
+ print IDX "<TABLE BORDER=0>\n";
+- print IDX generate_html_row($grcolor,"Total Transfers",$tcpTransferTotals);
+- print IDX generate_html_row($grcolor,"Average Transfers","$tcpTransferAverage per hour");
+- print IDX generate_html_row($hitcolor,"Total Cache Hits",$tcpTransferHitTotals);
+- print IDX generate_html_row($hitcolor,"Average Cache Hits","$tcpTransferHitAverage per hour");
+- print IDX generate_html_row($hitcolor,"% Cache Hits","$tcpTransferHitPercentage %");
+- print IDX generate_html_row($imscolor,"Total Cache IMS Hits",$tcpTransferIMSTotals);
+- print IDX generate_html_row($imscolor,"Average Cache IMS Hits","$tcpTransferIMSAverage per hour");
+- print IDX generate_html_row($misscolor,"Total Cache Misses",$tcpTransferMissTotals);
+- print IDX generate_html_row($misscolor,"Average Cache Misses","$tcpTransferMissAverage per hour");
+- print IDX generate_html_row($misscolor,"% Cache Misses","$tcpTransferMissPercentage %");
++ print IDX generate_html_row($grcolor,"$Lang::tr{'total transfers'}",$tcpTransferTotals);
++ print IDX generate_html_row($grcolor,"$Lang::tr{'average transfers'}","$tcpTransferAverage $Lang::tr{'per hour'}");
++ print IDX generate_html_row($hitcolor,"$Lang::tr{'total cache hits'}",$tcpTransferHitTotals);
++ print IDX generate_html_row($hitcolor,"$Lang::tr{'average cache hits'}","$tcpTransferHitAverage $Lang::tr{'per hour'}");
++ print IDX generate_html_row($hitcolor,"$Lang::tr{'percent cache hits'}","$tcpTransferHitPercentage %");
++ print IDX generate_html_row($imscolor,"$Lang::tr{'total cache ims hits'}",$tcpTransferIMSTotals);
++ print IDX generate_html_row($imscolor,"$Lang::tr{'average cache ims hits'}","$tcpTransferIMSAverage $Lang::tr{'per hour'}");
++ print IDX generate_html_row($misscolor,"$Lang::tr{'total cache misses'}",$tcpTransferMissTotals);
++ print IDX generate_html_row($misscolor,"$Lang::tr{'average cache misses'}","$tcpTransferMissAverage $Lang::tr{'per hour'}");
++ print IDX generate_html_row($misscolor,"$Lang::tr{'percent cache misses'}","$tcpTransferMissPercentage %");
+ print IDX "</TABLE>\n";
+ print IDX "</TD>\n";
+ print IDX "</TR>\n";
+ print IDX "</TABLE>\n";
+ if ($have_transfer) {
+- print IDX "<H3>Graph of Average TCP Transfer Duration</H3>\n";
++ print IDX "<H3>$Lang::tr{'graph of average tcp transfer duration'}</H3>\n";
+ print IDX "<TABLE BORDER=0>\n";
+ print IDX "<TR>\n";
+ print IDX "<TD><IMG SRC=tcp-duration.png></TD>\n";
+ print IDX "<TD>\n";
+ print IDX "<TABLE BORDER=0>\n";
+- print IDX generate_html_row($grcolor,"Avg. Transfer Duration","$tcpTimeAverage seconds");
+- print IDX generate_html_row($hitcolor,"Avg. Cache Hit Duration","$tcpTimeHitAverage seconds");
+- print IDX generate_html_row($misscolor,"Avg. Cache Miss Duration","$tcpTimeMissAverage seconds");
++ print IDX generate_html_row($grcolor,"$Lang::tr{'avg transfer duration'}","$tcpTimeAverage $Lang::tr{'seconds'}");
++ print IDX generate_html_row($hitcolor,"$Lang::tr{'avg cache hit duration'}","$tcpTimeHitAverage $Lang::tr{'seconds'}");
++ print IDX generate_html_row($misscolor,"$Lang::tr{'avg cache miss duration'}","$tcpTimeMissAverage $Lang::tr{'seconds'}");
+ print IDX "</TABLE>\n";
+ print IDX "</TD>\n";
+ print IDX "</TR>\n";
+@@ -702,54 +705,54 @@
+
+ if ($have_udp) {
+ print IDX "<BR><HR><BR>\n";
+- print IDX "<H3>Graph of UDP Accesses (5 minute total)</H3>\n" if (!$have_cumulative);
+- print IDX "<H3>Cumulative graph of UDP Accesses</H3>\n" if ($have_cumulative);
++ print IDX "<H3>$Lang::tr{'graph of udp accesses'}</H3>\n" if (!$have_cumulative);
++ print IDX "<H3>$Lang::tr{'cumulative graph of udp accesses'}</H3>\n" if ($have_cumulative);
+ print IDX "<TABLE BORDER=0>\n";
+ print IDX "<TR>\n";
+ print IDX "<TD><IMG SRC=udp-access.png></TD>\n";
+ print IDX "<TD>\n";
+ print IDX "<TABLE BORDER=0>\n";
+- print IDX generate_html_row($grcolor,"Total Accesses",$udpAccessTotals);
+- print IDX generate_html_row($grcolor,"Average Accesses","$udpAccessAverage per hour");
+- print IDX generate_html_row($hitcolor,"Total Cache Hits",$udpAccessHitTotals);
+- print IDX generate_html_row($hitcolor,"Average Cache Hits","$udpAccessHitAverage per hour");
+- print IDX generate_html_row($hitcolor,"% Cache Hits","$udpAccessHitPercentage %");
+- print IDX generate_html_row($misscolor,"Total Cache Misses",$udpAccessMissTotals);
+- print IDX generate_html_row($misscolor,"Average Cache Misses","$udpAccessMissAverage per hour");
+- print IDX generate_html_row($misscolor,"% Cache Misses","$udpAccessMissPercentage %");
++ print IDX generate_html_row($grcolor,"$Lang::tr{'total accesses'}",$udpAccessTotals);
++ print IDX generate_html_row($grcolor,"$Lang::tr{'average accesses'}","$udpAccessAverage $Lang::tr{'per hour'}");
++ print IDX generate_html_row($hitcolor,"$Lang::tr{'total cache hits'}",$udpAccessHitTotals);
++ print IDX generate_html_row($hitcolor,"$Lang::tr{'average cache hits'}","$udpAccessHitAverage $Lang::tr{'per hour'}");
++ print IDX generate_html_row($hitcolor,"$Lang::tr{'percent cache hits'}","$udpAccessHitPercentage %");
++ print IDX generate_html_row($misscolor,"$Lang::tr{'total cache misses'}",$udpAccessMissTotals);
++ print IDX generate_html_row($misscolor,"$Lang::tr{'average cache misses'}","$udpAccessMissAverage $Lang::tr{'per hour'}");
++ print IDX generate_html_row($misscolor,"$Lang::tr{'percent cache misses'}","$udpAccessMissPercentage %");
+ print IDX "</TABLE>\n";
+ print IDX "</TD>\n";
+ print IDX "</TR>\n";
+ print IDX "</TABLE>\n";
+- print IDX "<H3>Graph of UDP Transfers (5 minute total)</H3>\n" if (!$have_cumulative);
+- print IDX "<H3>Cumulative graph of UDP Transfers</H3>\n" if ($have_cumulative);
++ print IDX "<H3>$Lang::tr{'graph of udp transfers'}</H3>\n" if (!$have_cumulative);
++ print IDX "<H3>$Lang::tr{'cumulative graph of udp transfers'}</H3>\n" if ($have_cumulative);
+ print IDX "<TABLE BORDER=0>\n";
+ print IDX "<TR>\n";
+ print IDX "<TD><IMG SRC=udp-transfer.png></TD>\n";
+ print IDX "<TD>\n";
+ print IDX "<TABLE BORDER=0>\n";
+- print IDX generate_html_row($grcolor,"Total Transfers",$udpTransferTotals);
+- print IDX generate_html_row($grcolor,"Average Transfers","$udpTransferAverage per hour");
+- print IDX generate_html_row($hitcolor,"Total Cache Hits",$udpTransferHitTotals);
+- print IDX generate_html_row($hitcolor,"Average Cache Hits","$udpTransferHitAverage per hour");
+- print IDX generate_html_row($hitcolor,"% Cache Hits","$udpTransferHitPercentage %");
+- print IDX generate_html_row($misscolor,"Total Cache Misses",$udpTransferMissTotals);
+- print IDX generate_html_row($misscolor,"Average Cache Misses","$udpTransferMissAverage per hour");
+- print IDX generate_html_row($misscolor,"% Cache Misses","$udpTransferMissPercentage %");
++ print IDX generate_html_row($grcolor,"$Lang::tr{'total transfers'}",$udpTransferTotals);
++ print IDX generate_html_row($grcolor,"$Lang::tr{'average transfers'}","$udpTransferAverage $Lang::tr{'per hour'}");
++ print IDX generate_html_row($hitcolor,"$Lang::tr{'total cache hits'}",$udpTransferHitTotals);
++ print IDX generate_html_row($hitcolor,"$Lang::tr{'average cache hits'}","$udpTransferHitAverage $Lang::tr{'per hour'}");
++ print IDX generate_html_row($hitcolor,"$Lang::tr{'percent cache hits'}","$udpTransferHitPercentage %");
++ print IDX generate_html_row($misscolor,"$Lang::tr{'total cache misses'}",$udpTransferMissTotals);
++ print IDX generate_html_row($misscolor,"$Lang::tr{'average cache misses'}","$udpTransferMissAverage $Lang::tr{'per hour'}");
++ print IDX generate_html_row($misscolor,"$Lang::tr{'percent cache misses'}","$udpTransferMissPercentage %");
+ print IDX "</TABLE>\n";
+ print IDX "</TD>\n";
+ print IDX "</TR>\n";
+ print IDX "</TABLE>\n";
+ if ($have_transfer) {
+- print IDX "<H3>Graph of Average UDP Transfer Duration</H3>\n";
++ print IDX "<H3>$Lang::tr{'graph of average udp transfer duration'}</H3>\n";
+ print IDX "<TABLE BORDER=0>\n";
+ print IDX "<TR>\n";
+ print IDX "<TD><IMG SRC=udp-duration.png></TD>\n";
+ print IDX "<TD>\n";
+ print IDX "<TABLE BORDER=0>\n";
+- print IDX generate_html_row($grcolor,"Avg. Transfer Duration","$udpTimeAverage seconds");
+- print IDX generate_html_row($hitcolor,"Avg. Cache Hit Duration","$udpTimeHitAverage seconds");
+- print IDX generate_html_row($misscolor,"Avg. Cache Miss Duration","$udpTimeMissAverage seconds");
++ print IDX generate_html_row($grcolor,"$Lang::tr{'avg transfer duration'}","$udpTimeAverage $Lang::tr{'seconds'}");
++ print IDX generate_html_row($hitcolor,"$Lang::tr{'avg cache hit duration'}","$udpTimeHitAverage $Lang::tr{'seconds'}");
++ print IDX generate_html_row($misscolor,"$Lang::tr{'avg cache miss duration'}","$udpTimeMissAverage $Lang::tr{'seconds'}");
+ print IDX "</TABLE>\n";
+ print IDX "</TD>\n";
+ print IDX "</TR>\n";
new file mode 100644
@@ -0,0 +1,6 @@
+ $substatus->{'61.squid-graph'} = {
+ 'caption' => "$Lang::tr{'ssproxy graphs'}",
+ 'uri' => '/cgi-bin/sgraph.cgi',
+ 'title' => "$Lang::tr{'ssproxy graphs'}",
+ 'enabled' => 1,
+ };
new file mode 100644
GIT binary patch
literal 3933
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
literal 0
HcmV?d00001
new file mode 100644
@@ -0,0 +1,72 @@
+#!/usr/bin/perl
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2017 IPFire Team <info@ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+use strict;
+
+# enable only the following on debugging purpose
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
+
+require '/var/ipfire/general-functions.pl';
+require "${General::swroot}/lang.pl";
+require "${General::swroot}/header.pl";
+
+my @graphs = ();
+
+&Header::showhttpheaders();
+
+my $dir = "/srv/web/ipfire/html/sgraph";
+my $sgraphdir = "/srv/web/ipfire/html/sgraph";
+
+&Header::openpage($Lang::tr{'ssproxy graphs'}, 1, '');
+
+&Header::openbigbox('100%', 'left');
+
+&Header::openbox('100%', 'left', $Lang::tr{'proxy access graphs'} . ":" );
+
+if (open(IPACHTML, "$sgraphdir/index.html"))
+{
+ my $skip = 1;
+ while (<IPACHTML>)
+ {
+ $skip = 1 if /^<HR>$/;
+ if ($skip)
+ {
+ $skip = 0 if /<H1>/;
+ next;
+ }
+ s/<IMG SRC=([^"'>]+)>/<img src='\/sgraph\/$1' alt='Graph' \/>/;
+ s/<HR>/<hr \/>/g;
+ s/<BR>/<br \/>/g;
+ s/<([^>]*)>/\L<$1>\E/g;
+ s/(size|align|border|color)=([^'"> ]+)/$1='$2'/g;
+ print;
+ }
+ close(IPACHTML);
+}
+else {
+ print $Lang::tr{'no information available'}; }
+
+&Header::closebox();
+
+&Header::closebigbox();
+
+&Header::closepage();
new file mode 100644
@@ -0,0 +1,49 @@
+%tr = (
+%tr,
+
+'24hseconds' => '86400 Sekunden',
+'analysis duration' => 'Analyse - Dauer',
+'analysis speed' => 'Analyse - Geschwindigkeit',
+'average accesses' => 'Zugriffe - Durchschnitt',
+'average cache hits' => 'Cache-Treffer - Durchschnitt',
+'average cache ims hits' => 'Cache-IMS-Treffer - Durchschnitt',
+'average cache misses' => 'Cache verfehlt - Durchschnitt',
+'average transfers' => 'Transfers - Durchschnitt',
+'avg cache hit duration' => 'Cache-Dauer (Treffer)',
+'avg cache miss duration' => 'Cache-Dauer (verfehlt)',
+'avg transfer duration' => 'Transfer-Dauer',
+'cumulative graph of tcp accesses' => 'TCP-Zugriffe (Zusammenfassung)',
+'cumulative graph of tcp transfers' => 'TCP-Transfers (Zusammenfassung)',
+'cumulative graph of udp accesses' => 'UDP-Zugriffe (Zusammenfassung)',
+'cumulative graph of udp transfers' => 'UDP-Transfers (Zusammenfassung)',
+'errors' => 'Fehler',
+'generated' => 'Erstellt',
+'graph domain' => 'Diagramm - Zeitraum',
+'graph end' => 'Diagramm - Ende',
+'graph of average tcp transfer duration' => 'TCP-Transfer-Dauer (Durchschnitt)',
+'graph of average udp transfer duration' => 'UDP-Transfer-Dauer (Durchschnitt)',
+'graph of tcp accesses' => 'TCP-Zugriffe (alle 5 Minuten)',
+'graph of tcp transfers' => 'TCP-Transfers (alle 5 Minuten)',
+'graph of udp accesses' => 'UDP-Zugriffe (alle 5 Minuten)',
+'graph of udp transfers' => 'UDP-Transfers (alle 5 Minuten)',
+'graph start' => 'Diagramm - Start',
+'hours' => 'Stunden',
+'lines analyzed' => 'Analysierte Zeilen<br />(access.log)',
+'lines sec' => 'Zeilen/Sekunde',
+'lines' => 'Zeilen',
+'no information available' => 'Keine Informationen verfügbar.',
+'percent cache hits' => 'Cache-Treffer - Prozent',
+'percent cache misses' => 'Cache verfehlt - Prozent',
+'per hour' => 'pro Stunde',
+'proxy access graphs' => 'Diagramme zur Proxyauslastung',
+'seconds' => 'Sekunde(n)',
+'ssproxy graphs' => 'Proxy-Diagramme',
+'total accesses' => 'Zugriffe - gesamt',
+'total cache hits' => 'Cache-Treffer - gesamt',
+'total cache ims hits' => 'Cache-IMS-Treffer - gesamt',
+'total cache misses' => 'Cache verfehlt - gesamt',
+'total transfers' => 'Transfers - gesamt',
+
+);
+
+#EOF
new file mode 100644
@@ -0,0 +1,49 @@
+%tr = (
+%tr,
+
+'24hseconds' => '86400 seconds',
+'analysis duration' => 'Analysis Duration',
+'analysis speed' => 'Analysis Speed',
+'average accesses' => 'Average Accesses',
+'average cache hits' => 'Average Cache Hits',
+'average cache ims hits' => 'Average Cache IMS Hits',
+'average cache misses' => 'Average Cache Misses',
+'average transfers' => 'Average Transfers',
+'avg cache hit duration' => 'Avg. Cache Hit Duration',
+'avg cache miss duration' => 'Avg. Cache Miss Duration',
+'avg transfer duration' => 'Avg. Transfer Duration',
+'cumulative graph of tcp accesses' => 'TCP Accesses - cumulative',
+'cumulative graph of tcp transfers' => 'TCP Transfers - cumulative',
+'cumulative graph of udp accesses' => 'UDP Accesses - cumulative',
+'cumulative graph of udp transfers' => 'UDP Transfers - cumulative',
+'errors' => 'error(s)',
+'generated' => 'Generated',
+'graph domain' => 'Graph Domain',
+'graph end' => 'Graph End',
+'graph of average tcp transfer duration' => 'Average TCP Transfer Duration',
+'graph of average udp transfer duration' => 'Average UDP Transfer Duration',
+'graph of tcp accesses' => 'TCP Accesses (5 minute total)',
+'graph of tcp transfers' => 'TCP Transfers (5 minute total)',
+'graph of udp accesses' => 'UDP Accesses (5 minute total)',
+'graph of udp transfers' => 'UDP Transfers (5 minute total)',
+'graph start' => 'Graph Start',
+'hours' => 'hours',
+'lines analyzed' => 'Lines analyzed<br />(access.log)',
+'lines sec' => 'lines/sec',
+'lines' => 'lines',
+'no information available' => 'No information available.',
+'percent cache hits' => '% Cache Hits',
+'percent cache misses' => '% Cache Misses',
+'per hour' => 'per hour',
+'proxy access graphs' => 'Proxy access graphs',
+'seconds' => 'second(s)',
+'ssproxy graphs' => 'Proxy Graphs',
+'total accesses' => 'Total Accesses',
+'total cache hits' => 'Total Cache Hits',
+'total cache ims hits' => 'Total Cache IMS Hits',
+'total cache misses' => 'Total Cache Misses',
+'total transfers' => 'Total Transfers',
+
+);
+
+#EOF
new file mode 100644
@@ -0,0 +1,10 @@
+%tr = (
+%tr,
+
+'no information available' => 'No hay información disponible',
+'proxy access graphs' => 'Gráficas de acceso al proxy',
+'ssproxy graphs' => 'Gráficas de proxy',
+
+);
+
+#EOF
new file mode 100644
@@ -0,0 +1,9 @@
+%tr = (
+%tr,
+
+'no information available' => 'Aucune information disponible.',
+'proxy access graphs' => 'Graphiques des accès proxy',
+'ssproxy graphs' => 'Graphiques du proxy',
+);
+
+#EOF
new file mode 100644
@@ -0,0 +1,9 @@
+%tr = (
+%tr,
+
+'no information available' => 'No information available.',
+'proxy access graphs' => 'Proxy access graphs',
+'ssproxy graphs' => 'Proxy Graphs',
+);
+
+#EOF
new file mode 100644
@@ -0,0 +1,9 @@
+%tr = (
+%tr,
+
+'no information available' => 'Geen informatie beschikbaar.',
+'proxy access graphs' => 'Proxy toegangsgrafieken',
+'ssproxy graphs' => 'Proxy grafieken',
+);
+
+#EOF
new file mode 100644
@@ -0,0 +1,9 @@
+%tr = (
+%tr,
+
+'no information available' => 'Brak dostępnych informacji.',
+'proxy access graphs' => 'Wykresy dostępu do Proxy',
+'ssproxy graphs' => 'Wykresy Proxy',
+);
+
+#EOF
new file mode 100644
@@ -0,0 +1,9 @@
+%tr = (
+%tr,
+
+'no information available' => 'No information available.',
+'proxy access graphs' => 'Proxy access graphs',
+'ssproxy graphs' => 'Proxy Graphs',
+);
+
+#EOF
new file mode 100644
@@ -0,0 +1,9 @@
+%tr = (
+%tr,
+
+'no information available' => 'Herhangi bir bilgi bulunmamaktadır.',
+'proxy access graphs' => 'Vekil sunucu erişim grafiği',
+'ssproxy graphs' => 'Vekil Sunucu Grafikleri',
+);
+
+#EOF
new file mode 100644
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+###
+### Squid-Graphs
+###
+if [ -e "/var/log/squid/access.log" ]; then
+ /usr/bin/squid-graph --no-console-log --tcp-only --output-dir=/srv/web/ipfire/html/sgraph < /var/log/squid/access.log >/dev/null 2>&1;
+fi