Project

General

Profile

« Previous | Next » 

Revision 4b72f68f

Added by Steve Beaver over 8 years ago

Replace '_' with '_<wbr> when displaying alias names. Allows long alias names with underscores to word-break better.

View differences:

src/usr/local/www/firewall_nat.php
335 335 
<?php
336 336 
	endif;
337 337 
?>
338 
							<?=str_replace('_', ' ', htmlspecialchars(pprint_address($natent['source'])))?>
338 
							<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_address($natent['source'])))?>
339 339 
<?php
340 340 
	if (isset($alias['src'])):
341 341 
?>
......
352 352 
<?php
353 353 
	endif;
354 354 
?>
355 
							<?=str_replace('_', ' ', htmlspecialchars(pprint_port($natent['source']['port'])))?>
355 
							<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_port($natent['source']['port'])))?>
356 356 
<?php
357 357 
	if (isset($alias['srcport'])):
358 358 
?>
......
370 370 
<?php
371 371 
	endif;
372 372 
?>
373 
							<?=str_replace('_', ' ', htmlspecialchars(pprint_address($natent['destination'])))?>
373 
							<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_address($natent['destination'])))?>
374 374 
<?php
375 375 
	if (isset($alias['dst'])):
376 376 
?>
......
387 387 
<?php
388 388 
	endif;
389 389 
?>
390 
							<?=str_replace('_', ' ', htmlspecialchars(pprint_port($natent['destination']['port'])))?>
390 
							<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_port($natent['destination']['port'])))?>
391 391 
<?php
392 392 
	if (isset($alias['dstport'])):
393 393 
?>
......
405 405 
	endif;
406 406 
?>
407 407 

  		




  408
  
  
    
							<?=str_replace('_', ' ', htmlspecialchars($natent['target']))?>


  		




  
  408
  
    
							<?=str_replace('_', '_<wbr>', htmlspecialchars($natent['target']))?>


  		




  409
  409
  
    
<?php


  		




  410
  410
  
    
	if (isset($alias['target'])):


  		




  411
  411
  
    
?>


  		




  ......




  422
  422
  
    
<?php


  		




  423
  423
  
    
	endif;


  		




  424
  424
  
    
?>


  		




  425
  
  
    
							<?=str_replace('_', ' ', htmlspecialchars(pprint_port($localport)))?>


  		




  
  425
  
    
							<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_port($localport)))?>


  		




  426
  426
  
    
<?php


  		




  427
  427
  
    
	if (isset($alias['targetport'])):


  		




  428
  428
  
    
