Firewallgraphen angepasst und uebersetzt

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@590 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 0f492d4da23c6132b16a8dd1654cd7a745db1578..abc13685106e23fe3b165898c37b9b7017be8b6a 100644 (file)
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -259,25 +259,25 @@ sub updateifgraph {
 }
 
 sub updatefwhitsgraph {
-  my $interval = $_[0];
+  my $period = $_[0];
 
-  RRDs::graph ("$graphs/firewallhits-$interval-area.png",
-  "--start", "-1$interval", "-aPNG", "-i", "-z",
-  "--alt-y-grid", "-w 600", "-h 200",
+  RRDs::graph ("$graphs/firewallhits-$period-area.png",
+  "--start", "-1$period", "-aPNG", "-i", "-z",
+  "--alt-y-grid", "-w 600", "-h 100",
   "--color", "SHADEA".$color{"color19"},
   "--color", "SHADEB".$color{"color19"},
   "--color", "BACK".$color{"color21"},
-  "-t firewall hits over the last $interval",
+  "-t $tr{'firewall hits per'} $tr{$period}",
   "DEF:amount=$rrdlog/firewallhits.rrd:amount:AVERAGE",
-  "AREA:amount".$color{"color24"}.":$tr{'firewallhits'}",
-  "GPRINT:amount:MAX:   $tr{'maximal'}\\: %2.2lf %S",
-  "GPRINT:amount:AVERAGE: $tr{'average'}\\: %2.2lf %S",
-  "GPRINT:amount:LAST: $tr{'current'}\\: %2.2lf %Shits/5 min\\n",
   "DEF:portamount=$rrdlog/firewallhits.rrd:portamount:AVERAGE",
-  "AREA:portamount".$color{"color25"}.":$tr{'portscans'}",
-  "GPRINT:portamount:MAX:      $tr{'maximal'}\\: %2.2lf %S",
+  "AREA:amount".$color{"color24"}.":$tr{'firewallhits'}/5 min",
+  "GPRINT:amount:MAX: $tr{'maximal'}\\: %2.2lf %S",
+  "GPRINT:amount:AVERAGE: $tr{'average'}\\: %2.2lf %S",
+  "GPRINT:amount:LAST: $tr{'current'}\\: %2.2lf %S\\j",
+  "AREA:portamount".$color{"color25"}.":$tr{'portscans'}/5 min",
+  "GPRINT:portamount:MAX: $tr{'maximal'}\\: %2.2lf %S",
   "GPRINT:portamount:AVERAGE: $tr{'average'}\\: %2.2lf %S",
-  "GPRINT:portamount:LAST: $tr{'current'}\\: %2.2lf %Shits/5 min");
+  "GPRINT:portamount:LAST: $tr{'current'}\\: %2.2lf %S\\j");
   $ERROR = RRDs::error;
   print "Error in RRD::graph for Firewallhits: $ERROR\n" if $ERROR;
 }

diff --git a/doc/language_issues.de b/doc/language_issues.de
index a77536a79ae7ecd088b92b533892d22f6cb89fd4..884ea5736052f7dd78b679a137baa15c9b875999 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -82,6 +82,7 @@ WARNING: translation string unused: current dynamic leases
 WARNING: translation string unused: current media
 WARNING: translation string unused: current ovpn
 WARNING: translation string unused: current profile
+WARNING: translation string unused: daily firewallhits
 WARNING: translation string unused: daily firwallhits
 WARNING: translation string unused: dat without key
 WARNING: translation string unused: dbfile
@@ -123,6 +124,7 @@ WARNING: translation string unused: expected
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
 WARNING: translation string unused: filename
+WARNING: translation string unused: firewall hits per
 WARNING: translation string unused: firewall log viewer
 WARNING: translation string unused: firewallhits
 WARNING: translation string unused: firmware
@@ -225,8 +227,6 @@ WARNING: translation string unused: optionsfw warning
 WARNING: translation string unused: or
 WARNING: translation string unused: original
 WARNING: translation string unused: other countries
