All simple php echo to short

Short version is far more used than long php echo. This brings all code to same standard where possible.

17 files changed, 30 insertions, 30 deletions

diff --git a/src/usr/local/www/diag_dns.php b/src/usr/local/www/diag_dns.php
index 0d3e2a4..4a9775b 100755
--- a/src/usr/local/www/diag_dns.php
+++ b/src/usr/local/www/diag_dns.php
@@ -295,8 +295,8 @@ if (!$input_errors && $type) {
 		</ul>
 		<h5><?=gettext("NOTE: The following links are to external services, so their reliability cannot be guaranteed.");?></h5>
 		<ul class="list-group">
-			<li class="list-group-item"><a target="_blank" href="http://private.dnsstuff.com/tools/whois.ch?ip=<?php echo $ipaddr; ?>"><?=gettext("IP WHOIS @ DNS Stuff");?></a></li>
-			<li class="list-group-item"><a target="_blank" href="http://private.dnsstuff.com/tools/ipall.ch?ip=<?php echo $ipaddr; ?>"><?=gettext("IP Info @ DNS Stuff");?></a></li>
+			<li class="list-group-item"><a target="_blank" href="http://private.dnsstuff.com/tools/whois.ch?ip=<?=$ipaddr;?>"><?=gettext("IP WHOIS @ DNS Stuff");?></a></li>
+			<li class="list-group-item"><a target="_blank" href="http://private.dnsstuff.com/tools/ipall.ch?ip=<?=$ipaddr;?>"><?=gettext("IP Info @ DNS Stuff");?></a></li>
 		</ul>
 	</div>
 </div>
diff --git a/src/usr/local/www/diag_states_summary.php b/src/usr/local/www/diag_states_summary.php
index 052680d..a8a9cfd 100644
--- a/src/usr/local/www/diag_states_summary.php
+++ b/src/usr/local/www/diag_states_summary.php
@@ -196,17 +196,17 @@ function print_summary_table($label, $iparr, $sort = TRUE) {
 	}
 ?>
 						<tr>
-							<td<?= $rowSpan ?>><?php echo $ip; ?></td>
-							<td<?= $rowSpan ?> class="text-center"><?php echo $ipinfo['seen']; ?></td>
+							<td<?= $rowSpan ?>><?=$ip;?></td>
+							<td<?= $rowSpan ?> class="text-center"><?=$ipinfo['seen'];?></td>
 
 <?php foreach ($ipinfo['protos'] as $proto => $protoinfo): ?>
 <?php if ($protocolCount > 1 && $i > 0): ?>
 							</tr><tr>
 <?php endif; ?>
-							<td><?php echo $proto; ?></td>
-							<td class="text-center" ><?php echo $protoinfo['seen']; ?></td>
-							<td class="text-center" ><span title="<?php echo build_port_info($protoinfo['srcports'], $proto); ?>"><?php echo count($protoinfo['srcports']); ?></span></td>
-							<td class="text-center" ><span title="<?php echo build_port_info($protoinfo['dstports'], $proto); ?>"><?php echo count($protoinfo['dstports']); ?></span></td>
+							<td><?=$proto;?></td>
+							<td class="text-center" ><?=$protoinfo['seen'];?></td>
+							<td class="text-center" ><span title="<?=build_port_info($protoinfo['srcports'], $proto);?>"><?=count($protoinfo['srcports']);?></span></td>
+							<td class="text-center" ><span title="<?=build_port_info($protoinfo['dstports'], $proto);?>"><?=count($protoinfo['dstports']);?></span></td>
 <?php $i++; endforeach; ?>
 						</tr>
 <?php endforeach; ?>
diff --git a/src/usr/local/www/easyrule.php b/src/usr/local/www/easyrule.php
index 0c28335..5363adc 100644
--- a/src/usr/local/www/easyrule.php
+++ b/src/usr/local/www/easyrule.php
@@ -101,7 +101,7 @@ if ($input_errors) {
 
 if ($message) { ?>
 <br />
-<?=gettext("Message"); ?>: <?php echo $message; ?>
+<?=gettext("Message"); ?>: <?=$message;?>
 <br />
 <?php } else { ?>
 <?=gettext("This is the Easy Rule status page, mainly used to display errors when adding rules. " .
diff --git a/src/usr/local/www/exec.php b/src/usr/local/www/exec.php
index 6d6d386..f4bbd7f 100644
--- a/src/usr/local/www/exec.php
+++ b/src/usr/local/www/exec.php
@@ -260,7 +260,7 @@ if (!isBlank($_POST['txtCommand'])):?>
 		<div class="panel-heading"><h2 class="panel-title"><?=gettext('Download file')?></h2></div>
 		<div class="panel-body">
 			<div class="content">
-				<input name="dlPath" type="text" id="dlPath" placeholder="File to download" class="col-sm-4" value="<?php echo htmlspecialchars($_GET['dlPath']) ?>"/>
+				<input name="dlPath" type="text" id="dlPath" placeholder="File to download" class="col-sm-4" value="<?=htmlspecialchars($_GET['dlPath']);?>"/>
 				<br /><br />
 				<button name="submit" type="submit" class="btn btn-default btn-sm" id="download" value="DOWNLOAD"><?=gettext("Download")?></button>
 			</div>
diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php
index a9f0c5ab..89ee9dc 100755
--- a/src/usr/local/www/firewall_aliases_edit.php
+++ b/src/usr/local/www/firewall_aliases_edit.php
@@ -743,18 +743,18 @@ events.push(function() {
 		$("[id^='address_subnet']").prop("disabled", disable_subnets);
 
 		// Set the help text to match the tab
-		var helparray = <?php echo json_encode($help); ?>;
+		var helparray = <?=json_encode($help);?>;
 		$('.helptext').html(helparray[tab]);
 
 		// Set the section heading by tab type
-		var sectionstr = <?php echo json_encode($section_str); ?>;
+		var sectionstr = <?=json_encode($section_str);?>;
 		$('.panel-title:last').text(sectionstr[tab]);
 
-		var buttonstr = <?php echo json_encode($btn_str); ?>;
+		var buttonstr = <?=json_encode($btn_str);?>;
 		$('.btn-success').prop('value', buttonstr[tab]);
 
 		// Set the input field label by tab
-		var labelstr = <?php echo json_encode($label_str); ?>;
+		var labelstr = <?=json_encode($label_str);?>;
 		$('.repeatable:first').find('label').text(labelstr[tab]);
 
 		// Hide and disable rows other than the first
diff --git a/src/usr/local/www/status_gateways.php b/src/usr/local/www/status_gateways.php
index f6ad489..8cb37e5 100644
--- a/src/usr/local/www/status_gateways.php
+++ b/src/usr/local/www/status_gateways.php
@@ -112,7 +112,7 @@ display_top_tabs($tab_array);
 					<?=htmlspecialchars($gateway['name']);?>
 				</td>
 				<td>
-					<?php echo lookup_gateway_ip_by_name($gname);?>
+					<?=lookup_gateway_ip_by_name($gname);?>
 				</td>
 				<td>
 <?php
diff --git a/src/usr/local/www/status_graph.php b/src/usr/local/www/status_graph.php
index 62fe385..db1c5ec 100644
--- a/src/usr/local/www/status_graph.php
+++ b/src/usr/local/www/status_graph.php
@@ -262,8 +262,8 @@ if (ipsec_enabled()) {
 			<object data="graph.php?ifnum=<?=htmlspecialchars($curif);?>&amp;ifname=<?=rawurlencode($ifdescrs[htmlspecialchars($curif)]);?>">
 				<param name="id" value="graph" />
 				<param name="type" value="image/svg+xml" />
-				<param name="width" value="<?php echo $width; ?>" />
-				<param name="height" value="<?php echo $height; ?>" />
+				<param name="width" value="<?=$width;?>" />
+				<param name="height" value="<?=$height;?>" />
 				<param name="pluginspage" value="http://www.adobe.com/svg/viewer/install/auto" />
 			</object>
 		</div>
diff --git a/src/usr/local/www/status_logs_filter.php b/src/usr/local/www/status_logs_filter.php
index 235b143..48f808c 100644
--- a/src/usr/local/www/status_logs_filter.php
+++ b/src/usr/local/www/status_logs_filter.php
@@ -223,7 +223,7 @@ if (!$rawfilter) {
 			$margin_left = '0.4em';
 		}
 ?>
-						<i style="margin-left:<?php echo $margin_left;?>" class="fa <?php echo $icon_act;?> icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('status_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i>
+						<i style="margin-left:<?=$margin_left;?>" class="fa <?=$icon_act;?> icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('status_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i>
 <?php
 		if ($filterent['count']) {
 			echo $filterent['count'];
diff --git a/src/usr/local/www/status_logs_filter_dynamic.php b/src/usr/local/www/status_logs_filter_dynamic.php
index 8c9374a..a8845f6 100755
--- a/src/usr/local/www/status_logs_filter_dynamic.php
+++ b/src/usr/local/www/status_logs_filter_dynamic.php
@@ -451,7 +451,7 @@ function toggleListDescriptions() {
 								$icon_act = "fa-check text-success";
 							}
 ?>
-							<i class="fa <?php echo $icon_act;?> icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('status_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i>
+							<i class="fa <?=$icon_act;?> icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('status_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i>
 						</td>
 						<td><?=htmlspecialchars($filterent['time'])?></td>
 						<td><?=htmlspecialchars($filterent['interface'])?></td>
diff --git a/src/usr/local/www/status_openvpn.php b/src/usr/local/www/status_openvpn.php
index 6494d98..fe70a47 100644
--- a/src/usr/local/www/status_openvpn.php
+++ b/src/usr/local/www/status_openvpn.php
@@ -158,7 +158,7 @@ include("head.inc"); ?>
 						<td><?=format_bytes($conn['bytes_recv']);?></td>
 						<td>
 							<a
-							   onclick="killClient('<?php echo $server['mgmt']; ?>', '<?php echo $conn['remote_host']; ?>');" style="cursor:pointer;"
+							   onclick="killClient('<?=$server['mgmt'];?>', '<?=$conn['remote_host'];?>');" style="cursor:pointer;"
 							   id="<?php echo "i:{$server['mgmt']}:{$conn['remote_host']}"; ?>"
 							   title="<?php echo gettext("Kill client connection from") . " " . $conn['remote_host']; ?>">
 							<i class="fa fa-times"></i>
diff --git a/src/usr/local/www/status_queues.php b/src/usr/local/www/status_queues.php
index 8e871d0..2a13a12 100644
--- a/src/usr/local/www/status_queues.php
+++ b/src/usr/local/www/status_queues.php
@@ -259,7 +259,7 @@ function processQueues($altqstats, $level, $parent_name) {
 			$prev_if = $q['interface'];
 		}
 ?>
-		<tr class="<?php echo $parent_name?>">
+		<tr class="<?=$parent_name;?>">
 			<td class="<?=$row_class?>" style="padding-left:<?=$level * 20?>px;">
 				<?php
 				if (is_array($q['queue'])) {
diff --git a/src/usr/local/www/system_usermanager_settings_ldapacpicker.php b/src/usr/local/www/system_usermanager_settings_ldapacpicker.php
index 2543e41..26ff512 100644
--- a/src/usr/local/www/system_usermanager_settings_ldapacpicker.php
+++ b/src/usr/local/www/system_usermanager_settings_ldapacpicker.php
@@ -108,7 +108,7 @@ if ($_GET) {
 //<![CDATA[
 function post_choices() {
 
-	var ous = <?php echo count($ous); ?>;
+	var ous = <?=count($ous);?>;
 	var i;
 		opener.document.forms[0].ldapauthcontainers.value="";
 	for (i = 0; i < ous; i++) {
diff --git a/src/usr/local/www/widgets/widgets/gateways.widget.php b/src/usr/local/www/widgets/widgets/gateways.widget.php
index 2b9958e..b24e77e 100644
--- a/src/usr/local/www/widgets/widgets/gateways.widget.php
+++ b/src/usr/local/www/widgets/widgets/gateways.widget.php
@@ -129,9 +129,9 @@ if ($_POST) {
 					}
 				}
 			?>
-		<input name="display_type" class="radio" type="radio" id="display_type_gw_ip" value="gw_ip" <?php echo $display_type_gw_ip; ?> onchange="updateGatewayDisplays();" /> <span>Gateway IP</span>
-		<input name="display_type" class="radio" type="radio" id="display_type_monitor_ip" value="monitor_ip" <?php echo $display_type_monitor_ip; ?> onchange="updateGatewayDisplays();" /> <span>Monitor IP</span>
-		<input name="display_type" class="radio" type="radio" id="display_type_both_ip" value="both_ip" <?php echo $display_type_both_ip; ?> onchange="updateGatewayDisplays();" /> <span>Both</span>
+		<input name="display_type" class="radio" type="radio" id="display_type_gw_ip" value="gw_ip" <?=$display_type_gw_ip;?> onchange="updateGatewayDisplays();" /> <span>Gateway IP</span>
+		<input name="display_type" class="radio" type="radio" id="display_type_monitor_ip" value="monitor_ip" <?=$display_type_monitor_ip;?> onchange="updateGatewayDisplays();" /> <span>Monitor IP</span>
+		<input name="display_type" class="radio" type="radio" id="display_type_both_ip" value="both_ip" <?=$display_type_both_ip;?> onchange="updateGatewayDisplays();" /> <span>Both</span>
 		<br /><br />
 		<input id="submit_settings" name="submit_settings" type="submit" onclick="return updatePref();" class="formbtn" value="Save Settings" />
 	</form>
diff --git a/src/usr/local/www/widgets/widgets/ntp_status.widget.php b/src/usr/local/www/widgets/widgets/ntp_status.widget.php
index a98d84a..e0420ef 100644
--- a/src/usr/local/www/widgets/widgets/ntp_status.widget.php
+++ b/src/usr/local/www/widgets/widgets/ntp_status.widget.php
@@ -188,7 +188,7 @@ if ($_REQUEST['updateme']) {
 		<?php if ($ntpq_counter == 0): ?>
 			<i>No active peers available</i>
 		<?php else: ?>
-			<?php echo $syncsource; ?>
+			<?=$syncsource;?>
 		<?php endif; ?>
 		</td>
 	</tr>
@@ -196,7 +196,7 @@ if ($_REQUEST['updateme']) {
 		<tr>
 			<th>Clock location</th>
 			<td>
-				<a target="_gmaps" href="http://maps.google.com/?q=<?php echo $gps_lat; ?>,<?php echo $gps_lon; ?>">
+				<a target="_gmaps" href="http://maps.google.com/?q=<?=$gps_lat;?>,<?=$gps_lon;?>">
 				<?php
 				echo sprintf("%.5f", $gps_lat) . " " . $gps_la . ", " . sprintf("%.5f", $gps_lon) . " " . $gps_lo; ?>
 				</a>
diff --git a/src/usr/local/www/widgets/widgets/openvpn.widget.php b/src/usr/local/www/widgets/widgets/openvpn.widget.php
index 2d34401..88cb7c9 100644
--- a/src/usr/local/www/widgets/widgets/openvpn.widget.php
+++ b/src/usr/local/www/widgets/widgets/openvpn.widget.php
@@ -133,7 +133,7 @@ $clients = openvpn_get_active_clients();
 					<td>
 						<i class="fa fa-times-circle" onclick="killClient('<?=$server['mgmt']; ?>', '<?=$conn['remote_host']; ?>');" style="cursor:pointer;"
 							name="<?php echo "i:{$server['mgmt']}:{$conn['remote_host']}"; ?>"
-							title='Kill client connection from <?php echo $conn['remote_host']; ?>'>
+							title='Kill client connection from <?=$conn['remote_host'];?>'>
 						</i>
 					</td>
 				</tr>
diff --git a/src/usr/local/www/widgets/widgets/system_information.widget.php b/src/usr/local/www/widgets/widgets/system_information.widget.php
index 3f45cc7..8c70b5e 100644
--- a/src/usr/local/www/widgets/widgets/system_information.widget.php
+++ b/src/usr/local/www/widgets/widgets/system_information.widget.php
@@ -152,7 +152,7 @@ $filesystems = get_mounted_filesystems();
 		<tr>
 			<th><?=gettext("NanoBSD Boot Slice");?></th>
 			<td>
-				<?=htmlspecialchars(nanobsd_friendly_slice_name($BOOT_DEVICE));?> / <?=htmlspecialchars($BOOTFLASH);?><?php echo $rw; ?>
+				<?=htmlspecialchars(nanobsd_friendly_slice_name($BOOT_DEVICE));?> / <?=htmlspecialchars($BOOTFLASH);?><?=$rw;?>
 				<?php if ($BOOTFLASH != $ACTIVE_SLICE): ?>
 				<br /><br />Next Boot:<br />
 				<?=htmlspecialchars(nanobsd_friendly_slice_name($GLABEL_SLICE));?> / <?=htmlspecialchars($ACTIVE_SLICE);?>
diff --git a/src/usr/local/www/wizard.php b/src/usr/local/www/wizard.php
index 6bf58ab..4fc0066 100644
--- a/src/usr/local/www/wizard.php
+++ b/src/usr/local/www/wizard.php
@@ -930,7 +930,7 @@ print($form);
 		$counter = 0;
 		foreach ($inputaliases as $alias) {
 ?>
-			$('#' + '<?php echo $alias; ?>').autocomplete({
+			$('#' + '<?=$alias;?>').autocomplete({
 				source: customarray
 			});
 <?php