diff options
Diffstat (limited to 'usr/local')
| -rw-r--r-- | usr/local/www/diag_authentication.php | 8 | ||||
| -rw-r--r-- | usr/local/www/diag_ipsec.php | 4 | ||||
| -rw-r--r-- | usr/local/www/firewall_nat.php | 2 | ||||
| -rw-r--r-- | usr/local/www/firewall_rules.php | 2 |
4 files changed, 12 insertions, 4 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/diag_ipsec.php b/usr/local/www/diag_ipsec.php index bfa8e0b..e8ba6c5 100644 --- a/usr/local/www/diag_ipsec.php +++ b/usr/local/www/diag_ipsec.php @@ -320,7 +320,7 @@ $status = ipsec_list_sa(); </td> </tr> <?php - if (is_array($ikesa['child-sas'])) { + if (is_array($ikesa['child-sas']) && (count($ikesa['child-sas']) > 0)) { ?> <tr> <td class="listrborder" colspan="9"> @@ -422,7 +422,7 @@ $status = ipsec_list_sa(); </td> <td> <center> - <a href="diag_ipsec.php?act=childdisconnect&ikeid=<?php echo $con_id; ?>&ikesaid=<?php echo $childsa['reqid']; ?>"> + <a href="diag_ipsec.php?act=childdisconnect&ikeid=<?php echo $con_id; ?>&ikesaid=<?php echo $childsa['uniqueid']; ?>"> <img src ="/themes/<?php echo $g['theme']; ?>/images/icons/icon_x.gif" alt=<?php echo gettext("Disconnect Child SA");?> title=<?php echo gettext("Disconnect Child SA");?> border="0"/> </a> </center> 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;?>';"> diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php index c05b001..6368ed0 100644 --- a/usr/local/www/firewall_rules.php +++ b/usr/local/www/firewall_rules.php @@ -391,7 +391,7 @@ include("head.inc"); <td class="listr" style="background-color: #E0E0E0">*</td> <td class="listr" style="background-color: #E0E0E0">*</td> <td class="listr" style="background-color: #E0E0E0">*</td> - <td class="listr" style="background-color: #E0E0E0">*</td> + <td class="listr" style="background-color: #E0E0E0"> </td> <td class="listbg"><?=gettext("Block bogon networks");?></td> <td valign="middle" class="list nowrap"> <table border="0" cellspacing="0" cellpadding="1" summary="move rules before"> |
