From 2309e1c11abbfde4f0a931c99142b764017438d8 Mon Sep 17 00:00:00 2001
From: Michael Rotarius <13236924+Mirobit@users.noreply.github.com>
Date: Wed, 13 Sep 2023 14:40:52 +0200
Subject: [PATCH] Use .js files for javascript code

---
 assets/js/custom/datatables-peers.js  |  0
 assets/js/custom/datatables-rules.js  | 41 ++++++++++++++++++++++
 assets/js/custom/datatables-wallet.js |  8 +++++
 views/header.phtml                    |  2 +-
 views/hoster.phtml                    |  1 -
 views/peers.phtml                     | 36 ++++++++++----------
 views/rules.phtml                     | 49 +++------------------------
 views/wallet.phtml                    | 17 ++--------
 8 files changed, 75 insertions(+), 79 deletions(-)
 create mode 100644 assets/js/custom/datatables-peers.js
 create mode 100644 assets/js/custom/datatables-rules.js
 create mode 100644 assets/js/custom/datatables-wallet.js

diff --git a/assets/js/custom/datatables-peers.js b/assets/js/custom/datatables-peers.js
new file mode 100644
index 0000000..e69de29
diff --git a/assets/js/custom/datatables-rules.js b/assets/js/custom/datatables-rules.js
new file mode 100644
index 0000000..910d2de
--- /dev/null
+++ b/assets/js/custom/datatables-rules.js
@@ -0,0 +1,41 @@
+$(document).ready(function () {
+  $("#clientselection").multiselect();
+
+  var select = document.getElementById("action");
+  var selectT = document.getElementById("trigger");
+  displayInput(select.value, "ban", "bantime");
+  displayInput2(selectT.value, "client", "clientselectiond", "threshold");
+
+  var handleDataTableButtons = function () {
+    if ($("#rules").length) {
+      $("#rules").DataTable({
+        dom: '<"dataTables_exportbtn"B>ft',
+        paging: false,
+        order: [[0, "asc"]],
+        bInfo: false,
+        buttons: [
+          {
+            text: "Export",
+            extend: "csv",
+            className: "btn-sm btn-dark",
+            exportOptions: {
+              columns: [0, 3, 4, 5],
+            },
+          },
+        ],
+        responsive: true,
+      });
+    }
+  };
+
+  TableManageButtons = (function () {
+    "use strict";
+    return {
+      init: function () {
+        handleDataTableButtons();
+      },
+    };
+  })();
+
+  TableManageButtons.init();
+});
diff --git a/assets/js/custom/datatables-wallet.js b/assets/js/custom/datatables-wallet.js
new file mode 100644
index 0000000..0cf1e9a
--- /dev/null
+++ b/assets/js/custom/datatables-wallet.js
@@ -0,0 +1,8 @@
+$(document).ready(function () {
+  $("#txmempool").DataTable({
+    paging: false,
+    bInfo: false,
+    order: [],
+    bFilter: false,
+  });
+});
diff --git a/views/header.phtml b/views/header.phtml
index 396a254..d0344a0 100644
--- a/views/header.phtml
+++ b/views/header.phtml
@@ -4,7 +4,7 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta
   http-equiv="Content-Security-Policy"
-  content="default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src data: 'self'" />
+  content="default-src 'none'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; font-src: 'self'; img-src data: 'self'" />
 
 	<!-- Meta, title, CSS, favicons, etc. -->
 	<meta charset="utf-8">
diff --git a/views/hoster.phtml b/views/hoster.phtml
index 6dc54fd..dbfe274 100644
--- a/views/hoster.phtml
+++ b/views/hoster.phtml
@@ -127,6 +127,5 @@
 	<script src="assets/js/bootstrap.min.js"></script>
 	<!-- Custom Theme Scripts -->
 	<script src="assets/js/custom.min.js"></script>
-
   </body>
 </html>
\ No newline at end of file
diff --git a/views/peers.phtml b/views/peers.phtml
index 7f79a38..fce36cc 100644
--- a/views/peers.phtml
+++ b/views/peers.phtml
@@ -163,26 +163,27 @@
 	<!-- Custom Theme Scripts -->
 	<script src="assets/js/custom.min.js"></script>
 
-	<!-- Datatables -->
+  <!-- Custom Datatables Script -->
+	<script src="assets/js/custom/datatables-peers.js"></script>
+	<!-- /Datatables -->
 	<script>
