diff options
62 files changed, 134 insertions, 66 deletions
diff --git a/src/etc/inc/authgui.inc b/src/etc/inc/authgui.inc index f22e7c3..700643f 100644 --- a/src/etc/inc/authgui.inc +++ b/src/etc/inc/authgui.inc @@ -228,7 +228,11 @@ if ($local_ip == false) { <head> <link rel="stylesheet" href="/bootstrap/css/pfSense.css" /> <title><?=gettext("Login"); ?></title> - <script>var events = events || [];</script> + <script type="text/javascript> + //<![CDATA{ + var events = events || []; + //]]> + </script> </head> <body id="login" class="no-menu"> <div id="jumbotron"> @@ -280,7 +284,8 @@ if ($local_ip == false) { </div> </div> - <script> + <script type="text/javascript"> + //!<[CDATA[ events.push(function() { document.cookie= "cookie_test=1" + @@ -294,6 +299,7 @@ if ($local_ip == false) { // Delete it document.cookie = "cookie_test=1; expires=Thu, 01-Jan-1970 00:00:01 GMT"; }); + //]]> </script> <?php require('foot.inc'); diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index df2cb32..775f9a7 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -1791,9 +1791,11 @@ function update_output_window($text) { $log = preg_replace("/\n/", "\\n", $text); if ($pkg_interface != "console") { ?> -<script> +<script type="text/javascript"> +//<![CDATA[ document.getElementById("output").textContent="<?=htmlspecialchars($log)?>"; document.getElementById("output").scrollTop = document.getElementById("output").scrollHeight; +//]]> </script> <?php } @@ -1824,7 +1826,11 @@ function update_progress_bar($percent, $first_time) { $percent = 1; } if ($pkg_interface <> "console") { - echo '<script>document.getElementById("progressbar").style.width="'. $percent.'%";</script>'; + echo '<script type="text/javascript">'; + echo "\n//<![CDATA[\n"; + echo 'document.getElementById("progressbar").style.width="'. $percent.'%";' + echo "\n//]]>\n"; + echo '</script>'; } else { if (!($first_time)) { echo "\x08\x08\x08\x08\x08"; diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index fb00dcb..88d48fa 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -2232,7 +2232,12 @@ function post_redirect($page, $params) { foreach ($params as $key => $value) { print "<input type=\"hidden\" name=\"{$key}\" value=\"{$value}\" />\n"; } - print "</form><script type=\"text/javascript\">document.formredir.submit();</script>\n"; + print "</form>\n"; + print "<script type=\"text/javascript\">\n"; + print "//<![CDATA[\n"; + print "document.formredir.submit();\n"; + print "//]]>\n"; + print "</script>\n"; print "</body></html>\n"; } diff --git a/src/usr/local/www/Thumbs.db b/src/usr/local/www/Thumbs.db Binary files differnew file mode 100644 index 0000000..91d1daa --- /dev/null +++ b/src/usr/local/www/Thumbs.db diff --git a/src/usr/local/www/diag_arp.php b/src/usr/local/www/diag_arp.php index 9455ab0..1b2270f 100644 --- a/src/usr/local/www/diag_arp.php +++ b/src/usr/local/www/diag_arp.php @@ -372,7 +372,7 @@ $mac_man = load_mac_manufacturer_table(); </table> </div> -<script> +<script type="text/javascript> //<![CDATA[ // Clear the "loading" div once the page has loaded" events.push(function(){ diff --git a/src/usr/local/www/diag_dump_states.php b/src/usr/local/www/diag_dump_states.php index a195e25..c4c93d6 100755 --- a/src/usr/local/www/diag_dump_states.php +++ b/src/usr/local/www/diag_dump_states.php @@ -98,7 +98,8 @@ $pgtitle = array(gettext("Diagnostics"), gettext("Show States")); include("head.inc"); ?> -<script> +<script type="text/javascript"> +//<![CDATA[ events.push(function(){ $('a[data-entry]').on('click', function(){ var el = $(this); @@ -119,6 +120,7 @@ events.push(function(){ }); }); }); +//]]> </script> <?php diff --git a/src/usr/local/www/diag_dump_states_sources.php b/src/usr/local/www/diag_dump_states_sources.php index 2e11a85..b0c216f 100644 --- a/src/usr/local/www/diag_dump_states_sources.php +++ b/src/usr/local/www/diag_dump_states_sources.php @@ -100,7 +100,8 @@ display_top_tabs($tab_array); ?> -<script> +<script type="text/javascript"> +//<![CDATA[ events.push(function(){ $('a[data-entry]').on('click', function(){ var el = $(this); @@ -121,6 +122,7 @@ events.push(function(){ }); }); }); +//]]> </script> <?php diff --git a/src/usr/local/www/diag_limiter_info.php b/src/usr/local/www/diag_limiter_info.php index 833b3da..5425e6c 100644 --- a/src/usr/local/www/diag_limiter_info.php +++ b/src/usr/local/www/diag_limiter_info.php @@ -91,7 +91,8 @@ if ($input_errors) print_input_errors($input_errors); ?> -<script> +<script type="text/javascript"> +//<![CDATA[ function getlimiteractivity() { $.ajax( '/diag_limiter_info.php', @@ -110,6 +111,7 @@ if ($input_errors) setInterval('getlimiteractivity()', 2500); getlimiteractivity(); }); +//]]> </script> <div class="panel panel-default"> diff --git a/src/usr/local/www/diag_logs_filter_summary.php b/src/usr/local/www/diag_logs_filter_summary.php index 78d741e..abc446d 100644 --- a/src/usr/local/www/diag_logs_filter_summary.php +++ b/src/usr/local/www/diag_logs_filter_summary.php @@ -144,7 +144,8 @@ function stat_block($summary, $stat, $num) { function pie_block($summary, $stat, $num, $chartnum) { global $fields, $segcolors, $gotlines, $numcolors; ?> -<script> +<script type="text/javascript"> +//<![CDATA[ var pie = new d3pie("pieChart<?=$chartnum?>", { "header": { "title": { @@ -248,6 +249,7 @@ var pie = new d3pie("pieChart<?=$chartnum?>", { }, "callbacks": {} }); +//]]> </script> <?php } diff --git a/src/usr/local/www/diag_logs_settings.php b/src/usr/local/www/diag_logs_settings.php index e8d8731..d8de257 100644 --- a/src/usr/local/www/diag_logs_settings.php +++ b/src/usr/local/www/diag_logs_settings.php @@ -479,7 +479,7 @@ $form->add($section); print $form; ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/diag_pf_info.php b/src/usr/local/www/diag_pf_info.php index 492f988..c553b34 100644 --- a/src/usr/local/www/diag_pf_info.php +++ b/src/usr/local/www/diag_pf_info.php @@ -111,7 +111,8 @@ $form->add($section); print $form; ?> -<script> +<script type="text/javascript"> +//<![CDATA[ function getpfinfo() { if (!$('#refresh').is(':checked')) return; @@ -131,6 +132,7 @@ print $form; setInterval('getpfinfo()', 2500); getpfinfo(); }); +//]]> </script> <div class="panel panel-default"> diff --git a/src/usr/local/www/diag_routes.php b/src/usr/local/www/diag_routes.php index 08da04f..58c4924 100644 --- a/src/usr/local/www/diag_routes.php +++ b/src/usr/local/www/diag_routes.php @@ -138,7 +138,8 @@ $section->addInput(new Form_Input( $form->add($section); print $form; ?> -<script> +<script type="text/javascript"> +//<![CDATA[ function update_routes(section) { $.ajax( '/diag_routes.php', @@ -207,6 +208,7 @@ events.push(function(){ e.preventDefault(); }); }); +//]]> </script> <div class="panel panel-default"> diff --git a/src/usr/local/www/diag_system_activity.php b/src/usr/local/www/diag_system_activity.php index 7222288..810c39a 100644 --- a/src/usr/local/www/diag_system_activity.php +++ b/src/usr/local/www/diag_system_activity.php @@ -81,7 +81,8 @@ if ($input_errors) print_input_errors($input_errors); ?> -<script> +<script type="text/javascript"> +//<![CDATA[ function getcpuactivity() { $.ajax( '/diag_system_activity.php', @@ -102,6 +103,7 @@ events.push(function(){ setInterval('getcpuactivity()', 2500); getcpuactivity(); }); +//]]> </script> <div class="panel panel-default"> diff --git a/src/usr/local/www/diag_system_pftop.php b/src/usr/local/www/diag_system_pftop.php index db06ed2..4191720 100644 --- a/src/usr/local/www/diag_system_pftop.php +++ b/src/usr/local/www/diag_system_pftop.php @@ -171,7 +171,8 @@ $form->add($section); print $form; ?> -<script> +<script type="text/javascript"> +//<![CDATA[ function getpftopactivity() { $.ajax( '/diag_system_pftop.php', @@ -190,6 +191,7 @@ print $form; setInterval('getpftopactivity()', 2500); getpftopactivity(); }); +//]]> </script> <?php ?> @@ -200,7 +202,8 @@ print $form; </div> </div> -<script> +<script type="text/javascript"> +//<![CDATA[ events.push(function(){ $('#viewtype').on('change', function(){ if (['queue', 'label', 'rules'].indexOf($(this).val()) > -1) @@ -209,5 +212,6 @@ events.push(function(){ $("#sorttype, #sorttypediv, #statesdiv, #states").parents('.form-group').show(); }); }); +//]]> </script> <?php include("foot.inc"); diff --git a/src/usr/local/www/diag_tables.php b/src/usr/local/www/diag_tables.php index b75b29b..5fb0eba 100644 --- a/src/usr/local/www/diag_tables.php +++ b/src/usr/local/www/diag_tables.php @@ -140,7 +140,8 @@ $form->add($section); print $form; ?> -<script> +<script type="text/javascript"> +//<![CDATA[ events.push(function(){ $('a[data-entry]').on('click', function(){ var el = $(this); @@ -159,6 +160,7 @@ events.push(function(){ }); }); }); +//]]> </script> <div class="table-responsive"> diff --git a/src/usr/local/www/edit.php b/src/usr/local/www/edit.php index 055020e..f4ecde7 100644 --- a/src/usr/local/www/edit.php +++ b/src/usr/local/www/edit.php @@ -149,7 +149,8 @@ require("head.inc"); </div> </div> -<script> +<script type="text/javascript"> +//<![CDATA[ function loadFile() { jQuery("#fileStatus").html(""); jQuery("#fileStatusBox").show(500); @@ -350,6 +351,7 @@ var Base64 = { loadFile(); }); <?php endif; ?> +//]]> </script> <?php include("foot.inc"); diff --git a/src/usr/local/www/exec.php b/src/usr/local/www/exec.php index dc20057..f9b8f28 100644 --- a/src/usr/local/www/exec.php +++ b/src/usr/local/www/exec.php @@ -129,7 +129,8 @@ $closehead = false; $pgtitle = array(gettext("Diagnostics"), gettext("Execute command")); include("head.inc"); ?> -<script> +<script type="text/javascript"> +//<![CDATA[ // Create recall buffer array (of encoded strings). <?php @@ -304,11 +305,13 @@ if (!isBlank($_POST['txtCommand'])):?> puts(" </pre>"); puts("</div>"); ?> -<script> +<script type="text/javascript"> +//<![CDATA[ events.push(function(){ // Scroll to the bottom of the page to more easily see the results of a PHP exec command $("html, body").animate({ scrollTop: $(document).height() }, 1000); }); +//]]> </script> <?php } diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php index cdb4337..3f2563b 100755 --- a/src/usr/local/www/firewall_aliases_edit.php +++ b/src/usr/local/www/firewall_aliases_edit.php @@ -737,7 +737,7 @@ $form->add($section); print $form; ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/firewall_nat.php b/src/usr/local/www/firewall_nat.php index 5cf8cf1..c67c3cc 100644 --- a/src/usr/local/www/firewall_nat.php +++ b/src/usr/local/www/firewall_nat.php @@ -386,7 +386,8 @@ endforeach; </nav> </form> -<script> +<script type="text/javascript"> +//<![CDATA[ events.push(function() { // Make rules sortable @@ -402,6 +403,7 @@ events.push(function() { $('[id^=frc]').prop('checked', true); }); }); +//]]> </script> <?php diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php index dad8376..a2213b8 100644 --- a/src/usr/local/www/firewall_nat_1to1.php +++ b/src/usr/local/www/firewall_nat_1to1.php @@ -286,7 +286,8 @@ display_top_tabs($tab_array); </div> -<script> +<script type="text/javascript"> +//<![CDATA[ events.push(function() { // Make rules sortable @@ -302,5 +303,6 @@ events.push(function() { $('[id^=frc]').prop('checked', true); }); }); +//]]> </script> <?php include("foot.inc"); ?> diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php index aae2dee..f42eae7 100644 --- a/src/usr/local/www/firewall_nat_out.php +++ b/src/usr/local/www/firewall_nat_out.php @@ -660,7 +660,8 @@ endif; ?> </div> -<script> +<script type="text/javascript"> +//<![CDATA[ events.push(function() { // Make rules sortable @@ -676,6 +677,7 @@ events.push(function() { $('[id^=frc]').prop('checked', true); }); }); +//]]> </script> <?php include("foot.inc"); diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php index 48b81ab..c26a116 100644 --- a/src/usr/local/www/firewall_rules.php +++ b/src/usr/local/www/firewall_rules.php @@ -716,7 +716,8 @@ for ($i = 0; isset($a_filter[$i]); $i++): </div> </div> -<script> +<script type="text/javascript"> +//<![CDATA[ events.push(function() { // Make rules sortable @@ -732,6 +733,7 @@ events.push(function() { $('[id^=frc]').prop('checked', true); }); }); +//]]> </script> <?php include("foot.inc");?> diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index 0088dd4..479eaf6 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -1669,7 +1669,7 @@ $form->add($section); echo $form; ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/firewall_shaper_vinterface.php b/src/usr/local/www/firewall_shaper_vinterface.php index f743644..93e1cff 100644 --- a/src/usr/local/www/firewall_shaper_vinterface.php +++ b/src/usr/local/www/firewall_shaper_vinterface.php @@ -454,7 +454,7 @@ else { </table> </div> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/firewall_virtual_ip_edit.php b/src/usr/local/www/firewall_virtual_ip_edit.php index bcb1428..ebdccc4 100644 --- a/src/usr/local/www/firewall_virtual_ip_edit.php +++ b/src/usr/local/www/firewall_virtual_ip_edit.php @@ -483,7 +483,7 @@ print($form); 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)?> </div> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/foot.inc b/src/usr/local/www/foot.inc index ca1c633..10a8355 100755 --- a/src/usr/local/www/foot.inc +++ b/src/usr/local/www/foot.inc @@ -28,11 +28,13 @@ <script src="/jquery/pfSenseHelpers.js"></script> <script src="sortable/sortable.js"></script> - <script> + <script type="text/javascript"> + //<![CDATA[ // Un-hide the "Top of page" icons if the page is larger than the window if ($(document).height() > $(window).height()) { $('[id^=tp]').show(); } + //]]> </script> </body> </html> diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc index 9fb5e08..944bedb 100755 --- a/src/usr/local/www/head.inc +++ b/src/usr/local/www/head.inc @@ -86,7 +86,11 @@ if (isset($config['system']['webgui']['webguicss'])) { <link rel="stylesheet" href="font-awesome/css/font-awesome.min.css"> <link rel="stylesheet" href="sortable/sortable-theme-bootstrap.css"> <title><?=$tabtitle?></title> - <script>var events = events || [];</script> + <script type="text/javascript"> + //<![CDATA[ + var events = events || []; + //]]> + </script> </head> <?php @@ -562,7 +566,7 @@ if (are_notices_pending()):?> </div> </div> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ $('#clearallnotices').click(function() { diff --git a/src/usr/local/www/index.php b/src/usr/local/www/index.php index 441cba9..28cc1f4 100644 --- a/src/usr/local/www/index.php +++ b/src/usr/local/www/index.php @@ -398,7 +398,8 @@ foreach ($widgets as $widgetname => $widgetconfig) <?php endforeach; ?> </div> -<script> +<script type="text/javascript"> +//<![CDATA[ function updateWidgets(newWidget) { var sequence = ''; @@ -482,6 +483,7 @@ events.push(function() { }); }); +//]]> </script> <?php //build list of javascript include files diff --git a/src/usr/local/www/interfaces_ppps_edit.php b/src/usr/local/www/interfaces_ppps_edit.php index 01b200b..d18e338 100644 --- a/src/usr/local/www/interfaces_ppps_edit.php +++ b/src/usr/local/www/interfaces_ppps_edit.php @@ -1005,7 +1005,7 @@ print($form); ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ var showadvanced = false; diff --git a/src/usr/local/www/interfaces_vlan.php b/src/usr/local/www/interfaces_vlan.php index edf5a80..cf32902 100644 --- a/src/usr/local/www/interfaces_vlan.php +++ b/src/usr/local/www/interfaces_vlan.php @@ -179,7 +179,7 @@ display_top_tabs($tab_array); 'tagging will still work, but the reduced MTU may cause problems.<br />See the '. '%s handbook for information on supported cards.'),$g['product_name']), info)?> </div> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ // Select 'delete button' clicks, extract the id, set the hidden input values and submit diff --git a/src/usr/local/www/load_balancer_pool_edit.php b/src/usr/local/www/load_balancer_pool_edit.php index 76fe61c..9d5c98b 100644 --- a/src/usr/local/www/load_balancer_pool_edit.php +++ b/src/usr/local/www/load_balancer_pool_edit.php @@ -481,7 +481,7 @@ $form->add($section); print($form); ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/load_balancer_virtual_server_edit.php b/src/usr/local/www/load_balancer_virtual_server_edit.php index 2ac9889..b4472dc 100644 --- a/src/usr/local/www/load_balancer_virtual_server_edit.php +++ b/src/usr/local/www/load_balancer_virtual_server_edit.php @@ -305,7 +305,7 @@ print($form); print_info_box(gettext('Don\'t forget to add a firewall rule for the virtual server/pool after you have finished setting it up.')); ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ // --------- Autocomplete ----------------------------------------------------------------------------------------- diff --git a/src/usr/local/www/pkg_mgr.php b/src/usr/local/www/pkg_mgr.php index fb7125d..0c5df79 100644 --- a/src/usr/local/www/pkg_mgr.php +++ b/src/usr/local/www/pkg_mgr.php @@ -233,7 +233,7 @@ endif;?> </div> </div> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/reboot.php b/src/usr/local/www/reboot.php index 25e7c99..916565b 100755 --- a/src/usr/local/www/reboot.php +++ b/src/usr/local/www/reboot.php @@ -90,7 +90,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') { <div id="countdown" style="text-align: center;"></div> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ function startCountdown(time) { diff --git a/src/usr/local/www/services_captiveportal_mac_edit.php b/src/usr/local/www/services_captiveportal_mac_edit.php index ab8ee32..cb6d8ff 100644 --- a/src/usr/local/www/services_captiveportal_mac_edit.php +++ b/src/usr/local/www/services_captiveportal_mac_edit.php @@ -296,7 +296,7 @@ $form->add($section); print($form); ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ // Make the ‘Copy My MAC’ button a plain button, not a submit button diff --git a/src/usr/local/www/services_captiveportal_vouchers.php b/src/usr/local/www/services_captiveportal_vouchers.php index ba39b2f..51e0c80 100644 --- a/src/usr/local/www/services_captiveportal_vouchers.php +++ b/src/usr/local/www/services_captiveportal_vouchers.php @@ -638,7 +638,8 @@ print($form); ?> </div> -<script> +<script type="text/javascript"> +//<![CDATA[ events.push(function(){ // Hides all elements of the specified class. This will usually be a section or group @@ -680,6 +681,6 @@ events.push(function(){ }); generateButton.appendTo($('#publickey + .help-block')[0]); }); - +//]]> </script> <?php include("foot.inc"); diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php index 465b9f0..3a16993 100644 --- a/src/usr/local/www/services_dhcp.php +++ b/src/usr/local/www/services_dhcp.php @@ -1348,7 +1348,7 @@ if (!is_numeric($pool) && !($act == "newpool")) { } ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/services_dhcp_edit.php b/src/usr/local/www/services_dhcp_edit.php index 76a6cca..39223cc 100644 --- a/src/usr/local/www/services_dhcp_edit.php +++ b/src/usr/local/www/services_dhcp_edit.php @@ -684,7 +684,7 @@ $form->add($section); print($form); ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php index 89a9f67..0ebf441 100644 --- a/src/usr/local/www/services_dhcpv6.php +++ b/src/usr/local/www/services_dhcpv6.php @@ -949,7 +949,7 @@ endif; </a> </nav> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/services_dnsmasq.php b/src/usr/local/www/services_dnsmasq.php index 2184ea4..dabeb7d 100644 --- a/src/usr/local/www/services_dnsmasq.php +++ b/src/usr/local/www/services_dnsmasq.php @@ -479,7 +479,7 @@ endforeach; </a> </nav> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ // On clicking the "Apply" button, submit the main form, not the little form the button lives in diff --git a/src/usr/local/www/services_dyndns_edit.php b/src/usr/local/www/services_dyndns_edit.php index 8de71ff..ff4dbb4 100644 --- a/src/usr/local/www/services_dyndns_edit.php +++ b/src/usr/local/www/services_dyndns_edit.php @@ -417,7 +417,7 @@ print($form); // Certain input elements are hidden/shown based on the service type in the following script ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/services_ntpd.php b/src/usr/local/www/services_ntpd.php index cccc4a0..3340bdf 100644 --- a/src/usr/local/www/services_ntpd.php +++ b/src/usr/local/www/services_ntpd.php @@ -498,13 +498,14 @@ print($form); ?> -<script> +<script type="text/javascript"> +//<![CDATA[ // If this variable is declared, any help text will not be deleted when rows are added // IOW the help text will appear on every row retainhelp = true; </script> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/services_ntpd_gps.php b/src/usr/local/www/services_ntpd_gps.php index ef4946b..e457fd9 100644 --- a/src/usr/local/www/services_ntpd_gps.php +++ b/src/usr/local/www/services_ntpd_gps.php @@ -425,7 +425,7 @@ print($form); ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php index 39bef7d..08b8e41 100644 --- a/src/usr/local/www/services_router_advertisements.php +++ b/src/usr/local/www/services_router_advertisements.php @@ -402,7 +402,7 @@ $form->add($section); print($form); ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ // Suppress "Delete row" button if there are fewer than two rows diff --git a/src/usr/local/www/services_unbound.php b/src/usr/local/www/services_unbound.php index 8b49343..1552e07 100644 --- a/src/usr/local/www/services_unbound.php +++ b/src/usr/local/www/services_unbound.php @@ -360,7 +360,7 @@ $form->add($section); print($form); ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/services_unbound_acls.php b/src/usr/local/www/services_unbound_acls.php index bdfd911..b85565d 100644 --- a/src/usr/local/www/services_unbound_acls.php +++ b/src/usr/local/www/services_unbound_acls.php @@ -359,7 +359,7 @@ else // NOT 'edit' or 'add' </a> </nav> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ // Suppress "Delete row" button if there are fewer than two rows diff --git a/src/usr/local/www/status_graph.php b/src/usr/local/www/status_graph.php index dabf8a3..afe0933 100644 --- a/src/usr/local/www/status_graph.php +++ b/src/usr/local/www/status_graph.php @@ -204,7 +204,8 @@ $form->add($section); print $form; ?> -<script> +<script type="text/javascript"> +//<![CDATA[ function updateBandwidth(){ $.ajax( @@ -242,6 +243,7 @@ events.push(function(){ updateBandwidth(); }); +//]]> </script> <?php diff --git a/src/usr/local/www/system_advanced_admin.php b/src/usr/local/www/system_advanced_admin.php index 174fb7c..0cb4d50 100644 --- a/src/usr/local/www/system_advanced_admin.php +++ b/src/usr/local/www/system_advanced_admin.php @@ -557,7 +557,7 @@ $form->add($section); print $form; ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/system_advanced_firewall.php b/src/usr/local/www/system_advanced_firewall.php index a926da7..edce9f6 100644 --- a/src/usr/local/www/system_advanced_firewall.php +++ b/src/usr/local/www/system_advanced_firewall.php @@ -743,7 +743,7 @@ $section->add($group); print $form; ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ // Change help text based on the selector value diff --git a/src/usr/local/www/system_authservers.php b/src/usr/local/www/system_authservers.php index 70ae7fb..7f10912 100644 --- a/src/usr/local/www/system_authservers.php +++ b/src/usr/local/www/system_authservers.php @@ -748,7 +748,7 @@ if (isset($id) && $a_server[$id]) $form->add($section); print $form; ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ function select_clicked() { diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php index e1d6a52..223e1b9 100644 --- a/src/usr/local/www/system_certmanager.php +++ b/src/usr/local/www/system_certmanager.php @@ -1045,7 +1045,7 @@ $form->add($section); print $form; ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/system_gateways_edit.php b/src/usr/local/www/system_gateways_edit.php index 606aeca..d29c134 100644 --- a/src/usr/local/www/system_gateways_edit.php +++ b/src/usr/local/www/system_gateways_edit.php @@ -620,7 +620,8 @@ if ($input_errors) print_input_errors($input_errors); ?> -<script> +<script type="text/javascript"> +//<![CDATA[ var systemGatewaysEditRecalculate = function(){ var interval = $('#interval')[0].value; @@ -669,6 +670,7 @@ events.push(function(){ systemGatewaysEditRecalculate(); }); +//]]> </script> <?php diff --git a/src/usr/local/www/system_groupmanager.php b/src/usr/local/www/system_groupmanager.php index 6ca00e4..dfeb12f 100644 --- a/src/usr/local/www/system_groupmanager.php +++ b/src/usr/local/www/system_groupmanager.php @@ -452,7 +452,7 @@ if ($_GET['act'] != "new") print $form; ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/system_routes_edit.php b/src/usr/local/www/system_routes_edit.php index 22b5d44..34451ef 100644 --- a/src/usr/local/www/system_routes_edit.php +++ b/src/usr/local/www/system_routes_edit.php @@ -315,7 +315,7 @@ $form->add($section); print $form; ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ // --------- Autocomplete ----------------------------------------------------------------------------------------- diff --git a/src/usr/local/www/system_update_settings.php b/src/usr/local/www/system_update_settings.php index 93d0f56..9cd95ac 100644 --- a/src/usr/local/www/system_update_settings.php +++ b/src/usr/local/www/system_update_settings.php @@ -212,7 +212,7 @@ if(file_exists("/usr/local/bin/git") && $g['platform'] == $g['product_name']) { print($form); ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ // Update firmwareurl from preseturls or from the saved alternate if "Unofficial" is checked diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php index 3e2917c..90c59d3 100644 --- a/src/usr/local/www/system_usermanager.php +++ b/src/usr/local/www/system_usermanager.php @@ -842,7 +842,7 @@ $form->add($section); print $form; ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/system_usermanager_addprivs.php b/src/usr/local/www/system_usermanager_addprivs.php index f73c4e1..3440c2d 100644 --- a/src/usr/local/www/system_usermanager_addprivs.php +++ b/src/usr/local/www/system_usermanager_addprivs.php @@ -198,7 +198,7 @@ print($form); <div class="panel panel-body alert-info" id="pdesc">Select a privilege from the list above for a description"</div> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/system_usermanager_settings.php b/src/usr/local/www/system_usermanager_settings.php index 4133edb..957a8c2 100644 --- a/src/usr/local/www/system_usermanager_settings.php +++ b/src/usr/local/www/system_usermanager_settings.php @@ -134,8 +134,10 @@ if ($savemsg) if($save_and_test) { echo "<script>\n"; + echo "//<![CDATA[\n"; echo "myRef = window.open('system_usermanager_settings_test.php?authserver=".$pconfig['authmode']."','mywin','left=20,top=20,width=700,height=550,toolbar=1,resizable=0');\n"; echo "if (myRef==null || typeof(myRef)=='undefined') alert('" . gettext("Popup blocker detected. Action aborted.") ."');\n"; + echo "//]]>\n"; echo "</script>\n"; } diff --git a/src/usr/local/www/system_usermanager_settings_ldapacpicker.php b/src/usr/local/www/system_usermanager_settings_ldapacpicker.php index eb42034..d400b10 100644 --- a/src/usr/local/www/system_usermanager_settings_ldapacpicker.php +++ b/src/usr/local/www/system_usermanager_settings_ldapacpicker.php @@ -106,6 +106,7 @@ if ($_GET) { </STYLE> </head> <script type="text/javascript"> +//<![CDATA[ function post_choices() { var ous = <?php echo count($ous); ?>; @@ -122,6 +123,7 @@ function post_choices() { window.close(); --> } +//]]> </script> <body link="#0000CC" vlink="#0000CC" alink="#0000CC" > diff --git a/src/usr/local/www/vpn_l2tp.php b/src/usr/local/www/vpn_l2tp.php index bd61f1e..9021b4f 100644 --- a/src/usr/local/www/vpn_l2tp.php +++ b/src/usr/local/www/vpn_l2tp.php @@ -352,7 +352,7 @@ print($form); print_info_box(gettext("Don't forget to add a firewall rule to permit traffic from L2TP clients!"), info); ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/vpn_openvpn_csc.php b/src/usr/local/www/vpn_openvpn_csc.php index 9e2c3fa..c9e716e 100644 --- a/src/usr/local/www/vpn_openvpn_csc.php +++ b/src/usr/local/www/vpn_openvpn_csc.php @@ -586,7 +586,7 @@ if($act=="new" || $act=="edit"): ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/vpn_pppoe_edit.php b/src/usr/local/www/vpn_pppoe_edit.php index 10d4e16..e03757c 100644 --- a/src/usr/local/www/vpn_pppoe_edit.php +++ b/src/usr/local/www/vpn_pppoe_edit.php @@ -577,7 +577,7 @@ print($form); print_info_box(gettext('Don\'t forget to add a firewall rule to permit traffic from PPPoE clients')); ?> -<script> +<script type="text/javascript"> //<![CDATA[ events.push(function(){ |