diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ac2462b..84bb8a77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ This file documents all notable changes made to ITFlow. +## [25.02.4] + +### Fixed +- Resolved issue preventing the addition or editing of licenses when no vendor was selected. +- Fixed several undeclared variables in AJAX contact details. +- Corrected the contact ticket count display. +- Addressed an issue where clicking "More Details" in AJAX contact/asset details failed to include the `client_id` in the URL. +- Fixed an issue with recurring invoices in the client URL: clicking "Inactive" or "Active" would unexpectedly navigate away from the client section. +- Added new php function getFieldById() to return a record using just an id and sanitized as well. + ## [25.02.3] ### Fixed diff --git a/admin_role.php b/admin_role.php index f79def74..5ea1e4c6 100644 --- a/admin_role.php +++ b/admin_role.php @@ -1,7 +1,7 @@ "> - - Role + + Role Members - - Admin + + Admin Action @@ -70,17 +70,17 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - + @@ -87,7 +87,7 @@ require_once "includes/inc_all_admin.php";
- + diff --git a/admin_settings_theme.php b/admin_settings_theme.php index a79841cb..c15bd49f 100644 --- a/admin_settings_theme.php +++ b/admin_settings_theme.php @@ -19,7 +19,7 @@ require_once "includes/inc_all_admin.php"; ?> -
+
> diff --git a/admin_user.php b/admin_user.php index dace2d78..a6cee3a2 100644 --- a/admin_user.php +++ b/admin_user.php @@ -6,17 +6,25 @@ $order = "ASC"; require_once "includes/inc_all_admin.php"; - -//Rebuild URL -$url_query_strings_sort = http_build_query($get_copy); +// User Type Filter +if (isset($_GET['type']) && $_GET['type'] == "client") { + $type_filter = "client"; + $type_query = "AND user_type = 2"; +} else { + $type_filter = "user"; + $type_query = "AND user_type = 1"; +} $sql = mysqli_query( $mysqli, - "SELECT SQL_CALC_FOUND_ROWS * FROM users, user_settings, user_roles - WHERE users.user_id = user_settings.user_id - AND user_settings.user_role = user_roles.user_role_id - AND (user_name LIKE '%$q%' OR user_email LIKE '%$q%') + "SELECT SQL_CALC_FOUND_ROWS * FROM users + LEFT JOIN user_roles ON user_role_id = role_id + LEFT JOIN user_settings ON users.user_id = user_settings.user_id + LEFT JOIN contacts ON users.user_id = contact_user_id + LEFT JOIN clients ON contact_client_id = client_id + WHERE (user_name LIKE '%$q%' OR user_email LIKE '%$q%') AND user_archived_at IS NULL + $type_query ORDER BY $sort $order LIMIT $record_from, $record_to" ); @@ -36,6 +44,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
1) { ?> + Export
IR @@ -55,8 +64,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
- +
+
+ ">User + ">Client +
@@ -77,8 +89,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - - Role + + Role @@ -90,6 +102,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Last Login + + + + Client + + + Action @@ -116,10 +135,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $mfa_status_display = ""; } $user_config_force_mfa = intval($row['user_config_force_mfa']); - $user_role = $row['user_role']; - $user_role_display = nullable_htmlentities($row['user_role_name']); + $user_role = intval($row['user_role_id']); + $user_role_display = nullable_htmlentities($row['role_name']); $user_initials = nullable_htmlentities(initials($user_name)); + $contact_id = intval($row['contact_id']); + $client_id = intval($row['client_id']); + $client_name = nullable_htmlentities($row['client_name']); + $sql_last_login = mysqli_query( $mysqli, "SELECT * FROM logs @@ -139,7 +162,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); } // Get User Client Access Permissions - $user_client_access_sql = mysqli_query($mysqli,"SELECT client_id FROM user_permissions WHERE user_id = $user_id"); + $user_client_access_sql = mysqli_query($mysqli,"SELECT client_id FROM user_client_permissions WHERE user_id = $user_id"); $client_access_array = []; while ($row = mysqli_fetch_assoc($user_client_access_sql)) { $client_access_array[] = intval($row['client_id']); @@ -178,6 +201,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + + +
diff --git a/ajax.php b/ajax.php index 2143d9bb..a60433c4 100644 --- a/ajax.php +++ b/ajax.php @@ -8,7 +8,7 @@ require_once "config.php"; require_once "functions.php"; -require_once "check_login.php"; +require_once "includes/check_login.php"; require_once "plugins/totp/totp.php"; /* @@ -165,7 +165,7 @@ if (isset($_GET['ticket_query_views'])) { } /* - * Generates public/guest links for sharing logins/docs + * Generates public/guest links for sharing credentials/docs */ if (isset($_GET['share_generate_link'])) { enforceUserPermission('module_support', 2); @@ -207,23 +207,23 @@ if (isset($_GET['share_generate_link'])) { $item_name = sanitizeInput($row['file_name']); } - if ($item_type == "Login") { - $login = mysqli_query($mysqli, "SELECT login_name, login_username, login_password FROM logins WHERE login_id = $item_id AND login_client_id = $client_id LIMIT 1"); - $row = mysqli_fetch_array($login); + if ($item_type == "Credential") { + $credential = mysqli_query($mysqli, "SELECT credential_name, credential_username, credential_password FROM credentials WHERE credential_id = $item_id AND credential_client_id = $client_id LIMIT 1"); + $row = mysqli_fetch_array($credential); - $item_name = sanitizeInput($row['login_name']); + $item_name = sanitizeInput($row['credential_name']); // Decrypt & re-encrypt username/password for sharing - $login_encryption_key = randomString(); + $credential_encryption_key = randomString(); - $login_username_cleartext = decryptLoginEntry($row['login_username']); + $credential_username_cleartext = decryptCredentialEntry($row['credential_username']); $iv = randomString(); - $username_ciphertext = openssl_encrypt($login_username_cleartext, 'aes-128-cbc', $login_encryption_key, 0, $iv); + $username_ciphertext = openssl_encrypt($credential_username_cleartext, 'aes-128-cbc', $credential_encryption_key, 0, $iv); $item_encrypted_username = $iv . $username_ciphertext; - $login_password_cleartext = decryptLoginEntry($row['login_password']); + $credential_password_cleartext = decryptCredentialEntry($row['credential_password']); $iv = randomString(); - $password_ciphertext = openssl_encrypt($login_password_cleartext, 'aes-128-cbc', $login_encryption_key, 0, $iv); + $password_ciphertext = openssl_encrypt($credential_password_cleartext, 'aes-128-cbc', $credential_encryption_key, 0, $iv); $item_encrypted_credential = $iv . $password_ciphertext; } @@ -232,8 +232,8 @@ if (isset($_GET['share_generate_link'])) { $share_id = $mysqli->insert_id; // Return URL - if ($item_type == "Login") { - $url = "https://$config_base_url/guest/guest_view_item.php?id=$share_id&key=$item_key&ek=$login_encryption_key"; + if ($item_type == "Credential") { + $url = "https://$config_base_url/guest/guest_view_item.php?id=$share_id&key=$item_key&ek=$credential_encryption_key"; } else { $url = "https://$config_base_url/guest/guest_view_item.php?id=$share_id&key=$item_key"; @@ -333,24 +333,24 @@ if (isset($_GET['get_client_contacts'])) { if (isset($_GET['get_totp_token_via_id'])) { enforceUserPermission('module_credential'); - $login_id = intval($_GET['login_id']); + $credential_id = intval($_GET['credential_id']); - $sql = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT login_name, login_otp_secret, login_client_id FROM logins WHERE login_id = $login_id")); - $name = sanitizeInput($sql['login_name']); - $totp_secret = $sql['login_otp_secret']; - $client_id = intval($sql['login_client_id']); + $sql = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT credential_name, credential_otp_secret, credential_client_id FROM credentials WHERE credential_id = $credential_id")); + $name = sanitizeInput($sql['credential_name']); + $totp_secret = $sql['credential_otp_secret']; + $client_id = intval($sql['credential_client_id']); $otp = TokenAuth6238::getTokenCode(strtoupper($totp_secret)); echo json_encode($otp); // Logging // Only log the TOTP view if the user hasn't already viewed this specific login entry recently, this prevents logs filling if a user hovers across an entry a few times - $check_recent_totp_view_logged_sql = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(log_id) AS recent_totp_view FROM logs WHERE log_type = 'Login' AND log_action = 'View TOTP' AND log_user_id = $session_user_id AND log_entity_id = $login_id AND log_client_id = $client_id AND log_created_at > (NOW() - INTERVAL 5 MINUTE)")); + $check_recent_totp_view_logged_sql = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT(log_id) AS recent_totp_view FROM logs WHERE log_type = 'Credential' AND log_action = 'View TOTP' AND log_user_id = $session_user_id AND log_entity_id = $credential_id AND log_client_id = $client_id AND log_created_at > (NOW() - INTERVAL 5 MINUTE)")); $recent_totp_view_logged_count = intval($check_recent_totp_view_logged_sql['recent_totp_view']); if ($recent_totp_view_logged_count == 0) { // Logging - logAction("Credential", "View TOTP", "$session_name viewed credential TOTP code for $name", $client_id, $login_id); + logAction("Credential", "View TOTP", "$session_name viewed credential TOTP code for $name", $client_id, $credential_id); } } diff --git a/ajax/ajax_asset_details.php b/ajax/ajax_asset_details.php index 21ff47a2..3ffa50a2 100644 --- a/ajax/ajax_asset_details.php +++ b/ajax/ajax_asset_details.php @@ -50,6 +50,7 @@ $device_icon = getAssetIcon($asset_type); $contact_name = nullable_htmlentities($row['contact_name']); $contact_email = nullable_htmlentities($row['contact_email']); $contact_phone = nullable_htmlentities($row['contact_phone']); +$contact_extension = nullable_htmlentities($row['contact_extension']); $contact_mobile = nullable_htmlentities($row['contact_mobile']); $contact_archived_at = nullable_htmlentities($row['contact_archived_at']); if ($contact_archived_at) { @@ -111,46 +112,53 @@ $interface_count = mysqli_num_rows($sql_related_interfaces); // Related Credentials Query $sql_related_credentials = mysqli_query($mysqli, " SELECT - logins.login_id AS login_id, - logins.login_name, - logins.login_description, - logins.login_uri, - logins.login_username, - logins.login_password, - logins.login_otp_secret, - logins.login_note, - logins.login_important, - logins.login_contact_id, - logins.login_asset_id - 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_asset_id = $asset_id - AND login_archived_at IS NULL - GROUP BY logins.login_id - ORDER BY login_name DESC + credentials.credential_id AS credential_id, + credentials.credential_name, + credentials.credential_description, + credentials.credential_uri, + credentials.credential_username, + credentials.credential_password, + credentials.credential_otp_secret, + credentials.credential_note, + credentials.credential_important, + credentials.credential_contact_id, + credentials.credential_asset_id + FROM credentials + LEFT JOIN credential_tags ON credential_tags.credential_id = credentials.credential_id + LEFT JOIN tags ON tags.tag_id = credential_tags.tag_id + WHERE credential_asset_id = $asset_id + AND credential_archived_at IS NULL + GROUP BY credentials.credential_id + ORDER BY credential_name DESC "); $credential_count = mysqli_num_rows($sql_related_credentials); // Related Tickets Query -$sql_related_tickets = mysqli_query($mysqli, "SELECT * FROM tickets - LEFT JOIN users on ticket_assigned_to = user_id +$sql_related_tickets = mysqli_query($mysqli, " + SELECT tickets.*, users.*, ticket_statuses.* + FROM tickets + LEFT JOIN users ON ticket_assigned_to = user_id LEFT JOIN ticket_statuses ON ticket_status_id = ticket_status - WHERE ticket_asset_id = $asset_id - ORDER BY ticket_number DESC" -); + LEFT JOIN ticket_assets ON tickets.ticket_id = ticket_assets.ticket_id + WHERE ticket_asset_id = $asset_id OR ticket_assets.asset_id = $asset_id + GROUP BY tickets.ticket_id + ORDER BY ticket_number DESC +"); $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" +$sql_related_recurring_tickets = mysqli_query($mysqli, "SELECT * FROM recurring_tickets + LEFT JOIN recurring_ticket_assets ON recurring_tickets.recurring_ticket_id = recurring_ticket_assets.recurring_ticket_id + WHERE recurring_ticket_asset_id = $asset_id OR recurring_ticket_assets.asset_id = $asset_id + GROUP BY recurring_tickets.recurring_ticket_id + ORDER BY recurring_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 +$sql_related_documents = mysqli_query($mysqli, "SELECT * FROM asset_documents LEFT JOIN documents ON asset_documents.document_id = documents.document_id + LEFT JOIN users ON user_id = document_created_by WHERE asset_documents.asset_id = $asset_id AND document_archived_at IS NULL ORDER BY document_name DESC" @@ -446,68 +454,69 @@ ob_start(); "; } - $login_password = nullable_htmlentities(decryptLoginEntry($row['login_password'])); - $login_otp_secret = nullable_htmlentities($row['login_otp_secret']); - $login_id_with_secret = '"' . $row['login_id'] . '","' . $row['login_otp_secret'] . '"'; - if (empty($login_otp_secret)) { + $credential_password = nullable_htmlentities(decryptCredentialEntry($row['credential_password'])); + $credential_otp_secret = nullable_htmlentities($row['credential_otp_secret']); + $credential_id_with_secret = '"' . $row['credential_id'] . '","' . $row['credential_otp_secret'] . '"'; + if (empty($credential_otp_secret)) { $otp_display = "-"; } else { - $otp_display = " Hover.."; + $otp_display = " Hover.."; } - $login_note = nullable_htmlentities($row['login_note']); - $login_important = intval($row['login_important']); - $login_contact_id = intval($row['login_contact_id']); - $login_asset_id = intval($row['login_asset_id']); + $credential_note = nullable_htmlentities($row['credential_note']); + $credential_important = intval($row['credential_important']); + $credential_contact_id = intval($row['credential_contact_id']); + $credential_asset_id = intval($row['credential_asset_id']); // Tags - $login_tag_name_display_array = array(); - $login_tag_id_array = array(); - $sql_login_tags = mysqli_query($mysqli, "SELECT * FROM login_tags LEFT JOIN tags ON login_tags.tag_id = tags.tag_id WHERE login_id = $login_id ORDER BY tag_name ASC"); - while ($row = mysqli_fetch_array($sql_login_tags)) { + $credential_tag_name_display_array = array(); + $credential_tag_id_array = array(); + $sql_credential_tags = mysqli_query($mysqli, "SELECT * FROM credential_tags LEFT JOIN tags ON credential_tags.tag_id = tags.tag_id WHERE credential_id = $credential_id ORDER BY tag_name ASC"); + while ($row = mysqli_fetch_array($sql_credential_tags)) { - $login_tag_id = intval($row['tag_id']); - $login_tag_name = nullable_htmlentities($row['tag_name']); - $login_tag_color = nullable_htmlentities($row['tag_color']); - if (empty($login_tag_color)) { - $login_tag_color = "dark"; + $credential_tag_id = intval($row['tag_id']); + $credential_tag_name = nullable_htmlentities($row['tag_name']); + $credential_tag_color = nullable_htmlentities($row['tag_color']); + if (empty($credential_tag_color)) { + $credential_tag_color = "dark"; } - $login_tag_icon = nullable_htmlentities($row['tag_icon']); - if (empty($login_tag_icon)) { - $login_tag_icon = "tag"; + $credential_tag_icon = nullable_htmlentities($row['tag_icon']); + if (empty($credential_tag_icon)) { + $credential_tag_icon = "tag"; } - $login_tag_id_array[] = $login_tag_id; - $login_tag_name_display_array[] = "$login_tag_name"; + $credential_tag_id_array[] = $credential_tag_id; + $credential_tag_name_display_array[] = "$credential_tag_name"; } - $login_tags_display = implode('', $login_tag_name_display_array); + $credential_tags_display = implode('', $credential_tag_name_display_array); ?> - + - + - + + - +
- + @@ -547,12 +556,13 @@ ob_start(); $ticket_number = intval($row['ticket_number']); $ticket_subject = nullable_htmlentities($row['ticket_subject']); $ticket_priority = nullable_htmlentities($row['ticket_priority']); + $ticket_status_id = intval($row['ticket_status_id']); $ticket_status_name = nullable_htmlentities($row['ticket_status_name']); $ticket_status_color = nullable_htmlentities($row['ticket_status_color']); $ticket_created_at = nullable_htmlentities($row['ticket_created_at']); $ticket_updated_at = nullable_htmlentities($row['ticket_updated_at']); if (empty($ticket_updated_at)) { - if ($ticket_status == "Closed") { + if ($ticket_status_name == "Closed") { $ticket_updated_at_display = "

Never

"; } else { $ticket_updated_at_display = "

Never

"; @@ -573,7 +583,7 @@ ob_start(); } $ticket_assigned_to = intval($row['ticket_assigned_to']); if (empty($ticket_assigned_to)) { - if ($ticket_status == 5) { + if ($ticket_status_id == 5) { $ticket_assigned_to_display = "

Not Assigned

"; } else { $ticket_assigned_to_display = "

Not Assigned

"; @@ -628,18 +638,18 @@ ob_start(); - - - - + + + + @@ -679,11 +689,6 @@ ob_start(); $seat_count = 0; - // Get Login - $login_id = intval($row['login_id']); - $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username'])); - $login_password = nullable_htmlentities(decryptLoginEntry($row['login_password'])); - // Asset Licenses $asset_licenses_sql = mysqli_query($mysqli, "SELECT asset_id FROM software_assets WHERE software_id = $software_id"); $asset_licenses_array = array(); @@ -848,7 +853,7 @@ ob_start();
- More Details + More Details Edit diff --git a/ajax/ajax_calendar_event_edit.php b/ajax/ajax_calendar_event_edit.php index c6e6a61c..937b9749 100644 --- a/ajax/ajax_calendar_event_edit.php +++ b/ajax/ajax_calendar_event_edit.php @@ -4,7 +4,7 @@ require_once '../includes/ajax_header.php'; $event_id = intval($_GET['id']); -$sql = mysqli_query($mysqli, "SELECT * FROM events LEFT JOIN calendars ON event_calendar_id = calendar_id WHERE event_id = $event_id LIMIT 1"); +$sql = mysqli_query($mysqli, "SELECT * FROM calendar_events LEFT JOIN calendars ON event_calendar_id = calendar_id WHERE event_id = $event_id LIMIT 1"); $row = mysqli_fetch_array($sql); $event_title = nullable_htmlentities($row['event_title']); diff --git a/ajax/ajax_contact_details.php b/ajax/ajax_contact_details.php index 67cdeac1..98075a45 100644 --- a/ajax/ajax_contact_details.php +++ b/ajax/ajax_contact_details.php @@ -9,7 +9,7 @@ $sql = mysqli_query($mysqli, "SELECT * FROM contacts LEFT JOIN locations ON location_id = contact_location_id LEFT JOIN users ON user_id = contact_user_id WHERE contact_id = $contact_id - $client_query + LIMIT 1 "); $row = mysqli_fetch_array($sql); @@ -51,21 +51,21 @@ $software_count = mysqli_num_rows($sql_linked_software); $linked_software = array(); -// Related Logins Query 1 to 1 relationship -$sql_related_logins = mysqli_query($mysqli, " +// Related Credentials Query 1 to 1 relationship +$sql_related_credentials = 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 + credentials.credential_id AS credentials_credential_id, -- Alias for credentials.credential_id + credentials.*, -- All other columns from credentials + credential_tags.*, -- All columns from credential_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 - GROUP BY logins.login_id - ORDER BY login_name DESC + FROM credentials + LEFT JOIN credential_tags ON credential_tags.credential_id = credentials.credential_id + LEFT JOIN tags ON tags.tag_id = credential_tags.tag_id + WHERE credential_contact_id = $contact_id + GROUP BY credentials.credential_id + ORDER BY credential_name DESC "); -$credential_count = mysqli_num_rows($sql_related_logins); +$credential_count = mysqli_num_rows($sql_related_credentials); // Related Tickets Query - 1 to 1 relationship $sql_related_tickets = mysqli_query($mysqli, "SELECT * FROM tickets @@ -75,9 +75,9 @@ $sql_related_tickets = mysqli_query($mysqli, "SELECT * FROM tickets $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_contact_id = $contact_id - ORDER BY scheduled_ticket_next_run DESC" +$sql_related_recurring_tickets = mysqli_query($mysqli, "SELECT * FROM recurring_tickets + WHERE recurring_ticket_contact_id = $contact_id + ORDER BY recurring_ticket_next_run DESC" ); $recurring_ticket_count = mysqli_num_rows($sql_related_recurring_tickets); @@ -114,7 +114,7 @@ $sql_linked_services = mysqli_query($mysqli, "SELECT * FROM service_contacts, se AND service_contacts.service_id = services.service_id ORDER BY service_name ASC" ); -$service_count = mysqli_num_rows($sql_linked_services); +$services_count = mysqli_num_rows($sql_linked_services); $linked_services = array(); @@ -189,11 +189,6 @@ ob_start();
Rcr Tickets () - -
  • -
    Services ()     -
    • -

  • Documents ()     @@ -244,7 +239,7 @@ ob_start();
    -
    +
    ">
    @@ -404,7 +399,7 @@ ob_start();
    - +
    @@ -418,68 +413,70 @@ ob_start(); "; } - $login_password = nullable_htmlentities(decryptLoginEntry($row['login_password'])); - $login_otp_secret = nullable_htmlentities($row['login_otp_secret']); - $login_id_with_secret = '"' . $row['login_id'] . '","' . $row['login_otp_secret'] . '"'; - if (empty($login_otp_secret)) { + $credential_password = nullable_htmlentities(decryptCredentialEntry($row['credential_password'])); + $credential_otp_secret = nullable_htmlentities($row['credential_otp_secret']); + $credential_id_with_secret = '"' . $row['credential_id'] . '","' . $row['credential_otp_secret'] . '"'; + if (empty($credential_otp_secret)) { $otp_display = "-"; } else { - $otp_display = " Hover.."; + $otp_display = " Hover.."; } - $login_note = nullable_htmlentities($row['login_note']); - $login_important = intval($row['login_important']); - $login_contact_id = intval($row['login_contact_id']); - $login_asset_id = intval($row['login_asset_id']); + $credential_note = nullable_htmlentities($row['credential_note']); + $credential_important = intval($row['credential_important']); + $credential_contact_id = intval($row['credential_contact_id']); + $credential_asset_id = intval($row['credential_asset_id']); // Tags - $login_tag_name_display_array = array(); - $login_tag_id_array = array(); - $sql_login_tags = mysqli_query($mysqli, "SELECT * FROM login_tags LEFT JOIN tags ON login_tags.tag_id = tags.tag_id WHERE login_id = $login_id ORDER BY tag_name ASC"); - while ($row = mysqli_fetch_array($sql_login_tags)) { + $credential_tag_name_display_array = array(); + $credential_tag_id_array = array(); + $sql_credential_tags = mysqli_query($mysqli, "SELECT * FROM credential_tags LEFT JOIN tags ON credential_tags.tag_id = tags.tag_id WHERE credential_id = $credential_id ORDER BY tag_name ASC"); + while ($row = mysqli_fetch_array($sql_credential_tags)) { - $login_tag_id = intval($row['tag_id']); - $login_tag_name = nullable_htmlentities($row['tag_name']); - $login_tag_color = nullable_htmlentities($row['tag_color']); - if (empty($login_tag_color)) { - $login_tag_color = "dark"; + $credential_tag_id = intval($row['tag_id']); + $credential_tag_name = nullable_htmlentities($row['tag_name']); + $credential_tag_color = nullable_htmlentities($row['tag_color']); + if (empty($credential_tag_color)) { + $credential_tag_color = "dark"; } - $login_tag_icon = nullable_htmlentities($row['tag_icon']); - if (empty($login_tag_icon)) { - $login_tag_icon = "tag"; + $credential_tag_icon = nullable_htmlentities($row['tag_icon']); + if (empty($credential_tag_icon)) { + $credential_tag_icon = "tag"; } - $login_tag_id_array[] = $login_tag_id; - $login_tag_name_display_array[] = "$login_tag_name"; + $credential_tag_id_array[] = $credential_tag_id; + $credential_tag_name_display_array[] = "$credential_tag_name"; } - $login_tags_display = implode('', $login_tag_name_display_array); + $credential_tags_display = implode('', $credential_tag_name_display_array); ?> - - - + + + - + - + @@ -597,18 +594,18 @@ ob_start(); - - - - + + + + @@ -846,7 +843,7 @@ ob_start();
    - + More Details
    -
    Editing credential:
    +
    Editing credential:
    - +
    @@ -63,7 +62,7 @@ ob_start();
    > -
    +
    @@ -71,10 +70,10 @@ ob_start();
    - +
    - > + >
    @@ -86,7 +85,7 @@ ob_start();
    - +
    @@ -96,7 +95,7 @@ ob_start();
    - +
    @@ -106,12 +105,12 @@ ob_start();
    - +
    - +
    @@ -122,7 +121,7 @@ ob_start();
    - +
    @@ -135,13 +134,13 @@ ob_start();
    - +
    - +
    - +
    @@ -152,19 +151,19 @@ ob_start();
    - +
    - +
    - +
    -
    +
    @@ -173,7 +172,7 @@ ob_start();
    @@ -194,7 +193,7 @@ ob_start();
    @@ -218,10 +217,10 @@ ob_start(); -
    +
    - +
    @@ -238,7 +237,7 @@ ob_start(); $tag_id_select = intval($row['tag_id']); $tag_name_select = nullable_htmlentities($row['tag_name']); ?> - + @@ -259,7 +258,7 @@ ob_start();
    - +
    diff --git a/ajax/ajax_credential_view.php b/ajax/ajax_credential_view.php index 96dfd392..ea2a38f3 100644 --- a/ajax/ajax_credential_view.php +++ b/ajax/ajax_credential_view.php @@ -2,26 +2,26 @@ require_once '../includes/ajax_header.php'; -$login_id = intval($_GET['id']); +$credential_id = intval($_GET['id']); -$sql = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_id = $login_id LIMIT 1"); +$sql = mysqli_query($mysqli, "SELECT * FROM credentials WHERE credential_id = $credential_id LIMIT 1"); $row = mysqli_fetch_array($sql); -$login_name = nullable_htmlentities($row['login_name']); -$login_description = nullable_htmlentities($row['login_description']); -$login_uri = nullable_htmlentities($row['login_uri']); -$login_uri_2 = nullable_htmlentities($row['login_uri_2']); -$login_username = nullable_htmlentities(decryptLoginEntry($row['login_username'])); -$login_password = nullable_htmlentities(decryptLoginEntry($row['login_password'])); -$login_otp_secret = nullable_htmlentities($row['login_otp_secret']); -$login_id_with_secret = '"' . $row['login_id'] . '","' . $row['login_otp_secret'] . '"'; -if (empty($login_otp_secret)) { +$credential_name = nullable_htmlentities($row['credential_name']); +$credential_description = nullable_htmlentities($row['credential_description']); +$credential_uri = nullable_htmlentities($row['credential_uri']); +$credential_uri_2 = nullable_htmlentities($row['credential_uri_2']); +$credential_username = nullable_htmlentities(decryptLoginEntry($row['credential_username'])); +$credential_password = nullable_htmlentities(decryptLoginEntry($row['credential_password'])); +$credential_otp_secret = nullable_htmlentities($row['credential_otp_secret']); +$credential_id_with_secret = '"' . $row['credential_id'] . '","' . $row['credential_otp_secret'] . '"'; +if (empty($credential_otp_secret)) { $otp_display = "-"; } else { - $otp_display = " Hover.."; + $otp_display = " Hover.."; } -$login_note = nullable_htmlentities($row['login_note']); -$login_created_at = nullable_htmlentities($row['login_created_at']); +$credential_note = nullable_htmlentities($row['credential_note']); +$credential_created_at = nullable_htmlentities($row['credential_created_at']); // Generate the HTML form content using output buffering. ob_start(); diff --git a/ajax/ajax_project_edit.php b/ajax/ajax_project_edit.php index 71bf976a..af61d3ef 100644 --- a/ajax/ajax_project_edit.php +++ b/ajax/ajax_project_edit.php @@ -74,9 +74,8 @@ ob_start(); 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC" + "SELECT user_id, user_name FROM users + WHERE user_role_id > 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC" ); while ($row = mysqli_fetch_array($sql_project_managers_select)) { $user_id_select = intval($row['user_id']); diff --git a/ajax/ajax_recurring_invoice_edit.php b/ajax/ajax_recurring_invoice_edit.php index e0ab9d56..0a62b4f4 100644 --- a/ajax/ajax_recurring_invoice_edit.php +++ b/ajax/ajax_recurring_invoice_edit.php @@ -2,33 +2,33 @@ require_once '../includes/ajax_header.php'; -$recurring_id = intval($_GET['id']); +$recurring_invoice_id = intval($_GET['id']); -$sql = mysqli_query($mysqli, "SELECT * FROM recurring WHERE recurring_id = $recurring_id LIMIT 1"); +$sql = mysqli_query($mysqli, "SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id LIMIT 1"); $row = mysqli_fetch_array($sql); -$recurring_prefix = nullable_htmlentities($row['recurring_prefix']); -$recurring_number = intval($row['recurring_number']); -$recurring_scope = nullable_htmlentities($row['recurring_scope']); -$recurring_frequency = nullable_htmlentities($row['recurring_frequency']); -$recurring_status = nullable_htmlentities($row['recurring_status']); -$recurring_created_at = date('Y-m-d', strtotime($row['recurring_created_at'])); -$recurring_next_date = nullable_htmlentities($row['recurring_next_date']); -$recurring_discount = floatval($row['recurring_discount_amount']); -$category_id = intval($row['recurring_category_id']); +$recurring_invoice_prefix = nullable_htmlentities($row['recurring_invoice_prefix']); +$recurring_invoice_number = intval($row['recurring_invoice_number']); +$recurring_invoice_scope = nullable_htmlentities($row['recurring_invoice_scope']); +$recurring_invoice_frequency = nullable_htmlentities($row['recurring_invoice_frequency']); +$recurring_invoice_status = nullable_htmlentities($row['recurring_invoice_status']); +$recurring_invoice_created_at = date('Y-m-d', strtotime($row['recurring_invoice_created_at'])); +$recurring_invoice_next_date = nullable_htmlentities($row['recurring_invoice_next_date']); +$recurring_invoice_discount = floatval($row['recurring_invoice_discount_amount']); +$category_id = intval($row['recurring_invoice_category_id']); // Generate the HTML form content using output buffering. ob_start(); ?>
    -
    Editing Recur Invoice:
    +
    Editing Recur Invoice:
    - +
    @@ -38,7 +38,7 @@ ob_start();
    - +
    @@ -50,8 +50,8 @@ ob_start(); @@ -62,7 +62,7 @@ ob_start();
    - + @@ -76,7 +76,7 @@ ob_start(); '$recurring_created_at' OR category_archived_at IS NULL) ORDER BY category_name ASC"); + $sql_income_category = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND (category_archived_at > '$recurring_invoice_created_at' OR category_archived_at IS NULL) ORDER BY category_name ASC"); while ($row = mysqli_fetch_array($sql_income_category)) { $category_id_select = intval($row['category_id']); $category_name_select = nullable_htmlentities($row['category_name']); @@ -104,7 +104,7 @@ ob_start();
    - + @@ -115,10 +115,10 @@ ob_start(); @@ -127,7 +127,7 @@ ob_start();
    - +
    diff --git a/ajax/ajax_recurring_ticket_edit.php b/ajax/ajax_recurring_ticket_edit.php index e6356739..2ef5d31a 100644 --- a/ajax/ajax_recurring_ticket_edit.php +++ b/ajax/ajax_recurring_ticket_edit.php @@ -2,56 +2,64 @@ require_once '../includes/ajax_header.php'; -$scheduled_ticket_id = intval($_GET['id']); +$recurring_ticket_id = intval($_GET['id']); -$sql = mysqli_query($mysqli, "SELECT * FROM scheduled_tickets WHERE scheduled_ticket_id = $scheduled_ticket_id LIMIT 1"); +$sql = mysqli_query($mysqli, "SELECT * FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id LIMIT 1"); $row = mysqli_fetch_array($sql); -$client_id = intval($row['scheduled_ticket_client_id']); -$scheduled_ticket_subject = nullable_htmlentities($row['scheduled_ticket_subject']); -$scheduled_ticket_details = nullable_htmlentities($row['scheduled_ticket_details']); -$scheduled_ticket_priority = nullable_htmlentities($row['scheduled_ticket_priority']); -$scheduled_ticket_frequency = nullable_htmlentities($row['scheduled_ticket_frequency']); -$scheduled_ticket_next_run = nullable_htmlentities($row['scheduled_ticket_next_run']); -$scheduled_ticket_assigned_to = intval($row['scheduled_ticket_assigned_to']); -$scheduled_ticket_contact_id = intval($row['scheduled_ticket_contact_id']); -$scheduled_ticket_asset_id = intval($row['scheduled_ticket_asset_id']); -$scheduled_ticket_billable = intval($row['scheduled_ticket_billable']); +$client_id = intval($row['recurring_ticket_client_id']); +$recurring_ticket_subject = nullable_htmlentities($row['recurring_ticket_subject']); +$recurring_ticket_details = nullable_htmlentities($row['recurring_ticket_details']); +$recurring_ticket_priority = nullable_htmlentities($row['recurring_ticket_priority']); +$recurring_ticket_frequency = nullable_htmlentities($row['recurring_ticket_frequency']); +$recurring_ticket_next_run = nullable_htmlentities($row['recurring_ticket_next_run']); +$recurring_ticket_assigned_to = intval($row['recurring_ticket_assigned_to']); +$recurring_ticket_contact_id = intval($row['recurring_ticket_contact_id']); +$recurring_ticket_asset_id = intval($row['recurring_ticket_asset_id']); +$recurring_ticket_billable = intval($row['recurring_ticket_billable']); + +// Additional Assets Selected +$additional_assets_array = array(); +$sql_additional_assets = mysqli_query($mysqli, "SELECT asset_id FROM recurring_ticket_assets WHERE recurring_ticket_id = $recurring_ticket_id"); +while ($row = mysqli_fetch_array($sql_additional_assets)) { + $additional_asset_id = intval($row['asset_id']); + $additional_assets_array[] = $additional_asset_id; +} // Generate the HTML form content using output buffering. ob_start(); ?>
    -
    Editing Recurring Ticket:
    +
    Editing Recurring Ticket:
    - +
    > -
    +
    @@ -59,12 +67,12 @@ ob_start();
    - +
    - +
    @@ -74,9 +82,9 @@ ob_start();
    @@ -100,7 +108,7 @@ ob_start(); $user_name_select = nullable_htmlentities($row['user_name']); ?> - +
    @@ -109,7 +117,7 @@ ob_start();
    value="1" + value="1" >
    @@ -117,7 +125,7 @@ ob_start();
    -
    +
    @@ -152,7 +160,7 @@ ob_start(); } ?> - +
    @@ -160,7 +168,7 @@ ob_start();
    -
    +
    @@ -169,11 +177,11 @@ ob_start();
    @@ -184,13 +192,13 @@ ob_start();
    - +
    -
    +
    @@ -208,7 +216,7 @@ ob_start(); $asset_name_select = nullable_htmlentities($row['asset_name']); $asset_contact_name_select = nullable_htmlentities($row['contact_name']); ?> - +
    +
    + +
    +
    + +
    + +
    +
    +
    diff --git a/ajax/ajax_role_edit.php b/ajax/ajax_role_edit.php index f0f2d237..9b1d967f 100644 --- a/ajax/ajax_role_edit.php +++ b/ajax/ajax_role_edit.php @@ -4,18 +4,18 @@ require_once '../includes/ajax_header.php'; $role_id = intval($_GET['id']); -$sql = mysqli_query($mysqli, "SELECT * FROM user_roles WHERE user_role_id = $role_id LIMIT 1"); +$sql = mysqli_query($mysqli, "SELECT * FROM user_roles WHERE role_id = $role_id LIMIT 1"); $row = mysqli_fetch_array($sql); -$role_name = nullable_htmlentities($row['user_role_name']); -$role_description = nullable_htmlentities($row['user_role_description']); -$role_admin = intval($row['user_role_is_admin']); +$role_name = nullable_htmlentities($row['role_name']); +$role_description = nullable_htmlentities($row['role_description']); +$role_admin = intval($row['role_is_admin']); // Count number of users that have each role -$sql_role_user_count = mysqli_query($mysqli, "SELECT COUNT(users.user_id) FROM users LEFT JOIN user_settings on users.user_id = user_settings.user_id WHERE user_role = $role_id AND user_archived_at IS NULL"); +$sql_role_user_count = mysqli_query($mysqli, "SELECT COUNT(user_id) FROM users WHERE user_role_id = $role_id AND user_archived_at IS NULL"); $role_user_count = mysqli_fetch_row($sql_role_user_count)[0]; -$sql_users = mysqli_query($mysqli, "SELECT * FROM users LEFT JOIN user_settings on users.user_id = user_settings.user_id WHERE user_role = $role_id AND user_archived_at IS NULL"); +$sql_users = mysqli_query($mysqli, "SELECT * FROM users WHERE user_role_id = $role_id AND user_archived_at IS NULL"); // Initialize an empty array to hold user names $user_names = []; diff --git a/ajax/ajax_service_details.php b/ajax/ajax_service_details.php index 22c9f011..3c26234a 100644 --- a/ajax/ajax_service_details.php +++ b/ajax/ajax_service_details.php @@ -28,23 +28,23 @@ if ($service_importance == "High") { $service_importance_display = "-"; } -// Associated Assets (and their logins/networks/locations) +// Associated Assets (and their credentials/networks/locations) $sql_assets = mysqli_query( $mysqli, "SELECT * FROM service_assets LEFT JOIN assets ON service_assets.asset_id = assets.asset_id LEFT JOIN asset_interfaces ON interface_asset_id = assets.asset_id AND interface_primary = 1 - LEFT JOIN logins ON service_assets.asset_id = logins.login_asset_id + LEFT JOIN credentials ON service_assets.asset_id = credentials.credential_asset_id LEFT JOIN networks ON interface_network_id = networks.network_id LEFT JOIN locations ON assets.asset_location_id = locations.location_id WHERE service_id = $service_id" ); -// Associated logins -$sql_logins = mysqli_query( +// Associated credentials +$sql_credentials = mysqli_query( $mysqli, - "SELECT * FROM service_logins - LEFT JOIN logins ON service_logins.login_id = logins.login_id + "SELECT * FROM service_credentials + LEFT JOIN credentials ON service_credentials.credential_id = credentials.credential_id WHERE service_id = $service_id" ); @@ -318,27 +318,27 @@ ob_start(); } ?> - + 0 || mysqli_num_rows($sql_logins) > 0) { ?> -
    Logins
    + if (mysqli_num_rows($sql_assets) > 0 || mysqli_num_rows($sql_credentials) > 0) { ?> +
    Credentials
      $row[login_name]"; + if (!empty($row['credential_name'])) { + echo "
    • $row[credential_name]
      • "; } } - // Showing explicitly linked logins - while ($row = mysqli_fetch_array($sql_logins)) { - if (!empty($row['login_name'])) { - echo "
    • $row[login_name]
      • "; + // Showing explicitly linked credentials + while ($row = mysqli_fetch_array($sql_credentials)) { + if (!empty($row['credential_name'])) { + echo "
    • $row[credential_name]
      • "; } } ?> @@ -349,27 +349,27 @@ ob_start(); + if ($sql_credentials || $sql_assets) { ?>
      URLs
        $row[login_uri]"; + // Showing URLs linked to credentials + while ($row = mysqli_fetch_array($sql_credentials)) { + if (!empty($row['credential_uri'])) { + echo "
      • $row[credential_uri]
        • "; } } // Reset the $sql_assets pointer to the start mysqli_data_seek($sql_assets, 0); - // Show URLs linked to assets, that also have logins + // Show URLs linked to assets, that also have credentials while ($row = mysqli_fetch_array($sql_assets)) { - if (!empty($row['login_uri'])) { - echo "
      • $row[login_uri]
        • "; + if (!empty($row['credential_uri'])) { + echo "
      • $row[credential_uri]
        • "; } } ?> diff --git a/ajax/ajax_service_edit.php b/ajax/ajax_service_edit.php index 8d2258ec..e0932ba1 100644 --- a/ajax/ajax_service_edit.php +++ b/ajax/ajax_service_edit.php @@ -18,23 +18,23 @@ $service_updated_at = nullable_htmlentities($row['service_updated_at']); $service_review_due = nullable_htmlentities($row['service_review_due']); $client_id = intval($row['service_client_id']); -// Associated Assets (and their logins/networks/locations) +// Associated Assets (and their credentials/networks/locations) $sql_assets = mysqli_query( $mysqli, "SELECT * FROM service_assets LEFT JOIN assets ON service_assets.asset_id = assets.asset_id LEFT JOIN asset_interfaces ON interface_asset_id = assets.asset_id AND interface_primary = 1 - LEFT JOIN logins ON service_assets.asset_id = logins.login_asset_id + LEFT JOIN credentials ON service_assets.asset_id = credentials.credential_asset_id LEFT JOIN networks ON interface_network_id = networks.network_id LEFT JOIN locations ON assets.asset_location_id = locations.location_id WHERE service_id = $service_id" ); -// Associated logins -$sql_logins = mysqli_query( +// Associated credentials +$sql_credentials = mysqli_query( $mysqli, - "SELECT * FROM service_logins - LEFT JOIN logins ON service_logins.login_id = logins.login_id + "SELECT * FROM service_credentials + LEFT JOIN credentials ON service_credentials.credential_id = credentials.credential_id WHERE service_id = $service_id" ); @@ -280,21 +280,21 @@ ob_start();
        - - '$service_created_at' OR login_archived_at IS NULL) AND login_client_id = $client_id"); + $sql_all = mysqli_query($mysqli, "SELECT * FROM credentials WHERE (credential_archived_at > '$service_created_at' OR credential_archived_at IS NULL) AND credential_client_id = $client_id"); while ($row_all = mysqli_fetch_array($sql_all)) { - $login_id = intval($row_all['login_id']); - $login_name = nullable_htmlentities($row_all['login_name']); + $credential_id = intval($row_all['credential_id']); + $credential_name = nullable_htmlentities($row_all['credential_name']); - if (in_array($login_id, $selected_ids)) { - echo ""; + if (in_array($credential_id, $selected_ids)) { + echo ""; } else{ - echo ""; + echo ""; } } ?> diff --git a/ajax/ajax_ticket_edit.php b/ajax/ajax_ticket_edit.php index a2bf0c74..61a84782 100644 --- a/ajax/ajax_ticket_edit.php +++ b/ajax/ajax_ticket_edit.php @@ -24,6 +24,14 @@ $location_id = intval($row['ticket_location_id']); $vendor_id = intval($row['ticket_vendor_id']); $project_id = intval($row['ticket_project_id']); +// Additional Assets Selected +$additional_assets_array = array(); +$sql_additional_assets = mysqli_query($mysqli, "SELECT asset_id FROM ticket_assets WHERE ticket_id = $ticket_id"); +while ($row = mysqli_fetch_array($sql_additional_assets)) { + $additional_asset_id = intval($row['asset_id']); + $additional_assets_array[] = $additional_asset_id; +} + // Generate the HTML form content using output buffering. ob_start(); ?> @@ -212,6 +220,31 @@ ob_start();
        +
        + +
        +
        + +
        + +
        +
        +
        diff --git a/ajax/ajax_user_edit.php b/ajax/ajax_user_edit.php index f592d71b..1ea23f0e 100644 --- a/ajax/ajax_user_edit.php +++ b/ajax/ajax_user_edit.php @@ -4,7 +4,10 @@ require_once '../includes/ajax_header.php'; $user_id = intval($_GET['id']); -$sql = mysqli_query($mysqli, "SELECT * FROM users, user_settings WHERE users.user_id = user_settings.user_id AND users.user_id = $user_id LIMIT 1"); +$sql = mysqli_query($mysqli, "SELECT * FROM users + LEFT JOIN user_settings ON users.user_id = user_settings.user_id + WHERE users.user_id = $user_id LIMIT 1" +); $row = mysqli_fetch_array($sql); $user_name = nullable_htmlentities($row['user_name']); @@ -12,11 +15,11 @@ $user_email = nullable_htmlentities($row['user_email']); $user_avatar = nullable_htmlentities($row['user_avatar']); $user_token = nullable_htmlentities($row['user_token']); $user_config_force_mfa = intval($row['user_config_force_mfa']); -$user_role = intval($row['user_role']); +$user_role_id = intval($row['user_role_id']); $user_initials = nullable_htmlentities(initials($user_name)); // Get User Client Access Permissions -$user_client_access_sql = mysqli_query($mysqli,"SELECT client_id FROM user_permissions WHERE user_id = $user_id"); +$user_client_access_sql = mysqli_query($mysqli,"SELECT client_id FROM user_client_permissions WHERE user_id = $user_id"); $client_access_array = []; while ($row = mysqli_fetch_assoc($user_client_access_sql)) { $client_access_array[] = intval($row['client_id']); @@ -107,13 +110,13 @@ ob_start();
        diff --git a/api/v1/credentials/create.php b/api/v1/credentials/create.php index ba4c6e0e..5fb2b224 100644 --- a/api/v1/credentials/create.php +++ b/api/v1/credentials/create.php @@ -13,7 +13,7 @@ $insert_id = false; if (!empty($api_key_decrypt_password) && !empty($name) && !(empty($password))) { // Add credential - $insert_sql = mysqli_query($mysqli,"INSERT INTO logins SET login_name = '$name', login_description = '$description', login_uri = '$uri', login_uri_2 = '$uri_2', login_username = '$username', login_password = '$password', login_otp_secret = '$otp_secret', login_note = '$note', login_important = $important, login_contact_id = $contact_id, login_vendor_id = $vendor_id, login_asset_id = $asset_id, login_software_id = $software_id, login_client_id = $client_id"); + $insert_sql = mysqli_query($mysqli,"INSERT INTO credentials SET credential_name = '$name', credential_description = '$description', credential_uri = '$uri', credential_uri_2 = '$uri_2', credential_username = '$username', credential_password = '$password', credential_otp_secret = '$otp_secret', credential_note = '$note', credential_important = $important, credential_contact_id = $contact_id, credential_vendor_id = $vendor_id, credential_asset_id = $asset_id, credential_software_id = $software_id, credential_client_id = $client_id"); // Check insert & get insert ID if ($insert_sql) { diff --git a/api/v1/credentials/credential_model.php b/api/v1/credentials/credential_model.php index 6397f5f3..0693c37e 100644 --- a/api/v1/credentials/credential_model.php +++ b/api/v1/credentials/credential_model.php @@ -8,53 +8,53 @@ if (isset($_POST['api_key_decrypt_password'])) { $api_key_decrypt_password = $_POST['api_key_decrypt_password']; // No sanitization } -if (isset($_POST['login_name'])) { - $name = sanitizeInput($_POST['login_name']); -} elseif (isset($credential_row) && isset($credential_row['login_name'])) { - $name = $credential_row['login_name']; +if (isset($_POST['credential_name'])) { + $name = sanitizeInput($_POST['credential_name']); +} elseif (isset($credential_row) && isset($credential_row['credential_name'])) { + $name = $credential_row['credential_name']; } else { $name = ''; } -if (isset($_POST['login_description'])) { - $description = sanitizeInput($_POST['login_description']); -} elseif (isset($credential_row) && isset($credential_row['login_description'])) { - $description = $credential_row['login_description']; +if (isset($_POST['credential_description'])) { + $description = sanitizeInput($_POST['credential_description']); +} elseif (isset($credential_row) && isset($credential_row['credential_description'])) { + $description = $credential_row['credential_description']; } else { $description = ''; } -if (isset($_POST['login_uri'])) { - $uri = sanitizeInput($_POST['login_uri']); -} elseif (isset($credential_row) && isset($credential_row['login_uri'])) { - $uri = $credential_row['login_uri']; +if (isset($_POST['credential_uri'])) { + $uri = sanitizeInput($_POST['credential_uri']); +} elseif (isset($credential_row) && isset($credential_row['credential_uri'])) { + $uri = $credential_row['credential_uri']; } else { $uri = ''; } -if (isset($_POST['login_uri_2'])) { - $uri_2 = sanitizeInput($_POST['login_uri_2']); -} elseif (isset($credential_row) && isset($credential_row['login_uri_2'])) { - $uri_2 = $credential_row['login_uri_2']; +if (isset($_POST['credential_uri_2'])) { + $uri_2 = sanitizeInput($_POST['credential_uri_2']); +} elseif (isset($credential_row) && isset($credential_row['credential_uri_2'])) { + $uri_2 = $credential_row['credential_uri_2']; } else { $uri_2 = ''; } -if (isset($_POST['login_username'])) { - $username = $_POST['login_username']; +if (isset($_POST['credential_username'])) { + $username = $_POST['credential_username']; $username = apiEncryptLoginEntry($username, $api_key_decrypt_hash, $api_key_decrypt_password); -} elseif (isset($credential_row) && isset($credential_row['login_username'])) { - $username = $credential_row['login_username']; +} elseif (isset($credential_row) && isset($credential_row['credential_username'])) { + $username = $credential_row['credential_username']; } else { $username = ''; } -if (isset($_POST['login_password'])) { - $password = $_POST['login_password']; +if (isset($_POST['credential_password'])) { + $password = $_POST['credential_password']; $password = apiEncryptLoginEntry($password, $api_key_decrypt_hash, $api_key_decrypt_password); $password_changed = true; -} elseif (isset($credential_row) && isset($credential_row['login_password'])) { - $password = $credential_row['login_password']; +} elseif (isset($credential_row) && isset($credential_row['credential_password'])) { + $password = $credential_row['credential_password']; $password_changed = false; } else { $password = ''; @@ -63,58 +63,58 @@ if (isset($_POST['login_password'])) { -if (isset($_POST['login_otp_secret'])) { - $otp_secret = sanitizeInput($_POST['login_otp_secret']); -} elseif (isset($credential_row) && isset($credential_row['login_otp_secret'])) { - $otp_secret = $credential_row['login_otp_secret']; +if (isset($_POST['credential_otp_secret'])) { + $otp_secret = sanitizeInput($_POST['credential_otp_secret']); +} elseif (isset($credential_row) && isset($credential_row['credential_otp_secret'])) { + $otp_secret = $credential_row['credential_otp_secret']; } else { $otp_secret = ''; } -if (isset($_POST['login_note'])) { - $note = sanitizeInput($_POST['login_note']); -} elseif (isset($credential_row) && isset($credential_row['login_note'])) { - $note = $credential_row['login_note']; +if (isset($_POST['credential_note'])) { + $note = sanitizeInput($_POST['credential_note']); +} elseif (isset($credential_row) && isset($credential_row['credential_note'])) { + $note = $credential_row['credential_note']; } else { $note = ''; } -if (isset($_POST['login_important'])) { - $important = intval($_POST['login_important']); -} elseif (isset($credential_row) && isset($credential_row['login_important'])) { - $important = $credential_row['login_important']; +if (isset($_POST['credential_important'])) { + $important = intval($_POST['credential_important']); +} elseif (isset($credential_row) && isset($credential_row['credential_important'])) { + $important = $credential_row['credential_important']; } else { $important = ''; } -if (isset($_POST['login_contact_id'])) { - $contact_id = intval($_POST['login_contact_id']); -} elseif (isset($credential_row) && isset($credential_row['login_contact_id'])) { - $contact_id = $credential_row['login_contact_id']; +if (isset($_POST['credential_contact_id'])) { + $contact_id = intval($_POST['credential_contact_id']); +} elseif (isset($credential_row) && isset($credential_row['credential_contact_id'])) { + $contact_id = $credential_row['credential_contact_id']; } else { $contact_id = ''; } -if (isset($_POST['login_vendor_id'])) { - $vendor_id = intval($_POST['login_vendor_id']); -} elseif (isset($credential_row) && isset($credential_row['login_vendor_id'])) { - $vendor_id = $credential_row['login_vendor_id']; +if (isset($_POST['credential_vendor_id'])) { + $vendor_id = intval($_POST['credential_vendor_id']); +} elseif (isset($credential_row) && isset($credential_row['credential_vendor_id'])) { + $vendor_id = $credential_row['credential_vendor_id']; } else { $vendor_id = ''; } -if (isset($_POST['login_asset_id'])) { - $asset_id = intval($_POST['login_asset_id']); -} elseif (isset($credential_row) && isset($credential_row['login_asset_id'])) { - $asset_id = $credential_row['login_asset_id']; +if (isset($_POST['credential_asset_id'])) { + $asset_id = intval($_POST['credential_asset_id']); +} elseif (isset($credential_row) && isset($credential_row['credential_asset_id'])) { + $asset_id = $credential_row['credential_asset_id']; } else { $asset_id = ''; } -if (isset($_POST['login_software_id'])) { - $software_id = intval($_POST['login_software_id']); -} elseif (isset($credential_row) && isset($credential_row['login_software_id'])) { - $software_id = $credential_row['login_software_id']; +if (isset($_POST['credential_software_id'])) { + $software_id = intval($_POST['credential_software_id']); +} elseif (isset($credential_row) && isset($credential_row['credential_software_id'])) { + $software_id = $credential_row['credential_software_id']; } else { $software_id = ''; } diff --git a/api/v1/credentials/read.php b/api/v1/credentials/read.php index 7ee70e0a..39cc2331 100644 --- a/api/v1/credentials/read.php +++ b/api/v1/credentials/read.php @@ -13,17 +13,17 @@ if (isset($_GET['api_key_decrypt_password'])) { } // Specific credential/login via ID (single) -if (isset($_GET['login_id']) && !empty($api_key_decrypt_password)) { +if (isset($_GET['credential_id']) && !empty($api_key_decrypt_password)) { - $id = intval($_GET['login_id']); + $id = intval($_GET['credential_id']); - $sql = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_id = '$id' AND login_client_id LIKE '$client_id' LIMIT 1"); + $sql = mysqli_query($mysqli, "SELECT * FROM credentials WHERE credential_id = '$id' AND credential_client_id LIKE '$client_id' LIMIT 1"); } elseif (!empty($api_key_decrypt_password)) { - // All credentials ("logins") + // All credentials ("credentials") - $sql = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_client_id LIKE '$client_id' ORDER BY login_id LIMIT $limit OFFSET $offset"); + $sql = mysqli_query($mysqli, "SELECT * FROM credentials WHERE credential_client_id LIKE '$client_id' ORDER BY credential_id LIMIT $limit OFFSET $offset"); } @@ -37,8 +37,8 @@ if ($sql && mysqli_num_rows($sql) > 0) { $row = array(); while ($row = mysqli_fetch_array($sql)) { - $row['login_username'] = apiDecryptLoginEntry($row['login_username'], $api_key_decrypt_hash, $api_key_decrypt_password); - $row['login_password'] = apiDecryptLoginEntry($row['login_password'], $api_key_decrypt_hash, $api_key_decrypt_password); + $row['credential_username'] = apiDecryptCredentialEntry($row['credential_username'], $api_key_decrypt_hash, $api_key_decrypt_password); + $row['credential_password'] = apiDecryptCredentialEntry($row['credential_password'], $api_key_decrypt_hash, $api_key_decrypt_password); $return_arr['data'][] = $row; } diff --git a/api/v1/credentials/update.php b/api/v1/credentials/update.php index dfe59c45..78c4f296 100644 --- a/api/v1/credentials/update.php +++ b/api/v1/credentials/update.php @@ -5,30 +5,30 @@ require_once '../validate_api_key.php'; require_once '../require_post_method.php'; // Parse ID -$login_id = intval($_POST['login_id']); +$credential_id = intval($_POST['credential_id']); // Default $update_count = false; -if (!empty($_POST['api_key_decrypt_password']) && !empty($login_id)) { +if (!empty($_POST['api_key_decrypt_password']) && !empty($credential_id)) { - $credential_row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT * FROM logins WHERE login_id = '$login_id' AND login_client_id = $client_id LIMIT 1")); + $credential_row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT * FROM credentials WHERE credential_id = '$credential_id' AND credential_client_id = $client_id LIMIT 1")); // Variable assignment from POST - assigning the current database value if a value is not provided require_once 'credential_model.php'; - $update_sql = mysqli_query($mysqli,"UPDATE logins SET login_name = '$name', login_description = '$description', login_uri = '$uri', login_uri_2 = '$uri_2', login_username = '$username', login_password = '$password', login_otp_secret = '$otp_secret', login_note = '$note', login_important = $important, login_contact_id = $contact_id, login_vendor_id = $vendor_id, login_asset_id = $asset_id, login_software_id = $software_id, login_client_id = $client_id WHERE login_id = '$login_id' AND login_client_id = $client_id LIMIT 1"); + $update_sql = mysqli_query($mysqli,"UPDATE credentials SET credential_name = '$name', credential_description = '$description', credential_uri = '$uri', credential_uri_2 = '$uri_2', credential_username = '$username', credential_password = '$password', credential_otp_secret = '$otp_secret', credential_note = '$note', credential_important = $important, credential_contact_id = $contact_id, credential_vendor_id = $vendor_id, credential_asset_id = $asset_id, credential_software_id = $software_id, credential_client_id = $client_id WHERE credential_id = '$credential_id' AND credential_client_id = $client_id LIMIT 1"); // Check insert & get insert ID if ($update_sql) { $update_count = mysqli_affected_rows($mysqli); if ($password_changed) { - mysqli_query($mysqli, "UPDATE logins SET login_password_changed_at = NOW() WHERE login_id = $login_id LIMIT 1"); + mysqli_query($mysqli, "UPDATE credentials SET credential_password_changed_at = NOW() WHERE credential_id = $credential_id LIMIT 1"); } // Logging - logAction("Credential", "Edit", "$name via API ($api_key_name)", $client_id, $login_id); + logAction("Credential", "Edit", "$name via API ($api_key_name)", $client_id, $credential_id); logAction("API", "Success", "Updated credential $name via API ($api_key_name)", $client_id); } diff --git a/asset_details.php b/asset_details.php index d915d3bf..534f3e73 100644 --- a/asset_details.php +++ b/asset_details.php @@ -81,19 +81,24 @@ if (isset($_GET['asset_id'])) { // Override Tab Title // No Sanitizing needed as this var will opnly be used in the tab title $page_title = $row['asset_name']; - // Related Tickets Query - $sql_related_tickets = mysqli_query($mysqli, "SELECT * FROM tickets - LEFT JOIN users on ticket_assigned_to = user_id + $sql_related_tickets = mysqli_query($mysqli, " + SELECT tickets.*, users.*, ticket_statuses.* + FROM tickets + LEFT JOIN users ON ticket_assigned_to = user_id LEFT JOIN ticket_statuses ON ticket_status_id = ticket_status - WHERE ticket_asset_id = $asset_id - ORDER BY ticket_number DESC" - ); + LEFT JOIN ticket_assets ON tickets.ticket_id = ticket_assets.ticket_id + WHERE ticket_asset_id = $asset_id OR ticket_assets.asset_id = $asset_id + GROUP BY tickets.ticket_id + ORDER BY ticket_number DESC + "); $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" + $sql_related_recurring_tickets = mysqli_query($mysqli, "SELECT * FROM recurring_tickets + LEFT JOIN recurring_ticket_assets ON recurring_tickets.recurring_ticket_id = recurring_ticket_assets.recurring_ticket_id + WHERE recurring_ticket_asset_id = $asset_id OR recurring_ticket_assets.asset_id = $asset_id + GROUP BY recurring_tickets.recurring_ticket_id + ORDER BY recurring_ticket_next_run DESC" ); $recurring_ticket_count = mysqli_num_rows($sql_related_recurring_tickets); @@ -179,29 +184,29 @@ if (isset($_GET['asset_id'])) { $document_count = mysqli_num_rows($sql_related_documents); - // Related Logins Query - $sql_related_logins = mysqli_query($mysqli, " + // Related Credentials Query + $sql_related_credentials = mysqli_query($mysqli, " SELECT - logins.login_id AS login_id, - logins.login_name, - logins.login_description, - logins.login_uri, - logins.login_username, - logins.login_password, - logins.login_otp_secret, - logins.login_note, - logins.login_important, - logins.login_contact_id, - logins.login_asset_id - 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_asset_id = $asset_id - AND login_archived_at IS NULL - GROUP BY logins.login_id - ORDER BY login_name DESC + credentials.credential_id AS credential_id, + credentials.credential_name, + credentials.credential_description, + credentials.credential_uri, + credentials.credential_username, + credentials.credential_password, + credentials.credential_otp_secret, + credentials.credential_note, + credentials.credential_important, + credentials.credential_contact_id, + credentials.credential_asset_id + FROM credentials + LEFT JOIN credential_tags ON credential_tags.credential_id = credentials.credential_id + LEFT JOIN tags ON tags.tag_id = credential_tags.tag_id + WHERE credential_asset_id = $asset_id + AND credential_archived_at IS NULL + GROUP BY credentials.credential_id + ORDER BY credential_name DESC "); - $login_count = mysqli_num_rows($sql_related_logins); + $credential_count = mysqli_num_rows($sql_related_credentials); // Related Software Query $sql_related_software = mysqli_query( @@ -518,7 +523,7 @@ if (isset($_GET['asset_id'])) {
        -
        "> +
        ">

        Credentials

        @@ -539,56 +544,56 @@ if (isset($_GET['asset_id'])) {
    "; + $credential_uri_display = "$credential_uri"; } - $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username'])); - if (empty($login_username)) { - $login_username_display = "-"; + $credential_username = nullable_htmlentities(decryptCredentialEntry($row['credential_username'])); + if (empty($credential_username)) { + $credential_username_display = "-"; } else { - $login_username_display = "$login_username"; + $credential_username_display = "$credential_username"; } - $login_password = nullable_htmlentities(decryptLoginEntry($row['login_password'])); - $login_otp_secret = nullable_htmlentities($row['login_otp_secret']); - $login_id_with_secret = '"' . $row['login_id'] . '","' . $row['login_otp_secret'] . '"'; - if (empty($login_otp_secret)) { + $credential_password = nullable_htmlentities(decryptCredentialEntry($row['credential_password'])); + $credential_otp_secret = nullable_htmlentities($row['credential_otp_secret']); + $credential_id_with_secret = '"' . $row['credential_id'] . '","' . $row['credential_otp_secret'] . '"'; + if (empty($credential_otp_secret)) { $otp_display = "-"; } else { - $otp_display = " Hover.."; + $otp_display = " Hover.."; } - $login_note = nullable_htmlentities($row['login_note']); - $login_important = intval($row['login_important']); - $login_contact_id = intval($row['login_contact_id']); - $login_asset_id = intval($row['login_asset_id']); + $credential_note = nullable_htmlentities($row['credential_note']); + $credential_important = intval($row['credential_important']); + $credential_contact_id = intval($row['credential_contact_id']); + $credential_asset_id = intval($row['credential_asset_id']); // Tags - $login_tag_name_display_array = array(); - $login_tag_id_array = array(); - $sql_login_tags = mysqli_query($mysqli, "SELECT * FROM login_tags LEFT JOIN tags ON login_tags.tag_id = tags.tag_id WHERE login_id = $login_id ORDER BY tag_name ASC"); - while ($row = mysqli_fetch_array($sql_login_tags)) { + $credential_tag_name_display_array = array(); + $credential_tag_id_array = array(); + $sql_credential_tags = mysqli_query($mysqli, "SELECT * FROM credential_tags LEFT JOIN tags ON credential_tags.tag_id = tags.tag_id WHERE credential_id = $credential_id ORDER BY tag_name ASC"); + while ($row = mysqli_fetch_array($sql_credential_tags)) { - $login_tag_id = intval($row['tag_id']); - $login_tag_name = nullable_htmlentities($row['tag_name']); - $login_tag_color = nullable_htmlentities($row['tag_color']); - if (empty($login_tag_color)) { - $login_tag_color = "dark"; + $credential_tag_id = intval($row['tag_id']); + $credential_tag_name = nullable_htmlentities($row['tag_name']); + $credential_tag_color = nullable_htmlentities($row['tag_color']); + if (empty($credential_tag_color)) { + $credential_tag_color = "dark"; } - $login_tag_icon = nullable_htmlentities($row['tag_icon']); - if (empty($login_tag_icon)) { - $login_tag_icon = "tag"; + $credential_tag_icon = nullable_htmlentities($row['tag_icon']); + if (empty($credential_tag_icon)) { + $credential_tag_icon = "tag"; } - $login_tag_id_array[] = $login_tag_id; - $login_tag_name_display_array[] = "$login_tag_name"; + $credential_tag_id_array[] = $credential_tag_id; + $credential_tag_name_display_array[] = "$credential_tag_name"; } - $login_tags_display = implode('', $login_tag_name_display_array); + $credential_tags_display = implode('', $credential_tag_name_display_array); ?> @@ -597,18 +602,18 @@ if (isset($_GET['asset_id'])) { - + - - + + - + - + - + - + @@ -664,14 +669,6 @@ if (mysqli_num_rows($os_sql) > 0) { - - @@ -687,3 +684,9 @@ require_once "includes/footer.php"; }); }); + +Blank Page

    This is a great starting point for new custom pages.

    +

    +
    -
    -

    +
    +

    Ticket +

    +
    Resolve ticket -

    +
    @@ -122,7 +124,7 @@ if (isset($_GET['id']) && intval($_GET['id'])) { while ($ticket_attachment = mysqli_fetch_array($sql_ticket_attachments)) { $name = nullable_htmlentities($ticket_attachment['ticket_attachment_name']); $ref_name = nullable_htmlentities($ticket_attachment['ticket_attachment_reference_name']); - echo "
    $name | View"; + echo "
    $name | Download | View"; } ?>
    @@ -259,7 +261,7 @@ if (isset($_GET['id']) && intval($_GET['id'])) { while ($ticket_attachment = mysqli_fetch_array($sql_ticket_reply_attachments)) { $name = nullable_htmlentities($ticket_attachment['ticket_attachment_name']); $ref_name = nullable_htmlentities($ticket_attachment['ticket_attachment_reference_name']); - echo "
    $name | View"; + echo "
    $name | Download | View"; } ?> diff --git a/client_overview.php b/client_overview.php index ead88b74..938e26e2 100644 --- a/client_overview.php +++ b/client_overview.php @@ -32,12 +32,12 @@ $sql_recent_tickets = mysqli_query( LIMIT 5" ); -$sql_recent_logins = mysqli_query( +$sql_recent_credentials = mysqli_query( $mysqli, - "SELECT * FROM logins - WHERE login_client_id = $client_id - AND login_archived_at IS NULL - ORDER BY login_updated_at ASC + "SELECT * FROM credentials + WHERE credential_client_id = $client_id + AND credential_archived_at IS NULL + ORDER BY credential_updated_at ASC LIMIT 5" ); @@ -286,10 +286,10 @@ $sql_asset_retired = mysqli_query( $item_expire_at = nullable_htmlentities($row['item_expire_at']); $item_expire_at_human = timeAgo($row['item_expire_at']); - if ($item_type == 'Login') { - $share_item_sql = mysqli_query($mysqli, "SELECT login_name FROM logins WHERE login_id = $item_related_id AND login_client_id = $client_id"); + if ($item_type == 'Credential') { + $share_item_sql = mysqli_query($mysqli, "SELECT credential_name FROM credentials WHERE credential_id = $item_related_id AND credential_client_id = $client_id"); $share_item = mysqli_fetch_array($share_item_sql); - $item_name = nullable_htmlentities($share_item['login_name']); + $item_name = nullable_htmlentities($share_item['credential_name']); $item_icon = "fas fa-key"; } elseif ($item_type == 'Document') { $share_item_sql = mysqli_query($mysqli, "SELECT document_name FROM documents WHERE document_id = $item_related_id AND document_client_id = $client_id"); diff --git a/clients.php b/clients.php index a4d742c0..b7306f23 100644 --- a/clients.php +++ b/clients.php @@ -362,13 +362,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); } //Get Monthly Recurring Total - $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_amount) AS recurring_monthly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'month' AND recurring_client_id = $client_id"); + $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_monthly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'month' AND recurring_invoice_client_id = $client_id"); $row = mysqli_fetch_array($sql_recurring_monthly_total); $recurring_monthly_total = floatval($row['recurring_monthly_total']); //Get Yearly Recurring Total - $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_amount) AS recurring_yearly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'year' AND recurring_client_id = $client_id"); + $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_yearly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'year' AND recurring_invoice_client_id = $client_id"); $row = mysqli_fetch_array($sql_recurring_yearly_total); $recurring_yearly_total = floatval($row['recurring_yearly_total']) / 12; diff --git a/contact_details.php b/contact_details.php index 0c1ca035..e320c4da 100644 --- a/contact_details.php +++ b/contact_details.php @@ -69,21 +69,21 @@ if (isset($_GET['contact_id'])) { $linked_software = array(); - // Related Logins Query 1 to 1 relationship - $sql_related_logins = mysqli_query($mysqli, " + // Related Credentials Query 1 to 1 relationship + $sql_related_credentials = 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 + credentials.credential_id AS credentials_credential_id, -- Alias for credentials.credential_id + credentials.*, -- All other columns from credentials + credential_tags.*, -- All columns from credential_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 - GROUP BY logins.login_id - ORDER BY login_name DESC + FROM credentials + LEFT JOIN credential_tags ON credential_tags.credential_id = credentials.credential_id + LEFT JOIN tags ON tags.tag_id = credential_tags.tag_id + WHERE credential_contact_id = $contact_id + GROUP BY credentials.credential_id + ORDER BY credential_name DESC "); - $login_count = mysqli_num_rows($sql_related_logins); + $credential_count = mysqli_num_rows($sql_related_credentials); // Related Tickets Query - 1 to 1 relationship $sql_related_tickets = mysqli_query($mysqli, "SELECT * FROM tickets @@ -93,9 +93,9 @@ if (isset($_GET['contact_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_contact_id = $contact_id - ORDER BY scheduled_ticket_next_run DESC" + $sql_related_recurring_tickets = mysqli_query($mysqli, "SELECT * FROM recurring_tickets + WHERE recurring_ticket_contact_id = $contact_id + ORDER BY recurring_ticket_next_run DESC" ); $recurring_ticket_count = mysqli_num_rows($sql_related_recurring_tickets); @@ -446,7 +446,7 @@ if (isset($_GET['contact_id'])) { -
    "> +
    ">

    Credentials

    @@ -467,57 +467,57 @@ if (isset($_GET['contact_id'])) {
    "; + $credential_uri_display = "$credential_uri"; } - $login_uri_2 = nullable_htmlentities($row['login_uri_2']); - $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username'])); - if (empty($login_username)) { - $login_username_display = "-"; + $credential_uri_2 = nullable_htmlentities($row['credential_uri_2']); + $credential_username = nullable_htmlentities(decryptCredentialEntry($row['credential_username'])); + if (empty($credential_username)) { + $credential_username_display = "-"; } else { - $login_username_display = "$login_username"; + $credential_username_display = "$credential_username"; } - $login_password = nullable_htmlentities(decryptLoginEntry($row['login_password'])); - $login_otp_secret = nullable_htmlentities($row['login_otp_secret']); - $login_id_with_secret = '"' . $row['login_id'] . '","' . $row['login_otp_secret'] . '"'; - if (empty($login_otp_secret)) { + $credential_password = nullable_htmlentities(decryptCredentialEntry($row['credential_password'])); + $credential_otp_secret = nullable_htmlentities($row['credential_otp_secret']); + $credential_id_with_secret = '"' . $row['credential_id'] . '","' . $row['credential_otp_secret'] . '"'; + if (empty($credential_otp_secret)) { $otp_display = "-"; } else { - $otp_display = " Hover.."; + $otp_display = " Hover.."; } - $login_note = nullable_htmlentities($row['login_note']); - $login_important = intval($row['login_important']); - $login_contact_id = intval($row['login_contact_id']); - $login_asset_id = intval($row['login_asset_id']); + $credential_note = nullable_htmlentities($row['credential_note']); + $credential_important = intval($row['credential_important']); + $credential_contact_id = intval($row['credential_contact_id']); + $credential_asset_id = intval($row['credential_asset_id']); // Tags - $login_tag_name_display_array = array(); - $login_tag_id_array = array(); - $sql_login_tags = mysqli_query($mysqli, "SELECT * FROM login_tags LEFT JOIN tags ON login_tags.tag_id = tags.tag_id WHERE login_id = $login_id ORDER BY tag_name ASC"); - while ($row = mysqli_fetch_array($sql_login_tags)) { + $credential_tag_name_display_array = array(); + $credential_tag_id_array = array(); + $sql_credential_tags = mysqli_query($mysqli, "SELECT * FROM credential_tags LEFT JOIN tags ON credential_tags.tag_id = tags.tag_id WHERE credential_id = $credential_id ORDER BY tag_name ASC"); + while ($row = mysqli_fetch_array($sql_credential_tags)) { - $login_tag_id = intval($row['tag_id']); - $login_tag_name = nullable_htmlentities($row['tag_name']); - $login_tag_color = nullable_htmlentities($row['tag_color']); - if (empty($login_tag_color)) { - $login_tag_color = "dark"; + $credential_tag_id = intval($row['tag_id']); + $credential_tag_name = nullable_htmlentities($row['tag_name']); + $credential_tag_color = nullable_htmlentities($row['tag_color']); + if (empty($credential_tag_color)) { + $credential_tag_color = "dark"; } - $login_tag_icon = nullable_htmlentities($row['tag_icon']); - if (empty($login_tag_icon)) { - $login_tag_icon = "tag"; + $credential_tag_icon = nullable_htmlentities($row['tag_icon']); + if (empty($credential_tag_icon)) { + $credential_tag_icon = "tag"; } - $login_tag_id_array[] = $login_tag_id; - $login_tag_name_display_array[] = "$login_tag_name"; + $credential_tag_id_array[] = $credential_tag_id; + $credential_tag_name_display_array[] = "$credential_tag_name"; } - $login_tags_display = implode('', $login_tag_name_display_array); + $credential_tags_display = implode('', $credential_tag_name_display_array); ?> @@ -526,18 +526,18 @@ if (isset($_GET['contact_id'])) { - + - - + + - + @@ -695,14 +695,14 @@ if (isset($_GET['contact_id'])) { - + - - - + + + diff --git a/credentials.php b/credentials.php index ef558db7..8c3df7af 100644 --- a/credentials.php +++ b/credentials.php @@ -1,21 +1,21 @@ = 2) { ?>
    -
    - + Import 0) { ?>
    - + Export @@ -207,12 +207,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    @@ -221,7 +221,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    @@ -246,16 +246,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    @@ -275,80 +275,80 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); while ($row = mysqli_fetch_array($sql)) { $client_id = intval($row['client_id']); $client_name = nullable_htmlentities($row['client_name']); - $login_id = intval($row['l_login_id']); - $login_name = nullable_htmlentities($row['login_name']); - $login_description = nullable_htmlentities($row['login_description']); - $login_uri = nullable_htmlentities($row['login_uri']); - if (empty($login_uri)) { - $login_uri_display = "-"; + $credential_id = intval($row['c_credential_id']); + $credential_name = nullable_htmlentities($row['credential_name']); + $credential_description = nullable_htmlentities($row['credential_description']); + $credential_uri = nullable_htmlentities($row['credential_uri']); + if (empty($credential_uri)) { + $credential_uri_display = "-"; } else { - $login_uri_display = truncate($login_uri,40) . ""; + $credential_uri_display = truncate($credential_uri,40) . ""; } - $login_uri_2 = nullable_htmlentities($row['login_uri_2']); - $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username'])); - if (empty($login_username)) { - $login_username_display = "-"; + $credential_uri_2 = nullable_htmlentities($row['credential_uri_2']); + $credential_username = nullable_htmlentities(decryptCredentialEntry($row['credential_username'])); + if (empty($credential_username)) { + $credential_username_display = "-"; } else { - $login_username_display = "$login_username"; + $credential_username_display = "$credential_username"; } - $login_password = nullable_htmlentities(decryptLoginEntry($row['login_password'])); - $login_otp_secret = nullable_htmlentities($row['login_otp_secret']); - $login_id_with_secret = '"' . $row['login_id'] . '","' . $row['login_otp_secret'] . '"'; - if (empty($login_otp_secret)) { + $credential_password = nullable_htmlentities(decryptCredentialEntry($row['credential_password'])); + $credential_otp_secret = nullable_htmlentities($row['credential_otp_secret']); + $credential_id_with_secret = '"' . $row['credential_id'] . '","' . $row['credential_otp_secret'] . '"'; + if (empty($credential_otp_secret)) { $otp_display = "-"; } else { - $otp_display = " Hover.."; + $otp_display = " Hover.."; } - $login_note = nullable_htmlentities($row['login_note']); - $login_created_at = nullable_htmlentities($row['login_created_at']); - $login_archived_at = nullable_htmlentities($row['login_archived_at']); - $login_important = intval($row['login_important']); - $login_contact_id = intval($row['login_contact_id']); + $credential_note = nullable_htmlentities($row['credential_note']); + $credential_created_at = nullable_htmlentities($row['credential_created_at']); + $credential_archived_at = nullable_htmlentities($row['credential_archived_at']); + $credential_important = intval($row['credential_important']); + $credential_contact_id = intval($row['credential_contact_id']); $contact_name = nullable_htmlentities($row['contact_name']); - $login_asset_id = intval($row['login_asset_id']); + $credential_asset_id = intval($row['credential_asset_id']); $asset_name = nullable_htmlentities($row['asset_name']); // Tags - $login_tag_name_display_array = array(); - $login_tag_id_array = array(); - $sql_login_tags = mysqli_query($mysqli, "SELECT * FROM login_tags LEFT JOIN tags ON login_tags.tag_id = tags.tag_id WHERE login_id = $login_id ORDER BY tag_name ASC"); - while ($row = mysqli_fetch_array($sql_login_tags)) { + $credential_tag_name_display_array = array(); + $credential_tag_id_array = array(); + $sql_credential_tags = mysqli_query($mysqli, "SELECT * FROM credential_tags LEFT JOIN tags ON credential_tags.tag_id = tags.tag_id WHERE credential_id = $credential_id ORDER BY tag_name ASC"); + while ($row = mysqli_fetch_array($sql_credential_tags)) { - $login_tag_id = intval($row['tag_id']); - $login_tag_name = nullable_htmlentities($row['tag_name']); - $login_tag_color = nullable_htmlentities($row['tag_color']); - if (empty($login_tag_color)) { - $login_tag_color = "dark"; + $credential_tag_id = intval($row['tag_id']); + $credential_tag_name = nullable_htmlentities($row['tag_name']); + $credential_tag_color = nullable_htmlentities($row['tag_color']); + if (empty($credential_tag_color)) { + $credential_tag_color = "dark"; } - $login_tag_icon = nullable_htmlentities($row['tag_icon']); - if (empty($login_tag_icon)) { - $login_tag_icon = "tag"; + $credential_tag_icon = nullable_htmlentities($row['tag_icon']); + if (empty($credential_tag_icon)) { + $credential_tag_icon = "tag"; } - $login_tag_id_array[] = $login_tag_id; - $login_tag_name_display_array[] = "$login_tag_name"; + $credential_tag_id_array[] = $credential_tag_id; + $credential_tag_name_display_array[] = "$credential_tag_name"; } - $login_tags_display = implode('', $login_tag_name_display_array); + $credential_tags_display = implode('', $credential_tag_name_display_array); - if ($login_contact_id) { - $login_contact_display = " + data-ajax-id='$credential_asset_id'> "; } else { - $login_asset_display = ''; + $credential_asset_display = ''; } // Check if shared @@ -359,8 +359,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); AND item_active = 1 AND item_views != item_view_limit AND item_expire_at > NOW() - AND item_type = 'Login' - AND item_related_id = $login_id + AND item_type = 'Credential' + AND item_related_id = $credential_id LIMIT 1" ); if (mysqli_num_rows($sql_shared) > 0) { @@ -381,41 +381,41 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); ?> - "> + "> - + - + - - - + + + @@ -571,9 +571,9 @@ if (isset($_GET['query'])) { - 0) { ?> + 0) { ?> - +
    @@ -593,21 +593,21 @@ if (isset($_GET['query'])) {
    - - - - + + + diff --git a/guest/guest_ajax.php b/guest/guest_ajax.php index 523e5208..8c35e4eb 100644 --- a/guest/guest_ajax.php +++ b/guest/guest_ajax.php @@ -9,7 +9,7 @@ require_once "../config.php"; // Set Timezone -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; require_once "../functions.php"; require_once "../plugins/totp/totp.php"; diff --git a/guest/guest_download_file.php b/guest/guest_download_file.php index f083d429..dc63ce44 100644 --- a/guest/guest_download_file.php +++ b/guest/guest_download_file.php @@ -3,7 +3,7 @@ require_once "../config.php"; // Set Timezone -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; require_once "../functions.php"; diff --git a/guest/guest_pay_invoice_stripe.php b/guest/guest_pay_invoice_stripe.php index 9f3c9a6e..c50758d6 100644 --- a/guest/guest_pay_invoice_stripe.php +++ b/guest/guest_pay_invoice_stripe.php @@ -1,6 +1,6 @@

    There was an error verifying your payment. Please contact us for more information before attempting payment again.

    "); @@ -19,7 +19,7 @@ $config_stripe_flat_fee = floatval($stripe_vars['config_stripe_flat_fee']); // Check Stripe is configured if ($config_stripe_enable == 0 || $config_stripe_account == 0 || empty($config_stripe_publishable) || empty($config_stripe_secret)) { echo "

    Stripe payments not enabled/configured

    "; - require_once 'guest_footer.php'; + require_once 'includes/guest_footer.php'; error_log("Stripe payment error - disabled. Check payments are enabled, Expense account is set, Stripe publishable and secret keys are configured."); exit(); } @@ -47,7 +47,7 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent // Ensure we have a valid invoice if (!$sql || mysqli_num_rows($sql) !== 1) { echo "

    Oops, something went wrong! Please ensure you have the correct URL and have not already paid this invoice.

    "; - require_once 'guest_footer.php'; + require_once 'includes/guest_footer.php'; error_log("Stripe payment error - Invoice with ID $invoice_id is unknown/not eligible to be paid."); exit(); } @@ -357,4 +357,4 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent } -require_once 'guest_footer.php'; +require_once 'includes/guest_footer.php'; diff --git a/guest/guest_post.php b/guest/guest_post.php index cfc8af51..bead301c 100644 --- a/guest/guest_post.php +++ b/guest/guest_post.php @@ -5,7 +5,7 @@ require_once "../functions.php"; session_start(); -require_once "../inc_set_timezone.php"; // Must be included after session_start to work +require_once "../includes/inc_set_timezone.php"; // Must be included after session_start to work if (isset($_GET['accept_quote'], $_GET['url_key'])) { $quote_id = intval($_GET['accept_quote']); diff --git a/guest/guest_view_invoice.php b/guest/guest_view_invoice.php index 8352d4f8..a1db478c 100644 --- a/guest/guest_view_invoice.php +++ b/guest/guest_view_invoice.php @@ -1,10 +1,10 @@

    Oops, something went wrong! Please raise a ticket if you believe this is an error.

    "; - require_once "guest_footer.php"; + require_once "includes/guest_footer.php"; exit(); } @@ -25,7 +25,7 @@ $sql = mysqli_query( if (mysqli_num_rows($sql) !== 1) { // Invalid invoice/key echo "

    Oops, something went wrong! Please raise a ticket if you believe this is an error.

    "; - require_once "guest_footer.php"; + require_once "includes/guest_footer.php"; exit(); } @@ -931,4 +931,4 @@ if ($outstanding_invoices_count > 0) { ?> Incorrect URL."; - include "guest_footer.php"; + include "includes/guest_footer.php"; exit(); } @@ -52,7 +52,7 @@ $row = mysqli_fetch_array($sql); // Check we got a result if (mysqli_num_rows($sql) !== 1 || !$row) { echo "
    No item to view. Check with the person that sent you this link to ensure it is correct and has not expired.
    "; - include "guest_footer.php"; + include "includes/guest_footer.php"; exit(); } @@ -60,7 +60,7 @@ if (mysqli_num_rows($sql) !== 1 || !$row) { // Check item share is active & hasn't been viewed too many times but allow 0 views as that is consider infinite views if ($row['item_active'] !== "1" || ($row['item_view_limit'] > 0 && $row['item_views'] >= $row['item_view_limit'])) { echo "
    Item cannot be viewed at this time. Check with the person that sent you this link to ensure it is correct and has not expired.
    "; - include "guest_footer.php"; + include "includes/guest_footer.php"; exit(); } @@ -122,7 +122,7 @@ if ($item_type == "Document") { if (mysqli_num_rows($doc_sql) !== 1 || !$doc_row) { echo "
    Error retrieving document to view.
    "; - require_once "guest_footer.php"; + require_once "includes/guest_footer.php"; exit(); } @@ -149,7 +149,7 @@ if ($item_type == "Document") { if (mysqli_num_rows($file_sql) !== 1 || !$file_row) { echo "
    Error retrieving file.
    "; - include "guest_footer.php"; + include "includes/guest_footer.php"; exit(); } @@ -163,61 +163,61 @@ if ($item_type == "Document") { echo "Download $file_name"; -} elseif ($item_type == "Login") { +} elseif ($item_type == "Credential") { $encryption_key = $_GET['ek']; - $login_sql = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_id = $item_related_id AND login_client_id = $client_id LIMIT 1"); - $login_row = mysqli_fetch_array($login_sql); - if (mysqli_num_rows($login_sql) !== 1 || !$login_row) { + $credential_sql = mysqli_query($mysqli, "SELECT * FROM credentials WHERE credential_id = $item_related_id AND credential_client_id = $client_id LIMIT 1"); + $credential_row = mysqli_fetch_array($credential_sql); + if (mysqli_num_rows($credential_sql) !== 1 || !$credential_row) { echo "
    Error retrieving login.
    "; - include "guest_footer.php"; + include "includes/guest_footer.php"; exit(); } - $login_id = intval($login_row['login_id']); - $login_name = nullable_htmlentities($login_row['login_name']); - $login_uri = nullable_htmlentities($login_row['login_uri']); + $credential_id = intval($credential_row['credential_id']); + $credential_name = nullable_htmlentities($credential_row['credential_name']); + $credential_uri = nullable_htmlentities($credential_row['credential_uri']); $username_iv = substr($row['item_encrypted_username'], 0, 16); $username_ciphertext = substr($row['item_encrypted_username'], 16); - $login_username = nullable_htmlentities(openssl_decrypt($username_ciphertext, 'aes-128-cbc', $encryption_key, 0, $username_iv)); + $credential_username = nullable_htmlentities(openssl_decrypt($username_ciphertext, 'aes-128-cbc', $encryption_key, 0, $username_iv)); $password_iv = substr($row['item_encrypted_credential'], 0, 16); $password_ciphertext = substr($row['item_encrypted_credential'], 16); - $login_password = nullable_htmlentities(openssl_decrypt($password_ciphertext, 'aes-128-cbc', $encryption_key, 0, $password_iv)); + $credential_password = nullable_htmlentities(openssl_decrypt($password_ciphertext, 'aes-128-cbc', $encryption_key, 0, $password_iv)); - $login_otp = nullable_htmlentities($login_row['login_otp_secret']); + $credential_otp = nullable_htmlentities($credential_row['credential_otp_secret']); - $login_otp_secret = nullable_htmlentities($login_row['login_otp_secret']); - $login_id_with_secret = '"' . $login_row['login_id'] . '","' . $login_row['login_otp_secret'] . '"'; - if (empty($login_otp_secret)) { + $credential_otp_secret = nullable_htmlentities($credential_row['credential_otp_secret']); + $credential_id_with_secret = '"' . $credential_row['credential_id'] . '","' . $credential_row['credential_otp_secret'] . '"'; + if (empty($credential_otp_secret)) { $otp_display = "-"; } else { - $otp_display = " Hover.."; + $otp_display = " Hover.."; } - $login_notes = nullable_htmlentities($login_row['login_note']); + $credential_notes = nullable_htmlentities($credential_row['credential_note']); ?> -
    +
    Name
    - + + +
    - +
    - +
    @@ -949,19 +950,20 @@ if (isset($_GET['asset_id'])) {
    Edit
    - + Force Reoccur
    - + Delete
    @@ -1005,12 +1007,13 @@ if (isset($_GET['asset_id'])) { $ticket_number = intval($row['ticket_number']); $ticket_subject = nullable_htmlentities($row['ticket_subject']); $ticket_priority = nullable_htmlentities($row['ticket_priority']); + $ticket_status_id = intval($row['ticket_status_id']); $ticket_status_name = nullable_htmlentities($row['ticket_status_name']); $ticket_status_color = nullable_htmlentities($row['ticket_status_color']); $ticket_created_at = nullable_htmlentities($row['ticket_created_at']); $ticket_updated_at = nullable_htmlentities($row['ticket_updated_at']); if (empty($ticket_updated_at)) { - if ($ticket_status == "Closed") { + if ($ticket_status_name == "Closed") { $ticket_updated_at_display = "

    Never

    "; } else { $ticket_updated_at_display = "

    Never

    "; @@ -1031,7 +1034,7 @@ if (isset($_GET['asset_id'])) { } $ticket_assigned_to = intval($row['ticket_assigned_to']); if (empty($ticket_assigned_to)) { - if ($ticket_status == 5) { + if ($ticket_status_id == 5) { $ticket_assigned_to_display = "

    Not Assigned

    "; } else { $ticket_assigned_to_display = "

    Not Assigned

    "; @@ -1167,7 +1170,7 @@ if (isset($_GET['asset_id'])) { }); - + 0) { type="submit" form="bulkActions" name="bulk_unarchive_assets"> Unarchive +
    +
    - +
    @@ -1162,7 +1162,7 @@ if (isset($_GET['contact_id'])) { }); - + "; + } else { + $user_exists_display = ""; + } // Related Assets Query $sql_related_assets = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_contact_id = $contact_id ORDER BY asset_id DESC"); @@ -361,13 +366,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $asset_count_display = ''; } - // Related Logins Query - $sql_related_logins = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_contact_id = $contact_id ORDER BY login_id DESC"); - $login_count = mysqli_num_rows($sql_related_logins); - if ($login_count) { - $login_count_display = "$login_count"; + // Related Credentials Query + $sql_related_credentials = mysqli_query($mysqli, "SELECT * FROM credentials WHERE credential_contact_id = $contact_id ORDER BY credential_id DESC"); + $credential_count = mysqli_num_rows($sql_related_credentials); + if ($credential_count) { + $credential_count_display = "$credential_count"; } else { - $login_count_display = ''; + $credential_count_display = ''; } // Related Software Query @@ -385,7 +390,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); if ($ticket_count) { $ticket_count_display = "$ticket_count"; } else { - $software_count_display = ''; + $ticket_count_display = ''; } // Related Documents Query @@ -445,7 +450,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    -
    ">
    +
    ">
    		- + - - Name + + Name Username / ID Password / Key OTP - - URI + + URI
    - +
    -
    -
    +
    +
    + if (!empty($credential_tags_display)) { ?>
    - +
    		- + - + 0) { ?>
    @@ -431,21 +431,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - +
    - - - + + + - +
    - - + +
    @@ -459,29 +459,29 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Edit
    - )"> + )"> Share = 2) { ?> - +
    - + Unarchive = 3) { ?>
    - + Delete
    - + Archive diff --git a/dashboard.php b/dashboard.php index cae20984..f4b968ad 100644 --- a/dashboard.php +++ b/dashboard.php @@ -73,11 +73,6 @@ $sql_years_select = mysqli_query($mysqli, " window.location.href = \'dashboard_technical.php\';'); - } - // Fetch financial data for the dashboard // Define variables to avoid errors in logs $largest_income_month = 0; @@ -129,11 +124,11 @@ if ($user_config_dashboard_financial_enable == 1) { "); // Get recurring invoice totals - $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_amount) AS recurring_yearly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'year' AND YEAR(recurring_created_at) <= $year"); + $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_yearly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'year' AND YEAR(recurring_invoice_created_at) <= $year"); $row = mysqli_fetch_array($sql_recurring_yearly_total); $recurring_yearly_total = floatval($row['recurring_yearly_total']); - $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_amount) AS recurring_monthly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'month' AND YEAR(recurring_created_at) <= $year"); + $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_monthly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'month' AND YEAR(recurring_invoice_created_at) <= $year"); $row = mysqli_fetch_array($sql_recurring_monthly_total); $recurring_monthly_total = floatval($row['recurring_monthly_total']) + ($recurring_yearly_total / 12); diff --git a/database_updates.php b/database_updates.php index 50ea60ce..43dff4f4 100644 --- a/database_updates.php +++ b/database_updates.php @@ -2423,10 +2423,974 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.7'"); } - // if (CURRENT_DATABASE_VERSION == '1.8.7') { - // // Insert queries here required to update to DB version 1.8.8 + if (CURRENT_DATABASE_VERSION == '1.8.7') { + mysqli_query($mysqli, "ALTER TABLE `tickets` ADD `ticket_first_response_at` DATETIME NULL DEFAULT NULL AFTER `ticket_archived_at`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.8'"); + } + + if (CURRENT_DATABASE_VERSION == '1.8.8') { + mysqli_query($mysqli, "ALTER TABLE `invoices` ADD `invoice_recurring_invoice_id` INT(11) NOT NULL DEFAULT 0 AFTER `invoice_category_id`"); + mysqli_query($mysqli, "ALTER TABLE `invoice_items` ADD `item_product_id` INT(11) NOT NULL DEFAULT 0 AFTER `item_tax_id`"); + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.9'"); + } + + if (CURRENT_DATABASE_VERSION == '1.8.9') { + mysqli_query($mysqli, "ALTER TABLE `users` ADD `user_role_id` INT(11) DEFAULT 0 AFTER `user_archived_at`"); + + // Copy user role from user settings table to the users table + mysqli_query($mysqli," + UPDATE `users` + JOIN `user_settings` ON users.user_id = user_settings.user_id + SET users.user_role_id = user_settings.user_role + "); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.9.0'"); + } + + if (CURRENT_DATABASE_VERSION == '1.9.0') { + mysqli_query($mysqli, "ALTER TABLE `user_settings` DROP `user_role`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.9.1'"); + } + + if (CURRENT_DATABASE_VERSION == '1.9.1') { + + mysqli_query($mysqli, + "ALTER TABLE `user_roles` + CHANGE COLUMN `user_role_id` `role_id` INT(11) NOT NULL AUTO_INCREMENT, + CHANGE COLUMN `user_role_name` `role_name` VARCHAR(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + CHANGE COLUMN `user_role_description` `role_description` VARCHAR(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + CHANGE COLUMN `user_role_type` `role_type` TINYINT(1) NOT NULL DEFAULT 1, + CHANGE COLUMN `user_role_is_admin` `role_is_admin` TINYINT(1) NOT NULL DEFAULT 0, + CHANGE COLUMN `user_role_created_at` `role_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP(), + CHANGE COLUMN `user_role_updated_at` `role_updated_at` DATETIME NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(), + CHANGE COLUMN `user_role_archived_at` `role_archived_at` DATETIME NULL DEFAULT NULL + "); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.9.2'"); + } + + if (CURRENT_DATABASE_VERSION == '1.9.2') { + + mysqli_query($mysqli, "RENAME TABLE `user_permissions` TO `user_client_permissions`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.9.3'"); + } + + if (CURRENT_DATABASE_VERSION == '1.9.3') { + + // Now create the table with foreign keys + mysqli_query($mysqli, " + CREATE TABLE `ticket_assets` ( + `ticket_id` INT(11) NOT NULL, + `asset_id` INT(11) NOT NULL, + PRIMARY KEY (`ticket_id`, `asset_id`), + FOREIGN KEY (`asset_id`) REFERENCES `assets`(`asset_id`) ON DELETE CASCADE, + FOREIGN KEY (`ticket_id`) REFERENCES `tickets`(`ticket_id`) ON DELETE CASCADE + ) + "); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.9.4'"); + } + + if (CURRENT_DATABASE_VERSION == '1.9.4') { + mysqli_query($mysqli, "RENAME TABLE `scheduled_tickets` TO `recurring_tickets`"); + + mysqli_query($mysqli, + "ALTER TABLE `recurring_tickets` + CHANGE COLUMN `scheduled_ticket_id` `recurring_ticket_id` INT(11) NOT NULL AUTO_INCREMENT, + CHANGE COLUMN `scheduled_ticket_category` `recurring_ticket_category` VARCHAR(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + CHANGE COLUMN `scheduled_ticket_subject` `recurring_ticket_subject` VARCHAR(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + CHANGE COLUMN `scheduled_ticket_details` `recurring_ticket_details` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + CHANGE COLUMN `scheduled_ticket_priority` `recurring_ticket_priority` VARCHAR(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + CHANGE COLUMN `scheduled_ticket_frequency` `recurring_ticket_frequency` VARCHAR(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + CHANGE COLUMN `scheduled_ticket_billable` `recurring_ticket_billable` TINYINT(1) NOT NULL DEFAULT 0, + CHANGE COLUMN `scheduled_ticket_start_date` `recurring_ticket_start_date` DATE NOT NULL, + CHANGE COLUMN `scheduled_ticket_next_run` `recurring_ticket_next_run` DATE NOT NULL, + CHANGE COLUMN `scheduled_ticket_created_at` `recurring_ticket_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP(), + CHANGE COLUMN `scheduled_ticket_updated_at` `recurring_ticket_updated_at` DATETIME NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(), + CHANGE COLUMN `scheduled_ticket_created_by` `recurring_ticket_created_by` INT(11) NOT NULL DEFAULT 0, + CHANGE COLUMN `scheduled_ticket_assigned_to` `recurring_ticket_assigned_to` INT(11) NOT NULL DEFAULT 0, + CHANGE COLUMN `scheduled_ticket_client_id` `recurring_ticket_client_id` INT(11) NOT NULL DEFAULT 0, + CHANGE COLUMN `scheduled_ticket_contact_id` `recurring_ticket_contact_id` INT(11) NOT NULL DEFAULT 0, + CHANGE COLUMN `scheduled_ticket_asset_id` `recurring_ticket_asset_id` INT(11) NOT NULL DEFAULT 0 + " + ); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.9.5'"); + } + + if (CURRENT_DATABASE_VERSION == '1.9.5') { + + // create the table with foreign keys + mysqli_query($mysqli, " + CREATE TABLE `recurring_ticket_assets` ( + `recurring_ticket_id` INT(11) NOT NULL, + `asset_id` INT(11) NOT NULL, + PRIMARY KEY (`recurring_ticket_id`, `asset_id`), + FOREIGN KEY (`asset_id`) REFERENCES `assets`(`asset_id`) ON DELETE CASCADE, + FOREIGN KEY (`recurring_ticket_id`) REFERENCES `recurring_tickets`(`recurring_ticket_id`) ON DELETE CASCADE + ) + "); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.9.6'"); + } + + if (CURRENT_DATABASE_VERSION == '1.9.6') { + mysqli_query($mysqli, "RENAME TABLE `recurring` TO `recurring_invoices`"); + + mysqli_query($mysqli, " + ALTER TABLE `recurring_invoices` + CHANGE COLUMN `recurring_id` `recurring_invoice_id` INT(11) NOT NULL AUTO_INCREMENT, + CHANGE COLUMN `recurring_prefix` `recurring_invoice_prefix` VARCHAR(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + CHANGE COLUMN `recurring_number` `recurring_invoice_number` INT(11) NOT NULL, + CHANGE COLUMN `recurring_scope` `recurring_invoice_scope` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + CHANGE COLUMN `recurring_frequency` `recurring_invoice_frequency` VARCHAR(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + CHANGE COLUMN `recurring_last_sent` `recurring_invoice_last_sent` DATE NULL DEFAULT NULL, + CHANGE COLUMN `recurring_next_date` `recurring_invoice_next_date` DATE NOT NULL, + CHANGE COLUMN `recurring_status` `recurring_invoice_status` INT(1) NOT NULL, + CHANGE COLUMN `recurring_discount_amount` `recurring_invoice_discount_amount` DECIMAL(15,2) NOT NULL DEFAULT 0.00, + CHANGE COLUMN `recurring_amount` `recurring_invoice_amount` DECIMAL(15,2) NOT NULL DEFAULT 0.00, + CHANGE COLUMN `recurring_currency_code` `recurring_invoice_currency_code` VARCHAR(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + CHANGE COLUMN `recurring_note` `recurring_invoice_note` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + CHANGE COLUMN `recurring_created_at` `recurring_invoice_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP(), + CHANGE COLUMN `recurring_updated_at` `recurring_invoice_updated_at` DATETIME NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(), + CHANGE COLUMN `recurring_archived_at` `recurring_invoice_archived_at` DATETIME NULL DEFAULT NULL, + CHANGE COLUMN `recurring_category_id` `recurring_invoice_category_id` INT(11) NOT NULL, + CHANGE COLUMN `recurring_client_id` `recurring_invoice_client_id` INT(11) NOT NULL + "); + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.9.7'"); + } + + if (CURRENT_DATABASE_VERSION == '1.9.7') { + + mysqli_query($mysqli, " + ALTER TABLE `settings` + CHANGE COLUMN `config_recurring_prefix` `config_recurring_invoice_prefix` VARCHAR(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + CHANGE COLUMN `config_recurring_next_number` `config_recurring_invoice_next_number` INT(11) NOT NULL DEFAULT 1 + "); + + mysqli_query($mysqli, " + ALTER TABLE `history` + CHANGE COLUMN `history_recurring_id` `history_recurring_invoice_id` INT(11) NOT NULL DEFAULT 0 + "); + + mysqli_query($mysqli, " + ALTER TABLE `invoice_items` + CHANGE COLUMN `item_recurring_id` `item_recurring_invoice_id` INT(11) NOT NULL DEFAULT 0 + "); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.9.8'"); + } + + if (CURRENT_DATABASE_VERSION == '1.9.8') { + // Reference a Recurring Ticket that generated ticket + mysqli_query($mysqli, "ALTER TABLE `tickets` ADD `ticket_recurring_ticket_id` INT(11) DEFAULT 0 AFTER `ticket_project_id`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.9.9'"); + } + + if (CURRENT_DATABASE_VERSION == '1.9.9') { + mysqli_query($mysqli, "RENAME TABLE `logins` TO `credentials`"); + mysqli_query($mysqli, " + ALTER TABLE `credentials` + CHANGE COLUMN `login_id` `credential_id` INT(11) NOT NULL AUTO_INCREMENT, + CHANGE COLUMN `login_name` `credential_name` VARCHAR(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + CHANGE COLUMN `login_description` `credential_description` VARCHAR(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + CHANGE COLUMN `login_category` `credential_category` VARCHAR(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + CHANGE COLUMN `login_uri` `credential_uri` VARCHAR(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + CHANGE COLUMN `login_uri_2` `credential_uri_2` VARCHAR(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + CHANGE COLUMN `login_username` `credential_username` VARCHAR(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + CHANGE COLUMN `login_password` `credential_password` VARBINARY(200) NULL DEFAULT NULL, + CHANGE COLUMN `login_otp_secret` `credential_otp_secret` VARCHAR(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + CHANGE COLUMN `login_note` `credential_note` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + CHANGE COLUMN `login_important` `credential_important` TINYINT(1) NOT NULL DEFAULT '0', + CHANGE COLUMN `login_created_at` `credential_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP(), + CHANGE COLUMN `login_updated_at` `credential_updated_at` DATETIME NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(), + CHANGE COLUMN `login_archived_at` `credential_archived_at` DATETIME NULL DEFAULT NULL, + CHANGE COLUMN `login_accessed_at` `credential_accessed_at` DATETIME NULL DEFAULT NULL, + CHANGE COLUMN `login_password_changed_at` `credential_password_changed_at` DATETIME NULL DEFAULT CURRENT_TIMESTAMP(), + CHANGE COLUMN `login_folder_id` `credential_folder_id` INT(11) NOT NULL DEFAULT '0', + CHANGE COLUMN `login_contact_id` `credential_contact_id` INT(11) NOT NULL DEFAULT '0', + CHANGE COLUMN `login_asset_id` `credential_asset_id` INT(11) NOT NULL DEFAULT '0', + CHANGE COLUMN `login_client_id` `credential_client_id` INT(11) NOT NULL DEFAULT '0' + "); + + // Rename table contact_logins to contact_credentials + mysqli_query($mysqli, "RENAME TABLE `contact_logins` TO `contact_credentials`"); + + // Alter contact_credentials table and change login_id to credential_id + mysqli_query($mysqli, " + ALTER TABLE `contact_credentials` + CHANGE COLUMN `login_id` `credential_id` INT(11) NOT NULL + "); + + // Clean up orphaned contact_id rows in contact_credentials + mysqli_query($mysqli, " + DELETE FROM `contact_credentials` + WHERE `contact_id` NOT IN (SELECT `contact_id` FROM `contacts`); + "); + + // Clean up orphaned credential_id rows in contact_credentials + mysqli_query($mysqli, " + DELETE FROM `contact_credentials` + WHERE `credential_id` NOT IN (SELECT `credential_id` FROM `credentials`); + "); + + // Add foreign keys to contact_credentials + mysqli_query($mysqli, " + ALTER TABLE `contact_credentials` + ADD FOREIGN KEY (`contact_id`) REFERENCES `contacts`(`contact_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`credential_id`) REFERENCES `credentials`(`credential_id`) ON DELETE CASCADE + "); + + // Rename table service_logins to service_credentials + mysqli_query($mysqli, "RENAME TABLE `service_logins` TO `service_credentials`"); + + // Alter service_credentials table and change login_id to credential_id + mysqli_query($mysqli, " + ALTER TABLE `service_credentials` + CHANGE COLUMN `login_id` `credential_id` INT(11) NOT NULL + "); + + // Clean up orphaned service_id rows in service_credentials + mysqli_query($mysqli, " + DELETE FROM `service_credentials` + WHERE `service_id` NOT IN (SELECT `service_id` FROM `services`); + "); + + // Clean up orphaned credential_id rows in service_credentials + mysqli_query($mysqli, " + DELETE FROM `service_credentials` + WHERE `credential_id` NOT IN (SELECT `credential_id` FROM `credentials`); + "); + + // Add foreign keys to service_credentials + mysqli_query($mysqli, " + ALTER TABLE `service_credentials` + ADD FOREIGN KEY (`service_id`) REFERENCES `services`(`service_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`credential_id`) REFERENCES `credentials`(`credential_id`) ON DELETE CASCADE + "); + + // Rename table software_logins to software_credentials + mysqli_query($mysqli, "RENAME TABLE `software_logins` TO `software_credentials`"); + + // Alter software_credentials table and change login_id to credential_id + mysqli_query($mysqli, " + ALTER TABLE `software_credentials` + CHANGE COLUMN `login_id` `credential_id` INT(11) NOT NULL + "); + + // Clean up orphaned software_id rows in software_credentials + mysqli_query($mysqli, " + DELETE FROM `software_credentials` + WHERE `software_id` NOT IN (SELECT `software_id` FROM `software`); + "); + + // Clean up orphaned credential_id rows in software_credentials + mysqli_query($mysqli, " + DELETE FROM `software_credentials` + WHERE `credential_id` NOT IN (SELECT `credential_id` FROM `credentials`); + "); + + // Add foreign keys to software_credentials + mysqli_query($mysqli, " + ALTER TABLE `software_credentials` + ADD FOREIGN KEY (`software_id`) REFERENCES `software`(`software_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`credential_id`) REFERENCES `credentials`(`credential_id`) ON DELETE CASCADE + "); + + // Rename table vendor_logins to vendor_credentials + mysqli_query($mysqli, "RENAME TABLE `vendor_logins` TO `vendor_credentials`"); + + // Alter vendor_credentials table and change login_id to credential_id + mysqli_query($mysqli, " + ALTER TABLE `vendor_credentials` + CHANGE COLUMN `login_id` `credential_id` INT(11) NOT NULL + "); + + // Clean up orphaned vendor_id rows in vendor_credentials + mysqli_query($mysqli, " + DELETE FROM `vendor_credentials` + WHERE `vendor_id` NOT IN (SELECT `vendor_id` FROM `vendors`); + "); + + // Clean up orphaned credential_id rows in vendor_credentials + mysqli_query($mysqli, " + DELETE FROM `vendor_credentials` + WHERE `credential_id` NOT IN (SELECT `credential_id` FROM `credentials`); + "); + + // Add foreign keys to vendor_credentials + mysqli_query($mysqli, " + ALTER TABLE `vendor_credentials` + ADD FOREIGN KEY (`vendor_id`) REFERENCES `vendors`(`vendor_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`credential_id`) REFERENCES `credentials`(`credential_id`) ON DELETE CASCADE + "); + + // Rename table login_tags to credential_tags + mysqli_query($mysqli, "RENAME TABLE `login_tags` TO `credential_tags`"); + + // Alter credential_tags table and change login_id to credential_id + mysqli_query($mysqli, " + ALTER TABLE `credential_tags` + CHANGE COLUMN `login_id` `credential_id` INT(11) NOT NULL + "); + + // Clean up orphaned tag_id rows in credential_tags + mysqli_query($mysqli, " + DELETE FROM `credential_tags` + WHERE `tag_id` NOT IN (SELECT `tag_id` FROM `tags`); + "); + + // Clean up orphaned credential_id rows in credential_tags + mysqli_query($mysqli, " + DELETE FROM `credential_tags` + WHERE `credential_id` NOT IN (SELECT `credential_id` FROM `credentials`); + "); + + // Add foreign keys to credential_tags + mysqli_query($mysqli, " + ALTER TABLE `credential_tags` + ADD FOREIGN KEY (`tag_id`) REFERENCES `tags`(`tag_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`credential_id`) REFERENCES `credentials`(`credential_id`) ON DELETE CASCADE + "); + + // Create asset_credentials table with foreign keys + mysqli_query($mysqli, " + CREATE TABLE `asset_credentials` ( + `credential_id` INT(11) NOT NULL, + `asset_id` INT(11) NOT NULL, + PRIMARY KEY (`credential_id`, `asset_id`), + FOREIGN KEY (`credential_id`) REFERENCES `credentials`(`credential_id`) ON DELETE CASCADE, + FOREIGN KEY (`asset_id`) REFERENCES `assets`(`asset_id`) ON DELETE CASCADE + ) + "); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.0'"); + } + + if (CURRENT_DATABASE_VERSION == '2.0.0') { + + //Dropping patch panel as a patch panel can be documented as an asset with interfaces. + mysqli_query($mysqli, "DROP TABLE `patch_panel_ports`"); + mysqli_query($mysqli, "DROP TABLE `patch_panels`"); + + mysqli_query($mysqli, "RENAME TABLE `events` TO `calendar_events`"); + mysqli_query($mysqli, "RENAME TABLE `event_attendees` TO `calendar_event_attendees`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.1'"); + } + + if (CURRENT_DATABASE_VERSION == '2.0.1') { + + // Clean up orphaned data before adding foreign keys + + // Clean up orphaned asset_custom_asset_id rows in asset_custom + mysqli_query($mysqli, " + DELETE FROM `asset_custom` + WHERE `asset_custom_asset_id` NOT IN (SELECT `asset_id` FROM `assets`); + "); + + // Add foreign key to asset_custom + mysqli_query($mysqli, " + ALTER TABLE `asset_custom` + ADD FOREIGN KEY (`asset_custom_asset_id`) REFERENCES `assets`(`asset_id`) ON DELETE CASCADE + "); + + // Clean up orphaned asset_id rows in asset_documents + mysqli_query($mysqli, " + DELETE FROM `asset_documents` + WHERE `asset_id` NOT IN (SELECT `asset_id` FROM `assets`); + "); + + // Clean up orphaned document_id rows in asset_documents + mysqli_query($mysqli, " + DELETE FROM `asset_documents` + WHERE `document_id` NOT IN (SELECT `document_id` FROM `documents`); + "); + + // Add foreign keys to asset_documents + mysqli_query($mysqli, " + ALTER TABLE `asset_documents` + ADD FOREIGN KEY (`asset_id`) REFERENCES `assets`(`asset_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`document_id`) REFERENCES `documents`(`document_id`) ON DELETE CASCADE + "); + + // Clean up orphaned asset_id rows in asset_files + mysqli_query($mysqli, " + DELETE FROM `asset_files` + WHERE `asset_id` NOT IN (SELECT `asset_id` FROM `assets`); + "); + + // Clean up orphaned file_id rows in asset_files + mysqli_query($mysqli, " + DELETE FROM `asset_files` + WHERE `file_id` NOT IN (SELECT `file_id` FROM `files`); + "); + + // Add foreign keys to asset_files + mysqli_query($mysqli, " + ALTER TABLE `asset_files` + ADD FOREIGN KEY (`asset_id`) REFERENCES `assets`(`asset_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`file_id`) REFERENCES `files`(`file_id`) ON DELETE CASCADE + "); + + // Clean up orphaned asset_history_asset_id rows in asset_history + mysqli_query($mysqli, " + DELETE FROM `asset_history` + WHERE `asset_history_asset_id` NOT IN (SELECT `asset_id` FROM `assets`); + "); + + // Add foreign key to asset_history + mysqli_query($mysqli, " + ALTER TABLE `asset_history` + ADD FOREIGN KEY (`asset_history_asset_id`) REFERENCES `assets`(`asset_id`) ON DELETE CASCADE + "); + + // Clean up orphaned interface_asset_id rows in asset_interfaces + mysqli_query($mysqli, " + DELETE FROM `asset_interfaces` + WHERE `interface_asset_id` NOT IN (SELECT `asset_id` FROM `assets`); + "); + + // Add foreign key to asset_interfaces + mysqli_query($mysqli, " + ALTER TABLE `asset_interfaces` + ADD FOREIGN KEY (`interface_asset_id`) REFERENCES `assets`(`asset_id`) ON DELETE CASCADE + "); + + // Clean up orphaned asset_note_asset_id rows in asset_notes + mysqli_query($mysqli, " + DELETE FROM `asset_notes` + WHERE `asset_note_asset_id` NOT IN (SELECT `asset_id` FROM `assets`); + "); + + // Add foreign key to asset_notes + mysqli_query($mysqli, " + ALTER TABLE `asset_notes` + ADD FOREIGN KEY (`asset_note_asset_id`) REFERENCES `assets`(`asset_id`) ON DELETE CASCADE + "); + + // Clean up orphaned contact_id rows in contact_assets + mysqli_query($mysqli, " + DELETE FROM `contact_assets` + WHERE `contact_id` NOT IN (SELECT `contact_id` FROM `contacts`); + "); + + // Clean up orphaned asset_id rows in contact_assets + mysqli_query($mysqli, " + DELETE FROM `contact_assets` + WHERE `asset_id` NOT IN (SELECT `asset_id` FROM `assets`); + "); + + // Add foreign keys to contact_assets + mysqli_query($mysqli, " + ALTER TABLE `contact_assets` + ADD FOREIGN KEY (`contact_id`) REFERENCES `contacts`(`contact_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`asset_id`) REFERENCES `assets`(`asset_id`) ON DELETE CASCADE + "); + + // Clean up orphaned service_id rows in service_assets + mysqli_query($mysqli, " + DELETE FROM `service_assets` + WHERE `service_id` NOT IN (SELECT `service_id` FROM `services`); + "); + + // Clean up orphaned asset_id rows in service_assets + mysqli_query($mysqli, " + DELETE FROM `service_assets` + WHERE `asset_id` NOT IN (SELECT `asset_id` FROM `assets`); + "); + + // Add foreign keys to service_assets + mysqli_query($mysqli, " + ALTER TABLE `service_assets` + ADD FOREIGN KEY (`service_id`) REFERENCES `services`(`service_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`asset_id`) REFERENCES `assets`(`asset_id`) ON DELETE CASCADE + "); + + // Clean up orphaned software_id rows in software_assets + mysqli_query($mysqli, " + DELETE FROM `software_assets` + WHERE `software_id` NOT IN (SELECT `software_id` FROM `software`); + "); + + // Clean up orphaned asset_id rows in software_assets + mysqli_query($mysqli, " + DELETE FROM `software_assets` + WHERE `asset_id` NOT IN (SELECT `asset_id` FROM `assets`); + "); + + // Add foreign keys to software_assets + mysqli_query($mysqli, " + ALTER TABLE `software_assets` + ADD FOREIGN KEY (`software_id`) REFERENCES `software`(`software_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`asset_id`) REFERENCES `assets`(`asset_id`) ON DELETE CASCADE + "); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.2'"); + } + + if (CURRENT_DATABASE_VERSION == '2.0.2') { + + // Clean up orphans + mysqli_query($mysqli, " + DELETE FROM `calendar_event_attendees` + WHERE `attendee_event_id` NOT IN (SELECT `event_id` FROM `calendar_events`); + "); + + mysqli_query($mysqli, " + DELETE FROM `calendar_events` + WHERE `event_calendar_id` NOT IN (SELECT `calendar_id` FROM `calendars`); + "); + + // Add foreign key to calendar_event_attendees + mysqli_query($mysqli, " + ALTER TABLE `calendar_event_attendees` + ADD FOREIGN KEY (`attendee_event_id`) REFERENCES `calendar_events`(`event_id`) ON DELETE CASCADE + "); + + // Add foreign key to calendar_events + mysqli_query($mysqli, " + ALTER TABLE `calendar_events` + ADD FOREIGN KEY (`event_calendar_id`) REFERENCES `calendars`(`calendar_id`) ON DELETE CASCADE + "); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.3'"); + } + + if (CURRENT_DATABASE_VERSION == '2.0.3') { + + // Clean up orphaned history + mysqli_query($mysqli, " + DELETE FROM `certificate_history` + WHERE `certificate_history_certificate_id` NOT IN (SELECT `certificate_id` FROM `certificates`); + "); + + // Add foreign key certificate history + mysqli_query($mysqli, " + ALTER TABLE `certificate_history` + ADD FOREIGN KEY (`certificate_history_certificate_id`) REFERENCES `certificates`(`certificate_id`) ON DELETE CASCADE + "); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.4'"); + } + + if (CURRENT_DATABASE_VERSION == '2.0.4') { + + // Clean up orphaned history + mysqli_query($mysqli, " + DELETE FROM `client_notes` + WHERE `client_note_client_id` NOT IN (SELECT `client_id` FROM `clients`); + "); + + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `client_notes` + ADD FOREIGN KEY (`client_note_client_id`) REFERENCES `clients`(`client_id`) ON DELETE CASCADE + "); + + // Clean up orphaned history + mysqli_query($mysqli, " + DELETE FROM `client_tags` + WHERE `client_id` NOT IN (SELECT `client_id` FROM `clients`); + "); + + // Clean up orphaned history + mysqli_query($mysqli, " + DELETE FROM `client_tags` + WHERE `tag_id` NOT IN (SELECT `tag_id` FROM `tags`); + "); + + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `client_tags` + ADD FOREIGN KEY (`client_id`) REFERENCES `clients`(`client_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`tag_id`) REFERENCES `tags`(`tag_id`) ON DELETE CASCADE + "); + + //Contact Assets + // Clean up orphaned history + mysqli_query($mysqli, " + DELETE FROM `contact_assets` + WHERE `contact_id` NOT IN (SELECT `contact_id` FROM `contacts`); + "); + + mysqli_query($mysqli, " + DELETE FROM `contact_assets` + WHERE `asset_id` NOT IN (SELECT `asset_id` FROM `assets`); + "); + + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `contact_assets` + ADD FOREIGN KEY (`contact_id`) REFERENCES `contacts`(`contact_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`asset_id`) REFERENCES `assets`(`asset_id`) ON DELETE CASCADE + "); + + // Contact Documents + // Clean up orphaned history + mysqli_query($mysqli, " + DELETE FROM `contact_documents` + WHERE `contact_id` NOT IN (SELECT `contact_id` FROM `contacts`); + "); + + mysqli_query($mysqli, " + DELETE FROM `contact_documents` + WHERE `document_id` NOT IN (SELECT `document_id` FROM `documents`); + "); + + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `contact_documents` + ADD FOREIGN KEY (`contact_id`) REFERENCES `contacts`(`contact_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`document_id`) REFERENCES `documents`(`document_id`) ON DELETE CASCADE + "); + + // contact_files + // Clean up orphaned rows + mysqli_query($mysqli, " + DELETE FROM `contact_files` + WHERE `contact_id` NOT IN (SELECT `contact_id` FROM `contacts`); + "); + + mysqli_query($mysqli, " + DELETE FROM `contact_files` + WHERE `file_id` NOT IN (SELECT `file_id` FROM `files`); + "); + + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `contact_files` + ADD FOREIGN KEY (`contact_id`) REFERENCES `contacts`(`contact_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`file_id`) REFERENCES `files`(`file_id`) ON DELETE CASCADE + "); + + // contact_notes + // Clean up orphaned rows + mysqli_query($mysqli, " + DELETE FROM `contact_notes` + WHERE `contact_note_contact_id` NOT IN (SELECT `contact_id` FROM `contacts`); + "); + + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `contact_notes` + ADD FOREIGN KEY (`contact_note_contact_id`) REFERENCES `contacts`(`contact_id`) ON DELETE CASCADE + "); + + // contact_tags + // Clean up orphaned rows + mysqli_query($mysqli, " + DELETE FROM `contact_tags` + WHERE `contact_id` NOT IN (SELECT `contact_id` FROM `contacts`); + "); + + mysqli_query($mysqli, " + DELETE FROM `contact_tags` + WHERE `tag_id` NOT IN (SELECT `tag_id` FROM `tags`); + "); + + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `contact_tags` + ADD FOREIGN KEY (`contact_id`) REFERENCES `contacts`(`contact_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`tag_id`) REFERENCES `tags`(`tag_id`) ON DELETE CASCADE + "); + + // document_files + // Clean up orphaned rows + mysqli_query($mysqli, " + DELETE FROM `document_files` + WHERE `document_id` NOT IN (SELECT `document_id` FROM `documents`); + "); + + mysqli_query($mysqli, " + DELETE FROM `document_files` + WHERE `file_id` NOT IN (SELECT `file_id` FROM `files`); + "); + + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `document_files` + ADD FOREIGN KEY (`document_id`) REFERENCES `documents`(`document_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`file_id`) REFERENCES `files`(`file_id`) ON DELETE CASCADE + "); + + // domain_history + // Clean up orphaned rows + mysqli_query($mysqli, " + DELETE FROM `domain_history` + WHERE `domain_history_domain_id` NOT IN (SELECT `domain_id` FROM `domains`); + "); + + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `domain_history` + ADD FOREIGN KEY (`domain_history_domain_id`) REFERENCES `domains`(`domain_id`) ON DELETE CASCADE + "); + + // location_tags + // Clean up orphaned rows + mysqli_query($mysqli, " + DELETE FROM `location_tags` + WHERE `location_id` NOT IN (SELECT `location_id` FROM `locations`); + "); + mysqli_query($mysqli, " + DELETE FROM `location_tags` + WHERE `tag_id` NOT IN (SELECT `tag_id` FROM `tags`); + "); + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `location_tags` + ADD FOREIGN KEY (`location_id`) REFERENCES `locations`(`location_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`tag_id`) REFERENCES `tags`(`tag_id`) ON DELETE CASCADE + "); + + // quote_files + // Clean up orphaned rows + mysqli_query($mysqli, " + DELETE FROM `quote_files` + WHERE `quote_id` NOT IN (SELECT `quote_id` FROM `quotes`); + "); + mysqli_query($mysqli, " + DELETE FROM `quote_files` + WHERE `file_id` NOT IN (SELECT `file_id` FROM `files`); + "); + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `quote_files` + ADD FOREIGN KEY (`quote_id`) REFERENCES `quotes`(`quote_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`file_id`) REFERENCES `files`(`file_id`) ON DELETE CASCADE + "); + + // service_certificates + // Clean up orphaned rows + mysqli_query($mysqli, " + DELETE FROM `service_certificates` + WHERE `service_id` NOT IN (SELECT `service_id` FROM `services`); + "); + mysqli_query($mysqli, " + DELETE FROM `service_certificates` + WHERE `certificate_id` NOT IN (SELECT `certificate_id` FROM `certificates`); + "); + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `service_certificates` + ADD FOREIGN KEY (`service_id`) REFERENCES `services`(`service_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`certificate_id`) REFERENCES `certificates`(`certificate_id`) ON DELETE CASCADE + "); + + // service_contacts + // Clean up orphaned rows + mysqli_query($mysqli, " + DELETE FROM `service_contacts` + WHERE `service_id` NOT IN (SELECT `service_id` FROM `services`); + "); + mysqli_query($mysqli, " + DELETE FROM `service_contacts` + WHERE `contact_id` NOT IN (SELECT `contact_id` FROM `contacts`); + "); + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `service_contacts` + ADD FOREIGN KEY (`service_id`) REFERENCES `services`(`service_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`contact_id`) REFERENCES `contacts`(`contact_id`) ON DELETE CASCADE + "); + + // service_documents + // Clean up orphaned rows + mysqli_query($mysqli, " + DELETE FROM `service_documents` + WHERE `service_id` NOT IN (SELECT `service_id` FROM `services`); + "); + mysqli_query($mysqli, " + DELETE FROM `service_documents` + WHERE `document_id` NOT IN (SELECT `document_id` FROM `documents`); + "); + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `service_documents` + ADD FOREIGN KEY (`service_id`) REFERENCES `services`(`service_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`document_id`) REFERENCES `documents`(`document_id`) ON DELETE CASCADE + "); + + // service_domains + // Clean up orphaned rows + mysqli_query($mysqli, " + DELETE FROM `service_domains` + WHERE `service_id` NOT IN (SELECT `service_id` FROM `services`); + "); + mysqli_query($mysqli, " + DELETE FROM `service_domains` + WHERE `domain_id` NOT IN (SELECT `domain_id` FROM `domains`); + "); + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `service_domains` + ADD FOREIGN KEY (`service_id`) REFERENCES `services`(`service_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`domain_id`) REFERENCES `domains`(`domain_id`) ON DELETE CASCADE + "); + + // service_vendors + // Clean up orphaned rows + mysqli_query($mysqli, " + DELETE FROM `service_vendors` + WHERE `service_id` NOT IN (SELECT `service_id` FROM `services`); + "); + mysqli_query($mysqli, " + DELETE FROM `service_vendors` + WHERE `vendor_id` NOT IN (SELECT `vendor_id` FROM `vendors`); + "); + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `service_vendors` + ADD FOREIGN KEY (`service_id`) REFERENCES `services`(`service_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`vendor_id`) REFERENCES `vendors`(`vendor_id`) ON DELETE CASCADE + "); + + // software_contacts + // Clean up orphaned rows + mysqli_query($mysqli, " + DELETE FROM `software_contacts` + WHERE `software_id` NOT IN (SELECT `software_id` FROM `software`); + "); + mysqli_query($mysqli, " + DELETE FROM `software_contacts` + WHERE `contact_id` NOT IN (SELECT `contact_id` FROM `contacts`); + "); + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `software_contacts` + ADD FOREIGN KEY (`software_id`) REFERENCES `software`(`software_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`contact_id`) REFERENCES `contacts`(`contact_id`) ON DELETE CASCADE + "); + + // software_documents + // Clean up orphaned rows + mysqli_query($mysqli, " + DELETE FROM `software_documents` + WHERE `software_id` NOT IN (SELECT `software_id` FROM `software`); + "); + mysqli_query($mysqli, " + DELETE FROM `software_documents` + WHERE `document_id` NOT IN (SELECT `document_id` FROM `documents`); + "); + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `software_documents` + ADD FOREIGN KEY (`software_id`) REFERENCES `software`(`software_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`document_id`) REFERENCES `documents`(`document_id`) ON DELETE CASCADE + "); + + // software_files + // Clean up orphaned rows + mysqli_query($mysqli, " + DELETE FROM `software_files` + WHERE `software_id` NOT IN (SELECT `software_id` FROM `software`); + "); + mysqli_query($mysqli, " + DELETE FROM `software_files` + WHERE `file_id` NOT IN (SELECT `file_id` FROM `files`); + "); + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `software_files` + ADD FOREIGN KEY (`software_id`) REFERENCES `software`(`software_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`file_id`) REFERENCES `files`(`file_id`) ON DELETE CASCADE + "); + + // vendor_documents + // Clean up orphaned rows + mysqli_query($mysqli, " + DELETE FROM `vendor_documents` + WHERE `vendor_id` NOT IN (SELECT `vendor_id` FROM `vendors`); + "); + mysqli_query($mysqli, " + DELETE FROM `vendor_documents` + WHERE `document_id` NOT IN (SELECT `document_id` FROM `documents`); + "); + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `vendor_documents` + ADD FOREIGN KEY (`vendor_id`) REFERENCES `vendors`(`vendor_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`document_id`) REFERENCES `documents`(`document_id`) ON DELETE CASCADE + "); + + // vendor_files + // Clean up orphaned rows + mysqli_query($mysqli, " + DELETE FROM `vendor_files` + WHERE `vendor_id` NOT IN (SELECT `vendor_id` FROM `vendors`); + "); + mysqli_query($mysqli, " + DELETE FROM `vendor_files` + WHERE `file_id` NOT IN (SELECT `file_id` FROM `files`); + "); + // Add foreign key + mysqli_query($mysqli, " + ALTER TABLE `vendor_files` + ADD FOREIGN KEY (`vendor_id`) REFERENCES `vendors`(`vendor_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`file_id`) REFERENCES `files`(`file_id`) ON DELETE CASCADE + "); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.5'"); + } + + if (CURRENT_DATABASE_VERSION == '2.0.5') { + + // CONVERT All tables TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci + + $tables = [ + 'accounts', 'api_keys', 'app_logs', 'asset_credentials', 'asset_custom', 'asset_documents', + 'asset_files', 'asset_history', 'asset_interface_links', 'asset_interfaces', 'asset_notes', 'assets', + 'auth_logs', 'budget', 'calendar_event_attendees', 'calendar_events', 'calendars', 'categories', + 'certificate_history', 'certificates', 'client_notes', 'client_stripe', 'client_tags', 'clients', + 'companies', 'contact_assets', 'contact_credentials', 'contact_documents', 'contact_files', 'contact_notes', + 'contact_tags', 'contacts', 'credential_tags', 'credentials', 'custom_fields', 'custom_links', + 'custom_values', 'document_files', 'documents', 'domain_history', 'domains', 'email_queue', 'expenses', + 'files', 'folders', 'history', 'invoice_items', 'invoices', 'location_tags', 'locations', 'logs', + 'modules', 'networks', 'notifications', 'payments', 'products', 'project_template_ticket_templates', + 'project_templates', 'projects', 'quote_files', 'quotes', 'rack_units', 'racks', 'records', + 'recurring_expenses', 'recurring_invoices', 'recurring_payments', 'recurring_ticket_assets', 'recurring_tickets', + 'remember_tokens', 'revenues', 'service_assets', 'service_certificates', 'service_contacts', 'service_credentials', + 'service_documents', 'service_domains', 'service_vendors', 'services', 'settings', 'shared_items', + 'software', 'software_assets', 'software_contacts', 'software_credentials', 'software_documents', 'software_files', + 'tags', 'task_templates', 'tasks', 'taxes', 'ticket_assets', 'ticket_attachments', 'ticket_history', 'ticket_replies', + 'ticket_statuses', 'ticket_templates', 'ticket_views', 'ticket_watchers', 'tickets', 'transfers', 'trips', + 'user_client_permissions', 'user_role_permissions', 'user_roles', 'user_settings', 'users', 'vendor_credentials', + 'vendor_documents', 'vendor_files', 'vendors' + ]; + + foreach ($tables as $table) { + $sql = "ALTER TABLE `$table` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;"; + mysqli_query($mysqli, $sql); + } + + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.6'"); + } + + if (CURRENT_DATABASE_VERSION == '2.0.6') { + // Fix service_domains to yse InnoDB instead of MyISAM + mysqli_query($mysqli, "ALTER TABLE service_domains ENGINE = InnoDB;"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.7'"); + } + + if (CURRENT_DATABASE_VERSION == '2.0.7') { + + mysqli_query($mysqli, "ALTER TABLE `files` DROP `file_hash`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.8'"); + } + + // if (CURRENT_DATABASE_VERSION == '2.0.8') { + // // Insert queries here required to update to DB version 2.0.9 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.8.8'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.9'"); // } } else { diff --git a/db.sql b/db.sql index a757b2a2..48186dbf 100644 --- a/db.sql +++ b/db.sql @@ -1,8 +1,9 @@ --- MariaDB dump 10.19 Distrib 10.11.6-MariaDB, for debian-linux-gnu (x86_64) +/*M!999999\- enable the sandbox mode */ +-- MariaDB dump 10.19 Distrib 10.11.11-MariaDB, for debian-linux-gnu (x86_64) -- -- Host: localhost Database: itflow_dev -- ------------------------------------------------------ --- Server version 10.11.6-MariaDB-0+deb12u1 +-- Server version 10.11.11-MariaDB-0+deb12u1 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -21,7 +22,7 @@ DROP TABLE IF EXISTS `accounts`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `accounts` ( `account_id` int(11) NOT NULL AUTO_INCREMENT, `account_name` varchar(200) NOT NULL, @@ -43,7 +44,7 @@ CREATE TABLE `accounts` ( DROP TABLE IF EXISTS `api_keys`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `api_keys` ( `api_key_id` int(11) NOT NULL AUTO_INCREMENT, `api_key_name` varchar(255) NOT NULL, @@ -53,7 +54,7 @@ CREATE TABLE `api_keys` ( `api_key_expire` date NOT NULL, `api_key_client_id` int(11) NOT NULL DEFAULT 0, PRIMARY KEY (`api_key_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -62,7 +63,7 @@ CREATE TABLE `api_keys` ( DROP TABLE IF EXISTS `app_logs`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `app_logs` ( `app_log_id` int(11) NOT NULL AUTO_INCREMENT, `app_log_category` varchar(200) DEFAULT NULL, @@ -73,20 +74,39 @@ CREATE TABLE `app_logs` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `asset_credentials` +-- + +DROP TABLE IF EXISTS `asset_credentials`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `asset_credentials` ( + `credential_id` int(11) NOT NULL, + `asset_id` int(11) NOT NULL, + PRIMARY KEY (`credential_id`,`asset_id`), + KEY `asset_id` (`asset_id`), + CONSTRAINT `asset_credentials_ibfk_1` FOREIGN KEY (`credential_id`) REFERENCES `credentials` (`credential_id`) ON DELETE CASCADE, + CONSTRAINT `asset_credentials_ibfk_2` FOREIGN KEY (`asset_id`) REFERENCES `assets` (`asset_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `asset_custom` -- DROP TABLE IF EXISTS `asset_custom`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `asset_custom` ( `asset_custom_id` int(11) NOT NULL AUTO_INCREMENT, `asset_custom_field_value` int(11) NOT NULL, `asset_custom_field_id` int(11) NOT NULL, `asset_custom_asset_id` int(11) NOT NULL, - PRIMARY KEY (`asset_custom_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + PRIMARY KEY (`asset_custom_id`), + KEY `asset_custom_asset_id` (`asset_custom_asset_id`), + CONSTRAINT `asset_custom_ibfk_1` FOREIGN KEY (`asset_custom_asset_id`) REFERENCES `assets` (`asset_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -95,12 +115,15 @@ CREATE TABLE `asset_custom` ( DROP TABLE IF EXISTS `asset_documents`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `asset_documents` ( `asset_id` int(11) NOT NULL, `document_id` int(11) NOT NULL, - PRIMARY KEY (`asset_id`,`document_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + PRIMARY KEY (`asset_id`,`document_id`), + KEY `document_id` (`document_id`), + CONSTRAINT `asset_documents_ibfk_1` FOREIGN KEY (`asset_id`) REFERENCES `assets` (`asset_id`) ON DELETE CASCADE, + CONSTRAINT `asset_documents_ibfk_2` FOREIGN KEY (`document_id`) REFERENCES `documents` (`document_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -109,12 +132,15 @@ CREATE TABLE `asset_documents` ( DROP TABLE IF EXISTS `asset_files`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `asset_files` ( `asset_id` int(11) NOT NULL, `file_id` int(11) NOT NULL, - PRIMARY KEY (`asset_id`,`file_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + PRIMARY KEY (`asset_id`,`file_id`), + KEY `file_id` (`file_id`), + CONSTRAINT `asset_files_ibfk_1` FOREIGN KEY (`asset_id`) REFERENCES `assets` (`asset_id`) ON DELETE CASCADE, + CONSTRAINT `asset_files_ibfk_2` FOREIGN KEY (`file_id`) REFERENCES `files` (`file_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -123,14 +149,16 @@ CREATE TABLE `asset_files` ( DROP TABLE IF EXISTS `asset_history`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `asset_history` ( `asset_history_id` int(11) NOT NULL AUTO_INCREMENT, `asset_history_status` varchar(200) NOT NULL, `asset_history_description` varchar(255) NOT NULL, `asset_history_created_at` datetime NOT NULL DEFAULT current_timestamp(), `asset_history_asset_id` int(11) NOT NULL, - PRIMARY KEY (`asset_history_id`) + PRIMARY KEY (`asset_history_id`), + KEY `asset_history_asset_id` (`asset_history_asset_id`), + CONSTRAINT `asset_history_ibfk_1` FOREIGN KEY (`asset_history_asset_id`) REFERENCES `assets` (`asset_id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -140,7 +168,7 @@ CREATE TABLE `asset_history` ( DROP TABLE IF EXISTS `asset_interface_links`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `asset_interface_links` ( `interface_link_id` int(11) NOT NULL AUTO_INCREMENT, `interface_a_id` int(11) NOT NULL, @@ -163,7 +191,7 @@ CREATE TABLE `asset_interface_links` ( DROP TABLE IF EXISTS `asset_interfaces`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `asset_interfaces` ( `interface_id` int(11) NOT NULL AUTO_INCREMENT, `interface_name` varchar(200) NOT NULL, @@ -180,7 +208,9 @@ CREATE TABLE `asset_interfaces` ( `interface_archived_at` datetime DEFAULT NULL, `interface_network_id` int(11) DEFAULT NULL, `interface_asset_id` int(11) NOT NULL, - PRIMARY KEY (`interface_id`) + PRIMARY KEY (`interface_id`), + KEY `interface_asset_id` (`interface_asset_id`), + CONSTRAINT `asset_interfaces_ibfk_1` FOREIGN KEY (`interface_asset_id`) REFERENCES `assets` (`asset_id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -190,7 +220,7 @@ CREATE TABLE `asset_interfaces` ( DROP TABLE IF EXISTS `asset_notes`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `asset_notes` ( `asset_note_id` int(11) NOT NULL AUTO_INCREMENT, `asset_note_type` varchar(200) NOT NULL, @@ -200,7 +230,9 @@ CREATE TABLE `asset_notes` ( `asset_note_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `asset_note_archived_at` datetime DEFAULT NULL, `asset_note_asset_id` int(11) NOT NULL, - PRIMARY KEY (`asset_note_id`) + PRIMARY KEY (`asset_note_id`), + KEY `asset_note_asset_id` (`asset_note_asset_id`), + CONSTRAINT `asset_notes_ibfk_1` FOREIGN KEY (`asset_note_asset_id`) REFERENCES `assets` (`asset_id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -210,7 +242,7 @@ CREATE TABLE `asset_notes` ( DROP TABLE IF EXISTS `assets`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `assets` ( `asset_id` int(11) NOT NULL AUTO_INCREMENT, `asset_type` varchar(200) NOT NULL, @@ -249,7 +281,7 @@ CREATE TABLE `assets` ( DROP TABLE IF EXISTS `auth_logs`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `auth_logs` ( `auth_log_id` int(11) NOT NULL AUTO_INCREMENT, `auth_log_status` tinyint(1) NOT NULL, @@ -268,7 +300,7 @@ CREATE TABLE `auth_logs` ( DROP TABLE IF EXISTS `budget`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `budget` ( `budget_id` int(11) NOT NULL AUTO_INCREMENT, `budget_month` tinyint(4) NOT NULL, @@ -279,7 +311,57 @@ CREATE TABLE `budget` ( `budget_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `budget_category_id` int(11) NOT NULL, PRIMARY KEY (`budget_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `calendar_event_attendees` +-- + +DROP TABLE IF EXISTS `calendar_event_attendees`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `calendar_event_attendees` ( + `attendee_id` int(11) NOT NULL AUTO_INCREMENT, + `attendee_name` varchar(200) DEFAULT NULL, + `attendee_email` varchar(200) DEFAULT NULL, + `attendee_invitation_status` tinyint(1) NOT NULL DEFAULT 0, + `attendee_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `attendee_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `attendee_archived_at` datetime DEFAULT NULL, + `attendee_contact_id` int(11) NOT NULL DEFAULT 0, + `attendee_event_id` int(11) NOT NULL, + PRIMARY KEY (`attendee_id`), + KEY `attendee_event_id` (`attendee_event_id`), + CONSTRAINT `calendar_event_attendees_ibfk_1` FOREIGN KEY (`attendee_event_id`) REFERENCES `calendar_events` (`event_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `calendar_events` +-- + +DROP TABLE IF EXISTS `calendar_events`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `calendar_events` ( + `event_id` int(11) NOT NULL AUTO_INCREMENT, + `event_title` varchar(200) NOT NULL, + `event_location` text DEFAULT NULL, + `event_description` longtext DEFAULT NULL, + `event_start` datetime NOT NULL, + `event_end` datetime DEFAULT NULL, + `event_repeat` varchar(200) DEFAULT NULL, + `event_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `event_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `event_archived_at` datetime DEFAULT NULL, + `event_client_id` int(11) NOT NULL DEFAULT 0, + `event_location_id` int(11) NOT NULL DEFAULT 0, + `event_calendar_id` int(11) NOT NULL DEFAULT 0, + PRIMARY KEY (`event_id`), + KEY `event_calendar_id` (`event_calendar_id`), + CONSTRAINT `calendar_events_ibfk_1` FOREIGN KEY (`event_calendar_id`) REFERENCES `calendars` (`calendar_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -288,7 +370,7 @@ CREATE TABLE `budget` ( DROP TABLE IF EXISTS `calendars`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `calendars` ( `calendar_id` int(11) NOT NULL AUTO_INCREMENT, `calendar_name` varchar(200) NOT NULL, @@ -306,7 +388,7 @@ CREATE TABLE `calendars` ( DROP TABLE IF EXISTS `categories`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `categories` ( `category_id` int(11) NOT NULL AUTO_INCREMENT, `category_name` varchar(200) NOT NULL, @@ -327,16 +409,18 @@ CREATE TABLE `categories` ( DROP TABLE IF EXISTS `certificate_history`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `certificate_history` ( - `certificate_history_id` int(11) NOT NULL AUTO_INCREMENT, - `certificate_history_column` varchar(200) NOT NULL, - `certificate_history_old_value` text NOT NULL, - `certificate_history_new_value` text NOT NULL, - `certificate_history_certificate_id` int(11) NOT NULL, - `certificate_history_modified_at` datetime NOT NULL DEFAULT current_timestamp(), - PRIMARY KEY (`certificate_history_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + `certificate_history_id` int(11) NOT NULL AUTO_INCREMENT, + `certificate_history_column` varchar(200) NOT NULL, + `certificate_history_old_value` text NOT NULL, + `certificate_history_new_value` text NOT NULL, + `certificate_history_certificate_id` int(11) NOT NULL, + `certificate_history_modified_at` datetime NOT NULL DEFAULT current_timestamp(), + PRIMARY KEY (`certificate_history_id`), + KEY `certificate_history_certificate_id` (`certificate_history_certificate_id`), + CONSTRAINT `certificate_history_ibfk_1` FOREIGN KEY (`certificate_history_certificate_id`) REFERENCES `certificates` (`certificate_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -345,16 +429,16 @@ CREATE TABLE `certificate_history` ( DROP TABLE IF EXISTS `certificates`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `certificates` ( `certificate_id` int(11) NOT NULL AUTO_INCREMENT, `certificate_name` varchar(200) NOT NULL, - `certificate_description` text DEFAULT NULL, + `certificate_description` mediumtext DEFAULT NULL, `certificate_domain` varchar(200) DEFAULT NULL, `certificate_issued_by` varchar(200) NOT NULL, `certificate_expire` date DEFAULT NULL, - `certificate_public_key` text DEFAULT NULL, - `certificate_notes` text DEFAULT NULL, + `certificate_public_key` mediumtext DEFAULT NULL, + `certificate_notes` mediumtext DEFAULT NULL, `certificate_created_at` datetime NOT NULL DEFAULT current_timestamp(), `certificate_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `certificate_archived_at` datetime DEFAULT NULL, @@ -362,7 +446,7 @@ CREATE TABLE `certificates` ( `certificate_domain_id` int(11) NOT NULL DEFAULT 0, `certificate_client_id` int(11) NOT NULL DEFAULT 0, PRIMARY KEY (`certificate_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -371,7 +455,7 @@ CREATE TABLE `certificates` ( DROP TABLE IF EXISTS `client_notes`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `client_notes` ( `client_note_id` int(11) NOT NULL AUTO_INCREMENT, `client_note_type` varchar(200) NOT NULL, @@ -381,7 +465,9 @@ CREATE TABLE `client_notes` ( `client_note_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `client_note_archived_at` datetime DEFAULT NULL, `client_note_client_id` int(11) NOT NULL, - PRIMARY KEY (`client_note_id`) + PRIMARY KEY (`client_note_id`), + KEY `client_note_client_id` (`client_note_client_id`), + CONSTRAINT `client_notes_ibfk_1` FOREIGN KEY (`client_note_client_id`) REFERENCES `clients` (`client_id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -391,13 +477,13 @@ CREATE TABLE `client_notes` ( DROP TABLE IF EXISTS `client_stripe`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `client_stripe` ( `client_id` int(11) NOT NULL, `stripe_id` varchar(255) NOT NULL, `stripe_pm` varchar(255) DEFAULT NULL, PRIMARY KEY (`client_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -406,12 +492,15 @@ CREATE TABLE `client_stripe` ( DROP TABLE IF EXISTS `client_tags`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `client_tags` ( `client_id` int(11) NOT NULL, `tag_id` int(11) NOT NULL, - PRIMARY KEY (`client_id`,`tag_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + PRIMARY KEY (`client_id`,`tag_id`), + KEY `tag_id` (`tag_id`), + CONSTRAINT `client_tags_ibfk_1` FOREIGN KEY (`client_id`) REFERENCES `clients` (`client_id`) ON DELETE CASCADE, + CONSTRAINT `client_tags_ibfk_2` FOREIGN KEY (`tag_id`) REFERENCES `tags` (`tag_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -420,7 +509,7 @@ CREATE TABLE `client_tags` ( DROP TABLE IF EXISTS `clients`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `clients` ( `client_id` int(11) NOT NULL AUTO_INCREMENT, `client_lead` tinyint(1) NOT NULL DEFAULT 0, @@ -448,7 +537,7 @@ CREATE TABLE `clients` ( DROP TABLE IF EXISTS `companies`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `companies` ( `company_id` int(11) NOT NULL AUTO_INCREMENT, `company_name` varchar(200) NOT NULL, @@ -475,12 +564,34 @@ CREATE TABLE `companies` ( DROP TABLE IF EXISTS `contact_assets`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `contact_assets` ( `contact_id` int(11) NOT NULL, `asset_id` int(11) NOT NULL, - PRIMARY KEY (`contact_id`,`asset_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + PRIMARY KEY (`contact_id`,`asset_id`), + KEY `asset_id` (`asset_id`), + CONSTRAINT `contact_assets_ibfk_1` FOREIGN KEY (`contact_id`) REFERENCES `contacts` (`contact_id`) ON DELETE CASCADE, + CONSTRAINT `contact_assets_ibfk_2` FOREIGN KEY (`asset_id`) REFERENCES `assets` (`asset_id`) ON DELETE CASCADE, + CONSTRAINT `contact_assets_ibfk_3` FOREIGN KEY (`contact_id`) REFERENCES `contacts` (`contact_id`) ON DELETE CASCADE, + CONSTRAINT `contact_assets_ibfk_4` FOREIGN KEY (`asset_id`) REFERENCES `assets` (`asset_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `contact_credentials` +-- + +DROP TABLE IF EXISTS `contact_credentials`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `contact_credentials` ( + `contact_id` int(11) NOT NULL, + `credential_id` int(11) NOT NULL, + PRIMARY KEY (`contact_id`,`credential_id`), + KEY `credential_id` (`credential_id`), + CONSTRAINT `contact_credentials_ibfk_1` FOREIGN KEY (`contact_id`) REFERENCES `contacts` (`contact_id`) ON DELETE CASCADE, + CONSTRAINT `contact_credentials_ibfk_2` FOREIGN KEY (`credential_id`) REFERENCES `credentials` (`credential_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -489,12 +600,15 @@ CREATE TABLE `contact_assets` ( DROP TABLE IF EXISTS `contact_documents`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `contact_documents` ( `contact_id` int(11) NOT NULL, `document_id` int(11) NOT NULL, - PRIMARY KEY (`contact_id`,`document_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + PRIMARY KEY (`contact_id`,`document_id`), + KEY `document_id` (`document_id`), + CONSTRAINT `contact_documents_ibfk_1` FOREIGN KEY (`contact_id`) REFERENCES `contacts` (`contact_id`) ON DELETE CASCADE, + CONSTRAINT `contact_documents_ibfk_2` FOREIGN KEY (`document_id`) REFERENCES `documents` (`document_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -503,26 +617,15 @@ CREATE TABLE `contact_documents` ( DROP TABLE IF EXISTS `contact_files`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `contact_files` ( `contact_id` int(11) NOT NULL, `file_id` int(11) NOT NULL, - PRIMARY KEY (`contact_id`,`file_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Table structure for table `contact_logins` --- - -DROP TABLE IF EXISTS `contact_logins`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `contact_logins` ( - `contact_id` int(11) NOT NULL, - `login_id` int(11) NOT NULL, - PRIMARY KEY (`contact_id`,`login_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + PRIMARY KEY (`contact_id`,`file_id`), + KEY `file_id` (`file_id`), + CONSTRAINT `contact_files_ibfk_1` FOREIGN KEY (`contact_id`) REFERENCES `contacts` (`contact_id`) ON DELETE CASCADE, + CONSTRAINT `contact_files_ibfk_2` FOREIGN KEY (`file_id`) REFERENCES `files` (`file_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -531,7 +634,7 @@ CREATE TABLE `contact_logins` ( DROP TABLE IF EXISTS `contact_notes`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `contact_notes` ( `contact_note_id` int(11) NOT NULL AUTO_INCREMENT, `contact_note_type` varchar(200) NOT NULL, @@ -541,7 +644,9 @@ CREATE TABLE `contact_notes` ( `contact_note_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `contact_note_archived_at` datetime DEFAULT NULL, `contact_note_contact_id` int(11) NOT NULL, - PRIMARY KEY (`contact_note_id`) + PRIMARY KEY (`contact_note_id`), + KEY `contact_note_contact_id` (`contact_note_contact_id`), + CONSTRAINT `contact_notes_ibfk_1` FOREIGN KEY (`contact_note_contact_id`) REFERENCES `contacts` (`contact_id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -551,11 +656,14 @@ CREATE TABLE `contact_notes` ( DROP TABLE IF EXISTS `contact_tags`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `contact_tags` ( `contact_id` int(11) NOT NULL, `tag_id` int(11) NOT NULL, - PRIMARY KEY (`contact_id`,`tag_id`) + PRIMARY KEY (`contact_id`,`tag_id`), + KEY `tag_id` (`tag_id`), + CONSTRAINT `contact_tags_ibfk_1` FOREIGN KEY (`contact_id`) REFERENCES `contacts` (`contact_id`) ON DELETE CASCADE, + CONSTRAINT `contact_tags_ibfk_2` FOREIGN KEY (`tag_id`) REFERENCES `tags` (`tag_id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -565,7 +673,7 @@ CREATE TABLE `contact_tags` ( DROP TABLE IF EXISTS `contacts`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `contacts` ( `contact_id` int(11) NOT NULL AUTO_INCREMENT, `contact_name` varchar(200) NOT NULL, @@ -594,13 +702,62 @@ CREATE TABLE `contacts` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `credential_tags` +-- + +DROP TABLE IF EXISTS `credential_tags`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `credential_tags` ( + `credential_id` int(11) NOT NULL, + `tag_id` int(11) NOT NULL, + PRIMARY KEY (`credential_id`,`tag_id`), + KEY `tag_id` (`tag_id`), + CONSTRAINT `credential_tags_ibfk_1` FOREIGN KEY (`tag_id`) REFERENCES `tags` (`tag_id`) ON DELETE CASCADE, + CONSTRAINT `credential_tags_ibfk_2` FOREIGN KEY (`credential_id`) REFERENCES `credentials` (`credential_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `credentials` +-- + +DROP TABLE IF EXISTS `credentials`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `credentials` ( + `credential_id` int(11) NOT NULL AUTO_INCREMENT, + `credential_name` varchar(200) NOT NULL, + `credential_description` varchar(500) DEFAULT NULL, + `credential_category` varchar(200) DEFAULT NULL, + `credential_uri` varchar(500) DEFAULT NULL, + `credential_uri_2` varchar(500) DEFAULT NULL, + `credential_username` varchar(500) DEFAULT NULL, + `credential_password` varbinary(200) DEFAULT NULL, + `credential_otp_secret` varchar(200) DEFAULT NULL, + `credential_note` text DEFAULT NULL, + `credential_important` tinyint(1) NOT NULL DEFAULT 0, + `credential_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `credential_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `credential_archived_at` datetime DEFAULT NULL, + `credential_accessed_at` datetime DEFAULT NULL, + `credential_password_changed_at` datetime DEFAULT current_timestamp(), + `credential_folder_id` int(11) NOT NULL DEFAULT 0, + `credential_contact_id` int(11) NOT NULL DEFAULT 0, + `credential_asset_id` int(11) NOT NULL DEFAULT 0, + `credential_client_id` int(11) NOT NULL DEFAULT 0, + PRIMARY KEY (`credential_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `custom_fields` -- DROP TABLE IF EXISTS `custom_fields`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `custom_fields` ( `custom_field_id` int(11) NOT NULL AUTO_INCREMENT, `custom_field_table` varchar(255) NOT NULL, @@ -609,7 +766,7 @@ CREATE TABLE `custom_fields` ( `custom_field_location` int(11) NOT NULL DEFAULT 0, `custom_field_order` int(11) NOT NULL DEFAULT 999, PRIMARY KEY (`custom_field_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -618,7 +775,7 @@ CREATE TABLE `custom_fields` ( DROP TABLE IF EXISTS `custom_links`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `custom_links` ( `custom_link_id` int(11) NOT NULL AUTO_INCREMENT, `custom_link_name` varchar(200) NOT NULL, @@ -641,13 +798,13 @@ CREATE TABLE `custom_links` ( DROP TABLE IF EXISTS `custom_values`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `custom_values` ( `custom_value_id` int(11) NOT NULL AUTO_INCREMENT, - `custom_value_value` text NOT NULL, + `custom_value_value` mediumtext NOT NULL, `custom_value_field` int(11) NOT NULL, PRIMARY KEY (`custom_value_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -656,12 +813,15 @@ CREATE TABLE `custom_values` ( DROP TABLE IF EXISTS `document_files`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `document_files` ( `document_id` int(11) NOT NULL, `file_id` int(11) NOT NULL, - PRIMARY KEY (`document_id`,`file_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + PRIMARY KEY (`document_id`,`file_id`), + KEY `file_id` (`file_id`), + CONSTRAINT `document_files_ibfk_1` FOREIGN KEY (`document_id`) REFERENCES `documents` (`document_id`) ON DELETE CASCADE, + CONSTRAINT `document_files_ibfk_2` FOREIGN KEY (`file_id`) REFERENCES `files` (`file_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -670,7 +830,7 @@ CREATE TABLE `document_files` ( DROP TABLE IF EXISTS `documents`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `documents` ( `document_id` int(11) NOT NULL AUTO_INCREMENT, `document_name` varchar(200) NOT NULL, @@ -700,7 +860,7 @@ CREATE TABLE `documents` ( DROP TABLE IF EXISTS `domain_history`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `domain_history` ( `domain_history_id` int(11) NOT NULL AUTO_INCREMENT, `domain_history_column` varchar(200) NOT NULL, @@ -708,8 +868,10 @@ CREATE TABLE `domain_history` ( `domain_history_new_value` text NOT NULL, `domain_history_domain_id` int(11) NOT NULL, `domain_history_modified_at` datetime NOT NULL DEFAULT current_timestamp(), - PRIMARY KEY (`domain_history_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + PRIMARY KEY (`domain_history_id`), + KEY `domain_history_domain_id` (`domain_history_domain_id`), + CONSTRAINT `domain_history_ibfk_1` FOREIGN KEY (`domain_history_domain_id`) REFERENCES `domains` (`domain_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -718,7 +880,7 @@ CREATE TABLE `domain_history` ( DROP TABLE IF EXISTS `domains`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `domains` ( `domain_id` int(11) NOT NULL AUTO_INCREMENT, `domain_name` varchar(200) NOT NULL, @@ -749,7 +911,7 @@ CREATE TABLE `domains` ( DROP TABLE IF EXISTS `email_queue`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `email_queue` ( `email_id` int(11) NOT NULL AUTO_INCREMENT, `email_status` tinyint(1) NOT NULL DEFAULT 0, @@ -765,52 +927,6 @@ CREATE TABLE `email_queue` ( `email_attempts` tinyint(1) NOT NULL DEFAULT 0, `email_sent_at` datetime DEFAULT NULL, PRIMARY KEY (`email_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Table structure for table `event_attendees` --- - -DROP TABLE IF EXISTS `event_attendees`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `event_attendees` ( - `attendee_id` int(11) NOT NULL AUTO_INCREMENT, - `attendee_name` varchar(200) DEFAULT NULL, - `attendee_email` varchar(200) DEFAULT NULL, - `attendee_invitation_status` tinyint(1) NOT NULL DEFAULT 0, - `attendee_created_at` datetime NOT NULL DEFAULT current_timestamp(), - `attendee_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), - `attendee_archived_at` datetime DEFAULT NULL, - `attendee_contact_id` int(11) NOT NULL DEFAULT 0, - `attendee_event_id` int(11) NOT NULL, - PRIMARY KEY (`attendee_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Table structure for table `events` --- - -DROP TABLE IF EXISTS `events`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `events` ( - `event_id` int(11) NOT NULL AUTO_INCREMENT, - `event_title` varchar(200) NOT NULL, - `event_location` text DEFAULT NULL, - `event_description` longtext DEFAULT NULL, - `event_start` datetime NOT NULL, - `event_end` datetime DEFAULT NULL, - `event_repeat` varchar(200) DEFAULT NULL, - `event_created_at` datetime NOT NULL DEFAULT current_timestamp(), - `event_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), - `event_archived_at` datetime DEFAULT NULL, - `event_client_id` int(11) NOT NULL DEFAULT 0, - `event_location_id` int(11) NOT NULL DEFAULT 0, - `event_calendar_id` int(11) NOT NULL DEFAULT 0, - PRIMARY KEY (`event_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -820,7 +936,7 @@ CREATE TABLE `events` ( DROP TABLE IF EXISTS `expenses`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `expenses` ( `expense_id` int(11) NOT NULL AUTO_INCREMENT, `expense_description` text DEFAULT NULL, @@ -847,7 +963,7 @@ CREATE TABLE `expenses` ( DROP TABLE IF EXISTS `files`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `files` ( `file_id` int(11) NOT NULL AUTO_INCREMENT, `file_reference_name` varchar(200) DEFAULT NULL, @@ -855,7 +971,6 @@ CREATE TABLE `files` ( `file_description` varchar(250) DEFAULT NULL, `file_ext` varchar(10) DEFAULT NULL, `file_size` bigint(20) unsigned NOT NULL DEFAULT 0, - `file_hash` varchar(200) DEFAULT NULL, `file_mime_type` varchar(100) DEFAULT NULL, `file_has_thumbnail` tinyint(1) NOT NULL DEFAULT 0, `file_has_preview` tinyint(1) NOT NULL DEFAULT 0, @@ -878,7 +993,7 @@ CREATE TABLE `files` ( DROP TABLE IF EXISTS `folders`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `folders` ( `folder_id` int(11) NOT NULL AUTO_INCREMENT, `folder_name` varchar(200) NOT NULL, @@ -886,7 +1001,7 @@ CREATE TABLE `folders` ( `folder_location` int(11) DEFAULT 0, `folder_client_id` int(11) NOT NULL DEFAULT 0, PRIMARY KEY (`folder_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -895,14 +1010,14 @@ CREATE TABLE `folders` ( DROP TABLE IF EXISTS `history`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `history` ( `history_id` int(11) NOT NULL AUTO_INCREMENT, `history_status` varchar(200) NOT NULL, `history_description` varchar(200) NOT NULL, `history_created_at` datetime NOT NULL DEFAULT current_timestamp(), `history_invoice_id` int(11) NOT NULL DEFAULT 0, - `history_recurring_id` int(11) NOT NULL DEFAULT 0, + `history_recurring_invoice_id` int(11) NOT NULL DEFAULT 0, `history_quote_id` int(11) NOT NULL DEFAULT 0, PRIMARY KEY (`history_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; @@ -914,7 +1029,7 @@ CREATE TABLE `history` ( DROP TABLE IF EXISTS `invoice_items`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `invoice_items` ( `item_id` int(11) NOT NULL AUTO_INCREMENT, `item_name` varchar(200) NOT NULL, @@ -929,8 +1044,9 @@ CREATE TABLE `invoice_items` ( `item_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `item_archived_at` datetime DEFAULT NULL, `item_tax_id` int(11) NOT NULL DEFAULT 0, + `item_product_id` int(11) NOT NULL DEFAULT 0, `item_quote_id` int(11) NOT NULL DEFAULT 0, - `item_recurring_id` int(11) NOT NULL DEFAULT 0, + `item_recurring_invoice_id` int(11) NOT NULL DEFAULT 0, `item_invoice_id` int(11) NOT NULL DEFAULT 0, PRIMARY KEY (`item_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; @@ -942,7 +1058,7 @@ CREATE TABLE `invoice_items` ( DROP TABLE IF EXISTS `invoices`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `invoices` ( `invoice_id` int(11) NOT NULL AUTO_INCREMENT, `invoice_prefix` varchar(200) DEFAULT NULL, @@ -960,6 +1076,7 @@ CREATE TABLE `invoices` ( `invoice_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `invoice_archived_at` datetime DEFAULT NULL, `invoice_category_id` int(11) NOT NULL, + `invoice_recurring_invoice_id` int(11) NOT NULL DEFAULT 0, `invoice_client_id` int(11) NOT NULL, PRIMARY KEY (`invoice_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; @@ -971,11 +1088,14 @@ CREATE TABLE `invoices` ( DROP TABLE IF EXISTS `location_tags`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `location_tags` ( `location_id` int(11) NOT NULL, `tag_id` int(11) NOT NULL, - PRIMARY KEY (`location_id`,`tag_id`) + PRIMARY KEY (`location_id`,`tag_id`), + KEY `tag_id` (`tag_id`), + CONSTRAINT `location_tags_ibfk_1` FOREIGN KEY (`location_id`) REFERENCES `locations` (`location_id`) ON DELETE CASCADE, + CONSTRAINT `location_tags_ibfk_2` FOREIGN KEY (`tag_id`) REFERENCES `tags` (`tag_id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -985,7 +1105,7 @@ CREATE TABLE `location_tags` ( DROP TABLE IF EXISTS `locations`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `locations` ( `location_id` int(11) NOT NULL AUTO_INCREMENT, `location_name` varchar(200) NOT NULL, @@ -1011,59 +1131,13 @@ CREATE TABLE `locations` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; --- --- Table structure for table `login_tags` --- - -DROP TABLE IF EXISTS `login_tags`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `login_tags` ( - `login_id` int(11) NOT NULL, - `tag_id` int(11) NOT NULL, - PRIMARY KEY (`login_id`,`tag_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Table structure for table `logins` --- - -DROP TABLE IF EXISTS `logins`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `logins` ( - `login_id` int(11) NOT NULL AUTO_INCREMENT, - `login_name` varchar(200) NOT NULL, - `login_description` varchar(500) DEFAULT NULL, - `login_category` varchar(200) DEFAULT NULL, - `login_uri` varchar(500) DEFAULT NULL, - `login_uri_2` varchar(500) DEFAULT NULL, - `login_username` varchar(500) DEFAULT NULL, - `login_password` varbinary(200) DEFAULT NULL, - `login_otp_secret` varchar(200) DEFAULT NULL, - `login_note` text DEFAULT NULL, - `login_important` tinyint(1) NOT NULL DEFAULT 0, - `login_created_at` datetime NOT NULL DEFAULT current_timestamp(), - `login_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), - `login_archived_at` datetime DEFAULT NULL, - `login_accessed_at` datetime DEFAULT NULL, - `login_password_changed_at` datetime DEFAULT current_timestamp(), - `login_folder_id` int(11) NOT NULL DEFAULT 0, - `login_contact_id` int(11) NOT NULL DEFAULT 0, - `login_asset_id` int(11) NOT NULL DEFAULT 0, - `login_client_id` int(11) NOT NULL DEFAULT 0, - PRIMARY KEY (`login_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - -- -- Table structure for table `logs` -- DROP TABLE IF EXISTS `logs`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `logs` ( `log_id` int(11) NOT NULL AUTO_INCREMENT, `log_type` varchar(200) NOT NULL, @@ -1085,7 +1159,7 @@ CREATE TABLE `logs` ( DROP TABLE IF EXISTS `modules`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `modules` ( `module_id` int(11) NOT NULL AUTO_INCREMENT, `module_name` varchar(200) NOT NULL, @@ -1100,7 +1174,7 @@ CREATE TABLE `modules` ( DROP TABLE IF EXISTS `networks`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `networks` ( `network_id` int(11) NOT NULL AUTO_INCREMENT, `network_name` varchar(200) NOT NULL, @@ -1129,7 +1203,7 @@ CREATE TABLE `networks` ( DROP TABLE IF EXISTS `notifications`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `notifications` ( `notification_id` int(11) NOT NULL AUTO_INCREMENT, `notification_type` varchar(200) NOT NULL, @@ -1145,62 +1219,13 @@ CREATE TABLE `notifications` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; --- --- Table structure for table `patch_panel_ports` --- - -DROP TABLE IF EXISTS `patch_panel_ports`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `patch_panel_ports` ( - `port_id` int(11) NOT NULL AUTO_INCREMENT, - `port_number` int(11) NOT NULL, - `port_name` varchar(200) DEFAULT NULL, - `port_description` text DEFAULT NULL, - `port_type` varchar(200) DEFAULT NULL, - `port_created_at` datetime NOT NULL DEFAULT current_timestamp(), - `port_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), - `port_archived_at` datetime DEFAULT NULL, - `port_asset_id` int(11) DEFAULT NULL, - `port_patch_panel_id` int(11) NOT NULL, - PRIMARY KEY (`port_id`), - KEY `port_patch_panel_id` (`port_patch_panel_id`), - CONSTRAINT `patch_panel_ports_ibfk_1` FOREIGN KEY (`port_patch_panel_id`) REFERENCES `patch_panels` (`patch_panel_id`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Table structure for table `patch_panels` --- - -DROP TABLE IF EXISTS `patch_panels`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `patch_panels` ( - `patch_panel_id` int(11) NOT NULL AUTO_INCREMENT, - `patch_panel_name` varchar(200) NOT NULL, - `patch_panel_description` text DEFAULT NULL, - `patch_panel_type` varchar(200) DEFAULT NULL, - `patch_panel_ports` int(11) NOT NULL, - `patch_panel_physical_location` varchar(200) DEFAULT NULL, - `patch_panel_notes` text DEFAULT NULL, - `patch_panel_created_at` datetime NOT NULL DEFAULT current_timestamp(), - `patch_panel_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), - `patch_panel_archived_at` datetime DEFAULT NULL, - `patch_panel_location_id` int(11) DEFAULT NULL, - `patch_panel_rack_id` int(11) DEFAULT NULL, - `patch_panel_client_id` int(11) NOT NULL, - PRIMARY KEY (`patch_panel_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - -- -- Table structure for table `payments` -- DROP TABLE IF EXISTS `payments`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `payments` ( `payment_id` int(11) NOT NULL AUTO_INCREMENT, `payment_date` date NOT NULL, @@ -1223,7 +1248,7 @@ CREATE TABLE `payments` ( DROP TABLE IF EXISTS `products`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `products` ( `product_id` int(11) NOT NULL AUTO_INCREMENT, `product_name` varchar(200) NOT NULL, @@ -1245,7 +1270,7 @@ CREATE TABLE `products` ( DROP TABLE IF EXISTS `project_template_ticket_templates`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `project_template_ticket_templates` ( `ticket_template_id` int(11) NOT NULL, `project_template_id` int(11) NOT NULL, @@ -1260,7 +1285,7 @@ CREATE TABLE `project_template_ticket_templates` ( DROP TABLE IF EXISTS `project_templates`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `project_templates` ( `project_template_id` int(11) NOT NULL AUTO_INCREMENT, `project_template_name` varchar(200) NOT NULL, @@ -1278,13 +1303,13 @@ CREATE TABLE `project_templates` ( DROP TABLE IF EXISTS `projects`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `projects` ( `project_id` int(11) NOT NULL AUTO_INCREMENT, `project_prefix` varchar(200) DEFAULT NULL, `project_number` int(11) NOT NULL DEFAULT 1, `project_name` varchar(255) NOT NULL, - `project_description` text DEFAULT NULL, + `project_description` mediumtext DEFAULT NULL, `project_due` date DEFAULT NULL, `project_manager` int(11) NOT NULL DEFAULT 0, `project_created_at` datetime NOT NULL DEFAULT current_timestamp(), @@ -1293,7 +1318,7 @@ CREATE TABLE `projects` ( `project_archived_at` datetime DEFAULT NULL, `project_client_id` int(11) NOT NULL DEFAULT 0, PRIMARY KEY (`project_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1302,11 +1327,14 @@ CREATE TABLE `projects` ( DROP TABLE IF EXISTS `quote_files`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `quote_files` ( `quote_id` int(11) NOT NULL, `file_id` int(11) NOT NULL, - PRIMARY KEY (`quote_id`,`file_id`) + PRIMARY KEY (`quote_id`,`file_id`), + KEY `file_id` (`file_id`), + CONSTRAINT `quote_files_ibfk_1` FOREIGN KEY (`quote_id`) REFERENCES `quotes` (`quote_id`) ON DELETE CASCADE, + CONSTRAINT `quote_files_ibfk_2` FOREIGN KEY (`file_id`) REFERENCES `files` (`file_id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -1316,7 +1344,7 @@ CREATE TABLE `quote_files` ( DROP TABLE IF EXISTS `quotes`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `quotes` ( `quote_id` int(11) NOT NULL AUTO_INCREMENT, `quote_prefix` varchar(200) DEFAULT NULL, @@ -1345,7 +1373,7 @@ CREATE TABLE `quotes` ( DROP TABLE IF EXISTS `rack_units`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `rack_units` ( `unit_id` int(11) NOT NULL AUTO_INCREMENT, `unit_start_number` int(11) NOT NULL, @@ -1368,7 +1396,7 @@ CREATE TABLE `rack_units` ( DROP TABLE IF EXISTS `racks`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `racks` ( `rack_id` int(11) NOT NULL AUTO_INCREMENT, `rack_name` varchar(200) NOT NULL, @@ -1395,7 +1423,7 @@ CREATE TABLE `racks` ( DROP TABLE IF EXISTS `records`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `records` ( `record_id` int(11) NOT NULL AUTO_INCREMENT, `record_type` varchar(200) NOT NULL, @@ -1407,36 +1435,6 @@ CREATE TABLE `records` ( `record_archived_at` datetime DEFAULT NULL, `record_domain_id` int(11) NOT NULL, PRIMARY KEY (`record_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Table structure for table `recurring` --- - -DROP TABLE IF EXISTS `recurring`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `recurring` ( - `recurring_id` int(11) NOT NULL AUTO_INCREMENT, - `recurring_prefix` varchar(200) DEFAULT NULL, - `recurring_number` int(11) NOT NULL, - `recurring_scope` varchar(255) DEFAULT NULL, - `recurring_frequency` varchar(200) NOT NULL, - `recurring_last_sent` date DEFAULT NULL, - `recurring_next_date` date NOT NULL, - `recurring_status` int(1) NOT NULL, - `recurring_discount_amount` decimal(15,2) NOT NULL DEFAULT 0.00, - `recurring_amount` decimal(15,2) NOT NULL DEFAULT 0.00, - `recurring_currency_code` varchar(200) NOT NULL, - `recurring_note` text DEFAULT NULL, - `recurring_invoice_email_notify` tinyint(1) NOT NULL DEFAULT 1, - `recurring_created_at` datetime NOT NULL DEFAULT current_timestamp(), - `recurring_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), - `recurring_archived_at` datetime DEFAULT NULL, - `recurring_category_id` int(11) NOT NULL, - `recurring_client_id` int(11) NOT NULL, - PRIMARY KEY (`recurring_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -1446,7 +1444,7 @@ CREATE TABLE `recurring` ( DROP TABLE IF EXISTS `recurring_expenses`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `recurring_expenses` ( `recurring_expense_id` int(11) NOT NULL AUTO_INCREMENT, `recurring_expense_frequency` tinyint(1) NOT NULL, @@ -1455,7 +1453,7 @@ CREATE TABLE `recurring_expenses` ( `recurring_expense_last_sent` date DEFAULT NULL, `recurring_expense_next_date` date NOT NULL, `recurring_expense_status` tinyint(1) NOT NULL DEFAULT 1, - `recurring_expense_description` text DEFAULT NULL, + `recurring_expense_description` mediumtext DEFAULT NULL, `recurring_expense_amount` decimal(15,2) NOT NULL, `recurring_expense_payment_method` varchar(200) DEFAULT NULL, `recurring_expense_reference` varchar(255) DEFAULT NULL, @@ -1468,7 +1466,37 @@ CREATE TABLE `recurring_expenses` ( `recurring_expense_category_id` int(11) NOT NULL, `recurring_expense_account_id` int(11) NOT NULL, PRIMARY KEY (`recurring_expense_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `recurring_invoices` +-- + +DROP TABLE IF EXISTS `recurring_invoices`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `recurring_invoices` ( + `recurring_invoice_id` int(11) NOT NULL AUTO_INCREMENT, + `recurring_invoice_prefix` varchar(200) DEFAULT NULL, + `recurring_invoice_number` int(11) NOT NULL, + `recurring_invoice_scope` varchar(255) DEFAULT NULL, + `recurring_invoice_frequency` varchar(200) NOT NULL, + `recurring_invoice_last_sent` date DEFAULT NULL, + `recurring_invoice_next_date` date NOT NULL, + `recurring_invoice_status` int(1) NOT NULL, + `recurring_invoice_discount_amount` decimal(15,2) NOT NULL DEFAULT 0.00, + `recurring_invoice_amount` decimal(15,2) NOT NULL DEFAULT 0.00, + `recurring_invoice_currency_code` varchar(200) NOT NULL, + `recurring_invoice_note` text DEFAULT NULL, + `recurring_invoice_email_notify` tinyint(1) NOT NULL DEFAULT 1, + `recurring_invoice_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `recurring_invoice_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `recurring_invoice_archived_at` datetime DEFAULT NULL, + `recurring_invoice_category_id` int(11) NOT NULL, + `recurring_invoice_client_id` int(11) NOT NULL, + PRIMARY KEY (`recurring_invoice_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1477,7 +1505,7 @@ CREATE TABLE `recurring_expenses` ( DROP TABLE IF EXISTS `recurring_payments`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `recurring_payments` ( `recurring_payment_id` int(11) NOT NULL AUTO_INCREMENT, `recurring_payment_currency_code` varchar(10) NOT NULL, @@ -1492,13 +1520,58 @@ CREATE TABLE `recurring_payments` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `recurring_ticket_assets` +-- + +DROP TABLE IF EXISTS `recurring_ticket_assets`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `recurring_ticket_assets` ( + `recurring_ticket_id` int(11) NOT NULL, + `asset_id` int(11) NOT NULL, + PRIMARY KEY (`recurring_ticket_id`,`asset_id`), + KEY `asset_id` (`asset_id`), + CONSTRAINT `recurring_ticket_assets_ibfk_1` FOREIGN KEY (`asset_id`) REFERENCES `assets` (`asset_id`) ON DELETE CASCADE, + CONSTRAINT `recurring_ticket_assets_ibfk_2` FOREIGN KEY (`recurring_ticket_id`) REFERENCES `recurring_tickets` (`recurring_ticket_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `recurring_tickets` +-- + +DROP TABLE IF EXISTS `recurring_tickets`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `recurring_tickets` ( + `recurring_ticket_id` int(11) NOT NULL AUTO_INCREMENT, + `recurring_ticket_category` varchar(200) DEFAULT NULL, + `recurring_ticket_subject` varchar(500) NOT NULL, + `recurring_ticket_details` longtext NOT NULL, + `recurring_ticket_priority` varchar(200) DEFAULT NULL, + `recurring_ticket_frequency` varchar(10) NOT NULL, + `recurring_ticket_billable` tinyint(1) NOT NULL DEFAULT 0, + `recurring_ticket_start_date` date NOT NULL, + `recurring_ticket_next_run` date NOT NULL, + `recurring_ticket_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `recurring_ticket_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `recurring_ticket_created_by` int(11) NOT NULL DEFAULT 0, + `recurring_ticket_assigned_to` int(11) NOT NULL DEFAULT 0, + `recurring_ticket_client_id` int(11) NOT NULL DEFAULT 0, + `recurring_ticket_contact_id` int(11) NOT NULL DEFAULT 0, + `recurring_ticket_asset_id` int(11) NOT NULL DEFAULT 0, + PRIMARY KEY (`recurring_ticket_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `remember_tokens` -- DROP TABLE IF EXISTS `remember_tokens`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `remember_tokens` ( `remember_token_id` int(11) NOT NULL AUTO_INCREMENT, `remember_token_token` varchar(255) NOT NULL, @@ -1514,7 +1587,7 @@ CREATE TABLE `remember_tokens` ( DROP TABLE IF EXISTS `revenues`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `revenues` ( `revenue_id` int(11) NOT NULL AUTO_INCREMENT, `revenue_date` date NOT NULL, @@ -1530,35 +1603,7 @@ CREATE TABLE `revenues` ( `revenue_account_id` int(11) NOT NULL, `revenue_client_id` int(11) NOT NULL DEFAULT 0, PRIMARY KEY (`revenue_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Table structure for table `scheduled_tickets` --- - -DROP TABLE IF EXISTS `scheduled_tickets`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `scheduled_tickets` ( - `scheduled_ticket_id` int(11) NOT NULL AUTO_INCREMENT, - `scheduled_ticket_category` varchar(200) DEFAULT NULL, - `scheduled_ticket_subject` varchar(500) NOT NULL, - `scheduled_ticket_details` longtext NOT NULL, - `scheduled_ticket_priority` varchar(200) DEFAULT NULL, - `scheduled_ticket_frequency` varchar(10) NOT NULL, - `scheduled_ticket_billable` tinyint(1) NOT NULL DEFAULT 0, - `scheduled_ticket_start_date` date NOT NULL, - `scheduled_ticket_next_run` date NOT NULL, - `scheduled_ticket_created_at` datetime NOT NULL DEFAULT current_timestamp(), - `scheduled_ticket_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), - `scheduled_ticket_created_by` int(11) NOT NULL DEFAULT 0, - `scheduled_ticket_assigned_to` int(11) NOT NULL DEFAULT 0, - `scheduled_ticket_client_id` int(11) NOT NULL DEFAULT 0, - `scheduled_ticket_contact_id` int(11) NOT NULL DEFAULT 0, - `scheduled_ticket_asset_id` int(11) NOT NULL DEFAULT 0, - PRIMARY KEY (`scheduled_ticket_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1567,11 +1612,15 @@ CREATE TABLE `scheduled_tickets` ( DROP TABLE IF EXISTS `service_assets`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `service_assets` ( `service_id` int(11) NOT NULL, - `asset_id` int(11) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + `asset_id` int(11) NOT NULL, + KEY `service_id` (`service_id`), + KEY `asset_id` (`asset_id`), + CONSTRAINT `service_assets_ibfk_1` FOREIGN KEY (`service_id`) REFERENCES `services` (`service_id`) ON DELETE CASCADE, + CONSTRAINT `service_assets_ibfk_2` FOREIGN KEY (`asset_id`) REFERENCES `assets` (`asset_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1580,11 +1629,15 @@ CREATE TABLE `service_assets` ( DROP TABLE IF EXISTS `service_certificates`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `service_certificates` ( `service_id` int(11) NOT NULL, - `certificate_id` int(11) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + `certificate_id` int(11) NOT NULL, + KEY `service_id` (`service_id`), + KEY `certificate_id` (`certificate_id`), + CONSTRAINT `service_certificates_ibfk_1` FOREIGN KEY (`service_id`) REFERENCES `services` (`service_id`) ON DELETE CASCADE, + CONSTRAINT `service_certificates_ibfk_2` FOREIGN KEY (`certificate_id`) REFERENCES `certificates` (`certificate_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1593,11 +1646,32 @@ CREATE TABLE `service_certificates` ( DROP TABLE IF EXISTS `service_contacts`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `service_contacts` ( `service_id` int(11) NOT NULL, - `contact_id` int(11) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + `contact_id` int(11) NOT NULL, + KEY `service_id` (`service_id`), + KEY `contact_id` (`contact_id`), + CONSTRAINT `service_contacts_ibfk_1` FOREIGN KEY (`service_id`) REFERENCES `services` (`service_id`) ON DELETE CASCADE, + CONSTRAINT `service_contacts_ibfk_2` FOREIGN KEY (`contact_id`) REFERENCES `contacts` (`contact_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `service_credentials` +-- + +DROP TABLE IF EXISTS `service_credentials`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `service_credentials` ( + `service_id` int(11) NOT NULL, + `credential_id` int(11) NOT NULL, + KEY `service_id` (`service_id`), + KEY `credential_id` (`credential_id`), + CONSTRAINT `service_credentials_ibfk_1` FOREIGN KEY (`service_id`) REFERENCES `services` (`service_id`) ON DELETE CASCADE, + CONSTRAINT `service_credentials_ibfk_2` FOREIGN KEY (`credential_id`) REFERENCES `credentials` (`credential_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1606,11 +1680,15 @@ CREATE TABLE `service_contacts` ( DROP TABLE IF EXISTS `service_documents`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `service_documents` ( `service_id` int(11) NOT NULL, - `document_id` int(11) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + `document_id` int(11) NOT NULL, + KEY `service_id` (`service_id`), + KEY `document_id` (`document_id`), + CONSTRAINT `service_documents_ibfk_1` FOREIGN KEY (`service_id`) REFERENCES `services` (`service_id`) ON DELETE CASCADE, + CONSTRAINT `service_documents_ibfk_2` FOREIGN KEY (`document_id`) REFERENCES `documents` (`document_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1619,24 +1697,13 @@ CREATE TABLE `service_documents` ( DROP TABLE IF EXISTS `service_domains`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `service_domains` ( `service_id` int(11) NOT NULL, - `domain_id` int(11) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Table structure for table `service_logins` --- - -DROP TABLE IF EXISTS `service_logins`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `service_logins` ( - `service_id` int(11) NOT NULL, - `login_id` int(11) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + `domain_id` int(11) NOT NULL, + KEY `service_id` (`service_id`), + KEY `domain_id` (`domain_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1645,11 +1712,15 @@ CREATE TABLE `service_logins` ( DROP TABLE IF EXISTS `service_vendors`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `service_vendors` ( `service_id` int(11) NOT NULL, - `vendor_id` int(11) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + `vendor_id` int(11) NOT NULL, + KEY `service_id` (`service_id`), + KEY `vendor_id` (`vendor_id`), + CONSTRAINT `service_vendors_ibfk_1` FOREIGN KEY (`service_id`) REFERENCES `services` (`service_id`) ON DELETE CASCADE, + CONSTRAINT `service_vendors_ibfk_2` FOREIGN KEY (`vendor_id`) REFERENCES `vendors` (`vendor_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1658,22 +1729,22 @@ CREATE TABLE `service_vendors` ( DROP TABLE IF EXISTS `services`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `services` ( `service_id` int(11) NOT NULL AUTO_INCREMENT, - `service_name` varchar(200) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL, - `service_description` varchar(200) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL, - `service_category` varchar(20) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL, - `service_importance` varchar(10) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL, + `service_name` varchar(200) NOT NULL, + `service_description` varchar(200) NOT NULL, + `service_category` varchar(20) NOT NULL, + `service_importance` varchar(10) NOT NULL, `service_backup` varchar(200) DEFAULT NULL, - `service_notes` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL, + `service_notes` mediumtext NOT NULL, `service_created_at` datetime NOT NULL DEFAULT current_timestamp(), `service_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `service_accessed_at` datetime DEFAULT NULL, `service_review_due` date DEFAULT NULL, `service_client_id` int(11) NOT NULL, PRIMARY KEY (`service_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1682,7 +1753,7 @@ CREATE TABLE `services` ( DROP TABLE IF EXISTS `settings`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `settings` ( `company_id` int(11) NOT NULL, `config_current_database_version` varchar(10) NOT NULL, @@ -1718,8 +1789,8 @@ CREATE TABLE `settings` ( `config_invoice_late_fee_enable` tinyint(1) NOT NULL DEFAULT 0, `config_invoice_late_fee_percent` decimal(5,2) NOT NULL DEFAULT 0.00, `config_invoice_paid_notification_email` varchar(200) DEFAULT NULL, - `config_recurring_prefix` varchar(200) DEFAULT NULL, - `config_recurring_next_number` int(11) NOT NULL, + `config_recurring_invoice_prefix` varchar(200) DEFAULT NULL, + `config_recurring_invoice_next_number` int(11) NOT NULL DEFAULT 1, `config_quote_prefix` varchar(200) DEFAULT NULL, `config_quote_next_number` int(11) DEFAULT NULL, `config_quote_footer` text DEFAULT NULL, @@ -1785,7 +1856,7 @@ CREATE TABLE `settings` ( DROP TABLE IF EXISTS `shared_items`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `shared_items` ( `item_id` int(11) NOT NULL AUTO_INCREMENT, `item_active` int(1) NOT NULL, @@ -1811,7 +1882,7 @@ CREATE TABLE `shared_items` ( DROP TABLE IF EXISTS `software`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `software` ( `software_id` int(11) NOT NULL AUTO_INCREMENT, `software_name` varchar(200) NOT NULL, @@ -1843,12 +1914,15 @@ CREATE TABLE `software` ( DROP TABLE IF EXISTS `software_assets`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `software_assets` ( `software_id` int(11) NOT NULL, `asset_id` int(11) NOT NULL, - PRIMARY KEY (`software_id`,`asset_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + PRIMARY KEY (`software_id`,`asset_id`), + KEY `asset_id` (`asset_id`), + CONSTRAINT `software_assets_ibfk_1` FOREIGN KEY (`software_id`) REFERENCES `software` (`software_id`) ON DELETE CASCADE, + CONSTRAINT `software_assets_ibfk_2` FOREIGN KEY (`asset_id`) REFERENCES `assets` (`asset_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1857,12 +1931,32 @@ CREATE TABLE `software_assets` ( DROP TABLE IF EXISTS `software_contacts`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `software_contacts` ( `software_id` int(11) NOT NULL, `contact_id` int(11) NOT NULL, - PRIMARY KEY (`software_id`,`contact_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + PRIMARY KEY (`software_id`,`contact_id`), + KEY `contact_id` (`contact_id`), + CONSTRAINT `software_contacts_ibfk_1` FOREIGN KEY (`software_id`) REFERENCES `software` (`software_id`) ON DELETE CASCADE, + CONSTRAINT `software_contacts_ibfk_2` FOREIGN KEY (`contact_id`) REFERENCES `contacts` (`contact_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `software_credentials` +-- + +DROP TABLE IF EXISTS `software_credentials`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `software_credentials` ( + `software_id` int(11) NOT NULL, + `credential_id` int(11) NOT NULL, + PRIMARY KEY (`software_id`,`credential_id`), + KEY `credential_id` (`credential_id`), + CONSTRAINT `software_credentials_ibfk_1` FOREIGN KEY (`software_id`) REFERENCES `software` (`software_id`) ON DELETE CASCADE, + CONSTRAINT `software_credentials_ibfk_2` FOREIGN KEY (`credential_id`) REFERENCES `credentials` (`credential_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1871,12 +1965,15 @@ CREATE TABLE `software_contacts` ( DROP TABLE IF EXISTS `software_documents`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `software_documents` ( `software_id` int(11) NOT NULL, `document_id` int(11) NOT NULL, - PRIMARY KEY (`software_id`,`document_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + PRIMARY KEY (`software_id`,`document_id`), + KEY `document_id` (`document_id`), + CONSTRAINT `software_documents_ibfk_1` FOREIGN KEY (`software_id`) REFERENCES `software` (`software_id`) ON DELETE CASCADE, + CONSTRAINT `software_documents_ibfk_2` FOREIGN KEY (`document_id`) REFERENCES `documents` (`document_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1885,26 +1982,15 @@ CREATE TABLE `software_documents` ( DROP TABLE IF EXISTS `software_files`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `software_files` ( `software_id` int(11) NOT NULL, `file_id` int(11) NOT NULL, - PRIMARY KEY (`software_id`,`file_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Table structure for table `software_logins` --- - -DROP TABLE IF EXISTS `software_logins`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `software_logins` ( - `software_id` int(11) NOT NULL, - `login_id` int(11) NOT NULL, - PRIMARY KEY (`software_id`,`login_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + PRIMARY KEY (`software_id`,`file_id`), + KEY `file_id` (`file_id`), + CONSTRAINT `software_files_ibfk_1` FOREIGN KEY (`software_id`) REFERENCES `software` (`software_id`) ON DELETE CASCADE, + CONSTRAINT `software_files_ibfk_2` FOREIGN KEY (`file_id`) REFERENCES `files` (`file_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1913,7 +1999,7 @@ CREATE TABLE `software_logins` ( DROP TABLE IF EXISTS `tags`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `tags` ( `tag_id` int(11) NOT NULL AUTO_INCREMENT, `tag_name` varchar(200) NOT NULL, @@ -1924,7 +2010,7 @@ CREATE TABLE `tags` ( `tag_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `tag_archived_at` datetime DEFAULT NULL, PRIMARY KEY (`tag_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1933,7 +2019,7 @@ CREATE TABLE `tags` ( DROP TABLE IF EXISTS `task_templates`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `task_templates` ( `task_template_id` int(11) NOT NULL AUTO_INCREMENT, `task_template_name` varchar(200) NOT NULL, @@ -1953,7 +2039,7 @@ CREATE TABLE `task_templates` ( DROP TABLE IF EXISTS `tasks`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `tasks` ( `task_id` int(11) NOT NULL AUTO_INCREMENT, `task_name` varchar(255) NOT NULL, @@ -1966,7 +2052,7 @@ CREATE TABLE `tasks` ( `task_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `task_ticket_id` int(11) DEFAULT NULL, PRIMARY KEY (`task_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1975,7 +2061,7 @@ CREATE TABLE `tasks` ( DROP TABLE IF EXISTS `taxes`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `taxes` ( `tax_id` int(11) NOT NULL AUTO_INCREMENT, `tax_name` varchar(200) NOT NULL, @@ -1984,7 +2070,24 @@ CREATE TABLE `taxes` ( `tax_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `tax_archived_at` datetime DEFAULT NULL, PRIMARY KEY (`tax_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `ticket_assets` +-- + +DROP TABLE IF EXISTS `ticket_assets`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `ticket_assets` ( + `ticket_id` int(11) NOT NULL, + `asset_id` int(11) NOT NULL, + PRIMARY KEY (`ticket_id`,`asset_id`), + KEY `asset_id` (`asset_id`), + CONSTRAINT `ticket_assets_ibfk_1` FOREIGN KEY (`asset_id`) REFERENCES `assets` (`asset_id`) ON DELETE CASCADE, + CONSTRAINT `ticket_assets_ibfk_2` FOREIGN KEY (`ticket_id`) REFERENCES `tickets` (`ticket_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1993,7 +2096,7 @@ CREATE TABLE `taxes` ( DROP TABLE IF EXISTS `ticket_attachments`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `ticket_attachments` ( `ticket_attachment_id` int(11) NOT NULL AUTO_INCREMENT, `ticket_attachment_name` varchar(255) NOT NULL, @@ -2002,7 +2105,7 @@ CREATE TABLE `ticket_attachments` ( `ticket_attachment_ticket_id` int(11) NOT NULL, `ticket_attachment_reply_id` int(11) DEFAULT NULL, PRIMARY KEY (`ticket_attachment_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -2011,7 +2114,7 @@ CREATE TABLE `ticket_attachments` ( DROP TABLE IF EXISTS `ticket_history`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `ticket_history` ( `ticket_history_id` int(11) NOT NULL AUTO_INCREMENT, `ticket_history_status` varchar(200) NOT NULL, @@ -2028,7 +2131,7 @@ CREATE TABLE `ticket_history` ( DROP TABLE IF EXISTS `ticket_replies`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `ticket_replies` ( `ticket_reply_id` int(11) NOT NULL AUTO_INCREMENT, `ticket_reply` longtext NOT NULL, @@ -2049,7 +2152,7 @@ CREATE TABLE `ticket_replies` ( DROP TABLE IF EXISTS `ticket_statuses`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `ticket_statuses` ( `ticket_status_id` int(11) NOT NULL AUTO_INCREMENT, `ticket_status_name` varchar(200) NOT NULL, @@ -2066,7 +2169,7 @@ CREATE TABLE `ticket_statuses` ( DROP TABLE IF EXISTS `ticket_templates`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `ticket_templates` ( `ticket_template_id` int(11) NOT NULL AUTO_INCREMENT, `ticket_template_name` varchar(200) NOT NULL, @@ -2086,7 +2189,7 @@ CREATE TABLE `ticket_templates` ( DROP TABLE IF EXISTS `ticket_views`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `ticket_views` ( `view_id` int(11) NOT NULL AUTO_INCREMENT, `view_ticket_id` int(11) NOT NULL, @@ -2102,14 +2205,14 @@ CREATE TABLE `ticket_views` ( DROP TABLE IF EXISTS `ticket_watchers`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `ticket_watchers` ( `watcher_id` int(11) NOT NULL AUTO_INCREMENT, `watcher_name` varchar(255) DEFAULT NULL, `watcher_email` varchar(255) NOT NULL, `watcher_ticket_id` int(11) NOT NULL, PRIMARY KEY (`watcher_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -2118,7 +2221,7 @@ CREATE TABLE `ticket_watchers` ( DROP TABLE IF EXISTS `tickets`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `tickets` ( `ticket_id` int(11) NOT NULL AUTO_INCREMENT, `ticket_prefix` varchar(200) DEFAULT NULL, @@ -2139,6 +2242,7 @@ CREATE TABLE `tickets` ( `ticket_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `ticket_resolved_at` datetime DEFAULT NULL, `ticket_archived_at` datetime DEFAULT NULL, + `ticket_first_response_at` datetime DEFAULT NULL, `ticket_closed_at` datetime DEFAULT NULL, `ticket_created_by` int(11) NOT NULL, `ticket_assigned_to` int(11) NOT NULL DEFAULT 0, @@ -2150,6 +2254,7 @@ CREATE TABLE `tickets` ( `ticket_asset_id` int(11) NOT NULL DEFAULT 0, `ticket_invoice_id` int(11) NOT NULL DEFAULT 0, `ticket_project_id` int(11) NOT NULL DEFAULT 0, + `ticket_recurring_ticket_id` int(11) DEFAULT 0, `ticket_order` int(11) NOT NULL DEFAULT 0, PRIMARY KEY (`ticket_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; @@ -2161,7 +2266,7 @@ CREATE TABLE `tickets` ( DROP TABLE IF EXISTS `transfers`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `transfers` ( `transfer_id` int(11) NOT NULL AUTO_INCREMENT, `transfer_method` varchar(200) DEFAULT NULL, @@ -2181,7 +2286,7 @@ CREATE TABLE `transfers` ( DROP TABLE IF EXISTS `trips`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `trips` ( `trip_id` int(11) NOT NULL AUTO_INCREMENT, `trip_date` date NOT NULL, @@ -2202,13 +2307,13 @@ CREATE TABLE `trips` ( /*!40101 SET character_set_client = @saved_cs_client */; -- --- Table structure for table `user_permissions` +-- Table structure for table `user_client_permissions` -- -DROP TABLE IF EXISTS `user_permissions`; +DROP TABLE IF EXISTS `user_client_permissions`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `user_permissions` ( +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `user_client_permissions` ( `user_id` int(11) NOT NULL, `client_id` int(11) NOT NULL, PRIMARY KEY (`user_id`,`client_id`) @@ -2221,7 +2326,7 @@ CREATE TABLE `user_permissions` ( DROP TABLE IF EXISTS `user_role_permissions`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `user_role_permissions` ( `user_role_id` int(11) NOT NULL, `module_id` int(11) NOT NULL, @@ -2235,17 +2340,17 @@ CREATE TABLE `user_role_permissions` ( DROP TABLE IF EXISTS `user_roles`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `user_roles` ( - `user_role_id` int(11) NOT NULL AUTO_INCREMENT, - `user_role_name` varchar(200) NOT NULL, - `user_role_description` varchar(200) DEFAULT NULL, - `user_role_type` tinyint(1) NOT NULL DEFAULT 1, - `user_role_is_admin` tinyint(1) NOT NULL DEFAULT 0, - `user_role_created_at` datetime NOT NULL DEFAULT current_timestamp(), - `user_role_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), - `user_role_archived_at` datetime DEFAULT NULL, - PRIMARY KEY (`user_role_id`) + `role_id` int(11) NOT NULL AUTO_INCREMENT, + `role_name` varchar(200) NOT NULL, + `role_description` varchar(200) DEFAULT NULL, + `role_type` tinyint(1) NOT NULL DEFAULT 1, + `role_is_admin` tinyint(1) NOT NULL DEFAULT 0, + `role_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `role_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `role_archived_at` datetime DEFAULT NULL, + PRIMARY KEY (`role_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2255,17 +2360,16 @@ CREATE TABLE `user_roles` ( DROP TABLE IF EXISTS `user_settings`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `user_settings` ( `user_id` int(11) NOT NULL, - `user_role` int(11) NOT NULL, `user_config_force_mfa` tinyint(1) NOT NULL DEFAULT 0, `user_config_records_per_page` int(11) NOT NULL DEFAULT 10, `user_config_dashboard_financial_enable` tinyint(1) NOT NULL DEFAULT 0, `user_config_dashboard_technical_enable` tinyint(1) NOT NULL DEFAULT 0, `user_config_calendar_first_day` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY (`user_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -2274,7 +2378,7 @@ CREATE TABLE `user_settings` ( DROP TABLE IF EXISTS `users`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `users` ( `user_id` int(11) NOT NULL AUTO_INCREMENT, `user_name` varchar(200) NOT NULL, @@ -2293,22 +2397,43 @@ CREATE TABLE `users` ( `user_created_at` datetime NOT NULL DEFAULT current_timestamp(), `user_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `user_archived_at` datetime DEFAULT NULL, + `user_role_id` int(11) DEFAULT 0, PRIMARY KEY (`user_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `vendor_credentials` +-- + +DROP TABLE IF EXISTS `vendor_credentials`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `vendor_credentials` ( + `vendor_id` int(11) NOT NULL, + `credential_id` int(11) NOT NULL, + PRIMARY KEY (`vendor_id`,`credential_id`), + KEY `credential_id` (`credential_id`), + CONSTRAINT `vendor_credentials_ibfk_1` FOREIGN KEY (`vendor_id`) REFERENCES `vendors` (`vendor_id`) ON DELETE CASCADE, + CONSTRAINT `vendor_credentials_ibfk_2` FOREIGN KEY (`credential_id`) REFERENCES `credentials` (`credential_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `vendor_documents` -- DROP TABLE IF EXISTS `vendor_documents`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `vendor_documents` ( `vendor_id` int(11) NOT NULL, `document_id` int(11) NOT NULL, - PRIMARY KEY (`vendor_id`,`document_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + PRIMARY KEY (`vendor_id`,`document_id`), + KEY `document_id` (`document_id`), + CONSTRAINT `vendor_documents_ibfk_1` FOREIGN KEY (`vendor_id`) REFERENCES `vendors` (`vendor_id`) ON DELETE CASCADE, + CONSTRAINT `vendor_documents_ibfk_2` FOREIGN KEY (`document_id`) REFERENCES `documents` (`document_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -2317,26 +2442,15 @@ CREATE TABLE `vendor_documents` ( DROP TABLE IF EXISTS `vendor_files`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `vendor_files` ( `vendor_id` int(11) NOT NULL, `file_id` int(11) NOT NULL, - PRIMARY KEY (`vendor_id`,`file_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Table structure for table `vendor_logins` --- - -DROP TABLE IF EXISTS `vendor_logins`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `vendor_logins` ( - `vendor_id` int(11) NOT NULL, - `login_id` int(11) NOT NULL, - PRIMARY KEY (`vendor_id`,`login_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + PRIMARY KEY (`vendor_id`,`file_id`), + KEY `file_id` (`file_id`), + CONSTRAINT `vendor_files_ibfk_1` FOREIGN KEY (`vendor_id`) REFERENCES `vendors` (`vendor_id`) ON DELETE CASCADE, + CONSTRAINT `vendor_files_ibfk_2` FOREIGN KEY (`file_id`) REFERENCES `files` (`file_id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -2345,7 +2459,7 @@ CREATE TABLE `vendor_logins` ( DROP TABLE IF EXISTS `vendors`; /*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; +/*!40101 SET character_set_client = utf8mb4 */; CREATE TABLE `vendors` ( `vendor_id` int(11) NOT NULL AUTO_INCREMENT, `vendor_name` varchar(200) NOT NULL, @@ -2380,4 +2494,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-02-26 12:58:39 +-- Dump completed on 2025-03-17 14:58:00 diff --git a/functions.php b/functions.php index 4e013c37..3c63d30a 100644 --- a/functions.php +++ b/functions.php @@ -13,8 +13,7 @@ use PHPMailer\PHPMailer\PHPMailer; use PHPMailer\PHPMailer\Exception; // Function to generate both crypto & URL safe random strings -function randomString($length = 16) -{ +function randomString($length = 16) { // Generate some cryptographically safe random bytes // Generate a little more than requested as we'll lose some later converting $random_bytes = random_bytes($length + 5); @@ -31,8 +30,7 @@ function randomString($length = 16) } // Older keygen function - only used for TOTP currently -function key32gen() -{ +function key32gen() { $chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; $chars .= "234567"; while (1) { @@ -46,25 +44,23 @@ function key32gen() return $key; } -function nullable_htmlentities($unsanitizedInput) -{ +function nullable_htmlentities($unsanitizedInput) { //return htmlentities($unsanitizedInput ?? ''); return htmlspecialchars($unsanitizedInput ?? '', ENT_QUOTES, 'UTF-8'); } -function initials($str) -{ - if (!empty($str)) { - $ret = ''; - foreach (explode(' ', $str) as $word) - $ret .= strtoupper($word[0]); - $ret = substr($ret, 0, 2); - return $ret; +function initials($string) { + if (!empty($string)) { + $return = ''; + foreach (explode(' ', $string) as $word) { + $return .= mb_strtoupper($word[0], 'UTF-8'); // Use mb_strtoupper for UTF-8 support + } + $return = substr($return, 0, 2); + return $return; } } -function removeDirectory($path) -{ +function removeDirectory($path) { if (!file_exists($path)) { return; } @@ -76,13 +72,11 @@ function removeDirectory($path) rmdir($path); } -function getUserAgent() -{ +function getUserAgent() { return $_SERVER['HTTP_USER_AGENT']; } -function getIP() -{ +function getIP() { if (defined("CONST_GET_IP_METHOD")) { if (CONST_GET_IP_METHOD == "HTTP_X_FORWARDED_FOR") { $ip = getenv('HTTP_X_FORWARDED_FOR'); @@ -100,8 +94,7 @@ function getIP() return $ip; } -function getWebBrowser($user_browser) -{ +function getWebBrowser($user_browser) { $browser = "-"; $browser_array = array( '/msie/i' => " Internet Explorer", @@ -120,8 +113,7 @@ function getWebBrowser($user_browser) return $browser; } -function getOS($user_os) -{ +function getOS($user_os) { $os_platform = "-"; $os_array = array( '/windows/i' => " Windows", @@ -141,8 +133,7 @@ function getOS($user_os) return $os_platform; } -function getDevice() -{ +function getDevice() { $tablet_browser = 0; $mobile_browser = 0; if (preg_match('/(tablet|ipad|playbook)|(android(?!.*(mobi|opera mini)))/i', strtolower($_SERVER['HTTP_USER_AGENT']))) { @@ -189,8 +180,7 @@ function getDevice() } } -function truncate($text, $chars) -{ +function truncate($text, $chars) { if (strlen($text) <= $chars) { return $text; } @@ -203,8 +193,7 @@ function truncate($text, $chars) return $text . "..."; } -function formatPhoneNumber($phoneNumber) -{ +function formatPhoneNumber($phoneNumber) { global $mysqli; // Get Phone Mask Option @@ -240,8 +229,7 @@ function formatPhoneNumber($phoneNumber) return $phoneNumber; } -function mkdirMissing($dir) -{ +function mkdirMissing($dir) { if (!is_dir($dir)) { mkdir($dir); } @@ -249,8 +237,7 @@ function mkdirMissing($dir) // Called during initial setup // Encrypts the master key with the user's password -function setupFirstUserSpecificKey($user_password, $site_encryption_master_key) -{ +function setupFirstUserSpecificKey($user_password, $site_encryption_master_key) { $iv = randomString(); $salt = randomString(); @@ -268,8 +255,7 @@ function setupFirstUserSpecificKey($user_password, $site_encryption_master_key) * New Users: Requires the admin setting up their account have a Specific/Session key configured * Password Changes: Will use the current info in the session. */ -function encryptUserSpecificKey($user_password) -{ +function encryptUserSpecificKey($user_password) { $iv = randomString(); $salt = randomString(); @@ -334,13 +320,13 @@ function generateUserSessionKey($site_encryption_master_key) } } -// Decrypts an encrypted password (website/asset login), returns it as a string -function decryptLoginEntry($login_password_ciphertext) +// Decrypts an encrypted password (website/asset credentials), returns it as a string +function decryptCredentialEntry($credential_password_ciphertext) { - // Split the login into IV and Ciphertext - $login_iv = substr($login_password_ciphertext, 0, 16); - $login_ciphertext = $salt = substr($login_password_ciphertext, 16); + // Split the credential into IV and Ciphertext + $credential_iv = substr($credential_password_ciphertext, 0, 16); + $credential_ciphertext = $salt = substr($credential_password_ciphertext, 16); // Get the user session info. $user_encryption_session_ciphertext = $_SESSION['user_encryption_session_ciphertext']; @@ -350,12 +336,12 @@ function decryptLoginEntry($login_password_ciphertext) // Decrypt the session key to get the master key $site_encryption_master_key = openssl_decrypt($user_encryption_session_ciphertext, 'aes-128-cbc', $user_encryption_session_key, 0, $user_encryption_session_iv); - // Decrypt the login password using the master key - return openssl_decrypt($login_ciphertext, 'aes-128-cbc', $site_encryption_master_key, 0, $login_iv); + // Decrypt the credential password using the master key + return openssl_decrypt($credential_ciphertext, 'aes-128-cbc', $site_encryption_master_key, 0, $credential_iv); } -// Encrypts a website/asset login password -function encryptLoginEntry($login_password_cleartext) +// Encrypts a website/asset credential password +function encryptCredentialEntry($credential_password_cleartext) { $iv = randomString(); @@ -367,26 +353,26 @@ function encryptLoginEntry($login_password_cleartext) //Decrypt the session key to get the master key $site_encryption_master_key = openssl_decrypt($user_encryption_session_ciphertext, 'aes-128-cbc', $user_encryption_session_key, 0, $user_encryption_session_iv); - //Encrypt the website/asset login using the master key - $ciphertext = openssl_encrypt($login_password_cleartext, 'aes-128-cbc', $site_encryption_master_key, 0, $iv); + //Encrypt the website/asset credential using the master key + $ciphertext = openssl_encrypt($credential_password_cleartext, 'aes-128-cbc', $site_encryption_master_key, 0, $iv); return $iv . $ciphertext; } -function apiDecryptLoginEntry($login_ciphertext, $api_key_decrypt_hash, #[\SensitiveParameter]$api_key_decrypt_password) +function apiDecryptCredentialEntry($credential_ciphertext, $api_key_decrypt_hash, #[\SensitiveParameter]$api_key_decrypt_password) { - // Split the login entry (username/password) into IV and Ciphertext - $login_iv = substr($login_ciphertext, 0, 16); - $login_ciphertext = $salt = substr($login_ciphertext, 16); + // Split the Credential entry (username/password) into IV and Ciphertext + $credential_iv = substr($credential_ciphertext, 0, 16); + $credential_ciphertext = $salt = substr($credential_ciphertext, 16); // Decrypt the api hash to get the master key $site_encryption_master_key = decryptUserSpecificKey($api_key_decrypt_hash, $api_key_decrypt_password); - // Decrypt the login password using the master key - return openssl_decrypt($login_ciphertext, 'aes-128-cbc', $site_encryption_master_key, 0, $login_iv); + // Decrypt the credential password using the master key + return openssl_decrypt($credential_ciphertext, 'aes-128-cbc', $site_encryption_master_key, 0, $credential_iv); } -function apiEncryptLoginEntry(#[\SensitiveParameter]$credential_cleartext, $api_key_decrypt_hash, #[\SensitiveParameter]$api_key_decrypt_password) +function apiEncryptCredentialEntry(#[\SensitiveParameter]$credential_cleartext, $api_key_decrypt_hash, #[\SensitiveParameter]$api_key_decrypt_password) { $iv = randomString(); @@ -539,9 +525,9 @@ function validateCSRFToken($token) * Accountant - 1 */ -function validateAdminRole() -{ - if (!isset($_SESSION['user_role']) || $_SESSION['user_role'] != 3) { +function validateAdminRole() { + global $session_user_role; + if (!isset($session_user_role) || $session_user_role != 3) { $_SESSION['alert_type'] = "danger"; $_SESSION['alert_message'] = WORDING_ROLECHECK_FAILED; header("Location: " . $_SERVER["HTTP_REFERER"]); @@ -551,9 +537,9 @@ function validateAdminRole() // LEGACY // Validates a user is a tech (or admin). Stops page load and attempts to direct away from the page if not (i.e. user is an accountant) -function validateTechRole() -{ - if (!isset($_SESSION['user_role']) || $_SESSION['user_role'] == 1) { +function validateTechRole() { + global $session_user_role; + if (!isset($session_user_role) || $session_user_role == 1) { $_SESSION['alert_type'] = "danger"; $_SESSION['alert_message'] = WORDING_ROLECHECK_FAILED; header("Location: " . $_SERVER["HTTP_REFERER"]); @@ -563,9 +549,9 @@ function validateTechRole() // LEGACY // Validates a user is an accountant (or admin). Stops page load and attempts to direct away from the page if not (i.e. user is a tech) -function validateAccountantRole() -{ - if (!isset($_SESSION['user_role']) || $_SESSION['user_role'] == 2) { +function validateAccountantRole() { + global $session_user_role; + if (!isset($session_user_role) || $session_user_role == 2) { $_SESSION['alert_type'] = "danger"; $_SESSION['alert_message'] = WORDING_ROLECHECK_FAILED; header("Location: " . $_SERVER["HTTP_REFERER"]); @@ -765,7 +751,7 @@ function checkFileUpload($file, $allowed_extensions) $fileContent = file_get_contents($tmp); // Hash the file content using SHA-256 - $hashedContent = hash('sha256', $fileContent); + $hashedContent = hash('md5', $fileContent); // Generate a secure filename using the hashed content $secureFilename = $hashedContent . randomString(2) . '.' . $extension; @@ -1313,15 +1299,15 @@ function lookupUserPermission($module) { $sql = mysqli_query( $mysqli, "SELECT - urp.user_role_permission_level + user_role_permissions.user_role_permission_level FROM - modules AS m + modules JOIN - user_role_permissions AS urp + user_role_permissions ON - m.module_id = urp.module_id + modules.module_id = user_role_permissions.module_id WHERE - m.module_name = '$module' AND urp.user_role_id = $session_user_role" + module_name = '$module' AND user_role_permissions.user_role_id = $session_user_role" ); $row = mysqli_fetch_array($sql); diff --git a/global_search.php b/global_search.php index 9e1d01e4..5b121bc5 100644 --- a/global_search.php +++ b/global_search.php @@ -91,21 +91,21 @@ if (isset($_GET['query'])) { ORDER BY ticket_id DESC LIMIT 5" ); - $sql_recurring_tickets = mysqli_query($mysqli, "SELECT * FROM scheduled_tickets - LEFT JOIN clients ON scheduled_ticket_client_id = client_id - WHERE (scheduled_ticket_subject LIKE '%$query%' - OR scheduled_ticket_details LIKE '%$query%') + $sql_recurring_tickets = mysqli_query($mysqli, "SELECT * FROM recurring_tickets + LEFT JOIN clients ON recurring_ticket_client_id = client_id + WHERE (recurring_ticket_subject LIKE '%$query%' + OR recurring_ticket_details LIKE '%$query%') $access_permission_query - ORDER BY scheduled_ticket_id DESC LIMIT 5" + ORDER BY recurring_ticket_id DESC LIMIT 5" ); - $sql_logins = mysqli_query($mysqli, "SELECT * FROM logins - LEFT JOIN contacts ON login_contact_id = contact_id - LEFT JOIN clients ON login_client_id = client_id - WHERE login_archived_at IS NULL - AND (login_name LIKE '%$query%' OR login_description LIKE '%$query%') + $sql_credentials = mysqli_query($mysqli, "SELECT * FROM credentials + LEFT JOIN contacts ON credential_contact_id = contact_id + LEFT JOIN clients ON credential_client_id = client_id + WHERE credential_archived_at IS NULL + AND (credential_name LIKE '%$query%' OR credential_description LIKE '%$query%') $access_permission_query - ORDER BY login_id DESC LIMIT 5" + ORDER BY credential_id DESC LIMIT 5" ); $sql_invoices = mysqli_query($mysqli, "SELECT * FROM invoices @@ -544,18 +544,18 @@ if (isset($_GET['query'])) {
    +
    - + - + - + - + @@ -250,12 +250,12 @@ if ($item_type == "Document") { diff --git a/guest/guest_view_quote.php b/guest/guest_view_quote.php index 0baabd22..66317731 100644 --- a/guest/guest_view_quote.php +++ b/guest/guest_view_quote.php @@ -1,11 +1,11 @@

    Oops, something went wrong! Please raise a ticket if you believe this is an error.

    "; - require_once "guest_footer.php"; + require_once "includes/guest_footer.php"; exit(); } @@ -27,7 +27,7 @@ $sql = mysqli_query( if (mysqli_num_rows($sql) !== 1) { // Invalid quote/key echo "

    Oops, something went wrong! Please raise a ticket if you believe this is an error.

    "; - require_once "guest_footer.php"; + require_once "includes/guest_footer.php"; exit(); } @@ -717,5 +717,5 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie

    Oops, something went wrong! Please raise a ticket if you believe this is an error.

    "; - require_once "guest_footer.php"; + require_once "includes/guest_footer.php"; exit(); } @@ -34,7 +34,7 @@ $ticket_sql = mysqli_query($mysqli, if (mysqli_num_rows($ticket_sql) !== 1) { // Invalid invoice/key echo "

    Oops, something went wrong! Please raise a ticket if you believe this is an error.

    "; - require_once "guest_footer.php"; + require_once "includes/guest_footer.php"; exit(); } @@ -208,4 +208,4 @@ if ($ticket_row) { Recurring Tickets - + if ($num_recurring_tickets) { ?> +

    @@ -103,8 +103,8 @@

    Calendar 0) { ?> - + if ($num_calendar_events > 0) { ?> +

    @@ -147,8 +147,8 @@

    Credentials 0) { ?> - + if ($num_credentials > 0) { ?> +

    @@ -277,8 +277,8 @@

    Recurring Invoices 0) { ?> - + if ($num_recurring_invoices) { ?> +

    diff --git a/includes/database_version.php b/includes/database_version.php index 17de9b8e..8b3d3c0d 100644 --- a/includes/database_version.php +++ b/includes/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "1.8.7"); +DEFINE("LATEST_DATABASE_VERSION", "2.0.8"); diff --git a/get_settings.php b/includes/get_settings.php similarity index 97% rename from get_settings.php rename to includes/get_settings.php index f14c2ee1..d142b709 100644 --- a/get_settings.php +++ b/includes/get_settings.php @@ -49,8 +49,8 @@ $config_invoice_late_fee_percent = floatval($row['config_invoice_late_fee_percen $config_invoice_paid_notification_email = $row['config_invoice_paid_notification_email']; // Recurring Invoices -$config_recurring_prefix = $row['config_recurring_prefix']; -$config_recurring_next_number = intval($row['config_recurring_next_number']); +$config_recurring_invoice_prefix = $row['config_recurring_invoice_prefix']; +$config_recurring_invoice_next_number = intval($row['config_recurring_invoice_next_number']); // Quotes $config_quote_prefix = $row['config_quote_prefix']; @@ -142,21 +142,22 @@ $config_whitelabel_key = $row['config_whitelabel_key']; $theme_colors_array = array ( 'lightblue', 'blue', - 'green', 'cyan', - 'yellow', - 'red', - 'black', - 'gray', - 'indigo', - 'navy', - 'purple', - 'fuchsia', - 'pink', - 'maroon', - 'orange', + 'green', + 'olive', 'teal', - 'olive' + 'red', + 'maroon', + 'pink', + 'purple', + 'indigo', + 'fuchsia', + 'yellow', + 'orange', + 'yellow', + 'black', + 'navy', + 'gray' ); $colors_array = array ( diff --git a/includes/get_side_nav_counts.php b/includes/get_side_nav_counts.php index c448632c..6d0afd4b 100644 --- a/includes/get_side_nav_counts.php +++ b/includes/get_side_nav_counts.php @@ -10,7 +10,7 @@ $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS nu $num_active_tickets = $row['num']; // Recurring Ticket Count -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('scheduled_ticket_id') AS num FROM scheduled_tickets LEFT JOIN clients ON client_id = scheduled_ticket_client_id WHERE 1 = 1 $access_permission_query")); +$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_ticket_id') AS num FROM recurring_tickets LEFT JOIN clients ON client_id = recurring_ticket_client_id WHERE 1 = 1 $access_permission_query")); $num_recurring_tickets = $row['num']; // Active Project Count @@ -22,7 +22,7 @@ $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS n $num_open_invoices = $row['num']; // Recurring Invoice Count -$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_id') AS num FROM recurring WHERE recurring_archived_at IS NULL")); +$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_invoice_id') AS num FROM recurring_invoices WHERE recurring_invoice_archived_at IS NULL")); $num_recurring_invoices = $row['num']; // Open Quotes Count diff --git a/includes/inc_all_client.php b/includes/inc_all_client.php index aa25a4d6..49a589d7 100644 --- a/includes/inc_all_client.php +++ b/includes/inc_all_client.php @@ -115,13 +115,13 @@ if (isset($_GET['client_id'])) { $balance = $invoice_amounts - $amount_paid; //Get Monthly Recurring Total - $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_amount) AS recurring_monthly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'month' AND recurring_client_id = $client_id"); + $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_monthly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'month' AND recurring_invoice_client_id = $client_id"); $row = mysqli_fetch_array($sql_recurring_monthly_total); $recurring_monthly_total = floatval($row['recurring_monthly_total']); //Get Yearly Recurring Total - $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_amount) AS recurring_yearly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'year' AND recurring_client_id = $client_id"); + $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_yearly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'year' AND recurring_invoice_client_id = $client_id"); $row = mysqli_fetch_array($sql_recurring_yearly_total); $recurring_yearly_total = floatval($row['recurring_yearly_total']) / 12; @@ -145,8 +145,8 @@ if (isset($_GET['client_id'])) { $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('ticket_id') AS num FROM tickets WHERE ticket_archived_at IS NULL AND ticket_closed_at IS NOT NULL AND ticket_client_id = $client_id")); $num_closed_tickets = $row['num']; - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('scheduled_ticket_id') AS num FROM scheduled_tickets WHERE scheduled_ticket_client_id = $client_id")); - $num_scheduled_tickets = $row['num']; + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_ticket_id') AS num FROM recurring_tickets WHERE recurring_ticket_client_id = $client_id")); + $num_recurring_tickets = $row['num']; $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('service_id') AS num FROM services WHERE service_client_id = $client_id")); $num_services = $row['num']; @@ -154,8 +154,8 @@ if (isset($_GET['client_id'])) { $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('vendor_id') AS num FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id AND vendor_template = 0")); $num_vendors = $row['num']; - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('login_id') AS num FROM logins WHERE login_archived_at IS NULL AND login_client_id = $client_id")); - $num_logins = $row['num']; + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('credential_id') AS num FROM credentials WHERE credential_archived_at IS NULL AND credential_client_id = $client_id")); + $num_credentials = $row['num']; $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('network_id') AS num FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id")); $num_networks = $row['num']; @@ -196,8 +196,8 @@ if (isset($_GET['client_id'])) { $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('quote_id') AS num FROM quotes WHERE quote_archived_at IS NULL AND quote_client_id = $client_id")); $num_quotes = $row['num']; - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_id') AS num FROM recurring WHERE recurring_archived_at IS NULL AND recurring_client_id = $client_id")); - $num_recurring = $row['num']; + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_invoice_id') AS num FROM recurring_invoices WHERE recurring_invoice_archived_at IS NULL AND recurring_invoice_client_id = $client_id")); + $num_recurring_invoices = $row['num']; $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('payment_id') AS num FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id")); $num_payments = $row['num']; @@ -208,8 +208,8 @@ if (isset($_GET['client_id'])) { $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('document_id') AS num FROM documents WHERE document_archived_at IS NULL AND document_client_id = $client_id")); $num_documents = $row['num']; - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('event_id') AS num FROM events WHERE event_client_id = $client_id")); - $num_events = $row['num']; + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('event_id') AS num FROM calendar_events WHERE event_client_id = $client_id")); + $num_calendar_events = $row['num']; $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('trip_id') AS num FROM trips WHERE trip_archived_at IS NULL AND trip_client_id = $client_id")); $num_trips = $row['num']; diff --git a/inc_set_timezone.php b/includes/inc_set_timezone.php similarity index 100% rename from inc_set_timezone.php rename to includes/inc_set_timezone.php diff --git a/settings_localization_array.php b/includes/settings_localization_array.php similarity index 100% rename from settings_localization_array.php rename to includes/settings_localization_array.php diff --git a/js/ajax_modal.js b/js/ajax_modal.js index 75b9b12d..6bb8974c 100644 --- a/js/ajax_modal.js +++ b/js/ajax_modal.js @@ -27,7 +27,6 @@ $(document).on('click', '[data-toggle="ajax-modal"]', function (e) { method: 'GET', data: { id: ajaxId }, dataType: 'json', - cache: false, // Prevent caching if necessary success: function (response) { if (response.error) { alert(response.error); @@ -42,7 +41,7 @@ $(document).on('click', '[data-toggle="ajax-modal"]', function (e) { // Build the modal HTML using the returned title and content. var modalHtml = - '
    ' + + '
    ").appendTo(a)),c.nTHead=p[0],a.children("tbody")),n=(0===n.length&&(n=H("").insertAfter(p)),c.nTBody=n[0],a.children("tfoot")),R=(0===n.length&&(n=H("").appendTo(a)),c.nTFoot=n[0],c.aiDisplay=c.aiDisplayMaster.slice(),c.bInitialised=!0,c.oLanguage);H.extend(!0,R,e.oLanguage),R.sUrl?H.ajax({dataType:"json",url:R.sUrl,success:function(e){B(r.oLanguage,e),H.extend(!0,R,e,c.oInit.oLanguage),G(c,null,"i18n",[c],!0),Me(c)},error:function(){z(c,0,"i18n file loading error",21),Me(c)}}):(G(c,null,"i18n",[c],!0),Me(c))}}),E=null,this)},g=(V.ext=T={buttons:{},classes:{},builder:"bs4/dt-2.2.1",errMode:"alert",feature:[],features:{},search:[],selector:{cell:[],column:[],row:[]},legacy:{ajax:null},pager:{},renderer:{pageButton:{},header:{}},order:{},type:{className:{},detect:[],render:{},search:{},order:{}},_unique:0,fnVersionCheck:V.fnVersionCheck,iApiIndex:0,sVersion:V.version},H.extend(T,{afnFiltering:T.search,aTypes:T.type.detect,ofnSearch:T.type.search,oSort:T.type.order,afnSortData:T.order,aoFeatures:T.feature,oStdClasses:T.classes,oPagination:T.pager}),H.extend(V.ext.classes,{container:"dt-container",empty:{row:"dt-empty"},info:{container:"dt-info"},layout:{row:"dt-layout-row",cell:"dt-layout-cell",tableRow:"dt-layout-table",tableCell:"",start:"dt-layout-start",end:"dt-layout-end",full:"dt-layout-full"},length:{container:"dt-length",select:"dt-input"},order:{canAsc:"dt-orderable-asc",canDesc:"dt-orderable-desc",isAsc:"dt-ordering-asc",isDesc:"dt-ordering-desc",none:"dt-orderable-none",position:"sorting_"},processing:{container:"dt-processing"},scrolling:{body:"dt-scroll-body",container:"dt-scroll",footer:{self:"dt-scroll-foot",inner:"dt-scroll-footInner"},header:{self:"dt-scroll-head",inner:"dt-scroll-headInner"}},search:{container:"dt-search",input:"dt-input"},table:"dataTable",tbody:{cell:"",row:""},thead:{cell:"",row:""},tfoot:{cell:"",row:""},paging:{active:"current",button:"dt-paging-button",container:"dt-paging",disabled:"disabled",nav:""}}),{}),N=/[\r\n\u2028]/g,F=/<([^>]*>)/g,O=Math.pow(2,28),j=/^\d{2,4}[./-]\d{1,2}[./-]\d{1,2}([T ]{1}\d{1,2}[:.]\d{2}([.:]\d{2})?)?$/,R=new RegExp("(\\"+["/",".","*","+","?","|","(",")","[","]","{","}","\\","$","^","-"].join("|\\")+")","g"),P=/['\u00A0,$£€¥%\u2009\u202F\u20BD\u20a9\u20BArfkɃΞ]/gi,_=function(e){return!e||!0===e||"-"===e},E=function(e,t){return g[t]||(g[t]=new RegExp(Pe(t),"g")),"string"==typeof e&&"."!==t?e.replace(/\./g,"").replace(g[t],"."):e},b=function(e,t,n){var r=[],a=0,o=e.length;if(void 0!==n)for(;aO)throw new Error("Exceeded max str len");var t;for(e=e.replace(F,"");(e=(t=e).replace(/ - - $contact_name linked with credential $login_name"; + $_SESSION['alert_message'] = "Contact $contact_name linked with credential $credential_name"; header("Location: " . $_SERVER["HTTP_REFERER"]); @@ -1079,26 +1063,26 @@ if (isset($_GET['unlink_credential_from_contact'])) { enforceUserPermission('module_support', 2); $contact_id = intval($_GET['contact_id']); - $login_id = intval($_GET['login_id']); + $credential_id = intval($_GET['credential_id']); - // Get login Name and Client ID for logging - $sql_login = mysqli_query($mysqli,"SELECT login_name, login_client_id FROM logins WHERE login_id = $login_id"); - $row = mysqli_fetch_array($sql_login); - $login_name = sanitizeInput($row['login_name']); - $client_id = intval($row['login_client_id']); + // Get credential Name and Client ID for logging + $sql_credential = mysqli_query($mysqli,"SELECT credential_name, credential_client_id FROM credentials WHERE credential_id = $credential_id"); + $row = mysqli_fetch_array($sql_credential); + $credential_name = sanitizeInput($row['credential_name']); + $client_id = intval($row['credential_client_id']); // Get Contact Name for logging $sql_contact = mysqli_query($mysqli,"SELECT contact_name FROM contacts WHERE contact_id = $contact_id"); $row = mysqli_fetch_array($sql_contact); $contact_name = sanitizeInput($row['contact_name']); - mysqli_query($mysqli,"UPDATE logins SET login_contact_id = 0 WHERE login_id = $login_id"); + mysqli_query($mysqli,"UPDATE credentials SET credential_contact_id = 0 WHERE credential_id = $credential_id"); //Logging - logAction("Credential", "Unlink", "$session_name unlinked contact $contact_name from credential $login_name", $client_id, $login_id); + logAction("Credential", "Unlink", "$session_name unlinked contact $contact_name from credential $credential_name", $client_id, $credential_id); $_SESSION['alert_type'] = "error"; - $_SESSION['alert_message'] = "Credential $login_name unlinked from Contact $contact_name"; + $_SESSION['alert_message'] = "Credential $credential_name unlinked from Contact $contact_name"; header("Location: " . $_SERVER["HTTP_REFERER"]); diff --git a/post/user/credential.php b/post/user/credential.php index ac6f899c..49d07e06 100644 --- a/post/user/credential.php +++ b/post/user/credential.php @@ -1,31 +1,31 @@ $name created"; @@ -33,146 +33,139 @@ if (isset($_POST['add_login'])) { } -if (isset($_POST['edit_login'])) { +if (isset($_POST['edit_credential'])) { enforceUserPermission('module_credential', 2); require_once 'post/user/credential_model.php'; - $login_id = intval($_POST['login_id']); + $credential_id = intval($_POST['credential_id']); // Determine if the password has actually changed (salt is rotated on all updates, so have to dencrypt both and compare) - $current_password = decryptLoginEntry(mysqli_fetch_row(mysqli_query($mysqli, "SELECT login_password FROM logins WHERE login_id = $login_id"))[0]); // Get current login password - $new_password = decryptLoginEntry($password); // Get the new password being set (already encrypted by the login model) + $current_password = decryptCredentialEntry(mysqli_fetch_row(mysqli_query($mysqli, "SELECT credential_password FROM credentials WHERE credential_id = $credential_id"))[0]); // Get current credential password + $new_password = decryptCredentialEntry($password); // Get the new password being set (already encrypted by the credential model) if ($current_password !== $new_password) { // The password has been changed - update the DB to track - mysqli_query($mysqli, "UPDATE logins SET login_password_changed_at = NOW() WHERE login_id = $login_id"); + mysqli_query($mysqli, "UPDATE credentials SET credential_password_changed_at = NOW() WHERE credential_id = $credential_id"); } - // Update the login entry with the new details - mysqli_query($mysqli,"UPDATE logins SET login_name = '$name', login_description = '$description', login_uri = '$uri', login_uri_2 = '$uri_2', login_username = '$username', login_password = '$password', login_otp_secret = '$otp_secret', login_note = '$note', login_important = $important, login_contact_id = $contact_id, login_asset_id = $asset_id WHERE login_id = $login_id"); + // Update the credential entry with the new details + mysqli_query($mysqli,"UPDATE credentials SET credential_name = '$name', credential_description = '$description', credential_uri = '$uri', credential_uri_2 = '$uri_2', credential_username = '$username', credential_password = '$password', credential_otp_secret = '$otp_secret', credential_note = '$note', credential_important = $important, credential_contact_id = $contact_id, credential_asset_id = $asset_id WHERE credential_id = $credential_id"); // Tags // Delete existing tags - mysqli_query($mysqli, "DELETE FROM login_tags WHERE login_id = $login_id"); + mysqli_query($mysqli, "DELETE FROM credential_tags WHERE credential_id = $credential_id"); // Add new tags if(isset($_POST['tags'])) { foreach($_POST['tags'] as $tag) { $tag = intval($tag); - mysqli_query($mysqli, "INSERT INTO login_tags SET login_id = $login_id, tag_id = $tag"); + mysqli_query($mysqli, "INSERT INTO credential_tags SET credential_id = $credential_id, tag_id = $tag"); } } // Logging - logAction("Credential", "Edit", "$session_name edited credential $name", $client_id, $login_id); + logAction("Credential", "Edit", "$session_name edited credential $name", $client_id, $credential_id); - $_SESSION['alert_message'] = "Login $name edited"; + $_SESSION['alert_message'] = "Credential $name edited"; header("Location: " . $_SERVER["HTTP_REFERER"]); } -if(isset($_GET['archive_login'])){ +if(isset($_GET['archive_credential'])){ enforceUserPermission('module_credential', 2); - $login_id = intval($_GET['archive_login']); + $credential_id = intval($_GET['archive_credential']); // Get Name and Client ID for logging and alert message - $sql = mysqli_query($mysqli,"SELECT login_name, login_client_id FROM logins WHERE login_id = $login_id"); + $sql = mysqli_query($mysqli,"SELECT credential_name, credential_client_id FROM credentials WHERE credential_id = $credential_id"); $row = mysqli_fetch_array($sql); - $login_name = sanitizeInput($row['login_name']); - $client_id = intval($row['login_client_id']); + $credential_name = sanitizeInput($row['credential_name']); + $client_id = intval($row['credential_client_id']); - mysqli_query($mysqli,"UPDATE logins SET login_archived_at = NOW() WHERE login_id = $login_id"); + mysqli_query($mysqli,"UPDATE credentials SET credential_archived_at = NOW() WHERE credential_id = $credential_id"); //logging - logAction("Credential", "Archive", "$session_name archived credential $login_name", $client_id, $login_id); + logAction("Credential", "Archive", "$session_name archived credential $credential_name", $client_id, $credential_id); $_SESSION['alert_type'] = "error"; - $_SESSION['alert_message'] = "Credential $login_name archived"; + $_SESSION['alert_message'] = "Credential $credential_name archived"; header("Location: " . $_SERVER["HTTP_REFERER"]); } -if(isset($_GET['unarchive_login'])){ +if(isset($_GET['unarchive_credential'])){ enforceUserPermission('module_credential', 2); - $login_id = intval($_GET['unarchive_login']); + $credential_id = intval($_GET['unarchive_credential']); // Get Name and Client ID for logging and alert message - $sql = mysqli_query($mysqli,"SELECT login_name, login_client_id FROM logins WHERE login_id = $login_id"); + $sql = mysqli_query($mysqli,"SELECT credential_name, credential_client_id FROM credentials WHERE credential_id = $credential_id"); $row = mysqli_fetch_array($sql); - $login_name = sanitizeInput($row['login_name']); - $client_id = intval($row['login_client_id']); + $credential_name = sanitizeInput($row['credential_name']); + $client_id = intval($row['credential_client_id']); - mysqli_query($mysqli,"UPDATE logins SET login_archived_at = NULL WHERE login_id = $login_id"); + mysqli_query($mysqli,"UPDATE credentials SET credential_archived_at = NULL WHERE credential_id = $credential_id"); //Logging - logAction("Credential", "Unarchive", "$session_name unarchived credential $login_name", $client_id, $login_id); + logAction("Credential", "Unarchive", "$session_name unarchived credential $credential_name", $client_id, $credential_id); - $_SESSION['alert_message'] = "Credential $login_name restored"; + $_SESSION['alert_message'] = "Credential $credential_name restored"; header("Location: " . $_SERVER["HTTP_REFERER"]); } -if (isset($_GET['delete_login'])) { +if (isset($_GET['delete_credential'])) { enforceUserPermission('module_credential', 3); - $login_id = intval($_GET['delete_login']); + $credential_id = intval($_GET['delete_credential']); - // Get Login Name and Client ID for logging and alert message - $sql = mysqli_query($mysqli,"SELECT login_name, login_client_id FROM logins WHERE login_id = $login_id"); + // Get Credential Name and Client ID for logging and alert message + $sql = mysqli_query($mysqli,"SELECT credential_name, credential_client_id FROM credentials WHERE credential_id = $credential_id"); $row = mysqli_fetch_array($sql); - $login_name = sanitizeInput($row['login_name']); - $client_id = intval($row['login_client_id']); - - mysqli_query($mysqli,"DELETE FROM logins WHERE login_id = $login_id"); - - // Remove Relations - mysqli_query($mysqli,"DELETE FROM contact_logins WHERE login_id = $login_id"); - mysqli_query($mysqli,"DELETE FROM service_logins WHERE login_id = $login_id"); - mysqli_query($mysqli,"DELETE FROM software_logins WHERE login_id = $login_id"); - mysqli_query($mysqli,"DELETE FROM vendor_logins WHERE login_id = $login_id"); + $credential_name = sanitizeInput($row['credential_name']); + $client_id = intval($row['credential_client_id']); + mysqli_query($mysqli,"DELETE FROM credentials WHERE credential_id = $credential_id"); // Logging - logAction("Credential", "Delete", "$session_name deleted credential $login_name", $client_id); + logAction("Credential", "Delete", "$session_name deleted credential $credential_name", $client_id); $_SESSION['alert_type'] = "error"; - $_SESSION['alert_message'] = "Credential $login_name deleted"; + $_SESSION['alert_message'] = "Credential $credential_name deleted"; header("Location: " . $_SERVER["HTTP_REFERER"]); } -if (isset($_POST['bulk_assign_login_tags'])) { +if (isset($_POST['bulk_assign_credential_tags'])) { enforceUserPermission('module_credential', 2); // Assign tags to Selected Credentials - if (isset($_POST['login_ids'])) { + if (isset($_POST['credential_ids'])) { // Get Selected Credential Count - $count = count($_POST['login_ids']); + $count = count($_POST['credential_ids']); - foreach($_POST['login_ids'] as $login_id) { - $login_id = intval($login_id); + foreach($_POST['credential_ids'] as $credential_id) { + $credential_id = intval($credential_id); // Get Contact Details for Logging - $sql = mysqli_query($mysqli,"SELECT login_name, login_client_id FROM logins WHERE login_id = $login_id"); + $sql = mysqli_query($mysqli,"SELECT credential_name, credential_client_id FROM credentials WHERE credential_id = $credential_id"); $row = mysqli_fetch_array($sql); - $login_name = sanitizeInput($row['login_name']); - $client_id = intval($row['login_client_id']); + $credential_name = sanitizeInput($row['credential_name']); + $client_id = intval($row['credential_client_id']); if($_POST['bulk_remove_tags']) { // Delete tags if chosed to do so - mysqli_query($mysqli, "DELETE FROM login_tags WHERE login_id = $login_id"); + mysqli_query($mysqli, "DELETE FROM credential_tags WHERE credential_id = $credential_id"); } // Add new tags @@ -180,15 +173,15 @@ if (isset($_POST['bulk_assign_login_tags'])) { foreach($_POST['bulk_tags'] as $tag) { $tag = intval($tag); - $sql = mysqli_query($mysqli,"SELECT * FROM login_tags WHERE login_id = $login_id AND tag_id = $tag"); + $sql = mysqli_query($mysqli,"SELECT * FROM credential_tags WHERE credential_id = $credential_id AND tag_id = $tag"); if (mysqli_num_rows($sql) == 0) { - mysqli_query($mysqli, "INSERT INTO login_tags SET login_id = $login_id, tag_id = $tag"); + mysqli_query($mysqli, "INSERT INTO credential_tags SET credential_id = $credential_id, tag_id = $tag"); } } } // Logging - logAction("Credential", "Edit", "$session_name added tags to $login_name", $client_id, $login_id); + logAction("Credential", "Edit", "$session_name added tags to $credential_name", $client_id, $credential_id); $_SESSION['alert_message'] = "Assigned tags for $count credentials"; @@ -202,31 +195,31 @@ if (isset($_POST['bulk_assign_login_tags'])) { } -if (isset($_POST['bulk_archive_logins'])) { +if (isset($_POST['bulk_archive_credentials'])) { enforceUserPermission('module_credential', 2); validateCSRFToken($_POST['csrf_token']); - if (isset($_POST['login_ids'])) { + if (isset($_POST['credential_ids'])) { // Get Selected Credential Count - $count = count($_POST['login_ids']); + $count = count($_POST['credential_ids']); // Cycle through array and archive each record - foreach ($_POST['login_ids'] as $login_id) { + foreach ($_POST['credential_ids'] as $credential_id) { - $login_id = intval($login_id); + $credential_id = intval($credential_id); // Get Name and Client ID for logging and alert message - $sql = mysqli_query($mysqli,"SELECT login_name, login_client_id FROM logins WHERE login_id = $login_id"); + $sql = mysqli_query($mysqli,"SELECT credential_name, credential_client_id FROM credentials WHERE credential_id = $credential_id"); $row = mysqli_fetch_array($sql); - $login_name = sanitizeInput($row['login_name']); - $client_id = intval($row['login_client_id']); + $credential_name = sanitizeInput($row['credential_name']); + $client_id = intval($row['credential_client_id']); - mysqli_query($mysqli,"UPDATE logins SET login_archived_at = NOW() WHERE login_id = $login_id"); + mysqli_query($mysqli,"UPDATE credentials SET credential_archived_at = NOW() WHERE credential_id = $credential_id"); // Individual Contact logging - logAction("Credential", "Archive", "$session_name archived credential $login_name", $client_id, $login_id); + logAction("Credential", "Archive", "$session_name archived credential $credential_name", $client_id, $credential_id); } // Bulk Logging @@ -240,32 +233,32 @@ if (isset($_POST['bulk_archive_logins'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } -if (isset($_POST['bulk_unarchive_logins'])) { +if (isset($_POST['bulk_unarchive_credentials'])) { enforceUserPermission('module_credential', 2); validateCSRFToken($_POST['csrf_token']); - if (isset($_POST['login_ids'])) { + if (isset($_POST['credential_ids'])) { // Get Selected Credential Count - $count = count($_POST['login_ids']); + $count = count($_POST['credential_ids']); // Cycle through array and unarchive - foreach ($_POST['login_ids'] as $login_id) { + foreach ($_POST['credential_ids'] as $credential_id) { - $login_id = intval($login_id); + $credential_id = intval($credential_id); // Get Name and Client ID for logging and alert message - $sql = mysqli_query($mysqli,"SELECT login_name, login_client_id FROM logins WHERE login_id = $login_id"); + $sql = mysqli_query($mysqli,"SELECT credential_name, credential_client_id FROM credentials WHERE credential_id = $credential_id"); $row = mysqli_fetch_array($sql); - $login_name = sanitizeInput($row['login_name']); - $client_id = intval($row['login_client_id']); + $credential_name = sanitizeInput($row['credential_name']); + $client_id = intval($row['credential_client_id']); - mysqli_query($mysqli,"UPDATE logins SET login_archived_at = NULL WHERE login_id = $login_id"); + mysqli_query($mysqli,"UPDATE credentials SET credential_archived_at = NULL WHERE credential_id = $credential_id"); // Individual logging - logAction("Credential", "Unarchive", "$session_name unarchived credential $login_name", $client_id, $login_id); + logAction("Credential", "Unarchive", "$session_name unarchived credential $credential_name", $client_id, $credential_id); } @@ -279,38 +272,32 @@ if (isset($_POST['bulk_unarchive_logins'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } -if (isset($_POST['bulk_delete_logins'])) { +if (isset($_POST['bulk_delete_credentials'])) { enforceUserPermission('module_credential', 3); validateCSRFToken($_POST['csrf_token']); - if (isset($_POST['login_ids'])) { + if (isset($_POST['credential_ids'])) { // Get Selected Credential Count - $count = count($_POST['login_ids']); + $count = count($_POST['credential_ids']); // Cycle through array and delete each record - foreach ($_POST['login_ids'] as $login_id) { + foreach ($_POST['credential_ids'] as $credential_id) { - $login_id = intval($login_id); + $credential_id = intval($credential_id); // Get Name and Client ID for logging and alert message - $sql = mysqli_query($mysqli,"SELECT login_name, login_client_id FROM logins WHERE login_id = $login_id"); + $sql = mysqli_query($mysqli,"SELECT credential_name, credential_client_id FROM credentials WHERE credential_id = $credential_id"); $row = mysqli_fetch_array($sql); - $login_name = sanitizeInput($row['login_name']); - $client_id = intval($row['login_client_id']); + $credential_name = sanitizeInput($row['credential_name']); + $client_id = intval($row['credential_client_id']); - mysqli_query($mysqli, "DELETE FROM logins WHERE login_id = $login_id AND login_client_id = $client_id"); - - // Remove Relations - mysqli_query($mysqli,"DELETE FROM contact_logins WHERE login_id = $login_id"); - mysqli_query($mysqli,"DELETE FROM service_logins WHERE login_id = $login_id"); - mysqli_query($mysqli,"DELETE FROM software_logins WHERE login_id = $login_id"); - mysqli_query($mysqli,"DELETE FROM vendor_logins WHERE login_id = $login_id"); + mysqli_query($mysqli, "DELETE FROM credentials WHERE credential_id = $credential_id AND credential_client_id = $client_id"); // Logging - logAction("Credential", "Delete", "$session_name deleted credential $login_name", $client_id); + logAction("Credential", "Delete", "$session_name deleted credential $credential_name", $client_id); } @@ -331,13 +318,13 @@ if (isset($_POST['export_credentials_csv'])) { if (isset($_POST['client_id'])) { $client_id = intval($_POST['client_id']); - $client_query = "AND login_client_id = $client_id"; + $client_query = "AND credential_client_id = $client_id"; } else { $client_query = ''; } //get records from database - $sql = mysqli_query($mysqli,"SELECT * FROM logins LEFT JOIN clients ON client_id = login_client_id WHERE login_archived_at IS NULL $client_query ORDER BY login_name ASC"); + $sql = mysqli_query($mysqli,"SELECT * FROM credentials LEFT JOIN clients ON client_id = credential_client_id WHERE credential_archived_at IS NULL $client_query ORDER BY credential_name ASC"); $row = mysqli_fetch_array($sql); $num_rows = mysqli_num_rows($sql); @@ -355,9 +342,9 @@ if (isset($_POST['export_credentials_csv'])) { //output each row of the data, format line as csv and write to file pointer while($row = mysqli_fetch_assoc($sql)){ - $login_username = decryptLoginEntry($row['login_username']); - $login_password = decryptLoginEntry($row['login_password']); - $lineData = array($row['login_name'], $row['login_description'], $login_username, $login_password, $row['login_uri']); + $credential_username = decryptCredentialEntry($row['credential_username']); + $credential_password = decryptCredentialEntry($row['credential_password']); + $lineData = array($row['credential_name'], $row['credential_description'], $credential_username, $credential_password, $row['credential_uri']); fputcsv($f, $lineData, $delimiter); } @@ -427,7 +414,7 @@ if (isset($_POST["import_credentials_csv"])) { $duplicate_detect = 0; if (isset($column[0])) { $name = sanitizeInput($column[0]); - if (mysqli_num_rows(mysqli_query($mysqli,"SELECT * FROM logins WHERE login_name = '$name' AND login_client_id = $client_id")) > 0){ + if (mysqli_num_rows(mysqli_query($mysqli,"SELECT * FROM credentials WHERE credential_name = '$name' AND credential_client_id = $client_id")) > 0){ $duplicate_detect = 1; } } @@ -435,10 +422,10 @@ if (isset($_POST["import_credentials_csv"])) { $description = sanitizeInput($column[1]); } if (isset($column[2])) { - $username = sanitizeInput(encryptLoginEntry($column[2])); + $username = sanitizeInput(encryptCredentialEntry($column[2])); } if (isset($column[3])) { - $password = sanitizeInput(encryptLoginEntry($column[3])); + $password = sanitizeInput(encryptCredentialEntry($column[3])); } if (isset($column[4])) { $uri = sanitizeInput($column[4]); @@ -447,7 +434,7 @@ if (isset($_POST["import_credentials_csv"])) { // Check if duplicate was detected if ($duplicate_detect == 0){ //Add - mysqli_query($mysqli,"INSERT INTO logins SET login_name = '$name', login_description = '$description', login_uri = '$uri', login_username = '$username', login_password = '$password', login_client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO credentials SET credential_name = '$name', credential_description = '$description', credential_uri = '$uri', credential_username = '$username', credential_password = '$password', credential_client_id = $client_id"); $row_count = $row_count + 1; }else{ $duplicate_count = $duplicate_count + 1; diff --git a/post/user/credential_model.php b/post/user/credential_model.php index 6ab57b48..0d3818dd 100644 --- a/post/user/credential_model.php +++ b/post/user/credential_model.php @@ -1,5 +1,5 @@ $invoice_prefix$invoice_number"; - header("Location: recurring_invoice.php?recurring_id=$recurring_id"); + header("Location: recurring_invoice.php?recurring_invoice_id=$recurring_invoice_id"); } -if (isset($_POST['add_recurring'])) { +if (isset($_POST['add_recurring_invoice'])) { $client_id = intval($_POST['client']); $frequency = sanitizeInput($_POST['frequency']); @@ -200,57 +200,57 @@ if (isset($_POST['add_recurring'])) { $scope = sanitizeInput($_POST['scope']); //Get the last Recurring Number and add 1 for the new Recurring number - $recurring_number = $config_recurring_next_number; - $new_config_recurring_next_number = $config_recurring_next_number + 1; - mysqli_query($mysqli,"UPDATE settings SET config_recurring_next_number = $new_config_recurring_next_number WHERE company_id = 1"); + $recurring_invoice_number = $config_recurring_invoice_next_number; + $new_config_recurring_invoice_next_number = $config_recurring_invoice_next_number + 1; + mysqli_query($mysqli,"UPDATE settings SET config_recurring_invoice_next_number = $new_config_recurring_invoice_next_number WHERE company_id = 1"); - mysqli_query($mysqli,"INSERT INTO recurring SET recurring_prefix = '$config_recurring_prefix', recurring_number = $recurring_number, recurring_scope = '$scope', recurring_frequency = '$frequency', recurring_next_date = '$start_date', recurring_category_id = $category, recurring_status = 1, recurring_currency_code = '$session_company_currency', recurring_client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO recurring_invoices SET recurring_invoice_prefix = '$config_recurring_invoice_prefix', recurring_invoice_number = $recurring_invoice_number, recurring_invoice_scope = '$scope', recurring_invoice_frequency = '$frequency', recurring_invoice_next_date = '$start_date', recurring_invoice_category_id = $category, recurring_invoice_status = 1, recurring_invoice_currency_code = '$session_company_currency', recurring_invoice_client_id = $client_id"); - $recurring_id = mysqli_insert_id($mysqli); + $recurring_invoice_id = mysqli_insert_id($mysqli); - mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Active', history_description = 'Recurring Invoice created', history_recurring_id = $recurring_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Active', history_description = 'Recurring Invoice created', history_recurring_invoice_id = $recurring_invoice_id"); //Logging - logAction("Recurring Invoice", "Create", "$session_name created recurring invoice $config_recurring_prefix$recurring_number - $scope", $client_id, $recurring_id); + logAction("Recurring Invoice", "Create", "$session_name created recurring invoice $config_recurring_invoice_prefix$recurring_invoice_number - $scope", $client_id, $recurring_invoice_id); - $_SESSION['alert_message'] = "Recurring Invoice $config_recurring_prefix$recurring_number created"; + $_SESSION['alert_message'] = "Recurring Invoice $config_recurring_invoice_prefix$recurring_invoice_number created"; - header("Location: recurring_invoice.php?recurring_id=$recurring_id"); + header("Location: recurring_invoice.php?recurring_invoice_id=$recurring_invoice_id"); } -if (isset($_POST['edit_recurring'])) { +if (isset($_POST['edit_recurring_invoice'])) { - $recurring_id = intval($_POST['recurring_id']); + $recurring_invoice_id = intval($_POST['recurring_invoice_id']); $frequency = sanitizeInput($_POST['frequency']); $next_date = sanitizeInput($_POST['next_date']); $category = intval($_POST['category']); $scope = sanitizeInput($_POST['scope']); $status = intval($_POST['status']); - $recurring_discount = floatval($_POST['recurring_discount']); + $recurring_invoice_discount = floatval($_POST['recurring_invoice_discount']); // Get Recurring Invoice Details and Client ID for Logging - $sql = mysqli_query($mysqli,"SELECT recurring_prefix, recurring_number, recurring_client_id FROM recurring WHERE recurring_id = $recurring_id"); + $sql = mysqli_query($mysqli,"SELECT recurring_invoice_prefix, recurring_invoice_number, recurring_invoice_client_id FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); $row = mysqli_fetch_array($sql); - $recurring_invoice_prefix = sanitizeInput($row['recurring_prefix']); - $recurring_invoice_number = intval($row['recurring_number']); - $client_id = intval($row['recurring_client_id']); + $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); + $recurring_invoice_number = intval($row['recurring_invoice_number']); + $client_id = intval($row['recurring_invoice_client_id']); //Calculate new total - $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_id = $recurring_id"); - $recurring_amount = 0; + $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id"); + $recurring_invoice_amount = 0; while($row = mysqli_fetch_array($sql)) { $item_total = floatval($row['item_total']); - $recurring_amount = $recurring_amount + $item_total; + $recurring_invoice_amount = $recurring_invoice_amount + $item_total; } - $recurring_amount = $recurring_amount - $recurring_discount; + $recurring_invoice_amount = $recurring_invoice_amount - $recurring_invoice_discount; - mysqli_query($mysqli,"UPDATE recurring SET recurring_scope = '$scope', recurring_frequency = '$frequency', recurring_next_date = '$next_date', recurring_category_id = $category, recurring_discount_amount = $recurring_discount, recurring_amount = $recurring_amount, recurring_status = $status WHERE recurring_id = $recurring_id"); + mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_scope = '$scope', recurring_invoice_frequency = '$frequency', recurring_invoice_next_date = '$next_date', recurring_invoice_category_id = $category, recurring_invoice_discount_amount = $recurring_invoice_discount, recurring_invoice_amount = $recurring_invoice_amount, recurring_invoice_status = $status WHERE recurring_invoice_id = $recurring_invoice_id"); - mysqli_query($mysqli,"INSERT INTO history SET history_status = '$status', history_description = 'Recurring Invoice edited', history_recurring_id = $recurring_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_status = '$status', history_description = 'Recurring Invoice edited', history_recurring_invoice_id = $recurring_invoice_id"); // Logging - logAction("Recurring Invoice", "Edit", "$session_name edited recurring invoice $recurring_invoice_prefix$recurring_invoice_number - $scope", $client_id, $recurring_id); + logAction("Recurring Invoice", "Edit", "$session_name edited recurring invoice $recurring_invoice_prefix$recurring_invoice_number - $scope", $client_id, $recurring_invoice_id); $_SESSION['alert_message'] = "Recurring Invoice $recurring_invoice_prefix$recurring_invoice_number edited"; @@ -258,28 +258,28 @@ if (isset($_POST['edit_recurring'])) { } -if (isset($_GET['delete_recurring'])) { - $recurring_id = intval($_GET['delete_recurring']); +if (isset($_GET['delete_recurring_invoice'])) { + $recurring_invoice_id = intval($_GET['delete_recurring_invoice']); // Get Recurring Invoice Details and Client ID for Logging - $sql = mysqli_query($mysqli,"SELECT recurring_prefix, recurring_number, recurring_scope, recurring_client_id FROM recurring WHERE recurring_id = $recurring_id"); + $sql = mysqli_query($mysqli,"SELECT recurring_invoice_prefix, recurring_invoice_number, recurring_invoice_scope, recurring_invoice_client_id FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); $row = mysqli_fetch_array($sql); - $recurring_invoice_prefix = sanitizeInput($row['recurring_prefix']); - $recurring_invoice_number = intval($row['recurring_number']); - $recurring_invoice_scope = sanitizeInput($row['recurring_scope']); - $client_id = intval($row['recurring_client_id']); + $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); + $recurring_invoice_number = intval($row['recurring_invoice_number']); + $recurring_invoice_scope = sanitizeInput($row['recurring_invoice_scope']); + $client_id = intval($row['recurring_invoice_client_id']); - mysqli_query($mysqli,"DELETE FROM recurring WHERE recurring_id = $recurring_id"); + mysqli_query($mysqli,"DELETE FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); //Delete Items Associated with the Recurring - $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_id = $recurring_id"); + $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id"); while($row = mysqli_fetch_array($sql)) { $item_id = intval($row['item_id']); mysqli_query($mysqli,"DELETE FROM invoice_items WHERE item_id = $item_id"); } //Delete History Associated with the Invoice - $sql = mysqli_query($mysqli,"SELECT * FROM history WHERE history_recurring_id = $recurring_id"); + $sql = mysqli_query($mysqli,"SELECT * FROM history WHERE history_recurring_invoice_id = $recurring_invoice_id"); while($row = mysqli_fetch_array($sql)) { $history_id = intval($row['history_id']); mysqli_query($mysqli,"DELETE FROM history WHERE history_id = $history_id"); @@ -295,9 +295,9 @@ if (isset($_GET['delete_recurring'])) { } -if (isset($_POST['add_recurring_item'])) { +if (isset($_POST['add_recurring_invoice_item'])) { - $recurring_id = intval($_POST['recurring_id']); + $recurring_invoice_id = intval($_POST['recurring_invoice_id']); $name = sanitizeInput($_POST['name']); $description = sanitizeInput($_POST['description']); $qty = floatval($_POST['qty']); @@ -318,29 +318,29 @@ if (isset($_POST['add_recurring_item'])) { $total = $subtotal + $tax_amount; - mysqli_query($mysqli,"INSERT INTO invoice_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = $price, item_subtotal = $subtotal, item_tax = $tax_amount, item_total = $total, item_tax_id = $tax_id, item_order = $item_order, item_recurring_id = $recurring_id"); + mysqli_query($mysqli,"INSERT INTO invoice_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = $price, item_subtotal = $subtotal, item_tax = $tax_amount, item_total = $total, item_tax_id = $tax_id, item_order = $item_order, item_recurring_invoice_id = $recurring_invoice_id"); - $sql = mysqli_query($mysqli,"SELECT * FROM recurring WHERE recurring_id = $recurring_id"); + $sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); $row = mysqli_fetch_array($sql); - $recurring_discount = floatval($row['recurring_discount_amount']); - $recurring_invoice_prefix = sanitizeInput($row['recurring_prefix']); - $recurring_invoice_number = intval($row['recurring_number']); - $client_id = intval($row['recurring_client_id']); + $recurring_invoice_discount = floatval($row['recurring_invoice_discount_amount']); + $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); + $recurring_invoice_number = intval($row['recurring_invoice_number']); + $client_id = intval($row['recurring_invoice_client_id']); //add up all the items - $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_id = $recurring_id"); - $recurring_amount = 0; + $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id"); + $recurring_invoice_amount = 0; while($row = mysqli_fetch_array($sql)) { $item_total = floatval($row['item_total']); - $recurring_amount = $recurring_amount + $item_total; + $recurring_invoice_amount = $recurring_invoice_amount + $item_total; } - $recurring_amount = $recurring_amount - $recurring_discount; + $recurring_invoice_amount = $recurring_invoice_amount - $recurring_invoice_discount; - mysqli_query($mysqli,"UPDATE recurring SET recurring_amount = $recurring_amount WHERE recurring_id = $recurring_id"); + mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_amount = $recurring_invoice_amount WHERE recurring_invoice_id = $recurring_invoice_id"); // Logging - logAction("Recurring Invoice", "Edit", "$session_name added item $name to recurring invoice $recurring_invoice_prefix$recurring_invoice_number", $client_id, $recurring_id); + logAction("Recurring Invoice", "Edit", "$session_name added item $name to recurring invoice $recurring_invoice_prefix$recurring_invoice_number", $client_id, $recurring_invoice_id); $_SESSION['alert_message'] = "Item $name added to Recurring Invoice"; @@ -348,22 +348,22 @@ if (isset($_POST['add_recurring_item'])) { } -if (isset($_POST['recurring_note'])) { +if (isset($_POST['recurring_invoice_note'])) { - $recurring_id = intval($_POST['recurring_id']); + $recurring_invoice_id = intval($_POST['recurring_invoice_id']); $note = sanitizeInput($_POST['note']); // Get Recurring details for logging - $sql = mysqli_query($mysqli,"SELECT recurring_prefix, recurring_number, recurring_client_id FROM recurring WHERE recurring_id = $recurring_id"); + $sql = mysqli_query($mysqli,"SELECT recurring_invoice_prefix, recurring_invoice_number, recurring_invoice_client_id FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); $row = mysqli_fetch_array($sql); - $recurring_invoice_prefix = sanitizeInput($row['recurring_prefix']); - $recurring_invoice_number = intval($row['recurring_number']); - $client_id = intval($row['recurring_client_id']); + $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); + $recurring_invoice_number = intval($row['recurring_invoice_number']); + $client_id = intval($row['recurring_invoice_client_id']); - mysqli_query($mysqli,"UPDATE recurring SET recurring_note = '$note' WHERE recurring_id = $recurring_id"); + mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_note = '$note' WHERE recurring_invoice_id = $recurring_invoice_id"); // Logging - logAction("Recurring Invoice", "Edit", "$session_name added note to recurring invoice $recurring_invoice_prefix$recurring_invoice_number", $client_id, $recurring_id); + logAction("Recurring Invoice", "Edit", "$session_name added note to recurring invoice $recurring_invoice_prefix$recurring_invoice_number", $client_id, $recurring_invoice_id); $_SESSION['alert_message'] = "Notes added"; @@ -371,26 +371,26 @@ if (isset($_POST['recurring_note'])) { } -if (isset($_GET['delete_recurring_item'])) { - $item_id = intval($_GET['delete_recurring_item']); +if (isset($_GET['delete_recurring_invoice_item'])) { + $item_id = intval($_GET['delete_recurring_invoice_item']); $sql = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_id = $item_id"); $row = mysqli_fetch_array($sql); - $recurring_id = intval($row['item_recurring_id']); + $recurring_invoice_id = intval($row['item_recurring_invoice_id']); $item_name = sanitizeInput($row['item_name']); $item_subtotal = floatval($row['item_subtotal']); $item_tax = floatval($row['item_tax']); $item_total = floatval($row['item_total']); - $sql = mysqli_query($mysqli,"SELECT * FROM recurring WHERE recurring_id = $recurring_id"); + $sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); $row = mysqli_fetch_array($sql); - $recurring_invoice_prefix = sanitizeInput($row['recurring_prefix']); - $recurring_invoice_number = intval($row['recurring_number']); - $client_id = intval($row['recurring_client_id']); + $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); + $recurring_invoice_number = intval($row['recurring_invoice_number']); + $client_id = intval($row['recurring_invoice_client_id']); - $new_recurring_amount = floatval($row['recurring_amount']) - $item_total; + $new_recurring_invoice_amount = floatval($row['recurring_invoice_amount']) - $item_total; - mysqli_query($mysqli,"UPDATE recurring SET recurring_amount = $new_recurring_amount WHERE recurring_id = $recurring_id"); + mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_amount = $new_recurring_invoice_amount WHERE recurring_invoice_id = $recurring_invoice_id"); mysqli_query($mysqli,"DELETE FROM invoice_items WHERE item_id = $item_id"); @@ -622,11 +622,11 @@ if (isset($_POST['edit_item'])) { mysqli_query($mysqli,"UPDATE invoice_items SET item_name = '$name', item_description = '$description', item_quantity = $qty, item_price = $price, item_subtotal = $subtotal, item_tax = $tax_amount, item_total = $total, item_tax_id = $tax_id WHERE item_id = $item_id"); // Determine what type of line item - $sql = mysqli_query($mysqli,"SELECT item_invoice_id, item_quote_id, item_recurring_id FROM invoice_items WHERE item_id = $item_id"); + $sql = mysqli_query($mysqli,"SELECT item_invoice_id, item_quote_id, item_recurring_invoice_id FROM invoice_items WHERE item_id = $item_id"); $row = mysqli_fetch_array($sql); $invoice_id = intval($row['item_invoice_id']); $quote_id = intval($row['item_quote_id']); - $recurring_id = intval($row['item_recurring_id']); + $recurring_invoice_id = intval($row['item_recurring_invoice_id']); if ($invoice_id > 0) { //Get Discount Amount @@ -668,22 +668,22 @@ if (isset($_POST['edit_item'])) { } else { //Get Discount Amount - $sql = mysqli_query($mysqli,"SELECT * FROM recurring WHERE recurring_id = $recurring_id"); + $sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); $row = mysqli_fetch_array($sql); - $recurring_invoice_prefix = sanitizeInput($row['recurring_prefix']); - $recurring_invoice_number = intval($row['recurring_number']); - $client_id = intval($row['recurring_client_id']); - $recurring_discount = floatval($row['recurring_discount_amount']); + $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); + $recurring_invoice_number = intval($row['recurring_invoice_number']); + $client_id = intval($row['recurring_invoice_client_id']); + $recurring_invoice_discount = floatval($row['recurring_invoice_discount_amount']); //Update Invoice Balances by tallying up invoice items - $sql_recurring_total = mysqli_query($mysqli,"SELECT SUM(item_total) AS recurring_total FROM invoice_items WHERE item_recurring_id = $recurring_id"); - $row = mysqli_fetch_array($sql_recurring_total); - $new_recurring_amount = floatval($row['recurring_total']) - $recurring_discount; + $sql_recurring_invoice_total = mysqli_query($mysqli,"SELECT SUM(item_total) AS recurring_invoice_total FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id"); + $row = mysqli_fetch_array($sql_recurring_invoice_total); + $new_recurring_invoice_amount = floatval($row['recurring_invoice_total']) - $recurring_invoice_discount; - mysqli_query($mysqli,"UPDATE recurring SET recurring_amount = $new_recurring_amount WHERE recurring_id = $recurring_id"); + mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_amount = $new_recurring_invoice_amount WHERE recurring_invoice_id = $recurring_invoice_id"); // Logging - logAction("Recurring Invoice", "Edit", "$session_name edited item $name on recurring invoice $recurring_invoice_prefix$recurring_invoice_number", $client_id, $recurring_id); + logAction("Recurring Invoice", "Edit", "$session_name edited item $name on recurring invoice $recurring_invoice_prefix$recurring_invoice_number", $client_id, $recurring_invoice_id); } @@ -1386,29 +1386,29 @@ if (isset($_GET['email_invoice'])) { if (isset($_POST['add_recurring_payment'])) { - $recurring_id = intval($_POST['recurring_id']); + $recurring_invoice_id = intval($_POST['recurring_invoice_id']); $account = intval($_POST['account']); $currency_code = sanitizeInput($_POST['currency_code']); $payment_method = sanitizeInput($_POST['payment_method']); // Get Recurring Info for logging and alerting - $sql = mysqli_query($mysqli, "SELECT * FROM recurring WHERE recurring_id = $recurring_id"); + $sql = mysqli_query($mysqli, "SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); $row = mysqli_fetch_array($sql); - $recurring_prefix = sanitizeInput($row['recurring_prefix']); - $recurring_number = intval($row['recurring_number']); - $recurring_amount = floatval($row['recurring_amount']); - $client_id = intval($row['recurring_client_id']); + $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); + $recurring_invoice_number = intval($row['recurring_invoice_number']); + $recurring_invoice_amount = floatval($row['recurring_invoice_amount']); + $client_id = intval($row['recurring_invoice_client_id']); - mysqli_query($mysqli,"INSERT INTO recurring_payments SET recurring_payment_currency_code = '$currency_code', recurring_payment_account_id = $account, recurring_payment_method = '$payment_method', recurring_payment_recurring_invoice_id = $recurring_id"); + mysqli_query($mysqli,"INSERT INTO recurring_payments SET recurring_payment_currency_code = '$currency_code', recurring_payment_account_id = $account, recurring_payment_method = '$payment_method', recurring_payment_recurring_invoice_id = $recurring_invoice_id"); // Get Payment ID for reference $recurring_payment_id = mysqli_insert_id($mysqli); // Logging - logAction("Recurring Invoice", "Auto Payment", "$session_name created Auto Pay for Recurring Invoice $recurring_prefix$recurring_number in the amount of " . numfmt_format_currency($currency_format, $recurring_amount, $currency_code), $client_id, $recurring_id); + logAction("Recurring Invoice", "Auto Payment", "$session_name created Auto Pay for Recurring Invoice $recurring_invoice_prefix$recurring_invoice_number in the amount of " . numfmt_format_currency($currency_format, $recurring_invoice_amount, $currency_code), $client_id, $recurring_invoice_id); - $_SESSION['alert_message'] = "Automatic Payment created for $recurring_prefix$recurring_number"; + $_SESSION['alert_message'] = "Automatic Payment created for $recurring_invoice_prefix$recurring_invoice_number"; header("Location: " . $_SERVER["HTTP_REFERER"]); } @@ -1421,42 +1421,42 @@ if (isset($_GET['delete_recurring_payment'])) { $recurring_invoice_id = intval($row['recurring_payment_recurring_invoice_id']); // Get the invoice total and details - $sql = mysqli_query($mysqli,"SELECT * FROM recurring WHERE recurring_id = $recurring_invoice_id"); + $sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); $row = mysqli_fetch_array($sql); - $recurring_prefix = sanitizeInput($row['recurring_prefix']); - $recurring_number = intval($row['recurring_number']); - $client_id = intval($row['recurring_client_id']); + $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); + $recurring_invoice_number = intval($row['recurring_invoice_number']); + $client_id = intval($row['recurring_invoice_client_id']); mysqli_query($mysqli,"DELETE FROM recurring_payments WHERE recurring_payment_id = $recurring_payment_id"); // Logging - logAction("Recurring Invoice", "Auto Payment", "$session_name removed auto Pay from Recurring Invoice $recurring_prefix$recurring_number", $client_id, $recurring_invoice_id); + logAction("Recurring Invoice", "Auto Payment", "$session_name removed auto Pay from Recurring Invoice $recurring_invoice_prefix$recurring_invoice_number", $client_id, $recurring_invoice_id); $_SESSION['alert_type'] = "error"; - $_SESSION['alert_message'] = "Auto Payment Removed for Recurring Invoice $recurring_prefix$recurring_number"; + $_SESSION['alert_message'] = "Auto Payment Removed for Recurring Invoice $recurring_invoice_prefix$recurring_invoice_number"; header("Location: " . $_SERVER["HTTP_REFERER"]); } if (isset($_GET['force_recurring'])) { - $recurring_id = intval($_GET['force_recurring']); + $recurring_invoice_id = intval($_GET['force_recurring']); - $sql_recurring = mysqli_query($mysqli,"SELECT * FROM recurring, clients WHERE client_id = recurring_client_id AND recurring_id = $recurring_id"); + $sql_recurring_invoices = mysqli_query($mysqli,"SELECT * FROM recurring_invoices, clients WHERE client_id = recurring_invoice_client_id AND recurring_invoice_id = $recurring_invoice_id"); - $row = mysqli_fetch_array($sql_recurring); - $recurring_id = intval($row['recurring_id']); - $recurring_scope = sanitizeInput($row['recurring_scope']); - $recurring_frequency = sanitizeInput($row['recurring_frequency']); - $recurring_status = sanitizeInput($row['recurring_status']); - $recurring_last_sent = sanitizeInput($row['recurring_last_sent']); - $recurring_next_date = sanitizeInput($row['recurring_next_date']); - $recurring_discount_amount = floatval($row['recurring_discount_amount']); - $recurring_amount = floatval($row['recurring_amount']); - $recurring_currency_code = sanitizeInput($row['recurring_currency_code']); - $recurring_note = sanitizeInput($row['recurring_note']); - $category_id = intval($row['recurring_category_id']); - $client_id = intval($row['recurring_client_id']); + $row = mysqli_fetch_array($sql_recurring_invoices); + $recurring_invoice_id = intval($row['recurring_invoice_id']); + $recurring_invoice_scope = sanitizeInput($row['recurring_invoice_scope']); + $recurring_invoice_frequency = sanitizeInput($row['recurring_invoice_frequency']); + $recurring_invoice_status = sanitizeInput($row['recurring_invoice_status']); + $recurring_invoice_last_sent = sanitizeInput($row['recurring_invoice_last_sent']); + $recurring_invoice_next_date = sanitizeInput($row['recurring_invoice_next_date']); + $recurring_invoice_discount_amount = floatval($row['recurring_invoice_discount_amount']); + $recurring_invoice_amount = floatval($row['recurring_invoice_amount']); + $recurring_invoice_currency_code = sanitizeInput($row['recurring_invoice_currency_code']); + $recurring_invoice_note = sanitizeInput($row['recurring_invoice_note']); + $category_id = intval($row['recurring_invoice_category_id']); + $client_id = intval($row['recurring_invoice_client_id']); $client_net_terms = intval($row['client_net_terms']); //Get the last Invoice Number and add 1 for the new invoice number @@ -1467,12 +1467,12 @@ if (isset($_GET['force_recurring'])) { //Generate a unique URL key for clients to access $url_key = randomString(156); - mysqli_query($mysqli,"INSERT INTO invoices SET invoice_prefix = '$config_invoice_prefix', invoice_number = $new_invoice_number, invoice_scope = '$recurring_scope', invoice_date = CURDATE(), invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), invoice_discount_amount = $recurring_discount_amount, invoice_amount = $recurring_amount, invoice_currency_code = '$recurring_currency_code', invoice_note = '$recurring_note', invoice_category_id = $category_id, invoice_status = 'Sent', invoice_url_key = '$url_key', invoice_client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO invoices SET invoice_prefix = '$config_invoice_prefix', invoice_number = $new_invoice_number, invoice_scope = '$recurring_invoice_scope', invoice_date = CURDATE(), invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), invoice_discount_amount = $recurring_invoice_discount_amount, invoice_amount = $recurring_invoice_amount, invoice_currency_code = '$recurring_invoice_currency_code', invoice_note = '$recurring_invoice_note', invoice_category_id = $category_id, invoice_status = 'Sent', invoice_url_key = '$url_key', invoice_recurring_invoice_id = $recurring_invoice_id, invoice_client_id = $client_id"); $new_invoice_id = mysqli_insert_id($mysqli); //Copy Items from original invoice to new invoice - $sql_invoice_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_id = $recurring_id ORDER BY item_id ASC"); + $sql_invoice_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id ORDER BY item_id ASC"); while($row = mysqli_fetch_array($sql_invoice_items)) { $item_id = intval($row['item_id']); @@ -1505,16 +1505,16 @@ if (isset($_GET['force_recurring'])) { mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Invoice Generated from Recurring!', history_invoice_id = $new_invoice_id"); //Update Recurring Balances by tallying up recurring items also update recurring dates - $sql_recurring_total = mysqli_query($mysqli,"SELECT SUM(item_total) AS recurring_total FROM invoice_items WHERE item_recurring_id = $recurring_id"); - $row = mysqli_fetch_array($sql_recurring_total); - $new_recurring_amount = floatval($row['recurring_total']) - $recurring_discount_amount; + $sql_recurring_invoice_total = mysqli_query($mysqli,"SELECT SUM(item_total) AS recurring_invoice_total FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id"); + $row = mysqli_fetch_array($sql_recurring_invoice_total); + $new_recurring_invoice_amount = floatval($row['recurring_invoice_total']) - $recurring_invoice_discount_amount; - mysqli_query($mysqli,"UPDATE recurring SET recurring_amount = $new_recurring_amount, recurring_last_sent = CURDATE(), recurring_next_date = DATE_ADD(CURDATE(), INTERVAL 1 $recurring_frequency) WHERE recurring_id = $recurring_id"); + mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_amount = $new_recurring_invoice_amount, recurring_invoice_last_sent = CURDATE(), recurring_invoice_next_date = DATE_ADD(CURDATE(), INTERVAL 1 $recurring_invoice_frequency) WHERE recurring_invoice_id = $recurring_invoice_id"); //Also update the newly created invoice with the new amounts - mysqli_query($mysqli,"UPDATE invoices SET invoice_amount = $new_recurring_amount WHERE invoice_id = $new_invoice_id"); + mysqli_query($mysqli,"UPDATE invoices SET invoice_amount = $new_recurring_invoice_amount WHERE invoice_id = $new_invoice_id"); - if ($config_recurring_auto_send_invoice == 1) { + if ($config_recurring_invoice_auto_send_invoice == 1) { $sql = mysqli_query($mysqli,"SELECT * FROM invoices LEFT JOIN clients ON invoice_client_id = client_id LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1 @@ -1654,7 +1654,7 @@ if (isset($_POST['export_invoices_csv'])) { } -if (isset($_POST['export_client_recurring_csv'])) { +if (isset($_POST['export_client_recurring_invoice_csv'])) { $client_id = intval($_POST['client_id']); //get records from database @@ -1663,7 +1663,7 @@ if (isset($_POST['export_client_recurring_csv'])) { $client_name = $row['client_name']; - $sql = mysqli_query($mysqli,"SELECT * FROM recurring WHERE recurring_client_id = $client_id ORDER BY recurring_number ASC"); + $sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoices WHERE recurring_invoice_client_id = $client_id ORDER BY recurring_invoice_number ASC"); $num_rows = mysqli_num_rows($sql); @@ -1680,7 +1680,7 @@ if (isset($_POST['export_client_recurring_csv'])) { //output each row of the data, format line as csv and write to file pointer while($row = $sql->fetch_assoc()) { - $lineData = array($row['recurring_prefix'] . $row['recurring_number'], $row['recurring_scope'], $row['recurring_amount'], ucwords($row['recurring_frequency'] . "ly"), $row['recurring_created_at']); + $lineData = array($row['recurring_invoice_prefix'] . $row['recurring_invoice_number'], $row['recurring_invoice_scope'], $row['recurring_invoice_amount'], ucwords($row['recurring_invoice_frequency'] . "ly"), $row['recurring_invoice_created_at']); fputcsv($f, $lineData, $delimiter); } @@ -1751,15 +1751,15 @@ if (isset($_POST['export_payments_csv'])) { if (isset($_GET['recurring_invoice_email_notify'])) { $recurring_invoice_email_notify = intval($_GET['recurring_invoice_email_notify']); - $recurring_id = intval($_GET['recurring_id']); + $recurring_invoice_id = intval($_GET['recurring_invoice_id']); - $sql = mysqli_query($mysqli,"SELECT * FROM recurring WHERE recurring_id = $recurring_id"); + $sql = mysqli_query($mysqli,"SELECT * FROM recurring_invoices WHERE recurring_invoice_id = $recurring_invoice_id"); $row = mysqli_fetch_array($sql); - $recurring_invoice_prefix = sanitizeInput($row['recurring_prefix']); - $recurring_invoice_number = intval($row['recurring_number']); - $client_id = intval($row['recurring_client_id']); + $recurring_invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']); + $recurring_invoice_number = intval($row['recurring_invoice_number']); + $client_id = intval($row['recurring_invoice_client_id']); - mysqli_query($mysqli,"UPDATE recurring SET recurring_invoice_email_notify = $recurring_invoice_email_notify WHERE recurring_id = $recurring_id"); + mysqli_query($mysqli,"UPDATE recurring_invoices SET recurring_invoice_email_notify = $recurring_invoice_email_notify WHERE recurring_invoice_id = $recurring_invoice_id"); // Wording if ($recurring_invoice_email_notify) { @@ -1769,7 +1769,7 @@ if (isset($_GET['recurring_invoice_email_notify'])) { } // Logging - logAction("Recurring Invoice", "Edit", "$session_name turned $notify_wording Email Notifications for Recurring Invoice $recurring_invoice_prefix$recurring_invoice_number", $client_id, $recurring_id); + logAction("Recurring Invoice", "Edit", "$session_name turned $notify_wording Email Notifications for Recurring Invoice $recurring_invoice_prefix$recurring_invoice_number", $client_id, $recurring_invoice_id); $_SESSION['alert_type'] = "error"; $_SESSION['alert_message'] = "Email Notifications $notify_wording"; diff --git a/post/user/location.php b/post/user/location.php index 6f44d167..a30958ec 100644 --- a/post/user/location.php +++ b/post/user/location.php @@ -185,10 +185,6 @@ if(isset($_GET['delete_location'])){ mysqli_query($mysqli,"DELETE FROM locations WHERE location_id = $location_id"); - // Tags - // Delete existing tags - mysqli_query($mysqli, "DELETE FROM location_tags WHERE location_id = $location_id"); - // Logging logAction("Location", "Delete", "$session_name deleted location $location_name", $client_id); @@ -416,7 +412,7 @@ if(isset($_POST['export_locations_csv'])){ } -if(isset($_POST["import_locations_csv"])){ +if (isset($_POST["import_locations_csv"])) { enforceUserPermission('module_client', 2); diff --git a/post/user/service.php b/post/user/service.php index 9437da39..e314593a 100644 --- a/post/user/service.php +++ b/post/user/service.php @@ -53,10 +53,10 @@ if (isset($_POST['add_service'])) { } } - if (isset($_POST['logins'])) { - foreach($_POST['logins'] as $login_id) { - $login_id = intval($login_id); - mysqli_query($mysqli, "INSERT INTO service_logins SET service_id = $service_id, login_id = $login_id"); + if (isset($_POST['credentials'])) { + foreach($_POST['credentials'] as $credential_id) { + $credential_id = intval($credential_id); + mysqli_query($mysqli, "INSERT INTO service_credentials SET service_id = $service_id, credential_id = $credential_id"); } } @@ -104,7 +104,7 @@ if (isset($_POST['edit_service'])) { mysqli_query($mysqli, "DELETE FROM service_vendors WHERE service_id = $service_id"); mysqli_query($mysqli, "DELETE FROM service_documents WHERE service_id = $service_id"); mysqli_query($mysqli, "DELETE FROM service_assets WHERE service_id = $service_id"); - mysqli_query($mysqli, "DELETE FROM service_logins WHERE service_id = $service_id"); + mysqli_query($mysqli, "DELETE FROM service_credentials WHERE service_id = $service_id"); mysqli_query($mysqli, "DELETE FROM service_domains WHERE service_id = $service_id"); mysqli_query($mysqli, "DELETE FROM service_certificates WHERE service_id = $service_id"); @@ -137,10 +137,10 @@ if (isset($_POST['edit_service'])) { } } - if (isset($_POST['logins'])) { - foreach($_POST['logins'] as $login_id) { - $login_id = intval($login_id); - mysqli_query($mysqli, "INSERT INTO service_logins SET service_id = $service_id, login_id = $login_id"); + if (isset($_POST['credentials'])) { + foreach($_POST['credentials'] as $credential_id) { + $credential_id = intval($credential_id); + mysqli_query($mysqli, "INSERT INTO service_credentials SET service_id = $service_id, credential_id = $credential_id"); } } @@ -183,16 +183,6 @@ if (isset($_GET['delete_service'])) { // Delete service mysqli_query($mysqli, "DELETE FROM services WHERE service_id = $service_id"); - // Delete relations - // TODO: Convert this to a join delete - mysqli_query($mysqli, "DELETE FROM service_contacts WHERE service_id = $service_id"); - mysqli_query($mysqli, "DELETE FROM service_vendors WHERE service_id = $service_id"); - mysqli_query($mysqli, "DELETE FROM service_documents WHERE service_id = $service_id"); - mysqli_query($mysqli, "DELETE FROM service_assets WHERE service_id = $service_id"); - mysqli_query($mysqli, "DELETE FROM service_logins WHERE service_id = $service_id"); - mysqli_query($mysqli, "DELETE FROM service_domains WHERE service_id = $service_id"); - mysqli_query($mysqli, "DELETE FROM service_certificates WHERE service_id = $service_id"); - // Logging logAction("Service", "Delete", "$session_name deleted service $service_name", $client_id); diff --git a/post/user/software.php b/post/user/software.php index 58177a8e..f4699a7f 100644 --- a/post/user/software.php +++ b/post/user/software.php @@ -201,10 +201,6 @@ if (isset($_GET['delete_software'])) { mysqli_query($mysqli,"DELETE FROM software WHERE software_id = $software_id"); - // Remove Software Relations - mysqli_query($mysqli,"DELETE FROM software_contacts WHERE software_id = $software_id"); - mysqli_query($mysqli,"DELETE FROM software_assets WHERE software_id = $software_id"); - //Logging logAction("Software", "Delete", "$session_name deleted software $software_name and removed all device/user license associations", $client_id); diff --git a/post/user/ticket.php b/post/user/ticket.php index aabb6701..9be9ad86 100644 --- a/post/user/ticket.php +++ b/post/user/ticket.php @@ -81,6 +81,14 @@ if (isset($_POST['add_ticket'])) { } } + // Add Additional Assets + if (isset($_POST['additional_assets'])) { + foreach ($_POST['additional_assets'] as $additional_asset) { + $additional_asset_id = intval($additional_asset); + mysqli_query($mysqli, "INSERT INTO ticket_assets SET ticket_id = $ticket_id, asset_id = $additional_asset_id"); + } + } + // E-mail client if (!empty($config_smtp_host) && $config_ticket_client_general_notifications == 1) { @@ -188,6 +196,15 @@ if (isset($_POST['edit_ticket'])) { mysqli_query($mysqli, "UPDATE tickets SET ticket_category = $category_id, ticket_subject = '$ticket_subject', ticket_priority = '$ticket_priority', ticket_billable = $billable, ticket_details = '$details', ticket_vendor_ticket_number = '$vendor_ticket_number', ticket_contact_id = $contact_id, ticket_vendor_id = $vendor_id, ticket_location_id = $location_id, ticket_asset_id = $asset_id, ticket_project_id = $project_id WHERE ticket_id = $ticket_id"); + // Add Additional Assets + if (isset($_POST['additional_assets'])) { + mysqli_query($mysqli, "DELETE FROM ticket_assets WHERE ticket_id = $ticket_id"); + foreach ($_POST['additional_assets'] as $additional_asset) { + $additional_asset_id = intval($additional_asset); + mysqli_query($mysqli, "INSERT INTO ticket_assets SET ticket_id = $ticket_id, asset_id = $additional_asset_id"); + } + } + // Get contact/ticket details after update for logging / email purposes $sql = mysqli_query($mysqli, "SELECT contact_name, contact_email, ticket_prefix, ticket_number, ticket_category, ticket_details, ticket_status_name, ticket_created_by, ticket_assigned_to, ticket_client_id FROM tickets LEFT JOIN clients ON ticket_client_id = client_id @@ -2049,12 +2066,20 @@ if (isset($_POST['add_recurring_ticket'])) { $start_date = sanitizeInput($_POST['start_date']); - mysqli_query($mysqli, "INSERT INTO scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_billable = $billable, scheduled_ticket_start_date = '$start_date', scheduled_ticket_next_run = '$start_date', scheduled_ticket_assigned_to = $assigned_to, scheduled_ticket_created_by = $session_user_id, scheduled_ticket_client_id = $client_id, scheduled_ticket_contact_id = $contact_id, scheduled_ticket_asset_id = $asset_id"); + mysqli_query($mysqli, "INSERT INTO recurring_tickets SET recurring_ticket_subject = '$subject', recurring_ticket_details = '$details', recurring_ticket_priority = '$priority', recurring_ticket_frequency = '$frequency', recurring_ticket_billable = $billable, recurring_ticket_start_date = '$start_date', recurring_ticket_next_run = '$start_date', recurring_ticket_assigned_to = $assigned_to, recurring_ticket_created_by = $session_user_id, recurring_ticket_client_id = $client_id, recurring_ticket_contact_id = $contact_id, recurring_ticket_asset_id = $asset_id"); - $scheduled_ticket_id = mysqli_insert_id($mysqli); + $recurring_ticket_id = mysqli_insert_id($mysqli); + + // Add Additional Assets + if (isset($_POST['additional_assets'])) { + foreach ($_POST['additional_assets'] as $additional_asset) { + $additional_asset_id = intval($additional_asset); + mysqli_query($mysqli, "INSERT INTO recurring_ticket_assets SET recurring_ticket_id = $recurring_ticket_id, asset_id = $additional_asset_id"); + } + } // Logging - logAction("Recurring Ticket", "Create", "$session_name created recurring ticket for $subject - $frequency", $client_id, $scheduled_ticket_id); + logAction("Recurring Ticket", "Create", "$session_name created recurring ticket for $subject - $frequency", $client_id, $recurring_ticket_id); $_SESSION['alert_message'] = "Recurring ticket $subject - $frequency created"; @@ -2067,13 +2092,22 @@ if (isset($_POST['edit_recurring_ticket'])) { require_once 'post/user/ticket_recurring_model.php'; - $scheduled_ticket_id = intval($_POST['scheduled_ticket_id']); + $recurring_ticket_id = intval($_POST['recurring_ticket_id']); $next_run_date = sanitizeInput($_POST['next_date']); - mysqli_query($mysqli, "UPDATE scheduled_tickets SET scheduled_ticket_subject = '$subject', scheduled_ticket_details = '$details', scheduled_ticket_priority = '$priority', scheduled_ticket_frequency = '$frequency', scheduled_ticket_billable = $billable, scheduled_ticket_next_run = '$next_run_date', scheduled_ticket_assigned_to = $assigned_to, scheduled_ticket_asset_id = $asset_id, scheduled_ticket_contact_id = $contact_id WHERE scheduled_ticket_id = $scheduled_ticket_id"); + mysqli_query($mysqli, "UPDATE recurring_tickets SET recurring_ticket_subject = '$subject', recurring_ticket_details = '$details', recurring_ticket_priority = '$priority', recurring_ticket_frequency = '$frequency', recurring_ticket_billable = $billable, recurring_ticket_next_run = '$next_run_date', recurring_ticket_assigned_to = $assigned_to, recurring_ticket_asset_id = $asset_id, recurring_ticket_contact_id = $contact_id WHERE recurring_ticket_id = $recurring_ticket_id"); + + // Add Additional Assets + if (isset($_POST['additional_assets'])) { + mysqli_query($mysqli, "DELETE FROM recurring_ticket_assets WHERE recurring_ticket_id = $recurring_ticket_id"); + foreach ($_POST['additional_assets'] as $additional_asset) { + $additional_asset_id = intval($additional_asset); + mysqli_query($mysqli, "INSERT INTO recurring_ticket_assets SET recurring_ticket_id = $recurring_ticket_id, asset_id = $additional_asset_id"); + } + } // Logging - logAction("Recurring Ticket", "Edit", "$session_name edited recurring ticket $subject", $client_id, $scheduled_ticket_id); + logAction("Recurring Ticket", "Edit", "$session_name edited recurring ticket $subject", $client_id, $recurring_ticket_id); $_SESSION['alert_message'] = "Recurring ticket $subject - $frequency updated"; @@ -2085,24 +2119,23 @@ if (isset($_GET['force_recurring_ticket'])) { enforceUserPermission('module_support', 2); validateCSRFToken($_GET['csrf_token']); - $scheduled_ticket_id = intval($_GET['force_recurring_ticket']); + $recurring_ticket_id = intval($_GET['force_recurring_ticket']); - $sql = mysqli_query($mysqli, "SELECT * FROM scheduled_tickets WHERE scheduled_ticket_id = $scheduled_ticket_id"); + $sql = mysqli_query($mysqli, "SELECT * FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id"); if (mysqli_num_rows($sql) > 0) { $row = mysqli_fetch_array($sql); - $schedule_id = intval($row['scheduled_ticket_id']); - $subject = sanitizeInput($row['scheduled_ticket_subject']); - $details = mysqli_real_escape_string($mysqli, $row['scheduled_ticket_details']); - $priority = sanitizeInput($row['scheduled_ticket_priority']); - $frequency = sanitizeInput(strtolower($row['scheduled_ticket_frequency'])); - $billable = intval($row['scheduled_ticket_billable']); - $old_next_scheduled_date = sanitizeInput($row['scheduled_ticket_next_run']); - $created_id = intval($row['scheduled_ticket_created_by']); - $assigned_id = intval($row['scheduled_ticket_assigned_to']); - $contact_id = intval($row['scheduled_ticket_contact_id']); - $client_id = intval($row['scheduled_ticket_client_id']); - $asset_id = intval($row['scheduled_ticket_asset_id']); + $subject = sanitizeInput($row['recurring_ticket_subject']); + $details = mysqli_real_escape_string($mysqli, $row['recurring_ticket_details']); + $priority = sanitizeInput($row['recurring_ticket_priority']); + $frequency = sanitizeInput(strtolower($row['recurring_ticket_frequency'])); + $billable = intval($row['recurring_ticket_billable']); + $old_next_recurring_date = sanitizeInput($row['recurring_ticket_next_run']); + $created_id = intval($row['recurring_ticket_created_by']); + $assigned_id = intval($row['recurring_ticket_assigned_to']); + $contact_id = intval($row['recurring_ticket_contact_id']); + $client_id = intval($row['recurring_ticket_client_id']); + $asset_id = intval($row['recurring_ticket_asset_id']); $url_key = randomString(156); $ticket_status = 1; // Default @@ -2122,9 +2155,15 @@ if (isset($_GET['force_recurring_ticket'])) { mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1"); // Raise the ticket - 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 = '$ticket_status', ticket_billable = $billable, ticket_url_key = '$url_key', ticket_created_by = $created_id, ticket_assigned_to = $assigned_id, ticket_contact_id = $contact_id, ticket_client_id = $client_id, ticket_asset_id = $asset_id"); + 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 = '$ticket_status', ticket_billable = $billable, ticket_url_key = '$url_key', ticket_created_by = $created_id, ticket_assigned_to = $assigned_id, ticket_contact_id = $contact_id, ticket_client_id = $client_id, ticket_asset_id = $asset_id, ticket_recurring_ticket_id = $recurring_ticket_id"); $id = mysqli_insert_id($mysqli); + // Copy Additional Assets from Recurring ticket to new ticket + mysqli_query($mysqli, "INSERT INTO ticket_assets (ticket_id, asset_id) + SELECT $id, asset_id + FROM recurring_ticket_assets + WHERE recurring_ticket_id = $recurring_ticket_id"); + // Notifications customAction('ticket_create', $id); @@ -2175,22 +2214,22 @@ if (isset($_GET['force_recurring_ticket'])) { addToMailQueue($data); // Set the next run date (based on the scheduled date, rather than now, so things keep their schedule) - $dt_old_next_scheduled_date = new DateTime($old_next_scheduled_date); + $dt_old_next_recurring_date = new DateTime($old_next_recurring_date); if ($frequency == "weekly") { - $next_run = date_add($dt_old_next_scheduled_date, date_interval_create_from_date_string('1 week')); + $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('1 week')); } elseif ($frequency == "monthly") { - $next_run = date_add($dt_old_next_scheduled_date, date_interval_create_from_date_string('1 month')); + $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('1 month')); } elseif ($frequency == "quarterly") { - $next_run = date_add($dt_old_next_scheduled_date, date_interval_create_from_date_string('3 months')); + $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('3 months')); } elseif ($frequency == "biannually") { - $next_run = date_add($dt_old_next_scheduled_date, date_interval_create_from_date_string('6 months')); + $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('6 months')); } elseif ($frequency == "annually") { - $next_run = date_add($dt_old_next_scheduled_date, date_interval_create_from_date_string('12 months')); + $next_run = date_add($dt_old_next_recurring_date, date_interval_create_from_date_string('12 months')); } // Update the run date $next_run = $next_run->format('Y-m-d'); - mysqli_query($mysqli, "UPDATE scheduled_tickets SET scheduled_ticket_next_run = '$next_run' WHERE scheduled_ticket_id = $schedule_id"); + mysqli_query($mysqli, "UPDATE recurring_tickets SET recurring_ticket_next_run = '$next_run' WHERE recurring_ticket_id = $recurring_ticket_id"); // Logging logAction("Ticket", "Create", "$session_name force created recurring scheduled $frequency ticket - $config_ticket_prefix$ticket_number - $subject", $client_id, $id); @@ -2212,21 +2251,21 @@ if (isset($_GET['delete_recurring_ticket'])) { enforceUserPermission('module_support', 3); validateCSRFToken($_GET['csrf_token']); - $scheduled_ticket_id = intval($_GET['delete_recurring_ticket']); + $recurring_ticket_id = intval($_GET['delete_recurring_ticket']); // Get Scheduled Ticket Subject Ticket Prefix, Number and Client ID for logging and alert message - $sql = mysqli_query($mysqli, "SELECT * FROM scheduled_tickets WHERE scheduled_ticket_id = $scheduled_ticket_id"); + $sql = mysqli_query($mysqli, "SELECT * FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id"); $row = mysqli_fetch_array($sql); - $subject = sanitizeInput($row['scheduled_ticket_subject']); - $frequency = sanitizeInput($row['scheduled_ticket_frequency']); + $subject = sanitizeInput($row['recurring_ticket_subject']); + $frequency = sanitizeInput($row['recurring_ticket_frequency']); - $client_id = intval($row['scheduled_ticket_client_id']); + $client_id = intval($row['recurring_ticket_client_id']); // Delete - mysqli_query($mysqli, "DELETE FROM scheduled_tickets WHERE scheduled_ticket_id = $scheduled_ticket_id"); + mysqli_query($mysqli, "DELETE FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id"); // Logging - logAction("Recurring Ticket", "Delete", "$session_name deleted recurring ticket $subject", $client_id, $scheduled_ticket_id); + logAction("Recurring Ticket", "Delete", "$session_name deleted recurring ticket $subject", $client_id, $recurring_ticket_id); $_SESSION['alert_type'] = "error"; $_SESSION['alert_message'] = "Recurring ticket $subject - $frequency deleted"; @@ -2234,23 +2273,23 @@ if (isset($_GET['delete_recurring_ticket'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } -if (isset($_POST['bulk_delete_scheduled_tickets']) || isset($_POST['bulk_delete_recurring_tickets'])) { +if (isset($_POST['bulk_delete_recurring_tickets'])) { enforceUserPermission('module_support', 3); validateCSRFToken($_POST['csrf_token']); - if (isset($_POST['scheduled_ticket_ids'])) { + if (isset($_POST['recurring_ticket_ids'])) { - $count = count($_POST['scheduled_ticket_ids']); + $count = count($_POST['recurring_ticket_ids']); // Cycle through array and delete each recurring scheduled ticket - foreach ($scheduled_ticket_ids as $scheduled_ticket_id) { + foreach ($recurring_ticket_ids as $recurring_ticket_id) { - $scheduled_ticket_id = intval($scheduled_ticket_id); - mysqli_query($mysqli, "DELETE FROM scheduled_tickets WHERE scheduled_ticket_id = $scheduled_ticket_id"); + $recurring_ticket_id = intval($recurring_ticket_id); + mysqli_query($mysqli, "DELETE FROM recurring_tickets WHERE recurring_ticket_id = $recurring_ticket_id"); // Logging - logAction("Recurring Ticket", "Delete", "$session_name deleted recurring ticket", 0, $scheduled_ticket_id); + logAction("Recurring Ticket", "Delete", "$session_name deleted recurring ticket", 0, $recurring_ticket_id); } diff --git a/post/user/vendor.php b/post/user/vendor.php index be4c0eb0..b68aaed2 100644 --- a/post/user/vendor.php +++ b/post/user/vendor.php @@ -143,12 +143,6 @@ if (isset($_GET['delete_vendor'])) { mysqli_query($mysqli,"DELETE FROM vendors WHERE vendor_id = $vendor_id"); - // Remove Relations - mysqli_query($mysqli,"DELETE FROM vendor_files WHERE vendor_id = $vendor_id"); - mysqli_query($mysqli,"DELETE FROM vendor_documents WHERE vendor_id = $vendor_id"); - mysqli_query($mysqli,"DELETE FROM vendor_logins WHERE vendor_id = $vendor_id"); - mysqli_query($mysqli,"DELETE FROM service_vendors WHERE vendor_id = $vendor_id"); - //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Vendor', log_action = 'Delete', log_description = '$session_name deleted vendor $vendor_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id"); @@ -263,12 +257,6 @@ if (isset($_POST['bulk_delete_vendors'])) { mysqli_query($mysqli, "DELETE FROM vendors WHERE vendor_id = $vendor_id AND vendor_client_id = $client_id"); - // Remove Relations - mysqli_query($mysqli,"DELETE FROM vendor_files WHERE vendor_id = $vendor_id"); - mysqli_query($mysqli,"DELETE FROM vendor_documents WHERE vendor_id = $vendor_id"); - mysqli_query($mysqli,"DELETE FROM vendor_logins WHERE vendor_id = $vendor_id"); - mysqli_query($mysqli,"DELETE FROM service_vendors WHERE vendor_id = $vendor_id"); - // Logging logAction("Vendor", "Delete", "$session_name deleted vendor $vendor_name", $client_id); diff --git a/recurring_invoice.php b/recurring_invoice.php index d267a76c..2df858a3 100644 --- a/recurring_invoice.php +++ b/recurring_invoice.php @@ -7,38 +7,38 @@ if (isset($_GET['client_id'])) { require_once "includes/inc_all.php"; } -if (isset($_GET['recurring_id'])) { +if (isset($_GET['recurring_invoice_id'])) { - $recurring_id = intval($_GET['recurring_id']); + $recurring_invoice_id = intval($_GET['recurring_invoice_id']); $sql = mysqli_query( $mysqli, - "SELECT * FROM recurring - LEFT JOIN clients ON recurring_client_id = client_id + "SELECT * FROM recurring_invoices + LEFT JOIN clients ON recurring_invoice_client_id = client_id LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1 LEFT JOIN locations ON clients.client_id = locations.location_client_id AND location_primary = 1 - LEFT JOIN recurring_payments ON recurring_payment_recurring_invoice_id = recurring_id - WHERE recurring_id = $recurring_id" + LEFT JOIN recurring_payments ON recurring_payment_recurring_invoice_id = recurring_invoice_id + WHERE recurring_invoice_id = $recurring_invoice_id LIMIT 1" ); $row = mysqli_fetch_array($sql); - $recurring_prefix = nullable_htmlentities($row['recurring_prefix']); - $recurring_number = intval($row['recurring_number']); - $recurring_scope = nullable_htmlentities($row['recurring_scope']); - $recurring_frequency = nullable_htmlentities($row['recurring_frequency']); - $recurring_status = nullable_htmlentities($row['recurring_status']); - $recurring_created_at = date('Y-m-d', strtotime($row['recurring_created_at'])); - $recurring_last_sent = nullable_htmlentities($row['recurring_last_sent']); - if ($recurring_last_sent == 0) { - $recurring_last_sent = '-'; + $recurring_invoice_prefix = nullable_htmlentities($row['recurring_invoice_prefix']); + $recurring_invoice_number = intval($row['recurring_invoice_number']); + $recurring_invoice_scope = nullable_htmlentities($row['recurring_invoice_scope']); + $recurring_invoice_frequency = nullable_htmlentities($row['recurring_invoice_frequency']); + $recurring_invoice_status = nullable_htmlentities($row['recurring_invoice_status']); + $recurring_invoice_created_at = date('Y-m-d', strtotime($row['recurring_invoice_created_at'])); + $recurring_invoice_last_sent = nullable_htmlentities($row['recurring_invoice_last_sent']); + if ($recurring_invoice_last_sent == 0) { + $recurring_invoice_last_sent = '-'; } - $recurring_next_date = nullable_htmlentities($row['recurring_next_date']); - $recurring_amount = floatval($row['recurring_amount']); - $recurring_discount = floatval($row['recurring_discount_amount']); - $recurring_currency_code = nullable_htmlentities($row['recurring_currency_code']); - $recurring_note = nullable_htmlentities($row['recurring_note']); + $recurring_invoice_next_date = nullable_htmlentities($row['recurring_invoice_next_date']); + $recurring_invoice_amount = floatval($row['recurring_invoice_amount']); + $recurring_invoice_discount = floatval($row['recurring_invoice_discount_amount']); + $recurring_invoice_currency_code = nullable_htmlentities($row['recurring_invoice_currency_code']); + $recurring_invoice_note = nullable_htmlentities($row['recurring_invoice_note']); $recurring_invoice_email_notify = intval($row['recurring_invoice_email_notify']); - $category_id = intval($row['recurring_category_id']); + $category_id = intval($row['recurring_invoice_category_id']); $client_id = intval($row['client_id']); $client_name = nullable_htmlentities($row['client_name']); $location_address = nullable_htmlentities($row['location_address']); @@ -53,7 +53,7 @@ if (isset($_GET['recurring_id'])) { $client_currency_code = nullable_htmlentities($row['client_currency_code']); $client_net_terms = intval($row['client_net_terms']); - if ($recurring_status == 1) { + if ($recurring_invoice_status == 1) { $status = "Active"; $status_badge_color = "success"; } else { @@ -66,7 +66,7 @@ if (isset($_GET['recurring_id'])) { // Override Tab Title // No Sanitizing needed as this var will only be used in the tab title $tab_title = $row['client_name']; - $page_title = "{$row['recurring_prefix']}{$row['recurring_number']}"; + $page_title = "{$row['recurring_invoice_prefix']}{$row['recurring_invoice_number']}"; $sql = mysqli_query($mysqli, "SELECT * FROM companies WHERE company_id = 1"); $row = mysqli_fetch_array($sql); @@ -83,7 +83,7 @@ if (isset($_GET['recurring_id'])) { $company_website = nullable_htmlentities($row['company_website']); $company_logo = nullable_htmlentities($row['company_logo']); - $sql_history = mysqli_query($mysqli, "SELECT * FROM history WHERE history_recurring_id = $recurring_id ORDER BY history_id DESC"); + $sql_history = mysqli_query($mysqli, "SELECT * FROM history WHERE history_recurring_invoice_id = $recurring_invoice_id ORDER BY history_id DESC"); //Product autocomplete $products_sql = mysqli_query($mysqli, "SELECT product_name AS label, product_description AS description, product_price AS price, product_tax_id AS tax FROM products WHERE product_archived_at IS NULL"); @@ -113,7 +113,7 @@ if (isset($_GET['recurring_id'])) { -
    • +
    • @@ -122,11 +122,11 @@ if (isset($_GET['recurring_id'])) {
    - + - Email Notify + Email Notify - Email Notify + Email Notify @@ -135,7 +135,7 @@ if (isset($_GET['recurring_id'])) { Disable AutoPay () - + Create AutoPay @@ -152,16 +152,16 @@ if (isset($_GET['recurring_id'])) { Edit
    - + Force Send
    - + Delete
    @@ -182,7 +182,7 @@ if (isset($_GET['recurring_id'])) {
    -

    Recurring Invoice
    ly

    +

    Recurring Invoice
    ly

    @@ -213,15 +213,15 @@ if (isset($_GET['recurring_id'])) {
    URL
    Username
    Password
    2FA (TOTP)
    - + - + - + @@ -229,7 +229,7 @@ if (isset($_GET['recurring_id'])) { - +
    @@ -282,7 +282,7 @@ if (isset($_GET['recurring_id'])) { Edit
    - Delete + Delete
    @@ -291,9 +291,9 @@ if (isset($_GET['recurring_id'])) {
    - - - + + + - + @@ -363,13 +363,13 @@ if (isset($_GET['recurring_id'])) {
    Notes
    - +
    - +
    @@ -378,23 +378,23 @@ if (isset($_GET['recurring_id'])) { - + - 0) { ?> + 0) { ?> - + 0) { ?> - + - +
    Next Date
    Last Sent
    Created
    - + -
    Subtotal
    Discount--
    Tax
    Total
    @@ -503,7 +503,7 @@ $(document).ready(function() { method: 'POST', data: { update_recurring_invoice_items_order: true, - recurring_id: , + recurring_invoice_id: , positions: positions }, success: function(data) { diff --git a/recurring_invoices.php b/recurring_invoices.php index a7f79656..7bcda6f2 100644 --- a/recurring_invoices.php +++ b/recurring_invoices.php @@ -1,13 +1,13 @@

    Recurring Invoices

    - +
    @@ -70,8 +70,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - ">Active - ">Inactive + ">Active + ">Inactive
    @@ -115,18 +115,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); "> - - Number + + Number - - Next Date + + Next Date - - Scope + + Scope @@ -137,18 +137,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - - Amount + + Amount - - Frequency + + Frequency - - Last Sent + + Last Sent @@ -162,8 +162,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - - Status + + Status Action @@ -173,27 +173,27 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); + Create "; @@ -222,18 +222,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - - + + - - + + - - ly - + + ly + @@ -251,13 +251,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Edit
    - + Delete diff --git a/recurring_tickets.php b/recurring_tickets.php index 08c17716..246eb073 100644 --- a/recurring_tickets.php +++ b/recurring_tickets.php @@ -1,13 +1,13 @@ - - Subject + + Subject - - Priority + + Priority - - Frequency + + Frequency - - Next Run Date + + Next Run Date = 2) { ?> @@ -155,24 +155,24 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
    - +
    - + @@ -181,17 +181,17 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); data-toggle="ajax-modal" data-modal-size="lg" data-ajax-url="ajax/ajax_recurring_ticket_edit.php" - data-ajax-id="" + data-ajax-id="" > - + - + - + - + = 2) { ?> @@ -204,17 +204,17 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); data-toggle="ajax-modal" data-modal-size="lg" data-ajax-url="ajax/ajax_recurring_ticket_edit.php" - data-ajax-id="" + data-ajax-id="" > Edit
    - + Force Reoccur
    - + Delete diff --git a/report_credential_rotation.php b/report_credential_rotation.php index 16022147..af10bc0c 100644 --- a/report_credential_rotation.php +++ b/report_credential_rotation.php @@ -12,10 +12,10 @@ if (isset($_GET['days'])) { } $passwords_not_rotated_sql = mysqli_query($mysqli, - "SELECT login_id, login_name, login_description, login_password_changed_at, login_client_id, client_id, client_name - FROM logins - LEFT JOIN clients ON login_client_id = client_id - WHERE DATE(login_password_changed_at) < DATE_SUB(CURDATE(), INTERVAL $days DAY) + "SELECT credential_id, credential_name, credential_description, credential_password_changed_at, credential_client_id, client_id, client_name + FROM credentials + LEFT JOIN clients ON credential_client_id = client_id + WHERE DATE(credential_password_changed_at) < DATE_SUB(CURDATE(), INTERVAL $days DAY) ORDER BY client_name" ); @@ -46,10 +46,10 @@ $passwords_not_rotated_sql = mysqli_query($mysqli, while ($row = mysqli_fetch_array($passwords_not_rotated_sql)) { - $login_id = intval($row['login_id']); - $login_name = nullable_htmlentities($row['login_name']); - $login_description = nullable_htmlentities($row['login_description']); - $login_password_changed = nullable_htmlentities($row['login_password_changed_at']); + $credential_id = intval($row['credential_id']); + $credential_name = nullable_htmlentities($row['credential_name']); + $credential_description = nullable_htmlentities($row['credential_description']); + $credential_password_changed = nullable_htmlentities($row['credential_password_changed_at']); $client_id = intval($row['client_id']); $client_name = nullable_htmlentities($row['client_name']); @@ -57,9 +57,9 @@ $passwords_not_rotated_sql = mysqli_query($mysqli, - - - + + + diff --git a/report_recurring_by_client.php b/report_recurring_by_client.php index 9a2efc72..bb181194 100644 --- a/report_recurring_by_client.php +++ b/report_recurring_by_client.php @@ -5,12 +5,12 @@ require_once "includes/inc_all_reports.php"; validateAccountantRole(); $sql = mysqli_query($mysqli, " - SELECT clients.client_id, clients.client_name, - SUM(CASE WHEN recurring.recurring_frequency = 'month' THEN recurring.recurring_amount - WHEN recurring.recurring_frequency = 'year' THEN recurring.recurring_amount / 12 END) AS recurring_monthly_total + SELECT client_id, client_name, + SUM(CASE WHEN recurring_invoice_frequency = 'month' THEN recurring_invoice_amount + WHEN recurring_invoice_frequency = 'year' THEN recurring_invoice_amount / 12 END) AS recurring_monthly_total FROM clients - LEFT JOIN recurring ON clients.client_id = recurring.recurring_client_id - WHERE recurring.recurring_status = 1 + LEFT JOIN recurring_invoices ON client_id = recurring_invoice_client_id + WHERE recurring_invoice_status = 1 GROUP BY clients.client_id HAVING recurring_monthly_total > 0 ORDER BY recurring_monthly_total DESC diff --git a/report_tax_summary.php b/report_tax_summary.php index 6c64a989..55d52839 100644 --- a/report_tax_summary.php +++ b/report_tax_summary.php @@ -108,7 +108,7 @@ $sql_tax = mysqli_query($mysqli, "SELECT `tax_name` FROM `taxes`"); } } ?> - + diff --git a/report_time_by_tech.php b/report_time_by_tech.php new file mode 100644 index 00000000..7ce4abad --- /dev/null +++ b/report_time_by_tech.php @@ -0,0 +1,179 @@ + (int)$days, + 'hour' => (int)$hours, + 'minute' => (int)$minutes, + 'second' => (int)$seconds, + ]; + + foreach ($sections as $name => $value){ + if ($value > 0){ + $timeParts[] = $value. ' '.$name.($value == 1 ? '' : 's'); + } + } + + return implode(', ', $timeParts); +} + +if (isset($_GET['year'])) { + $year = intval($_GET['year']); +} else { + $year = date('Y'); +} + +if (isset($_GET['month'])) { + $month = intval($_GET['month']); +} else { + $month = date('m'); +} + +$sql_ticket_years = mysqli_query($mysqli, "SELECT DISTINCT YEAR(ticket_created_at) AS ticket_year FROM tickets ORDER BY ticket_year DESC"); + +$sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC"); + +$sql_users = mysqli_query($mysqli, " + SELECT users.user_id, user_name FROM users + LEFT JOIN user_settings on users.user_id = user_settings.user_id + WHERE user_type = 1 + AND user_status = 1 + AND user_archived_at IS NULL + ORDER BY user_name DESC" +); +// TODO: Maybe try and filter this to just users with the support module perm + +?> + +
    +
    +

    Time Logged By Technician

    +
    + +
    +
    +
    + + + + +
    +
    +

    Yearly ()

    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    TechnicianTickets assignedTickets touchedTotal time worked (H:M:S)
    +
    +
    +
    + +
    +
    + + 0) { logApp("Cron", "info", "Cron created notifications for new tickets that are pending assignment"); } -// Recurring (Scheduled) tickets +// Recurring tickets // Get recurring tickets for today -$sql_scheduled_tickets = mysqli_query($mysqli, "SELECT * FROM scheduled_tickets WHERE scheduled_ticket_next_run = CURDATE()"); +$sql_recurring_tickets = mysqli_query($mysqli, "SELECT * FROM recurring_tickets WHERE recurring_ticket_next_run = CURDATE()"); -if (mysqli_num_rows($sql_scheduled_tickets) > 0) { - while ($row = mysqli_fetch_array($sql_scheduled_tickets)) { +if (mysqli_num_rows($sql_recurring_tickets) > 0) { + while ($row = mysqli_fetch_array($sql_recurring_tickets)) { - $schedule_id = intval($row['scheduled_ticket_id']); - $subject = sanitizeInput($row['scheduled_ticket_subject']); - $details = mysqli_real_escape_string($mysqli, $row['scheduled_ticket_details']); - $priority = sanitizeInput($row['scheduled_ticket_priority']); - $frequency = sanitizeInput(strtolower($row['scheduled_ticket_frequency'])); - $billable = intval($row['scheduled_ticket_billable']); - $created_id = intval($row['scheduled_ticket_created_by']); - $assigned_id = intval($row['scheduled_ticket_assigned_to']); - $client_id = intval($row['scheduled_ticket_client_id']); - $contact_id = intval($row['scheduled_ticket_contact_id']); - $asset_id = intval($row['scheduled_ticket_asset_id']); + $recurring_ticket_id = intval($row['recurring_ticket_id']); + $subject = sanitizeInput($row['recurring_ticket_subject']); + $details = mysqli_real_escape_string($mysqli, $row['recurring_ticket_details']); + $priority = sanitizeInput($row['recurring_ticket_priority']); + $frequency = sanitizeInput(strtolower($row['recurring_ticket_frequency'])); + $billable = intval($row['recurring_ticket_billable']); + $created_id = intval($row['recurring_ticket_created_by']); + $assigned_id = intval($row['recurring_ticket_assigned_to']); + $client_id = intval($row['recurring_ticket_client_id']); + $contact_id = intval($row['recurring_ticket_contact_id']); + $asset_id = intval($row['recurring_ticket_asset_id']); $ticket_status = 1; // Default if ($assigned_id > 0) { @@ -314,9 +314,15 @@ if (mysqli_num_rows($sql_scheduled_tickets) > 0) { mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1"); // Raise the ticket - 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 = '$ticket_status', ticket_billable = $billable, ticket_created_by = $created_id, ticket_assigned_to = $assigned_id, ticket_contact_id = $contact_id, ticket_client_id = $client_id, ticket_asset_id = $asset_id"); + 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 = '$ticket_status', ticket_billable = $billable, ticket_created_by = $created_id, ticket_assigned_to = $assigned_id, ticket_contact_id = $contact_id, ticket_client_id = $client_id, ticket_asset_id = $asset_id, ticket_recurring_ticket_id = $recurring_ticket_id"); $id = mysqli_insert_id($mysqli); + // Copy Additional Assets from Recurring ticket to new ticket + mysqli_query($mysqli, "INSERT INTO ticket_assets (ticket_id, asset_id) + SELECT $id, asset_id + FROM recurring_ticket_assets + WHERE recurring_ticket_id = $recurring_ticket_id"); + // Logging logAction("Ticket", "Create", "Cron created recurring scheduled $frequency ticket - $subject", $client_id, $id); @@ -408,7 +414,7 @@ if (mysqli_num_rows($sql_scheduled_tickets) > 0) { // Update the run date $next_run = $next_run->format('Y-m-d'); - $a = mysqli_query($mysqli, "UPDATE scheduled_tickets SET scheduled_ticket_next_run = '$next_run' WHERE scheduled_ticket_id = $schedule_id"); + $a = mysqli_query($mysqli, "UPDATE recurring_tickets SET recurring_ticket_next_run = '$next_run' WHERE recurring_ticket_id = $recurring_ticket_id"); } } @@ -541,27 +547,27 @@ if ($config_send_invoice_reminders == 1) { // Send Recurring Invoices that match todays date and are active //Loop through all recurring that match today's date and is active -$sql_recurring = mysqli_query($mysqli, "SELECT * FROM recurring - LEFT JOIN recurring_payments ON recurring_id = recurring_payment_recurring_invoice_id - LEFT JOIN clients ON client_id = recurring_client_id - WHERE recurring_next_date = CURDATE() - AND recurring_status = 1 +$sql_recurring_invoices = mysqli_query($mysqli, "SELECT * FROM recurring_invoices + LEFT JOIN recurring_payments ON recurring_invoice_id = recurring_payment_recurring_invoice_id + LEFT JOIN clients ON client_id = recurring_invoice_client_id + WHERE recurring_invoice_next_date = CURDATE() + AND recurring_invoice_status = 1 "); -while ($row = mysqli_fetch_array($sql_recurring)) { - $recurring_id = intval($row['recurring_id']); - $recurring_scope = sanitizeInput($row['recurring_scope']); - $recurring_frequency = sanitizeInput($row['recurring_frequency']); - $recurring_status = sanitizeInput($row['recurring_status']); - $recurring_last_sent = sanitizeInput($row['recurring_last_sent']); - $recurring_next_date = sanitizeInput($row['recurring_next_date']); - $recurring_discount_amount = floatval($row['recurring_discount_amount']); - $recurring_amount = floatval($row['recurring_amount']); - $recurring_currency_code = sanitizeInput($row['recurring_currency_code']); - $recurring_note = sanitizeInput($row['recurring_note']); +while ($row = mysqli_fetch_array($sql_recurring_invoices)) { + $recurring_invoice_id = intval($row['recurring_invoice_id']); + $recurring_invoice_scope = sanitizeInput($row['recurring_invoice_scope']); + $recurring_invoice_frequency = sanitizeInput($row['recurring_invoice_frequency']); + $recurring_invoice_status = sanitizeInput($row['recurring_invoice_status']); + $recurring_invoice_last_sent = sanitizeInput($row['recurring_invoice_last_sent']); + $recurring_invoice_next_date = sanitizeInput($row['recurring_invoice_next_date']); + $recurring_invoice_discount_amount = floatval($row['recurring_invoice_discount_amount']); + $recurring_invoice_amount = floatval($row['recurring_invoice_amount']); + $recurring_invoice_currency_code = sanitizeInput($row['recurring_invoice_currency_code']); + $recurring_invoice_note = sanitizeInput($row['recurring_invoice_note']); $recurring_invoice_email_notify = intval($row['recurring_invoice_email_notify']); - $category_id = intval($row['recurring_category_id']); - $client_id = intval($row['recurring_client_id']); + $category_id = intval($row['recurring_invoice_category_id']); + $client_id = intval($row['recurring_invoice_client_id']); $client_name = sanitizeInput($row['client_name']); $client_net_terms = intval($row['client_net_terms']); @@ -582,12 +588,12 @@ while ($row = mysqli_fetch_array($sql_recurring)) { //Generate a unique URL key for clients to access $url_key = randomString(156); - mysqli_query($mysqli, "INSERT INTO invoices SET invoice_prefix = '$config_invoice_prefix', invoice_number = $new_invoice_number, invoice_scope = '$recurring_scope', invoice_date = CURDATE(), invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), invoice_discount_amount = $recurring_discount_amount, invoice_amount = $recurring_amount, invoice_currency_code = '$recurring_currency_code', invoice_note = '$recurring_note', invoice_category_id = $category_id, invoice_status = 'Sent', invoice_url_key = '$url_key', invoice_client_id = $client_id"); + mysqli_query($mysqli, "INSERT INTO invoices SET invoice_prefix = '$config_invoice_prefix', invoice_number = $new_invoice_number, invoice_scope = '$recurring_invoice_scope', invoice_date = CURDATE(), invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), invoice_discount_amount = $recurring_invoice_discount_amount, invoice_amount = $recurring_invoice_amount, invoice_currency_code = '$recurring_invoice_currency_code', invoice_note = '$recurring_invoice_note', invoice_category_id = $category_id, invoice_status = 'Sent', invoice_url_key = '$url_key', invoice_recurring_invoice_id = $recurring_invoice_id, invoice_client_id = $client_id"); $new_invoice_id = mysqli_insert_id($mysqli); //Copy Items from original recurring invoice to new invoice - $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_recurring_id = $recurring_id ORDER BY item_id ASC"); + $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_recurring_invoice_id = $recurring_invoice_id ORDER BY item_id ASC"); while ($row = mysqli_fetch_array($sql_invoice_items)) { $item_id = intval($row['item_id']); @@ -614,7 +620,7 @@ while ($row = mysqli_fetch_array($sql_recurring)) { //Update recurring dates - mysqli_query($mysqli, "UPDATE recurring SET recurring_last_sent = CURDATE(), recurring_next_date = DATE_ADD(CURDATE(), INTERVAL 1 $recurring_frequency) WHERE recurring_id = $recurring_id"); + mysqli_query($mysqli, "UPDATE recurring_invoices SET recurring_invoice_last_sent = CURDATE(), recurring_invoice_next_date = DATE_ADD(CURDATE(), INTERVAL 1 $recurring_invoice_frequency) WHERE recurring_invoice_id = $recurring_invoice_id"); // Get details of the newly generated invoice $sql = mysqli_query( @@ -640,7 +646,7 @@ while ($row = mysqli_fetch_array($sql_recurring)) { if ($config_recurring_auto_send_invoice == 1 && $recurring_invoice_email_notify == 1) { $subject = "Invoice $invoice_prefix$invoice_number"; - $body = "Hello $contact_name,

    An invoice regarding \"$invoice_scope\" has been generated. Please view the details below.

    Invoice: $invoice_prefix$invoice_number
    Issue Date: $invoice_date
    Total: " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_currency_code) . "
    Due Date: $invoice_due


    To view your invoice, please click here.


    --
    $company_name - Billing
    $config_invoice_from_email
    $company_phone"; + $body = "Hello $contact_name,

    An invoice regarding \"$invoice_scope\" has been generated. Please view the details below.

    Invoice: $invoice_prefix$invoice_number
    Issue Date: $invoice_date
    Total: " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_invoice_currency_code) . "
    Due Date: $invoice_due


    To view your invoice, please click here.


    --
    $company_name - Billing
    $config_invoice_from_email
    $company_phone"; $mail = addToMailQueue([ [ @@ -907,9 +913,9 @@ if ($config_telemetry > 0 || $config_telemetry == 2) { $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_id') AS num FROM tickets")); $ticket_count = $row['num']; - // Recurring (Scheduled) Ticket Count - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('scheduled_ticket_id') AS num FROM scheduled_tickets")); - $scheduled_ticket_count = $row['num']; + // Recurring Ticket Count + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_ticket_id') AS num FROM recurring_tickets")); + $recurring_ticket_count = $row['num']; // Calendar Event Count $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('event_id') AS num FROM events")); @@ -927,9 +933,9 @@ if ($config_telemetry > 0 || $config_telemetry == 2) { $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('revenue_id') AS num FROM revenues")); $revenue_count = $row['num']; - // Recurring Count - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_id') AS num FROM recurring")); - $recurring_count = $row['num']; + // Recurring Invoice Count + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('recurring_invoice_id') AS num FROM recurring_invoices")); + $recurring_invoice_count = $row['num']; // Account Count $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('account_id') AS num FROM accounts")); @@ -983,9 +989,9 @@ if ($config_telemetry > 0 || $config_telemetry == 2) { $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('software_id') AS num FROM software WHERE software_template = 1")); $software_template_count = $row['num']; - // Password Count - $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('login_id') AS num FROM logins")); - $password_count = $row['num']; + // Credential Count + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('credential_id') AS num FROM credentials")); + $credential_count = $row['num']; // Network Count $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('network_id') AS num FROM networks")); @@ -1075,12 +1081,12 @@ if ($config_telemetry > 0 || $config_telemetry == 2) { 'currency' => "$company_currency", 'client_count' => $client_count, 'ticket_count' => $ticket_count, - 'scheduled_ticket_count' => $scheduled_ticket_count, + 'recurring_ticket_count' => $recurring_ticket_count, 'calendar_event_count' => $calendar_event_count, 'quote_count' => $quote_count, 'invoice_count' => $invoice_count, 'revenue_count' => $revenue_count, - 'recurring_count' => $recurring_count, + 'recurring_invoice_count' => $recurring_invoice_count, 'account_count' => $account_count, 'tax_count' => $tax_count, 'product_count' => $product_count, @@ -1094,7 +1100,7 @@ if ($config_telemetry > 0 || $config_telemetry == 2) { 'asset_count' => $asset_count, 'software_count' => $software_count, 'software_template_count' => $software_template_count, - 'password_count' => $password_count, + 'credential_count' => $credential_count, 'network_count' => $network_count, 'certificate_count' => $certificate_count, 'domain_count' => $domain_count, diff --git a/scripts/cron_certificate_refresher.php b/scripts/cron_certificate_refresher.php index 9cb2feb6..70149aba 100644 --- a/scripts/cron_certificate_refresher.php +++ b/scripts/cron_certificate_refresher.php @@ -11,7 +11,7 @@ if (php_sapi_name() !== 'cli') { require_once "../config.php"; // Set Timezone -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; require_once "../functions.php"; diff --git a/scripts/cron_domain_refresher.php b/scripts/cron_domain_refresher.php index 5132e0f0..2bb04656 100644 --- a/scripts/cron_domain_refresher.php +++ b/scripts/cron_domain_refresher.php @@ -11,7 +11,7 @@ if (php_sapi_name() !== 'cli') { require_once "../config.php"; // Set Timezone -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; require_once "../functions.php"; $sql_settings = mysqli_query($mysqli, "SELECT * FROM settings WHERE settings.company_id = 1"); diff --git a/scripts/cron_mail_queue.php b/scripts/cron_mail_queue.php index f536a57a..87e52447 100644 --- a/scripts/cron_mail_queue.php +++ b/scripts/cron_mail_queue.php @@ -10,7 +10,7 @@ if (php_sapi_name() !== 'cli') { require_once "../config.php"; // Set Timezone -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; require_once "../functions.php"; $sql_settings = mysqli_query($mysqli, "SELECT * FROM settings WHERE company_id = 1"); diff --git a/scripts/cron_ticket_email_parser.php b/scripts/cron_ticket_email_parser.php index f9276ad9..f0569f2b 100644 --- a/scripts/cron_ticket_email_parser.php +++ b/scripts/cron_ticket_email_parser.php @@ -19,11 +19,11 @@ if (php_sapi_name() !== 'cli') { require_once "../config.php"; // Set Timezone -require_once "../inc_set_timezone.php"; +require_once "../includes/inc_set_timezone.php"; require_once "../functions.php"; // Get settings for the "default" company -require_once "../get_settings.php"; +require_once "../includes/get_settings.php"; $config_ticket_prefix = sanitizeInput($config_ticket_prefix); $config_ticket_from_name = sanitizeInput($config_ticket_from_name); @@ -269,7 +269,8 @@ function addReply($from_email, $date, $subject, $ticket_number, $message, $attac mysqli_query($mysqli, "INSERT INTO ticket_replies SET ticket_reply = '$message_esc', ticket_reply_type = '$ticket_reply_type', ticket_reply_time_worked = '00:00:00', ticket_reply_by = $ticket_reply_contact, ticket_reply_ticket_id = $ticket_id"); $reply_id = mysqli_insert_id($mysqli); - mkdirMissing('../uploads/tickets/'); + $ticket_dir = "../uploads/tickets/" . $ticket_id . "/"; + mkdirMissing($ticket_dir); foreach ($attachments as $attachment) { $att_name = $attachment->getFilename(); $att_extarr = explode('.', $att_name); @@ -277,7 +278,7 @@ function addReply($from_email, $date, $subject, $ticket_number, $message, $attac if (in_array($att_extension, $allowed_extensions)) { $att_saved_filename = md5(uniqid(rand(), true)) . '.' . $att_extension; - $att_saved_path = "../uploads/tickets/" . $ticket_id . "/" . $att_saved_filename; + $att_saved_path = $ticket_dir . $att_saved_filename; file_put_contents($att_saved_path, $attachment->getContent()); $ticket_attachment_name = sanitizeInput($att_name); diff --git a/scripts/setup_cli.php b/scripts/setup_cli.php index 4e2411c5..ed46d8f0 100644 --- a/scripts/setup_cli.php +++ b/scripts/setup_cli.php @@ -267,8 +267,8 @@ $password_hash = password_hash(trim($user_password_plain), PASSWORD_DEFAULT); $site_encryption_master_key = randomString(); $user_specific_encryption_ciphertext = setupFirstUserSpecificKey($user_password_plain, $site_encryption_master_key); -mysqli_query($mysqli,"INSERT INTO users SET user_name = '$user_name', user_email = '$user_email', user_password = '$password_hash', user_specific_encryption_ciphertext = '$user_specific_encryption_ciphertext'"); -mysqli_query($mysqli,"INSERT INTO user_settings SET user_id = 1, user_role = 3"); +mysqli_query($mysqli,"INSERT INTO users SET user_name = '$user_name', user_email = '$user_email', user_password = '$password_hash', user_specific_encryption_ciphertext = '$user_specific_encryption_ciphertext', user_role_id = 3"); +mysqli_query($mysqli,"INSERT INTO user_settings SET user_id = 1"); echo "User $user_name created successfully.\n"; // Company Details @@ -276,7 +276,7 @@ mysqli_query($mysqli,"INSERT INTO companies SET company_name = '$company_name', // Insert default settings and categories $latest_database_version = LATEST_DATABASE_VERSION; -mysqli_query($mysqli,"INSERT INTO settings SET company_id = 1, config_current_database_version = '$latest_database_version', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_recurring_prefix = 'REC-', config_recurring_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_default_net_terms = 30, config_ticket_next_number = 1, config_ticket_prefix = 'TCK-'"); +mysqli_query($mysqli,"INSERT INTO settings SET company_id = 1, config_current_database_version = '$latest_database_version', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_recurring_invoice_prefix = 'REC-', config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_default_net_terms = 30, config_ticket_next_number = 1, config_ticket_prefix = 'TCK-'"); // Categories mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Office Supplies', category_type = 'Expense', category_color = 'blue'"); @@ -308,20 +308,20 @@ mysqli_query($mysqli, "INSERT INTO modules SET module_name = 'module_financial', mysqli_query($mysqli, "INSERT INTO modules SET module_name = 'module_reporting', module_description = 'Access to all reports'"); // Roles -mysqli_query($mysqli, "INSERT INTO user_roles SET user_role_id = 1, user_role_name = 'Accountant', user_role_description = 'Built-in - Limited access to financial-focused modules'"); +mysqli_query($mysqli, "INSERT INTO user_roles SET role_id = 1, role_name = 'Accountant', role_description = 'Built-in - Limited access to financial-focused modules'"); mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = 1, module_id = 1, user_role_permission_level = 1"); mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = 1, module_id = 2, user_role_permission_level = 1"); mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = 1, module_id = 4, user_role_permission_level = 1"); mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = 1, module_id = 5, user_role_permission_level = 2"); mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = 1, module_id = 6, user_role_permission_level = 1"); -mysqli_query($mysqli, "INSERT INTO user_roles SET user_role_id = 2, user_role_name = 'Technician', user_role_description = 'Built-in - Limited access to technical-focused modules'"); +mysqli_query($mysqli, "INSERT INTO user_roles SET role_id = 2, role_name = 'Technician', role_description = 'Built-in - Limited access to technical-focused modules'"); mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = 2, module_id = 1, user_role_permission_level = 2"); mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = 2, module_id = 2, user_role_permission_level = 2"); mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = 2, module_id = 3, user_role_permission_level = 2"); mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = 2, module_id = 4, user_role_permission_level = 2"); -mysqli_query($mysqli, "INSERT INTO user_roles SET user_role_id = 3, user_role_name = 'Administrator', user_role_description = 'Built-in - Full administrative access', user_role_is_admin = 1"); +mysqli_query($mysqli, "INSERT INTO user_roles SET role_id = 3, role_name = 'Administrator', role_description = 'Built-in - Full administrative access', role_is_admin = 1"); // Custom Links mysqli_query($mysqli,"INSERT INTO custom_links SET custom_link_name = 'Docs', custom_link_uri = 'https://docs.itflow.org', custom_link_new_tab = 1, custom_link_icon = 'question-circle'"); diff --git a/scripts/update_cli.php b/scripts/update_cli.php index b505c128..55aa4820 100644 --- a/scripts/update_cli.php +++ b/scripts/update_cli.php @@ -127,4 +127,4 @@ if (isset($options['update_db'])) { } else { echo "Database is already at the latest version ($latest_db_version). No updates were applied.\n"; } -} +} \ No newline at end of file diff --git a/setup.php b/setup.php index dd955461..12393a13 100644 --- a/setup.php +++ b/setup.php @@ -19,7 +19,7 @@ if ($config_enable_setup == 0) { exit; } -include_once "settings_localization_array.php"; +include_once "includes/settings_localization_array.php"; $errorLog = ini_get('error_log') ?: "Debian/Ubuntu default is usually /var/log/apache2/error.log"; // Get a list of all available timezones @@ -127,7 +127,7 @@ if (isset($_POST['add_user'])) { //Generate user specific key $user_specific_encryption_ciphertext = setupFirstUserSpecificKey(trim($_POST['password']), $site_encryption_master_key); - mysqli_query($mysqli,"INSERT INTO users SET user_name = '$name', user_email = '$email', user_password = '$password', user_specific_encryption_ciphertext = '$user_specific_encryption_ciphertext'"); + mysqli_query($mysqli,"INSERT INTO users SET user_name = '$name', user_email = '$email', user_password = '$password', user_specific_encryption_ciphertext = '$user_specific_encryption_ciphertext', user_role_id = 3"); mkdirMissing("uploads/users/1"); @@ -175,7 +175,7 @@ if (isset($_POST['add_user'])) { } //Create Settings - mysqli_query($mysqli,"INSERT INTO user_settings SET user_id = 1, user_role = 3"); + mysqli_query($mysqli,"INSERT INTO user_settings SET user_id = 1"); $_SESSION['alert_message'] = "User $name created"; @@ -244,7 +244,7 @@ if (isset($_POST['add_company_settings'])) { } $latest_database_version = LATEST_DATABASE_VERSION; - mysqli_query($mysqli,"INSERT INTO settings SET company_id = 1, config_current_database_version = '$latest_database_version', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_recurring_prefix = 'REC-', config_recurring_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_default_net_terms = 30, config_ticket_next_number = 1, config_ticket_prefix = 'TCK-'"); + mysqli_query($mysqli,"INSERT INTO settings SET company_id = 1, config_current_database_version = '$latest_database_version', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_recurring_invoice_prefix = 'REC-', config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_default_net_terms = 30, config_ticket_next_number = 1, config_ticket_prefix = 'TCK-'"); // Create Categories // Expense Categories Examples @@ -314,20 +314,20 @@ if (isset($_POST['add_company_settings'])) { mysqli_query($mysqli, "INSERT INTO modules SET module_name = 'module_reporting', module_description = 'Access to all reports'"); // Add default roles - mysqli_query($mysqli, "INSERT INTO user_roles SET user_role_id = 1, user_role_name = 'Accountant', user_role_description = 'Built-in - Limited access to financial-focused modules'"); + mysqli_query($mysqli, "INSERT INTO user_roles SET role_id = 1, role_name = 'Accountant', role_description = 'Built-in - Limited access to financial-focused modules'"); mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = 1, module_id = 1, user_role_permission_level = 1"); // Read clients mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = 1, module_id = 2, user_role_permission_level = 1"); // Read support mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = 1, module_id = 4, user_role_permission_level = 1"); // Read sales mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = 1, module_id = 5, user_role_permission_level = 2"); // Modify financial mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = 1, module_id = 6, user_role_permission_level = 1"); // Read reports - mysqli_query($mysqli, "INSERT INTO user_roles SET user_role_id = 2, user_role_name = 'Technician', user_role_description = 'Built-in - Limited access to technical-focused modules'"); + mysqli_query($mysqli, "INSERT INTO user_roles SET role_id = 2, role_name = 'Technician', role_description = 'Built-in - Limited access to technical-focused modules'"); mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = 2, module_id = 1, user_role_permission_level = 2"); // Modify clients mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = 2, module_id = 2, user_role_permission_level = 2"); // Modify support mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = 2, module_id = 3, user_role_permission_level = 2"); // Modify credentials mysqli_query($mysqli, "INSERT INTO user_role_permissions SET user_role_id = 2, module_id = 4, user_role_permission_level = 2"); // Modify sales - mysqli_query($mysqli, "INSERT INTO user_roles SET user_role_id = 3, user_role_name = 'Administrator', user_role_description = 'Built-in - Full administrative access to all modules (including user management)', user_role_is_admin = 1"); + mysqli_query($mysqli, "INSERT INTO user_roles SET role_id = 3, role_name = 'Administrator', role_description = 'Built-in - Full administrative access to all modules (including user management)', role_is_admin = 1"); // Custom Links mysqli_query($mysqli,"INSERT INTO custom_links SET custom_link_name = 'Docs', custom_link_uri = 'https://docs.itflow.org', custom_link_new_tab = 1, custom_link_icon = 'question-circle'"); diff --git a/software.php b/software.php index 5afd3355..8e3f63b2 100644 --- a/software.php +++ b/software.php @@ -175,6 +175,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); } else { $software_expire_display = "N/A"; + $tr_class = ''; } $software_created_at = nullable_htmlentities($row['software_created_at']); diff --git a/temp_bulk_close_bugfix.php b/temp_bulk_close_bugfix.php deleted file mode 100644 index f277099f..00000000 --- a/temp_bulk_close_bugfix.php +++ /dev/null @@ -1,28 +0,0 @@ - - - -
      -
    1. - Dashboard -
      2. -
    2. Temp bugfix page
      3. -
    - - -

    Temporary page to fix bulk ticket close/resolution bug

    -
    -

    Navigate back to tickets - all bulk closed tickets should be fixed now and no longer appear as open.

    - - - - 1 + "SELECT user_id, user_name FROM users + WHERE user_role_id > 1 AND user_type = 1 AND user_status = 1 AND user_archived_at IS NULL @@ -291,6 +291,12 @@ if (isset($_GET['ticket_id'])) { // Get Watchers $sql_ticket_watchers = mysqli_query($mysqli, "SELECT * FROM ticket_watchers WHERE watcher_ticket_id = $ticket_id ORDER BY watcher_email DESC"); + // Get Additional Assets + $sql_additional_assets = mysqli_query($mysqli, "SELECT * FROM assets, ticket_assets + WHERE assets.asset_id = ticket_assets.asset_id + AND ticket_id = $ticket_id + AND assets.asset_id != $asset_id" + ); // Get Ticket Attachments $sql_ticket_attachments = mysqli_query( @@ -1018,16 +1024,36 @@ if (isset($_GET['ticket_id'])) {
    -
    Asset
    +
    Asset(s)
    + +
    + + + +
    +