From d49d6033b73bba1b38a0fdf285b90a70a5696b9c Mon Sep 17 00:00:00 2001 From: k-paulius Date: Sun, 14 Feb 2016 13:47:32 -0600 Subject: Perform HTML entity translation where & is used --- src/usr/local/www/diag_smart.php | 4 ++-- src/usr/local/www/system_advanced_admin.php | 2 +- src/usr/local/www/system_advanced_firewall.php | 4 ++-- src/usr/local/www/system_advanced_misc.php | 2 +- src/usr/local/www/system_advanced_network.php | 2 +- src/usr/local/www/system_advanced_notifications.php | 2 +- src/usr/local/www/system_advanced_sysctl.php | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/usr/local/www/diag_smart.php b/src/usr/local/www/diag_smart.php index 91f18f1..85ed8bd 100644 --- a/src/usr/local/www/diag_smart.php +++ b/src/usr/local/www/diag_smart.php @@ -70,7 +70,7 @@ $action = (isset($_POST['action']) ? $_POST['action'] : $_GET['action']); $pgtitle = array(gettext("Diagnostics"), gettext("S.M.A.R.T. Status")); if ($action != 'config') { - $pgtitle[] = gettext('Information & Tests'); + $pgtitle[] = htmlspecialchars(gettext('Information & Tests')); } else { $pgtitle[] = gettext('Config'); } @@ -122,7 +122,7 @@ if (!file_exists('/dev/' . $targetdev)) { } $tab_array = array(); -$tab_array[0] = array(gettext("Information & Tests"), ($action != 'config'), $_SERVER['PHP_SELF'] . "?action=default"); +$tab_array[0] = array(htmlspecialchars(gettext("Information & Tests")), ($action != 'config'), $_SERVER['PHP_SELF'] . "?action=default"); $tab_array[1] = array(gettext("Config"), ($action == 'config'), $_SERVER['PHP_SELF'] . "?action=config"); display_top_tabs($tab_array); diff --git a/src/usr/local/www/system_advanced_admin.php b/src/usr/local/www/system_advanced_admin.php index e54f5a6..28e9324 100644 --- a/src/usr/local/www/system_advanced_admin.php +++ b/src/usr/local/www/system_advanced_admin.php @@ -326,7 +326,7 @@ if ($savemsg) { $tab_array = array(); $tab_array[] = array(gettext("Admin Access"), true, "system_advanced_admin.php"); -$tab_array[] = array(gettext("Firewall & NAT"), false, "system_advanced_firewall.php"); +$tab_array[] = array(htmlspecialchars(gettext("Firewall & NAT")), false, "system_advanced_firewall.php"); $tab_array[] = array(gettext("Networking"), false, "system_advanced_network.php"); $tab_array[] = array(gettext("Miscellaneous"), false, "system_advanced_misc.php"); $tab_array[] = array(gettext("System Tunables"), false, "system_advanced_sysctl.php"); diff --git a/src/usr/local/www/system_advanced_firewall.php b/src/usr/local/www/system_advanced_firewall.php index 7fab70d..ce2edc1 100644 --- a/src/usr/local/www/system_advanced_firewall.php +++ b/src/usr/local/www/system_advanced_firewall.php @@ -401,7 +401,7 @@ if ($_POST) { } } -$pgtitle = array(gettext("System"), gettext("Advanced"), gettext("Firewall & NAT")); +$pgtitle = array(gettext("System"), gettext("Advanced"), htmlspecialchars(gettext("Firewall & NAT"))); include("head.inc"); if ($input_errors) { @@ -413,7 +413,7 @@ if ($savemsg) { $tab_array = array(); $tab_array[] = array(gettext("Admin Access"), false, "system_advanced_admin.php"); -$tab_array[] = array(gettext("Firewall & NAT"), true, "system_advanced_firewall.php"); +$tab_array[] = array(htmlspecialchars(gettext("Firewall & NAT")), true, "system_advanced_firewall.php"); $tab_array[] = array(gettext("Networking"), false, "system_advanced_network.php"); $tab_array[] = array(gettext("Miscellaneous"), false, "system_advanced_misc.php"); $tab_array[] = array(gettext("System Tunables"), false, "system_advanced_sysctl.php"); diff --git a/src/usr/local/www/system_advanced_misc.php b/src/usr/local/www/system_advanced_misc.php index 6506863..844b991 100644 --- a/src/usr/local/www/system_advanced_misc.php +++ b/src/usr/local/www/system_advanced_misc.php @@ -314,7 +314,7 @@ if ($savemsg) { $tab_array = array(); $tab_array[] = array(gettext("Admin Access"), false, "system_advanced_admin.php"); -$tab_array[] = array(gettext("Firewall & NAT"), false, "system_advanced_firewall.php"); +$tab_array[] = array(htmlspecialchars(gettext("Firewall & NAT")), false, "system_advanced_firewall.php"); $tab_array[] = array(gettext("Networking"), false, "system_advanced_network.php"); $tab_array[] = array(gettext("Miscellaneous"), true, "system_advanced_misc.php"); $tab_array[] = array(gettext("System Tunables"), false, "system_advanced_sysctl.php"); diff --git a/src/usr/local/www/system_advanced_network.php b/src/usr/local/www/system_advanced_network.php index d6edc7d..55099f3 100644 --- a/src/usr/local/www/system_advanced_network.php +++ b/src/usr/local/www/system_advanced_network.php @@ -182,7 +182,7 @@ if ($savemsg) { $tab_array = array(); $tab_array[] = array(gettext("Admin Access"), false, "system_advanced_admin.php"); -$tab_array[] = array(gettext("Firewall & NAT"), false, "system_advanced_firewall.php"); +$tab_array[] = array(htmlspecialchars(gettext("Firewall & NAT")), false, "system_advanced_firewall.php"); $tab_array[] = array(gettext("Networking"), true, "system_advanced_network.php"); $tab_array[] = array(gettext("Miscellaneous"), false, "system_advanced_misc.php"); $tab_array[] = array(gettext("System Tunables"), false, "system_advanced_sysctl.php"); diff --git a/src/usr/local/www/system_advanced_notifications.php b/src/usr/local/www/system_advanced_notifications.php index d3c40c3..78de94b 100644 --- a/src/usr/local/www/system_advanced_notifications.php +++ b/src/usr/local/www/system_advanced_notifications.php @@ -226,7 +226,7 @@ if ($savemsg) { $tab_array = array(); $tab_array[] = array(gettext("Admin Access"), false, "system_advanced_admin.php"); -$tab_array[] = array(gettext("Firewall & NAT"), false, "system_advanced_firewall.php"); +$tab_array[] = array(htmlspecialchars(gettext("Firewall & NAT")), false, "system_advanced_firewall.php"); $tab_array[] = array(gettext("Networking"), false, "system_advanced_network.php"); $tab_array[] = array(gettext("Miscellaneous"), false, "system_advanced_misc.php"); $tab_array[] = array(gettext("System Tunables"), false, "system_advanced_sysctl.php"); diff --git a/src/usr/local/www/system_advanced_sysctl.php b/src/usr/local/www/system_advanced_sysctl.php index a3c728f..d5c0e96 100644 --- a/src/usr/local/www/system_advanced_sysctl.php +++ b/src/usr/local/www/system_advanced_sysctl.php @@ -180,7 +180,7 @@ if (is_subsystem_dirty('sysctl') && ($act != "edit" )) { $tab_array = array(); $tab_array[] = array(gettext("Admin Access"), false, "system_advanced_admin.php"); -$tab_array[] = array(gettext("Firewall & NAT"), false, "system_advanced_firewall.php"); +$tab_array[] = array(htmlspecialchars(gettext("Firewall & NAT")), false, "system_advanced_firewall.php"); $tab_array[] = array(gettext("Networking"), false, "system_advanced_network.php"); $tab_array[] = array(gettext("Miscellaneous"), false, "system_advanced_misc.php"); $tab_array[] = array(gettext("System Tunables"), true, "system_advanced_sysctl.php"); -- cgit v1.1