mirror of
https://github.com/itflow-org/itflow
synced 2026-04-27 14:57:47 +00:00
Merge branch 'develop' of github.com:itflow-org/itflow into develop
This commit is contained in:
@@ -27,6 +27,9 @@ if (!empty($asset_id)) {
|
|||||||
// Update Primary Interface
|
// Update Primary Interface
|
||||||
mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_mac = '$mac', interface_ip = '$ip', interface_network_id = $network WHERE interface_asset_id = $asset_id AND interface_primary = 1");
|
mysqli_query($mysqli,"UPDATE asset_interfaces SET interface_mac = '$mac', interface_ip = '$ip', interface_network_id = $network WHERE interface_asset_id = $asset_id AND interface_primary = 1");
|
||||||
|
|
||||||
|
// Add to History
|
||||||
|
mysqli_query($mysqli,"INSERT INTO asset_history SET asset_history_status = '$status', asset_history_description = 'API updated $name ($api_key_name)', asset_history_asset_id = $asset_id");
|
||||||
|
|
||||||
// Logging
|
// Logging
|
||||||
logAction("Asset", "Edit", "$name via API ($api_key_name)", $client_id);
|
logAction("Asset", "Edit", "$name via API ($api_key_name)", $client_id);
|
||||||
logAction("API", "Success", "Edited asset $name via API ($api_key_name)", $client_id);
|
logAction("API", "Success", "Edited asset $name via API ($api_key_name)", $client_id);
|
||||||
|
|||||||
@@ -60,8 +60,18 @@ if (!empty($document_id)) {
|
|||||||
|
|
||||||
$document_version_id = mysqli_insert_id($mysqli);
|
$document_version_id = mysqli_insert_id($mysqli);
|
||||||
|
|
||||||
// 3) Variable assignment from POST (uses trigger you already have)
|
// 3) Variable assignment from POST
|
||||||
// This should set: $name, $description, $content (raw html), $folder, etc.
|
// This should set: $name, $description, $content (raw html), $folder, etc.
|
||||||
|
|
||||||
|
// Fetch current doc data (fresh)
|
||||||
|
$document_row = mysqli_fetch_assoc(mysqli_query($mysqli, "
|
||||||
|
SELECT * FROM documents
|
||||||
|
WHERE document_client_id = $client_id
|
||||||
|
AND document_id = $document_id
|
||||||
|
LIMIT 1
|
||||||
|
"));
|
||||||
|
|
||||||
|
// Assign variables from POST or fallback to DB
|
||||||
require_once 'document_model.php';
|
require_once 'document_model.php';
|
||||||
|
|
||||||
// Process NEW HTML content: save base64 images to /uploads/documents/<document_id>/
|
// Process NEW HTML content: save base64 images to /uploads/documents/<document_id>/
|
||||||
|
|||||||
Reference in New Issue
Block a user