From cb5e9c6c64d5281eba5c790f14c2e5f3066becbf Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Fri, 17 Aug 2007 16:00:01 +0000 Subject: [PATCH] Debuginformationen aus den CGIs entfernt Hoffentlich die letzten Config Types bereinigt Samba und SSHd init Skripte angepasst Pakfire CGI optisch angepasst git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@779 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- doc/language_issues.de | 1 + doc/language_issues.en | 1 + html/cgi-bin/aliases.cgi | 4 ++-- html/cgi-bin/backup.cgi | 6 +++--- html/cgi-bin/connections.cgi | 2 +- html/cgi-bin/connscheduler.cgi | 4 ++-- html/cgi-bin/dhcp.cgi | 4 ++-- html/cgi-bin/extrahd.cgi | 4 ++-- html/cgi-bin/graphs.cgi | 4 ++-- html/cgi-bin/hardwaregraphs.cgi | 4 ++-- html/cgi-bin/ids.cgi | 4 ++-- html/cgi-bin/index.cgi | 4 ++-- html/cgi-bin/media.cgi | 4 ++-- html/cgi-bin/memory.cgi | 4 ++-- html/cgi-bin/mpfire.cgi | 19 ++++++++----------- html/cgi-bin/network.cgi | 6 +++--- html/cgi-bin/outgoingfw.cgi | 4 ++-- html/cgi-bin/pakfire.cgi | 22 ++++++++++++++-------- html/cgi-bin/pppsetup.cgi | 16 +++------------- html/cgi-bin/proxy.cgi | 4 ++-- html/cgi-bin/qos.cgi | 2 +- html/cgi-bin/qosgraph.cgi | 4 ++-- html/cgi-bin/samba.cgi | 4 ++-- html/cgi-bin/sambahlp.cgi | 4 ++-- html/cgi-bin/system.cgi | 4 ++-- html/cgi-bin/traffic.cgi | 4 ++-- html/cgi-bin/traffics.cgi | 4 ++-- html/cgi-bin/tripwire.cgi | 4 ++-- html/cgi-bin/updatexlrator.cgi | 4 ++-- html/cgi-bin/upnp.cgi | 4 ++-- html/cgi-bin/urlfilter.cgi | 4 ++-- html/cgi-bin/vpnmain.cgi | 4 ++-- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + src/initscripts/init.d/samba | 6 +++--- src/initscripts/init.d/sshd | 2 +- 36 files changed, 87 insertions(+), 90 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index 3f37f3d252..9b77add02d 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -265,6 +265,7 @@ WARNING: translation string unused: ovpn_processprioVH WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install +WARNING: translation string unused: pakfire available addons 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 diff --git a/doc/language_issues.en b/doc/language_issues.en index 59f1ba9f50..509d00f8a6 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -293,6 +293,7 @@ WARNING: translation string unused: ovpn_processprioVH WARNING: translation string unused: ovpnstatus log WARNING: translation string unused: ovpnsys log WARNING: translation string unused: package failed to install +WARNING: translation string unused: pakfire available addons 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 diff --git a/html/cgi-bin/aliases.cgi b/html/cgi-bin/aliases.cgi index b75a0159f9..4b475c144b 100644 --- a/html/cgi-bin/aliases.cgi +++ b/html/cgi-bin/aliases.cgi @@ -12,7 +12,7 @@ # to fully troubleshot your code, uncomment diagnostics, Carp and cluck lines #use diagnostics; # need to add the file /usr/lib/perl5/5.8.x/pods/perldiag.pod before to work # next look at /var/log/httpd/error_log , http://www.perl.com/pub/a/2002/05/07/mod_perl.html may help -use warnings; +#use warnings; use strict; #use Carp (); #local $SIG{__WARN__} = \&Carp::cluck; @@ -230,7 +230,7 @@ if ($errormessage) { print "$errormessage "; &Header::closebox(); } -unless (( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ ) && ($netsettings{'RED_TYPE'} eq 'STATIC')) +unless (( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ ) && ($netsettings{'RED_TYPE'} eq 'STATIC')) { &Header::openbox('100%', 'left', $Lang::tr{'capswarning'}); print </dev/null"); + system("/usr/local/bin/backupctrl restore"); } &Header::showhttpheaders(); diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi index 8d76a6be69..0cf82d84fa 100644 --- a/html/cgi-bin/connections.cgi +++ b/html/cgi-bin/connections.cgi @@ -21,7 +21,7 @@ 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"; diff --git a/html/cgi-bin/connscheduler.cgi b/html/cgi-bin/connscheduler.cgi index e4995e04eb..20cf2e67da 100644 --- a/html/cgi-bin/connscheduler.cgi +++ b/html/cgi-bin/connscheduler.cgi @@ -16,8 +16,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index 6d88a7f46a..9357bff17e 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -22,8 +22,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi index 89f2eea5e6..2fe1cf90f1 100644 --- a/html/cgi-bin/extrahd.cgi +++ b/html/cgi-bin/extrahd.cgi @@ -9,8 +9,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; diff --git a/html/cgi-bin/graphs.cgi b/html/cgi-bin/graphs.cgi index 19bbafeb3f..9d999348a0 100644 --- a/html/cgi-bin/graphs.cgi +++ b/html/cgi-bin/graphs.cgi @@ -11,8 +11,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.cgi index 6e3fc1d230..912f7083ef 100644 --- a/html/cgi-bin/hardwaregraphs.cgi +++ b/html/cgi-bin/hardwaregraphs.cgi @@ -10,8 +10,8 @@ use strict; # enable only the following on debugging purpose - use warnings; - use CGI::Carp 'fatalsToBrowser'; +# use warnings; +# use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 4e40e58352..7469b0d462 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -13,8 +13,8 @@ use File::Temp qw/ tempfile tempdir /; use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index db9b022900..f5ff75c909 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -10,8 +10,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi index ccf882e4fc..57cd8cd33f 100644 --- a/html/cgi-bin/media.cgi +++ b/html/cgi-bin/media.cgi @@ -11,8 +11,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; diff --git a/html/cgi-bin/memory.cgi b/html/cgi-bin/memory.cgi index 5e84c80de2..683a1185f2 100644 --- a/html/cgi-bin/memory.cgi +++ b/html/cgi-bin/memory.cgi @@ -11,8 +11,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; diff --git a/html/cgi-bin/mpfire.cgi b/html/cgi-bin/mpfire.cgi index 73c65968c4..c2dd67ae95 100644 --- a/html/cgi-bin/mpfire.cgi +++ b/html/cgi-bin/mpfire.cgi @@ -8,8 +8,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; @@ -231,19 +231,16 @@ foreach (@songdb){ @year = sort keys %hash; my %hash = map{ $_, 1 }@genre; @genre = sort keys %hash; -print < -END -; -if ( $#songdb eq '-1' ) {print "$Lang::tr{'year'}$Lang::tr{'genre'}";} -else {print "$Lang::tr{'year'} - $#year$Lang::tr{'genre'} - $#genre>";} +print ""; +if ( $#songdb eq '-1' ) {print "";} +else {print "";} print <";} -else {print "";} +if ( $#songdb eq '-1' ) {print "";} +else {print "";} print < -
$Lang::tr{'artist'}$Lang::tr{'album'}
$Lang::tr{'artist'} - $#artist$Lang::tr{'album'} - $#album
@@ -263,8 +260,8 @@ print < END ; -if ( $#songdb eq '-1' ) {print "
$Lang::tr{'artist'}$Lang::tr{'album'}
$Lang::tr{'artist'} - $#artist$Lang::tr{'album'} - $#album
$Lang::tr{'year'}$Lang::tr{'genre'}
$Lang::tr{'year'} - $#year$Lang::tr{'genre'} - $#genre
diff --git a/html/cgi-bin/network.cgi b/html/cgi-bin/network.cgi index 4e6c3e7f9b..08fc8fb49a 100644 --- a/html/cgi-bin/network.cgi +++ b/html/cgi-bin/network.cgi @@ -11,8 +11,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; @@ -75,7 +75,7 @@ foreach my $graphname (@graphs) { if ($cgiparams[1] =~ /red/) { - if ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && $netsettings{'RED_TYPE'} eq "DHCP") { + if ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} eq "DHCP") { &Header::openbox('100%', 'left', "RED $Lang::tr{'dhcp configuration'}"); if (-s "${General::swroot}/dhcpc/dhcpcd-$netsettings{'RED_DEV'}.info") { diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi index 2b529752ef..1a6bdb51d3 100644 --- a/html/cgi-bin/outgoingfw.cgi +++ b/html/cgi-bin/outgoingfw.cgi @@ -9,8 +9,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index a1a14c7acf..b10b5a7427 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -11,8 +11,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; @@ -21,6 +21,8 @@ require "/opt/pakfire/lib/functions.pl"; my %pakfiresettings=(); my $errormessage = ''; +my %color = (); +my %mainsettings = (); &Header::showhttpheaders(); @@ -33,6 +35,8 @@ $pakfiresettings{'AUTOUPDATE'} = 'off'; $pakfiresettings{'UUID'} = 'on'; &Header::getcgihash(\%pakfiresettings); +&General::readhash("${General::swroot}/main/settings", \%mainsettings); +&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); &Header::openpage($Lang::tr{'pakfire configuration'}, 1); &Header::openbigbox('100%', 'left', '', $errormessage); @@ -184,7 +188,8 @@ system("pakfire update &>dev/null"); print < -
Verfuegbare Addons:
+
$Lang::tr{'pakfire installed addons'}$Lang::tr{'pakfire installed addons'} +
$Lang::tr{'pakfire installed addons'}
+
-

+
-
$Lang::tr{'pakfire updates'} +
$Lang::tr{'pakfire updates'}
 
-

+
+
$Lang::tr{'basic options'}
$Lang::tr{'pakfire update daily'} $Lang::tr{'pakfire register'} -
+
END diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 0a3ce09ab5..31db636ab0 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -204,13 +204,8 @@ ERROR: &writesecrets(); &General::log("$Lang::tr{'profile saved'} $pppsettings{'PROFILENAME'}"); - if ($drivererror) { - my $refresh = ""; - my $title = $Lang::tr{'upload'}; - &Header::openpage($title, 0, $refresh); - } } -elsif ($pppsettings{'ACTION'} eq $Lang::tr{'select'}) +if ($pppsettings{'ACTION'} eq $Lang::tr{'select'}) { my $profile = $pppsettings{'PROFILE'}; %temppppsettings = (); @@ -306,8 +301,6 @@ $selected{'COMPORT'}{'ttyACM0'} = ''; $selected{'COMPORT'}{'ttyACM1'} = ''; $selected{'COMPORT'}{'ttyACM2'} = ''; $selected{'COMPORT'}{'ttyACM3'} = ''; -$selected{'COMPORT'}{'isdn1'} = ''; -$selected{'COMPORT'}{'isdn2'} = ''; $selected{'COMPORT'}{$pppsettings{'COMPORT'}} = "selected='selected'"; $selected{'DTERATE'}{'9600'} = ''; @@ -346,9 +339,6 @@ $checked{'SENDCR'}{$pppsettings{'SENDCR'}} = "checked='checked'"; $checked{'USEDOV'}{'off'} = ''; $checked{'USEDOV'}{'on'} = ''; $checked{'USEDOV'}{$pppsettings{'USEDOV'}} = "checked='checked'"; -$checked{'USEIBOD'}{'off'} = ''; -$checked{'USEIBOD'}{'on'} = ''; -$checked{'USEIBOD'}{$pppsettings{'USEIBOD'}} = "checked='checked'"; $checked{'MODEM'}{'PCIST'} = ''; $checked{'MODEM'}{'USB'} = ''; @@ -561,7 +551,7 @@ print < END ; - if ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && ( $netsettings{'RED_TYPE'} eq "DHCP" || $netsettings{'RED_TYPE'} eq "STATIC") ) { + if ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && ( $netsettings{'RED_TYPE'} eq "DHCP" || $netsettings{'RED_TYPE'} eq "STATIC") ) { $pppsettings{'AUTOCONNECT'} = 'on'; print "$Lang::tr{'connect on ipfire restart'}\n"; print "\n"; @@ -807,7 +797,7 @@ sub initprofile &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); # empty profile partial pre-initialization - if ($netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/) { + if ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/) { $pppsettings{'TYPE'}=lc($netsettings{'RED_TYPE'}); } else { $pppsettings{'TYPE'}='modem'; diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 8abfd00db1..c89d9a9c61 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -10,8 +10,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 606e928948..6c8067040e 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -11,7 +11,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"; diff --git a/html/cgi-bin/qosgraph.cgi b/html/cgi-bin/qosgraph.cgi index f4964f6b6f..8b0983288c 100644 --- a/html/cgi-bin/qosgraph.cgi +++ b/html/cgi-bin/qosgraph.cgi @@ -11,8 +11,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index a2020c1825..ed72369b69 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -8,8 +8,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; diff --git a/html/cgi-bin/sambahlp.cgi b/html/cgi-bin/sambahlp.cgi index 1586e0fe9e..4945fc933f 100644 --- a/html/cgi-bin/sambahlp.cgi +++ b/html/cgi-bin/sambahlp.cgi @@ -8,8 +8,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi index 5cc813f39a..66abeb8ae1 100644 --- a/html/cgi-bin/system.cgi +++ b/html/cgi-bin/system.cgi @@ -11,8 +11,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi index 03843913a0..1bcc053f73 100644 --- a/html/cgi-bin/traffic.cgi +++ b/html/cgi-bin/traffic.cgi @@ -20,8 +20,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; diff --git a/html/cgi-bin/traffics.cgi b/html/cgi-bin/traffics.cgi index f3c9d5ab48..5ab07142de 100644 --- a/html/cgi-bin/traffics.cgi +++ b/html/cgi-bin/traffics.cgi @@ -16,8 +16,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; diff --git a/html/cgi-bin/tripwire.cgi b/html/cgi-bin/tripwire.cgi index 3b4015a958..b7d547eb98 100644 --- a/html/cgi-bin/tripwire.cgi +++ b/html/cgi-bin/tripwire.cgi @@ -8,8 +8,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi index 4b2082ada8..2c2623e12c 100644 --- a/html/cgi-bin/updatexlrator.cgi +++ b/html/cgi-bin/updatexlrator.cgi @@ -10,8 +10,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; use IO::Socket; diff --git a/html/cgi-bin/upnp.cgi b/html/cgi-bin/upnp.cgi index 3749ade601..c7e15651a5 100644 --- a/html/cgi-bin/upnp.cgi +++ b/html/cgi-bin/upnp.cgi @@ -9,8 +9,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi index 697965546c..3316ff2712 100644 --- a/html/cgi-bin/urlfilter.cgi +++ b/html/cgi-bin/urlfilter.cgi @@ -10,8 +10,8 @@ use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; use File::Copy; use IO::Socket; diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index e14fa86646..2181a4bf93 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -6,8 +6,8 @@ use File::Temp qw/ tempfile tempdir /; use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 6ea5211456..017634c614 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1214,6 +1214,7 @@ 'package failed to install' => 'Programmpaket konnte nicht installiert werden.', 'pagerefresh' => 'Seite wird aktualisiert. Bitte warten.', 'pakfire accept all' => 'Möchten Sie der Installation aller Pakete zustimmen?', +'pakfire available addons' => 'Verfügbare Addons:', 'pakfire configuration' => 'Pakfire Konfiguration', 'pakfire install package' => 'Sie möchten folgende Pakete installieren: ', 'pakfire installed addons' => 'Installierte Addons:', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 9728d9b1bb..c4a91a064a 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1242,6 +1242,7 @@ 'package failed to install' => 'Package failed to install.', 'pagerefresh' => 'Page is beeing refreshed, please wait.', 'pakfire accept all' => 'Do you want to install all packages?', +'pakfire available addons' => 'Available Addons:', 'pakfire configuration' => 'Pakfire Configuration', 'pakfire install package' => 'You want to install the following packages: ', 'pakfire installed addons' => 'Installed Addons:', diff --git a/src/initscripts/init.d/samba b/src/initscripts/init.d/samba index a9bebeaf92..d6bdb262af 100644 --- a/src/initscripts/init.d/samba +++ b/src/initscripts/init.d/samba @@ -21,10 +21,10 @@ case "$1" in stop) boot_mesg "Stopping smbd..." - killproc /usr/sbin/smbd + killproc -p /var/run/smbd.pid /usr/sbin/smbd boot_mesg "Stopping nmbd..." - killproc /usr/sbin/nmbd + killproc -p /var/run/nmbd.pid /usr/sbin/nmbd ;; reload) @@ -37,7 +37,7 @@ case "$1" in restart) $0 stop - sleep 5 + sleep 3 $0 start ;; diff --git a/src/initscripts/init.d/sshd b/src/initscripts/init.d/sshd index 015a43c5b5..0770eb8bef 100644 --- a/src/initscripts/init.d/sshd +++ b/src/initscripts/init.d/sshd @@ -15,7 +15,7 @@ case "$1" in boot_mesg "Starting SSH Server..." # Also prevent ssh from being killed by out of memory conditions loadproc /usr/sbin/sshd - sleep 1 + sleep 3 echo "-16" >/proc/`cat /var/run/sshd.pid`/oom_adj ;; -- 2.39.2