diff --git a/agent/modals/network/network_add.php b/agent/modals/network/network_add.php index 7e4ff615..493306ed 100644 --- a/agent/modals/network/network_add.php +++ b/agent/modals/network/network_add.php @@ -39,7 +39,7 @@ ob_start();
- +
@@ -56,7 +56,7 @@ ob_start(); while ($row = mysqli_fetch_assoc($sql)) { $client_id_select = intval($row['client_id']); $client_name = nullable_htmlentities($row['client_name']); ?> - + @@ -65,26 +65,6 @@ ob_start(); -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
-
@@ -111,56 +91,65 @@ ob_start();
+
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
- +
- +
- +
- +
- +
- +
- +
- +
- +
- -
-
- -
- -
-
- -
- +
@@ -171,9 +160,9 @@ ob_start();
- +
- +
@@ -181,9 +170,9 @@ ob_start();
- +
- +
diff --git a/agent/modals/network/network_edit.php b/agent/modals/network/network_edit.php index 7d45ec45..6774f784 100644 --- a/agent/modals/network/network_edit.php +++ b/agent/modals/network/network_edit.php @@ -11,7 +11,6 @@ $network_name = nullable_htmlentities($row['network_name']); $network_description = nullable_htmlentities($row['network_description']); $network_vlan = intval($row['network_vlan']); $network = nullable_htmlentities($row['network']); -$network_subnet = nullable_htmlentities($row['network_subnet']); $network_gateway = nullable_htmlentities($row['network_gateway']); $network_primary_dns = nullable_htmlentities($row['network_primary_dns']); $network_secondary_dns = nullable_htmlentities($row['network_secondary_dns']); @@ -20,33 +19,32 @@ $network_notes = nullable_htmlentities($row['network_notes']); $network_location_id = intval($row['network_location_id']); $client_id = intval($row['network_client_id']); -// Generate the HTML form content using output buffering. ob_start(); ?>
-
Editing network:
+
Editing network:
- - + +
@@ -54,27 +52,7 @@ ob_start();
> -
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
-
+
@@ -90,8 +68,8 @@ ob_start(); $location_id = intval($row['location_id']); $location_name = nullable_htmlentities($row['location_name']); ?> -
-
- -
-
- +
- +
- +
- + +
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+
- +
- +
- +
- +
@@ -140,31 +138,21 @@ ob_start();
- -
-
- -
- -
-
- -
- +
-
+
- +
- +
@@ -172,21 +160,21 @@ ob_start();
- +
- +
-
+
- +
-

+

diff --git a/agent/networks.php b/agent/networks.php index 143bd49e..22c37c38 100644 --- a/agent/networks.php +++ b/agent/networks.php @@ -95,9 +95,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + - +
@@ -127,7 +127,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $location_id = intval($row['location_id']); $location_name = nullable_htmlentities($row['location_name']); ?> - + @@ -166,7 +166,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- "> Archived @@ -190,7 +190,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
- + "> @@ -200,48 +200,48 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - - - - - - - + + + + + + + @@ -261,7 +261,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $network_vlan_display = "-"; } $network = nullable_htmlentities($row['network']); - $network_subnet = nullable_htmlentities($row['network_subnet']); $network_gateway = nullable_htmlentities($row['network_gateway']); $network_primary_dns = nullable_htmlentities($row['network_primary_dns']); $network_secondary_dns = nullable_htmlentities($row['network_secondary_dns']); @@ -292,51 +291,48 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + + + - - - - - - - - - + + + + + +
- - Name - - - - vLAN - - - - IP / Network - - - - Gateway - - - - DNS - - - - DHCP Range - - - - Location - - - + Client + + Name + + + + Location + + + + VLAN + + + + Network (CIDR) + + + + Gateway + + + + IP Range + + + + DNS + + Action
- +
-
-
+
+
- -
-
- + Edit
- + Restore
- + Delete
- + Archive diff --git a/agent/post/network.php b/agent/post/network.php index f6b2b88c..1353d1b6 100644 --- a/agent/post/network.php +++ b/agent/post/network.php @@ -12,7 +12,7 @@ if (isset($_POST['add_network'])) { require_once 'network_model.php'; - mysqli_query($mysqli,"INSERT INTO networks SET network_name = '$name', network_description = '$description', network_vlan = $vlan, network = '$network', network_subnet = '$subnet', network_gateway = '$gateway', network_primary_dns = '$primary_dns', network_secondary_dns = '$secondary_dns', network_dhcp_range = '$dhcp_range', network_notes = '$notes', network_location_id = $location_id, network_client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO networks SET network_name = '$name', network_description = '$description', network_vlan = $vlan, network = '$network', network_subnet = '$subnet', network_gateway = '$gateway', network_primary_dns = '$primary_dns', network_secondary_dns = '$secondary_dns', network_notes = '$notes', network_location_id = $location_id, network_client_id = $client_id"); $network_id = mysqli_insert_id($mysqli); @@ -31,7 +31,7 @@ if (isset($_POST['edit_network'])) { $network_id = intval($_POST['network_id']); require_once 'network_model.php'; - mysqli_query($mysqli,"UPDATE networks SET network_name = '$name', network_description = '$description', network_vlan = $vlan, network = '$network', network_subnet = '$subnet', network_gateway = '$gateway', network_primary_dns = '$primary_dns', network_secondary_dns = '$secondary_dns', network_dhcp_range = '$dhcp_range', network_notes = '$notes', network_location_id = $location_id WHERE network_id = $network_id"); + mysqli_query($mysqli,"UPDATE networks SET network_name = '$name', network_description = '$description', network_vlan = $vlan, network = '$network', network_gateway = '$gateway', network_primary_dns = '$primary_dns', network_secondary_dns = '$secondary_dns', network_dhcp_range = '$dhcp_range', network_notes = '$notes', network_location_id = $location_id WHERE network_id = $network_id"); logAction("Network", "Edit", "$session_name edited network $name", $client_id, $network_id); @@ -174,12 +174,12 @@ if (isset($_POST['export_networks_csv'])) { $f = fopen('php://memory', 'w'); //set column headers - $fields = array('Name', 'Description', 'vLAN', 'IP/Network', 'Subnet Mask', 'Gateway', 'Primary DNS', 'Secondary DNS', 'DHCP Range'); + $fields = array('Name', 'Description', 'VLAN', 'Network (CIDR)', 'Gateway', 'IP Range', 'Primary DNS', 'Secondary DNS'); fputcsv($f, $fields, $delimiter, $enclosure, $escape); //output each row of the data, format line as csv and write to file pointer while ($row = $sql->fetch_assoc()) { - $lineData = array($row['network_name'], $row['network_description'], $row['network_vlan'], $row['network'], $row['network_subnet'], $row['network_gateway'], $row['network_primary_dns'], $row['network_secondary_dns'], $row['network_dhcp_range']); + $lineData = array($row['network_name'], $row['network_description'], $row['network_vlan'], $row['network'], $row['network_gateway'], $row['network_dhcp_range'], $row['network_primary_dns'], $row['network_secondary_dns']); fputcsv($f, $lineData, $delimiter, $enclosure, $escape); } diff --git a/agent/post/network_model.php b/agent/post/network_model.php index 500a4832..d8706e4d 100644 --- a/agent/post/network_model.php +++ b/agent/post/network_model.php @@ -5,7 +5,6 @@ $name = sanitizeInput($_POST['name']); $description = sanitizeInput($_POST['description']); $vlan = intval($_POST['vlan']); $network = sanitizeInput($_POST['network']); -$subnet = sanitizeInput($_POST['subnet']); $gateway = sanitizeInput($_POST['gateway']); $primary_dns = sanitizeInput($_POST['primary_dns']); $secondary_dns = sanitizeInput($_POST['secondary_dns']);