X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fpppsetup.cgi;h=31db636ab07eca509bfb33e42c04d19eb7deb552;hp=0a3ce09ab597552a65583ea4c05313b6fd06194b;hb=cb5e9c6c64d5281eba5c790f14c2e5f3066becbf;hpb=50418f3877dbaa18d4f725044bf4d1d4bdb53a5f

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 = "<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';