-	  $(document).ready(function() {
-
-		$('#connectedpeers').DataTable( {
-			paging:   false,
-			bInfo: false,
+  $(document).ready(function() {
+    $('#connectedpeers').DataTable( {
+      paging:   false,
+      bInfo: false,
       order: [[ 5, 'desc' ]],
-			dom: '<"dataTables_exportbtn"B>ft',
-			buttons: [
-						{
-						  text: 'Rules',
-						  className: "btn btn-info",
-						  action: function () {
-									document.location = "?p=peers&c=run&t=<?= $_SESSION["csfrToken"] ?>";
-								  }
-						}
-			]
+      dom: '<"dataTables_exportbtn"B>ft',
+      buttons: [
+            {
+              text: 'Rules',
+              className: "btn btn-info",
+              action: function () {
+                  document.location = "?p=peers&c=run&t=<?= $_SESSION["csfrToken"] ?>";
+                  }
+            }
+      ]
     } );
-    
+
     // Check for search query
     const searchQuery = "<?php  if(isset($_GET['q'])) echo htmlspecialchars($_GET['q']) ?>";
     if(searchQuery) {
@@ -193,6 +194,5 @@
      document.getElementsByClassName("x_content")[0].hidden = false
 	  });
 	</script>
-	<!-- /Datatables -->
   </body>
 </html>
\ No newline at end of file
diff --git a/views/rules.phtml b/views/rules.phtml
index 90a331e..bb7de2f 100644
--- a/views/rules.phtml
+++ b/views/rules.phtml
@@ -297,51 +297,11 @@ In the last fourth row you need to speficy the global trigger event if you check
 	<script src="assets/js/custom.min.js"></script>
 	<script src="assets/js/bootstrap-multiselect.js"></script>
 
-	<script type="text/javascript">
-	$(document).ready(function() {
-		$('#clientselection').multiselect();
-		
-		var select = document.getElementById('action');	
-		var selectT = document.getElementById('trigger');
-		displayInput(select.value, "ban", "bantime");		 
-		displayInput2(selectT.value, "client", "clientselectiond", "threshold"); 
-		
-
-		
-		var handleDataTableButtons = function() {
-		  if ($("#rules").length) {
-			$("#rules").DataTable({
-			  dom: '<"dataTables_exportbtn"B>ft',
-			  paging:   false,
-			  order: [[ 0, "asc" ]],
-			  bInfo: false,
-			  buttons: [
-				{
-				  text: 'Export',
-				  extend: "csv",
-					className: "btn-sm btn-dark",
-					exportOptions: {
-						columns: [0,3,4,5]
-		  		}
-				},
-			  ],
-			  responsive: true
-			});
-		  }
-		};
-
-		TableManageButtons = function() {
-		  "use strict";
-		  return {
-			init: function() {
-			  handleDataTableButtons();
-			}
-		  };
-		}();
+  	<!-- Custom Datatables Script -->
+	<script src="assets/js/custom/datatables-rules.js"></script>
+	<!-- /Datatables -->
 
-		TableManageButtons.init();
-	});
-	
+	<script type="text/javascript">
 	var hid1 = <?php echo ((isset($content['editRule']->id) AND $content['editRule']->global) ? 'false' : 'true') ?>;
 	$("#global").click (function () {
 
@@ -355,6 +315,5 @@ In the last fourth row you need to speficy the global trigger event if you check
 	});
 
 	</script>
-	<!-- /Datatables -->
   </body>
 </html>
\ No newline at end of file
diff --git a/views/wallet.phtml b/views/wallet.phtml
index 9d09656..81c03b1 100644
--- a/views/wallet.phtml
+++ b/views/wallet.phtml
@@ -127,20 +127,9 @@
 	<script src="assets/js/dataTables.buttons.min.js"></script>
 	<!-- Custom Theme Scripts -->
 	<script src="assets/js/custom.min.js"></script>
-
-	<!-- Datatables -->
-	<script>
-	  $(document).ready(function() {
-		
-		 $('#txmempool').DataTable( {
-			"paging":   false,
-			"bInfo": false,
-			"order": [],
-			"bFilter": false
-		} );
-		
-	  });
-	</script>
+  
+	<!-- Custom Datatables Script -->
+	<script src="assets/js/custom/datatables-wallet.js"></script>
 	<!-- /Datatables -->
   </body>
 </html>
\ No newline at end of file