Project

General

Profile

« Previous | Next » 

Revision f6aebbcc

Added by NewEraCracker over 9 years ago

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.

View differences:

src/usr/local/www/diag_backup.php
609 609
	<br/>
610 610
	<form action="diag_reboot.php" method="post">
611 611
		<input name="Submit" type="hidden" value="Yes" />
612
		<?=print_info_box(gettext("The firewall configuration has been changed.") . "<br />" . gettext("The firewall is now rebooting."))?>
612
		<?php print_info_box(gettext("The firewall configuration has been changed.") . "<br />" . gettext("The firewall is now rebooting.")); ?>
613 613
		<br />
614 614
	</form>
615 615
<?php
src/usr/local/www/diag_confbak.php
213 213
?>
214 214
<div>
215 215
	<div class="infoblock blockopen">
216
		<?=print_info_box(
216
		<?php print_info_box(
217 217
			gettext(
218 218
				'To view the differences between an older configuration and a newer configuration, ' .
219 219
				'select the older configuration using the left column of radio options and select the newer configuration in the right column, ' .
220 220
				'then press the "Diff" button.'),
221
			'info', false)?>
221
			'info', false); ?>
222 222
	</div>
223 223
</div>
224 224
<?php
src/usr/local/www/firewall_aliases.php
316 316
	 That way jQuery (in pfenseHelpers.js) will automatically take care of the display. -->
317 317
<div>
318 318
	<div class="infoblock">
319
		<?=print_info_box(gettext('Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number ' .
319
		<?php print_info_box(gettext('Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number ' .
320 320
			'of changes that have to be made if a host, network or port changes. <br />' .
321 321
			'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 />' .
322
			'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)?>
322
			'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); ?>
323 323
	</div>
324 324
</div>
325 325

  
src/usr/local/www/firewall_nat_1to1.php
285 285
</form>
286 286

  
287 287
<div class="infoblock">
288
<?=print_info_box(gettext('Depending on the way your WAN connection is setup, you may also need a ') . '<a href="firewall_virtual_ip.php">' .
288
<?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">' .
289 289
			   gettext("Virtual IP.") . '</a>' . '<br />' .
290 290
			   gettext('If you add a 1:1 NAT entry for any of the interface IPs on this system, ' .
291 291
					   'it will make this system inaccessible on that IP address. i.e. if ' .
292 292
					   'you use your WAN IP address, any services on this system (IPsec, OpenVPN server, etc.) ' .
293
					   'using the WAN IP address will no longer function.'), 'info', false)?>
293
					   'using the WAN IP address will no longer function.'), 'info', false); ?>
294 294

  
295 295
</div>
296 296

  
src/usr/local/www/firewall_schedule.php
280 280
</nav>
281 281

  
282 282
<div class="infoblock">
283
	<?=print_info_box(gettext('Schedules act as placeholders for time ranges to be used in firewall rules.'), 'info', false)?>
283
	<?php print_info_box(gettext('Schedules act as placeholders for time ranges to be used in firewall rules.'), 'info', false); ?>
284 284
</div>
285 285

  
286 286
<?php
src/usr/local/www/firewall_shaper.php
509 509
?>
510 510
<div>
511 511
	<div class="infoblock">
512
		<?=print_info_box($default_shaper_msg, 'info', false)?>
512
		<?php print_info_box($default_shaper_msg, 'info', false); ?>
513 513
	</div>
514 514
</div>
515 515
<?php
src/usr/local/www/firewall_virtual_ip.php
373 373
</nav>
374 374

  
375 375
<div class="infoblock">
376
	<?=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 />' .
377
		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)?>
376
	<?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 />' .
377
		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); ?>
378 378
</div>
379 379

  
380 380
<?php
src/usr/local/www/firewall_virtual_ip_edit.php
483 483
?>
484 484

  
485 485
<div class="infoblock">
486
	<?=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 />' .
487
			   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)?>
486
	<?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 />' .
487
			   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); ?>
488 488
</div>
489 489

  
490 490
<script type="text/javascript">
src/usr/local/www/interfaces_groups.php
162 162
</nav>
163 163

  
164 164
<div class="infoblock">
165
	<?=print_info_box(gettext('Interface Groups allow you to setup rules for multiple interfaces without duplicating the rules.<br />' .
166
					   'If you remove members from an interface group, the group rules are no longer applicable to that interface.'), 'info', false)?>
165
	<?php print_info_box(gettext('Interface Groups allow you to setup rules for multiple interfaces without duplicating the rules.<br />' .
166
					   'If you remove members from an interface group, the group rules are no longer applicable to that interface.'), 'info', false); ?>
