From c4b60a9a760b7eeffaa0f7aa56ae609fb620550c Mon Sep 17 00:00:00 2001 From: Colin Fleming Date: Sun, 29 Nov 2015 17:37:43 +0000 Subject: Tidy up Boolean operators for HTML5 Remove the XHTML standard Boolean operators (makes reading HTML much simpler). --- src/usr/local/www/crash_reporter.php | 2 +- src/usr/local/www/firewall_nat.php | 2 +- src/usr/local/www/firewall_nat_1to1.php | 2 +- src/usr/local/www/firewall_nat_npt.php | 2 +- src/usr/local/www/firewall_nat_out.php | 2 +- src/usr/local/www/firewall_rules.php | 2 +- src/usr/local/www/firewall_rules_edit.php | 6 +++--- src/usr/local/www/guiconfig.inc | 4 ++-- src/usr/local/www/interfaces.php | 2 +- src/usr/local/www/interfaces_assign.php | 4 ++-- src/usr/local/www/pkg.php | 4 ++-- src/usr/local/www/pkg_edit.php | 6 +++--- src/usr/local/www/status_lb_pool.php | 4 ++-- src/usr/local/www/system_usermanager.php | 4 ++-- src/usr/local/www/system_usermanager_settings_ldapacpicker.php | 2 +- src/usr/local/www/widgets/widgets/gateways.widget.php | 8 ++++---- src/usr/local/www/widgets/widgets/log.widget.php | 8 ++++---- src/usr/local/www/widgets/widgets/services_status.widget.php | 4 ++-- src/usr/local/www/widgets/widgets/thermal_sensors.widget.php | 4 ++-- src/usr/local/www/widgets/widgets/traffic_graphs.widget.php | 6 +++--- 20 files changed, 39 insertions(+), 39 deletions(-) (limited to 'src/usr/local/www') 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);

-
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; - 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); - 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; - 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); - 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++): - 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 .= " '; + $flagtable .= $pconfig['tcpflags_any'] ? 'checked':'' . '/>'; $flagtable .= '' . gettext(" Any flags.") . ''; 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 " $portinfo):?> - @@ -570,7 +570,7 @@ display_top_tabs($tab_array); "; 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 "Rows per page: \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"; } ?> 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): ?> - /> + /> Display: 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(){
+ />Pass + />Block + />Reject
@@ -254,7 +254,7 @@ events.push(function(){ 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) {
- - +
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) { /> + value="" /> @@ -235,7 +235,7 @@ function getBoolValueFromConfig(&$configArray, $valueKey, $defaultValue) { /> + value="" /> 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):
$ifdescr): ?> @@ -175,11 +175,11 @@ foreach ($ifdescrs as $ifname => $ifdescr):
-- cgit v1.1