diff options
| author | NewEraCracker <neweracracker@gmail.com> | 2016-02-15 15:16:31 +0000 |
|---|---|---|
| committer | NewEraCracker <neweracracker@gmail.com> | 2016-02-15 15:16:31 +0000 |
| commit | f6aebbcc55b4e83d4a05f503b5491ce5e6fb043b (patch) | |
| tree | 342dc6a643802153d70f43978598a62f04d8107f /src/usr/local/www | |
| parent | 703342b0354edeeb3179540715114a380c2f335c (diff) | |
| download | pfsense-f6aebbcc55b4e83d4a05f503b5491ce5e6fb043b.zip pfsense-f6aebbcc55b4e83d4a05f503b5491ce5e6fb043b.tar.gz | |
Bring all calls of print_info_box to same standard
The call itself to print_info_box already echoes the content. There is no need of additionally using the short-open-echo tag on those calls to echo return value. The previous implementation shouldn't yell any visible issues as return is 'NULL' (undefined) which casts to an empty string when printing. But, just for the sake of conformity, this changes are advisable in my opinion.
Diffstat (limited to 'src/usr/local/www')
21 files changed, 36 insertions, 36 deletions
diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php index dba496f..d499442 100644 --- a/src/usr/local/www/diag_backup.php +++ b/src/usr/local/www/diag_backup.php @@ -609,7 +609,7 @@ if (is_subsystem_dirty('restore')): <br/> <form action="diag_reboot.php" method="post"> <input name="Submit" type="hidden" value="Yes" /> - <?=print_info_box(gettext("The firewall configuration has been changed.") . "<br />" . gettext("The firewall is now rebooting."))?> + <?php print_info_box(gettext("The firewall configuration has been changed.") . "<br />" . gettext("The firewall is now rebooting.")); ?> <br /> </form> <?php diff --git a/src/usr/local/www/diag_confbak.php b/src/usr/local/www/diag_confbak.php index cd67957..a6674df 100644 --- a/src/usr/local/www/diag_confbak.php +++ b/src/usr/local/www/diag_confbak.php @@ -213,12 +213,12 @@ if (is_array($confvers)) { ?> <div> <div class="infoblock blockopen"> - <?=print_info_box( + <?php print_info_box( gettext( 'To view the differences between an older configuration and a newer configuration, ' . 'select the older configuration using the left column of radio options and select the newer configuration in the right column, ' . 'then press the "Diff" button.'), - 'info', false)?> + 'info', false); ?> </div> </div> <?php diff --git a/src/usr/local/www/firewall_aliases.php b/src/usr/local/www/firewall_aliases.php index 88d0d43..657224c 100644 --- a/src/usr/local/www/firewall_aliases.php +++ b/src/usr/local/www/firewall_aliases.php @@ -316,10 +316,10 @@ display_top_tabs($tab_array); That way jQuery (in pfenseHelpers.js) will automatically take care of the display. --> <div> <div class="infoblock"> - <?=print_info_box(gettext('Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number ' . + <?php print_info_box(gettext('Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number ' . 'of changes that have to be made if a host, network or port changes. <br />' . 'You can enter the name of an alias instead of the host, network or port where indicated. The alias will be resolved according to the list above.' . '<br />' . - 'If an alias cannot be resolved (e.g. because you deleted it), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped.'), 'info', false)?> + 'If an alias cannot be resolved (e.g. because you deleted it), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped.'), 'info', false); ?> </div> </div> diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php index 50c48ff..0c77c76 100644 --- a/src/usr/local/www/firewall_nat_1to1.php +++ b/src/usr/local/www/firewall_nat_1to1.php @@ -285,12 +285,12 @@ display_top_tabs($tab_array); </form> <div class="infoblock"> -<?=print_info_box(gettext('Depending on the way your WAN connection is setup, you may also need a ') . '<a href="firewall_virtual_ip.php">' . +<?php print_info_box(gettext('Depending on the way your WAN connection is setup, you may also need a ') . '<a href="firewall_virtual_ip.php">' . gettext("Virtual IP.") . '</a>' . '<br />' . gettext('If you add a 1:1 NAT entry for any of the interface IPs on this system, ' . 'it will make this system inaccessible on that IP address. i.e. if ' . 'you use your WAN IP address, any services on this system (IPsec, OpenVPN server, etc.) ' . - 'using the WAN IP address will no longer function.'), 'info', false)?> + 'using the WAN IP address will no longer function.'), 'info', false); ?> </div> diff --git a/src/usr/local/www/firewall_schedule.php b/src/usr/local/www/firewall_schedule.php index e531a80..b69a090 100644 --- a/src/usr/local/www/firewall_schedule.php +++ b/src/usr/local/www/firewall_schedule.php @@ -280,7 +280,7 @@ endforeach; </nav> <div class="infoblock"> - <?=print_info_box(gettext('Schedules act as placeholders for time ranges to be used in firewall rules.'), 'info', false)?> + <?php print_info_box(gettext('Schedules act as placeholders for time ranges to be used in firewall rules.'), 'info', false); ?> </div> <?php diff --git a/src/usr/local/www/firewall_shaper.php b/src/usr/local/www/firewall_shaper.php index d6b7f02..35af5c9 100644 --- a/src/usr/local/www/firewall_shaper.php +++ b/src/usr/local/www/firewall_shaper.php @@ -509,7 +509,7 @@ if ($dfltmsg) { ?> <div> <div class="infoblock"> - <?=print_info_box($default_shaper_msg, 'info', false)?> + <?php print_info_box($default_shaper_msg, 'info', false); ?> </div> </div> <?php diff --git a/src/usr/local/www/firewall_virtual_ip.php b/src/usr/local/www/firewall_virtual_ip.php index bbb8ea7..9e24709 100644 --- a/src/usr/local/www/firewall_virtual_ip.php +++ b/src/usr/local/www/firewall_virtual_ip.php @@ -373,8 +373,8 @@ endforeach; </nav> <div class="infoblock"> - <?=print_info_box(sprintf(gettext('The virtual IP addresses defined on this page may be used in %1$sNAT%2$s mappings.'), '<a href="firewall_nat.php">', '</a>') . '<br />' . - sprintf(gettext('You can check the status of your CARP Virtual IPs and interfaces %1$shere%2$s.'), '<a href="status_carp.php">', '</a>'), 'info', false)?> + <?php print_info_box(sprintf(gettext('The virtual IP addresses defined on this page may be used in %1$sNAT%2$s mappings.'), '<a href="firewall_nat.php">', '</a>') . '<br />' . + sprintf(gettext('You can check the status of your CARP Virtual IPs and interfaces %1$shere%2$s.'), '<a href="status_carp.php">', '</a>'), 'info', false); ?> </div> <?php diff --git a/src/usr/local/www/firewall_virtual_ip_edit.php b/src/usr/local/www/firewall_virtual_ip_edit.php index b7e973d..f75bd33 100644 --- a/src/usr/local/www/firewall_virtual_ip_edit.php +++ b/src/usr/local/www/firewall_virtual_ip_edit.php @@ -483,8 +483,8 @@ print($form); ?> <div class="infoblock"> - <?=print_info_box(gettext("Proxy ARP and Other type Virtual IPs cannot be bound to by anything running on the firewall, such as IPsec, OpenVPN, etc. Use a CARP or IP Alias type address for these types.") . '<br />' . - sprintf(gettext("For more information on CARP and the above values, visit the OpenBSD %s"), '<a href="http://www.openbsd.org/faq/pf/carp.html">CARP FAQ</a>.'), 'info', false)?> + <?php print_info_box(gettext("Proxy ARP and Other type Virtual IPs cannot be bound to by anything running on the firewall, such as IPsec, OpenVPN, etc. Use a CARP or IP Alias type address for these types.") . '<br />' . + sprintf(gettext("For more information on CARP and the above values, visit the OpenBSD %s"), '<a href="http://www.openbsd.org/faq/pf/carp.html">CARP FAQ</a>.'), 'info', false); ?> </div> <script type="text/javascript"> diff --git a/src/usr/local/www/interfaces_groups.php b/src/usr/local/www/interfaces_groups.php index ccc78eb..85de66f 100644 --- a/src/usr/local/www/interfaces_groups.php +++ b/src/usr/local/www/interfaces_groups.php @@ -162,8 +162,8 @@ display_top_tabs($tab_array); </nav> <div class="infoblock"> - <?=print_info_box(gettext('Interface Groups allow you to setup rules for multiple interfaces without duplicating the rules.<br />' . - 'If you remove members from an interface group, the group rules are no longer applicable to that interface.'), 'info', false)?> + <?php print_info_box(gettext('Interface Groups allow you to setup rules for multiple interfaces without duplicating the rules.<br />' . + 'If you remove members from an interface group, the group rules are no longer applicable to that interface.'), 'info', false); ?> </div> <?php diff --git a/src/usr/local/www/interfaces_qinq.php b/src/usr/local/www/interfaces_qinq.php index f18c2b8..2687e1a 100644 --- a/src/usr/local/www/interfaces_qinq.php +++ b/src/usr/local/www/interfaces_qinq.php @@ -188,9 +188,9 @@ endforeach; </nav> <div class="infoblock"> - <?=print_info_box(sprintf(gettext('Not all drivers/NICs support 802.1Q QinQ tagging properly. <br />On cards that do not explicitly support it, ' . + <?php print_info_box(sprintf(gettext('Not all drivers/NICs support 802.1Q QinQ tagging properly. <br />On cards that do not explicitly support it, ' . 'QinQ tagging will still work, but the reduced MTU may cause problems.<br />' . - 'See the %s handbook for information on supported cards.'), $g['product_name']), 'info', false)?> + 'See the %s handbook for information on supported cards.'), $g['product_name']), 'info', false); ?> </div> <?php diff --git a/src/usr/local/www/interfaces_vlan.php b/src/usr/local/www/interfaces_vlan.php index d4e3905..32ba6ed 100644 --- a/src/usr/local/www/interfaces_vlan.php +++ b/src/usr/local/www/interfaces_vlan.php @@ -180,10 +180,10 @@ display_top_tabs($tab_array); </form> <div class="infoblock"> - <?=print_info_box(sprintf(gettext('Not all drivers/NICs support 802.1Q '. + <?php print_info_box(sprintf(gettext('Not all drivers/NICs support 802.1Q '. 'VLAN tagging properly. <br />On cards that do not explicitly support it, VLAN '. 'tagging will still work, but the reduced MTU may cause problems.<br />See the '. - '%s handbook for information on supported cards.'), $g['product_name']), 'info', false)?> + '%s handbook for information on supported cards.'), $g['product_name']), 'info', false); ?> </div> <script type="text/javascript"> //<