From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 6335e4a6054b2393c1e1d38a0c58ac8014948213 Date: Fri, 06 Jun 2014 17:22:30 +0200 Message-ID: <20140606152230.472F42112C@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5741173388805054430==" List-Id: --===============5741173388805054430== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 6335e4a6054b2393c1e1d38a0c58ac8014948213 (commit) via d4af74b78ab66a59d42a9098c21e9b15229295b4 (commit) from a65b9c3268ffacc27e703025ffd246e95f906a79 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6335e4a6054b2393c1e1d38a0c58ac8014948213 Author: Arne Fitzenreiter Date: Fri Jun 6 17:20:52 2014 +0200 langs: add monitor port text. ----------------------------------------------------------------------- Summary of changes: config/cfgroot/header.pl | 4 ++- doc/language_issues.de | 6 +++- doc/language_issues.en | 6 +++- doc/language_issues.es | 5 +++ doc/language_issues.fr | 5 +++ doc/language_issues.nl | 5 +++ doc/language_issues.pl | 5 +++ doc/language_issues.ru | 5 +++ doc/language_issues.tr | 5 +++ doc/language_missings | 4 +++ html/cgi-bin/modem-status.cgi | 2 +- html/cgi-bin/pppsetup.cgi | 74 +++++++++++++++++++++++++++++++++++++++--= -- langs/de/cgi-bin/de.pl | 5 +-- langs/en/cgi-bin/en.pl | 5 +-- langs/es/cgi-bin/es.pl | 4 --- langs/fr/cgi-bin/fr.pl | 4 --- langs/nl/cgi-bin/nl.pl | 4 --- langs/pl/cgi-bin/pl.pl | 4 --- langs/ru/cgi-bin/ru.pl | 4 --- langs/tr/cgi-bin/tr.pl | 4 --- 20 files changed, 117 insertions(+), 43 deletions(-) mode change 100755 =3D> 100644 html/cgi-bin/modem-status.cgi Difference in files: diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index bbb7e21..d90086d 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -45,6 +45,7 @@ my %menuhash =3D (); my $menu =3D \%menuhash; %settings =3D (); %ethsettings =3D (); +%pppsettings =3D (); @URI =3D (); =20 ### Make sure this is an SSL request @@ -57,6 +58,7 @@ if ($ENV{'SERVER_ADDR'} && $ENV{'HTTPS'} ne 'on') { ### Initialize environment &General::readhash("${swroot}/main/settings", \%settings); &General::readhash("${swroot}/ethernet/settings", \%ethsettings); +&General::readhash("${swroot}/ppp/settings", \%pppsettings); $language =3D $settings{'LANGUAGE'}; $hostname =3D $settings{'HOSTNAME'}; $hostnameintitle =3D 0; @@ -154,7 +156,7 @@ sub genmenu { $menu->{'01.system'}{'subMenu'}->{'21.wlan'}{'enabled'} =3D 1; } =20 - if ($ethsettings{'RED_TYPE'} eq "PPPOE") { + if ( $ethsettings{'RED_TYPE'} eq "PPPOE" && $pppsettings{'MONPORT'} ne "= " ) { $menu->{'02.status'}{'subMenu'}->{'74.modem-status'}{'enabled'} =3D = 1; } } diff --git a/doc/language_issues.de b/doc/language_issues.de index 2140296..9d1e0ad 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -459,12 +459,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -491,6 +495,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid @@ -620,7 +625,6 @@ WARNING: untranslated string: emerging rules WARNING: untranslated string: first WARNING: untranslated string: fwhost err hostip WARNING: untranslated string: last -WARNING: untranslated string: monitor interface WARNING: untranslated string: qos add subclass WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added diff --git a/doc/language_issues.en b/doc/language_issues.en index 3a0a4c7..55ee3e2 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -486,12 +486,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -521,6 +525,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid @@ -651,7 +656,6 @@ WARNING: untranslated string: downlink WARNING: untranslated string: first WARNING: untranslated string: fwhost err hostip WARNING: untranslated string: last -WARNING: untranslated string: monitor interface WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_issues.es b/doc/language_issues.es index 7b59a5e..6bbdc18 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -420,12 +420,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -455,6 +459,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 2446583..13a3c88 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -431,12 +431,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -466,6 +470,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 8dd0a3c..aff38ca 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -485,12 +485,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -520,6 +524,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 7b59a5e..6bbdc18 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -420,12 +420,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -455,6 +459,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 2d12fc6..e553af7 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -425,12 +425,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -460,6 +464,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 7ce95e0..5d3dbc8 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -484,12 +484,16 @@ WARNING: translation string unused: released WARNING: translation string unused: removable device advice WARNING: translation string unused: reportfile WARNING: translation string unused: requested data +WARNING: translation string unused: reserved dst port +WARNING: translation string unused: reserved src port WARNING: translation string unused: restore hardware settings WARNING: translation string unused: root WARNING: translation string unused: root path WARNING: translation string unused: root user password WARNING: translation string unused: route subnet is invalid WARNING: translation string unused: router ip +WARNING: translation string unused: rsvd dst port overlap +WARNING: translation string unused: rsvd src port overlap WARNING: translation string unused: rules already up to date WARNING: translation string unused: safe removal of umounted device WARNING: translation string unused: save error @@ -519,6 +523,7 @@ WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net WARNING: translation string unused: source net WARNING: translation string unused: source network +WARNING: translation string unused: source port in use WARNING: translation string unused: source port overlaps WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid diff --git a/doc/language_missings b/doc/language_missings index 7ae53f8..a20a8d7 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -344,6 +344,7 @@ < modem no connection message < modem sim information < modem status +< monitor interface < most preferred < MTU settings < never @@ -863,6 +864,7 @@ < modem no connection message < modem sim information < modem status +< monitor interface < most preferred < MTU settings < never @@ -1366,6 +1368,7 @@ < modem no connection message < modem sim information < modem status +< monitor interface < most preferred < MTU settings < never @@ -1860,6 +1863,7 @@ < modem no connection message < modem sim information < modem status +< monitor interface < month-graph < most preferred < MTU settings diff --git a/html/cgi-bin/modem-status.cgi b/html/cgi-bin/modem-status.cgi old mode 100755 new mode 100644 index d278c77..2d33a3d --- a/html/cgi-bin/modem-status.cgi +++ b/html/cgi-bin/modem-status.cgi @@ -2,7 +2,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2008 Michael Tremer & Christian Schmidt = # +# 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 = # diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 7bceb80..33f521e 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'} =3D~ /^(modem|serial|isdn)$/ && $pppsetting= s{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM0|ttyACM1|ttyACM2|ttyA= CM3|ttyUSB0|ttyUSB1|ttyUSB2|ttyUSB3|rfcomm0|rfcomm1|isdn1|isdn2)$/) { + if ($pppsettings{'TYPE'} =3D~ /^(modem|serial|isdn)$/ && $pppsetting= s{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM[0-9]|ttyUSB[0-9]|rfco= mm0|rfcomm1|isdn1|isdn2)$/) { $errormessage =3D $Lang::tr{'invalid input'}; goto ERROR; } - if ($pppsettings{'TYPE'} =3D~ /^(modem|serial|isdn)$/ && $pppsetting= s{'MONPORT'} !~ /^(ttyUSB0|ttyUSB1|ttyUSB2|ttyUSB3)$/) { + if ($pppsettings{'TYPE'} =3D~ /^(modem|serial|isdn)$/ && $pppsetting= s{'MONPORT'} !~ /^(|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1)$/) { $errormessage =3D $Lang::tr{'invalid input'}; goto ERROR; } if ($pppsettings{'TYPE'} =3D~ /^(modem|serial)$/ && $pppsettings{'DT= ERATE'} !~ /^(9600|19200|38400|57600|115200|230400|460800|921600)$/) { @@ -333,19 +333,49 @@ $selected{'COMPORT'}{'ttyACM0'} =3D ''; $selected{'COMPORT'}{'ttyACM1'} =3D ''; $selected{'COMPORT'}{'ttyACM2'} =3D ''; $selected{'COMPORT'}{'ttyACM3'} =3D ''; +$selected{'COMPORT'}{'ttyACM4'} =3D ''; +$selected{'COMPORT'}{'ttyACM5'} =3D ''; +$selected{'COMPORT'}{'ttyACM6'} =3D ''; +$selected{'COMPORT'}{'ttyACM7'} =3D ''; +$selected{'COMPORT'}{'ttyACM8'} =3D ''; +$selected{'COMPORT'}{'ttyACM9'} =3D ''; $selected{'COMPORT'}{'ttyUSB0'} =3D ''; $selected{'COMPORT'}{'ttyUSB1'} =3D ''; $selected{'COMPORT'}{'ttyUSB2'} =3D ''; $selected{'COMPORT'}{'ttyUSB3'} =3D ''; +$selected{'COMPORT'}{'ttyUSB4'} =3D ''; +$selected{'COMPORT'}{'ttyUSB5'} =3D ''; +$selected{'COMPORT'}{'ttyUSB6'} =3D ''; +$selected{'COMPORT'}{'ttyUSB7'} =3D ''; +$selected{'COMPORT'}{'ttyUSB8'} =3D ''; +$selected{'COMPORT'}{'ttyUSB9'} =3D ''; $selected{'COMPORT'}{'rfcomm0'} =3D ''; $selected{'COMPORT'}{'rfcomm1'} =3D ''; $selected{'COMPORT'}{$pppsettings{'COMPORT'}} =3D "selected=3D'selected'"; =20 $selected{'MONPORT'}{''} =3D ''; +$selected{'MONPORT'}{'ttyACM0'} =3D ''; +$selected{'MONPORT'}{'ttyACM1'} =3D ''; +$selected{'MONPORT'}{'ttyACM2'} =3D ''; +$selected{'MONPORT'}{'ttyACM3'} =3D ''; +$selected{'MONPORT'}{'ttyACM4'} =3D ''; +$selected{'MONPORT'}{'ttyACM5'} =3D ''; +$selected{'MONPORT'}{'ttyACM6'} =3D ''; +$selected{'MONPORT'}{'ttyACM7'} =3D ''; +$selected{'MONPORT'}{'ttyACM8'} =3D ''; +$selected{'MONPORT'}{'ttyACM9'} =3D ''; $selected{'MONPORT'}{'ttyUSB0'} =3D ''; $selected{'MONPORT'}{'ttyUSB1'} =3D ''; $selected{'MONPORT'}{'ttyUSB2'} =3D ''; $selected{'MONPORT'}{'ttyUSB3'} =3D ''; +$selected{'MONPORT'}{'ttyUSB4'} =3D ''; +$selected{'MONPORT'}{'ttyUSB5'} =3D ''; +$selected{'MONPORT'}{'ttyUSB6'} =3D ''; +$selected{'MONPORT'}{'ttyUSB7'} =3D ''; +$selected{'MONPORT'}{'ttyUSB8'} =3D ''; +$selected{'MONPORT'}{'ttyUSB9'} =3D ''; +$selected{'MONPORT'}{'rfcomm0'} =3D ''; +$selected{'MONPORT'}{'rfcomm1'} =3D ''; $selected{'MONPORT'}{$pppsettings{'MONPORT'}} =3D "selected=3D'selected'"; =20 $selected{'DTERATE'}{'9600'} =3D ''; @@ -582,16 +612,28 @@ END + + + + + + END ; if ($pppsettings{'TYPE'} ne 'serial' ) { print <$L= ang::tr{'usb modem on acm0'} - - - + + + + + + + + + + END ; } @@ -608,6 +650,24 @@ END + +