From 40d0c2ebacba3428408f7d167d05dda56c99abf2 Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Sun, 27 May 2007 20:14:42 +0000 Subject: [PATCH] WOL Config Types angepasst, Nettraffic und Firewall Graphs Translations, Graph Directory auf 777 git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@588 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/cfgroot/graphs.pl | 4 ++-- doc/language_issues.de | 20 +++++++------------- doc/language_issues.en | 4 ++++ html/cgi-bin/traffic.cgi | 2 -- html/cgi-bin/wakeonlan.cgi | 10 +++------- langs/de/cgi-bin/de.pl | 20 ++++++++++++++++++++ langs/en/cgi-bin/en.pl | 4 ++++ lfs/configroot | 1 + 8 files changed, 41 insertions(+), 24 deletions(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index fd43805b6a..0f492d4da2 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -269,12 +269,12 @@ sub updatefwhitsgraph { "--color", "BACK".$color{"color21"}, "-t firewall hits over the last $interval", "DEF:amount=$rrdlog/firewallhits.rrd:amount:AVERAGE", - "AREA:amount".$color{"color24"}.":firewallhits", + "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"}.":portscans", + "AREA:portamount".$color{"color25"}.":$tr{'portscans'}", "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"); diff --git a/doc/language_issues.de b/doc/language_issues.de index 7e533e4e2d..2ac0794449 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -1,5 +1,6 @@ WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile +WARNING: translation string unused: Firewall Graphs WARNING: translation string unused: HDD temperature WARNING: translation string unused: Local VPN IP WARNING: translation string unused: Ping @@ -82,6 +83,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 firwallhits WARNING: translation string unused: dat without key WARNING: translation string unused: dbfile WARNING: translation string unused: ddns help dnsmadeeasy @@ -123,6 +125,7 @@ WARNING: translation string unused: exportkey WARNING: translation string unused: external access rule changed WARNING: translation string unused: filename WARNING: translation string unused: firewall log viewer +WARNING: translation string unused: firewallhits WARNING: translation string unused: firmware WARNING: translation string unused: force update WARNING: translation string unused: free memory @@ -199,6 +202,7 @@ WARNING: translation string unused: minutes WARNING: translation string unused: missing dat WARNING: translation string unused: missing gz WARNING: translation string unused: modulation +WARNING: translation string unused: monthly firewallhits WARNING: translation string unused: mount WARNING: translation string unused: nat-traversal WARNING: translation string unused: net address @@ -235,6 +239,7 @@ WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key 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: pots WARNING: translation string unused: profiles WARNING: translation string unused: proxy no proxy extend @@ -314,11 +319,12 @@ WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange WARNING: translation string unused: web proxy configuration WARNING: translation string unused: week +WARNING: translation string unused: weekly firewallhits 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: allmsg WARNING: untranslated string: alt proxy WARNING: untranslated string: bleeding rules WARNING: untranslated string: community rules @@ -334,20 +340,8 @@ WARNING: untranslated string: otherip WARNING: untranslated string: otherport WARNING: untranslated string: pakfire configuration WARNING: untranslated string: red -WARNING: untranslated string: selecttraffic WARNING: untranslated string: settingsc WARNING: untranslated string: sstraffic -WARNING: untranslated string: trafficblue -WARNING: untranslated string: trafficdate -WARNING: untranslated string: trafficfrom -WARNING: untranslated string: trafficgreen -WARNING: untranslated string: trafficin -WARNING: untranslated string: trafficorange -WARNING: untranslated string: trafficout -WARNING: untranslated string: trafficred -WARNING: untranslated string: traffics -WARNING: untranslated string: trafficsum -WARNING: untranslated string: trafficto WARNING: untranslated string: tripwire WARNING: untranslated string: up WARNING: untranslated string: urlfilter background image diff --git a/doc/language_issues.en b/doc/language_issues.en index 8e717ec033..d81e96b4d5 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1,5 +1,6 @@ WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile +WARNING: translation string unused: Firewall Graphs WARNING: translation string unused: HDD temperature WARNING: translation string unused: Local VPN IP WARNING: translation string unused: Ping @@ -99,6 +100,7 @@ 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 +135,7 @@ WARNING: translation string unused: exportkey WARNING: translation string unused: external access rule changed WARNING: translation string unused: filename WARNING: translation string unused: firewall log viewer +WARNING: translation string unused: firewallhits WARNING: translation string unused: firmware WARNING: translation string unused: force update WARNING: translation string unused: free memory @@ -248,6 +251,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: pots WARNING: translation string unused: profiles WARNING: translation string unused: psk diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi index 22867d76a7..0d87936ff5 100644 --- a/html/cgi-bin/traffic.cgi +++ b/html/cgi-bin/traffic.cgi @@ -30,8 +30,6 @@ my %netsettings; &General::readhash("${General::swroot}/ppp/settings", \%pppsettings); &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); -my @wday = ($Lang::tr{'wday1'}, $Lang::tr{'wday2'}, $Lang::tr{'wday3'}, $Lang::tr{'wday4'}, $Lang::tr{'wday5'}, $Lang::tr{'wday6'}, $Lang::tr{'wday7'}); - my ($s, $min, $h, $d, $m,$y) = localtime(time); $y+=1900; $m+=1; diff --git a/html/cgi-bin/wakeonlan.cgi b/html/cgi-bin/wakeonlan.cgi index e38ff2825b..081e235d51 100644 --- a/html/cgi-bin/wakeonlan.cgi +++ b/html/cgi-bin/wakeonlan.cgi @@ -430,18 +430,14 @@ sub WriteConfig # sub haveOrangeNet { - if ($netsettings{'CONFIG_TYPE'} == 1) {return 1;} - if ($netsettings{'CONFIG_TYPE'} == 3) {return 1;} - if ($netsettings{'CONFIG_TYPE'} == 5) {return 1;} - if ($netsettings{'CONFIG_TYPE'} == 7) {return 1;} + if ($netsettings{'CONFIG_TYPE'} == 2) {return 1;} + if ($netsettings{'CONFIG_TYPE'} == 4) {return 1;} return 0; } sub haveBlueNet { + if ($netsettings{'CONFIG_TYPE'} == 3) {return 1;} if ($netsettings{'CONFIG_TYPE'} == 4) {return 1;} - if ($netsettings{'CONFIG_TYPE'} == 5) {return 1;} - if ($netsettings{'CONFIG_TYPE'} == 6) {return 1;} - if ($netsettings{'CONFIG_TYPE'} == 7) {return 1;} return 0; } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index e46c309bcb..0a12db4648 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -17,6 +17,7 @@ 'ConnSched time' => 'Zeit:', 'ConnSched up' => 'Hoch', 'ConnSched weekdays' => 'Wochentage:', +'Firewall Graphs' => 'Firewall Diagramme', 'HDD temperature' => 'HDD-Temperatur', 'Local VPN IP' => 'Internes Netzwerk (GREEN)', 'MTU' => 'MTU Size', @@ -292,6 +293,7 @@ 'all interfaces' => 'Alle Schnittstellen', 'all services' => 'Alle Dienste', 'all updates installed' => 'Alle Updates installiert', +'allmsg' => 'alles', 'alt dialup' => 'Einwahl', 'alt home' => 'Startseite', 'alt information' => 'Information', @@ -475,6 +477,7 @@ 'current rules' => 'Aktuelle Regeln:', 'custom networks' => 'Benutzerdefinierte Netzwerke', 'custom services' => 'Benutzerdefinierte Dienste', +'daily firwallhits' => 'tägliche Firewalltreffer', 'dat without key' => 'Ein verschlüsseltes Archiv kann ohne Schlüssel nicht wiederhergestellt werden.', 'date' => 'Datum', 'date not in logs' => 'Für den gesuchten Tag existiert kein (oder nur ein unvollständiges) Log', @@ -673,6 +676,7 @@ 'firewall logs' => 'Firewall-Logdateien', 'firewall logs ip' => 'Firewall-Logdiagramme (IP)', 'firewall logs port' => 'Firewall-Logdiagramme (Port)', +'firewallhits' => 'Firewalltreffer', 'firmware' => 'Firmware', 'firmware upload' => 'Hochladen der Firmware/Treiber', 'fixed ip lease added' => 'Feste IP-Zuordnung hinzugefügt', @@ -977,6 +981,7 @@ 'modulation' => 'Modulation', 'monday' => 'Montag', 'month' => 'Monat', +'monthly firewallhits' => 'monatliche Firewalltreffer', 'months' => 'Monate', 'more' => 'weitere', 'mount' => 'Einbinden', @@ -1126,6 +1131,7 @@ 'port' => 'Port', 'port forwarding configuration' => 'Konfiguration der Port-Weiterleitung', 'ports' => 'Ports', +'portscancs' => 'Portscans', 'pots' => 'Analoges Telefon', 'ppp setup' => 'PPP-Einstellungen', 'pppoe' => 'PPPoE', @@ -1243,6 +1249,7 @@ 'select dest net' => 'Auswahl Ziel-Netz', 'select media' => 'Wähle Medium
(nur FAT wird auf entfernbaren Medien unterstützt)', 'select source net' => 'Auswahl Quell-Netz', +'selecttraffic' => 'Trafficübersicht auswählen:', 'send cr' => 'ISP verlangt Zeilenrücklaufzeichen:', 'september' => 'September', 'serial' => 'serielle', @@ -1390,6 +1397,17 @@ 'traffic on' => 'Verkehr auf', 'traffic shaping' => 'Traffic Shaping', 'traffic shaping settings' => 'Einstellungen der Datenflußkontrolle', +'trafficblue' => 'WLAN', +'trafficdate' => 'Datum', +'trafficfrom' => 'Von', +'trafficgreen' => 'Internes Netz', +'trafficin' => 'Eingehend', +'trafficorange' => 'DMZ', +'trafficout' => 'Ausgehend', +'trafficred' => 'Internet', +'traffics' => 'Trafficübersicht:', +'trafficsum' => 'Total', +'trafficto' => 'Nach', 'transfer limits' => 'Transferbeschränkungen', 'transparent on' => 'Transparent auf', 'tripwire cronjob' => 'Tripwire Cronjob', @@ -1734,6 +1752,7 @@ 'website' => 'Website', 'wednesday' => 'Mittwoch', 'week' => 'Woche', +'weekly firewallhits' => 'wöchentliche Firewalltreffer', 'weeks' => 'Wochen', 'wildcards' => 'Wildcards', 'wins server' => 'Wins Server', @@ -1748,6 +1767,7 @@ 'xtaccess all error' => 'Sie können einen externen Zugang nicht auf \'ALL\' setzen - dies erfolgt in den Port-Weiterleitungsregeln.', 'xtaccess bad transfert' => 'Wenn Sie einen Port Zielbereich angeben, muss der Quellbereich identisch sein!', 'year' => 'Jahr', +'yearly firewallhits' => 'jährliche Firewalltreffer', 'yes' => 'Ja', 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'Sie können nur eine Roadwarrior Verbindung definieren, wenn die Pre-shared Schlüsselauthentifizierung verwendet wird.
Entweder haben Sie bereits eine Roadwarrior Verbindung mit Pre-shared Schlüsselauthentifizierung, oder Sie versuchen gerade eine hinzuzufügen.', 'your department' => 'Ihre Abteilung', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 21fd1b2df6..ce6e477f84 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -17,6 +17,7 @@ 'ConnSched time' => 'Time:', 'ConnSched up' => 'Up', 'ConnSched weekdays' => 'Days of the week:', +'Firewall Graphs' => 'Firewall Graphs', 'HDD temperature' => 'HDD temperature', 'Local VPN IP' => 'Internal Network (GREEN):', 'MTU' => 'MTU Size:', @@ -493,6 +494,7 @@ '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', @@ -684,6 +686,7 @@ 'firewall log' => 'Firewall log', 'firewall log viewer' => 'Firewall Log Viewer', 'firewall logs' => 'Firewall Logs', +'firewallhits' => 'firewallhits', 'firmware' => 'Firmware', 'firmware upload' => 'Upload Firmware/Drivers', 'fixed ip lease added' => 'Fixed IP lease added', @@ -1141,6 +1144,7 @@ 'port' => 'Port', 'port forwarding configuration' => 'Port forwarding configuration', 'ports' => 'Ports', +'portscancs' => 'portscancs', 'pots' => 'Analog classic line', 'ppp setup' => 'PPP setup', 'pppoe' => 'PPPoE', diff --git a/lfs/configroot b/lfs/configroot index e5d33e7d10..980721a8c0 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -133,6 +133,7 @@ $(TARGET) : # Configroot permissions chown -R nobody:nobody $(CONFIG_ROOT) chown root:root $(CONFIG_ROOT) + chmod 777 /srv/web/ipfire/html/graphs for i in backup/ header.pl general-functions.pl lang.pl addon-lang/ langs/ red/ ; do \ chown -R root:root $(CONFIG_ROOT)/$$i; \ done -- 2.39.2