X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fpppsetup.cgi;h=4b45ee50c18d3153a7ea87fb5193b2b1c686d38c;hb=11fc9575d79644d7830eca59cf90b0d0393bf32b;hp=563d0eb58c8b0b7d1949d850b75d27de34887e6e;hpb=c5e3d520e92aee074f1713f8ba98ee4296341ad3;p=ipfire-2.x.git diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 563d0eb58c..4b45ee50c1 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team # +# Copyright (C) 2007-2014 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -70,10 +70,10 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'}) } elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) { - if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM0|ttyACM1|ttyACM2|ttyACM3|ttyUSB0|ttyUSB1|ttyUSB2|ttyUSB3|rfcomm0|rfcomm1|isdn1|isdn2)$/) { + if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1|isdn1|isdn2)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ERROR; } - if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'MONPORT'} !~ /^(ttyUSB0|ttyUSB1|ttyUSB2|ttyUSB3)$/) { + if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'MONPORT'} !~ /^(|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1)$/) { $errormessage = $Lang::tr{'invalid input'}; goto ERROR; } if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'DTERATE'} !~ /^(9600|19200|38400|57600|115200|230400|460800|921600)$/) { @@ -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'}; @@ -153,6 +150,9 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) if (($pppsettings{'VPI'} eq '0') && ($pppsettings{'VCI'} eq '0')) { $errormessage = $Lang::tr{'invalid vpi vpci'}; goto ERROR; } + if ($pppsettings{'ATM_DEV'} eq '') { + $errormessage = $Lang::tr{'invalid input'}; + goto ERROR; } if ( $pppsettings{'PROTOCOL'} eq '' ) { $errormessage = $Lang::tr{'invalid input'}; goto ERROR; } @@ -330,19 +330,49 @@ $selected{'COMPORT'}{'ttyACM0'} = ''; $selected{'COMPORT'}{'ttyACM1'} = ''; $selected{'COMPORT'}{'ttyACM2'} = ''; $selected{'COMPORT'}{'ttyACM3'} = ''; +$selected{'COMPORT'}{'ttyACM4'} = ''; +$selected{'COMPORT'}{'ttyACM5'} = ''; +$selected{'COMPORT'}{'ttyACM6'} = ''; +$selected{'COMPORT'}{'ttyACM7'} = ''; +$selected{'COMPORT'}{'ttyACM8'} = ''; +$selected{'COMPORT'}{'ttyACM9'} = ''; $selected{'COMPORT'}{'ttyUSB0'} = ''; $selected{'COMPORT'}{'ttyUSB1'} = ''; $selected{'COMPORT'}{'ttyUSB2'} = ''; $selected{'COMPORT'}{'ttyUSB3'} = ''; +$selected{'COMPORT'}{'ttyUSB4'} = ''; +$selected{'COMPORT'}{'ttyUSB5'} = ''; +$selected{'COMPORT'}{'ttyUSB6'} = ''; +$selected{'COMPORT'}{'ttyUSB7'} = ''; +$selected{'COMPORT'}{'ttyUSB8'} = ''; +$selected{'COMPORT'}{'ttyUSB9'} = ''; $selected{'COMPORT'}{'rfcomm0'} = ''; $selected{'COMPORT'}{'rfcomm1'} = ''; $selected{'COMPORT'}{$pppsettings{'COMPORT'}} = "selected='selected'"; $selected{'MONPORT'}{''} = ''; +$selected{'MONPORT'}{'ttyACM0'} = ''; +$selected{'MONPORT'}{'ttyACM1'} = ''; +$selected{'MONPORT'}{'ttyACM2'} = ''; +$selected{'MONPORT'}{'ttyACM3'} = ''; +$selected{'MONPORT'}{'ttyACM4'} = ''; +$selected{'MONPORT'}{'ttyACM5'} = ''; +$selected{'MONPORT'}{'ttyACM6'} = ''; +$selected{'MONPORT'}{'ttyACM7'} = ''; +$selected{'MONPORT'}{'ttyACM8'} = ''; +$selected{'MONPORT'}{'ttyACM9'} = ''; $selected{'MONPORT'}{'ttyUSB0'} = ''; $selected{'MONPORT'}{'ttyUSB1'} = ''; $selected{'MONPORT'}{'ttyUSB2'} = ''; $selected{'MONPORT'}{'ttyUSB3'} = ''; +$selected{'MONPORT'}{'ttyUSB4'} = ''; +$selected{'MONPORT'}{'ttyUSB5'} = ''; +$selected{'MONPORT'}{'ttyUSB6'} = ''; +$selected{'MONPORT'}{'ttyUSB7'} = ''; +$selected{'MONPORT'}{'ttyUSB8'} = ''; +$selected{'MONPORT'}{'ttyUSB9'} = ''; +$selected{'MONPORT'}{'rfcomm0'} = ''; +$selected{'MONPORT'}{'rfcomm1'} = ''; $selected{'MONPORT'}{$pppsettings{'MONPORT'}} = "selected='selected'"; $selected{'DTERATE'}{'9600'} = ''; @@ -579,16 +609,28 @@ END + + + + + + END ; if ($pppsettings{'TYPE'} ne 'serial' ) { print <$Lang::tr{'usb modem on acm0'} - - - + + + + + + + + + + END ; } @@ -605,6 +647,24 @@ END + + + + + + + + + + + + + + + + + + @@ -630,7 +690,7 @@ END ; } if ($pppsettings{'TYPE'} =~ /^(modem)$/ ) { - print "$Lang::tr{'number'}\n"; + print "$Lang::tr{'number'} *\n"; print "\n"; if ($pppsettings{'TYPE'} eq 'modem' ) { print "$Lang::tr{'modem speaker on'}\n"; @@ -648,15 +708,15 @@ END - $Lang::tr{'optional at cmd'} 1 * + $Lang::tr{'optional at cmd'} 1 - $Lang::tr{'optional at cmd'} 2 * + $Lang::tr{'optional at cmd'} 2 - $Lang::tr{'optional at cmd'} 3 * + $Lang::tr{'optional at cmd'} 3 @@ -669,7 +729,7 @@ END print < - $Lang::tr{'idle timeout'} + $Lang::tr{'idle timeout'} * @@ -711,11 +771,11 @@ print < - $Lang::tr{'holdoff'}: + $Lang::tr{'holdoff'}: * - $Lang::tr{'maximum retries'} + $Lang::tr{'maximum retries'} * END @@ -730,15 +790,15 @@ print <$Lang::tr{'pptp settings'} - Peer + $Lang::tr{'pptp peer'}: * - My Netconfig + $Lang::tr{'pptp netconfig'}: * - PPTP Route * + $Lang::tr{'pptp route'}: @@ -751,11 +811,12 @@ if ($pppsettings{'TYPE'} =~ /^(pppoeatm|pptpatm)$/) print < - $Lang::tr{'adsl settings'}: + $Lang::tr{'atm settings'}: - + $Lang::tr{'atm device'} + $Lang::tr{'encapsulation'}: - + - $Lang::tr{'vci number'} - + $Lang::tr{'vci number'} + END ; @@ -826,12 +886,12 @@ print <$Lang::tr{'pppoe settings'} - $Lang::tr{'service name'} * + $Lang::tr{'service name'} - $Lang::tr{'concentrator name'} * + $Lang::tr{'concentrator name'} @@ -846,11 +906,11 @@ print < - MTU * + MTU: - MRU * + MRU: END @@ -862,9 +922,9 @@ print <$Lang::tr{'authentication'} - $Lang::tr{'username'} + $Lang::tr{'username'} * - $Lang::tr{'password'} + $Lang::tr{'password'}  @@ -885,7 +945,7 @@ END } print < - $Lang::tr{'script name'} * + $Lang::tr{'script name'}

@@ -906,7 +966,7 @@ print <



- $Lang::tr{'profile name'} + $Lang::tr{'profile name'} * @@ -915,14 +975,16 @@ print < $Lang::tr{'legend'}: - * $Lang::tr{'this field may be blank'} + * $Lang::tr{'required field'} - END ; -&Header::closebox(); } +print ""; + +&Header::closebox(); + print "\n"; &Header::closebigbox(); @@ -968,6 +1030,7 @@ sub initprofile $pppsettings{'ENCAP'} = '0'; $pppsettings{'VPI'} = '1'; $pppsettings{'VCI'} = '32'; + $pppsettings{'ATM_DEV'} = '0'; $pppsettings{'PPTP_PEER'} = '10.0.0.138'; $pppsettings{'PPTP_NICCFG'} = '10.0.0.140/24 broadcast 10.0.0.255'; $pppsettings{'PPTP_ROUTE'} = '';