-WARNING: translation string unused: other ip
-WARNING: translation string unused: other port
 WARNING: translation string unused: out
 WARNING: translation string unused: outgoing traffic in bytes per second
 WARNING: translation string unused: ovpn
@@ -314,7 +314,6 @@ WARNING: translation string unused: used memory
 WARNING: translation string unused: used swap
 WARNING: translation string unused: user cpu
 WARNING: translation string unused: user cpu usage
-WARNING: translation string unused: user proxy log
 WARNING: translation string unused: view log
 WARNING: translation string unused: vpn on blue
 WARNING: translation string unused: vpn on green
@@ -326,17 +325,3 @@ WARNING: translation string unused: written sectors
 WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year
 WARNING: translation string unused: yearly firewallhits
-WARNING: untranslated string: IPFires hostname
-WARNING: untranslated string: down
-WARNING: untranslated string: otherip
-WARNING: untranslated string: otherport
-WARNING: untranslated string: settingsc
-WARNING: untranslated string: up
-WARNING: untranslated string: user proxy logs
-WARNING: untranslated string: wday1
-WARNING: untranslated string: wday2
-WARNING: untranslated string: wday3
-WARNING: untranslated string: wday4
-WARNING: untranslated string: wday5
-WARNING: untranslated string: wday6
-WARNING: untranslated string: wday7

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 6a35e2c4ca4ee613a1eaa4d3b8788583a85fa37e..5be82cbe0bdcb40f18bb97a4a9ce7cb982ab4ea2 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -99,7 +99,6 @@ WARNING: translation string unused: current media
 WARNING: translation string unused: current ovpn
 WARNING: translation string unused: current profile
 WARNING: translation string unused: daily firewallhits
-WARNING: translation string unused: daily firwallhits
 WARNING: translation string unused: dat without key
 WARNING: translation string unused: dbfile
 WARNING: translation string unused: debugme
@@ -133,6 +132,7 @@ WARNING: translation string unused: expected
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
 WARNING: translation string unused: filename
+WARNING: translation string unused: firewall hits per
 WARNING: translation string unused: firewall log viewer
 WARNING: translation string unused: firewallhits
 WARNING: translation string unused: firmware
@@ -238,8 +238,6 @@ WARNING: translation string unused: optionsfw portlist hint
 WARNING: translation string unused: optionsfw warning
 WARNING: translation string unused: original
 WARNING: translation string unused: other countries
-WARNING: translation string unused: other ip
-WARNING: translation string unused: other port
 WARNING: translation string unused: out
 WARNING: translation string unused: outgoing traffic in bytes per second
 WARNING: translation string unused: ovpn
@@ -252,7 +250,7 @@ WARNING: translation string unused: package failed to install
 WARNING: translation string unused: password contains illegal characters
 WARNING: translation string unused: passwords must be at least 6 characters in length
 WARNING: translation string unused: polfile
-WARNING: translation string unused: portscancs
+WARNING: translation string unused: portscans
 WARNING: translation string unused: pots
 WARNING: translation string unused: profiles
 WARNING: translation string unused: psk
@@ -320,7 +318,6 @@ WARNING: translation string unused: used memory
 WARNING: translation string unused: used swap
 WARNING: translation string unused: user cpu
 WARNING: translation string unused: user cpu usage
-WARNING: translation string unused: user proxy log
 WARNING: translation string unused: view log
 WARNING: translation string unused: vpn on blue
 WARNING: translation string unused: vpn on green
@@ -331,17 +328,3 @@ WARNING: translation string unused: weekly firewallhits
 WARNING: translation string unused: written sectors
 WARNING: translation string unused: year
 WARNING: translation string unused: yearly firewallhits
-WARNING: untranslated string: IPFires hostname
-WARNING: untranslated string: down
-WARNING: untranslated string: otherip
-WARNING: untranslated string: otherport
-WARNING: untranslated string: settingsc
-WARNING: untranslated string: up
-WARNING: untranslated string: user proxy logs
-WARNING: untranslated string: wday1
-WARNING: untranslated string: wday2
-WARNING: untranslated string: wday3
-WARNING: untranslated string: wday4
-WARNING: untranslated string: wday5
-WARNING: untranslated string: wday6
-WARNING: untranslated string: wday7

