diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi index c14e3f09d..bc7f498b1 100644 --- a/html/cgi-bin/backup.cgi +++ b/html/cgi-bin/backup.cgi @@ -141,9 +141,9 @@ my @backups = `cd /var/ipfire/backup/ && ls *.ipf 2>/dev/null`; print < - - + END ; } elsif ($_ =~ m/^Swap:\s+(\d+)\s+(\d+)\s+(\d+)$/) { @@ -111,7 +111,7 @@ END print < - + END ; } elsif ($ram and $_ =~ m/^-\/\+ buffers\/cache:\s+(\d+)\s+(\d+)$/ ) { @@ -120,8 +120,8 @@ END print "" } print <$used - + + - - - + + +
$Lang::tr{'logs'}include Logfiles +
$Lang::tr{'logs'}$Lang::tr{'include logfiles'} / - exclude Logfiles + $Lang::tr{'exclude logfiles'}
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 96f5ccd9d..207e30455 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -185,7 +185,7 @@ print < $Lang::tr{'network'} IP $Lang::tr{'status'} -
$Lang::tr{'internet'}:
+
$Lang::tr{'internet'}
$ipaddr $connstate END @@ -257,7 +257,7 @@ END } if ( $netsettings{'GREEN_DEV'} ) { print <$Lang::tr{'lan'}: +
$Lang::tr{'lan'} $netsettings{'GREEN_ADDRESS'} END @@ -267,7 +267,7 @@ END } else { print "Proxy aus"; } } if ( $netsettings{'BLUE_DEV'} ) { print <$Lang::tr{'wireless'}:
+
$Lang::tr{'wireless'}
$netsettings{'BLUE_ADDRESS'} END @@ -277,7 +277,7 @@ END } else { print "Proxy aus"; } } if ( $netsettings{'ORANGE_DEV'} ) { print <$Lang::tr{'dmz'}:
+
$Lang::tr{'dmz'}
$netsettings{'ORANGE_ADDRESS'} Online END @@ -289,7 +289,7 @@ END my %confighash = (); &General::readhasharray("${General::swroot}/vpn/config", \%confighash); print <$Lang::tr{'vpn'}:
+
$Lang::tr{'vpn'}
$ipsecip Online END @@ -322,7 +322,7 @@ END `cat /var/ipfire/ovpn/settings | grep ^ENABLED_ORANGE=on`) { my $ovpnip = `cat /var/ipfire/ovpn/settings | grep ^DOVPN_SUBNET= | cut -c 14- | sed -e 's\/\\/255.255.255.0\/\/'`; print <OpenVPN:
+
OpenVPN
$ovpnip Online END diff --git a/html/cgi-bin/memory.cgi b/html/cgi-bin/memory.cgi index 298c39186..ed73fb3f8 100644 --- a/html/cgi-bin/memory.cgi +++ b/html/cgi-bin/memory.cgi @@ -97,7 +97,7 @@ END print < $Lang::tr{'ram'}$size$size KB$Lang::tr{'swap'}$size$size KB
$Lang::tr{'excluding buffers and cache'}$free$used KB$free KB END ; @@ -137,9 +137,9 @@ END close FREE; print <
$Lang::tr{'shared'}$shared
$Lang::tr{'buffers'}$buffers
$Lang::tr{'cached'}$cached
$Lang::tr{'shared'}$shared KB
$Lang::tr{'buffers'}$buffers KB
$Lang::tr{'cached'}$cached KB
END ; diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index bf5d9173a..8a3d0024f 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -23,7 +23,7 @@ use RRDs; use strict; # enable only the following on debugging purpose # use warnings; -#use CGI::Carp 'fatalsToBrowser'; +# use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; @@ -487,6 +487,95 @@ elsif ($qossettings{'ACTION'} eq $Lang::tr{'save'}) } &General::writehash("${General::swroot}/qos/settings", \%qossettings); } +elsif ($qossettings{'ACTION'} eq $Lang::tr{'template'} ) +{ + my @UP; + #print "UP
"; + for(my $i = 1; $i <= 10; $i++) { + $UP[$i] = int($qossettings{'OUT_SPD'} / $i ); + #print $i."=".$UP[$i]." "; + } + my @DOWN; + #print "

Down
"; + for(my $i = 1; $i <= 20; $i++) { + $DOWN[$i] = int($qossettings{'INC_SPD'} / $i); + #print $i."=".$DOWN[$i]." "; + } + open( FILE, "> $classfile" ) or die "Unable to write $classfile"; + print FILE < $level7file" ) or die "Unable to write $level7file"; + print FILE < $portfile" ) or die "Unable to write $portfile"; + print FILE <
".$Lang::tr{'no information available'}; } print "\t"; @@ -761,15 +850,15 @@ sub changebandwidth {
- + + + + +
$Lang::tr{'down and up speed'} -
$Lang::tr{'downlink speed'}: - -   -
$Lang::tr{'uplink speed'}: - -   +
$Lang::tr{'down and up speed'}
$Lang::tr{'downlink speed'}:

