diff --git a/ajax.php b/ajax.php index 2143d9bb..aa2d26ee 100644 --- a/ajax.php +++ b/ajax.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 585336aa..c6125f65 100644 --- a/ajax/ajax_asset_details.php +++ b/ajax/ajax_asset_details.php @@ -111,24 +111,24 @@ $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); @@ -452,68 +452,68 @@ ob_start(); 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); ?> - + - + - + - + - + @@ -685,11 +685,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(); diff --git a/ajax/ajax_contact_details.php b/ajax/ajax_contact_details.php index 05f8a68a..5dbd80d7 100644 --- a/ajax/ajax_contact_details.php +++ b/ajax/ajax_contact_details.php @@ -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 @@ -418,68 +418,68 @@ ob_start(); 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); ?> - - - + + + - + - + - + diff --git a/ajax/ajax_credential_edit.php b/ajax/ajax_credential_edit.php index c6b50da8..ea132dfe 100644 --- a/ajax/ajax_credential_edit.php +++ b/ajax/ajax_credential_edit.php @@ -2,33 +2,32 @@ 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); -$client_id = intval($row['login_client_id']); -$login_id = intval($row['login_id']); -$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_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']); -$login_asset_id = intval($row['login_asset_id']); +$client_id = intval($row['credential_client_id']); +$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(decryptCredentialEntry($row['credential_username'])); +$credential_password = nullable_htmlentities(decryptCredentialEntry($row['credential_password'])); +$credential_otp_secret = nullable_htmlentities($row['credential_otp_secret']); +$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']); +$credential_asset_id = intval($row['credential_asset_id']); // Tags -$login_tag_id_array = array(); -$sql_login_tags = mysqli_query($mysqli, "SELECT tag_id FROM login_tags WHERE login_id = $login_id"); -while ($row = mysqli_fetch_array($sql_login_tags)) { - $login_tag_id = intval($row['tag_id']); - $login_tag_id_array[] = $login_tag_id; +$credential_tag_id_array = array(); +$sql_credential_tags = mysqli_query($mysqli, "SELECT tag_id FROM credential_tags WHERE credential_id = $credential_id"); +while ($row = mysqli_fetch_array($sql_credential_tags)) { + $credential_tag_id = intval($row['tag_id']); + $credential_tag_id_array[] = $credential_tag_id; } // Generate the HTML form content using output buffering. @@ -36,26 +35,26 @@ ob_start(); ?>
-
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_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/asset_details.php b/asset_details.php index 9cf8fa97..572a8f87 100644 --- a/asset_details.php +++ b/asset_details.php @@ -184,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( @@ -523,7 +523,7 @@ if (isset($_GET['asset_id'])) {
-
"> +
">

Credentials

@@ -544,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); ?> @@ -602,18 +602,18 @@ if (isset($_GET['asset_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'])) { - + - - + + - + - +
- + 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()"));
- - Name + + Name Username / ID Password / Key OTP - - URI + + URI @@ -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()")); ?> - "> + ">
- +
-
-
+
+
+ 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/database_updates.php b/database_updates.php index abaa4cb3..13f8bbd6 100644 --- a/database_updates.php +++ b/database_updates.php @@ -2583,10 +2583,89 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.9.9'"); } - // if (CURRENT_DATABASE_VERSION == '1.9.9') { - // // Insert queries here required to update to DB version 2.0.0 + 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' + "); + + mysqli_query($mysqli, "RENAME TABLE `contact_logins` TO `contact_credentials`"); + mysqli_query($mysqli, " + ALTER TABLE `contact_credentials` + CHANGE COLUMN `login_id` `credential_id` INT(11) NOT NULL, + ADD FOREIGN KEY (`contact_id`) REFERENCES `contacts`(`contact_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`credential_id`) REFERENCES `credentials`(`credential_id`) ON DELETE CASCADE + "); + + mysqli_query($mysqli, "RENAME TABLE `service_logins` TO `service_credentials`"); + mysqli_query($mysqli, " + ALTER TABLE `service_credentials` + CHANGE COLUMN `login_id` `credential_id` INT(11) NOT NULL, + ADD FOREIGN KEY (`service_id`) REFERENCES `services`(`service_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`credential_id`) REFERENCES `credentials`(`credential_id`) ON DELETE CASCADE + "); + + mysqli_query($mysqli, "RENAME TABLE `software_logins` TO `software_credentials`"); + mysqli_query($mysqli, " + ALTER TABLE `software_credentials` + CHANGE COLUMN `login_id` `credential_id` INT(11) NOT NULL, + ADD FOREIGN KEY (`software_id`) REFERENCES `software`(`software_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`credential_id`) REFERENCES `credentials`(`credential_id`) ON DELETE CASCADE + "); + + mysqli_query($mysqli, "RENAME TABLE `vendor_logins` TO `vendor_credentials`"); + mysqli_query($mysqli, " + ALTER TABLE `vendor_credentials` + CHANGE COLUMN `login_id` `credential_id` INT(11) NOT NULL, + ADD FOREIGN KEY (`vendor_id`) REFERENCES `vendors`(`vendor_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`credential_id`) REFERENCES `credentials`(`credential_id`) ON DELETE CASCADE + "); + + mysqli_query($mysqli, "RENAME TABLE `login_tags` TO `credential_tags`"); + mysqli_query($mysqli, " + ALTER TABLE `credential_tags` + CHANGE COLUMN `login_id` `credential_id` INT(11) NOT NULL, + ADD FOREIGN KEY (`tag_id`) REFERENCES `tags`(`tag_id`) ON DELETE CASCADE, + ADD FOREIGN KEY (`credential_id`) REFERENCES `credentials`(`credential_id`) ON DELETE CASCADE + "); + + 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') { + // // Insert queries here required to update to DB version 2.0.1 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.0'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.1'"); // } } else { diff --git a/db.sql b/db.sql index 43b590c0..db10b2e8 100644 --- a/db.sql +++ b/db.sql @@ -73,6 +73,23 @@ 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 = utf8 */; +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` -- @@ -483,6 +500,23 @@ CREATE TABLE `contact_assets` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_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 = utf8 */; +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=utf8mb3 COLLATE=utf8mb3_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `contact_documents` -- @@ -511,20 +545,6 @@ CREATE TABLE `contact_files` ( ) 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; -/*!40101 SET character_set_client = @saved_cs_client */; - -- -- Table structure for table `contact_notes` -- @@ -594,6 +614,55 @@ 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 = utf8 */; +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 = utf8 */; +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` -- @@ -1013,52 +1082,6 @@ 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` -- @@ -1619,6 +1642,23 @@ CREATE TABLE `service_contacts` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_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 = utf8 */; +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=utf8mb3 COLLATE=utf8mb3_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `service_documents` -- @@ -1645,19 +1685,6 @@ CREATE TABLE `service_domains` ( ) 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; -/*!40101 SET character_set_client = @saved_cs_client */; - -- -- Table structure for table `service_vendors` -- @@ -1884,6 +1911,23 @@ CREATE TABLE `software_contacts` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_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 = utf8 */; +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=utf8mb3 COLLATE=utf8mb3_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `software_documents` -- @@ -1912,20 +1956,6 @@ CREATE TABLE `software_files` ( ) 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; -/*!40101 SET character_set_client = @saved_cs_client */; - -- -- Table structure for table `tags` -- @@ -2187,6 +2217,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; @@ -2334,6 +2365,23 @@ CREATE TABLE `users` ( ) 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 = utf8 */; +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=utf8mb3 COLLATE=utf8mb3_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `vendor_documents` -- @@ -2362,20 +2410,6 @@ CREATE TABLE `vendor_files` ( ) 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; -/*!40101 SET character_set_client = @saved_cs_client */; - -- -- Table structure for table `vendors` -- @@ -2417,4 +2451,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-03-12 13:56:16 +-- Dump completed on 2025-03-12 21:27:39 diff --git a/functions.php b/functions.php index cdb1017b..dce9bb1f 100644 --- a/functions.php +++ b/functions.php @@ -334,13 +334,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 +350,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 +367,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(); diff --git a/global_search.php b/global_search.php index b1455cda..5b121bc5 100644 --- a/global_search.php +++ b/global_search.php @@ -99,13 +99,13 @@ if (isset($_GET['query'])) { 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 @@ -571,9 +571,9 @@ if (isset($_GET['query'])) { - 0) { ?> + 0) { ?> - +
@@ -593,21 +593,21 @@ if (isset($_GET['query'])) { - - - - + + + + diff --git a/guest/guest_view_item.php b/guest/guest_view_item.php index efe783df..96d78af0 100644 --- a/guest/guest_view_item.php +++ b/guest/guest_view_item.php @@ -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"; 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'] . '"'; + $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($login_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']); ?> -
+
- + - + - + - + @@ -250,12 +250,12 @@ if ($item_type == "Document") { Credentials 0) { ?> - + if ($num_credentials > 0) { ?> +

diff --git a/includes/database_version.php b/includes/database_version.php index cd74dc9d..d3e1d495 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.9.9"); +DEFINE("LATEST_DATABASE_VERSION", "2.0.0"); diff --git a/includes/inc_all_client.php b/includes/inc_all_client.php index 55ffdd0d..f4867bf4 100644 --- a/includes/inc_all_client.php +++ b/includes/inc_all_client.php @@ -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']; diff --git a/js/credential_show_otp_via_id.js b/js/credential_show_otp_via_id.js index 36fb042a..43e34328 100644 --- a/js/credential_show_otp_via_id.js +++ b/js/credential_show_otp_via_id.js @@ -1,15 +1,15 @@ -function showOTPViaLoginID(login_id) { - // Send a GET request to ajax.php as ajax.php?get_totp_token_via_id=true&login_id=ID +function showOTPViaCredentialID(credential_id) { + // Send a GET request to ajax.php as ajax.php?get_totp_token_via_id=true&credential_id=ID jQuery.get( "ajax.php", { get_totp_token_via_id: 'true', - login_id: login_id + credential_id: credential_id }, function(data) { //If we get a response from post.php, parse it as JSON const token = JSON.parse(data); - document.getElementById("otp_" + login_id).innerText = token + document.getElementById("otp_" + credential_id).innerText = token } ); diff --git a/modals/asset_link_credential_modal.php b/modals/asset_link_credential_modal.php index 917e63b3..748133d2 100644 --- a/modals/asset_link_credential_modal.php +++ b/modals/asset_link_credential_modal.php @@ -16,23 +16,23 @@
- - + diff --git a/modals/contact_link_credential_modal.php b/modals/contact_link_credential_modal.php index 6aa9d691..daf0cd6b 100644 --- a/modals/contact_link_credential_modal.php +++ b/modals/contact_link_credential_modal.php @@ -16,23 +16,23 @@
- - + diff --git a/modals/credential_add_modal.php b/modals/credential_add_modal.php index dc0907aa..4a0647b5 100644 --- a/modals/credential_add_modal.php +++ b/modals/credential_add_modal.php @@ -1,4 +1,4 @@ - - - - + + + diff --git a/scripts/cron.php b/scripts/cron.php index bfb5c8c0..6185024a 100644 --- a/scripts/cron.php +++ b/scripts/cron.php @@ -989,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")); @@ -1100,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,
URL
Username
Password
2FA (TOTP)