diff --git a/includes/client_overview_side_nav.php b/includes/client_overview_side_nav.php index eb721e0c..031dd8e2 100644 --- a/includes/client_overview_side_nav.php +++ b/includes/client_overview_side_nav.php @@ -34,6 +34,12 @@

ALL Assets

+
  • + "> + +

    ALL Networks

    +     +
  • "> diff --git a/includes/client_side_nav.php b/includes/client_side_nav.php index 848bb025..183c799b 100644 --- a/includes/client_side_nav.php +++ b/includes/client_side_nav.php @@ -155,7 +155,7 @@
  • - "> + ">

    Networks diff --git a/modals/client_network_add_modal.php b/modals/client_network_add_modal.php deleted file mode 100644 index 9627c52b..00000000 --- a/modals/client_network_add_modal.php +++ /dev/null @@ -1,172 +0,0 @@ -

     diff --git a/modals/network_add_modal.php b/modals/network_add_modal.php new file mode 100644 index 00000000..d23f8609 --- /dev/null +++ b/modals/network_add_modal.php @@ -0,0 +1,200 @@ + diff --git a/modals/client_network_export_modal.php b/modals/network_export_modal.php similarity index 79% rename from modals/client_network_export_modal.php rename to modals/network_export_modal.php index e2849ba9..47b32e61 100644 --- a/modals/client_network_export_modal.php +++ b/modals/network_export_modal.php @@ -8,12 +8,14 @@
    + +
    - +
    diff --git a/client_networks.php b/networks.php similarity index 89% rename from client_networks.php rename to networks.php index d3fdfa5e..0c230ad3 100644 --- a/client_networks.php +++ b/networks.php @@ -4,7 +4,16 @@ $sort = "network_name"; $order = "ASC"; -require_once "includes/inc_all_client.php"; +// If client_id is in URI then show client Side Bar and client header +if (isset($_GET['client_id'])) { + require_once "includes/inc_all_client.php"; + $client_query = "AND network_client_id = $client_id"; + $client_url = "client_id=$client_id&"; +} else { + require_once "includes/inc_client_overview_all.php"; + $client_query = ''; + $client_url = ''; +} // Perms enforceUserPermission('module_support'); @@ -15,10 +24,11 @@ $url_query_strings_sb = http_build_query(array_merge($_GET, array('sort' => $sor $sql = mysqli_query( $mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM networks + LEFT JOIN clients ON client_id = network_client_id LEFT JOIN locations ON location_id = network_location_id - WHERE network_client_id = $client_id - AND network_archived_at IS NULL - AND (network_name LIKE '%$q%' OR network_description LIKE '%$q%' OR network_vlan LIKE '%$q%' OR network LIKE '%$q%' OR network_gateway LIKE '%$q%' OR network_subnet LIKE '%$q%' OR network_primary_dns LIKE '%$q%' OR network_secondary_dns LIKE '%$q%' OR network_dhcp_range LIKE '%$q%' OR location_name LIKE '%$q%') + WHERE network_archived_at IS NULL + AND (network_name LIKE '%$q%' OR network_description LIKE '%$q%' OR network_vlan LIKE '%$q%' OR network LIKE '%$q%' OR network_gateway LIKE '%$q%' OR network_subnet LIKE '%$q%' OR network_primary_dns LIKE '%$q%' OR network_secondary_dns LIKE '%$q%' OR network_dhcp_range LIKE '%$q%' OR location_name LIKE '%$q%' OR client_name LIKE '%$q%') + $client_query ORDER BY $sort $order LIMIT $record_from, $record_to" ); @@ -46,7 +56,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    + +
    @@ -125,6 +137,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Location + + + + Client + + + Action @@ -132,6 +151,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    @@ -197,6 +217,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + + +
    diff --git a/post/user/network.php b/post/user/network.php index ac71cf70..661753a3 100644 --- a/post/user/network.php +++ b/post/user/network.php @@ -128,25 +128,24 @@ if (isset($_POST['bulk_delete_networks'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } -if (isset($_POST['export_client_networks_csv'])) { +if (isset($_POST['export_networks_csv'])) { enforceUserPermission('module_support', 2); - $client_id = intval($_POST['client_id']); + if (isset($_POST['client_id'])) { + $client_id = intval($_POST['client_id']); + $client_query = "AND network_client_id = $client_id"; + } else { + $client_query = ''; + } - //get records from database - $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id"); - $row = mysqli_fetch_array($sql); - - $client_name = $row['client_name']; - - $sql = mysqli_query($mysqli,"SELECT * FROM networks WHERE network_client_id = $client_id ORDER BY network_name ASC"); + $sql = mysqli_query($mysqli,"SELECT * FROM networks WHERE network_archived_at IS NULL $client_query ORDER BY network_name ASC"); $num_rows = mysqli_num_rows($sql); if ($num_rows > 0) { $delimiter = ","; - $filename = $client_name . "-Networks-" . date('Y-m-d') . ".csv"; + $filename = "Networks-" . date('Y-m-d') . ".csv"; //create a file pointer $f = fopen('php://memory', 'w'); @@ -173,7 +172,7 @@ if (isset($_POST['export_client_networks_csv'])) { } // Logging - logAction("Network", "Export", "$session_name deleted $num_rows network(s) to a CSV file", $client_id); + logAction("Network", "Export", "$session_name deleted $num_rows network(s) to a CSV file"); exit;