$Lang::tr{'uplink speed'}:
+ $Lang::tr{'template warning'} END ; } diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi index b18bb537e..7d78d2e26 100644 --- a/html/cgi-bin/system.cgi +++ b/html/cgi-bin/system.cgi @@ -47,33 +47,33 @@ my %cgiparams=(); # is also the name of the program my %servicenames = ( - $Lang::tr{'dhcp server'} => 'dhcpd', - $Lang::tr{'web server'} => 'httpd', - $Lang::tr{'cron server'} => 'fcron', - $Lang::tr{'dns proxy server'} => 'dnsmasq', - $Lang::tr{'logging server'} => 'syslogd', - $Lang::tr{'kernel logging server'} => 'klogd', - $Lang::tr{'ntp server'} => 'ntpd', - $Lang::tr{'secure shell server'} => 'sshd', - $Lang::tr{'vpn'} => 'pluto', - $Lang::tr{'web proxy'} => 'squid', - 'OpenVPN' => 'openvpn' + $Lang::tr{'dhcp server'} => 'dhcpd', + $Lang::tr{'web server'} => 'httpd', + $Lang::tr{'cron server'} => 'fcron', + $Lang::tr{'dns proxy server'} => 'dnsmasq', + $Lang::tr{'logging server'} => 'syslogd', + $Lang::tr{'kernel logging server'} => 'klogd', + $Lang::tr{'ntp server'} => 'ntpd', + $Lang::tr{'secure shell server'} => 'sshd', + $Lang::tr{'vpn'} => 'pluto', + $Lang::tr{'web proxy'} => 'squid', + 'OpenVPN' => 'openvpn' ); my $iface = ''; if (open(FILE, "${General::swroot}/red/iface")) { - $iface = ; - close FILE; - chomp $iface; + $iface = ; + close FILE; + chomp $iface; } $servicenames{"$Lang::tr{'intrusion detection system'} (RED)"} = "snort_${iface}"; $servicenames{"$Lang::tr{'intrusion detection system'} (GREEN)"} = "snort_$netsettings{'GREEN_DEV'}"; if ($netsettings{'ORANGE_DEV'} ne '') { - $servicenames{"$Lang::tr{'intrusion detection system'} (ORANGE)"} = "snort_$netsettings{'ORANGE_DEV'}"; + $servicenames{"$Lang::tr{'intrusion detection system'} (ORANGE)"} = "snort_$netsettings{'ORANGE_DEV'}"; } if ($netsettings{'BLUE_DEV'} ne '') { - $servicenames{"$Lang::tr{'intrusion detection system'} (BLUE)"} = "snort_$netsettings{'BLUE_DEV'}"; + $servicenames{"$Lang::tr{'intrusion detection system'} (BLUE)"} = "snort_$netsettings{'BLUE_DEV'}"; } # Generate Graphs from rrd Data @@ -115,18 +115,19 @@ print "
\n"; print < - +
+ END ; my $key = ''; foreach $key (sort keys %servicenames) { - print "\n\n"; - my $shortname = $servicenames{$key}; - my $status = &isrunning($shortname); - print "$status\n"; - print "\n"; + print "\n\n"; + my $shortname = $servicenames{$key}; + my $status = &isrunning($shortname); + print "$status\n"; + print "\n"; } @@ -138,58 +139,55 @@ print "
$Lang::tr{'services'}$Lang::tr{'status'}PID$Lang::tr{'memory'}
$key
$key
\n"; sub isrunning { - my $cmd = $_[0]; - my $status = "$Lang::tr{'stopped'}"; - my $pid = ''; - my $testcmd = ''; - my $exename; + my $cmd = $_[0]; + my $status = "$Lang::tr{'stopped'}"; + my $pid = ''; + my $testcmd = ''; + my $exename; + my @memory; - $cmd =~ /(^[a-z]+)/; - $exename = $1; + $cmd =~ /(^[a-z]+)/; + $exename = $1; - if (open(FILE, "/var/run/${cmd}.pid")) - { - $pid = ; chomp $pid; - close FILE; - if (open(FILE, "/proc/${pid}/status")) - { - while () - { - if (/^Name:\W+(.*)/) { - $testcmd = $1; } - } - close FILE; - if ($testcmd =~ /$exename/) - { - $status = "$Lang::tr{'running'}"; - } - } - } - - return $status; + if (open(FILE, "/var/run/${cmd}.pid")){ + $pid = ; chomp $pid; + close FILE; + if (open(FILE, "/proc/${pid}/status")){ + while (){ + if (/^Name:\W+(.*)/) {$testcmd = $1; } + } + close FILE; + } + if (open(FILE, "/proc/${pid}/statm")){ + my $temp = ; + @memory = split(/ /,$temp); + } + close FILE; + if ($testcmd =~ /$exename/){$status = "$Lang::tr{'running'}$pid$memory[0] KB";} + } +return $status; } sub percentbar { - my $percent = $_[0]; - my $fg = '#a0a0a0'; - my $bg = '#e2e2e2'; + my $percent = $_[0]; + my $fg = '#a0a0a0'; + my $bg = '#e2e2e2'; - if ($percent =~ m/^(\d+)%$/ ) - { - print < END ; - if ($percent eq "100%") { - print "" - } elsif ($percent eq "0%") { - print "" - } else { - print "" - } - print <" + } elsif ($percent eq "0%") { + print "" + } else { + print "" + } + print < END ; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 015efd010..8385aabc1 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -606,7 +606,7 @@ 'disconnect' => 'OVPN Stop / Trennen', 'disconnects' => 'Abbrüche', 'disk access per' => 'Plattenzugriff je', -'disk usage' => 'Festplattenbelegung:', +'disk usage' => 'Festplattenbelegung', 'display' => 'Anzeige', 'display hostname in window title' => 'Hostname im Fenstertitel anzeigen', 'display traffic at home' => 'Berechneten Traffic auf der Startseite anzeigen', @@ -704,6 +704,7 @@ 'esp keylife should be between 1 and 24 hours' => 'ESP Schlüssel-Lebensdauer sollte zwischen 1 und 24 Stunden betragen.', 'every' => 'Jeden', 'exampel' => 'Beispiel', +'exclude logfiles' => 'ohne Logdateien', 'excluding buffers and cache' => '-/+ Puffer/Zwischenspeicher', 'expected' => 'Erwartet', 'expertoptions' => 'Expertenoptionen', @@ -836,6 +837,7 @@ 'importkey' => 'PSK importieren', 'in' => 'Ein', 'inactive' => 'inaktiv', +'include logfiles' => 'mit Logdateien', 'incoming' => 'eingehend', 'incoming traffic in bytes per second' => 'Eingehender Verkehr in Bytes pro Sekunde', 'incorrect password' => 'Fehlerhaftes Passwort', @@ -1399,7 +1401,7 @@ 'service removed' => 'Benutzerdefinierter Netzwerkdienst wurde entfernt', 'service updated' => 'Benutzerdefinierter Netzwerkdienst wurde aktualisiert', 'servicename' => 'Dienstname', -'services' => 'Dienste:', +'services' => 'Dienste', 'services settings' => 'Firewall - Diensteeinstellungen', 'set' => 'gesetzt', 'set time now' => 'Stelle jetzt die Uhrzeit ein', @@ -1515,6 +1517,8 @@ 'system logs' => 'System-Logdateien', 'system status information' => 'System-Statusinformationen', 'telephone not set' => 'Telefonnummer nicht angegeben.', +'template' => 'Vorlage', +'template warning' => 'Zur Einrichtugn von QoS stehen Ihnen 2 Möglichkeiten zur Auswahl. Erstens Sie wählen speichern und erstellen Classen und Regeln nach Ihren Wünschen, oder Sie wählen Vorlage, dann werden die Klassen und Regeln durch ein Template generiert.', 'test' => 'test', 'test email could not be sent' => 'Könnte Testemail nicht senden', 'test email was sent' => 'Testemail wurde erfolgreich versand', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 6fad42a69..7384db657 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -629,7 +629,7 @@ 'disconnect' => 'OVPN Stop / Disconnect', 'disconnects' => 'Disconnects', 'disk access per' => 'Disk Access per', -'disk usage' => 'Disk usage:', +'disk usage' => 'Disk usage', 'display' => 'Display', 'display hostname in window title' => 'Display hostname in window title', 'display traffic at home' => 'Display calculated traffic on startpage', @@ -728,6 +728,7 @@ 'esp keylife should be between 1 and 24 hours' => 'ESP Keylife should be between 1 and 24 hours.', 'every' => 'Every', 'exampel' => 'exampel', +'exclude logfiles' => 'exclude logfiles', 'excluding buffers and cache' => '-/+ buffers/cache', 'expected' => 'Expected', 'expertoptions' => 'Expert options', @@ -862,6 +863,7 @@ 'importkey' => 'Import PSK', 'in' => 'In', 'inactive' => 'inactive', +'include logfiles' => 'include logfiles', 'incoming' => 'incoming', 'incoming traffic in bytes per second' => 'Incoming Traffic in Bytes per Second', 'incorrect password' => 'Incorrect password', @@ -1428,7 +1430,7 @@ 'service removed' => 'Custom Network Service removed', 'service updated' => 'Custom Network Service updated', 'servicename' => 'Service Name', -'services' => 'Services:', +'services' => 'Services', 'services settings' => 'Firewall - Services settings', 'set' => 'set', 'set time now' => 'Set Time Now', @@ -1547,6 +1549,8 @@ 'system logs' => 'System Logs', 'system status information' => 'System Status Information', 'telephone not set' => 'Telephone not set.', +'template' => 'Preset', +'template warning' => 'You have 2 options to set up Qos. The First, you press the save button and generate the classes and rules on your own. The second, you press the preset button and classes and rules will be set up by a template.', 'test' => 'test', 'test email could not be sent' => 'Could not sent Testemail', 'test email was sent' => 'Testemail was send successfully',