diff --git a/client_certificates.php b/client_certificates.php
index 6dd592d0..63a0f451 100644
--- a/client_certificates.php
+++ b/client_certificates.php
@@ -94,6 +94,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
while ($row = mysqli_fetch_array($sql)) {
$certificate_id = intval($row['certificate_id']);
$certificate_name = nullable_htmlentities($row['certificate_name']);
+ $certificate_description = nullable_htmlentities($row['certificate_description']);
$certificate_domain = nullable_htmlentities($row['certificate_domain']);
$certificate_issued_by = nullable_htmlentities($row['certificate_issued_by']);
$certificate_expire = nullable_htmlentities($row['certificate_expire']);
@@ -107,9 +108,17 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
)" data-target="#editCertificateModal"> |
-
+
+ )" data-target="#editCertificateModal">
+
+
+ |
|
|
diff --git a/js/certificate_edit_modal.js b/js/certificate_edit_modal.js
index 6ac93561..4a64e321 100644
--- a/js/certificate_edit_modal.js
+++ b/js/certificate_edit_modal.js
@@ -17,6 +17,7 @@ function populateCertificateEditModal(client_id, certificate_id) {
document.getElementById("editCertificateHeader").innerText = certificate.certificate_name;
document.getElementById("editCertificateId").value = certificate_id;
document.getElementById("editCertificateName").value = certificate.certificate_name;
+ document.getElementById("editCertificateDescription").value = certificate.certificate_description;
document.getElementById("editCertificateDomain").value = certificate.certificate_domain;
document.getElementById("editCertificateIssuedBy").value = certificate.certificate_issued_by;
document.getElementById("editCertificateExpire").value = certificate.certificate_expire;
diff --git a/post/certificate.php b/post/certificate.php
index ec933db0..a177974b 100644
--- a/post/certificate.php
+++ b/post/certificate.php
@@ -10,6 +10,7 @@ if (isset($_POST['add_certificate'])) {
$client_id = intval($_POST['client_id']);
$name = sanitizeInput($_POST['name']);
+ $description = sanitizeInput($_POST['description']);
$domain = sanitizeInput($_POST['domain']);
$issued_by = sanitizeInput($_POST['issued_by']);
$expire = sanitizeInput($_POST['expire']);
@@ -33,7 +34,7 @@ if (isset($_POST['add_certificate'])) {
$expire = "'" . $expire . "'";
}
- mysqli_query($mysqli,"INSERT INTO certificates SET certificate_name = '$name', certificate_domain = '$domain', certificate_issued_by = '$issued_by', certificate_expire = $expire, certificate_public_key = '$public_key', certificate_notes = '$notes', certificate_domain_id = $domain_id, certificate_client_id = $client_id");
+ mysqli_query($mysqli,"INSERT INTO certificates SET certificate_name = '$name', certificate_description = '$description', certificate_domain = '$domain', certificate_issued_by = '$issued_by', certificate_expire = $expire, certificate_public_key = '$public_key', certificate_notes = '$notes', certificate_domain_id = $domain_id, certificate_client_id = $client_id");
$certificate_id = mysqli_insert_id($mysqli);
@@ -52,6 +53,7 @@ if (isset($_POST['edit_certificate'])) {
$certificate_id = intval($_POST['certificate_id']);
$name = sanitizeInput($_POST['name']);
+ $description = sanitizeInput($_POST['description']);
$domain = sanitizeInput($_POST['domain']);
$issued_by = sanitizeInput($_POST['issued_by']);
$expire = sanitizeInput($_POST['expire']);
@@ -76,7 +78,7 @@ if (isset($_POST['edit_certificate'])) {
$expire = "'" . $expire . "'";
}
- mysqli_query($mysqli,"UPDATE certificates SET certificate_name = '$name', certificate_domain = '$domain', certificate_issued_by = '$issued_by', certificate_expire = $expire, certificate_public_key = '$public_key', certificate_notes = '$notes', certificate_domain_id = '$domain_id' WHERE certificate_id = $certificate_id");
+ mysqli_query($mysqli,"UPDATE certificates SET certificate_name = '$name', certificate_description = '$description', certificate_domain = '$domain', certificate_issued_by = '$issued_by', certificate_expire = $expire, certificate_public_key = '$public_key', certificate_notes = '$notes', certificate_domain_id = '$domain_id' WHERE certificate_id = $certificate_id");
//Logging
mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Certificate', log_action = 'Modify', log_description = '$session_name modified certificate $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $certificate_id");
@@ -189,12 +191,12 @@ if (isset($_POST['export_client_certificates_csv'])) {
$f = fopen('php://memory', 'w');
//set column headers
- $fields = array('Name', 'Domain', 'Issuer', 'Expiration Date');
+ $fields = array('Name', 'Description', 'Domain', 'Issuer', 'Expiration Date');
fputcsv($f, $fields, $delimiter);
//output each row of the data, format line as csv and write to file pointer
while($row = $sql->fetch_assoc()) {
- $lineData = array($row['certificate_name'], $row['certificate_domain'], $row['certificate_issued_by'], $row['certificate_expire']);
+ $lineData = array($row['certificate_name'], $row['certificate_description'], $row['certificate_domain'], $row['certificate_issued_by'], $row['certificate_expire']);
fputcsv($f, $lineData, $delimiter);
}