diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2016-01-23 21:43:19 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2016-01-23 21:43:19 -0500 |
commit | 098c4eb3f0975f9d27df461a6ce7ccf0c8b3a896 (patch) | |
tree | a275ecb41eb0f9511ad9a0674826c35c54f38e63 /src | |
parent | b3b15568ce847a94e30718b5aafe5faf5b4b956d (diff) | |
parent | a42399ac65f3365bf3a415ea4a63ad215fb519d8 (diff) | |
download | pfsense-098c4eb3f0975f9d27df461a6ce7ccf0c8b3a896.zip pfsense-098c4eb3f0975f9d27df461a6ce7ccf0c8b3a896.tar.gz |
Merge pull request #2518 from ExolonDX/branch_01
Diffstat (limited to 'src')
-rw-r--r-- | src/usr/local/www/firewall_rules.php | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php index 6ce03a1..e2f9848 100644 --- a/src/usr/local/www/firewall_rules.php +++ b/src/usr/local/www/firewall_rules.php @@ -391,7 +391,7 @@ for ($i = 0; isset($a_filter[$i]); $i++): ?> <tr id="fr<?=$nrules;?>" <?=$display?> onClick="fr_toggle(<?=$nrules;?>)" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';" <?=(isset($filterent['disabled']) ? ' class="disabled"' : '')?>> - <td > + <td> <input type="checkbox" id="frc<?=$nrules;?>" onClick="fr_toggle(<?=$nrules;?>)" name="rule[]" value="<?=$i;?>"/> </td> @@ -540,7 +540,7 @@ for ($i = 0; isset($a_filter[$i]); $i++): $sched_caption_escaped = str_replace("'", "\'", $schedule['descr']); $schedule_span_begin = '<a href="/firewall_schedule_edit.php?id=' . $idx . '" data-toggle="popover" data-trigger="hover focus" title="' . $schedule['name'] . '" data-content="' . $sched_caption_escaped . '" data-html="true">'; - $schedule_span_end = ""; + $schedule_span_end = "</a>"; } } $idx++; @@ -607,26 +607,38 @@ for ($i = 0; isset($a_filter[$i]); $i++): <td> <?php if (isset($alias['src'])): ?> <a href="/firewall_aliases_edit.php?id=<?=$alias['src']?>" data-toggle="popover" data-trigger="hover focus" title="<?=gettext('Alias details')?>" data-content="<?=alias_info_popup($alias['src'])?>" data-html="true"> + <?=htmlspecialchars(pprint_address($filterent['source']))?> + </a> + <?php else: ?> + <?=htmlspecialchars(pprint_address($filterent['source']))?> <?php endif; ?> - <?=htmlspecialchars(pprint_address($filterent['source']))?> </td> <td> <?php if (isset($alias['srcport'])): ?> <a href="/firewall_aliases_edit.php?id=<?=$alias['srcport']?>" data-toggle="popover" data-trigger="hover focus" title="<?=gettext('Alias details')?>" data-content="<?=alias_info_popup($alias['srcport'])?>" data-html="true"> + <?=htmlspecialchars(pprint_port($filterent['source']['port']))?> + </a> + <?php else: ?> + <?=htmlspecialchars(pprint_port($filterent['source']['port']))?> <?php endif; ?> - <?=htmlspecialchars(pprint_port($filterent['source']['port']))?> </td> <td> <?php if (isset($alias['dst'])): ?> <a href="/firewall_aliases_edit.php?id=<?=$alias['dst']?>" data-toggle="popover" data-trigger="hover focus" title="<?=gettext('Alias details')?>" data-content="<?=alias_info_popup($alias['dst'])?>" data-html="true"> + <?=htmlspecialchars(pprint_address($filterent['destination']))?> + </a> + <?php else ?> + <?=htmlspecialchars(pprint_address($filterent['destination']))?> <?php endif; ?> - <?=htmlspecialchars(pprint_address($filterent['destination']))?> </td> <td> <?php if (isset($alias['dstport'])): ?> <a href="/firewall_aliases_edit.php?id=<?=$alias['dstport']?>" data-toggle="popover" data-trigger="hover focus" title="<?=gettext('Alias details')?>" data-content="<?=alias_info_popup($alias['dstport'])?>" data-html="true"> + <?=htmlspecialchars(pprint_port($filterent['destination']['port']))?> + </a> + <?php else: ?> + <?=htmlspecialchars(pprint_port($filterent['destination']['port']))?> <?php endif; ?> - <?=htmlspecialchars(pprint_port($filterent['destination']['port']))?> </td> <td> <?php if (isset($config['interfaces'][$filterent['gateway']]['descr'])):?> @@ -652,7 +664,7 @@ for ($i = 0; isset($a_filter[$i]); $i++): </td> <td> <?php if ($printicon) { ?> - <i class="fa fa-<?=$image?> <?=$dispcolor?>" title="<?=$alttext;?>" alt="icon"></i> + <i class="fa fa-<?=$image?> <?=$dispcolor?>" title="<?=$alttext;?>"></i> <?php } ?> <?=$schedule_span_begin;?><?=htmlspecialchars($filterent['sched']);?> <?=$schedule_span_end;?> </td> @@ -807,7 +819,7 @@ events.push(function() { gColor = 'bg-info'; // Inset a temporary bar in which the user can enter some optional text $('#ruletable > tbody:last').append('<tr>' + - '<td class="' + gColor + '" colspan="10"><input id="newsep" placeholder="<?=gettext("Enter a description, Save, then drag to final location.")?>" class="col-md-12" type="text"></input></td>' + + '<td class="' + gColor + '" colspan="10"><input id="newsep" placeholder="<?=gettext("Enter a description, Save, then drag to final location.")?>" class="col-md-12" type="text" /></td>' + '<td class="' + gColor + '" colspan="2"><button class="btn btn-default btn-sm" id="btnnewsep"><?=gettext("Save")?></button>' + '<button class="btn btn-default btn-sm" id="btncncsep"><?=gettext("Cancel")?></button>' + ' ' + @@ -845,7 +857,7 @@ events.push(function() { $('#ruletable > tbody:last').append('<tr class="ui-sortable-handle separator">' + '<td class="' + gColor + '" colspan="11">' + '<font class="' + gColor + '">' + septext + '</font></td>' + '<td class="' + gColor + '"><a href="#"><i class="fa fa-trash sepdel"></i></a>' + - '</tr>'); + '</td></tr>'); $('#order-store').removeAttr('disabled'); newSeperator = false; |