Tidy up Boolean operators for HTML5

Remove the XHTML standard Boolean operators (makes reading HTML much
simpler).

22 files changed, 42 insertions, 42 deletions

diff --git a/src/etc/inc/openvpn.inc b/src/etc/inc/openvpn.inc
index 6572e0f..42eebd1 100644
--- a/src/etc/inc/openvpn.inc
+++ b/src/etc/inc/openvpn.inc
@@ -201,7 +201,7 @@ function openvpn_build_cert_list($include_none = false) {
 			$caname = " (CA: {$ca['descr']})";
 
 		if ($pconfig['certref'] == $cert['refid'])
-			$selected = "selected=\"selected\"";
+			$selected = "selected";
 
 		if (cert_in_use($cert['refid']))
 			$inuse = " *In Use";
diff --git a/src/etc/inc/shaper.inc b/src/etc/inc/shaper.inc
index 4d25742..d78326b 100644
--- a/src/etc/inc/shaper.inc
+++ b/src/etc/inc/shaper.inc
@@ -3759,7 +3759,7 @@ EOD;
 					$form .= "<option value=\"{$bwsidx}\"";
 
 					if ($bw['bwscale'] == $bwsidx) {
-						$form .= " selected=\"selected\"";
+						$form .= " selected";
 					}
 
 					$form .= ">{$bwscale}</option>";
@@ -3773,7 +3773,7 @@ EOD;
 				foreach ($schedules as $schd) {
 					$selected = "";
 					if ($bw['bwsched'] == $schd) {
-						$selected = "selected=\"selected\"";
+						$selected = "selected";
 					}
 
 					$form .= "<option value='{$schd}' {$selected}>{$schd}</option>";
diff --git a/src/usr/local/www/crash_reporter.php b/src/usr/local/www/crash_reporter.php
index 38d7558..3c28cea0 100644
--- a/src/usr/local/www/crash_reporter.php
+++ b/src/usr/local/www/crash_reporter.php
@@ -161,7 +161,7 @@ exec("/usr/bin/grep -vi warning /tmp/PHP_errors.log", $php_errors);
 			<?=gettext("Would you like to submit the programming debug logs to the pfSense developers for inspection?")?>
 			<i><?=gettext("Please double check the contents to ensure you are comfortable sending this information before clicking Yes.")?></i>
 		</p>
-		<textarea readonly="readonly" style="width: 100%; height: 350px;">
+		<textarea readonly style="width: 100%; height: 350px;">
 			<?=$crash_reports?>
 		</textarea>
 		<form action="crash_reporter.php" method="post">
diff --git a/src/usr/local/www/firewall_nat.php b/src/usr/local/www/firewall_nat.php
index bc355bb..5cf8cf1 100644
--- a/src/usr/local/www/firewall_nat.php
+++ b/src/usr/local/www/firewall_nat.php
@@ -379,7 +379,7 @@ endforeach;
 			<i class="fa fa-trash icon-embed-btn"></i>
 			<?=gettext("Delete"); ?>
 		</button>
-		<button type="submit" id="order-store" name="order-store" class="btn btn-primary btn-sm" disabled="disabled" title="<?=gettext('Save rule order')?>">
+		<button type="submit" id="order-store" name="order-store" class="btn btn-primary btn-sm" disabled title="<?=gettext('Save rule order')?>">
 			<i class="fa fa-save icon-embed-btn"></i>
 			<?=gettext("Save")?>
 		</button>
diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php
index 7129657..dad8376 100644
--- a/src/usr/local/www/firewall_nat_1to1.php
+++ b/src/usr/local/www/firewall_nat_1to1.php
@@ -269,7 +269,7 @@ display_top_tabs($tab_array);
 			<i class="fa fa-trash icon-embed-btn"></i>
 			<?=gettext("Delete"); ?>
 		</button>
-		<button type="submit" id="order-store" name="order-store" class="btn btn-primary btn-sm" value="Save changes" disabled="disabled">
+		<button type="submit" id="order-store" name="order-store" class="btn btn-primary btn-sm" value="Save changes" disabled>
 			<i class="fa fa-save icon-embed-btn"></i>
 			<?=gettext("Save")?>
 		</button>
diff --git a/src/usr/local/www/firewall_nat_npt.php b/src/usr/local/www/firewall_nat_npt.php
index 1fabdea..e63fb30 100644
--- a/src/usr/local/www/firewall_nat_npt.php
+++ b/src/usr/local/www/firewall_nat_npt.php
@@ -181,7 +181,7 @@ endforeach;
 		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
-	<button type="submit" id="order-store" class="btn btn-primary btn-sm" value="store changes" disabled="disabled">
+	<button type="submit" id="order-store" class="btn btn-primary btn-sm" value="store changes" disabled">
 		<i class="fa fa-save icon-embed-btn"></i>
 		<?=gettext("Save")?>
 	</button>
diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php
index feaa9c3..aae2dee 100644
--- a/src/usr/local/www/firewall_nat_out.php
+++ b/src/usr/local/www/firewall_nat_out.php
@@ -523,7 +523,7 @@ print($form);
 			<i class="fa fa-trash icon-embed-btn"></i>
 			<?=gettext("Delete"); ?>
 		</button>
-		<button type="submit" id="order-store" class="btn btn-primary btn-sm" value="Save changes" disabled="disabled" name="order-store" title="<?=gettext('Save map order')?>">
+		<button type="submit" id="order-store" class="btn btn-primary btn-sm" value="Save changes" disabled name="order-store" title="<?=gettext('Save map order')?>">
 			<i class="fa fa-save icon-embed-btn"></i>
 			<?=gettext("Save")?>
 		</button>
diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php
index a1b02de..48b81ab 100644
--- a/src/usr/local/www/firewall_rules.php
+++ b/src/usr/local/www/firewall_rules.php
@@ -679,7 +679,7 @@ for ($i = 0; isset($a_filter[$i]); $i++):
 			<i class="fa fa-trash icon-embed-btn"></i>
 			<?=gettext("Delete"); ?>
 		</button>
-		<button type="submit" id="order-store" name="order-store" class="btn btn-sm btn-primary" value="store changes" disabled="disabled" title="<?=gettext('Save rule order')?>">
+		<button type="submit" id="order-store" name="order-store" class="btn btn-sm btn-primary" value="store changes" disabled title="<?=gettext('Save rule order')?>">
 			<i class="fa fa-save icon-embed-btn"></i>
 			<?=gettext("Save")?>
 		</button>
diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php
index 94cd924..0088dd4 100644
--- a/src/usr/local/www/firewall_rules_edit.php
+++ b/src/usr/local/www/firewall_rules_edit.php
@@ -950,14 +950,14 @@ function build_flag_table() {
 		$tcpflags1 .= "<td> <input type='checkbox' name='tcpflags1_{$tcpflag}' value='on' ";
 
 		if (array_search($tcpflag, $setflags) !== false) {
-			$tcpflags1 .= "checked=\"checked\"";
+			$tcpflags1 .= "checked";
 		}
 
 		$tcpflags1 .= " /></td>\n";
 		$tcpflags2 .= "<td> <input type='checkbox' name='tcpflags2_{$tcpflag}' value='on' ";
 
 		if (array_search($tcpflag, $outofflags) !== false) {
-			$tcpflags2 .= "checked=\"checked\"";
+			$tcpflags2 .= "checked";
 		}
 
 		$tcpflags2 .= " /></td>\n";
@@ -969,7 +969,7 @@ function build_flag_table() {
 	$flagtable .=  "</table>";
 
 	$flagtable .= '<input type="checkbox" name="tcpflags_any" id="tcpflags_any" value="on"';
-	$flagtable .= $pconfig['tcpflags_any'] ? 'checked="checked"':'' . '/>';
+	$flagtable .= $pconfig['tcpflags_any'] ? 'checked':'' . '/>';
 	$flagtable .= '<strong>' . gettext(" Any flags.") . '</strong>';
 
 	return($flagtable);
diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc
index 0ea3659..cdf6975 100644
--- a/src/usr/local/www/guiconfig.inc
+++ b/src/usr/local/www/guiconfig.inc
@@ -962,7 +962,7 @@ function print_rfc2616_select($tag, $current) {
 	echo "<select id=\"{$tag}\" name=\"{$tag}\">\n";
 	foreach ($rfc2616 as $code => $message) {
 		if ($code == $current) {
-			$sel = " selected=\"selected\"";
+			$sel = " selected";
 		} else {
 			$sel = "";
 		}
@@ -1060,7 +1060,7 @@ function display_top_tabs(& $tab_array, $no_drop_down = false, $type = 'pills')
 
 		foreach ($tab_array as $ta) {
 			if ($ta[1] == "true")
-				$selected = " selected=\"selected\"";
+				$selected = " selected";
 			else
 				$selected = "";
 			// Onclick in option will not work in some browser
diff --git a/src/usr/local/www/interfaces.php b/src/usr/local/www/interfaces.php
index 3df0ac7..018a7cd 100644
--- a/src/usr/local/www/interfaces.php
+++ b/src/usr/local/www/interfaces.php
@@ -145,7 +145,7 @@ foreach ($a_ppps as $pppid => $ppp) {
 	}
 }
 
-$type_disabled = (substr($wancfg['if'], 0, 3) == 'gre') ? 'disabled="disabled"' : '';
+$type_disabled = (substr($wancfg['if'], 0, 3) == 'gre') ? 'disabled' : '';
 
 if ($wancfg['if'] == $a_ppps[$pppid]['if']) {
 	$pconfig['pppid'] = $pppid;
diff --git a/src/usr/local/www/interfaces_assign.php b/src/usr/local/www/interfaces_assign.php
index ff52e75..377741d 100644
--- a/src/usr/local/www/interfaces_assign.php
+++ b/src/usr/local/www/interfaces_assign.php
@@ -545,7 +545,7 @@ display_top_tabs($tab_array);
 			<td>
 				<select name="<?=$ifname?>" id="<?=$ifname?>" class="form-control">
 <?php foreach ($portlist as $portname => $portinfo):?>
-					<option value="<?=$portname?>" <?=($portname == $iface['if']) ? ' selected="selected"': ''?>>
+					<option value="<?=$portname?>" <?=($portname == $iface['if']) ? ' selected': ''?>>
 						<?=interface_assign_description($portinfo, $portname)?>
 					</option>
 <?php endforeach;?>
@@ -570,7 +570,7 @@ display_top_tabs($tab_array);
 			<td>
 				<select name="if_add" id="if_add" class="form-control">
 <?php foreach ($unused_portlist as $portname => $portinfo):?>
-					<option value="<?=$portname?>" <?=($portname == $iface['if']) ? ' selected="selected"': ''?>>
+					<option value="<?=$portname?>" <?=($portname == $iface['if']) ? ' selected': ''?>>
 						<?=interface_assign_description($portinfo, $portname)?>
 					</option>
 <?php endforeach;?>
diff --git a/src/usr/local/www/pkg.php b/src/usr/local/www/pkg.php
index 09bcbdc..04e06ee 100755
--- a/src/usr/local/www/pkg.php
+++ b/src/usr/local/www/pkg.php
@@ -334,7 +334,7 @@ if ($savemsg)
 					echo "Filter field: <select name='pkg_filter_type'>";
 					foreach ($field['sortablefields']['item'] as $si) {
 						if ($si['name'] == $_REQUEST['pkg_filter_type']) {
-							$SELECTED = "selected=\"selected\"";
+							$SELECTED = "selected";
 						} else {
 							$SELECTED = "";
 						}
@@ -377,7 +377,7 @@ if ($savemsg)
 		echo "<td align='right'>Rows per page: <select onchange='document.pkgform.submit();' name='display_maximum_rows'>";
 		for ($x = 0; $x < 250; $x++) {
 			if ($x == $display_maximum_rows) {
-				$SELECTED = "selected=\"selected\"";
+				$SELECTED = "selected";
 			} else {
 				$SELECTED = "";
 			}
diff --git a/src/usr/local/www/pkg_edit.php b/src/usr/local/www/pkg_edit.php
index c9a1b92..58b3efb 100644
--- a/src/usr/local/www/pkg_edit.php
+++ b/src/usr/local/www/pkg_edit.php
@@ -373,7 +373,7 @@ function display_row($trc, $value, $fieldname, $type, $rowhelper, $description)
 			$size = ($size ? "size=\"{$size}\"" : '');
 			$multiple = '';
 			if (isset($rowhelper['multiple'])) {
-				$multiple = "multiple=\"multiple\"";
+				$multiple = "multiple";
 			}
 			echo "<select style='height:22px;' id='{$fieldname}{$trc}' name='{$fieldname}{$trc}' {$size} {$multiple}>\n";
 			$ifaces = get_configured_interface_with_descr();
@@ -782,7 +782,7 @@ foreach ($pkg['fields']['field'] as $pkga) {
 			$fieldname = $pkga['fieldname'];
 
 			if (isset($pkga['multiple'])) {
-				$multiple = 'multiple="multiple"';
+				$multiple = 'multiple';
 				$items = explode(',', $value);
 				$fieldname .= "[]";
 			} else {
@@ -1139,7 +1139,7 @@ foreach ($pkg['fields']['field'] as $pkga) {
 			$fieldname = $pkga['fieldname'];
 			if (isset($pkga['multiple'])) {
 				$fieldname .= '[]';
-				$multiple = 'multiple="multiple"';
+				$multiple = 'multiple';
 			}
 
 			$selectedlist = array();
diff --git a/src/usr/local/www/status_lb_pool.php b/src/usr/local/www/status_lb_pool.php
index db0ec7d..47fbfce 100644
--- a/src/usr/local/www/status_lb_pool.php
+++ b/src/usr/local/www/status_lb_pool.php
@@ -221,7 +221,7 @@ foreach ($a_pool as $pool):
 			switch ($server['ip']['state']) {
 				case 'up':
 					$bgcolor = LIGHTGREEN;	// lightgreen
-					$checked = "checked=\"checked\"";
+					$checked = "checked";
 					break;
 				case 'disabled':
 					$bgcolor = WHITE;
@@ -229,7 +229,7 @@ foreach ($a_pool as $pool):
 					break;
 				default:
 					$bgcolor = LIGHTCORAL;	// lightcoral
-					$checked = "checked=\"checked\"";
+					$checked = "checked";
 			}
 ?>
 								<tr>
diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php
index 474f90a..3e2917c 100644
--- a/src/usr/local/www/system_usermanager.php
+++ b/src/usr/local/www/system_usermanager.php
@@ -490,7 +490,7 @@ foreach($a_user as $i => $userent):
 	?>
 			<tr>
 				<td>
-					<input type="checkbox" id="frc<?=$i?>" name="delete_check[]" value="<?=$i?>" <?=($userent['scope'] == "system" ? 'disabled="disabled"' : '')?>/>
+					<input type="checkbox" id="frc<?=$i?>" name="delete_check[]" value="<?=$i?>" <?=($userent['scope'] == "system" ? 'disabled' : '')?>/>
 				</td>
 				<td>
 <?php
@@ -577,7 +577,7 @@ if ($act == "new" || $act == "edit" || $input_errors):
 
 	$ro = "";
 	if ($pconfig['utype'] == "system") {
-		$ro = "readonly=\"readonly\"";
+		$ro = "readonly";
 	}
 
 	$section = new Form_Section('User Properties');
diff --git a/src/usr/local/www/system_usermanager_settings_ldapacpicker.php b/src/usr/local/www/system_usermanager_settings_ldapacpicker.php
index 415c2a7..eb42034 100644
--- a/src/usr/local/www/system_usermanager_settings_ldapacpicker.php
+++ b/src/usr/local/www/system_usermanager_settings_ldapacpicker.php
@@ -140,7 +140,7 @@ function post_choices() {
 	if (is_array($ous)) {
 		foreach ($ous as $ou) {
 			if (in_array($ou, $authcfg['ldap_authcn'])) {
-				$CHECKED=" CHECKED";
+				$CHECKED=" checked";
 			} else {
 				$CHECKED="";
 			}
diff --git a/src/usr/local/www/widgets/widgets/gateways.widget.php b/src/usr/local/www/widgets/widgets/gateways.widget.php
index ffbc342..59fa21d 100644
--- a/src/usr/local/www/widgets/widgets/gateways.widget.php
+++ b/src/usr/local/www/widgets/widgets/gateways.widget.php
@@ -227,23 +227,23 @@ if ($_POST) {
 	<form action="/widgets/widgets/gateways.widget.php" method="post" name="gateways_widget_iform" id="gateways_widget_iform">
 		Display:
 			<?php
-				$display_type_gw_ip="checked=\"checked\"";
+				$display_type_gw_ip="checked";
 				$display_type_monitor_ip="";
 				$display_type_both_ip="";
 				if (isset($config["widgets"]["gateways_widget"]["display_type"])) {
 					$selected_radio = $config["widgets"]["gateways_widget"]["display_type"];
 					if ($selected_radio == "gw_ip") {
-						$display_type_gw_ip = "checked=\"checked\"";
+						$display_type_gw_ip = "checked";
 						$display_type_monitor_ip="";
 						$display_type_both_ip="";
 					} else if ($selected_radio == "monitor_ip") {
 						$display_type_gw_ip = "";
-						$display_type_monitor_ip="checked=\"checked\"";
+						$display_type_monitor_ip="checked";
 						$display_type_both_ip="";
 					} else if ($selected_radio == "both_ip") {
 						$display_type_gw_ip = "";
 						$display_type_monitor_ip="";
-						$display_type_both_ip="checked=\"checked\"";
+						$display_type_both_ip="checked";
 					}
 				}
 			?>
diff --git a/src/usr/local/www/widgets/widgets/log.widget.php b/src/usr/local/www/widgets/widgets/log.widget.php
index 822e365..b5bc552 100644
--- a/src/usr/local/www/widgets/widgets/log.widget.php
+++ b/src/usr/local/www/widgets/widgets/log.widget.php
@@ -239,11 +239,11 @@ events.push(function(){
 			<div class="col-sm-6 checkbox">
 			<?php $include_acts = explode(" ", strtolower($nentriesacts)); ?>
 			<label><input name="actpass" type="checkbox" value="Pass"
-					<?=(in_array('pass', $include_acts) ? 'checked="checked"':'')?> />Pass</label>
+					<?=(in_array('pass', $include_acts) ? 'checked':'')?> />Pass</label>
 				<label><input name="actblock" type="checkbox" value="Block"
-					<?=(in_array('block', $include_acts) ? 'checked="checked"':'')?> />Block</label>
+					<?=(in_array('block', $include_acts) ? 'checked':'')?> />Block</label>
 				<label><input name="actreject" type="checkbox" value="Reject"
-					<?=(in_array('reject', $include_acts) ? 'checked="checked"':'')?> />Reject</label>
+					<?=(in_array('reject', $include_acts) ? 'checked':'')?> />Reject</label>
 			</div>
 		</div>
 
@@ -254,7 +254,7 @@ events.push(function(){
 				<select name="filterlogentriesinterfaces" class="form-control">
 			<?php foreach (array("All" => "ALL") + get_configured_interface_with_descr() as $iface => $ifacename):?>
 				<option value="<?=$iface?>"
-						<?=($nentriesinterfaces==$iface?'selected="selected"':'')?>><?=htmlspecialchars($ifacename)?></option>
+						<?=($nentriesinterfaces==$iface?'selected':'')?>><?=htmlspecialchars($ifacename)?></option>
 			<?php endforeach;?>
 			</select>
 			</div>
diff --git a/src/usr/local/www/widgets/widgets/services_status.widget.php b/src/usr/local/www/widgets/widgets/services_status.widget.php
index f1dbe6b..2f2d9d9 100644
--- a/src/usr/local/www/widgets/widgets/services_status.widget.php
+++ b/src/usr/local/www/widgets/widgets/services_status.widget.php
@@ -121,9 +121,9 @@ if (count($services) > 0) {
 	<div class="form-group">
 		<label for="inputPassword3" class="col-sm-3 control-label">Hidden services</label>
 		<div class="col-sm-6">
-			<select multiple="multiple" name="servicestatusfilter[]" class="form-control" height="5">
+			<select multiple name="servicestatusfilter[]" class="form-control" height="5">
 			<?php foreach ($services as $service): ?>
-				<option <?=(in_array($service['name'], $skipservices)?'selected="selected"':'')?>><?=$service['name']?></option>
+				<option <?=(in_array($service['name'], $skipservices)?'selected':'')?>><?=$service['name']?></option>
 			<?php endforeach; ?>
 			</select>
 		</div>
diff --git a/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php b/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php
index 36f2dac..a274935 100644
--- a/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php
+++ b/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php
@@ -217,7 +217,7 @@ function getBoolValueFromConfig(&$configArray, $valueKey, $defaultValue) {
 				<input type="checkbox"
 					id="thermal_sensors_widget_show_raw_output"
 					name="thermal_sensors_widget_show_raw_output"
-					value="<?= $thermal_sensors_widget_showRawOutput; ?>" <?= ($thermal_sensors_widget_showRawOutput) ? " checked='checked'" : ""; ?> />
+					value="<?= $thermal_sensors_widget_showRawOutput; ?>" <?= ($thermal_sensors_widget_showRawOutput) ? " checked" : ""; ?> />
 			</td>
 		</tr>
 		<tr>
@@ -235,7 +235,7 @@ function getBoolValueFromConfig(&$configArray, $valueKey, $defaultValue) {
 				<input type="checkbox"
 					id="thermal_sensors_widget_show_full_sensor_name"
 					name="thermal_sensors_widget_show_full_sensor_name"
-					value="<?= $thermal_sensors_widget_showFullSensorName; ?>" <?= ($thermal_sensors_widget_showFullSensorName) ? " checked='checked'" : ""; ?> />
+					value="<?= $thermal_sensors_widget_showFullSensorName; ?>" <?= ($thermal_sensors_widget_showFullSensorName) ? " checked" : ""; ?> />
 			</td>
 		</tr>
 		<tr>
diff --git a/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php b/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php
index 19e670e..b1131f8 100644
--- a/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php
+++ b/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php
@@ -165,7 +165,7 @@ foreach ($ifdescrs as $ifname => $ifdescr):
 		<div class="col-sm-6 checkbox">
 <?php foreach ($ifdescrs as $ifname => $ifdescr): ?>
 			<label>
-				<input type="checkbox" name="shown[]"<?= $ifname?>]" value="<?=$ifname?>" <?= ($shown[$ifname]) ? "checked=\"checked\"":""?> />
+				<input type="checkbox" name="shown[]"<?= $ifname?>]" value="<?=$ifname?>" <?= ($shown[$ifname]) ? "checked":""?> />
 				<?=$ifname?>
 			</label>
 <?php endforeach; ?>
@@ -175,11 +175,11 @@ foreach ($ifdescrs as $ifname => $ifdescr):
 		<label for="scale_type_up" class="col-sm-3 control-label">Default Autoscale</label>
 		<div class="col-sm-6 checkbox">
 			<label>
-				<input name="scale_type" type="radio" id="scale_type_up" value="up" <?=($config["widgets"]["trafficgraphs"]["scale_type"]=="follow" ? '' : 'checked="checked"')?> />
+				<input name="scale_type" type="radio" id="scale_type_up" value="up" <?=($config["widgets"]["trafficgraphs"]["scale_type"]=="follow" ? '' : 'checked')?> />
 				up
 			</label>
 			<label>
-				<input name="scale_type" type="radio" id="scale_type_follow" value="up" <?=($config["widgets"]["trafficgraphs"]["scale_type"]=="follow" ? 'checked="checked"' : '')?> />
+				<input name="scale_type" type="radio" id="scale_type_follow" value="up" <?=($config["widgets"]["trafficgraphs"]["scale_type"]=="follow" ? 'checked' : '')?> />
 				follow
 			</label>
 		</div>