diff --git a/doc/language_missings b/doc/language_missings
index a3ddc4b1d6c6d089aa9b55ba8d402c348630c41a..d12772635d0f41f85943f762f4b16f2ef06dd6db 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -9,6 +9,7 @@
 < blue access use hint
 < could not connect to www ipcop org
 < create new backup
+< daily firwallhits
 < ddns help dnsmadeeasy
 < ddns help freedns
 < ddns help plus
@@ -21,6 +22,7 @@
 < err bk 10 password
 < or
 < password crypting key
+< portscancs
 < proxy no proxy extend
 < proxy no proxy local
 < removable device advice

diff --git a/html/cgi-bin/fwhits.cgi b/html/cgi-bin/fwhits.cgi
index e91e22b7e24379806561514834b3efbad2e9a464..7f3b62dc9826495cab7ba28e7f057fb3e2978649 100644 (file)
--- a/html/cgi-bin/fwhits.cgi
+++ b/html/cgi-bin/fwhits.cgi
@@ -37,31 +37,51 @@ my $errormessage="";
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
                &Header::openbox('100%', 'center', $Lang::tr{"daily firewallhits"});
-               my $ftime = localtime((stat("$graphdir/firewallhits-day-area.png"))[9]);
+if (-e "$Header::graphdir/firewallhits-day-area.png") {
+               my $ftime = localtime((stat("$Header::graphdir/firewallhits-day-area.png"))[9]);
                print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
                print "<img alt='' src='/graphs/firewallhits-day-area.png' border='0' />";
                print "<br />\n";
+} else {
+       print $Lang::tr{'no information available'};
+}
+print "<br />\n";
                &Header::closebox();
-
+               
                &Header::openbox('100%', 'center', $Lang::tr{"weekly firewallhits"});
-               my $ftime = localtime((stat("$graphdir/firewallhits-week-area.png"))[9]);
+if (-e "$Header::graphdir/firewallhits-week-area.png") {
+               my $ftime = localtime((stat("$Header::graphdir/firewallhits-week-area.png"))[9]);
                print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
                print "<img alt='' src='/graphs/firewallhits-week-area.png' border='0' />";
                print "<br />\n";
+} else {
+       print $Lang::tr{'no information available'};
+}
+print "<br />\n";
                &Header::closebox();
 
                &Header::openbox('100%', 'center', $Lang::tr{"monthly firewallhits"});
-               my $ftime = localtime((stat("$graphdir/firewallhits-month-area.png"))[9]);
+if (-e "$Header::graphdir/firewallhits-month-area.png") {
+               my $ftime = localtime((stat("$Header::graphdir/firewallhits-month-area.png"))[9]);
                print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
                print "<img alt='' src='/graphs/firewallhits-month-area.png' border='0' />";
                print "<br />\n";
+} else {
+       print $Lang::tr{'no information available'};
+}
+print "<br />\n";
                &Header::closebox();
 
                &Header::openbox('100%', 'center', $Lang::tr{"yearly firewallhits"});
-               my $ftime = localtime((stat("$graphdir/firewallhits-year-area.png"))[9]);
+if (-e "$Header::graphdir/firewallhits-year-area.png") {
+               my $ftime = localtime((stat("$Header::graphdir/firewallhits-year-area.png"))[9]);
                print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
                print "<img alt='' src='/graphs/firewallhits-year-area.png' border='0' />";
                print "<br />\n";
+} else {
+       print $Lang::tr{'no information available'};
+}
+print "<br />\n";
                &Header::closebox();
 
 &Header::closebigbox();

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 7eede3aad4f31f042d1630fbfb6a8544ab12d880..7cbab640a002ee652b24e9d32f11d507c6497866 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -479,6 +479,7 @@
 'current rules' => 'Aktuelle Regeln:',
 'custom networks' => 'Benutzerdefinierte Netzwerke',
 'custom services' => 'Benutzerdefinierte Dienste',
