$checked{'METHOD'}{'STATIC'} = '';
$checked{'METHOD'}{'PPPOE'} = '';
-$checked{'METHOD'}{'PPPOE_PLUGIN'} = '';
$checked{'METHOD'}{'DHCP'} = '';
$checked{'METHOD'}{$pppsettings{'METHOD'}} = "checked='checked'";
;
}
- if ($pppsettings{'TYPE'} eq 'vdsl') {
+ if ($pppsettings{'TYPE'} =~ /^(pppoe|vdsl|pppoeatm)$/) {
print <<END
<tr>
<td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>IPTV:</b></td>
</tr>
END
;
- if ( -e '/usr/local/bin/igmpproxy'){
+ if ( -e '/opt/pakfire/db/installed/meta-igmpproxy'){
print <<END
<tr>
<td colspan='3' width='100%'><input type='radio' name='IPTV' value='enable' $checked{'IPTV'}{'enable'}>$Lang::tr{'on'}</td>
<td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'pppoe settings'}</b></td>
</tr>
<tr>
- <td width='25%'><input type='radio' name='METHOD' value='PPPOE_PLUGIN' $checked{'METHOD'}{'PPPOE_PLUGIN'} />PPPoE plugin</td>
- <td colspan='2' width='50%'>$Lang::tr{'service name'} <img src='/blob.gif' alt='*' /></td>
+ <td width='25%'>$Lang::tr{'service name'} <img src='/blob.gif' alt='*' /></td>
+ <td colspan='2' width='50%'></td>
<td width='25%'><input type='text' name='SERVICENAME' value='$pppsettings{'SERVICENAME'}' /></td>
</tr>
<tr>
- <td width='25%'><input type='radio' name='METHOD' value='PPPOE' $checked{'METHOD'}{'PPPOE'} />$Lang::tr{'pppoe'}</td>
- <td colspan='2' width='50%'>$Lang::tr{'concentrator name'} <img src='/blob.gif' alt='*' /></td>
+ <td width='25%'>$Lang::tr{'concentrator name'} <img src='/blob.gif' alt='*' /></td>
+ <td colspan='2' width='50%'></td>
<td width='25%'><input type='text' name='CONCENTRATORNAME' value='$pppsettings{'CONCENTRATORNAME'}' /></td>
</tr>
<tr>
$pppsettings{'PPTP_PEER'} = '10.0.0.138';
$pppsettings{'PPTP_NICCFG'} = '10.0.0.140/24 broadcast 10.0.0.255';
$pppsettings{'PROTOCOL'} = 'RFC2364';
- $pppsettings{'METHOD'} = 'PPPOE_PLUGIN';
- if ( $pppsettings{'METHOD'} eq 'PPPOE_PLUGIN' ) {
- $pppsettings{'MTU'} = '1492';
- $pppsettings{'MRU'} = '1492';
- } else {
- $pppsettings{'MTU'} = '1452';
- $pppsettings{'MRU'} = '1452';
- }
+ $pppsettings{'MTU'} = '1492';
+ $pppsettings{'MRU'} = '1492';
$pppsettings{'DIALMODE'} = 'T';
$pppsettings{'MAXRETRIES'} = 5;
$pppsettings{'HOLDOFF'} = 30;