diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index d1ece4f60..51e2f68cf 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -276,6 +276,9 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'delete'}) &General::writehash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", \%pppsettings); } +elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'}) +{ +} else { # read in the current vars @@ -313,7 +316,6 @@ $selected{'TYPE'}{'serial'} = ''; $selected{'TYPE'}{'pppoe'} = ''; $selected{'TYPE'}{'pptp'} = ''; $selected{'TYPE'}{$pppsettings{'TYPE'}} = "selected='selected'"; - $checked{'DEBUG'}{'off'} = ''; $checked{'DEBUG'}{'on'} = ''; $checked{'DEBUG'}{$pppsettings{'DEBUG'}} = "checked='checked'"; @@ -323,10 +325,11 @@ $selected{'COMPORT'}{'ttyS1'} = ''; $selected{'COMPORT'}{'ttyS2'} = ''; $selected{'COMPORT'}{'ttyS3'} = ''; $selected{'COMPORT'}{'ttyS4'} = ''; +if ( $pppsettings{'TYPE'} ne '' ){ $selected{'COMPORT'}{'ttyACM0'} = ''; $selected{'COMPORT'}{'ttyACM1'} = ''; $selected{'COMPORT'}{'ttyACM2'} = ''; -$selected{'COMPORT'}{'ttyACM3'} = ''; +$selected{'COMPORT'}{'ttyACM3'} = '';} $selected{'COMPORT'}{$pppsettings{'COMPORT'}} = "selected='selected'"; $selected{'DTERATE'}{'9600'} = ''; @@ -347,7 +350,6 @@ $selected{'DIALMODE'}{'T'} = ''; $selected{'DIALMODE'}{'P'} = ''; $selected{'DIALMODE'}{$pppsettings{'DIALMODE'}} = "selected='selected'"; -$checked{'RECONNECTION'}{'manual'} = ''; $checked{'RECONNECTION'}{'persistent'} = ''; $checked{'RECONNECTION'}{'dialondemand'} = ''; $checked{'RECONNECTION'}{$pppsettings{'RECONNECTION'}} = "checked='checked'"; @@ -539,14 +541,18 @@ END $Lang::tr{'modem on com3'} $Lang::tr{'modem on com4'} $Lang::tr{'modem on com5'} +END +; + if ($pppsettings{'TYPE'} ne 'serial' ) { + print <$Lang::tr{'usb modem on acm0'} $Lang::tr{'usb modem on acm1'} $Lang::tr{'usb modem on acm2'} $Lang::tr{'usb modem on acm3'} - END ; } + print " "} if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) { print < @@ -596,18 +602,6 @@ print <$Lang::tr{'idle timeout'} -END -; - 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"; - } else { - print "$Lang::tr{'connect on ipfire restart'}\n"; - print "\n"; - } -print < $Lang::tr{'connection debugging'}: @@ -617,9 +611,6 @@ print < $Lang::tr{'reconnection'}: - - $Lang::tr{'manual'} - $Lang::tr{'dod'} @@ -842,9 +833,9 @@ sub initprofile $pppsettings{'COMPORT'} = 'ttyS0'; $pppsettings{'DTERATE'} = 115200; $pppsettings{'SPEAKER'} = 'off'; - $pppsettings{'RECONNECTION'} = 'manual'; + $pppsettings{'RECONNECTION'} = 'persistent'; $pppsettings{'DIALONDEMANDDNS'} = 'off'; - $pppsettings{'AUTOCONNECT'} = 'off'; + $pppsettings{'AUTOCONNECT'} = 'on'; $pppsettings{'SENDCR'} = 'off'; $pppsettings{'USEIBOD'} = 'off'; $pppsettings{'USEDOV'} = 'off'; diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi index 059f9316f..ad0c4796d 100644 --- a/html/cgi-bin/updatexlrator.cgi +++ b/html/cgi-bin/updatexlrator.cgi @@ -479,10 +479,10 @@ END print " \n"; } elsif ($metadata[1] eq 'Apple') { - print " \n"; + print " \n"; } elsif ($metadata[1] eq 'Kaspersky') { - print " \n"; + print " \n"; } elsif ($metadata[1] eq 'Linux') { print " \n";