167 167

  
168 168
</div>
169 169
<?php
src/usr/local/www/interfaces_qinq.php
188 188
</nav>
189 189

  
190 190
<div class="infoblock">
191
	<?=print_info_box(sprintf(gettext('Not all drivers/NICs support 802.1Q QinQ tagging properly. <br />On cards that do not explicitly support it, ' .
191
	<?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, ' .
192 192
		'QinQ tagging will still work, but the reduced MTU may cause problems.<br />' .
193
		'See the %s handbook for information on supported cards.'), $g['product_name']), 'info', false)?>
193
		'See the %s handbook for information on supported cards.'), $g['product_name']), 'info', false); ?>
194 194
</div>
195 195

  
196 196
<?php
src/usr/local/www/interfaces_vlan.php
180 180
</form>
181 181

  
182 182
<div class="infoblock">
183
	<?=print_info_box(sprintf(gettext('Not all drivers/NICs support 802.1Q '.
183
	<?php print_info_box(sprintf(gettext('Not all drivers/NICs support 802.1Q '.
184 184
		'VLAN tagging properly. <br />On cards that do not explicitly support it, VLAN '.
185 185
		'tagging will still work, but the reduced MTU may cause problems.<br />See the '.
186
		'%s handbook for information on supported cards.'), $g['product_name']), 'info', false)?>
186
		'%s handbook for information on supported cards.'), $g['product_name']), 'info', false); ?>
187 187
</div>
188 188
<script type="text/javascript">
189 189
//<![CDATA[
src/usr/local/www/pkg_mgr.php
207 207
	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Packages')?></h2></div>
208 208
	<div id="pkgtbl" class="panel-body table-responsive">
209 209
		<div id="waitmsg">
210
			<?=print_info_box(gettext("Please wait while the list of packages is retrieved and formatted.") . '&nbsp;<i class="fa fa-cog fa-spin"></i>')?>
210
			<?php print_info_box(gettext("Please wait while the list of packages is retrieved and formatted.") . '&nbsp;<i class="fa fa-cog fa-spin"></i>'); ?>
211 211
		</div>
212 212

  
213 213
		<div id="errmsg" style="display: none;">
214
			<?=print_info_box("<ul><li>" . gettext("Unable to retrieve package information.") . "</li></ul>", 'danger')?>
214
			<?php print_info_box("<ul><li>" . gettext("Unable to retrieve package information.") . "</li></ul>", 'danger'); ?>
215 215
		</div>
216 216
	</div>
217 217
</div>
src/usr/local/www/services_captiveportal_hostname.php
197 197
</nav>
198 198

  
199 199
<div class="infoblock">
200
	<?=print_info_box($notestr, 'info', false)?>
200
	<?php print_info_box($notestr, 'info', false); ?>
201 201
</div>
202 202

  
203 203
<?php
src/usr/local/www/services_captiveportal_ip.php
193 193
</nav>
194 194

  
195 195
<div class="infoblock">
196
<?=print_info_box(gettext('Adding allowed IP addresses will allow IP access to/from these addresses through the captive portal without being taken to the portal page. ' .
197
					   'This can be used for a web server serving images for the portal page or a DNS server on another network, for example.'), 'info', false)?>
196
<?php print_info_box(gettext('Adding allowed IP addresses will allow IP access to/from these addresses through the captive portal without being taken to the portal page. ' .
197
					   'This can be used for a web server serving images for the portal page or a DNS server on another network, for example.'), 'info', false); ?>
198 198
</div>
199 199

  
200 200
<?php
src/usr/local/www/services_captiveportal_mac.php
256 256
</nav>
257 257

  
258 258
<div class="infoblock">
259
	<?=print_info_box(gettext('Adding MAC addresses as "pass" MACs allows them access through the captive portal automatically without being taken to the portal page.'), 'info', false)?>
259
	<?php print_info_box(gettext('Adding MAC addresses as "pass" MACs allows them access through the captive portal automatically without being taken to the portal page.'), 'info', false); ?>
260 260
</div>
261 261
<?php
262 262
include("foot.inc");
src/usr/local/www/services_igmpproxy.php
180 180
</nav>
181 181

  
182 182
<div class="infoblock">
183
<?=print_info_box(gettext('Please add the interface for upstream, the allowed subnets, and the downstream interfaces you would like the proxy to allow. ' .
184
					   'Only one "upstream" interface can be configured.'), 'info', false)?>
