[prev in list] [next in list] [prev in thread] [next in thread]
List: ipcop-svn
Subject: [Ipcop-svn] SF.net SVN: ipcop:[4035] ipcop/trunk
From: owes () users ! sourceforge ! net
Date: 2009-12-22 12:38:38
Message-ID: E1NN40c-0003Cw-Fk () bj8yhf1 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 4035
http://ipcop.svn.sourceforge.net/ipcop/?rev=4035&view=rev
Author: owes
Date: 2009-12-22 12:38:38 +0000 (Tue, 22 Dec 2009)
Log Message:
-----------
Add special interfaces ttyUSB2, ttyUSB3, noz0, noz1, ttyHS0, ttyHS1
Stop using translation texts for all those USB interfaces.
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/pppsetup.cgi
ipcop/trunk/updates/1.9.11/ROOTFILES.i486-1.9.11
Modified: ipcop/trunk/html/cgi-bin/pppsetup.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/pppsetup.cgi 2009-12-22 11:57:16 UTC (rev 4034)
+++ ipcop/trunk/html/cgi-bin/pppsetup.cgi 2009-12-22 12:38:38 UTC (rev 4035)
@@ -54,6 +54,11 @@
$selected{'PROFILE'}{$c} = '';
}
+my @list_ttys = ('ttyS0','ttyS1','ttyS2','ttyS3','ttyS4',
+ 'ttyUSB0','ttyUSB1','ttyUSB2','ttyUSB3',
+ 'noz0','noz1','ttyHS0','ttyHS1',
+ 'usb/ttyACM0','usb/ttyACM1','usb/ttyACM2','usb/ttyACM3');
+
&Header::showhttpheaders();
$pppsettings{'ACTION'} = '';
@@ -93,13 +98,18 @@
# TODO: do we need to check everything here, or do we simply trust the \
dropdownlists?
- 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;
+ if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/) {
+ my $ttyOK = 0;
+
+ $ttyOK = 1 if (($pppsettings{'COMPORT'} eq 'isdn1') || \
($pppsettings{'COMPORT'} eq 'isdn2')); + for $c (0 .. $#list_ttys) {
+ $ttyOK = 1 if ($pppsettings{'COMPORT'} eq $list_ttys[$c]);
+ }
+
+ if (! $ttyOK) {
+ $errormessage = $Lang::tr{'invalid input'};
+ goto ERROR;
+ }
}
if ( $pppsettings{'TYPE'} =~ /^(modem|serial)$/
&& $pppsettings{'DTERATE'} !~ \
/^(9600|19200|38400|57600|115200|230400|460800|921600)$/) @@ -433,17 +443,10 @@
$checked{'DEBUG'}{'on'} = '';
$checked{'DEBUG'}{$pppsettings{'DEBUG'}} = "checked='checked'";
-$selected{'COMPORT'}{'ttyS0'} = '';
-$selected{'COMPORT'}{'ttyS1'} = '';
-$selected{'COMPORT'}{'ttyS2'} = '';
-$selected{'COMPORT'}{'ttyS3'} = '';
-$selected{'COMPORT'}{'ttyS4'} = '';
-$selected{'COMPORT'}{'usb/ttyACM0'} = '';
-$selected{'COMPORT'}{'usb/ttyACM1'} = '';
-$selected{'COMPORT'}{'usb/ttyACM2'} = '';
-$selected{'COMPORT'}{'usb/ttyACM3'} = '';
-$selected{'COMPORT'}{'ttyUSB0'} = '';
-$selected{'COMPORT'}{'ttyUSB1'} = '';
+
+for $c (0 .. $#list_ttys) {
+ $selected{'COMPORT'}{"$list_ttys[$c]"} = '';
+}
$selected{'COMPORT'}{'isdn1'} = '';
$selected{'COMPORT'}{'isdn2'} = '';
$selected{'COMPORT'}{'ttyWP0'} = '';
@@ -677,27 +680,25 @@
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='usb/ttyACM0' \
$selected{'COMPORT'}{'usb/ttyACM0'}>$Lang::tr{'usb modem on \
acm0'}</option>
- <option value='usb/ttyACM1' \
$selected{'COMPORT'}{'usb/ttyACM1'}>$Lang::tr{'usb modem on \
acm1'}</option>
- <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
- ;
+ for $c (0 .. $#list_ttys) {
+ if ($list_ttys[$c] eq "ttyS$c") {
+ # Special tweak for serial interfaces, we have got translations \
for COM1 .. COM5 + # Make sure translations exist $Lang::tr{'modem \
on com1'} $Lang::tr{'modem on com2'} + # $Lang::tr{'modem on \
com3'} $Lang::tr{'modem on com4'} $Lang::tr{'modem on com5'} +
+ my $modemtext = $Lang::tr{"modem on com".($c+1)};
+ print "<option value='$list_ttys[$c]' \
$selected{'COMPORT'}{$list_ttys[$c]}>$modemtext</option>\n"; + }
+ else {
+ # There are all special USB interfaces, need a specialist to \
understand them + print "<option value='$list_ttys[$c]' \
$selected{'COMPORT'}{$list_ttys[$c]}>$list_ttys[$c]</option>\n"; + }
+ }
}
elsif ($pppsettings{'TYPE'} eq 'isdn') {
print <<END
<option value='isdn1' \
$selected{'COMPORT'}{'isdn1'}>$Lang::tr{'isdn1'}</option>
<option value='isdn2' \
$selected{'COMPORT'}{'isdn2'}>$Lang::tr{'isdn2'}</option>
- </select></td>
END
;
}
@@ -711,10 +712,10 @@
<option value='ttyWP5' $selected{'COMPORT'}{'ttyWP5'}>ttyWP5</option>
<option value='ttyWP6' $selected{'COMPORT'}{'ttyWP6'}>ttyWP6</option>
<option value='ttyWP7' $selected{'COMPORT'}{'ttyWP7'}>ttyWP7</option>
- </select></td>
END
;
}
+ print " </select></td>\n";
if ($pppsettings{'TYPE'} =~ /^(modem|serial|wanpipe-serial)$/) {
print <<END
Modified: ipcop/trunk/updates/1.9.11/ROOTFILES.i486-1.9.11
===================================================================
--- ipcop/trunk/updates/1.9.11/ROOTFILES.i486-1.9.11 2009-12-22 11:57:16 UTC (rev \
4034)
+++ ipcop/trunk/updates/1.9.11/ROOTFILES.i486-1.9.11 2009-12-22 12:38:38 UTC (rev \
4035) @@ -7,6 +7,7 @@
/home/httpd/cgi-bin/ipsec.cgi
/home/httpd/cgi-bin/netstatus.cgi
/home/httpd/cgi-bin/openvpn.cgi
+/home/httpd/cgi-bin/pppsetup.cgi
/home/httpd/cgi-bin/scheduler.cgi
/home/httpd/cgi-bin/time.cgi
/home/httpd/cgi-bin/trafficadm.cgi
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic