diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index 81f369403e..94fd82f8d1 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -177,7 +177,7 @@ $pconfig['enable'] = isset($wancfg['enable']); if (is_array($config['aliases']['alias'])) { foreach($config['aliases']['alias'] as $alias) { if($alias['name'] == $wancfg['descr']) { - $input_errors[] = sprintf(gettext("Sorry, an alias with the name '%s' already exists."),$wancfg['descr']); + $input_errors[] = gettext("Sorry, an alias with the name {$wancfg['descr']} already exists."); } } } @@ -355,31 +355,31 @@ if ($_POST) { switch($_POST['type']) { case "static": $reqdfields = explode(" ", "ipaddr subnet gateway"); - $reqdfieldsn = array(gettext("IP address"),gettext("Subnet bit count"),gettext("Gateway")); + $reqdfieldsn = explode(",", "IP address,Subnet bit count,Gateway"); do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); break; case "ppp": $reqdfields = explode(" ", "port phone"); - $reqdfieldsn = array(gettext("Modem Port"),gettext("Phone Number")); + $reqdfieldsn = explode(",", "Modem Port,Phone Number"); do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); break; case "PPPoE": if ($_POST['pppoe_dialondemand']) { $reqdfields = explode(" ", "pppoe_username pppoe_password pppoe_dialondemand pppoe_idletimeout"); - $reqdfieldsn = array(gettext("PPPoE username"),gettext("PPPoE password"),gettext("Dial on demand"),gettext("Idle timeout value")); + $reqdfieldsn = explode(",", "PPPoE username,PPPoE password,Dial on demand,Idle timeout value"); } else { $reqdfields = explode(" ", "pppoe_username pppoe_password"); - $reqdfieldsn = array(gettext("PPPoE username"),gettext("PPPoE password")); + $reqdfieldsn = explode(",", "PPPoE username,PPPoE password"); } do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); break; case "PPTP": if ($_POST['pptp_dialondemand']) { $reqdfields = explode(" ", "pptp_username pptp_password pptp_local pptp_subnet pptp_remote pptp_dialondemand pptp_idletimeout"); - $reqdfieldsn = array(gettext("PPTP username"),gettext("PPTP password"),gettext("PPTP local IP address"),gettext("PPTP subnet"),gettext("PPTP remote IP address"),gettext("Dial on demand"),gettext("Idle timeout value")); + $reqdfieldsn = explode(",", "PPTP username,PPTP password,PPTP local IP address,PPTP subnet,PPTP remote IP address,Dial on demand,Idle timeout value"); } else { $reqdfields = explode(" ", "pptp_username pptp_password pptp_local pptp_subnet pptp_remote"); - $reqdfieldsn = array(gettext("PPTP username"),gettext("PPTP password"),gettext("PPTP local IP address"),gettext("PPTP subnet"),gettext("PPTP remote IP address")); + $reqdfieldsn = explode(",", "PPTP username,PPTP password,PPTP local IP address,PPTP subnet,PPTP remote IP address"); } do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); break; @@ -433,7 +433,7 @@ if ($_POST) { /* Wireless interface? */ if (isset($wancfg['wireless'])) { $reqdfields = explode(" ", "mode ssid"); - $reqdfieldsn = array(gettext("Mode"),gettext("SSID")); + $reqdfieldsn = explode(",", "Mode,SSID"); do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); check_wireless_mode(); /* loop through keys and enforce size */ @@ -804,7 +804,7 @@ function check_wireless_mode() { } } -$pgtitle = array(gettext("Interfaces"),sprintf(gettext("'%s'"),$pconfig['descr'])); +$pgtitle = array("Interfaces", $pconfig['descr']); $statusurl = "status_interfaces.php"; $closehead = false; @@ -974,7 +974,7 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "ppp" =

- ".gettext("You must apply the changes in order for them to take effect.")."

".gettext("Don't forget to adjust the DHCP Server range if needed after applying."));?>
+ You must apply the changes in order for them to take effect.

Don't forget to adjust the DHCP Server range if needed after applying."));?>
@@ -999,7 +999,7 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "ppp" = @@ -1312,7 +1312,7 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "ppp" = @@ -1354,7 +1354,7 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "ppp" =
 
- : + Note:

@@ -1824,7 +1824,7 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "ppp" = @@ -1889,7 +1889,7 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "ppp" = @@ -479,7 +479,7 @@ if(file_exists("/var/run/interface_mismatch_reboot_needed")) @@ -490,14 +490,14 @@ if(file_exists("/var/run/interface_mismatch_reboot_needed"))
Description -
+
Enter a description (name) for the interface here.
Service name -
+
Hint: this field can usually be left empty
>
Setting this option will enable 802.1x authentication. -
: this option requires checking the "Enable WPA box". +
NOTE: this option requires checking the "Enable WPA box".

