lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 08:34:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

gateways: allow far gateway outside of interface subnet; closes #880

Browse Source
This commit is contained in:
Franco Fichtner 2016-05-08 19:43:12 +02:00
parent d3ea781245
commit ed5c0ddeff
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/www/system_gateways_edit.php
View File

@ -93,7 +93,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
}
if (!$found) {
if (!$found && !isset($pconfig['fargw'])) {
$input_errors[] = sprintf(gettext("The gateway address %1\$s does not lie within one of the chosen interface's subnets."), $pconfig['gateway']);
}
}
@ -124,7 +124,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
}
if (!$found) {
if (!$found && !isset($pconfig['fargw'])) {
$input_errors[] = sprintf(gettext("The gateway address %1\$s does not lie within one of the chosen interface's subnets."), $pconfig['gateway']);
}
}
@ -402,12 +402,19 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$gateway[$fieldname] = $pconfig[$fieldname];
}
}
if (isset($_POST['disabled'])) {
$gateway['disabled'] = true;
} else {
} elseif (isset($gateway['disabled'])) {
unset($gateway['disabled']);
}
if (isset($_POST['fargw'])) {
$gateway['fargw'] = true;
} elseif (isset($gateway['fargw'])) {
unset($gateway['fargw']);
}
/* when saving the manual gateway we use the attribute which has the corresponding id */
if (isset($realid)) {
$a_gateway_item[$realid] = $gateway;
@ -459,7 +466,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$copy_fields = array(
'name', 'weight', 'interval', 'avg_delay_samples', 'avg_loss_samples', 'avg_loss_delay_samples',
'interface', 'friendlyiface', 'ipprotocol', 'gateway', 'latencylow', 'latencyhigh', 'losslow', 'losshigh',
'down', 'monitor', 'descr', 'avg_delay_samples_calculated', 'avg_loss_samples_calculated',
'down', 'monitor', 'descr', 'avg_delay_samples_calculated', 'avg_loss_samples_calculated', 'fargw',
'avg_loss_delay_samples_calculated', 'monitor_disable', 'dynamic', 'defaultgw', 'force_down', 'disabled'
);
foreach ($copy_fields as $fieldname) {
@ -633,6 +640,15 @@ $( document ).ready(function() {
</div>
</td>
</tr>
<tr>
<td><a id="help_for_fargw" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Far Gateway"); ?></td>
<td>
<input name="fargw" type="checkbox" value="yes" <?=!empty($pconfig['fargw']) ? 'checked="checked"' : '';?> />
<div class="hidden" for="help_for_fargw">
<?=gettext("This will allow the gateway to exist outside of the interface subnet."); ?>
</div>
</td>
</tr>
<tr>
<td><a id="help_for_monitor_disable" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Disable Gateway Monitoring"); ?></td>
<td>