Stripe Var Passthru attempt

This commit is contained in:
johnnyq 2025-01-17 15:26:40 -05:00
parent e4a4687e8c
commit cb7965a84f
6 changed files with 91 additions and 24 deletions

View File

@ -95,13 +95,31 @@ if (isset($_GET['asset_id'])) {
$document_count = mysqli_num_rows($sql_related_documents); $document_count = mysqli_num_rows($sql_related_documents);
// Network Interfaces // Network Interfaces
$sql_related_interfaces = mysqli_query($mysqli, "SELECT * FROM asset_interfaces $sql_related_interfaces = mysqli_query($mysqli, "
LEFT JOIN assets ON asset_id = interface_asset_id SELECT
LEFT JOIN networks ON network_id = interface_network_id ai.interface_id,
WHERE asset_id = $asset_id ai.interface_name,
AND interface_archived_at IS NULL ai.interface_mac,
ORDER BY interface_name ASC" ai.interface_ip,
); ai.interface_ipv6,
ai.interface_port,
ai.interface_primary,
ai.interface_notes,
ai.interface_connected_asset_interface,
n.network_name,
n.network_id,
connected_assets.asset_name AS connected_asset_name,
connected_interfaces.interface_name AS connected_interface_name,
connected_interfaces.interface_port AS connected_interface_port
FROM asset_interfaces ai
LEFT JOIN assets a ON a.asset_id = ai.interface_asset_id
LEFT JOIN networks n ON n.network_id = ai.interface_network_id
LEFT JOIN asset_interfaces connected_interfaces ON connected_interfaces.interface_id = ai.interface_connected_asset_interface
LEFT JOIN assets connected_assets ON connected_assets.asset_id = connected_interfaces.interface_asset_id
WHERE ai.interface_asset_id = $asset_id
AND ai.interface_archived_at IS NULL
ORDER BY ai.interface_name ASC
");
$interface_count = mysqli_num_rows($sql_related_interfaces); $interface_count = mysqli_num_rows($sql_related_interfaces);
// Related Files // Related Files
@ -320,7 +338,7 @@ if (isset($_GET['asset_id'])) {
<div class="card card-dark"> <div class="card card-dark">
<div class="card-header py-2"> <div class="card-header py-2">
<h3 class="card-title mt-2"><i class="fa fa-fw fa-ethernet mr-2"></i>Network Interfaces</h3> <h3 class="card-title mt-2"><i class="fa fa-fw fa-ethernet mr-2"></i><?php echo $asset_name; ?> Network Interfaces</h3>
<div class="card-tools"> <div class="card-tools">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addAssetInterfaceModal"><i class="fas fa-plus mr-2"></i>New Interface</button> <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addAssetInterfaceModal"><i class="fas fa-plus mr-2"></i>New Interface</button>
</div> </div>
@ -368,13 +386,14 @@ if (isset($_GET['asset_id'])) {
$network_id = intval($row['network_id']); $network_id = intval($row['network_id']);
$network_name = nullable_htmlentities($row['network_name']); $network_name = nullable_htmlentities($row['network_name']);
if ($network_name) { if ($network_name) {
$network_name_display = "<i class='fas fa-fw fa-network-wired mr-1'></i>$network_name"; $network_name_display = "<i class='fas fa-fw fa-network-wired mr-1'></i>$network_name $network_id";
} else { } else {
$network_name_display = "-"; $network_name_display = "-";
} }
$interface_notes = nullable_htmlentities($row['interface_notes']); $interface_notes = nullable_htmlentities($row['interface_notes']);
$connected_asset_interface = intval($row['interface_connected_asset_interface']);
$connected_asset_name = nullable_htmlentities($row['connected_asset_name']);
$connected_asset_port = nullable_htmlentities($row['connected_interface_port']);
?> ?>
<tr> <tr>
<td> <td>
@ -387,7 +406,7 @@ if (isset($_GET['asset_id'])) {
<td><?php echo $interface_ip_display; ?></td> <td><?php echo $interface_ip_display; ?></td>
<td><?php echo $interface_port_display; ?></td> <td><?php echo $interface_port_display; ?></td>
<td><?php echo $network_name_display; ?></td> <td><?php echo $network_name_display; ?></td>
<td>-</td> <td><?php echo "<strong>$connected_asset_name</strong> - $connected_asset_port"; ?></td>
<td> <td>
<div class="dropdown dropleft text-center"> <div class="dropdown dropleft text-center">
<button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown"> <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
@ -867,11 +886,10 @@ if (isset($_GET['asset_id'])) {
require_once "modals/share_modal.php"; require_once "modals/share_modal.php";
}
?> ?>
<?php } ?>
<script> <script>
function updateAssetNotes(asset_id) { function updateAssetNotes(asset_id) {
var notes = document.getElementById("assetNotes").value; var notes = document.getElementById("assetNotes").value;
@ -908,12 +926,7 @@ if (isset($_GET['asset_id'])) {
<?php <?php
require_once "modals/client_asset_interface_add_modal.php"; require_once "modals/client_asset_interface_add_modal.php";
require_once "modals/ticket_add_modal.php"; require_once "modals/ticket_add_modal.php";
require_once "modals/recurring_ticket_add_modal.php"; require_once "modals/recurring_ticket_add_modal.php";
require_once "modals/recurring_ticket_edit_modal.php"; require_once "modals/recurring_ticket_edit_modal.php";
require_once "includes/footer.php"; require_once "includes/footer.php";

View File

@ -1,4 +1,6 @@
// Initialize Stripe.js // Initialize Stripe.js
//const stripe = Stripe('pk_test_51QhHFaH1DlldW47DoEgLXkXD65rtGgpXrS2H9mlC9tF117NtExGVvdsVpnS0whz0s4wuTgN4Yl2hjW8ERXYHV3fP00ZKjrya8n');
const stripe = Stripe(document.getElementById("stripe_publishable_key").value); const stripe = Stripe(document.getElementById("stripe_publishable_key").value);
initialize(); initialize();

View File

@ -70,7 +70,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Connected to</label> <label>Network</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-network-wired"></i></span> <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
@ -92,6 +92,30 @@
</div> </div>
</div> </div>
<div class="form-group">
<label>Connected to</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
</div>
<select class="form-control select2" name="connected_to">
<option value="">- None -</option>
<?php
$sql_interfaces_select = mysqli_query($mysqli, "SELECT * FROM asset_interfaces LEFT JOIN assets ON interface_asset_id = asset_id WHERE asset_archived_at IS NULL AND asset_client_id = $client_id ORDER BY asset_name ASC, interface_port ASC");
while ($row = mysqli_fetch_array($sql_interfaces_select)) {
$interface_id_select = intval($row['interface_id']);
$interface_port_select = nullable_htmlentities($row['interface_port']);
$asset_type_select = nullable_htmlentities($row['asset_type']);
$asset_name_select = nullable_htmlentities($row['asset_name']);
?>
<option value="<?php echo $interface_id_select; ?>"><?php echo "$asset_name_select - $interface_port_select"; ?></option>
<?php } ?>
</select>
</div>
</div>
<div class="form-group"> <div class="form-group">
<textarea class="form-control" rows="5" placeholder="Enter some notes" name="notes"></textarea> <textarea class="form-control" rows="5" placeholder="Enter some notes" name="notes"></textarea>
</div> </div>

View File

@ -70,7 +70,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Connected to</label> <label>Network</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-network-wired"></i></span> <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
@ -81,7 +81,7 @@
$sql_network_select = mysqli_query($mysqli, "SELECT * FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id ORDER BY network_name ASC"); $sql_network_select = mysqli_query($mysqli, "SELECT * FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id ORDER BY network_name ASC");
while ($row = mysqli_fetch_array($sql_network_select)) { while ($row = mysqli_fetch_array($sql_network_select)) {
$network_id_select = $row['network_id']; $network_id_select = intval($row['network_id']);
$network_name_select = nullable_htmlentities($row['network_name']); $network_name_select = nullable_htmlentities($row['network_name']);
$network_select = nullable_htmlentities($row['network']); $network_select = nullable_htmlentities($row['network']);
@ -92,6 +92,30 @@
</div> </div>
</div> </div>
<div class="form-group">
<label>Connected to</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
</div>
<select class="form-control select2" name="connected_to">
<option value="">- None -</option>
<?php
$sql_interfaces_select = mysqli_query($mysqli, "SELECT * FROM asset_interfaces LEFT JOIN assets ON interface_asset_id = asset_id WHERE asset_archived_at IS NULL AND asset_client_id = $client_id ORDER BY asset_name ASC, interface_port ASC");
while ($row = mysqli_fetch_array($sql_interfaces_select)) {
$interface_id_select = intval($row['interface_id']);
$interface_port_select = nullable_htmlentities($row['interface_port']);
$asset_type_select = nullable_htmlentities($row['asset_type']);
$asset_name_select = nullable_htmlentities($row['asset_name']);
?>
<option <?php if ($connected_asset_interface == $interface_id_select) { echo "selected"; } ?> value="<?php echo $interface_id_select; ?>"><?php echo "$asset_name_select - $interface_port_select"; ?></option>
<?php } ?>
</select>
</div>
</div>
<div class="form-group"> <div class="form-group">
<textarea class="form-control" rows="5" placeholder="Enter some notes" name="notes"><?php echo $interface_notes; ?></textarea> <textarea class="form-control" rows="5" placeholder="Enter some notes" name="notes"><?php echo $interface_notes; ?></textarea>
</div> </div>

View File

@ -691,7 +691,7 @@ if (isset($_POST['add_asset_interface'])) {
$asset_name = sanitizeInput($row['asset_name']); $asset_name = sanitizeInput($row['asset_name']);
$client_id = intval($row['asset_client_id']); $client_id = intval($row['asset_client_id']);
mysqli_query($mysqli,"INSERT INTO asset_interfaces SET interface_name = '$name', interface_mac = '$mac', interface_ip = '$ip', interface_ipv6 = '$ipv6', interface_port = '$port', interface_notes = '$notes', interface_network_id = $network, interface_asset_id = $asset_id"); mysqli_query($mysqli,"INSERT INTO asset_interfaces SET interface_name = '$name', interface_mac = '$mac', interface_ip = '$ip', interface_ipv6 = '$ipv6', interface_port = '$port', interface_notes = '$notes', interface_network_id = $network, interface_connected_asset_interface = $connected_to, interface_asset_id = $asset_id");
$interface_id = mysqli_insert_id($mysqli); $interface_id = mysqli_insert_id($mysqli);
@ -721,7 +721,10 @@ if (isset($_POST['edit_asset_interface'])) {
$asset_name = sanitizeInput($row['asset_name']); $asset_name = sanitizeInput($row['asset_name']);
$client_id = intval($row['asset_client_id']); $client_id = intval($row['asset_client_id']);
mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_name = '$name', interface_mac = '$mac', interface_ip = '$ip', interface_ipv6 = '$ipv6', interface_port = '$port', interface_notes = '$notes', interface_network_id = $network WHERE interface_id = $interface_id"); mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_name = '$name', interface_mac = '$mac', interface_ip = '$ip', interface_ipv6 = '$ipv6', interface_port = '$port', interface_notes = '$notes', interface_network_id = $network, interface_connected_asset_interface = $connected_to WHERE interface_id = $interface_id");
// Update the Connected device on the connecting device
mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_connected_asset_interface = $interface_id WHERE interface_id = $connected_to");
//Logging //Logging
logAction("Asset Interface", "Edit", "$session_name edited interface $name for asset $asset_name", $client_id, $asset_id); logAction("Asset Interface", "Edit", "$session_name edited interface $name for asset $asset_name", $client_id, $asset_id);

View File

@ -11,3 +11,4 @@ $ipv6 = sanitizeInput($_POST['ipv6']);
$port = sanitizeInput($_POST['port']); $port = sanitizeInput($_POST['port']);
$network = intval($_POST['network']); $network = intval($_POST['network']);
$notes = sanitizeInput($_POST['notes']); $notes = sanitizeInput($_POST['notes']);
$connected_to = intval($_POST['connected_to']);