diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2016-01-19 13:57:59 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2016-01-19 13:58:29 -0500 |
commit | a361a19b6f128a2f48bd0e3f28f2c6da5cff91f5 (patch) | |
tree | dacca1ab0e1e9c2e76c67365ffe01d2d676a7e11 | |
parent | 4538300459ef33a08753381dd0c3d3bb75d68bd0 (diff) | |
download | pfsense-a361a19b6f128a2f48bd0e3f28f2c6da5cff91f5.zip pfsense-a361a19b6f128a2f48bd0e3f28f2c6da5cff91f5.tar.gz |
Fixed issue with separator bar at very top of floating rule list
-rw-r--r-- | src/usr/local/www/firewall_rules.php | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php index 6af5008..7df60bc 100644 --- a/src/usr/local/www/firewall_rules.php +++ b/src/usr/local/www/firewall_rules.php @@ -235,12 +235,12 @@ if (isset($_POST['del_x'])) { $a_filter = $a_filter_new; - $config['filter']['separator'][$if] = ""; + $config['filter']['separator'][strtolower($if)] = ""; if ($_POST['separator']) { $idx = 0; foreach ($_POST['separator'] as $separator) { - $config['filter']['separator'][$separator['if']]['sep' . $idx++] = $separator; + $config['filter']['separator'][strtolower($separator['if'])]['sep' . $idx++] = $separator; } } @@ -371,6 +371,18 @@ display_top_tabs($tab_array); <?php $nrules = 0; $seps = 0; + +if (isset($config['filter']['separator'][strtolower($if)]['sep0'])) { + foreach ($config['filter']['separator'][strtolower($if)] as $rulesep) { + if ($rulesep['row']['0'] == "fr-1") { + print('<tr class="ui-sortable-handle separator">' . + '<td bgcolor="#cce5ff" colspan="11">' . '<font color="#002699">' . $rulesep['text'] . '</font></td>' . + '<td bgcolor="#cce5ff"><a href="#"><i class="fa fa-trash no-confirm sepdel" title="delete this separator"></i></a></td>' . + '</tr>' . "\n"); + } + } +} + for ($i = 0; isset($a_filter[$i]); $i++): $filterent = $a_filter[$i]; @@ -821,8 +833,8 @@ events.push(function() { $('#ruletable > tbody > tr').each(function() { if ($(this).hasClass('separator')) { seprow = $(this).prev('tr').attr("id"); - if (isNaN(seprow)) { - seprow = 0; + if (seprow == undefined) { + seprow = "fr-1"; } sepinput = '<input type="hidden" name="separator[' + sepnum + '][row]" value="' + seprow + '"></input>'; @@ -831,7 +843,7 @@ events.push(function() { $('form').append(sepinput); sepinput = '<input type="hidden" name="separator[' + sepnum + '][color]" value="' + 'blue' + '"></input>'; $('form').append(sepinput); - sepinput = '<input type="hidden" name="separator[' + sepnum + '][if]" value="<?=$if?>"></input>'; + sepinput = '<input type="hidden" name="separator[' + sepnum + '][if]" value="<?=strtolower($if)?>"></input>'; $('form').append(sepinput); sepnum++; } |