?>


  		












  

    
      src/usr/local/www/firewall_rules.php
    
  





  706
  706
  
    
						<td>


  		




  707
  707
  
    
							<?php if (isset($alias['src'])): ?>


  		




  708
  708
  
    
								<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" usepost>


  		




  709
  
  
    
									<?=str_replace('_', ' ', htmlspecialchars(pprint_address($filterent['source'])))?>


  		




  
  709
  
    
									<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_address($filterent['source'])))?>


  		




  710
  710
  
    
								</a>


  		




  711
  711
  
    
							<?php else: ?>


  		




  712
  712
  
    
								<?=htmlspecialchars(pprint_address($filterent['source']))?>


  		




  ......




  715
  715
  
    
						<td>


  		




  716
  716
  
    
							<?php if (isset($alias['srcport'])): ?>


  		




  717
  717
  
    
								<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" usepost>


  		




  718
  
  
    
									<?=str_replace('_', ' ', htmlspecialchars(pprint_port($filterent['source']['port'])))?>


  		




  
  718
  
    
									<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_port($filterent['source']['port'])))?>


  		




  719
  719
  
    
								</a>


  		




  720
  720
  
    
							<?php else: ?>


  		




  721
  721
  
    
								<?=htmlspecialchars(pprint_port($filterent['source']['port']))?>


  		




  ......




  724
  724
  
    
						<td>


  		




  725
  725
  
    
							<?php if (isset($alias['dst'])): ?>


  		




  726
  726
  
    
								<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" usepost>


  		




  727
  
  
    
									<?=str_replace('_', ' ', htmlspecialchars(pprint_address($filterent['destination'])))?>


  		




  
  727
  
    
									<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_address($filterent['destination'])))?>


  		




  728
  728
  
    
								</a>


  		




  729
  729
  
    
							<?php else: ?>


  		




  730
  730
  
    
								<?=htmlspecialchars(pprint_address($filterent['destination']))?>


  		




  ......




  733
  733
  
    
						<td>


  		




  734
  734
  
    
							<?php if (isset($alias['dstport'])): ?>


  		




  735
  735
  
    
								<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" usepost>


  		




  736
  
  
    
									<?=str_replace('_', ' ', htmlspecialchars(pprint_port($filterent['destination']['port'])))?>


  		




  
  736
  
    
									<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_port($filterent['destination']['port'])))?>


  		




  737
  737
  
    
								</a>


  		




  738
  738
  
    
							<?php else: ?>


  		




  739
  739
  
    
								<?=htmlspecialchars(pprint_port($filterent['destination']['port']))?>


  		




  ......




  741
  741
  
    
						</td>


  		




  742
  742
  
    
						<td>


  		




  743
  743
  
    
							<?php if (isset($config['interfaces'][$filterent['gateway']]['descr'])):?>


  		




  744
  
  
    
								<?=str_replace('_', ' ', htmlspecialchars($config['interfaces'][$filterent['gateway']]['descr']))?>


  		




  
  744
  
    
								<?=str_replace('_', '_<wbr>', htmlspecialchars($config['interfaces'][$filterent['gateway']]['descr']))?>


  		




  745
  745
  
    
							<?php else: ?>


  		




  746
  746
  
    
								<?=htmlspecialchars(pprint_port($filterent['gateway']))?>


  		




  747
  747
  
    
							<?php endif; ?>


  		




  ......




  751
  751
  
    
								if (isset($filterent['ackqueue']) && isset($filterent['defaultqueue'])) {


  		




  752
  752
  
    
									$desc = str_replace('_', ' ', $filterent['ackqueue']);


  		




  753
  753
  
    
									echo "<a href=\"firewall_shaper_queues.php?queue={$filterent['ackqueue']}&amp;action=show\" usepost>{$desc}</a>";


  		




  754
  
  
    
									$desc = str_replace('_', ' ', $filterent['defaultqueue']);


  		




  
  754
  
    
									$desc = str_replace('_', '_<wbr>', $filterent['defaultqueue']);


  		




  755
  755
  
    
									echo "/<a href=\"firewall_shaper_queues.php?queue={$filterent['defaultqueue']}&amp;action=show\" usepost>{$desc}</a>";


  		




  756
  756
  
    
								} else if (isset($filterent['defaultqueue'])) {


  		




  757
  
  
    
									$desc = str_replace('_', ' ', $filterent['defaultqueue']);


  		




  
  757
  
    
									$desc = str_replace('_', '_<wbr>', $filterent['defaultqueue']);


  		




  758
  758
  
    
									echo "<a href=\"firewall_shaper_queues.php?queue={$filterent['defaultqueue']}&amp;action=show\" usepost>{$desc}</a>";


  		




  759
  759
  
    
								} else {


  		




  760
  760
  
    
									echo gettext("none");


  		




  ......




  765
  765
  
    
							<?php if ($printicon) { ?>


  		




  766
  766
  
    
								<i class="fa fa-<?=$image?> <?=$dispcolor?>" title="<?=$alttext;?>"></i>


  		




  767
  767
  
    
							<?php } ?>


  		




  768
  
  
    
							<?=$schedule_span_begin;?><?=str_replace('_', ' ', htmlspecialchars($filterent['sched']));?>&nbsp;<?=$schedule_span_end;?>


  		




  
  768
  
    
							<?=$schedule_span_begin;?><?=str_replace('_', '_<wbr>', htmlspecialchars($filterent['sched']));?>&nbsp;<?=$schedule_span_end;?>


  		




  769
  769
  
    
						</td>


  		




  770
  770
  
    
						<td>


  		




  771
  771
  
    
							<?=htmlspecialchars($filterent['descr']);?>


  		












Also available in:  Unified diff