mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1545 from k-paulius/fix-syntax

Browse Source
This commit is contained in:
Renato Botelho 2015-03-09 06:53:46 -03:00
commit aeaf63f103
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr/local/www/carp_status.php
View File

@ -212,7 +212,7 @@ include("head.inc");
$icon = "<img {$align} src=\"/themes/".$g['theme']."/images/icons/icon_pass_d.gif\" alt=\"backup\" />";
} else if($status == "INIT") {
$icon = "<img {$align} src=\"/themes/".$g['theme']."/images/icons/icon_log.gif\" alt=\"init\" />";
} else
} else {
$icon = "";
}
}

4
usr/local/www/services_unbound.php
View File

@ -281,7 +281,7 @@ function show_advanced_dns() {
<select id="active_interface" name="active_interface[]" multiple="multiple" size="<?php echo $size; ?>">
<option value="all" <?php if (empty($pconfig['active_interface']) || empty($pconfig['active_interface'][0]) || in_array("all", $pconfig['active_interface'], true)) echo 'selected="selected"'; ?>>All</option>
<?php
foreach ($interface_addresses as $laddr => ldescr):
foreach ($interface_addresses as $laddr => $ldescr):
$selected = "";
if (in_array($laddr, $pconfig['active_interface']))
$selected = 'selected="selected"';
@ -302,7 +302,7 @@ function show_advanced_dns() {
<select id="outgoing_interface" name="outgoing_interface[]" multiple="multiple" size="<?php echo $size; ?>">
<option value="" <?php if (empty($pconfig['outgoing_interface']) || empty($pconfig['outgoing_interface'][0])) echo 'selected="selected"'; ?>>All</option>
<?php
foreach ($interface_addresses as $laddr):
foreach ($interface_addresses as $laddr => $ldescr):
$selected = "";
if (in_array($laddr, $pconfig['outgoing_interface']))
$selected = 'selected="selected"';

4
usr/local/www/xmlrpc.php
View File

@ -213,9 +213,9 @@ function restore_config_section_xmlrpc($raw_params) {
foreach ($config['virtualip']['vip'] as $vipindex => $vip) {
if ($vip['mode'] == "carp")
$oldvips["{$vip['interface']}_vip{$vip['vhid']}"] = "{$vip['password']}{$vip['advskew']}{$vip['subnet']}{$vip['subnet_bits']}{$vip['advbase']}";
else if ($vip['mode'] == "ipalias" && (substr($vip['interface'], 0, 4) == '_vip') || strpos($vip['interface'], "lo0")))
else if ($vip['mode'] == "ipalias" && (substr($vip['interface'], 0, 4) == '_vip') || strpos($vip['interface'], "lo0"))
$oldvips[$vip['subnet']] = "{$vip['interface']}{$vip['subnet']}{$vip['subnet_bits']}";
else if (($vip['mode'] == "ipalias" || $vip['mode'] == 'proxyarp') && !(substr($vip['interface'], 0, 4) == '_vip') || strpos($vip['interface'], "lo0")))
else if (($vip['mode'] == "ipalias" || $vip['mode'] == 'proxyarp') && !(substr($vip['interface'], 0, 4) == '_vip') || strpos($vip['interface'], "lo0"))
$vipbackup[] = $vip;
}
}