diff options
author | Ermal Luçi <eri@pfsense.org> | 2014-01-16 05:30:00 -0800 |
---|---|---|
committer | Ermal Luçi <eri@pfsense.org> | 2014-01-16 05:30:00 -0800 |
commit | 254df3174a9690ee2ac50e4fb1128844e424507d (patch) | |
tree | b2fbda89105f7f2b7056563541036ea724227e4c | |
parent | fdfa8f43eded441107fd8b1fbc0b03de22bf558c (diff) | |
parent | 72b774aae412ee6175e43db0a482bcf7d5fee323 (diff) | |
download | pfsense-254df3174a9690ee2ac50e4fb1128844e424507d.zip pfsense-254df3174a9690ee2ac50e4fb1128844e424507d.tar.gz |
Merge pull request #887 from brunostein/tracker_firewall_rule
added input hidden with tracker value
-rwxr-xr-x | usr/local/www/firewall_rules_edit.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php index 05cbe94..2daf3a1 100755 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -183,6 +183,8 @@ if (isset($id) && $a_filter[$id]) { if (!isset($_GET['dup'])) $pconfig['associated-rule-id'] = $a_filter[$id]['associated-rule-id']; + $pconfig['tracker'] = $a_filter[$id]['tracker']; + } else { /* defaults */ if ($_GET['if']) @@ -531,10 +533,9 @@ if ($_POST) { if (!$input_errors) { $filterent = array(); $filterent['id'] = $_POST['ruleid']>0?$_POST['ruleid']:''; - if (empty($_POST['tracker'])) - $filterent['tracker'] = (int)microtime(true); - else - $filterent['tracker'] = $_POST['tracker']; + + $filterent['tracker'] = empty($_POST['tracker']) ? (int)microtime(true) : $_POST['tracker']; + $filterent['type'] = $_POST['type']; if (isset($_POST['interface'] )) $filterent['interface'] = $_POST['interface']; @@ -1669,6 +1670,7 @@ $has_updated_time = (isset($a_filter[$id]['updated']) && is_array($a_filter[$id] <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" /> <input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()" /> <?php if (isset($id) && $a_filter[$id]): ?> <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" /> + <input name="tracker" type="hidden" value="<?=htmlspecialchars($pconfig['tracker']);?>"> <?php endif; ?> <input name="after" type="hidden" value="<?=htmlspecialchars($after);?>" /> </td> |