X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fpppsetup.cgi;h=65893b7abbf8b5e59c5eed18fdcf032d6e7d6c8f;hb=a8239982ac7e33e4623b30b8f0d35ceee4ad2b9c;hp=4bd8d6b97a6981a94d2b6e4208ef6e55e25fb45d;hpb=ac1cfefab236b73ed52909e14f43eaffc8d6914e;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index 4bd8d6b97a..65893b7abb 100644
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -6,12 +6,6 @@
 #
 # (c) The SmoothWall Team
 #
-# Copyright (C) 03-Apr-2002 Guy Ellis <guy@traverse.com.au>
-#              - ISDN DOV support
-#              - ibod now an option
-#	       - PCI ADSL support added
-#
-# $Id: pppsetup.cgi,v 1.17.2.49 2005/12/01 16:20:35 franck78 Exp $
 
 use strict;
 
@@ -19,7 +13,7 @@ use strict;
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';
 
-require 'CONFIG_ROOT/general-functions.pl';
+require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
@@ -64,7 +58,7 @@ 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; }
-	if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'DTERATE'} !~ /^(9600|19200|38400|57600|115200|230400)$/) {
+	if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'DTERATE'} !~ /^(9600|19200|38400|57600|115200|230400|460800)$/) {
 		$errormessage = $Lang::tr{'invalid input'};
 		goto ERROR; }
 	if ($pppsettings{'TYPE'} eq 'modem' && $pppsettings{'DIALMODE'} !~ /^(T|P)$/) {
@@ -321,7 +315,7 @@ my $c=0;
 for ($c = 1; $c <= $maxprofiles; $c++)
 {
 	%temppppsettings = ();
-	$temppppsettings{'PROFILENAME'} = $Lang::tr{'empty'};
+	$temppppsettings{'PROFILENAME'} = $Lang::tr{'empty profile'};
 	&General::readhash("${General::swroot}/ppp/settings-$c", \%temppppsettings);
 	$profilenames[$c] = $temppppsettings{'PROFILENAME'};
 }
@@ -381,6 +375,7 @@ $selected{'DTERATE'}{'38400'} = '';
 $selected{'DTERATE'}{'57600'} = '';
 $selected{'DTERATE'}{'115200'} = '';
 $selected{'DTERATE'}{'230400'} = '';
+$selected{'DTERATE'}{'460800'} = '';
 $selected{'DTERATE'}{$pppsettings{'DTERATE'}} = "selected='selected'";
 
 $checked{'SPEAKER'}{'off'} = '';
@@ -594,6 +589,7 @@ END
 		<option value='57600' $selected{'DTERATE'}{'57600'}>57600</option>
 		<option value='115200' $selected{'DTERATE'}{'115200'}>115200</option>
 		<option value='230400' $selected{'DTERATE'}{'230400'}>230400</option>
+		<option value='460800' $selected{'DTERATE'}{'460800'}>460800</option>
 	</select></td>
 </tr>
 END
@@ -637,10 +633,10 @@ END
 ;
 	if ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && ( $netsettings{'RED_TYPE'} eq "DHCP" || $netsettings{'RED_TYPE'} eq "STATIC") ) {
 		$pppsettings{'AUTOCONNECT'} = 'on';
-		print "<tr><td align='right'>$Lang::tr{'connect on ipcop restart'}</td>\n";
+		print "<tr><td align='right'>$Lang::tr{'connect on ipfire restart'}</td>\n";
 		print "<td><input type='checkbox' disabled='disabled' name='AUTOCONNECT' value='on' $checked{'AUTOCONNECT'}{'on'} /></td>\n";
 	} else {
-		print "<tr><td align='right'>$Lang::tr{'connect on ipcop restart'}</td>\n";
+		print "<tr><td align='right'>$Lang::tr{'connect on ipfire restart'}</td>\n";
 		print "<td><input type='checkbox' name='AUTOCONNECT' value='on' $checked{'AUTOCONNECT'}{'on'} /></td>\n";
 	}
 print <<END