AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-03-11 00:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Assets: Added IPv6 Address to assets list and interface list, Updated UI of add / edit network interfaces updated icons wording and bettr arrangement

Browse Source
This commit is contained in:
johnnyq
2026-03-02 23:40:53 -05:00
parent 9d9ebe7b9e
commit f9558d4701
4 changed files with 158 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
agent/asset_details.php
View File

@@ -583,7 +583,10 @@ if (isset($_GET['asset_id'])) {
</td> </td>
<td><?= $interface_type_display; ?></td> <td><?= $interface_type_display; ?></td>
<td><?= $interface_mac_display; ?></td> <td><?= $interface_mac_display; ?></td>
<td><?= $interface_ip_display; ?></td> <td>
<?= $interface_ip_display; ?>
<div><small class="text-secondary"><?= $interface_ipv6 ?></small></div>
</td>
<td><?= $network_name_display; ?></td> <td><?= $network_name_display; ?></td>
<td><?= $connected_to_display; ?></td> <td><?= $connected_to_display; ?></td>
<td> <td>

14
agent/assets.php
View File

@@ -550,7 +550,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
$asset_model = nullable_htmlentities($row['asset_model']); $asset_model = nullable_htmlentities($row['asset_model']);
$asset_serial = nullable_htmlentities($row['asset_serial']); $asset_serial = nullable_htmlentities($row['asset_serial']);
if ($asset_serial) { if ($asset_serial) {
$asset_serial_display = "<span class='badge badge-light text-monospace'>$asset_serial</span>"; $asset_serial_display = "<span class='text-monospace'>$asset_serial</span>";
} else { } else {
$asset_serial_display = "-"; $asset_serial_display = "-";
} }
@@ -560,12 +560,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
} else { } else {
$asset_os_display = "-"; $asset_os_display = "-";
} }
$asset_ip = nullable_htmlentities($row['interface_ip']); $asset_ip = getFallBack(nullable_htmlentities($row['interface_ip']));
if ($asset_ip) {
$asset_ip_display = $asset_ip;
} else {
$asset_ip_display = "-";
}
$asset_ipv6 = nullable_htmlentities($row['interface_ipv6']); $asset_ipv6 = nullable_htmlentities($row['interface_ipv6']);
$asset_nat_ip = nullable_htmlentities($row['interface_nat_ip']); $asset_nat_ip = nullable_htmlentities($row['interface_nat_ip']);
$asset_mac = nullable_htmlentities(getFallBack($row['interface_mac'])); $asset_mac = nullable_htmlentities(getFallBack($row['interface_mac']));
@@ -703,7 +698,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<td><?php echo $asset_os_display; ?></td> <td><?php echo $asset_os_display; ?></td>
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
<td><?php echo $asset_ip_display; ?></td> <td>
<?php echo $asset_ip; ?>
<div class="text-secondary"><small><?php echo $asset_ipv6; ?></small></div>
</td>
<?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Mac_Address', $_GET['show_column'])) { ?> <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Mac_Address', $_GET['show_column'])) { ?>
<td><?php echo $asset_mac; ?></td> <td><?php echo $asset_mac; ?></td>
<?php } ?> <?php } ?>

116
agent/modals/asset/asset_interface_add.php
View File

@@ -92,63 +92,6 @@ ob_start();
<div class="tab-pane fade" id="pills-interface-network"> <div class="tab-pane fade" id="pills-interface-network">
<!-- MAC Address -->
<div class="form-group">
<label>MAC Address</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
</div>
<input type="text" class="form-control" name="mac" placeholder="MAC Address" data-inputmask="'alias': 'mac'" maxlength="200" data-mask>
</div>
</div>
<!-- IP (with optional DHCP checkbox) -->
<div class="form-group">
<label>IP or DHCP</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
</div>
<input type="text" class="form-control" name="ip" placeholder="IP Address" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
<div class="input-group-append">
<div class="input-group-text">
<input type="checkbox" name="dhcp" value="1" title="Check to mark address as DHCP controlled">
</div>
</div>
</div>
</div>
<!-- NAT IP -->
<div class="form-group">
<label>NAT IP</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
</div>
<input
type="text"
class="form-control"
name="nat_ip"
placeholder="Nat IP"
maxlength="200"
data-inputmask="'alias': 'ip'"
data-mask
>
</div>
</div>
<!-- IPv6 -->
<div class="form-group">
<label>IPv6</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
</div>
<input type="text" class="form-control" name="ipv6" placeholder="IPv6 Address" maxlength="200">
</div>
</div>
<!-- Network --> <!-- Network -->
<div class="form-group"> <div class="form-group">
<label>Network</label> <label>Network</label>
@@ -173,11 +116,68 @@ ob_start();
</div> </div>
</div> </div>
<!-- IP (with optional DHCP checkbox) -->
<div class="form-group">
<label>IPv4 Address / <span class="text-muted">DHCP</span></label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
</div>
<input type="text" class="form-control" name="ip" placeholder="e.g. 192.168.1.10" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
<div class="input-group-append">
<div class="input-group-text">
<input type="checkbox" name="dhcp" value="1" title="Check to mark address as DHCP controlled">
</div>
</div>
</div>
</div>
<!-- MAC Address -->
<div class="form-group">
<label>MAC Address</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
</div>
<input type="text" class="form-control" name="mac" placeholder="e.g. 00:1A:2B:3C:4D:5E" data-inputmask="'alias': 'mac'" maxlength="200" data-mask>
</div>
</div>
<!-- IPv6 -->
<div class="form-group">
<label>IPv6 Address</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
</div>
<input type="text" class="form-control" name="ipv6" placeholder="e.g. 2001:db8::1" maxlength="200">
</div>
</div>
<!-- NAT IP -->
<div class="form-group">
<label>NAT Address</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-exchange-alt"></i></span>
</div>
<input
type="text"
class="form-control"
name="nat_ip"
placeholder="e.g. 203.0.113.10 or 10.0.0.5"
maxlength="200"
data-inputmask="'alias': 'ip'"
data-mask
>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label>Connected to</label> <label>Connected to</label>
<div class="input-group"> <div class="input-group">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span> <span class="input-group-text"><i class="fa fa-fw fa-plug"></i></span>
</div> </div>
<select class="form-control select2" name="connected_to"> <select class="form-control select2" name="connected_to">
<option value="">- Select Asset and Interface -</option> <option value="">- Select Asset and Interface -</option>

