[IPCop-cvs] ipcop/html/cgi-bin pppsetup.cgi,1.17.2.58,1.17.2.59

[Olaf W. <ow...@us...>]

Update of /cvsroot/ipcop/ipcop/html/cgi-bin
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18410/html/cgi-bin

Modified Files:
      Tag: IPCOP_v1_4_0
	pppsetup.cgi 
Log Message:
Add USB0 and USB1 to pppsetup as suggested in RFE #1678777.
Note that 3G users will still need to add info to /etc/modules.


Index: pppsetup.cgi
===================================================================
RCS file: /cvsroot/ipcop/ipcop/html/cgi-bin/pppsetup.cgi,v
retrieving revision 1.17.2.58
retrieving revision 1.17.2.59
diff -C2 -d -r1.17.2.58 -r1.17.2.59
*** pppsetup.cgi	23 Jun 2007 11:59:12 -0000	1.17.2.58
--- pppsetup.cgi	24 Jul 2007 14:29:29 -0000	1.17.2.59
***************
*** 62,66 ****
  elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
  {
! 	if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|usb\/ttyACM0|usb\/ttyACM1|usb\/ttyACM2|usb\/ttyACM3|isdn1|isdn2)$/) {
  		$errormessage = $Lang::tr{'invalid input'};
  		goto ERROR; }
--- 62,66 ----
  elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
  {
! 	if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyUSB0|ttyUSB1|usb\/ttyACM0|usb\/ttyACM1|usb\/ttyACM2|usb\/ttyACM3|isdn1|isdn2)$/) {
  		$errormessage = $Lang::tr{'invalid input'};
  		goto ERROR; }
***************
*** 355,358 ****
--- 355,360 ----
  $selected{'COMPORT'}{'usb/ttyACM2'} = '';
  $selected{'COMPORT'}{'usb/ttyACM3'} = '';
+ $selected{'COMPORT'}{'ttyUSB0'} = '';
+ $selected{'COMPORT'}{'ttyUSB1'} = '';
  $selected{'COMPORT'}{'isdn1'} = '';
  $selected{'COMPORT'}{'isdn2'} = '';
***************
*** 574,577 ****
--- 576,581 ----
  		<option value='usb/ttyACM2' $selected{'COMPORT'}{'usb/ttyACM2'}>$Lang::tr{'usb modem on acm2'}</option>
  		<option value='usb/ttyACM3' $selected{'COMPORT'}{'usb/ttyACM3'}>$Lang::tr{'usb modem on acm3'}</option>
+ 		<option value='ttyUSB0' $selected{'COMPORT'}{'ttyUSB0'}>$Lang::tr{'modem on USB0'}</option>
+ 		<option value='ttyUSB1' $selected{'COMPORT'}{'ttyUSB1'}>$Lang::tr{'modem on USB1'}</option>
  	</select></td>
  END