ThaMunsta/itflow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1225 from itflow-org/bulk-assign-phyloc

Browse Source 
Add physical location modal - not working
This commit is contained in:
Johnny
2025-07-03 15:11:42 -04:00
committed by GitHub
parent 67dc012caa b85137096d
commit 6af61cbb3c
3 changed files with 124 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
assets.php
View File

@@ -194,7 +194,7 @@ if (mysqli_num_rows($os_sql) > 0) {
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<?php } ?> <?php } ?>
<?php if ($num_rows[0] > 0) { ?> <?php if ($num_rows[0] > 0) { ?>
<a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportAssetModal"> <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportAssetModal">
<i class="fa fa-fw fa-download mr-2"></i>Export <i class="fa fa-fw fa-download mr-2"></i>Export
</a> </a>
@@ -316,6 +316,9 @@ if (mysqli_num_rows($os_sql) > 0) {
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignLocationModal"> <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignLocationModal">
<i class="fas fa-fw fa-map-marker-alt mr-2"></i>Assign Location <i class="fas fa-fw fa-map-marker-alt mr-2"></i>Assign Location
</a> </a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignPhysicalLocationModal">
<i class="fas fa-fw fa-map-marker-alt mr-2"></i>Set Physical Location
</a>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditStatusModal"> <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditStatusModal">
<i class="fas fa-fw fa-info mr-2"></i>Set Status <i class="fas fa-fw fa-info mr-2"></i>Set Status
@@ -325,28 +328,28 @@ if (mysqli_num_rows($os_sql) > 0) {
<i class="fas fa-fw fa-life-ring mr-2"></i>Create Tickets <i class="fas fa-fw fa-life-ring mr-2"></i>Create Tickets
</a> </a>
<?php if ($archived) { ?> <?php if ($archived) { ?>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<button class="dropdown-item text-info" <button class="dropdown-item text-info"
type="submit" form="bulkActions" name="bulk_unarchive_assets"> type="submit" form="bulkActions" name="bulk_unarchive_assets">
<i class="fas fa-fw fa-redo mr-2"></i>Unarchive <i class="fas fa-fw fa-redo mr-2"></i>Unarchive
</button> </button>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<button class="dropdown-item text-danger text-bold" <button class="dropdown-item text-danger text-bold"
type="submit" form="bulkActions" name="bulk_delete_assets"> type="submit" form="bulkActions" name="bulk_delete_assets">
<i class="fas fa-fw fa-trash mr-2"></i>Delete <i class="fas fa-fw fa-trash mr-2"></i>Delete
</button> </button>
<?php } else { ?> <?php } else { ?>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<button class="dropdown-item text-danger confirm-link" <button class="dropdown-item text-danger confirm-link"
type="submit" form="bulkActions" name="bulk_archive_assets"> type="submit" form="bulkActions" name="bulk_archive_assets">
<i class="fas fa-fw fa-archive mr-2"></i>Archive <i class="fas fa-fw fa-archive mr-2"></i>Archive
</button> </button>
<?php } ?> <?php } ?>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</form> </form>
<hr> <hr>
@@ -544,7 +547,7 @@ if (mysqli_num_rows($os_sql) > 0) {
} else { } else {
$contact_name_display = "-"; $contact_name_display = "-";
} }
$location_name = nullable_htmlentities($row['location_name']); $location_name = nullable_htmlentities($row['location_name']);
if (empty($location_name)) { if (empty($location_name)) {
$location_name = "-"; $location_name = "-";
@@ -686,6 +689,7 @@ if (mysqli_num_rows($os_sql) > 0) {
</table> </table>
</div> </div>
<?php require_once "modals/asset_bulk_assign_location_modal.php"; ?> <?php require_once "modals/asset_bulk_assign_location_modal.php"; ?>
<?php require_once "modals/asset_bulk_assign_physical_location_modal.php"; ?>
<?php require_once "modals/asset_bulk_assign_contact_modal.php"; ?> <?php require_once "modals/asset_bulk_assign_contact_modal.php"; ?>
<?php require_once "modals/asset_bulk_transfer_client_modal.php"; ?> <?php require_once "modals/asset_bulk_transfer_client_modal.php"; ?>
<?php require_once "modals/asset_bulk_edit_status_modal.php"; ?> <?php require_once "modals/asset_bulk_edit_status_modal.php"; ?>

31
modals/asset_bulk_assign_physical_location_modal.php Normal file
View File

@@ -0,0 +1,31 @@
<div class="modal" id="bulkAssignPhysicalLocationModal" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content bg-dark">
<div class="modal-header">
<h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt mr-2"></i>Bulk Set Physical Location</h5>
<button type="button" class="close text-white" data-dismiss="modal">
<span>&times;</span>
</button>
</div>
<div class="modal-body bg-white">
<div class="form-group">
<label>Physical Location</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
</div>
<input type="text" class="form-control" name="physical_location" placeholder="Physical location eg. Floor 2, Closet B" maxlength="200">
</div>
</div>
</div>
<div class="modal-footer bg-white">
<button type="submit" name="bulk_assign_asset_physical_location" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
</div>
</div>
</div>
</div>

103
post/user/asset.php
View File

@@ -210,11 +210,11 @@ if (isset($_POST['bulk_assign_asset_location'])) {
$row = mysqli_fetch_array($sql); $row = mysqli_fetch_array($sql);
$location_name = sanitizeInput($row['location_name']); $location_name = sanitizeInput($row['location_name']);
$client_id = intval($row['location_client_id']); $client_id = intval($row['location_client_id']);
// Assign Location to Selected Contacts // Assign Location to Selected Assets
if (isset($_POST['asset_ids'])) { if (isset($_POST['asset_ids'])) {
// Get Selected Contacts Count // Get Selected Asset Count
$asset_count = count($_POST['asset_ids']); $asset_count = count($_POST['asset_ids']);
foreach($_POST['asset_ids'] as $asset_id) { foreach($_POST['asset_ids'] as $asset_id) {
@@ -231,10 +231,10 @@ if (isset($_POST['bulk_assign_asset_location'])) {
logAction("Asset", "Edit", "$session_name assigned asset $asset_name to location $location_name", $client_id, $asset_id); logAction("Asset", "Edit", "$session_name assigned asset $asset_name to location $location_name", $client_id, $asset_id);
} // End Assign Location Loop } // End Assign Location Loop
// Bulk Logging // Bulk Logging
logAction("Asset", "Bulk Edit", "$session_name assigned $asset_count assets to location $location_name", $client_id); logAction("Asset", "Bulk Edit", "$session_name assigned $asset_count assets to location $location_name", $client_id);
$_SESSION['alert_message'] = "You assigned <strong>$asset_count</strong> assets to location <strong>$location_name</strong>"; $_SESSION['alert_message'] = "You assigned <strong>$asset_count</strong> assets to location <strong>$location_name</strong>";
} }
@@ -242,6 +242,45 @@ if (isset($_POST['bulk_assign_asset_location'])) {
} }
if (isset($_POST['bulk_assign_asset_physical_location'])) {
enforceUserPermission('module_support', 2);
validateCSRFToken($_POST['csrf_token']);
$physical_location = sanitizeInput($_POST['physical_location']);
// Assign Physical Location to Selected Assets
if (isset($_POST['asset_ids'])) {
// Get Selected Assets Count
$asset_count = count($_POST['asset_ids']);
foreach($_POST['asset_ids'] as $asset_id) {
$asset_id = intval($asset_id);
// Get Asset Details for Logging
$sql = mysqli_query($mysqli,"SELECT asset_name, asset_client_id FROM assets WHERE asset_id = $asset_id");
$row = mysqli_fetch_array($sql);
$asset_name = sanitizeInput($row['asset_name']);
$client_id = intval($row['asset_client_id']);
mysqli_query($mysqli,"UPDATE assets SET asset_physical_location = '$physical_location' WHERE asset_id = $asset_id");
//Logging
logAction("Asset", "Edit", "$session_name set asset $asset_name to physical location $physical_location", $client_id, $asset_id);
} // End Assign Location Loop
// Bulk Logging
logAction("Asset", "Bulk Edit", "$session_name set $asset_count assets to physical location $physical_location", $client_id);
$_SESSION['alert_message'] = "You moved <strong>$asset_count</strong> assets to location <strong>$location_name</strong>";
}
header("Location: " . $_SERVER["HTTP_REFERER"]);
}
if (isset($_POST['bulk_transfer_client_asset'])) { if (isset($_POST['bulk_transfer_client_asset'])) {
enforceUserPermission('module_support', 2); enforceUserPermission('module_support', 2);
@@ -249,7 +288,7 @@ if (isset($_POST['bulk_transfer_client_asset'])) {
validateCSRFToken($_POST['csrf_token']); validateCSRFToken($_POST['csrf_token']);
$new_client_id = intval($_POST['bulk_client_id']); $new_client_id = intval($_POST['bulk_client_id']);
// Transfer selected asset to new client // Transfer selected asset to new client
if (isset($_POST['asset_ids'])) { if (isset($_POST['asset_ids'])) {
@@ -300,7 +339,7 @@ if (isset($_POST['bulk_transfer_client_asset'])) {
// Archive/log the current asset // Archive/log the current asset
$notes = $asset_notes . "\r\n\r\n---\r\n* " . date('Y-m-d H:i:s') . ": Transferred asset $asset_name (old asset ID: $current_asset_id) from $current_client_name to $new_client_name (new asset ID: $new_asset_id)"; $notes = $asset_notes . "\r\n\r\n---\r\n* " . date('Y-m-d H:i:s') . ": Transferred asset $asset_name (old asset ID: $current_asset_id) from $current_client_name to $new_client_name (new asset ID: $new_asset_id)";
mysqli_query($mysqli,"UPDATE assets SET asset_archived_at = NOW() WHERE asset_id = $current_asset_id"); mysqli_query($mysqli,"UPDATE assets SET asset_archived_at = NOW() WHERE asset_id = $current_asset_id");
// Log Archive // Log Archive
logAction("Asset", "Archive", "$session_name archived asset $asset_name (via transfer)", $current_client_id, $current_asset_id); logAction("Asset", "Archive", "$session_name archived asset $asset_name (via transfer)", $current_client_id, $current_asset_id);
@@ -320,7 +359,7 @@ if (isset($_POST['bulk_transfer_client_asset'])) {
// Bulk Logging // Bulk Logging
logAction("Asset", "Bulk Transfer", "$session_name transferred $asset_count assets to $new_client_name", $new_client_id); logAction("Asset", "Bulk Transfer", "$session_name transferred $asset_count assets to $new_client_name", $new_client_id);
$_SESSION['alert_message'] = "Transferred <strong>$asset_count</strong> assets to <strong>$new_client_name</strong>."; $_SESSION['alert_message'] = "Transferred <strong>$asset_count</strong> assets to <strong>$new_client_name</strong>.";
} }
@@ -340,7 +379,7 @@ if (isset($_POST['bulk_assign_asset_contact'])) {
$row = mysqli_fetch_array($sql); $row = mysqli_fetch_array($sql);
$contact_name = sanitizeInput($row['contact_name']); $contact_name = sanitizeInput($row['contact_name']);
$client_id = intval($row['contact_client_id']); $client_id = intval($row['contact_client_id']);
// Assign Contact to Selected Assets // Assign Contact to Selected Assets
if (isset($_POST['asset_ids'])) { if (isset($_POST['asset_ids'])) {
@@ -364,7 +403,7 @@ if (isset($_POST['bulk_assign_asset_contact'])) {
// Bulk Logging // Bulk Logging
logAction("Asset", "Bulk Edit", "$session_name assigned $asset_count assets to contact $contact_name", $client_id); logAction("Asset", "Bulk Edit", "$session_name assigned $asset_count assets to contact $contact_name", $client_id);
$_SESSION['alert_message'] = "You assigned <strong>$asset_count</strong> assets to contact <strong>$contact_name</strong>"; $_SESSION['alert_message'] = "You assigned <strong>$asset_count</strong> assets to contact <strong>$contact_name</strong>";
} }
@@ -379,7 +418,7 @@ if (isset($_POST['bulk_edit_asset_status'])) {
validateCSRFToken($_POST['csrf_token']); validateCSRFToken($_POST['csrf_token']);
$status = sanitizeInput($_POST['bulk_status']); $status = sanitizeInput($_POST['bulk_status']);
// Assign Status to Selected Assets // Assign Status to Selected Assets
if (isset($_POST['asset_ids'])) { if (isset($_POST['asset_ids'])) {
@@ -404,7 +443,7 @@ if (isset($_POST['bulk_edit_asset_status'])) {
// Bulk Logging // Bulk Logging
logAction("Asset", "Bulk Edit", "$session_name set status to $status on $asset_count assets", $client_id); logAction("Asset", "Bulk Edit", "$session_name set status to $status on $asset_count assets", $client_id);
$_SESSION['alert_message'] = "You set the status <strong>$status</strong> on <strong>$asset_count</strong> assets."; $_SESSION['alert_message'] = "You set the status <strong>$status</strong> on <strong>$asset_count</strong> assets.";
} }
@@ -904,7 +943,7 @@ if (isset($_POST["import_assets_csv"])) {
mysqli_query($mysqli,"INSERT INTO assets SET asset_name = '$name', asset_description = '$description', asset_type = '$type', asset_make = '$make', asset_model = '$model', asset_serial = '$serial', asset_os = '$os', asset_purchase_date = $purchase_date, asset_physical_location = '$physical_location', asset_contact_id = $contact_id, asset_location_id = $location_id, asset_client_id = $client_id"); mysqli_query($mysqli,"INSERT INTO assets SET asset_name = '$name', asset_description = '$description', asset_type = '$type', asset_make = '$make', asset_model = '$model', asset_serial = '$serial', asset_os = '$os', asset_purchase_date = $purchase_date, asset_physical_location = '$physical_location', asset_contact_id = $contact_id, asset_location_id = $location_id, asset_client_id = $client_id");
$asset_id = mysqli_insert_id($mysqli); $asset_id = mysqli_insert_id($mysqli);
// Add Primary Interface // Add Primary Interface
mysqli_query($mysqli,"INSERT INTO asset_interfaces SET interface_name = '1', interface_primary = 1, interface_asset_id = $asset_id"); mysqli_query($mysqli,"INSERT INTO asset_interfaces SET interface_name = '1', interface_primary = 1, interface_asset_id = $asset_id");
@@ -1055,11 +1094,11 @@ if (isset($_POST['add_asset_interface'])) {
interface_asset_id = $asset_id interface_asset_id = $asset_id
"; ";
mysqli_query($mysqli, $sql_insert); mysqli_query($mysqli, $sql_insert);
$new_interface_id = mysqli_insert_id($mysqli); $new_interface_id = mysqli_insert_id($mysqli);
// If Primary Interface Checked set all interfaces primary to 0 then set the new interface as primary with a 1 // If Primary Interface Checked set all interfaces primary to 0 then set the new interface as primary with a 1
if ($primary_interface) { if ($primary_interface) {
mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_primary = 0 WHERE interface_asset_id = $asset_id"); mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_primary = 0 WHERE interface_asset_id = $asset_id");
mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_primary = 1 WHERE interface_id = $new_interface_id"); mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_primary = 1 WHERE interface_id = $new_interface_id");
} }
@@ -1076,10 +1115,10 @@ if (isset($_POST['add_asset_interface'])) {
// 6) Logging // 6) Logging
logAction( logAction(
"Asset Interface", "Asset Interface",
"Create", "Create",
"$session_name created interface $name for asset $asset_name", "$session_name created interface $name for asset $asset_name",
$client_id, $client_id,
$asset_id $asset_id
); );
@@ -1111,7 +1150,7 @@ if (isset($_POST['add_asset_multiple_interfaces'])) {
// Format $interface_number as a 2-digit number // Format $interface_number as a 2-digit number
$formatted_interface_number = str_pad($interface_number, 2, '0', STR_PAD_LEFT); $formatted_interface_number = str_pad($interface_number, 2, '0', STR_PAD_LEFT);
$sql_insert = " $sql_insert = "
INSERT INTO asset_interfaces SET INSERT INTO asset_interfaces SET
interface_name = '$name_prefix$formatted_interface_number', interface_name = '$name_prefix$formatted_interface_number',
@@ -1138,7 +1177,7 @@ if (isset($_POST['edit_asset_interface'])) {
// Interface info // Interface info
$interface_id = intval($_POST['interface_id']); $interface_id = intval($_POST['interface_id']);
require_once 'asset_interface_model.php'; require_once 'asset_interface_model.php';
// sets: $name, $mac, $ip, $ipv6, $port, $notes, $network, $connected_to, etc. // sets: $name, $mac, $ip, $ipv6, $port, $notes, $network, $connected_to, etc.
// 1) Get Asset Name and Client ID for logging and alert message // 1) Get Asset Name and Client ID for logging and alert message
@@ -1170,7 +1209,7 @@ if (isset($_POST['edit_asset_interface'])) {
mysqli_query($mysqli, $sql_update); mysqli_query($mysqli, $sql_update);
// If Primary Interface Checked set all interfaces primary to 0 then set the new interface as primary with a 1 // If Primary Interface Checked set all interfaces primary to 0 then set the new interface as primary with a 1
if ($primary_interface) { if ($primary_interface) {
mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_primary = 0 WHERE interface_asset_id = $asset_id"); mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_primary = 0 WHERE interface_asset_id = $asset_id");
mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_primary = 1 WHERE interface_id = $interface_id"); mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_primary = 1 WHERE interface_id = $interface_id");
} }
@@ -1195,10 +1234,10 @@ if (isset($_POST['edit_asset_interface'])) {
// 5) Logging // 5) Logging
logAction( logAction(
"Asset Interface", "Asset Interface",
"Edit", "Edit",
"$session_name edited interface $name for asset $asset_name", "$session_name edited interface $name for asset $asset_name",
$client_id, $client_id,
$asset_id $asset_id
); );
@@ -1236,10 +1275,10 @@ if (isset($_GET['delete_asset_interface'])) {
// 3) Logging // 3) Logging
logAction( logAction(
"Asset Interface", "Asset Interface",
"Delete", "Delete",
"$session_name deleted interface $interface_name from asset $asset_name", "$session_name deleted interface $interface_name from asset $asset_name",
$client_id, $client_id,
$asset_id $asset_id
); );
@@ -1298,7 +1337,7 @@ if (isset($_POST['bulk_edit_asset_interface_network'])) {
validateCSRFToken($_POST['csrf_token']); validateCSRFToken($_POST['csrf_token']);
$network_id = intval($_POST['bulk_network']); $network_id = intval($_POST['bulk_network']);
// Get Network Name for logging // Get Network Name for logging
$sql = mysqli_query($mysqli, "SELECT network_name FROM networks WHERE network_id = $network_id"); $sql = mysqli_query($mysqli, "SELECT network_name FROM networks WHERE network_id = $network_id");
$row = mysqli_fetch_array($sql); $row = mysqli_fetch_array($sql);
@@ -1615,4 +1654,4 @@ if (isset($_POST['export_client_asset_interfaces_csv'])) {
exit; exit;
} }