180
agent/modals/asset/asset_interface_edit.php
View File

@@ -143,95 +143,6 @@ ob_start();
<!-- Network Section --> <!-- Network Section -->
<div class="tab-pane fade" id="pills-interface-network<?php echo $interface_id; ?>"> <div class="tab-pane fade" id="pills-interface-network<?php echo $interface_id; ?>">
<!-- MAC Address -->
<div class="form-group">
<label>MAC Address</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
</div>
<input
type="text"
class="form-control"
name="mac"
placeholder="MAC Address"
maxlength="200"
value="<?php echo $interface_mac; ?>"
data-inputmask="'alias': 'mac'"
data-mask
>
</div>
</div>
<!-- IPv4 or DHCP -->
<div class="form-group">
<label>IPv4 or DHCP</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
</div>
<input
type="text"
class="form-control"
name="ip"
placeholder="IP Address"
maxlength="200"
value="<?php echo $interface_ip; ?>"
data-inputmask="'alias': 'ip'"
data-mask
>
<div class="input-group-append">
<div class="input-group-text">
<input
type="checkbox"
name="dhcp"
value="1"
title="Check to mark address as DHCP controlled"
<?php if ($interface_ip === 'DHCP') echo "checked"; ?>
>
</div>
</div>
</div>
</div>
<!-- NAT IP -->
<div class="form-group">
<label>NAT IP</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
</div>
<input
type="text"
class="form-control"
name="nat_ip"
placeholder="Nat IP"
maxlength="200"
value="<?php echo $interface_nat_ip; ?>"
data-inputmask="'alias': 'ip'"
data-mask
>
</div>
</div>
<!-- IPv6 -->
<div class="form-group">
<label>IPv6</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
</div>
<input
type="text"
class="form-control"
name="ipv6"
placeholder="IPv6 Address"
maxlength="200"
value="<?php echo $interface_ipv6; ?>"
>
</div>
</div>
<!-- Network --> <!-- Network -->
<div class="form-group"> <div class="form-group">
<label>Network</label> <label>Network</label>
@@ -262,12 +173,101 @@ ob_start();
</div> </div>
</div> </div>
<!-- IPv4 or DHCP -->
<div class="form-group">
<label>IPv4 Address / <span class="text-muted">DHCP</span></label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
</div>
<input
type="text"
class="form-control"
name="ip"
placeholder="e.g. 192.168.1.10"
maxlength="200"
value="<?php echo $interface_ip; ?>"
data-inputmask="'alias': 'ip'"
data-mask
>
<div class="input-group-append">
<div class="input-group-text">
<input
type="checkbox"
name="dhcp"
value="1"
title="Check to mark address as DHCP controlled"
<?php if ($interface_ip === 'DHCP') echo "checked"; ?>
>
</div>
</div>
</div>
</div>
<!-- MAC Address -->
<div class="form-group">
<label>MAC Address</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
</div>
<input
type="text"
class="form-control"
name="mac"
placeholder="e.g. 00:1A:2B:3C:4D:5E"
maxlength="200"
value="<?php echo $interface_mac; ?>"
data-inputmask="'alias': 'mac'"
data-mask
>
</div>
</div>
<!-- IPv6 -->
<div class="form-group">
<label>IPv6 Address</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
</div>
<input
type="text"
class="form-control"
name="ipv6"
placeholder="e.g. 2001:db8::1"
maxlength="200"
value="<?php echo $interface_ipv6; ?>"
>
</div>
</div>
<!-- NAT IP -->
<div class="form-group">
<label>NAT Address</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-exchange-alt"></i></span>
</div>
<input
type="text"
class="form-control"
name="nat_ip"
placeholder="e.g. 203.0.113.10 or 10.0.0.5"
maxlength="200"
value="<?php echo $interface_nat_ip; ?>"
data-inputmask="'alias': 'ip'"
data-mask
>
</div>
</div>
<!-- Connected to (One-to-One) --> <!-- Connected to (One-to-One) -->
<div class="form-group"> <div class="form-group">
<label>Connected to</label> <label>Connected to</label>
<div class="input-group"> <div class="input-group">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span> <span class="input-group-text"><i class="fa fa-fw fa-plug"></i></span>
</div> </div>
<select class="form-control select2" name="connected_to"> <select class="form-control select2" name="connected_to">
<option value="">- Select Asset and Interface -</option> <option value="">- Select Asset and Interface -</option>