183
<?php print_info_box(gettext('Please add the interface for upstream, the allowed subnets, and the downstream interfaces you would like the proxy to allow. ' .
184
					   'Only one "upstream" interface can be configured.'), 'info', false); ?>
185 185
</div>
186 186
<?php
187 187
include("foot.inc");
src/usr/local/www/services_unbound.php
556 556
</nav>
557 557

  
558 558
<div class="infoblock">
559
	<?=print_info_box(sprintf(gettext("If the DNS Resolver is enabled, the DHCP".
559
	<?php print_info_box(sprintf(gettext("If the DNS Resolver is enabled, the DHCP".
560 560
		" service (if enabled) will automatically serve the LAN IP".
561 561
		" address as a DNS server to DHCP clients so they will use".
562 562
		" the DNS Resolver. If Forwarding is enabled, the DNS Resolver will use the DNS servers".
563 563
		" entered in %sSystem: General setup%s".
564 564
		" or those obtained via DHCP or PPP on WAN if &quot;Allow".
565 565
		" DNS server list to be overridden by DHCP/PPP on WAN&quot;".
566
		" is checked."), '<a href="system.php">', '</a>'), 'info', false)?>
566
		" is checked."), '<a href="system.php">', '</a>'), 'info', false); ?>
567 567
</div>
568 568

  
569 569
<?php include("foot.inc");
src/usr/local/www/status_logs_filter_summary.php
158 158
?>
159 159
<div>
160 160
	<div class="infoblock blockopen">
161
		<?=print_info_box($infomsg, 'info', false);?>
161
		<?php print_info_box($infomsg, 'info', false); ?>
162 162
	</div>
163 163
</div>
164 164

  
src/usr/local/www/system_gateway_groups.php
206 206
</nav>
207 207

  
208 208
<div class="infoblock">
209
	<?=print_info_box(gettext('Remember to use these Gateway Groups in firewall rules in order to enable load balancing, failover, ' .
209
	<?php print_info_box(gettext('Remember to use these Gateway Groups in firewall rules in order to enable load balancing, failover, ' .
210 210
						   'or policy-based routing.' . '<br />' .
211
						   'Without rules directing traffic into the Gateway Groups, they will not be used.'), 'info', false)?>
211
						   'Without rules directing traffic into the Gateway Groups, they will not be used.'), 'info', false); ?>
212 212
</div>
213 213
<?php
214 214
include("foot.inc");
src/usr/local/www/system_usermanager.php
553 553
</form>
554 554

  
555 555
<div class="infoblock">
556
	<?=print_info_box(gettext("Additional users can be added here. User permissions for accessing " .
556
	<?php print_info_box(gettext("Additional users can be added here. User permissions for accessing " .
557 557
	"the webConfigurator can be assigned directly or inherited from group memberships. " .
558 558
	"An icon that appears grey indicates that it is a system defined object. " .
559 559
	"Some system object properties can be modified but they cannot be deleted.") .
560 560
	'<br /><br />' .
561 561
	gettext("Accounts added here are also used for other parts of the system " .
562
	"such as OpenVPN, IPsec, and Captive Portal."), 'info', false)?>
562
	"such as OpenVPN, IPsec, and Captive Portal."), 'info', false); ?>
563 563
</div>
564 564

  
565 565
<?php
src/usr/local/www/vpn_ipsec.php
557 557
</form>
558 558

  
559 559
<div class="infoblock">
560
	<?=print_info_box(sprintf(gettext("You can check your IPsec status at %s%s%s."), '<a href="status_ipsec.php">', gettext("Status:IPsec"), '</a>') . '<br />' .
560
	<?php print_info_box(sprintf(gettext("You can check your IPsec status at %s%s%s."), '<a href="status_ipsec.php">', gettext("Status:IPsec"), '</a>') . '<br />' .
561 561
	sprintf(gettext("IPsec debug mode can be enabled at %s%s%s."), '<a href="vpn_ipsec_settings.php">', gettext("VPN:IPsec:Advanced Settings"), '</a>') . '<br />' .
562
	sprintf(gettext("IPsec can be set to prefer older SAs at %s%s%s."), '<a href="vpn_ipsec_settings.php">', gettext("VPN:IPsec:Advanced Settings"), '</a>'), 'info', false)?>
562
	sprintf(gettext("IPsec can be set to prefer older SAs at %s%s%s."), '<a href="vpn_ipsec_settings.php">', gettext("VPN:IPsec:Advanced Settings"), '</a>'), 'info', false); ?>
563 563
</div>
564 564

  
565 565
<script type="text/javascript">

Also available in: Unified diff