summaryrefslogtreecommitdiffstats
path: root/src/usr/local
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2016-02-09 17:56:33 -0600
committerChris Buechler <cmb@pfsense.org>2016-02-09 17:56:33 -0600
commitd9901ff473dc86e70ae59b3070164ec6e99c7df9 (patch)
treec20939ea03c230d98022f8dd314c6813f1795b88 /src/usr/local
parent6c3d8b4554388adc49b93d06f3f57477263b3a31 (diff)
downloadpfsense-d9901ff473dc86e70ae59b3070164ec6e99c7df9.zip
pfsense-d9901ff473dc86e70ae59b3070164ec6e99c7df9.tar.gz
Fix style issues.
Diffstat (limited to 'src/usr/local')
-rw-r--r--src/usr/local/www/firewall_virtual_ip.php4
-rw-r--r--src/usr/local/www/firewall_virtual_ip_edit.php11
-rw-r--r--src/usr/local/www/interfaces_gre.php5
-rw-r--r--src/usr/local/www/status_carp.php12
-rw-r--r--src/usr/local/www/system_gateway_groups_edit.php6
-rw-r--r--src/usr/local/www/vpn_ipsec.php3
-rw-r--r--src/usr/local/www/vpn_ipsec_phase1.php3
7 files changed, 28 insertions, 16 deletions
diff --git a/src/usr/local/www/firewall_virtual_ip.php b/src/usr/local/www/firewall_virtual_ip.php
index 4e8226c..945f48a 100644
--- a/src/usr/local/www/firewall_virtual_ip.php
+++ b/src/usr/local/www/firewall_virtual_ip.php
@@ -307,9 +307,9 @@ $viplist = get_configured_vip_list();
foreach ($viplist as $vipname => $address) {
$interfaces[$vipname] = $address;
$interfaces[$vipname] .= " (";
- if (get_vip_descr($address))
+ if (get_vip_descr($address)) {
$interfaces[$vipname] .= get_vip_descr($address);
- else {
+ } else {
$vip = get_configured_vip($vipname);
$interfaces[$vipname] .= "vhid: {$vip['vhid']}";
}
diff --git a/src/usr/local/www/firewall_virtual_ip_edit.php b/src/usr/local/www/firewall_virtual_ip_edit.php
index d3beb92..b9a49c3 100644
--- a/src/usr/local/www/firewall_virtual_ip_edit.php
+++ b/src/usr/local/www/firewall_virtual_ip_edit.php
@@ -260,8 +260,9 @@ if ($_POST) {
}
/* IPalias specific fields */
- if ($_POST['mode'] === "ipalias")
+ if ($_POST['mode'] === "ipalias") {
$vipent['uniqid'] = $_POST['uniqid'];
+ }
/* Common fields */
$vipent['descr'] = $_POST['descr'];
@@ -327,15 +328,17 @@ function build_if_list() {
foreach ($carplist as $vipname => $address) {
$vip = get_configured_vip($vipname);
- if ($vip['mode'] != 'carp')
+ if ($vip['mode'] != 'carp') {
continue;
+ }
$interfaces[$vipname] = $address;
$interfaces[$vipname] .= " (";
- if (get_vip_descr($address))
+ if (get_vip_descr($address)) {
$interfaces[$vipname] .= get_vip_descr($address);
- else
+ } else {
$interfaces[$vipname] .= "vhid: {$vip['vhid']}";
+ }
$interfaces[$vipname] .= ")";
}
diff --git a/src/usr/local/www/interfaces_gre.php b/src/usr/local/www/interfaces_gre.php
index 0acbf1e..a677a23 100644
--- a/src/usr/local/www/interfaces_gre.php
+++ b/src/usr/local/www/interfaces_gre.php
@@ -136,10 +136,11 @@ display_top_tabs($tab_array);
</thead>
<tbody>
<?php foreach ($a_gres as $i => $gre):
- if (substr($gre['if'], 0, 4) == "_vip")
+ if (substr($gre['if'], 0, 4) == "_vip") {
$if = convert_real_interface_to_friendly_descr(get_real_interface($gre['if']));
- else
+ } else {
$if = $gre['if'];
+ }
?>
<tr>
<td>
diff --git a/src/usr/local/www/status_carp.php b/src/usr/local/www/status_carp.php
index 748c36b..15bf5f4 100644
--- a/src/usr/local/www/status_carp.php
+++ b/src/usr/local/www/status_carp.php
@@ -72,10 +72,12 @@ function find_ipalias($carpif) {
$ips = array();
foreach ($config['virtualip']['vip'] as $vip) {
- if ($vip['mode'] != "ipalias")
+ if ($vip['mode'] != "ipalias") {
continue;
- if ($vip['interface'] != $carpif)
+ }
+ if ($vip['interface'] != $carpif) {
continue;
+ }
$ips[] = "{$vip['subnet']}/{$vip['subnet_bits']}";
}
@@ -130,8 +132,9 @@ if ($_POST['disablecarp'] != "") {
interface_carp_configure($vip);
break;
case 'ipalias':
- if (substr($vip['interface'], 0, 4) == "_vip")
+ if (substr($vip['interface'], 0, 4) == "_vip") {
interface_ipalias_configure($vip);
+ }
break;
}
}
@@ -252,8 +255,9 @@ if ($carpcount == 0) {
<td>
<?php
printf("{$carp['subnet']}/{$carp['subnet_bits']}");
- for ($i = 0; $i < count($aliases); $i++)
+ for ($i = 0; $i < count($aliases); $i++) {
printf("<br>{$aliases[$i]}");
+ }
?>
</td>
<td><i class="fa fa-<?=$icon?>"></i>&nbsp;<?=$status?></td>
diff --git a/src/usr/local/www/system_gateway_groups_edit.php b/src/usr/local/www/system_gateway_groups_edit.php
index c083794..3d4054b 100644
--- a/src/usr/local/www/system_gateway_groups_edit.php
+++ b/src/usr/local/www/system_gateway_groups_edit.php
@@ -196,8 +196,9 @@ function build_vip_list($family = 'all') {
$viplist = get_configured_vip_list($family);
foreach ($viplist as $vip => $address) {
$list[$vip] = "$address";
- if (get_vip_descr($address))
+ if (get_vip_descr($address)) {
$list[$vip] .= " (". get_vip_descr($address) .")";
+ }
}
return($list);
@@ -251,8 +252,9 @@ foreach ($a_gateways as $gwname => $gateway) {
$itemsplit = explode("|", $item);
if ($itemsplit[0] == $gwname) {
$selected = $itemsplit[1];
- if (count($itemsplit) >= 3)
+ if (count($itemsplit) >= 3) {
$vaddress = $itemsplit[2];
+ }
break;
}
}
diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php
index 81f1dfe..196994c 100644
--- a/src/usr/local/www/vpn_ipsec.php
+++ b/src/usr/local/www/vpn_ipsec.php
@@ -326,8 +326,9 @@ display_top_tabs($tab_array);
$viplist = get_configured_vip_list();
foreach ($viplist as $vip => $address) {
$iflabels[$vip] = $address;
- if (get_vip_descr($address))
+ if (get_vip_descr($address)) {
$iflabels[$vip] .= " (". get_vip_descr($address) .")";
+ }
}
$grouplist = return_gateway_groups_array();
diff --git a/src/usr/local/www/vpn_ipsec_phase1.php b/src/usr/local/www/vpn_ipsec_phase1.php
index aba06f3..05f0af9 100644
--- a/src/usr/local/www/vpn_ipsec_phase1.php
+++ b/src/usr/local/www/vpn_ipsec_phase1.php
@@ -527,8 +527,9 @@ function build_interface_list() {
$viplist = get_configured_vip_list();
foreach ($viplist as $vip => $address) {
$interfaces[$vip] = $address;
- if (get_vip_descr($address))
+ if (get_vip_descr($address)) {
$interfaces[$vip] .= " (". get_vip_descr($address) .")";
+ }
}
$grouplist = return_gateway_groups_array();
OpenPOWER on IntegriCloud