- "> + diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php index 28349fa34c..2c38e804ed 100755 --- a/usr/local/www/interfaces_assign.php +++ b/usr/local/www/interfaces_assign.php @@ -40,7 +40,7 @@ ##|*MATCH=interfaces_assign.php* ##|-PRIV -$pgtitle = array(gettext("Interfaces"),gettext("Assign network ports")); +$pgtitle = array("Interfaces", "Assign network ports"); $statusurl = "status_interfaces.php"; require("guiconfig.inc"); @@ -182,9 +182,9 @@ if ($_POST['apply']) { /* Deliver error message for any port with more than one assignment */ foreach ($portifmap as $portname => $ifnames) { if (count($ifnames) > 1) { - $errstr = sprintf(gettext("Port '%s' ". - " was assigned to '%s'" . - " interfaces:"), $portname, count($ifnames)); + $errstr = "Port " . $portname . + " was assigned to " . count($ifnames) . + " interfaces:"; foreach ($portifmap[$portname] as $ifn) $errstr .= " " . $ifn; @@ -246,11 +246,11 @@ if ($_GET['act'] == "del") { $id = $_GET['id']; if (link_interface_to_bridge($id)) - $input_errors[] = gettext("The interface is part of a bridge. Please remove it from the bridge to continue"); + $input_errors[] = "The interface is part of a bridge. Please remove it from the bridge to continue"; else if (link_interface_to_gre($id)) - $input_errors[] = gettext("The interface is part of a gre tunnel. Please delete the tunnel to continue"); + $input_errors[] = "The interface is part of a gre tunnel. Please delete the tunnel to continue"; else if (link_interface_to_gif($id)) - $input_errors[] = gettext("The interface is part of a gif tunnel. Please delete the tunnel to continue"); + $input_errors[] = "The interface is part of a gif tunnel. Please delete the tunnel to continue"; else { unset($config['interfaces'][$id]['enable']); $realid = get_real_interface($id); @@ -300,15 +300,15 @@ if ($_GET['act'] == "del") { link_interface_to_vlans($realid, "update"); - $savemsg = gettext("Interface has been deleted."); + $savemsg = "Interface has been deleted."; } } if ($_GET['act'] == "add") { /* find next free optional interface number */ if(!$config['interfaces']['lan']) { - $newifname = gettext("lan"); - $descr = gettext("LAN"); + $newifname = "lan"; + $descr = "LAN"; $config['interfaces'][$newifname] = array(); $config['interfaces'][$newifname]['descr'] = $descr; } else { @@ -317,7 +317,7 @@ if ($_GET['act'] == "add") { break; } $newifname = 'opt' . $i; - $descr = sprintf(gettext("OPT '%s'"),$i); + $descr = "OPT{$i}"; $config['interfaces'][$newifname] = array(); $config['interfaces'][$newifname]['descr'] = $descr; } @@ -348,7 +348,7 @@ if ($_GET['act'] == "add") { write_config(); - $savemsg = gettext("Interface has been added."); + $savemsg = "Interface has been added."; } @@ -371,9 +371,9 @@ include("head.inc"); if(file_exists("/var/run/interface_mismatch_reboot_needed")) if ($_POST) - $savemsg = gettext("Reboot is needed. Please apply the settings in order to reboot."); + $savemsg = "Reboot is needed. Please apply the settings in order to reboot."; else - $savemsg = gettext("Interface mismatch detected. Please resolve the mismatch and click Save. The firewall will reboot afterwards."); + $savemsg = "Interface mismatch detected. Please resolve the mismatch and click Save. The firewall will reboot afterwards."; ?> @@ -429,7 +429,7 @@ if(file_exists("/var/run/interface_mismatch_reboot_needed")) $portinfo): ?> 		- width="17" height="17" border="0"> +
- width="17" height="17" border="0"> +

->

+

