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

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 3f37f3d25273001f608c0057124bdbed95b488f4..9b77add02d2c9934aff9cbaa6795fed8a1fb5c86 100644 (file)
--- 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 59f1ba9f50d09de8008ed33d8063e447e51f4125..509d00f8a687bfbd4900fcc6b2b230f79f62227e 100644 (file)
--- 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 b75a0159f979eb7ba56b88f405d52c0e53240a1f..4b475c144bdbfa966096e35670f79a725d0ef7d3 100644 (file)
--- 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 "<font class='base'>$errormessage&nbsp;</font>";
     &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 <<END

diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi
index 194a70e7ed0e01d4b8bb9a95a80981186dd5532e..877e6345887da05d2f7596c7373628f75fddad37 100644 (file)
--- a/html/cgi-bin/backup.cgi
+++ b/html/cgi-bin/backup.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';
 use File::Copy;
 
 require '/var/ipfire/general-functions.pl';
@@ -58,7 +58,7 @@ elsif ( $cgiparams{'ACTION'} eq "restore" )
   print UPLOADFILE;
   }
   close UPLOADFILE;
-  system("/usr/local/bin/backupctrl restore >/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 8d76a6be69a4440955a9357de898fae0f4cfd716..0cf82d84facc71d116ab684f345de68cc094901a 100644 (file)
--- 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 e4995e04ebc094ee1b2032023362ef3d54a2341c..20cf2e67dad213a538e2f1679c68f193a994de62 100644 (file)
--- 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 6d88a7f46a7ffcc244096be448e9ceaf5fa5474f..9357bff17ed418d0525b0e98e4203bb82b4b4b94 100644 (file)
--- 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 89f2eea5e64ae2059a909c0072e3dd0031de86aa..2fe1cf90f17e60e1859fe6af9e49d898f23be298 100644 (file)
--- 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 19bbafeb3f6c993425399ae355375e2f2dc1c05a..9d999348a0ad2c8dd26badc31f25dbebfb692476 100644 (file)
--- 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 6e3fc1d230c61e3c5b3402759048e0fbb680cf60..912f7083ef078fd89d8c3d16921ede4387fa49e3 100644 (file)
--- 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 4e40e58352c43e86b9380e34c3c80d333a3eb39f..7469b0d462bac2b47ac9591c4e405234c74fab36 100644 (file)
--- 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 db9b02290055788beeb003d7f506d44c11bec823..f5ff75c909155a3eb9ce2188e72b39c955dc617f 100644 (file)
--- 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 ccf882e4fce64a14500e7ef2db9a6b6a151f77d3..57cd8cd33fd6db51dfe156ab582c347ed033abef 100644 (file)
--- 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 5e84c80de2e9829623ba591e2c2b643916fbe623..683a1185f2e6c1f5612e36134ced0465cd93b3d7 100644 (file)
--- 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 73c65968c445d6f18459fe860855958632410cfa..c2dd67ae95a10785a501ce701284cf5c681c292f 100644 (file)
--- 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
-  <table width='95%' cellspacing='0'>
-END
-;
-if ( $#songdb eq '-1' ) {print "<tr><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'year'}</b></td><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'genre'}</b></td></tr>";}
-else {print "<tr><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'year'} - $#year</b></td><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'genre'} - $#genre</b></td></tr>>";}
+print "<table width='95%' cellspacing='0'>";
+if ( $#songdb eq '-1' ) {print "<tr><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'artist'}</b></td><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'album'}</b></td></tr>";}
+else {print "<tr><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'artist'} - $#artist</b></td><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'album'} - $#album</b></td></tr>";}
 print <<END
   <tr><td align='center'>
       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
       <select name='artist' size='8' multiple='multiple' style='width:300px;'>
 END
 ;
-  foreach (@artist){if ( $_ ne '' ){print "<option>$_</option>";}}
+foreach (@artist){if ( $_ ne '' ){print "<option>$_</option>";}}
 print <<END
       </select><br/>
       <input type='hidden' name='ACTION' value='playartist' />
@@ -263,8 +260,8 @@ print <<END
       </tr>
 END
 ;
-if ( $#songdb eq '-1' ) {print "<tr><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'artist'}</b></td><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'album'}</b></td></tr>";}
-else {print "<tr><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'artist'} - $#artist</b></td><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'album'} - $#album</b></td></tr>";}
+if ( $#songdb eq '-1' ) {print "<tr><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'year'}</b></td><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'genre'}</b></td></tr>";}
+else {print "<tr><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'year'} - $#year</b></td><td align='center' bgcolor='$color{'color20'}'><b>$Lang::tr{'genre'} - $#genre</b></td></tr>";}
 print <<END
   <tr><td align='center'>
       <form method='post' action='$ENV{'SCRIPT_NAME'}'>

diff --git a/html/cgi-bin/network.cgi b/html/cgi-bin/network.cgi
index 4e6c3e7f9be9c39eea3f52c8b3adbb39423ac21a..08fc8fb49af4bd1427ca374e6d4473562ac16b9c 100644 (file)
--- 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 2b529752efabb7042b8ff423585e44332d8d59b9..1a6bdb51d347ad1a9c345925e1abf6df9fa3b3af 100644 (file)
--- 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 a1a14c7acf96eb8cc8a6689fefdaea93c457a1ab..b10b5a7427e6afdceca34d6327b4370a56ba3357 100644 (file)
--- 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 <<END;
        <table width='100%'>
-               <tr><td width='40%' align="center">Verfuegbare Addons:<br />
+               <tr><td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire installed addons'}</b></td><td bgcolor='$color{'color20'}'></td><td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire installed addons'}</b>
+               <tr><td width='40%' align="center">
                        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                <select name="INSPAKS" size="10" multiple>
 END
@@ -207,7 +212,7 @@ print <<END;
                                <input type='hidden' name='ACTION' value='remove' />
                                <input type='image' alt='$Lang::tr{'remove'}' src='/images/list-remove.png' />
                </td>
-               <td width='40%' align="center">$Lang::tr{'pakfire installed addons'}<br />
+               <td width='40%' align="center">
                        <select name="DELPAKS" size="10" multiple>
 END
 
@@ -216,10 +221,10 @@ END
 print <<END;
                </select>
        </table></form>
-               <br /><hr /><br />
+       <br />
        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
        <table width='100%'>
-               <tr><td colspan='2'>$Lang::tr{'pakfire updates'}
+               <tr><td colspan='3' bgcolor='$color{'color20'}'><b>$Lang::tr{'pakfire updates'}</b></br>
                <tr><td width='20%'>&nbsp;<td width='60%' align='center'>
                        <select name="UPDPAKS" size="5" disabled>
 END
@@ -231,14 +236,15 @@ print <<END;
                <td width='20%' align='center' valign='middle'><input type='hidden' name='ACTION' value='upgrade' />
                        <input type='image' alt='$Lang::tr{'upgrade'}' src='/images/document-save.png' />
        </table></form>
-               <br /><hr /><br />
+       <br />
        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                <table width='100%'>
+                       <tr><td colspan='4' bgcolor='$color{'color20'}'><b>$Lang::tr{'basic options'}</b></br>
                        <tr><td width='40%' align="right">$Lang::tr{'pakfire update daily'}
                                        <td width='10%' align="left"><input type="checkbox" name="AUTOUPDATE" $checked{'AUTOUPDATE'}{'on'} />
                                        <td width='40%' align="right">$Lang::tr{'pakfire register'} 
                                        <td width='10%' align="left"><input type="checkbox" name="UUID" $checked{'UUID'}{'on'} />
-                       <tr><td width='100%' colspan="4" align="right"><input type="submit" name="ACTION" value="$Lang::tr{'save'}" />
+                       <tr><td width='100%' colspan="4" align="center"><input type="submit" name="ACTION" value="$Lang::tr{'save'}" />
                </table>
        </form>
 END

diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index 0a3ce09ab597552a65583ea4c05313b6fd06194b..31db636ab07eca509bfb33e42c04d19eb7deb552 100644 (file)
--- 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 = "<META HTTP-EQUIV='refresh' CONTENT='1; URL=/cgi-bin/upload.cgi'>";
-               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
 </tr>
 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 "<tr><td colspan='3' width='75%'>$Lang::tr{'connect on ipfire restart'}</td>\n";
                print "<td width='25%'><input type='checkbox' disabled='disabled' name='AUTOCONNECT' value='on' $checked{'AUTOCONNECT'}{'on'}></td>\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 8abfd00db1b68b72c7696494005d578cce764c5a..c89d9a9c61c307fb2a9cf7b2cd58d14f1b21ec6c 100644 (file)
--- 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 606e9289484454b1fa27362f94f47bce20a16ff1..6c8067040ed5444130ec5eb0fcda2d9ef2e8ebe7 100644 (file)
--- 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 f4964f6b6fa4042f0cf50db0a41d11d30830439b..8b0983288c822b72c3e6a965a2b15851e35693ef 100644 (file)
--- 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 a2020c182545cff65aa6400ee5fd0a7807894666..ed72369b69bdf394a8bacfe3d18b2b3d7fb07cd1 100644 (file)
--- 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 1586e0fe9ef4d540df6f517b47b7e045cf8a891e..4945fc933f64191e1497b8177c8d97e4f7bbd7d6 100644 (file)
--- 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 5cc813f39a64aa75562f503404cef5efb58c27b0..66abeb8ae1f8e5c765447e7a3bc722abac3c71b3 100644 (file)
--- 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 03843913a04981e8e3952339b2604c6da84f1218..1bcc053f735aaeeb3f72a388228f338ee8c88e76 100644 (file)
--- 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 f3c9d5ab48af06c548a3dd577e461e0c9d49c4bf..5ab07142ded6c3a11b20541723e906bdcffe8e4b 100644 (file)
--- 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 3b4015a958c8f9e41c241240ea25ac39601e1574..b7d547eb98b1c278990940e7ba01f35549376042 100644 (file)
--- 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 4b2082ada8e198c7de3b0ca07ec9bad6f7495d0c..2c2623e12c3fe3011234b241bbef562003690d21 100644 (file)
--- 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 3749ade60182e07b4ac651bfeb28474e1645a3cd..c7e15651a56e745f1683327ed140c0a65fa810b2 100644 (file)
--- 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 697965546cbd6d60e8993cdc3a2cf66ca85662ff..3316ff27122e41f184dd0cc1a437b102239b5fbf 100644 (file)
--- 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 e14fa86646dfaf1e91d2818f6c800819d3aa3945..2181a4bf93d01fcac46acac0fa90a07d0cbc9f2a 100644 (file)
--- 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 6ea5211456c2dbf2bae5aee170ec44677c47150a..017634c61405b0ca7726200aad8796bc9d5302a3 100644 (file)
--- 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 9728d9b1bb0d79199bb3803492154d4800c6651e..c4a91a064aed14f52d4418e4787ff741ceaefa0e 100644 (file)
--- 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 a9bebeaf92229f5d95c3dcb7418e7258ce68ccc8..d6bdb262af92e7bab7e42cd7a9108635d0a2e81c 100644 (file)
--- 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 015a43c5b5008512e2582c3c22a6c2767e6b5176..0770eb8bef1c27b51f2a5b12e475ff9ae9995b8f 100644 (file)
--- 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
         ;;