X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fpppsetup.cgi;h=7597bfbc79f34f9392d3df84fcaef51d2696ddd1;hb=43ecaceb4da5b868f62ae6ff9daf30927fc335e8;hp=33f521e7569adcb7bf640ce44e0b81c59be280ab;hpb=9bd0bfd233b2297a3c2e91e90b56fdfd96011c3b;p=people%2Fpmueller%2Fipfire-2.x.git diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 33f521e756..7597bfbc79 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -44,7 +44,7 @@ my $kernel=`/bin/uname -r | /usr/bin/tr -d '\012'`; my %color = (); my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", \%mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color); &Header::showhttpheaders(); @@ -103,10 +103,7 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) if ($pppsettings{'USERNAME'} eq '') { $errormessage = $Lang::tr{'username not set'}; goto ERROR; } - if ($pppsettings{'PASSWORD'} eq '') { - $errormessage = $Lang::tr{'password not set'}; - goto ERROR; } - } + } if ($pppsettings{'TIMEOUT'} eq '') { $errormessage = $Lang::tr{'idle timeout not set'}; @@ -119,19 +116,6 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) $errormessage = $Lang::tr{'bad characters in script field'}; goto ERROR; } - if ($pppsettings{'DNS1'}) - { - if (!(&General::validip($pppsettings{'DNS1'}))) { - $errormessage = $Lang::tr{'invalid primary dns'}; - goto ERROR; } - } - if ($pppsettings{'DNS2'}) - { - if (!(&General::validip($pppsettings{'DNS2'}))) { - $errormessage = $Lang::tr{'invalid secondary dns'}; - goto ERROR; } - } - if ($pppsettings{'MAXRETRIES'} eq '') { $errormessage = $Lang::tr{'max retries not set'}; goto ERROR; } @@ -185,8 +169,6 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) if (! &General::validip($pppsettings{'BROADCAST'})) { $errormessage = $errormessage.' '.$Lang::tr{'broadcast'}.' '.$Lang::tr{'invalid broadcast ip'}; } } - if( $pppsettings{'DNS'} eq 'Automatic') { - $errormessage = $Lang::tr{'invalid input'}; } if ($errormessage ne '') {goto ERROR; } } @@ -458,10 +440,6 @@ $selected{'AUTH'}{'demon-login-script'} = ''; $selected{'AUTH'}{'other-login-script'} = ''; $selected{'AUTH'}{$pppsettings{'AUTH'}} = "selected='selected'"; -$checked{'DNS'}{'Automatic'} = ''; -$checked{'DNS'}{'Manual'} = ''; -$checked{'DNS'}{$pppsettings{'DNS'}} = "checked='checked'"; - $checked{'IPTV'}{'enable'} = ''; $checked{'IPTV'}{'disable'} = ''; $checked{'IPTV'}{$pppsettings{'IPTV'}} = "checked='checked'"; @@ -693,7 +671,7 @@ END ; } if ($pppsettings{'TYPE'} =~ /^(modem)$/ ) { - print "