diff --git a/app/acf-util/welcome-html.lsp b/app/acf-util/welcome-html.lsp index 3b071cb80d9075a5540e36bb1f8c5217967394ef..1f523b55c43d40e613d2bdcef7e06468d62e8475 100644 --- a/app/acf-util/welcome-html.lsp +++ b/app/acf-util/welcome-html.lsp @@ -177,7 +177,7 @@ <span class="data-title">Uptime</span> <span id="uptime" class="uptime"> <%= uptime %><br> - <script nonce="NONCE_PLACEHOLDER" type="application/javascript"> + <script type="application/javascript"> // IMPORT UPTIME FOR JS LIVE TIMER if (location.href.includes("welcome/read")) { let increment = "<%= up_time or 'unknown' %>"; @@ -217,7 +217,7 @@ print ("<span class='nan'>N/A<span>") end %> - <script nonce="NONCE_PLACEHOLDER" type="application/javascript" defer> + <script type="application/javascript" defer> // CONVERT TEMP TO FAHRENHEIT if (((<%= tonumber(api.value.cpuTemp.value) %>) < 50000) && (window.localStorage.getItem('toggle-degree') === 'fahrenheit')) { document.getElementById("cpuTemp").innerHTML = ((Math.ceil(((<%= tonumber(api.value.boardTemp.value) %>) / 1000) * 9 / 5) + 32) + " °F | <span class='normal'>" + (Math.floor(((<%= tonumber(api.value.cpuTemp.value) %>) / 1000) * 9 / 5) + 32)) + " °F</span>"; diff --git a/app/alpine-baselayout/health-networkstats-html.lsp b/app/alpine-baselayout/health-networkstats-html.lsp index eaad8859b379cc0021eedfef37219ba18e44788c..91f59f3aafc287abf87d3fe7c3ea983236071846 100644 --- a/app/alpine-baselayout/health-networkstats-html.lsp +++ b/app/alpine-baselayout/health-networkstats-html.lsp @@ -37,26 +37,26 @@ width: auto; } </style> -<!--[if IE]><script nonce="NONCE_PLACEHOLDER" type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/excanvas.js"></script><![endif]--> -<script nonce="NONCE_PLACEHOLDER" type="text/javascript"> +<!--[if IE]><script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/excanvas.js"></script><![endif]--> +<script type="text/javascript"> if (typeof jQuery == 'undefined') { - document.write('<script nonce="NONCE_PLACEHOLDER" type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>'); + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>'); } </script> -<script nonce="NONCE_PLACEHOLDER" type="text/javascript"> +<script type="text/javascript"> if (typeof $.plot == 'undefined') { - document.write('<script nonce="NONCE_PLACEHOLDER" type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.flot.js"><\/script>'); + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.flot.js"><\/script>'); } </script> -<script nonce="NONCE_PLACEHOLDER" type="text/javascript"> +<script type="text/javascript"> if (typeof $.plot.formatDate == 'undefined') { - document.write('<script nonce="NONCE_PLACEHOLDER" type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.flot.time.js"><\/script>'); + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.flot.time.js"><\/script>'); } </script> -<script nonce="NONCE_PLACEHOLDER" type="text/javascript"> +<script type="text/javascript"> var interval = 1000; var duration = 60000; var lastdata = <%= json.encode(view) %>; @@ -124,7 +124,7 @@ val.data = []; }); Update(); - ID = window.setInterval(Update, interval); + ID = window.setInterval("Update()", interval); $("#Start").attr("disabled","disabled"); $("#Stop").removeAttr("disabled"); } diff --git a/app/template-html.lsp b/app/template-html.lsp index 49a7a1f37d1511819f81554afc14312a309e5985..38d2bc2e5cc6daac64c2ba9dc0974645f52d4154 100644 --- a/app/template-html.lsp +++ b/app/template-html.lsp @@ -64,20 +64,20 @@ end <link rel="stylesheet" type="text/css" href="<%= html.html_escape(pageinfo.wwwprefix..pageinfo.skin.."/"..posix.basename(pageinfo.skin).."-ie.css") %>"> <![endif]--> <!-- UNPKG JS CDN FOR LATEST CHART.JS --> - <script nonce="NONCE_PLACEHOLDER" type="application/javascript" src="https://cdn.jsdelivr.net/npm/chart.js/dist/chart.umd.min.js"></script> - <script nonce="NONCE_PLACEHOLDER" type="application/javascript" src="https://cdn.jsdelivr.net/npm/luxon@latest"></script> - <script nonce="NONCE_PLACEHOLDER" type="application/javascript" src="https://cdn.jsdelivr.net/npm/chartjs-adapter-luxon@latest/dist/chartjs-adapter-luxon.umd.min.js"></script> - <script nonce="NONCE_PLACEHOLDER" type="application/javascript" src="https://cdn.jsdelivr.net/npm/chartjs-plugin-streaming@latest"></script> + <script type="application/javascript" src="https://cdn.jsdelivr.net/npm/chart.js/dist/chart.umd.min.js"></script> + <script type="application/javascript" src="https://cdn.jsdelivr.net/npm/luxon@latest"></script> + <script type="application/javascript" src="https://cdn.jsdelivr.net/npm/chartjs-adapter-luxon@latest/dist/chartjs-adapter-luxon.umd.min.js"></script> + <script type="application/javascript" src="https://cdn.jsdelivr.net/npm/chartjs-plugin-streaming@latest"></script> <!-- UNPKG JS CDN FOR LATEST HIGHLIGHT.JS --> - <script nonce="NONCE_PLACEHOLDER" type="application/javascript" src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@latest/build/highlight.min.js"></script> + <script type="application/javascript" src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@latest/build/highlight.min.js"></script> <!-- INITIALIZE HIGHLIGHT.JS --> - <script nonce="NONCE_PLACEHOLDER" defer type="application/javascript">hljs.highlightAll()</script> + <script defer type="application/javascript">hljs.highlightAll()</script> <!-- UNPKG JS CDN FOR LATEST JQUERY --> - <script nonce="NONCE_PLACEHOLDER" type="application/javascript" src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script> + <script type="application/javascript" src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script> <!-- GLOBAL FUNCTIONS --> - <script nonce="NONCE_PLACEHOLDER" defer type="application/javascript" src="<%= html.html_escape(pageinfo.wwwprefix..pageinfo.skin.."/"..posix.basename(pageinfo.skin)..".js") %>"></script> + <script defer type="application/javascript" src="<%= html.html_escape(pageinfo.wwwprefix..pageinfo.skin.."/"..posix.basename(pageinfo.skin)..".js") %>"></script> <!-- HIDE LOGGON PAGE FOR AUTH USERS --> - <script nonce="NONCE_PLACEHOLDER" type="application/javascript"> let user = "<%= session.userinfo %>"; if ((user !== "nil") && (window.location.href.indexOf("logon/logon") > -1)) {window.location.href = '//' + window.location.hostname + '/cgi-bin/acf/acf-util/welcome/read'}</script> + <script type="application/javascript"> let user = "<%= session.userinfo %>"; if ((user !== "nil") && (window.location.href.indexOf("logon/logon") > -1)) {window.location.href = '//' + window.location.hostname + '/cgi-bin/acf/acf-util/welcome/read'}</script> </head> <% end -- pageinfo.skinned %> <%