diff --git a/README.md b/README.md index aa3b6cd6..6c1791cc 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ ### In Beta * This project is in beta with many ongoing changes. Updates may unintentionally introduce bugs/security issues. Writing functional, secure code is very difficult. * Whilst we are confident the code is safe, nothing in life is 100% safe or risk-free. Use your best judgement before deciding to store highly confidential information in ITFlow. -* We are hoping to have a stable 1.0 release by early 2024. +* We are hoping to have a stable 1.0 release by early 2025. ## Getting Started diff --git a/admin_app_log.php b/admin_app_log.php new file mode 100644 index 00000000..c03f5a24 --- /dev/null +++ b/admin_app_log.php @@ -0,0 +1,193 @@ + + +
+
+

App Logs

+
+
+
+
+
+
+ +
+ + +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
" id="advancedFilter"> +
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+
+ + "> + + + + + + + + + + + + + + + + + + + + +
+ + Timestamp + + + + Type + + + + Category + + + + Details + +
+
+ +
+
+ +
- -
diff --git a/admin_custom_link_edit_modal.php b/admin_custom_link_edit_modal.php index d2be695c..63124b91 100644 --- a/admin_custom_link_edit_modal.php +++ b/admin_custom_link_edit_modal.php @@ -8,7 +8,9 @@
+ +
diff --git a/admin_debug.php b/admin_debug.php index fc6d659a..894151c3 100644 --- a/admin_debug.php +++ b/admin_debug.php @@ -1,4 +1,5 @@ free(); - $databaseStats[] = [ - 'name' => 'Current Database Version', - 'value' => CURRENT_DATABASE_VERSION, - ]; $databaseStats[] = [ 'name' => 'Total number of tables', 'value' => $totalTables, @@ -512,13 +512,22 @@ $mysqli->close();

Debugging

    -
  • If you are experiencing a problem with ITFlow you may be directed to this page to gather server/app info.
    • -
  • When creating forum posts / support requests ensure you share the information under Server Info, ITFlow app and Database stats.
    • -
  • Caution: Be careful when sharing the full debug output - it contains your PHP session variables/cookies ("PHPSESSID") which could allow anyone to login to your ITFlow instance
    • -
  • Note: Sometimes you might need to gather PHP error logs as well
    • +
  • If you are experiencing a problem with ITFlow, this page should help you identify any configuration issues.
    • +
  • Note: You might also need to gather error logs
+ + + + + + + + + +
Current App Version
Current DB Version
+

System Information

diff --git a/admin_document_template.php b/admin_document_template.php index 64fd8a6d..353de054 100644 --- a/admin_document_template.php +++ b/admin_document_template.php @@ -135,3 +135,36 @@ + + diff --git a/admin_document_template_add_modal.php b/admin_document_template_add_modal.php index 8f243a7d..521d0a67 100644 --- a/admin_document_template_add_modal.php +++ b/admin_document_template_add_modal.php @@ -14,9 +14,26 @@ + + +
+ +
+ +
+ +
+
+
+ + +
+
diff --git a/admin_settings_ai.php b/admin_settings_ai.php index e36f1464..91eba539 100644 --- a/admin_settings_ai.php +++ b/admin_settings_ai.php @@ -63,10 +63,8 @@ require_once "inc_all_admin.php";
-

Test Input Text to Reword

- - - +
Test AI Rewording
+
diff --git a/admin_settings_company.php b/admin_settings_company.php index f3e42cf6..797ba20e 100644 --- a/admin_settings_company.php +++ b/admin_settings_company.php @@ -48,7 +48,7 @@ $company_initials = nullable_htmlentities(initials($company_name));
- +
diff --git a/admin_settings_default.php b/admin_settings_default.php index 29151e91..c162ac1b 100644 --- a/admin_settings_default.php +++ b/admin_settings_default.php @@ -231,10 +231,10 @@ require_once "inc_all_admin.php"; $phone_mask = intval($row['config_phone_mask']); } ?>
diff --git a/admin_settings_integration.php b/admin_settings_integration.php index 6a71ae2b..68e1a6b3 100644 --- a/admin_settings_integration.php +++ b/admin_settings_integration.php @@ -10,9 +10,9 @@ require_once "inc_all_admin.php"; -

Client Portal SSO via Microsoft Azure AD

+

Client Portal SSO via Microsoft Entra

- +
@@ -22,7 +22,7 @@ require_once "inc_all_admin.php";
- +
diff --git a/admin_settings_invoice.php b/admin_settings_invoice.php index d2b68f26..24115592 100644 --- a/admin_settings_invoice.php +++ b/admin_settings_invoice.php @@ -63,7 +63,7 @@ require_once "inc_all_admin.php";
- +
diff --git a/admin_settings_notification.php b/admin_settings_notification.php index 2dd6c40e..8197c908 100644 --- a/admin_settings_notification.php +++ b/admin_settings_notification.php @@ -11,11 +11,6 @@ require_once "inc_all_admin.php";
- - - - -
diff --git a/admin_settings_quote.php b/admin_settings_quote.php index ea3c2763..ea198287 100644 --- a/admin_settings_quote.php +++ b/admin_settings_quote.php @@ -35,6 +35,16 @@ require_once "inc_all_admin.php";
+
+ +
+
+ +
+ +
+
+
diff --git a/admin_settings_theme.php b/admin_settings_theme.php index a503a85e..9ac12a36 100644 --- a/admin_settings_theme.php +++ b/admin_settings_theme.php @@ -22,7 +22,7 @@ require_once "inc_all_admin.php";
- > + >
-
- - -
diff --git a/admin_settings_ticket.php b/admin_settings_ticket.php index 72020c89..44e97502 100644 --- a/admin_settings_ticket.php +++ b/admin_settings_ticket.php @@ -9,9 +9,6 @@ require_once "inc_all_admin.php";
- - -
@@ -72,7 +69,7 @@ require_once "inc_all_admin.php";
- +
diff --git a/admin_side_nav.php b/admin_side_nav.php index 4c3ce5d9..c93cec27 100644 --- a/admin_side_nav.php +++ b/admin_side_nav.php @@ -120,6 +120,12 @@

