diff options
| author | Ermal Luçi <eri@pfsense.org> | 2010-01-26 23:59:43 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2010-01-26 23:59:43 +0000 |
| commit | 9b16b83439add7c4898c8911e5a36a1ed1d3bdc2 (patch) | |
| tree | 77a4f23c1936b15e962ee61ff2b6aabecd8aabd9 /usr/local/www/firewall_nat.php | |
| parent | 8f3f7729dca3cb734bc9d06a53953a07d6fca0c1 (diff) | |
| download | pfsense-9b16b83439add7c4898c8911e5a36a1ed1d3bdc2.zip pfsense-9b16b83439add7c4898c8911e5a36a1ed1d3bdc2.tar.gz | |
Ticket #136.
Fix associated nat rules.
Now both the filter rules and the nat ones contain a associated-rule-id tag which helps link the items together.
The API to use for this is in itemid.inc.
All the issues should be solved now.
Diffstat (limited to 'usr/local/www/firewall_nat.php')
| -rwxr-xr-x | usr/local/www/firewall_nat.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php index f7ddc8b..696248f 100755 --- a/usr/local/www/firewall_nat.php +++ b/usr/local/www/firewall_nat.php @@ -88,8 +88,8 @@ if (isset($_POST['del_x'])) { foreach ($_POST['rule'] as $rulei) { $target = $rule['target']; // Check for filter rule associations - if (isset($a_nat[$rulei]['associated-filter-rule-id'])){ - delete_id($a_nat[$rulei]['associated-filter-rule-id'], $config['filter']['rule']); + if (isset($a_nat[$rulei]['associated-rule-id'])){ + delete_id($a_nat[$rulei]['associated-rule-id'], $config['filter']['rule']); mark_subsystem_dirty('filter'); } @@ -230,10 +230,10 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript <tr valign="top" id="fr<?=$nnats;?>"> <td class="listt"><input type="checkbox" id="frc<?=$nnats;?>" name="rule[]" value="<?=$i;?>" onClick="fr_bgcolor('<?=$nnats;?>')" style="margin: 0; padding: 0; width: 15px; height: 15px;"></td> <td class="listt" align="center"> - <?php if(isset($natent['associated-filter-rule-id']) && $natent['associated-filter-rule-id']>0): ?> - <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_chain.png" width="17" height="17" title="Firewall rule ID <?=htmlspecialchars($natent['associated-filter-rule-id']); ?> is managed with this rule" border="0"> + <?php if(!empty($natent['associated-rule-id'])): ?> + <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_chain.png" width="17" height="17" title="Firewall rule ID <?=htmlspecialchars($nnatid); ?> is managed with this rule" border="0"> <?php endif; ?> - <?php if($natent['associated-filter-rule-id'] == "pass"): ?> + <?php if($natent['associated-rule-id'] == "pass"): ?> <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_pass.gif" title="All traffic matching this NAT entry is passed" border="0"> <?php endif; ?> </td> |