+'daily firewallhits' => 'tägliche Firewalltreffer',
 'daily firwallhits' => 'tägliche Firewalltreffer',
 'dat without key' => 'Ein verschlüsseltes Archiv kann ohne Schlüssel nicht wiederhergestellt werden.',
 'date' => 'Datum',
@@ -675,6 +676,7 @@
 'firewall' => 'Firewall',
 'firewall graphs' => 'Firewall Diagramme',
 'firewall hits' => 'Gesamtanzahl der Firewall-Treffer für',
+'firewall hits per' => 'Firewalltreffer pro',
 'firewall log' => 'Firewall-Protokoll',
 'firewall log viewer' => 'Betrachter der Firewall-Logdateien',
 'firewall logs' => 'Firewall-Logdateien',
@@ -1081,9 +1083,9 @@
 'original' => 'Original',
 'os level' => 'OS Level',
 'other countries' => 'Andere Länder',
-'other ip' => 'Andere IP',
 'other login script' => 'Anderes Anmeldeskript',
-'other port' => 'Anderer Port',
+'otherip' => 'Andere IP',
+'otherport' => 'Anderer Port',
 'out' => 'Aus',
 'outgoing' => 'ausgehend',
 'outgoing firewall' => 'Ausgehende Firewall',
@@ -1727,7 +1729,7 @@
 'user cpu' => 'Benutzer CPU',
 'user cpu usage' => 'Benutzer CPU',
 'user log' => 'Benutzer Log',
-'user proxy log' => 'Benutzer Proxy Log',
+'user proxy logs' => 'Benutzer Proxy Log',
 'username' => 'Benutzername:',
 'username not set' => 'Benutzername nicht angegeben.',
 'users department' => 'Abteilung des Benutzers',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index e46dd06abb29d2a7205eefa8c2ee8ad884368f78..f3130b0b0880e0614b036a0d2dd5d443ae864b97 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -496,7 +496,6 @@
 'custom networks' => 'Custom networks',
 'custom services' => 'Custom services',
 'daily firewallhits' => 'daily firewallhits',
-'daily firwallhits' => 'daily firwallhits',
 'dat without key' => 'An encrypted archive cannot be restored without the key.',
 'date' => 'Date',
 'date not in logs' => 'No (or only partial) logs exist for the day queried',
@@ -685,6 +684,7 @@
 'firewall' => 'Firewall',
 'firewall graphs' => 'Firewall Graphs',
 'firewall hits' => 'Total number of firewall hits for',
+'firewall hits per' => 'firewallhits per',
 'firewall log' => 'Firewall log',
 'firewall log viewer' => 'Firewall Log Viewer',
 'firewall logs' => 'Firewall Logs',
@@ -1094,9 +1094,9 @@
 'original' => 'Original',
 'os level' => 'OS Level',
 'other countries' => 'Other countries',
-'other ip' => 'other IP',
 'other login script' => 'Other login script',
-'other port' => 'other Port',
+'otherip' => 'other IP',
+'otherport' => 'other Port',
 'out' => 'Out',
 'outgoing' => 'outgoing',
 'outgoing firewall' => 'Outgoing Firewall',
@@ -1155,7 +1155,7 @@
 'port' => 'Port',
 'port forwarding configuration' => 'Port forwarding configuration',
 'ports' => 'Ports',
-'portscancs' => 'portscancs',
+'portscans' => 'portscancs',
 'pots' => 'Analog classic line',
 'ppp setup' => 'PPP setup',
 'pppoe' => 'PPPoE',
@@ -1733,7 +1733,7 @@
 'user cpu' => 'User CPU',
 'user cpu usage' => 'User CPU Usage',
 'user log' => 'user log',
-'user proxy log' => 'user proxy log',
+'user proxy logs' => 'user proxy log',
 'username' => 'User Name:',
 'username not set' => 'Username not set.',
 'users department' => 'User\'s Department',