diff --git a/usr/local/www/interfaces_bridge_edit.php b/usr/local/www/interfaces_bridge_edit.php index 6679afb495..1b2b304b9f 100644 --- a/usr/local/www/interfaces_bridge_edit.php +++ b/usr/local/www/interfaces_bridge_edit.php @@ -104,45 +104,45 @@ if ($_POST) { /* input validation */ $reqdfields = explode(" ", "members"); - $reqdfieldsn = array(gettext("Member Interfaces")); + $reqdfieldsn = explode(",", "Member Interfaces"); do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); if ($_POST['maxage'] && !is_numeric($_POST['maxage'])) - $input_errors[] = gettext("Maxage needs to be an integer between 6 and 40."); + $input_errors[] = "Maxage needs to be an integer between 6 and 40."; if ($_POST['maxaddr'] && !is_numeric($_POST['maxaddr'])) - $input_errors[] = gettext("Maxaddr needs to be an integer."); + $input_errors[] = "Maxaddr needs to be an integer."; if ($_POST['timeout'] && !is_numeric($_POST['timeout'])) - $input_errors[] = gettext("Timeout needs to be an integer."); + $input_errors[] = "Timeout needs to be an integer."; if ($_POST['fwdelay'] && !is_numeric($_POST['fwdelay'])) - $input_errors[] = gettext("Forward Delay needs to be an integer between 4 and 30."); + $input_errors[] = "Forward Delay needs to be an integer between 4 and 30."; if ($_POST['hellotime'] && !is_numeric($_POST['hellotime'])) - $input_errors[] = gettext("Hello time for STP needs to be an integer between 1 and 2."); + $input_errors[] = "Hello time for STP needs to be an integer between 1 and 2."; if ($_POST['priority'] && !is_numeric($_POST['priority'])) - $input_errors[] = gettext("Priority for STP needs to be an integer between 0 and 61440."); + $input_errors[] = "Priority for STP needs to be an integer between 0 and 61440."; if ($_POST['holdcnt'] && !is_numeric($_POST['holdcnt'])) - $input_errors[] = gettext("Transmit Hold Count for STP needs to be an integer between 1 and 10."); + $input_errors[] = "Transmit Hold Count for STP needs to be an integer between 1 and 10."; foreach ($ifacelist as $ifn => $ifdescr) { if ($_POST[$ifn] <> "" && !is_numeric($_POST[$ifn])) - $input_errors[] = "{$ifdescr} " . gettext("interface priority for STP needs to be an integer between 0 and 240."); + $input_errors[] = "{$ifdescr} interface priority for STP needs to be an integer between 0 and 240."; } $i = 0; foreach ($ifacelist as $ifn => $ifdescr) { if ($_POST["{$ifn}{$i}"] <> "" && !is_numeric($_POST["{$ifn}{$i}"])) - $input_errors[] = "{$ifdescr} " . gettext("interface path cost for STP needs to be an integer between 1 and 200000000."); + $input_errors[] = "{$ifdescr} interface path cost for STP needs to be an integer between 1 and 200000000."; $i++; } if (!is_array($_POST['members']) || count($_POST['members']) < 2) - $input_errors[] = gettext("You must select at least 2 member interfaces for a bridge."); + $input_errors[] = "You must select at least 2 member interfaces for a bridge."; if (is_array($_POST['members'])) { foreach($_POST['members'] as $ifmembers) { if (is_array($config['interfaces'][$ifmembers]['wireless']) && $config['interfaces'][$ifmembers]['wireless']['mode'] != "hostap") - $input_errors[] = gettext("Bridging a wireless interface is only possible in hostap mode."); + $input_errors[] = "Bridging a wireless interface is only possible in hostap mode."; if ($_POST['span'] != "none" && $_POST['span'] == $ifmembers) - $input_errors[] = gettext("Span interface cannot be part of the bridge. Remove the span interface from bridge members to continue."); + $input_errors[] = "Span interface cannot be part of the bridge. Remove the span interface from bridge members to continue."; } } @@ -199,7 +199,7 @@ if ($_POST) { $bridge['bridgeif'] = $_POST['bridgeif']; $bridge['bridgeif'] = interface_bridge_configure($bridge); if ($bridge['bridgeif'] == "" || !stristr($bridge['bridgeif'], "bridge")) - $input_errors[] = gettext("Error occured creating interface, please retry."); + $input_errors[] = "Error occured creating interface, please retry."; else { if (isset($id) && $a_bridges[$id]) $a_bridges[$id] = $bridge; @@ -219,7 +219,7 @@ if ($_POST) { } } -$pgtitle = array(gettext("Firewall"),gettext("Bridge"),gettext("Edit")); +$pgtitle = array("Firewall","Bridge","Edit"); include("head.inc"); ?> @@ -246,10 +246,10 @@ function show_source_port_range() { - + - + - + @@ -281,10 +281,10 @@ function show_source_port_range() { - + - + - + - + - + - + - + - + - + @@ -136,7 +136,7 @@ include("head.inc");
Bridge configuration
Member interfaces
- + Interfaces participating in the bridge.
Description RSTP/STP > - + Enable spanning tree options for this bridge.

- + + Protocol used for spanning tree. - + - + - + - + - + - + - + - +
Protocol
-
STP interfaces
- - + + Enable Spanning Tree Protocol on interface. The if_bridge(4) + driver has support for the IEEE 802.1D Spanning Tree Protocol + (STP). STP is used to detect and remove loops in a + network topology.
Valid time - + seconds
- + Set the time that a Spanning Tree Protocol configuration is + valid. The default is 20 seconds. The minimum is 6 seconds and + the maximum is 40 seconds.
Forward time - + seconds
- + Set the time that must pass before an interface begins forwarding + packets when Spanning Tree is enabled. The default is 15 seconds. The minimum is 4 seconds and the maximum is 30 seconds.
Hello time - + seconds
- + Set the time between broadcasting of Spanning Tree Protocol configuration messages. The hello time may only be changed when + operating in legacy STP mode. The default is 2 seconds. The minimum is 1 second and the maximum is 2 seconds.
Priority
- + Set the bridge priority for Spanning Tree. The default is 32768. + The minimum is 0 and the maximum is 61440.
Hold count
- + Set the transmit hold count for Spanning Tree. This is the num- + ber of packets transmitted before being rate limited. The + default is 6. The minimum is 1 and the maximum is 10.
Priority $ifdescr) @@ -375,11 +375,11 @@ function show_source_port_range() {

- + Set the Spanning Tree priority of interface to value. The + default is 128. The minimum is 0 and the maximum is 240.
Path cost $ifdescr) @@ -388,40 +388,40 @@ function show_source_port_range() {

- + Set the Spanning Tree path cost of interface to value. The + default is calculated from the link speed. To change a previously selected path cost back to automatic, set the cost to 0. + The minimum is 1 and the maximum is 200000000.
  - "> " onclick="history.back()"> + diff --git a/usr/local/www/interfaces_gif_edit.php b/usr/local/www/interfaces_gif_edit.php index 742b00e4da..908277f8cc 100644 --- a/usr/local/www/interfaces_gif_edit.php +++ b/usr/local/www/interfaces_gif_edit.php @@ -69,13 +69,13 @@ if ($_POST) { /* input validation */ $reqdfields = explode(" ", "if tunnel-remote-addr tunnel-remote-net tunnel-local-addr"); - $reqdfieldsn = array(gettext("Parent interface,Local address, Remote tunnel address, Remote tunnel network, Local tunnel address")); + $reqdfieldsn = explode(",", "Parent interface,Local address, Remote tunnel address, Remote tunnel network, Local tunnel address"); do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); if ((!is_ipaddr($_POST['tunnel-local-addr'])) || (!is_ipaddr($_POST['tunnel-remote-addr'])) || (!is_ipaddr($_POST['remote-addr']))) { - $input_errors[] = gettext("The tunnel local and tunnel remote fields must have valid IP addresses."); + $input_errors[] = "The tunnel local and tunnel remote fields must have valid IP addresses."; } foreach ($a_gifs as $gif) { @@ -83,7 +83,7 @@ if ($_POST) { continue; if (($gif['if'] == $_POST['if']) && ($gif['tunnel-remote-net'] == $_POST['tunnel-remote-net'])) { - $input_errors[] = gettext("A gif with the network {$gif['remote-network']} is already defined."); + $input_errors[] = "A gif with the network {$gif['remote-network']} is already defined."; break; } } @@ -102,7 +102,7 @@ if ($_POST) { $gif['gifif'] = interface_gif_configure($gif); if ($gif['gifif'] == "" || !stristr($gif['gifif'], "gif")) - $input_errors[] = gettext("Error occured creating interface, please retry."); + $input_errors[] = "Error occured creating interface, please retry."; else { if (isset($id) && $a_gifs[$id]) $a_gifs[$id] = $gif; @@ -117,7 +117,7 @@ if ($_POST) { } } -$pgtitle = array(gettext("Firewall"),gettext("GIF"),gettext("Edit")); +$pgtitle = array("Firewall","GIF","Edit"); include("head.inc"); ?> @@ -128,10 +128,10 @@ include("head.inc"); - + - + + The interface here servers as the local address to be used for the gif tunnel. - + + Peer address where encapsulated gif packets will be sent. - + + Local gif tunnel endpoint - + + Remote gif address endpoint. The subnet part is used for the determinig the network that is tunneled. - + + Specify if route caching can be enabled. Be careful with these settings on dynamic networks. - + - + +
You may enter a description here + for your reference (not parsed). @@ -103,9 +103,9 @@ include("head.inc");
GIF configuration
Parent interface
-
gif remote address
-
gif tunnel local address
-
gif tunnel remote address
-
Route caching >
-
ECN friendly behaviour >
- + Note that the ECN friendly behavior violates RFC2893. This should be + used in mutual agreement with the peer.
Description -
  - "> " onclick="history.back()"> + diff --git a/usr/local/www/interfaces_gre.php b/usr/local/www/interfaces_gre.php index af10a521aa..a1a959e660 100644 --- a/usr/local/www/interfaces_gre.php +++ b/usr/local/www/interfaces_gre.php @@ -61,7 +61,7 @@ function gre_inuse($num) { if ($_GET['act'] == "del") { /* check if still in use */ if (gre_inuse($_GET['id'])) { - $input_errors[] = gettext("This GRE tunnel cannot be deleted because it is still being used as an interface."); + $input_errors[] = "This GRE tunnel cannot be deleted because it is still being used as an interface."; } else { mwexec("/sbin/ifconfig " . $a_gres[$_GET['id']]['greif'] . " destroy"); unset($a_gres[$_GET['id']]); @@ -73,7 +73,7 @@ if ($_GET['act'] == "del") { } } -$pgtitle = array(gettext("Interfaces"),gettext("GRE")); +$pgtitle = array("Interfaces","GRE"); include("head.inc"); ?> @@ -85,16 +85,16 @@ include("head.inc");
- - - + + + @@ -120,7 +120,7 @@ include("head.inc");   +   @@ -129,7 +129,7 @@ include("head.inc");
InterfaceTunnel to...Description
-  )">
-


+

Note:
Here you can configure Generic Routing Encapsulation (GRE - RFC 2784) tunnels.
diff --git a/usr/local/www/interfaces_gre_edit.php b/usr/local/www/interfaces_gre_edit.php index 271b831ee0..1144bcd7a0 100644 --- a/usr/local/www/interfaces_gre_edit.php +++ b/usr/local/www/interfaces_gre_edit.php @@ -70,7 +70,7 @@ if ($_POST) { /* input validation */ $reqdfields = explode(" ", "if tunnel-remote-addr tunnel-remote-net tunnel-local-addr"); - $reqdfieldsn = array(gettext("Parent interface"),gettext("Local address"),gettext("Remote tunnel address"),gettext("Remote tunnel network"), gettext("Local tunnel address")); + $reqdfieldsn = explode(",", "Parent interface,Local address, Remote tunnel address, Remote tunnel network, Local tunnel address"); do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); @@ -84,7 +84,7 @@ if ($_POST) { continue; if (($gre['if'] == $_POST['if']) && ($gre['tunnel-remote-net'] == $_POST['tunnel-remote-net'])) { - $input_errors[] = sprintf(gettext("A gre with the network %s is already defined."),$gre['remote-network']); + $input_errors[] = "A gre with the network {$gre['remote-network']} is already defined."; break; } } @@ -104,7 +104,7 @@ if ($_POST) { $gre['greif'] = interface_gre_configure($gre); if ($gre['greif'] == "" || !stristr($gre['greif'], "gre")) - $input_errors[] = gettext("Error occured creating interface, please retry."); + $input_errors[] = "Error occured creating interface, please retry."; else { if (isset($id) && $a_gres[$id]) $a_gres[$id] = $gre; @@ -119,7 +119,7 @@ if ($_POST) { } } -$pgtitle = array(gettext("Firewall"),gettext("GRE"),gettext("Edit")); +$pgtitle = array("Firewall","GRE","Edit"); include("head.inc"); ?> @@ -130,10 +130,10 @@ include("head.inc"); - + - + + The interface here serves as the local address to be used for the GRE tunnel. - + + Peer address where encapsulated GRE packets will be sent - + + Local GRE tunnel endpoint - + + Remote GRE address endpoint. The subnet part is used for the determining the network that is tunneled. - + + Specify which encapsulation method the tunnel should use. - + - + + Specify which WCCP encapsulation(version 1 or 2) method the tunnel should use - + +
You may enter a description here + for your reference (not parsed). @@ -90,9 +90,9 @@ include("head.inc");
GRE configuration
Parent interface
-
GRE remote address
-
GRE tunnel local address
-
GRE tunnel remote address
-
Mobile tunnel >
-
Route search type >
- + For correct operation, the GRE device needs a route to the destination + that is less specific than the one over the tunnel. (Basically, there + needs to be a route to the decapsulating host that does not run over the + tunnel, as this would be a loop.)
WCCP version >
-
Description -
  - "> " onclick="history.back()"> + diff --git a/usr/local/www/interfaces_groups.php b/usr/local/www/interfaces_groups.php index 954bcf6927..27a088a583 100755 --- a/usr/local/www/interfaces_groups.php +++ b/usr/local/www/interfaces_groups.php @@ -59,7 +59,7 @@ if ($_GET['act'] == "del") { } } -$pgtitle = array(gettext("Interfaces"),gettext("Groups")); +$pgtitle = array("Interfaces","Groups"); include("head.inc"); ?> @@ -71,16 +71,16 @@ include("head.inc");
- - - + + +
NameMembersDescription
- - + +
">)">">
- +
 ">
@@ -144,7 +144,7 @@ include("head.inc"); -


+

Note:
Interface Groups allow you to create rules that apply to multiple interfaces without duplicating the rules. If you remove members from an interface group, the group rules no longer apply to that interface.

diff --git a/usr/local/www/interfaces_groups_edit.php b/usr/local/www/interfaces_groups_edit.php index 752594540b..51feffda18 100755 --- a/usr/local/www/interfaces_groups_edit.php +++ b/usr/local/www/interfaces_groups_edit.php @@ -37,7 +37,7 @@ ##|*MATCH=interfaces_groups_edit.php* ##|-PRIV -$pgtitle = array(gettext("Interfaces"),gettext("Groups"),gettext("Edit")); +$pgtitle = array("Interfaces","Groups", "Edit"); require("guiconfig.inc"); @@ -69,7 +69,7 @@ if ($_POST) { $input_errors[] = "Group name already exists!"; } if (preg_match("/([^a-zA-Z])+/", $_POST['ifname'], $match)) - $input_errors[] = gettext("Only letters A-Z are allowed as the group name."); + $input_errors[] = "Only letters A-Z are allowed as the group name."; $ifgroupentry = array(); $ifgroupentry['ifname'] = $_POST['ifname']; @@ -200,33 +200,33 @@ function removeRow(el) { - + - + - + - +
Interface Groups Edit
Group Name
- + No numbers or spaces are allowed. Only characters in a-zA-Z
Description
- + You may enter a description here for your reference (not parsed).
Member (s)
 - +
Interface
- " /> +
- " /> +
  - " /> - " /> + + diff --git a/usr/local/www/interfaces_lagg.php b/usr/local/www/interfaces_lagg.php index 190c7876a1..f09c59e322 100644 --- a/usr/local/www/interfaces_lagg.php +++ b/usr/local/www/interfaces_lagg.php @@ -67,7 +67,7 @@ function lagg_inuse($num) { if ($_GET['act'] == "del") { /* check if still in use */ if (lagg_inuse($_GET['id'])) { - $input_errors[] = gettext("This LAGG interface cannot be deleted because it is still being used."); + $input_errors[] = "This LAGG interface cannot be deleted because it is still being used."; } else { mwexec_bg("/sbin/ifconfig " . $a_laggs[$_GET['id']]['laggif'] . " destroy"); unset($a_laggs[$_GET['id']]); @@ -79,7 +79,7 @@ if ($_GET['act'] == "del") { } } -$pgtitle = array(gettext("Interfaces"),gettext("LAGG")); +$pgtitle = array("Interfaces","LAGG"); include("head.inc"); ?> @@ -91,15 +91,15 @@ include("head.inc");
@@ -109,9 +109,9 @@ include("head.inc");
- - - + + + @@ -135,9 +135,9 @@ include("head.inc"); diff --git a/usr/local/www/interfaces_lagg_edit.php b/usr/local/www/interfaces_lagg_edit.php index d507c22644..8b67ab61b7 100644 --- a/usr/local/www/interfaces_lagg_edit.php +++ b/usr/local/www/interfaces_lagg_edit.php @@ -76,7 +76,7 @@ if ($_POST) { /* input validation */ $reqdfields = explode(" ", "members proto"); - $reqdfieldsn = array(",", gettext("Member interfaces"), gettext("Lagg protocol")); + $reqdfieldsn = explode(",", "Member interfaces, Lagg protocol"); do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); @@ -89,7 +89,7 @@ if ($_POST) { $lagg['laggif'] = interface_lagg_configure($lagg); if ($lagg['laggif'] == "" || !stristr($lagg['laggif'], "lagg")) - $input_errors[] = gettext("Error occured creating interface, please retry."); + $input_errors[] = "Error occured creating interface, please retry."; else { if (isset($id) && $a_laggs[$id]) $a_laggs[$id] = $lagg; @@ -108,7 +108,7 @@ if ($_POST) { } } -$pgtitle = array(gettext("Firewall"),"LAGG",gettext("Edit")); +$pgtitle = array("Firewall","LAGG","Edit"); include("head.inc"); ?> @@ -119,10 +119,10 @@ include("head.inc");
InterfaceMembersDescription

- :
+ Note:
 - . + LAGG allows for link aggregation, bonding and fault tolerance. Only unassigned interfaces can be added to LAGG.

 
- + - + + Choose the members that will be used for the link aggregation. - + - + +
You may enter a description here + for your reference (not parsed). @@ -101,9 +101,9 @@ include("head.inc");
LAGG LAGG configuration
Parent interface
- .
Lag proto
Description -
.
  - "> " onclick="history.back()"> + diff --git a/usr/local/www/interfaces_ppps.php b/usr/local/www/interfaces_ppps.php index 28a02d4ae4..e6d48800a1 100644 --- a/usr/local/www/interfaces_ppps.php +++ b/usr/local/www/interfaces_ppps.php @@ -60,7 +60,7 @@ function ppp_inuse($num) { if ($_GET['act'] == "del") { /* check if still in use */ if (ppp_inuse($_GET['id'])) { - $input_errors[] = gettext("This point-to-point link cannot be deleted because it is still being used as an interface."); + $input_errors[] = "This point-to-point link cannot be deleted because it is still being used as an interface."; } else { unset($a_ppps[$_GET['id']]['pppoe-reset-type']); handle_pppoe_reset($a_ppps[$_GET['id']]); @@ -71,7 +71,7 @@ if ($_GET['act'] == "del") { } } -$pgtitle = gettext("Interfaces: PPPs"); +$pgtitle = "Interfaces: PPPs"; include("head.inc"); ?> @@ -83,16 +83,16 @@ include("head.inc");
- - - + + + $ppp): ?> @@ -125,7 +125,7 @@ include("head.inc");   +   diff --git a/usr/local/www/interfaces_ppps_edit.php b/usr/local/www/interfaces_ppps_edit.php index 89a657c3d6..f218f3c6c8 100644 --- a/usr/local/www/interfaces_ppps_edit.php +++ b/usr/local/www/interfaces_ppps_edit.php @@ -175,17 +175,17 @@ if ($_POST) { /* input validation */ switch($_POST['type']) { case "ppp": - $reqdfields = explode("interfaces phone"); - $reqdfieldsn = array(gettext("Link Interface(s)"),gettext("Phone Number")); + $reqdfields = explode(" ", "interfaces phone"); + $reqdfieldsn = explode(",", "Link Interface(s),Phone Number"); do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); break; case "pppoe": if ($_POST['ondemand']) { $reqdfields = explode(" ", "interfaces username password ondemand idletimeout"); - $reqdfieldsn = array(gettext("Link Interface(s)"),gettext("Username"),gettext("Password"),gettext("Dial on demand"),gettext("Idle timeout value")); + $reqdfieldsn = explode(",", "Link Interface(s),Username,Password,Dial on demand,Idle timeout value"); } else { $reqdfields = explode(" ", "interfaces username password"); - $reqdfieldsn = array(gettext("Link Interface(s)"),gettext("Username"),gettext("Password")); + $reqdfieldsn = explode(",", "Link Interface(s),Username,Password"); } do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); break; @@ -193,23 +193,23 @@ if ($_POST) { case "pptp": if ($_POST['ondemand']) { $reqdfields = explode(" ", "interfaces username password localip subnet gateway ondemand idletimeout"); - $reqdfieldsn = array(gettext("Link Interface(s)"),gettext("Username"),gettext("Password"),gettext("Local IP address"),gettext("Subnet"),gettext("Remote IP address"),gettext("Dial on demand"),gettext("Idle timeout value")); + $reqdfieldsn = explode(",", "Link Interface(s),Username,Password,Local IP address,Subnet,Remote IP address,Dial on demand,Idle timeout value"); } else { $reqdfields = explode(" ", "interfaces username password localip subnet gateway"); - $reqdfieldsn = array(gettext("Link Interface(s)"),gettext("Username"),gettext("Password"),gettext("Local IP address"),gettext("Subnet"),gettext("Remote IP address")); + $reqdfieldsn = explode(",", "Link Interface(s),Username,Password,Local IP address,Subnet,Remote IP address"); } do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); break; default: - $input_errors[] = gettext("Please choose a Link Type."); + $input_errors[] = "Please choose a Link Type."; break; } if ($_POST['type'] == "ppp" && count($_POST['interfaces']) > 1) - $input_errors[] = gettext("Multilink connections (MLPPP) using the PPP link type is not currently supported. Please select only one Link Interface."); + $input_errors[] = "Multilink connections (MLPPP) using the PPP link type is not currently supported. Please select only one Link Interface."; if (($_POST['provider'] && !is_domain($_POST['provider']))) - $input_errors[] = gettext("The service name contains invalid characters."); + $input_errors[] = "The service name contains invalid characters."; if (($_POST['idletimeout'] != "") && !is_numericint($_POST['idletimeout'])) - $input_errors[] = gettext("The idle timeout value must be an integer."); + $input_errors[] = "The idle timeout value must be an integer."; if ($_POST['pppoe-reset-type'] == "custom" && $_POST['pppoe_resethour'] <> "" && !is_numericint($_POST['pppoe_resethour']) && $_POST['pppoe_resethour'] >= 0 && $_POST['pppoe_resethour'] <=23) $input_errors[] = gettext("A valid PPPoE reset hour must be specified (0-23)."); @@ -230,15 +230,15 @@ if ($_POST) { foreach($_POST['interfaces'] as $iface){ if ($_POST['localip'][$iface] && !is_ipaddr($_POST['localip'][$iface])) - $input_errors[] = sprintf(gettext("A valid local IP address must be specified for %s."),$iface); + $input_errors[] = "A valid local IP address must be specified for {$iface}."; if ($_POST['gateway'][$iface] && !is_ipaddr($_POST['gateway'][$iface]) && !is_hostname($_POST['gateway'][$iface])) - $input_errors[] = sprintf(gettext("A valid gateway IP address OR hostname must be specified for %s."),$iface); + $input_errors[] = "A valid gateway IP address OR hostname must be specified for {$iface}."; if ($_POST['bandwidth'][$iface] && !is_numericint($_POST['bandwidth'][$iface])) - $input_errors[] = sprintf(gettext("The bandwidth value for %s must be an integer."),$iface); + $input_errors[] = "The bandwidth value for {$iface} must be an integer."; if ($_POST['mtu'][$iface] && ($_POST['mtu'][$iface] < 576)) - $input_errors[] = sprintf(gettext("The MTU for %s must be greater than 576 bytes."),$iface); + $input_errors[] = "The MTU for {$iface} must be greater than 576 bytes."; if ($_POST['mru'][$iface] && ($_POST['mru'][$iface] < 576)) - $input_errors[] = sprintf(gettext("The MRU for %s must be greater than 576 bytes."),$iface); + $input_errors[] = "The MRU for {$iface} must be greater than 576 bytes."; } /* @@ -370,10 +370,10 @@ if ($_POST) { } // end if($_POST) $closehead = false; -$pgtitle = array(gettext("Interfaces"),gettext("PPPs"),gettext("Edit")); +$pgtitle = array("Interfaces","PPPs","Edit"); include("head.inc"); -$types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE", "pptp" => "PPTP", "l2tp" => "L2TP"/*, "tcp" => "TCP", "udp" => "UDP"*/ ); +$types = array("select" => "Select", "ppp" => "PPP", "pppoe" => "PPPoE", "pptp" => "PPTP", "l2tp" => "L2TP"/*, "tcp" => "TCP", "udp" => "UDP"*/ ); ?> @@ -613,7 +613,7 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE"
 
- + Note:

@@ -682,32 +682,32 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE" - + - + @@ -111,10 +111,10 @@ include("head.inc");
InterfaceInterface(s)/Port(s)Description
-  )">
-
-
+
When the idle timeout occurs, if the dial-on-demand option is enabled, mpd goes back into dial-on-demand mode. Otherwise, the interface is brought down and all associated routes removed."); ?>
- - - - + + + + @@ -137,7 +137,7 @@ include("head.inc");   +   @@ -146,9 +146,9 @@ include("head.inc"); diff --git a/usr/local/www/interfaces_qinq_edit.php b/usr/local/www/interfaces_qinq_edit.php index a820e14558..1ea76e4071 100755 --- a/usr/local/www/interfaces_qinq_edit.php +++ b/usr/local/www/interfaces_qinq_edit.php @@ -36,7 +36,7 @@ ##|*MATCH=interfaces_qinq_edit.php* ##|-PRIV -$pgtitle = array(gettext("Interfaces"),gettext("QinQ"), gettext("Edit")); +$pgtitle = array("Interfaces","QinQ", "Edit"); require("guiconfig.inc"); @@ -81,19 +81,19 @@ if ($_POST) { $pconfig = $_POST; if (empty($_POST['tag'])) - $input_errors[] = gettext("First level tag cannot be empty."); + $input_errors[] = "First level tag cannot be empty."; if (isset($id) && $a_qinqs[$id]['tag'] != $_POST['tag']) - $input_errors[] = gettext("You are editing an existing entry and modifying the first level tag is not allowed."); + $input_errors[] = "You are editing an existing entry and modifying the first level tag is not allowed."; if (isset($id) && $a_qinqs[$id]['if'] != $_POST['if']) - $input_errors[] = gettext("You are editing an existing entry and modifying the interface is not allowed."); + $input_errors[] = "You are editing an existing entry and modifying the interface is not allowed."; if (!isset($id)) { foreach ($a_qinqs as $qinqentry) if ($qinqentry['tag'] == $_POST['tag'] && $qinqentry['if'] == $_POST['if']) - $input_errors[] = gettext("QinQ level already exists for this interface, edit it!"); + $input_errors[] = "QinQ level already exists for this interface, edit it!"; if (is_array($config['vlans']['vlan'])) { foreach ($config['vlans']['vlan'] as $vlan) if ($vlan['tag'] == $_POST['tag'] && $vlan['if'] == $_POST['if']) - $input_errors[] = gettext("A normal VLAN exists with this tag please remove it to use this tag for QinQ first level."); + $input_errors[] = "A normal VLAN exists with this tag please remove it to use this tag for QinQ first level."; } } @@ -120,7 +120,7 @@ if ($_POST) { if (count($member) > 1) { if (preg_match("/([^0-9])+/", $member[0], $match) || preg_match("/([^0-9])+/", $member[1], $match)) - $input_errors[] = gettext("Tags can contain only numbers or a range in format #-#."); + $input_errors[] = "Tags can contain only numbers or a range in format #-#."; for ($i = $member[0]; $i <= $member[1]; $i++) { if ($isfirst > 0) @@ -130,7 +130,7 @@ if ($_POST) { } } else { if (preg_match("/([^0-9])+/", $_POST["members{$x}"], $match)) - $input_errors[] = gettext("Tags can contain only numbers or a range in format #-#."); + $input_errors[] = "Tags can contain only numbers or a range in format #-#."; if ($isfirst > 0) $members .= " "; @@ -190,7 +190,7 @@ if ($_POST) { $gentry = array(); $gentry['ifname'] = "QinQ"; $gentry['members'] = "{$additions}"; - $gentry['descr'] = gettext("QinQ VLANs group"); + $gentry['descr'] = "QinQ VLANs group"; $config['ifgroups']['ifgroupentry'][] = $gentry; } } @@ -266,11 +266,11 @@ function removeRow(el) { } } - rowname[0] = ; + rowname[0] = "members"; rowtype[0] = "textbox"; rowsize[0] = "30"; - rowname[2] = ; + rowname[2] = "detail"; rowtype[2] = "textbox"; rowsize[2] = "50"; @@ -282,10 +282,10 @@ function removeRow(el) {
InterfaceTagQinQ membersDescription
-  )">

-
+ Note:
 -

+ Not all drivers/NICs support 802.1Q QinQ tagging properly. On cards that do not explicitly support it, QinQ tagging will still work, but the reduced MTU may cause problems. See the handbook for information on supported cards.

 
- + - + + Only QinQ capable interfaces will be shown. - + - + - + - + @@ -105,9 +105,9 @@ include("head.inc");
Interface QinQ Edit
Parent interface
-
First level tag
- + This is the first level VLAN tag. On top of this are stacked the member VLANs defined below.
Options
@@ -330,30 +330,30 @@ function removeRow(el) {
> - + Adds interface to QinQ interface groups so you can write filter rules easily.
Description
- + You may enter a description here for your reference (not parsed).
Member (s)
 - + You can specify ranges in the input below. The format is pretty simple i.e 9-100 or 10.20...
- + " class="formselect" id="members" value="">
Tag
- " /> +
- " /> +
  - " /> - " /> + + diff --git a/usr/local/www/interfaces_vlan.php b/usr/local/www/interfaces_vlan.php index c75190fdc5..cd8975c038 100755 --- a/usr/local/www/interfaces_vlan.php +++ b/usr/local/www/interfaces_vlan.php @@ -62,7 +62,7 @@ function vlan_inuse($num) { if ($_GET['act'] == "del") { /* check if still in use */ if (vlan_inuse($_GET['id'])) { - $input_errors[] = gettext("This VLAN cannot be deleted because it is still being used as an interface."); + $input_errors[] = "This VLAN cannot be deleted because it is still being used as an interface."; } else { mwexec("/sbin/ifconfig " . $a_vlans[$_GET['id']]['vlanif'] . " destroy"); unset($a_vlans[$_GET['id']]); @@ -75,7 +75,7 @@ if ($_GET['act'] == "del") { } -$pgtitle = array(gettext("Interfaces"),gettext("VLAN")); +$pgtitle = array("Interfaces","VLAN"); include("head.inc"); ?> @@ -87,16 +87,16 @@ include("head.inc");
- - - + + + @@ -122,18 +122,18 @@ include("head.inc");   +   - + diff --git a/usr/local/www/interfaces_vlan_edit.php b/usr/local/www/interfaces_vlan_edit.php index 8c37b75615..db676f7706 100755 --- a/usr/local/www/interfaces_vlan_edit.php +++ b/usr/local/www/interfaces_vlan_edit.php @@ -72,12 +72,12 @@ if ($_POST) { /* input validation */ $reqdfields = explode(" ", "if tag"); - $reqdfieldsn = array(gettext("Parent interface"),gettext("VLAN tag")); + $reqdfieldsn = explode(",", "Parent interface,VLAN tag"); do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); if ($_POST['tag'] && (!is_numericint($_POST['tag']) || ($_POST['tag'] < '1') || ($_POST['tag'] > '4094'))) { - $input_errors[] = gettext("The VLAN tag must be an integer between 1 and 4094."); + $input_errors[] = "The VLAN tag must be an integer between 1 and 4094."; } foreach ($a_vlans as $vlan) { @@ -85,14 +85,14 @@ if ($_POST) { continue; if (($vlan['if'] == $_POST['if']) && ($vlan['tag'] == $_POST['tag'])) { - $input_errors[] = sprintf(gettext("A VLAN with the tag %s is already defined on this interface."),$vlan['tag']); + $input_errors[] = "A VLAN with the tag {$vlan['tag']} is already defined on this interface."; break; } } if (is_array($config['qinqs']['qinqentry'])) { foreach ($config['qinqs']['qinqentry'] as $qinq) if ($qinq['tag'] == $_POST['tag'] && $qinq['if'] == $_POST['if']) - $input_errors[] = gettext("A QinQ VLAN exists with this tag please remove it to use this tag with."); + $input_errors[] = "A QinQ VLAN exists with this tag please remove it to use this tag with."; } if (!$input_errors) { @@ -104,7 +104,7 @@ if ($_POST) { $vlan['vlanif'] = interface_vlan_configure($vlan); if ($vlan['vlanif'] == "" || !stristr($vlan['vlanif'], "vlan")) - $input_errors[] = gettext("Error occured creating interface, please retry."); + $input_errors[] = "Error occured creating interface, please retry."; else { if (isset($id) && $a_vlans[$id]) $a_vlans[$id] = $vlan; @@ -123,7 +123,7 @@ if ($_POST) { } } -$pgtitle = array(gettext("Firewall"),gettext("VLAN"),gettext("Edit")); +$pgtitle = array("Firewall","VLAN","Edit"); include("head.inc"); ?> @@ -134,10 +134,10 @@ include("head.inc");
InterfaceVLAN tagDescription
-  )">
 

-
+ Note:
 -

+ Not all drivers/NICs support 802.1Q VLAN tagging properly. On cards that do not explicitly support it, VLAN tagging will still work, but the reduced MTU may cause problems. See the handbook for information on supported cards.

 
- + - + + Only VLAN capable interfaces will be shown. - + + 802.1Q VLAN tag (between 1 and 4094) - + +
You may enter a description here + for your reference (not parsed). @@ -103,9 +103,9 @@ include("head.inc");
VLAN configuration
Parent interface
-
VLAN tag
-
Description -
  - "> " onclick="history.back()"> + diff --git a/usr/local/www/interfaces_wireless.php b/usr/local/www/interfaces_wireless.php index e22a802b4d..42fd14954d 100644 --- a/usr/local/www/interfaces_wireless.php +++ b/usr/local/www/interfaces_wireless.php @@ -60,7 +60,7 @@ function clone_inuse($num) { if ($_GET['act'] == "del") { /* check if still in use */ if (clone_inuse($_GET['id'])) { - $input_errors[] = gettext("This wireless clone cannot be deleted because it is assigned as an interface."); + $input_errors[] = "This wireless clone cannot be deleted because it is assigned as an interface."; } else { mwexec("/sbin/ifconfig " . $a_clones[$_GET['id']]['cloneif'] . " destroy"); unset($a_clones[$_GET['id']]); @@ -73,7 +73,7 @@ if ($_GET['act'] == "del") { } -$pgtitle = array(gettext("Interfaces"),("Wireless")); +$pgtitle = array("Interfaces","Wireless"); include("head.inc"); ?> @@ -85,16 +85,16 @@ include("head.inc");
- - - + + +   +   @@ -130,9 +130,9 @@ include("head.inc"); diff --git a/usr/local/www/interfaces_wireless_edit.php b/usr/local/www/interfaces_wireless_edit.php index 1cb39061be..1e9419e520 100644 --- a/usr/local/www/interfaces_wireless_edit.php +++ b/usr/local/www/interfaces_wireless_edit.php @@ -81,7 +81,7 @@ if ($_POST) { /* input validation */ $reqdfields = explode(" ", "if mode"); - $reqdfieldsn = array(gettext("Parent interface"),gettext("Mode")); + $reqdfieldsn = explode(",", "Parent interface,Mode"); do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); @@ -113,14 +113,14 @@ if ($_POST) { if (isset($id) && $a_clones[$id]) { if (clone_inuse($id)) { if ($clone['if'] != $a_clones[$id]['if']) - $input_errors[] = gettext("This wireless clone cannot be modified because it is still assigned as an interface."); + $input_errors[] = "This wireless clone cannot be modified because it is still assigned as an interface."; else if ($clone['mode'] != $a_clones[$id]['mode']) - $input_errors[] = gettext("Use the configuration page for the assigned interface to change the mode."); + $input_errors[] = "Use the configuration page for the assigned interface to change the mode."; } } if (!$input_errors) { if (!interface_wireless_clone($clone['cloneif'], $clone)) { - $input_errors[] = sprintf(gettext("Error creating interface with mode %s. The %s interface may not support creating more clones with the selected mode."), $wlan_modes[$clone['mode']], $clone['if']); + $input_errors[] = "Error creating interface with mode {$wlan_modes[$clone['mode']]}. The {$clone['if']} interface may not support creating more clones with the selected mode."; } else { if (isset($id) && $a_clones[$id]) { if ($clone['if'] != $a_clones[$id]['if']) @@ -128,7 +128,7 @@ if ($_POST) { $input_errors[] = "Created with id {$id}"; $a_clones[$id] = $clone; } else { - $input_errors[] = gettext("Created without id"); + $input_errors[] = "Created without id"; $a_clones[] = $clone; } @@ -142,7 +142,7 @@ if ($_POST) { } } -$pgtitle = array(gettext("Firewall"),gettext("Wireless"),gettext("Edit")); +$pgtitle = array("Firewall","Wireless","Edit"); include("head.inc"); ?> @@ -153,10 +153,10 @@ include("head.inc");
InterfaceModeDescription
-  )">

-
+ Note:
 - + Here you can configure clones of wireless interfaces, which can be assigned as separate independent interfaces. Only available on wireless chipsets that support this, with limitations on the number that can be created in each mode.

 
- + - + - + - + +
You may enter a description here + for your reference (not parsed).
Wireless clone configuration
Parent interface
Mode
Description -
  - "> " onclick="history.back()"> +