stage #2

Merged
ThaMunsta merged 122 commits from stage into main 2026-01-17 20:10:26 +00:00
14 changed files with 1298 additions and 1263 deletions
Showing only changes of commit a55dabb1cd - Show all commits

View File

@@ -4,7 +4,7 @@
if (isset($_GET['client_id'])) {
require_once "includes/inc_all_client.php";
$client_query = "AND asset_client_id = $client_id";
$client_url = "AND client_id=$client_id&";
$client_url = "client_id=$client_id&";
} else {
require_once "includes/inc_client_overview_all.php";
$client_query = '';
@@ -369,7 +369,7 @@ if (isset($_GET['asset_id'])) {
<i class="fa fa-fw fa-recycle mr-2"></i>New Recurring Ticket
</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addCredentialModal">
<a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/credential/credential_add.php?<?= $client_url ?>asset_id=<?= $asset_id ?>">
<i class="fa fa-fw fa-key mr-2"></i>New Credential
</a>
<div class="dropdown-divider"></div>
@@ -1227,7 +1227,6 @@ if (isset($_GET['asset_id'])) {
require_once "modals/asset/asset_interface_export.php";
require_once "modals/ticket/ticket_add.php";
require_once "modals/recurring_ticket/recurring_ticket_add.php";
require_once "modals/credential/credential_add.php";
require_once "modals/document/document_add.php";
require_once "modals/file/file_upload.php";

View File

@@ -64,7 +64,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<h3 class="card-title mt-2"><i class="fas fa-fw fa-lock mr-2"></i>Certificates</h3>
<div class="card-tools">
<div class="btn-group">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCertificateModal"><i class="fas fa-plus mr-2"></i>New Certificate</button>
<button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/certificate/certificate_add.php?<?= $client_url ?>"><i class="fas fa-plus mr-2"></i>New Certificate</button>
<?php if ($num_rows[0] > 0) { ?>
<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
<div class="dropdown-menu">
@@ -303,11 +303,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
</div>
<?php
require_once "modals/certificate/certificate_add.php";
require_once "modals/certificate/certificate_export.php";
?>
<script src="../js/bulk_actions.js"></script>
<script src="js/certificate_fetch_ssl.js"></script>
<?php require_once "../includes/footer.php";

View File

@@ -274,7 +274,7 @@ if (isset($_GET['contact_id'])) {
<i class="fa fa-fw fa-desktop mr-2"></i>New Asset
</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addCredentialModal">
<a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/credential/credential_add.php?<?= $client_url ?>&contact_id=<?= $contact_id ?>">
<i class="fa fa-fw fa-key mr-2"></i>New Credential
</a>
<div class="dropdown-divider"></div>
@@ -1182,7 +1182,6 @@ if (isset($_GET['contact_id'])) {
require_once "modals/ticket/ticket_add.php";
require_once "modals/recurring_ticket/recurring_ticket_add.php";
require_once "modals/credential/credential_add.php";
require_once "modals/document/document_add.php";
require_once "modals/file/file_upload.php";

View File

@@ -106,7 +106,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<div class="card-tools">
<?php if (lookupUserPermission("module_credential") >= 2) { ?>
<div class="btn-group">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCredentialModal" <?php if (!isset($_COOKIE['user_encryption_session_key'])) { echo "disabled"; } ?>>
<button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/credential/credential_add.php?<?= $client_url ?>" <?php if (!isset($_COOKIE['user_encryption_session_key'])) { echo "disabled"; } ?>>
<i class="fas fa-plus mr-2"></i>New Credential
</button>
<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
@@ -534,7 +534,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<?php
require_once "modals/credential/credential_add.php";
require_once "modals/credential/credential_export.php";
if ($client_url) {
require_once "modals/credential/credential_import.php";

View File

@@ -76,7 +76,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<h3 class="card-title mt-2"><i class="fa fa-fw fa-globe mr-2"></i>Domains</h3>
<div class="card-tools">
<div class="btn-group">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addDomainModal"><i class="fas fa-plus mr-2"></i>New Domain</button>
<button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/domain/domain_add.php?<?= $client_url ?>"><i class="fas fa-plus mr-2"></i>New Domain</button>
<?php if ($num_rows[0] > 0) { ?>
<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
<div class="dropdown-menu">
@@ -361,7 +361,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
</div>
<?php
require_once "modals/domain/domain_add.php";
require_once "modals/domain/domain_export.php";
?>

View File

@@ -1,6 +1,12 @@
<div class="modal" id="addCertificateModal" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<?php
require_once '../../../includes/modal_header.php';
$client_id = intval($_GET['client_id'] ?? 0);
ob_start();
?>
<div class="modal-header bg-dark">
<h5 class="modal-title"><i class="fa fa-fw fa-lock mr-2"></i>New Certificate</h5>
<button type="button" class="close text-white" data-dismiss="modal">
@@ -28,7 +34,7 @@
<div class="tab-pane fade show active" id="pills-details">
<?php if ($client_url) { ?>
<?php if ($client_id) { ?>
<input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
<?php } else { ?>
@@ -44,9 +50,9 @@
$sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
while ($row = mysqli_fetch_array($sql)) {
$client_id = intval($row['client_id']);
$client_id_select = intval($row['client_id']);
$client_name = nullable_htmlentities($row['client_name']); ?>
<option <?php if ($client_id == isset($_GET['client'])) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
<option <?php if ($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name; ?></option>
<?php } ?>
</select>
@@ -75,7 +81,7 @@
</div>
</div>
<?php if ($client_url) { ?>
<?php if ($client_id) { ?>
<div class="form-group">
<label>Domain</label>
<div class="input-group">
@@ -161,6 +167,9 @@
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
</div>
</form>
</div>
</div>
</div>
<script src="/agent/js/certificate_fetch_ssl.js"></script>
<?php
require_once '../../../includes/modal_footer.php';

View File

@@ -1,6 +1,14 @@
<div class="modal" id="addCredentialModal" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<?php
require_once '../../../includes/modal_header.php';
$client_id = intval($_GET['client_id'] ?? 0);
$contact_id = intval($_GET['contact_id'] ?? 0);
$asset_id = intval($_GET['asset_id'] ?? 0);
ob_start();
?>
<div class="modal-header bg-dark">
<h5 class="modal-title"><i class="fa fa-fw fa-key mr-2"></i>New Credential</h5>
<button type="button" class="close text-white" data-dismiss="modal">
@@ -15,7 +23,7 @@
<li class="nav-item">
<a class="nav-link active" data-toggle="pill" href="#pills-credential-details">Details</a>
</li>
<?php if ($client_url) { ?>
<?php if ($client_id) { ?>
<li class="nav-item">
<a class="nav-link" data-toggle="pill" href="#pills-credential-relation">Relation</a>
</li>
@@ -31,7 +39,7 @@
<div class="tab-pane fade show active" id="pills-credential-details">
<?php if ($client_url) { ?>
<?php if ($client_id) { ?>
<input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
<?php } else { ?>
@@ -47,9 +55,9 @@
$sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
while ($row = mysqli_fetch_array($sql)) {
$client_id = intval($row['client_id']);
$client_id_select = intval($row['client_id']);
$client_name = nullable_htmlentities($row['client_name']); ?>
<option <?php if ($client_id == isset($_GET['client'])) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
<option <?php if ($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name; ?></option>
<?php } ?>
</select>
@@ -144,7 +152,7 @@
</div>
<?php if ($client_url) { ?>
<?php if ($client_id) { ?>
<div class="tab-pane fade" id="pills-credential-relation">
<div class="form-group">
<label>Contact</label>
@@ -158,14 +166,12 @@
$sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
while ($row = mysqli_fetch_array($sql)) {
$contact_id = intval($row['contact_id']);
$contact_id_select = intval($row['contact_id']);
$contact_name = nullable_htmlentities($row['contact_name']);
?>
<option
<?php if (isset($_GET['contact_id']) && $contact_id == $_GET['contact_id']) {
echo "selected"; }
?>
value="<?php echo $contact_id; ?>"><?php echo $contact_name; ?>
<?php if ($contact_id == $contact_id_select) { echo "selected"; } ?>
value="<?php echo $contact_id_select; ?>"><?php echo $contact_name; ?>
</option>
<?php
@@ -187,7 +193,7 @@
$sql = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN locations on asset_location_id = location_id WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
while ($row = mysqli_fetch_array($sql)) {
$asset_id = intval($row['asset_id']);
$asset_id_select = intval($row['asset_id']);
$asset_name = nullable_htmlentities($row['asset_name']);
$asset_location = nullable_htmlentities($row['location_name']);
@@ -197,9 +203,8 @@
}
?>
<option <?php if (isset($_GET['asset_id']) && $asset_id == $_GET['asset_id']) {
echo "selected"; } ?>
value="<?php echo $asset_id; ?>"><?php echo $asset_display_string; ?></option>
<option <?php if ($asset_id == $asset_id_select) { echo "selected"; } ?>
value="<?php echo $asset_id_select; ?>"><?php echo $asset_display_string; ?></option>
<?php
}
@@ -252,6 +257,7 @@
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
</div>
</form>
</div>
</div>
</div>
<?php
require_once '../../../includes/modal_footer.php';

View File

@@ -1,6 +1,12 @@
<div class="modal" id="addDomainModal" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<?php
require_once '../../../includes/modal_header.php';
$client_id = intval($_GET['client_id'] ?? 0);
ob_start();
?>
<div class="modal-header bg-dark">
<h5 class="modal-title"><i class="fa fa-fw fa-globe mr-2"></i>New Domain</h5>
<button type="button" class="close text-white" data-dismiss="modal">
@@ -26,7 +32,7 @@
<div class="tab-pane fade show active" id="pills-details">
<?php if ($client_url) { ?>
<?php if ($client_id) { ?>
<input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
<?php } else { ?>
@@ -42,9 +48,9 @@
$sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
while ($row = mysqli_fetch_array($sql)) {
$client_id = intval($row['client_id']);
$client_id_select = intval($row['client_id']);
$client_name = nullable_htmlentities($row['client_name']); ?>
<option <?php if ($client_id == isset($_GET['client'])) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
<option <?php if ($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name; ?></option>
<?php } ?>
</select>
@@ -73,7 +79,7 @@
</div>
</div>
<?php if ($client_url) { ?>
<?php if ($client_id) { ?>
<div class="form-group">
<label>Registrar</label>
<div class="input-group">
@@ -186,6 +192,7 @@
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
</div>
</form>
</div>
</div>
</div>
<?php
require_once '../../../includes/modal_footer.php';

View File

@@ -1,6 +1,13 @@
<div class="modal" id="addNetworkModal" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<?php
require_once '../../../includes/modal_header.php';
$client_id = intval($_GET['client_id'] ?? 0);
$location_id = intval($_GET['location_id'] ?? 0);
ob_start();
?>
<div class="modal-header bg-dark">
<h5 class="modal-title"><i class="fa fa-fw fa-network-wired mr-2"></i>New Network</h5>
<button type="button" class="close text-white" data-dismiss="modal">
@@ -31,7 +38,7 @@
<div class="tab-pane fade show active" id="pills-details">
<?php if ($client_url) { ?>
<?php if ($client_id) { ?>
<input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
<?php } else { ?>
@@ -47,9 +54,9 @@
$sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
while ($row = mysqli_fetch_array($sql)) {
$client_id = intval($row['client_id']);
$client_id_select = intval($row['client_id']);
$client_name = nullable_htmlentities($row['client_name']); ?>
<option <?php if ($client_id == isset($_GET['client'])) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
<option <?php if ($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name; ?></option>
<?php } ?>
</select>
@@ -78,7 +85,7 @@
</div>
</div>
<?php if ($client_url) { ?>
<?php if ($client_id) { ?>
<div class="form-group">
<label>Location</label>
<div class="input-group">
@@ -91,10 +98,10 @@
$sql = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
while ($row = mysqli_fetch_array($sql)) {
$location_id = intval($row['location_id']);
$location_id_select = intval($row['location_id']);
$location_name = nullable_htmlentities($row['location_name']);
?>
<option <?php if ($location_id == isset($_GET['location'])) { echo "selected"; } ?> value="<?php echo $location_id; ?>"><?php echo $location_name; ?></option>
<option <?php if ($location_id == $location_id_select) { echo "selected"; } ?> value="<?php echo $location_id_select; ?>"><?php echo $location_name; ?></option>
<?php
}
@@ -195,6 +202,7 @@
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
</div>
</form>
</div>
</div>
</div>
<?php
require_once '../../../includes/modal_footer.php';

View File

@@ -1,6 +1,12 @@
<div class="modal" id="addServiceModal" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<?php
require_once '../../../includes/modal_header.php';
$client_id = intval($_GET['client_id'] ?? 0);
ob_start();
?>
<div class="modal-header bg-dark">
<h5 class="modal-title text-white"><i class="fa fa-fw fa-stream mr-2"></i>New Service</h5>
<button type="button" class="close text-white" data-dismiss="modal">
@@ -11,7 +17,7 @@
<form action="post.php" method="post" autocomplete="off">
<div class="modal-body">
<?php if ($client_url) { ?>
<?php if ($client_id) { ?>
<ul class="nav nav-pills nav-justified mb-3">
<li class="nav-item">
<a class="nav-link active" data-toggle="pill" href="#pills-overview">Overview</a>
@@ -36,7 +42,7 @@
<div class="tab-pane fade show active" id="pills-overview">
<?php if ($client_url) { ?>
<?php if ($client_id) { ?>
<input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
<?php } else { ?>
@@ -124,7 +130,7 @@
</div>
</div>
<?php if ($client_url) { ?>
<?php if ($client_id) { ?>
<div class="tab-pane fade" id="pills-general">
<div class="form-group">
@@ -242,6 +248,7 @@
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
</div>
</form>
</div>
</div>
</div>
<?php
require_once '../../../includes/modal_footer.php';

View File

@@ -1,6 +1,12 @@
<div class="modal" id="addSoftwareModal" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
<?php
require_once '../../../includes/modal_header.php';
$client_id = intval($_GET['client_id'] ?? 0);
ob_start();
?>
<div class="modal-header bg-dark">
<h5 class="modal-title"><i class="fa fa-fw fa-cube mr-2"></i>New License</h5>
<button type="button" class="close text-white" data-dismiss="modal">
@@ -17,7 +23,7 @@
<li class="nav-item">
<a class="nav-link" data-toggle="pill" href="#pills-licensing">Licensing</a>
</li>
<?php if ($client_url) { // Dont show these when in global mode ?>
<?php if ($client_id) { // Dont show these when in global mode ?>
<li class="nav-item">
<a class="nav-link" data-toggle="pill" href="#pills-device-licenses">Devices</a>
</li>
@@ -36,7 +42,7 @@
<div class="tab-pane fade show active" id="pills-details">
<?php if ($client_url) { ?>
<?php if ($client_id) { ?>
<input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
<?php } else { ?>
@@ -52,9 +58,9 @@
$sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
while ($row = mysqli_fetch_array($sql)) {
$client_id = intval($row['client_id']);
$client_id_select = intval($row['client_id']);
$client_name = nullable_htmlentities($row['client_name']); ?>
<option <?php if ($client_id == isset($_GET['client'])) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
<option <?php if ($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name; ?></option>
<?php } ?>
</select>
@@ -93,7 +99,7 @@
</div>
</div>
<?php if ($client_url) { ?>
<?php if ($client_id) { ?>
<div class="form-group">
<label>Vendor</label>
<div class="input-group">
@@ -202,7 +208,7 @@
</div>
<?php if ($client_url) { // Dont show these when in global mode ?>
<?php if ($client_id) { // Dont show these when in global mode ?>
<div class="tab-pane fade" id="pills-device-licenses">
@@ -294,6 +300,7 @@
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
</div>
</form>
</div>
</div>
</div>
<?php
require_once '../../../includes/modal_footer.php';

View File

@@ -78,7 +78,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<h3 class="card-title mt-2"><i class="fas fa-fw fa-network-wired mr-2"></i>Networks</h3>
<div class="card-tools">
<div class="btn-group">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addNetworkModal"><i class="fas fa-plus mr-2"></i>New Network</button>
<button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/network/network_add.php?<?= $client_url ?>&location_id=<?= $location_filter ?>"><i class="fas fa-plus mr-2"></i>New Network</button>
<?php if ($num_rows[0] > 0) { ?>
<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
<div class="dropdown-menu">
@@ -358,7 +358,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
</div>
<?php
require_once "modals/network/network_add.php";
require_once "modals/network/network_export.php";
?>

View File

@@ -50,7 +50,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<h3 class="card-title mt-2"><i class="fa fa-fw fa-stream mr-2"></i>Services</h3>
<div class="card-tools">
<?php if (lookupUserPermission("module_support") >= 2) { ?>
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addServiceModal"><i class="fas fa-plus mr-2"></i>New Service</button>
<button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/service/service_add.php?<?= $client_url ?>"><i class="fas fa-plus mr-2"></i>New Service</button>
<?php } ?>
</div>
</div>
@@ -220,5 +220,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
</div>
<?php
require_once "modals/service/service_add.php";
require_once "../includes/footer.php";

View File

@@ -66,7 +66,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<h3 class="card-title mt-2"><i class="fas fa-fw fa-cube mr-2"></i>Software & Licenses</h3>
<div class="card-tools">
<div class="btn-group">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addSoftwareModal">
<button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/software/software_add.php?<?= $client_url ?>">
<i class="fas fa-plus mr-2"></i>New License
</button>
<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
@@ -322,7 +322,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<?php
require_once "modals/software/software_add.php";
require_once "modals/software/software_add_from_template.php";
require_once "modals/software/software_export.php";
require_once "../includes/footer.php";