Audit Logs

+
  • + + +

    App Logs

    +     +
  • diff --git a/admin_user_add_modal.php b/admin_user_add_modal.php index 99e98301..9d54bb0b 100644 --- a/admin_user_add_modal.php +++ b/admin_user_add_modal.php @@ -85,7 +85,7 @@
    - +
    > diff --git a/admin_user_edit_modal.php b/admin_user_edit_modal.php index 0831dcbb..491c7de6 100644 --- a/admin_user_edit_modal.php +++ b/admin_user_edit_modal.php @@ -98,7 +98,7 @@
    - +
    diff --git a/admin_user_export_modal.php b/admin_user_export_modal.php index 9439fbc5..82e68dfc 100644 --- a/admin_user_export_modal.php +++ b/admin_user_export_modal.php @@ -10,9 +10,6 @@
    - -
    diff --git a/ajax.php b/ajax.php index fb699daf..3a420b06 100644 --- a/ajax.php +++ b/ajax.php @@ -152,7 +152,7 @@ if (isset($_POST['client_set_notes'])) { mysqli_query($mysqli, "UPDATE clients SET client_notes = '$notes' WHERE client_id = $client_id"); // Logging - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Client', log_action = 'Modify', log_description = '$session_name modified client notes', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id"); + logAction("Client", "Edit", "$session_name edited client notes", $client_id); } @@ -160,11 +160,19 @@ if (isset($_POST['contact_set_notes'])) { $contact_id = intval($_POST['contact_id']); $notes = sanitizeInput($_POST['notes']); + // Get Contact Details and Client ID for Logging + $sql = mysqli_query($mysqli,"SELECT contact_name, contact_client_id + FROM contacts WHERE contact_id = $contact_id" + ); + $row = mysqli_fetch_array($sql); + $contact_name = sanitizeInput($row['contact_name']); + $client_id = intval($row['contact_client_id']); + // Update notes mysqli_query($mysqli, "UPDATE contacts SET contact_notes = '$notes' WHERE contact_id = $contact_id"); // Logging - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Contact', log_action = 'Modify', log_description = '$session_name modified contact notes', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); + logAction("Contact", "Edit", "$session_name edited contact notes for $contact_name", $client_id, $contact_id); } @@ -172,11 +180,19 @@ if (isset($_POST['asset_set_notes'])) { $asset_id = intval($_POST['asset_id']); $notes = sanitizeInput($_POST['notes']); + // Get Asset Details and Client ID 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']); + // Update notes mysqli_query($mysqli, "UPDATE assets SET asset_notes = '$notes' WHERE asset_id = $asset_id"); // Logging - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Asset', log_action = 'Modify', log_description = '$session_name modified asset notes', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); + logAction("Asset", "Edit", "$session_name edited asset notes for $asset_name", $client_id, $asset_id); } @@ -236,14 +252,20 @@ if (isset($_GET['share_generate_link'])) { $item_email = sanitizeInput($_GET['contact_email']); $item_note = sanitizeInput($_GET['note']); $item_view_limit = intval($_GET['views']); + $item_view_limit_wording = ""; + if ($item_view_limit == 1) { + $item_view_limit_wording = " and may only be viewed once, before the link is destroyed."; + } $item_expires = sanitizeInput($_GET['expires']); $item_expires_friendly = "never"; // default never - if ($item_expires == "30 MINUTE") { - $item_expires_friendly = "30 minutes"; + if ($item_expires == "1 HOUR") { + $item_expires_friendly = "1 hour"; } elseif ($item_expires == "24 HOUR") { - $item_expires_friendly = "24 hours"; - } elseif ($item_expires == "72 HOUR") { - $item_expires_friendly = "72 hours (3 days)"; + $item_expires_friendly = "1 day"; + } elseif ($item_expires == "168 HOUR") { + $item_expires_friendly = "1 week"; + } elseif ($item_expires == "730 HOUR") { + $item_expires_friendly = "1 month"; } $item_key = randomString(156); @@ -308,7 +330,7 @@ if (isset($_GET['share_generate_link'])) { if ($item_expires_friendly == "never") { $subject = "$company_name secure link enclosed"; } - $body = "Hello,

    $session_name from $company_name sent you a time sensitive secure link regarding \"$item_name\".

    The link will expire in $item_expires_friendly and may only be viewed $item_view_limit times, before the link is destroyed.

    Click here to access your secure content

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; + $body = "Hello,

    $session_name from $company_name sent you a time sensitive secure link regarding \"$item_name\".

    The link will expire in $item_expires_friendly$item_view_limit_wording.

    Click here to access your secure content

    --
    $company_name - Support
    $config_ticket_from_email
    $company_phone"; // Add the intended recipient disclosure $body .= "

    This email and any attachments are confidential and intended for the specified recipient(s) only. If you are not the intended recipient, please notify the sender and delete this email. Unauthorized use, disclosure, or distribution is prohibited."; @@ -331,7 +353,7 @@ if (isset($_GET['share_generate_link'])) { echo json_encode($url); // Logging - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Sharing', log_action = 'Create', log_description = '$session_name created shared link for $item_type - $item_name', log_client_id = $client_id, log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); + logAction("Share", "Create", "$session_name created shared link for $item_type - $item_name", $client_id, $item_id); } @@ -484,7 +506,9 @@ if (isset($_GET['get_totp_token_via_id'])) { $recent_totp_view_logged_count = intval($check_recent_totp_view_logged_sql['recent_totp_view']); if ($recent_totp_view_logged_count == 0) { - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Login', log_action = 'View TOTP', log_description = '$session_name viewed login TOTP code for $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $login_id"); + // Logging + logAction("Credential", "View TOTP", "$session_name viewed credential TOTP code for $name", $client_id, $login_id); + } } diff --git a/api/v1/assets/create.php b/api/v1/assets/create.php index b8213805..4954e049 100644 --- a/api/v1/assets/create.php +++ b/api/v1/assets/create.php @@ -22,9 +22,9 @@ if (!empty($name) && !empty($client_id)) { // Add Primary Interface mysqli_query($mysqli,"INSERT INTO asset_interfaces SET interface_name = 'Primary', interface_mac = '$mac', interface_ip = '$ip', interface_port = 'eth0', interface_primary = 1, interface_network_id = $network, interface_asset_id = $insert_id"); - //Logging - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Asset', log_action = 'Created', log_description = '$name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = '$client_id'"); - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'API', log_action = 'Success', log_description = 'Created asset $name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = '$client_id'"); + // Logging + logAction("Asset", "Create", "$name via API ($api_key_name)", $client_id, $insert_id); + logAction("API", "Success", "Created asset $name via API ($api_key_name)", $client_id); } } diff --git a/api/v1/assets/delete.php b/api/v1/assets/delete.php index 42479ef7..061e4bc4 100644 --- a/api/v1/assets/delete.php +++ b/api/v1/assets/delete.php @@ -24,8 +24,8 @@ if (!empty($asset_id)) { if ($delete_sql && !empty($asset_name)) { $delete_count = mysqli_affected_rows($mysqli); - //Logging - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Asset', log_action = 'Deleted', log_description = '$asset_name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id"); + // Logging + logAction("Asset", "Delete", "$asset_name via API ($api_key_name)", $client_id); } } diff --git a/api/v1/assets/update.php b/api/v1/assets/update.php index 54ee6a94..86f59b57 100644 --- a/api/v1/assets/update.php +++ b/api/v1/assets/update.php @@ -28,9 +28,9 @@ if (!empty($asset_id)) { // 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"); - //Logging - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Asset', log_action = 'Updated', log_description = '$name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id"); - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'API', log_action = 'Success', log_description = 'Updated asset $name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id"); + // Logging + logAction("Asset", "Edit", "$name via API ($api_key_name)", $client_id); + logAction("API", "Success", "Edited asset $name via API ($api_key_name)", $client_id); } } diff --git a/api/v1/clients/create.php b/api/v1/clients/create.php index dcffd710..eafd7daa 100644 --- a/api/v1/clients/create.php +++ b/api/v1/clients/create.php @@ -20,9 +20,10 @@ if (!empty($name) && $client_id == 0) { // Check insert & get insert ID if ($insert_sql) { $insert_id = mysqli_insert_id($mysqli); - //Logging - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Client', log_action = 'Created', log_description = '$name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $insert_id"); - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'API', log_action = 'Success', log_description = 'Created client $name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $insert_id"); + + // Logging + logAction("Client", "Create", "$name via API ($api_key_name)", $insert_id); + logAction("API", "Success", "Created client $name via API ($api_key_name)", $insert_id); } } diff --git a/api/v1/contacts/create.php b/api/v1/contacts/create.php index 02301b21..45f3b78f 100644 --- a/api/v1/contacts/create.php +++ b/api/v1/contacts/create.php @@ -25,9 +25,10 @@ if (!empty($name) && !empty($email) && !empty($client_id)) { // Check insert & get insert ID if ($insert_sql) { $insert_id = mysqli_insert_id($mysqli); - //Logging - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Contact', log_action = 'Created', log_description = '$name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id"); - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'API', log_action = 'Success', log_description = 'Created contact $name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id"); + + // Logging + logAction("Contact", "Create", "$name via API ($api_key_name)", $client_id, $insert_id); + logAction("API", "Success", "Created contact $name via API ($api_key_name)", $client_id); } } diff --git a/api/v1/contacts/delete.php b/api/v1/contacts/delete.php index 1729148d..62309277 100644 --- a/api/v1/contacts/delete.php +++ b/api/v1/contacts/delete.php @@ -21,8 +21,8 @@ if (!empty($contact_id)) { if ($delete_sql && !empty($contact_name)) { $delete_count = mysqli_affected_rows($mysqli); - //Logging - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Contact', log_action = 'Deleted', log_description = '$contact_name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id"); + // Logging + logAction("Contact", "Delete", "$contact_name via API ($api_key_name)", $client_id); } } diff --git a/api/v1/contacts/update.php b/api/v1/contacts/update.php index 8e7e28e0..eb9e4c45 100644 --- a/api/v1/contacts/update.php +++ b/api/v1/contacts/update.php @@ -25,12 +25,11 @@ if (!empty($contact_id)) { if ($update_sql) { $update_count = mysqli_affected_rows($mysqli); - //Logging - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Contact', log_action = 'Updated', log_description = '$name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id"); - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'API', log_action = 'Success', log_description = 'Updated contact $name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id"); + // Logging + logAction("Contact", "Edit", "$name via API ($api_key_name)", $client_id, $contact_id); + logAction("API", "Success", "Edited contact $name via API ($api_key_name)", $client_id); } } // Output require_once '../update_output.php'; - diff --git a/api/v1/credentials/create.php b/api/v1/credentials/create.php index 66140df1..ba4c6e0e 100644 --- a/api/v1/credentials/create.php +++ b/api/v1/credentials/create.php @@ -19,9 +19,9 @@ if (!empty($api_key_decrypt_password) && !empty($name) && !(empty($password))) { if ($insert_sql) { $insert_id = mysqli_insert_id($mysqli); - //Logging - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Credential', log_action = 'Create', log_description = '$name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id"); - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'API', log_action = 'Success', log_description = 'Created credential $name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id"); + // Logging + logAction("Credential", "Create", "$name via API ($api_key_name)", $client_id, $insert_id); + logAction("API", "Success", "Created credential $name via API ($api_key_name)", $client_id); } } diff --git a/api/v1/credentials/update.php b/api/v1/credentials/update.php index 489ef8b0..dfe59c45 100644 --- a/api/v1/credentials/update.php +++ b/api/v1/credentials/update.php @@ -27,9 +27,9 @@ if (!empty($_POST['api_key_decrypt_password']) && !empty($login_id)) { mysqli_query($mysqli, "UPDATE logins SET login_password_changed_at = NOW() WHERE login_id = $login_id LIMIT 1"); } - //Logging - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Credential', log_action = 'Update', log_description = '$name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id"); - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'API', log_action = 'Success', log_description = 'Updated credential $name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id"); + // Logging + logAction("Credential", "Edit", "$name via API ($api_key_name)", $client_id, $login_id); + logAction("API", "Success", "Updated credential $name via API ($api_key_name)", $client_id); } } diff --git a/api/v1/documents/create.php b/api/v1/documents/create.php index 9b540885..82d9f7e5 100644 --- a/api/v1/documents/create.php +++ b/api/v1/documents/create.php @@ -22,13 +22,12 @@ if (!empty($name) && !(empty($content))) { // Update field document_parent to be the same id as document ID as this is the only version of the document. mysqli_query($mysqli,"UPDATE documents SET document_parent = $insert_id WHERE document_id = $insert_id"); - //Logging - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Document', log_action = 'Create', log_description = '$name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id"); - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'API', log_action = 'Success', log_description = 'Created document $name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id"); + // Logging + logAction("Document", "Create", "$name via API ($api_key_name)", $client_id, $insert_id); + logAction("API", "Success", "Created document $name via API ($api_key_name)", $client_id); } } - // Output require_once '../create_output.php'; diff --git a/api/v1/documents/update.php b/api/v1/documents/update.php index ec007cb3..63bd9939 100644 --- a/api/v1/documents/update.php +++ b/api/v1/documents/update.php @@ -46,9 +46,9 @@ if (!empty($document_id)) { // Vendor documents mysqli_query($mysqli,"UPDATE vendor_documents SET document_id = $new_document_id WHERE document_id = $document_id"); - //Logging - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Document', log_action = 'Modify', log_description = '$name via API ($api_key_name) previous version was kept', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id"); - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'API', log_action = 'Success', log_description = 'Edited document $name via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id"); + // Logging + logAction("Document", "Edit", "$name via API ($api_key_name) previous version kept", $client_id, $insert_id); + logAction("API", "Success", "Edited document $name via API ($api_key_name)", $client_id); // Override update count to 1 for API to report a success (as we inserted a document, not "updated" an existing row) $update_count = 1; @@ -56,6 +56,5 @@ if (!empty($document_id)) { } - // Output require_once '../update_output.php'; diff --git a/api/v1/tickets/create.php b/api/v1/tickets/create.php index 13da7242..0d0281f0 100644 --- a/api/v1/tickets/create.php +++ b/api/v1/tickets/create.php @@ -4,7 +4,6 @@ require_once '../validate_api_key.php'; require_once '../require_post_method.php'; - // Ticket-related settings require_once "../../../get_settings.php"; @@ -17,14 +16,17 @@ $company_phone = formatPhoneNumber($row['company_phone']); $ticket_row = false; // Creation, not an update require_once 'ticket_model.php'; - // Default $insert_id = false; -if (!empty($subject) && !empty($client_id)) { +if (!empty($subject)) { - // If no contact is selected automatically choose the primary contact for the client - if ($contact == 0) { + if (!is_int($client_id)) { + $client_id = 0; + } + + // If no contact is selected automatically choose the primary contact for the client (if client set) + if ($contact == 0 && $client_id != 0) { $sql = mysqli_query($mysqli,"SELECT contact_id FROM contacts WHERE contact_client_id = $client_id AND contact_primary = 1"); $row = mysqli_fetch_array($sql); $contact = intval($row['contact_id']); @@ -36,18 +38,19 @@ if (!empty($subject) && !empty($client_id)) { mysqli_query($mysqli,"UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1"); // Insert ticket - $insert_sql = mysqli_query($mysqli,"INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 'Open', ticket_vendor_ticket_number = '$vendor_ticket_number', ticket_vendor_id = $vendor_id, ticket_created_by = 0, ticket_assigned_to = $assigned_to, ticket_contact_id = $contact, ticket_client_id = $client_id"); + $url_key = randomString(156); + $insert_sql = mysqli_query($mysqli,"INSERT INTO tickets SET ticket_prefix = '$config_ticket_prefix', ticket_number = $ticket_number, ticket_subject = '$subject', ticket_details = '$details', ticket_priority = '$priority', ticket_status = 1, ticket_vendor_ticket_number = '$vendor_ticket_number', ticket_vendor_id = $vendor_id, ticket_created_by = 0, ticket_assigned_to = $assigned_to, ticket_contact_id = $contact, ticket_url_key = '$url_key', ticket_client_id = $client_id"); // Check insert & get insert ID if ($insert_sql) { $insert_id = mysqli_insert_id($mysqli); + // Logging - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket', log_action = 'Create', log_description = 'Created ticket $config_ticket_prefix$ticket_number $subject via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id"); - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'API', log_action = 'Success', log_description = 'Created ticket $config_ticket_prefix$ticket_number via API ($api_key_name)', log_ip = '$ip', log_user_agent = '$user_agent', log_client_id = $client_id"); + logAction("Ticket", "Create", "Created ticket $config_ticket_prefix$ticket_number $subject via API ($api_key_name)", $client_id, $insert_id); + logAction("API", "Success", "Created ticket $config_ticket_prefix$ticket_number $subject via API ($api_key_name)", $client_id); } } // Output require_once '../create_output.php'; - diff --git a/api/v1/tickets/ticket_model.php b/api/v1/tickets/ticket_model.php index c17379f3..d5292951 100644 --- a/api/v1/tickets/ticket_model.php +++ b/api/v1/tickets/ticket_model.php @@ -29,11 +29,11 @@ if (isset($_POST['ticket_priority'])) { if (isset($_POST['ticket_details'])) { - $details = sanitizeInput($_POST['ticket_details']); + $details = sanitizeInput($_POST['ticket_details']) . "
    "; } elseif ($ticket_row) { $details = $ticket_row['ticket_details']; } else { - $details = '< blank >'; + $details = '< blank >
    '; } if (isset($_POST['ticket_vendor_id'])) { diff --git a/api/v1/validate_api_key.php b/api/v1/validate_api_key.php index 3a4bef5e..f46e4bff 100644 --- a/api/v1/validate_api_key.php +++ b/api/v1/validate_api_key.php @@ -20,6 +20,10 @@ $_POST = json_decode(file_get_contents('php://input'), true); $ip = sanitizeInput(getIP()); $user_agent = sanitizeInput($_SERVER['HTTP_USER_AGENT']); +// Temp Added this to work with the new logAction function +$session_ip = $ip; +$session_user_agent = $user_agent; + // Setup return array $return_arr = array(); diff --git a/blank.php b/blank.php index 7e7356ed..2e83e0bf 100644 --- a/blank.php +++ b/blank.php @@ -39,7 +39,11 @@ echo getUserAgent();
    + + + + - - -
      @@ -130,9 +127,8 @@
      - -
      +
      @@ -141,6 +137,16 @@
      +
      + +
      +
      + +
      + +
      +
      +
      diff --git a/client_asset_add_modal.php b/client_asset_add_modal.php index 0128f34e..83032aa7 100644 --- a/client_asset_add_modal.php +++ b/client_asset_add_modal.php @@ -12,7 +12,7 @@ -
      +
      • @@ -116,7 +116,7 @@
        - +
      @@ -378,7 +378,7 @@
      - +
      diff --git a/client_asset_bulk_add_ticket_modal.php b/client_asset_bulk_add_ticket_modal.php index 0fe27425..1749e902 100644 --- a/client_asset_bulk_add_ticket_modal.php +++ b/client_asset_bulk_add_ticket_modal.php @@ -22,21 +22,10 @@
      -
      - +
      -
      - - -
      - -
      - -
      - -
      diff --git a/client_asset_copy_modal.php b/client_asset_copy_modal.php index a70a9317..109b1e0b 100644 --- a/client_asset_copy_modal.php +++ b/client_asset_copy_modal.php @@ -260,10 +260,10 @@ $sql_contacts = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC"); while ($row = mysqli_fetch_array($sql_contacts)) { - $contact_id = intval($row['contact_id']); - $contact_name = nullable_htmlentities($row['contact_name']); + $contact_id_select = intval($row['contact_id']); + $contact_name_select = nullable_htmlentities($row['contact_name']); ?> - + diff --git a/client_asset_details.php b/client_asset_details.php index daeed5ff..37f7be3c 100644 --- a/client_asset_details.php +++ b/client_asset_details.php @@ -6,7 +6,7 @@ require_once "inc_all_client.php"; if (isset($_GET['asset_id'])) { $asset_id = intval($_GET['asset_id']); - $sql = mysqli_query($mysqli, "SELECT * FROM assets + $sql = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN contacts ON asset_contact_id = contact_id LEFT JOIN locations ON asset_location_id = location_id LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1 @@ -75,6 +75,13 @@ if (isset($_GET['asset_id'])) { ); $ticket_count = mysqli_num_rows($sql_related_tickets); + // Related Recurring Tickets Query + $sql_related_recurring_tickets = mysqli_query($mysqli, "SELECT * FROM scheduled_tickets + WHERE scheduled_ticket_asset_id = $asset_id + ORDER BY scheduled_ticket_next_run DESC" + ); + $recurring_ticket_count = mysqli_num_rows($sql_related_recurring_tickets); + // Related Documents $sql_related_documents = mysqli_query($mysqli, "SELECT * FROM asset_documents LEFT JOIN documents ON asset_documents.document_id = documents.document_id @@ -258,6 +265,56 @@ if (isset($_GET['asset_id'])) {
      • +
      +
      + +
      + + New Ticket + +
      + + New Recurring Ticket + +
      + + New Note (WIP) + +
      +
      + +
      + +
      + + Asset (WIP) + +
      + + License (WIP) + +
      + + Credential (WIP) + +
      + + Service (WIP) + +
      + + Document (WIP) + +
      + + File (WIP) + + + +
      +
      +
      +

      Network Interfaces

      @@ -644,6 +701,71 @@ if (isset($_GET['asset_id'])) {
      +
      "> +
      +

      Recurring Tickets

      +
      +
      +
      +
    • + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SubjectPriorityFrequencyNext Run
    +
    + +
    + + Edit + + +
    + + Delete + +
    + +
    +
    +
    +
    +
    +
    ">

    Tickets

    @@ -776,9 +898,17 @@ if (isset($_GET['asset_id'])) { }); + + - +
    diff --git a/client_asset_export_modal.php b/client_asset_export_modal.php index d26cd1f9..be26f8fd 100644 --- a/client_asset_export_modal.php +++ b/client_asset_export_modal.php @@ -13,8 +13,6 @@
    - -
    diff --git a/client_asset_import_modal.php b/client_asset_import_modal.php index 583bf346..cc10bd7b 100644 --- a/client_asset_import_modal.php +++ b/client_asset_import_modal.php @@ -14,7 +14,7 @@

    Format csv file with headings & data:
    Name, Description, Type, Make, Model, Serial, OS, Assigned To, Location

    - +
    Download sample csv template
    diff --git a/client_assets.php b/client_assets.php index ae904258..ad713306 100644 --- a/client_assets.php +++ b/client_assets.php @@ -51,8 +51,6 @@ $row = mysqli_fetch_assoc(mysqli_query($mysqli, " LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1 WHERE asset_client_id = $client_id AND asset_$archive_query - AND (asset_name LIKE '%$q%' OR asset_description LIKE '%$q%' OR asset_type LIKE '%$q%' OR interface_ip LIKE '%$q%' OR interface_ipv6 LIKE '%$q%' OR asset_make LIKE '%$q%' OR asset_model LIKE '%$q%' OR asset_serial LIKE '%$q%' OR asset_os LIKE '%$q%' OR contact_name LIKE '%$q%' OR location_name LIKE '%$q%') - $location_query ) AS filtered_assets; ")); @@ -93,8 +91,32 @@ $sql = mysqli_query( $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + +// OS typeahead suggestions +$os_sql = mysqli_query($mysqli, "SELECT DISTINCT asset_os AS label FROM assets WHERE asset_archived_at IS NULL"); +if (mysqli_num_rows($os_sql) > 0) { + while ($row = mysqli_fetch_array($os_sql)) { + $os_arr[] = $row; + } + $json_os = json_encode($os_arr); +} + ?> +
    +
    + Workstations + + Servers + + Virtual + + Network + + Other +
    +
    +

    Assets

    @@ -126,7 +148,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    s"> @@ -160,9 +181,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - @@ -172,87 +190,57 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); -
    -
    -
    -
    - - All Assets - - 0) { ?> - Workstations - 0) { ?> - Servers - 0) { ?> - Virtual - 0) { ?> - Network - 0) { ?> - Other - -
    -
    - "> - Archived - -
    +
    -
    +
    @@ -297,13 +285,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - IP - @@ -337,13 +323,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Location - - - - Physical Location - - - Status @@ -413,9 +392,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $asset_photo = nullable_htmlentities($row['asset_photo']); $asset_physical_location = nullable_htmlentities($row['asset_physical_location']); if ($asset_physical_location) { - $asset_physical_location_display = $asset_physical_location; + $asset_physical_location_display = "
    $asset_physical_location
    "; } else { - $asset_physical_location_display = "-"; + $asset_physical_location_display = ""; } $asset_notes = nullable_htmlentities($row['asset_notes']); $asset_created_at = nullable_htmlentities($row['asset_created_at']); @@ -490,9 +469,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - - @@ -505,10 +482,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - - - - + + + +
    @@ -652,3 +629,20 @@ require_once "client_asset_export_modal.php"; require_once "footer.php"; +?> + + + + + diff --git a/client_certificate_export_modal.php b/client_certificate_export_modal.php index 97e7f337..0c0b0077 100644 --- a/client_certificate_export_modal.php +++ b/client_certificate_export_modal.php @@ -11,9 +11,6 @@
    - -
    diff --git a/client_contact_add_modal.php b/client_contact_add_modal.php index 75a52141..486447df 100644 --- a/client_contact_add_modal.php +++ b/client_contact_add_modal.php @@ -8,12 +8,6 @@
    - - - - - -
    @@ -138,7 +132,7 @@
    - +
    diff --git a/client_contact_create_note_modal.php b/client_contact_create_note_modal.php new file mode 100644 index 00000000..de9ebf3d --- /dev/null +++ b/client_contact_create_note_modal.php @@ -0,0 +1,42 @@ + diff --git a/client_contact_details.php b/client_contact_details.php index 43bbb910..1599b941 100644 --- a/client_contact_details.php +++ b/client_contact_details.php @@ -39,12 +39,29 @@ if (isset($_GET['contact_id'])) { exit(); } - // Related Assets Query + // Related Assets Query - 1 to 1 relationship $sql_related_assets = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1 WHERE asset_contact_id = $contact_id ORDER BY asset_name DESC"); $asset_count = mysqli_num_rows($sql_related_assets); - // Related Logins Query - $sql_related_logins = mysqli_query($mysqli, "SELECT * FROM logins + // Linked Software Licenses + $sql_linked_software = mysqli_query($mysqli, "SELECT * FROM software_contacts, software + WHERE software_contacts.contact_id = $contact_id + AND software_contacts.software_id = software.software_id + AND software_archived_at IS NULL + ORDER BY software_name ASC" + ); + $software_count = mysqli_num_rows($sql_linked_software); + + $linked_software = array(); + + // Related Logins Query 1 to 1 relationship + $sql_related_logins = mysqli_query($mysqli, " + SELECT + logins.login_id AS logins_login_id, -- Alias for logins.login_id + logins.*, -- All other columns from logins + login_tags.*, -- All columns from login_tags + tags.* -- All columns from tags + FROM logins LEFT JOIN login_tags ON login_tags.login_id = logins.login_id LEFT JOIN tags ON tags.tag_id = login_tags.tag_id WHERE login_contact_id = $contact_id @@ -53,26 +70,22 @@ if (isset($_GET['contact_id'])) { "); $login_count = mysqli_num_rows($sql_related_logins); - // Related Software Query - //$sql_related_software = mysqli_query($mysqli, "SELECT * FROM software, software_contacts WHERE software.software_id = software_contacts.software_id AND software_contacts.contact_id = $contact_id ORDER BY software.software_id DESC"); - $sql_related_software = mysqli_query( - $mysqli, - "SELECT * FROM software_contacts - LEFT JOIN software ON software_contacts.software_id = software.software_id - WHERE software_contacts.contact_id = $contact_id - ORDER BY software.software_id DESC" - ); - - $software_count = mysqli_num_rows($sql_related_software); - - // Related Tickets Query + // Related Tickets Query - 1 to 1 relationship $sql_related_tickets = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN users ON ticket_assigned_to = user_id LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id WHERE ticket_contact_id = $contact_id ORDER BY ticket_id DESC"); $ticket_count = mysqli_num_rows($sql_related_tickets); - // Tags + // Related Recurring Tickets Query + $sql_related_recurring_tickets = mysqli_query($mysqli, "SELECT * FROM scheduled_tickets + WHERE scheduled_ticket_contact_id = $contact_id + ORDER BY scheduled_ticket_next_run DESC" + ); + $recurring_ticket_count = mysqli_num_rows($sql_related_recurring_tickets); + + + // Tags - many to many relationship $contact_tag_name_display_array = array(); $contact_tag_id_array = array(); $sql_contact_tags = mysqli_query($mysqli, "SELECT * FROM contact_tags LEFT JOIN tags ON contact_tags.tag_id = tags.tag_id WHERE contact_id = $contact_id ORDER BY tag_name ASC"); @@ -94,6 +107,44 @@ if (isset($_GET['contact_id'])) { } $contact_tags_display = implode('', $contact_tag_name_display_array); + // Notes - 1 to 1 relationship + $sql_related_notes = mysqli_query($mysqli, "SELECT * FROM contact_notes LEFT JOIN users ON contact_note_created_by = user_id WHERE contact_note_contact_id = $contact_id AND contact_note_archived_at IS NULL ORDER BY contact_note_created_at DESC"); + $note_count = mysqli_num_rows($sql_related_notes); + + // Linked Services + $sql_linked_services = mysqli_query($mysqli, "SELECT * FROM service_contacts, services + WHERE service_contacts.contact_id = $contact_id + AND service_contacts.service_id = services.service_id + ORDER BY service_name ASC" + ); + $service_count = mysqli_num_rows($sql_linked_services); + + $linked_services = array(); + + // Linked Documents + $sql_linked_documents = mysqli_query($mysqli, "SELECT * FROM contact_documents, documents + LEFT JOIN users ON document_created_by = user_id + WHERE contact_documents.contact_id = $contact_id + AND contact_documents.document_id = documents.document_id + AND document_template = 0 + AND document_archived_at IS NULL + ORDER BY document_name ASC" + ); + $document_count = mysqli_num_rows($sql_linked_documents); + + $linked_documents = array(); + + // Linked Files + $sql_linked_files = mysqli_query($mysqli, "SELECT * FROM contact_files, files + WHERE contact_files.contact_id = $contact_id + AND contact_files.file_id = files.file_id + AND file_archived_at IS NULL + ORDER BY file_name ASC" + ); + $file_count = mysqli_num_rows($sql_linked_files); + + $linked_files = array(); + ?>
    @@ -134,10 +185,13 @@ if (isset($_GET['contact_id'])) {
    -
    ">
    +
    ">
    + +
    x
    -
    +
    @@ -173,7 +227,6 @@ if (isset($_GET['contact_id'])) {
    -
    1. @@ -181,15 +234,56 @@ if (isset($_GET['contact_id'])) {
    2. Contacts
      3. -
      4. +
    -
    - -
    - - New Ticket - +
    +
    + +
    + + New Ticket + +
    + + New Recurring Ticket + +
    + + New Note + +
    +
    + +
    + +
    + + Asset + +
    + + License + +
    + + Credential + +
    + + Service + +
    + + Document + +
    + + File + + + +
    @@ -298,6 +392,12 @@ if (isset($_GET['contact_id'])) { Copy +
    + + Unlink +
    @@ -352,7 +452,7 @@ if (isset($_GET['contact_id'])) { )"> Share +
    + + Unlink +
    @@ -459,8 +565,13 @@ if (isset($_GET['contact_id'])) {
    "> -
    -

    Related Licenses

    +
    +

    Related Licenses

    +
    + +
    @@ -471,12 +582,13 @@ if (isset($_GET['contact_id'])) { Type License Type Seats + Action - $software_version"; ?> + + + +
    -
    "> +
    ">
    -

    Related Tickets

    +

    Recurring Tickets

    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SubjectPriorityFrequencyNext Run
    +
    + +
    + + Edit + + +
    + + Delete + +
    + +
    +
    +
    +
    +
    + +
    "> +
    +

    Related Tickets

    +
    + +
    @@ -615,6 +802,261 @@ if (isset($_GET['contact_id'])) {
    +
    "> +
    +

    Linked Services

    +
    + +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + +
    ServiceCategoryImportanceAction
    +
    +
    +     		+ +
    +
    +
    +
    + +
    "> +
    +

    Linked Documents

    +
    + +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    Document TitleByCreatedUpdatedAction
    +
    +
    +     		+ +
    +
    +
    +
    + +
    "> +
    +

    Linked Files

    +
    + +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    File NameTypeSizeUploadedAction
    +
    +
    +     		KB + +
    +
    +
    +
    + +
    "> +
    +

    Notes

    +
    + +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    TypeNoteByCreatedAction
    +
    + +
    + + Archive + + +
    + + Delete + + +
    +
    +
    +
    +
    +
    +
    @@ -623,7 +1065,6 @@ if (isset($_GET['contact_id'])) { require_once "share_modal.php"; - ?> @@ -680,9 +1121,20 @@ if (isset($_GET['contact_id'])) { }); + +
    - - - - - - -
    @@ -235,7 +228,7 @@
    - + contact_photo"> @@ -246,7 +239,7 @@
    - +
    diff --git a/client_contact_export_modal.php b/client_contact_export_modal.php index 30d12cc7..87efd742 100644 --- a/client_contact_export_modal.php +++ b/client_contact_export_modal.php @@ -11,9 +11,6 @@
    - -
    diff --git a/client_contact_import_modal.php b/client_contact_import_modal.php index a7c02bfd..bc567b60 100644 --- a/client_contact_import_modal.php +++ b/client_contact_import_modal.php @@ -13,7 +13,7 @@

    Format csv file with headings & data:
    Name, Title, Department, Email, Phone, Extension, Mobile, Location

    - +
    diff --git a/client_contact_link_asset_modal.php b/client_contact_link_asset_modal.php new file mode 100644 index 00000000..698b9ea5 --- /dev/null +++ b/client_contact_link_asset_modal.php @@ -0,0 +1,51 @@ + diff --git a/client_contact_link_credential_modal.php b/client_contact_link_credential_modal.php new file mode 100644 index 00000000..6aa9d691 --- /dev/null +++ b/client_contact_link_credential_modal.php @@ -0,0 +1,51 @@ + diff --git a/client_contact_link_document_modal.php b/client_contact_link_document_modal.php new file mode 100644 index 00000000..266a545f --- /dev/null +++ b/client_contact_link_document_modal.php @@ -0,0 +1,57 @@ + diff --git a/client_contact_link_file_modal.php b/client_contact_link_file_modal.php new file mode 100644 index 00000000..0f134cc3 --- /dev/null +++ b/client_contact_link_file_modal.php @@ -0,0 +1,59 @@ + diff --git a/client_contact_link_service_modal.php b/client_contact_link_service_modal.php new file mode 100644 index 00000000..74a4b51d --- /dev/null +++ b/client_contact_link_service_modal.php @@ -0,0 +1,56 @@ + diff --git a/client_contact_link_software_modal.php b/client_contact_link_software_modal.php new file mode 100644 index 00000000..b79014dd --- /dev/null +++ b/client_contact_link_software_modal.php @@ -0,0 +1,58 @@ + diff --git a/client_contacts.php b/client_contacts.php index 3546f7fe..078995ce 100644 --- a/client_contacts.php +++ b/client_contacts.php @@ -187,7 +187,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    +
    @@ -382,6 +382,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Details + + Make Note + Edit @@ -416,6 +419,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    - +
    - -
    - - -
    - -
    - -
    -
    diff --git a/client_document_edit_modal.php b/client_document_edit_modal.php index 0a313042..4a6904d7 100644 --- a/client_document_edit_modal.php +++ b/client_document_edit_modal.php @@ -18,22 +18,10 @@
    -
    - +
    - -
    - - -
    - -
    - -
    - - - +
    diff --git a/client_domain_export_modal.php b/client_domain_export_modal.php index a5664358..cb743669 100644 --- a/client_domain_export_modal.php +++ b/client_domain_export_modal.php @@ -11,9 +11,6 @@
    - -
    diff --git a/client_edit_modal.php b/client_edit_modal.php index bdac5dbb..eedaa4ea 100644 --- a/client_edit_modal.php +++ b/client_edit_modal.php @@ -11,13 +11,7 @@
    - - - +
      diff --git a/client_export_modal.php b/client_export_modal.php index fd0da54d..8d4e6fa5 100644 --- a/client_export_modal.php +++ b/client_export_modal.php @@ -9,10 +9,6 @@
    - - -
    diff --git a/client_file_view_modal.php b/client_file_view_modal.php index 0578e5d8..c4a6955e 100644 --- a/client_file_view_modal.php +++ b/client_file_view_modal.php @@ -1,17 +1,25 @@ -