[IPCop-cvs] CVS: ipcop/html/cgi-bin pppsetup.cgi,1.4.2.27,1.4.2.28

[Gilles E. <ges...@us...>]

Update of /cvsroot/ipcop/ipcop/html/cgi-bin
In directory sc8-pr-cvs1:/tmp/cvs-serv6821/ipcop/html/cgi-bin

Modified Files:
      Tag: IPCOP_v1
	pppsetup.cgi 
Log Message:
Change to other DHCP  call / Suppress DHCP for ATM modems

Index: pppsetup.cgi
===================================================================
RCS file: /cvsroot/ipcop/ipcop/html/cgi-bin/Attic/pppsetup.cgi,v
retrieving revision 1.4.2.27
retrieving revision 1.4.2.28
diff -C2 -d -r1.4.2.27 -r1.4.2.28
*** pppsetup.cgi	27 Aug 2003 21:22:10 -0000	1.4.2.27
--- pppsetup.cgi	31 Aug 2003 22:21:00 -0000	1.4.2.28
***************
*** 13,18 ****
  #
  # $Id$
! # PPPoE support added for SpeedTouch and new manner to link to upload.cgi
! # Bewan PCI ST/USB and Sagem Fast 800/USR9000 support added
  
  require 'CONFIG_ROOT/header.pl';
--- 13,17 ----
  #
  # $Id$
! 
  
  require 'CONFIG_ROOT/header.pl';
***************
*** 582,589 ****
  	print <<END
  	<OPTION VALUE='eciadsl' $selected{'TYPE'}{'eciadsl'}>ECI ADSL
! 	<OPTION VALUE='adiadsl' $selected{'TYPE'}{'adiadsl'}>ADI USB ADSL (Sagem USR)
! 	<OPTION VALUE='conexantusbadsl' $selected{'TYPE'}{'conexantusbadsl'}>Conexant USB ADSL (Olitec 3Com)
! 	<OPTION VALUE='alcatelusb' $selected{'TYPE'}{'alcatelusb'}>Alcatel USB ADSL user mode driver
! 	<OPTION VALUE='alcatelusbk' $selected{'TYPE'}{'alcatelusbk'}>Alcatel USB ADSL kernel mode driver
  END
  ;
--- 581,588 ----
  	print <<END
  	<OPTION VALUE='eciadsl' $selected{'TYPE'}{'eciadsl'}>ECI ADSL
! 	<OPTION VALUE='adiadsl' $selected{'TYPE'}{'adiadsl'}>ADI USB ADSL (Comtrend Sagem USR)
! 	<OPTION VALUE='conexantusbadsl' $selected{'TYPE'}{'conexantusbadsl'}>Conexant USB ADSL (Amigo Olitec 3Com)
! 	<OPTION VALUE='alcatelusb' $selected{'TYPE'}{'alcatelusb'}>Speedtouch USB ADSL user mode driver
! 	<OPTION VALUE='alcatelusbk' $selected{'TYPE'}{'alcatelusbk'}>Speedtouch USB ADSL kernel mode driver
  END
  ;
***************
*** 592,596 ****
  	<OPTION VALUE='fritzdsl' $selected{'TYPE'}{'fritzdsl'}>Fritz!DSL
  	<OPTION VALUE='pulsardsl' $selected{'TYPE'}{'pulsardsl'}>Pulsar ADSL
! 	<OPTION VALUE='bewanadsl' $selected{'TYPE'}{'bewanadsl'}>Bewan ADSL ST PCI/USB
  	</SELECT></TD>
  	<TD WIDTH='25%'><INPUT TYPE='submit' NAME='ACTION' VALUE='$tr{'refresh'}'></TD>
--- 591,595 ----
  	<OPTION VALUE='fritzdsl' $selected{'TYPE'}{'fritzdsl'}>Fritz!DSL
  	<OPTION VALUE='pulsardsl' $selected{'TYPE'}{'pulsardsl'}>Pulsar ADSL
! 	<OPTION VALUE='bewanadsl' $selected{'TYPE'}{'bewanadsl'}>Bewan ADSL PCI st/USB st
  	</SELECT></TD>
  	<TD WIDTH='25%'><INPUT TYPE='submit' NAME='ACTION' VALUE='$tr{'refresh'}'></TD>
***************
*** 961,965 ****
  ;
  }
!  if ($pppsettings{'TYPE'} =~ /^(alcatelusbk|conexantusbadsl|pulsardsl|eciadsl|bewanadsl|adiadsl)$/)
  {
  print <<END
--- 960,964 ----
  ;
  }
!  if ($pppsettings{'TYPE'} =~ /^(pulsardsl|eciadsl|adiadsl)$/)
  {
  print <<END
***************
*** 974,977 ****
--- 973,982 ----
  		</TABLE>
  </TR>
+ END
+ ;
+ }
+  if ($pppsettings{'TYPE'} =~ /^(alcatelusbk|conexantusbadsl|pulsardsl|eciadsl|bewanadsl|adiadsl)$/)
+ {
+ print <<END
  <TR>
  	<TD>&nbsp;</TD>