summaryrefslogtreecommitdiffstats
path: root/usr/local
diff options
context:
space:
mode:
Diffstat (limited to 'usr/local')
-rw-r--r--usr/local/www/diag_authentication.php8
-rw-r--r--usr/local/www/firewall_nat.php2
2 files changed, 9 insertions, 1 deletions
diff --git a/usr/local/www/diag_authentication.php b/usr/local/www/diag_authentication.php
index 24d567e..a4c9290 100644
--- a/usr/local/www/diag_authentication.php
+++ b/usr/local/www/diag_authentication.php
@@ -66,6 +66,14 @@ if ($_POST) {
$input_errors[] = gettext("Authentication failed.");
}
}
+} else {
+ // Choose a reasonable initial default.
+ if (isset($config['system']['webgui']['authmode'])) {
+ $pconfig['authmode'] = $config['system']['webgui']['authmode'];
+ }
+ else {
+ $pconfig['authmode'] = "Local Database";
+ }
}
$pgtitle = array(gettext("Diagnostics"),gettext("Authentication"));
$shortcut_section = "authentication";
diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php
index adbb948..e2c79b9 100644
--- a/usr/local/www/firewall_nat.php
+++ b/usr/local/www/firewall_nat.php
@@ -265,7 +265,7 @@ echo "<script type=\"text/javascript\" src=\"/javascript/domTT/fadomatic.js\"></
<?php if($natent['associated-rule-id'] == "pass"): ?>
<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_pass.gif" title="<?=gettext("All traffic matching this NAT entry is passed"); ?>" border="0" alt="pass" />
<?php elseif (!empty($natent['associated-rule-id'])): ?>
- <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_chain.png" width="17" height="17" title="<?=gettext("Firewall rule ID"); ?> <?=htmlspecialchars($nnatid); ?> <?=gettext("is managed with this rule"); ?>" border="0" alt="change" />
+ <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_chain.png" width="17" height="17" title="<?=gettext("Firewall rule ID"); ?> <?=htmlspecialchars($natent['associated-rule-id']); ?> <?=gettext("is managed with this rule"); ?>" border="0" alt="change" />
<?php endif; ?>
</td>
<td class="listlr" onClick="fr_toggle(<?=$nnats;?>)" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
OpenPOWER on IntegriCloud