Eine kleine Aenderung in der pppsetup.cgi von Arne.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@964 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-10-13 20:25:24 +00:00
parent 77f1c55ffe
commit 197f8d4392
2 changed files with 445 additions and 433 deletions

View File

@@ -420,6 +420,17 @@ $checked{'DNS'}{$pppsettings{'DNS'}} = "checked='checked'";
&Header::openpage($Lang::tr{'ppp setup'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
if ($netsettings{'RED_TYPE'} ne 'PPPOE') {
&Header::openbox('100%', 'center', $Lang::tr{'error messages'});
print "<CLASS name='base'>Einwahl nur funktioniert nur mit RED=PPPOE im Netzwerksetup";
print "&nbsp;</CLASS>\n";
&Header::closebox();
&Header::closebigbox();
&Header::closepage();
exit(1);
}
if ($errormessage) {
&Header::openbox('100%', 'center', $Lang::tr{'error messages'});
print "<CLASS name='base'>$errormessage\n";
@@ -466,16 +477,16 @@ print <<END
<td width='25%'>$Lang::tr{'interface'}:</td>
<td width='25%'>
<select name='TYPE' style="width: 165px">
<option value='modem' $selected{'TYPE'}{'modem'}>$Lang::tr{'modem'}</option>
<option value='serial' $selected{'TYPE'}{'serial'}>$Lang::tr{'serial'}</option>
END
;
if ($netsettings{'RED_TYPE'} eq 'PPPOE') {
print "\t<option value='pppoe' $selected{'TYPE'}{'pppoe'}>PPPoE</option>\n";
}
if ($netsettings{'RED_TYPE'} eq 'PPTP') {
print "\t<option value='pptp' $selected{'TYPE'}{'pptp'}>PPTP</option>\n";
}
print <<END
<option value='modem' $selected{'TYPE'}{'modem'}>$Lang::tr{'modem'}</option>
<option value='serial' $selected{'TYPE'}{'serial'}>$Lang::tr{'serial'}</option>
<option value='pppoe' $selected{'TYPE'}{'pppoe'}>PPPoE</option>
END
;
my $atmdev=`cat /proc/net/atm/devices | grep 0`;
chomp ($atmdev);
if ($atmdev ne '') {
@@ -484,7 +495,11 @@ if ($atmdev ne '') {
END
;
}
}
#if ($netsettings{'RED_TYPE'} eq 'PPTP') {#
# print "\t<option value='pptp' $selected{'TYPE'}{'pptp'}>PPTP</option>\n";
#}
#
#if (0) {
# print <<END
# <option value='eciadsl' $selected{'TYPE'}{'eciadsl'}>ECI USB ADSL</option>
@@ -536,11 +551,11 @@ END
;
if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) {
print <<END
<option value='ttyS0' $selected{'COMPORT'}{'ttyS0'}>$Lang::tr{'modem on com1'}</option>
<option value='ttyS1' $selected{'COMPORT'}{'ttyS1'}>$Lang::tr{'modem on com2'}</option>
<option value='ttyS2' $selected{'COMPORT'}{'ttyS2'}>$Lang::tr{'modem on com3'}</option>
<option value='ttyS3' $selected{'COMPORT'}{'ttyS3'}>$Lang::tr{'modem on com4'}</option>
<option value='ttyS4' $selected{'COMPORT'}{'ttyS4'}>$Lang::tr{'modem on com5'}</option>
<option value='ttyS0' $selected{'COMPORT'}{'ttyS0'}>COM1</option>
<option value='ttyS1' $selected{'COMPORT'}{'ttyS1'}>COM2</option>
<option value='ttyS2' $selected{'COMPORT'}{'ttyS2'}>COM3</option>
<option value='ttyS3' $selected{'COMPORT'}{'ttyS3'}>COM4</option>
<option value='ttyS4' $selected{'COMPORT'}{'ttyS4'}>COM5</option>
END
;
if ($pppsettings{'TYPE'} ne 'serial' ) {
@@ -680,11 +695,8 @@ if ($pppsettings{'TYPE'} =~ /^(pppoeatm)$/)
{
print <<END
</table>
<table width='100%'>
<tr>
<td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'adsl settings'}:</b></td>
</tr>
<tr>
<td> $Lang::tr{'encapsulation'}:</td>

View File

@@ -21,7 +21,7 @@
package Conf;
$version = "2.0rc1t";
$version = "2.0rc1";
$mainserver = "pakfire.ipfire.org";