From 6a3d53fc4b17c627526833e3a550987fe97c70b0 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 20 Mar 2024 12:53:25 -0400 Subject: [PATCH 01/21] Feature: Added Ticket Replies to Global Search --- client_contacts.php | 2 +- global_search.php | 79 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 75 insertions(+), 6 deletions(-) diff --git a/client_contacts.php b/client_contacts.php index 4ebe9c465..540c38ae8 100644 --- a/client_contacts.php +++ b/client_contacts.php @@ -10,7 +10,7 @@ //Rebuild URL $url_query_strings_sort = http_build_query($get_copy); -$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM contacts +$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM contacts LEFT JOIN locations ON location_id = contact_location_id WHERE contact_$archive_query AND (contact_name LIKE '%$q%' OR contact_title LIKE '%$q%' OR location_name LIKE '%$q%' OR contact_email LIKE '%$q%' OR contact_department LIKE '%$q%' OR contact_phone LIKE '%$phone_query%' OR contact_extension LIKE '%$q%' OR contact_mobile LIKE '%$phone_query%') diff --git a/global_search.php b/global_search.php index 418b8ca1c..a52b5c2cf 100644 --- a/global_search.php +++ b/global_search.php @@ -2,6 +2,12 @@ require_once "inc_all.php"; +// Initialize the HTML Purifier to prevent XSS +require "plugins/htmlpurifier/HTMLPurifier.standalone.php"; + +$purifier_config = HTMLPurifier_Config::createDefault(); +$purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]); +$purifier = new HTMLPurifier($purifier_config); if (isset($_GET['query'])) { @@ -93,14 +99,26 @@ ORDER BY asset_name DESC LIMIT 5" ); + $sql_ticket_replies = mysqli_query($mysqli,"SELECT * FROM ticket_replies + LEFT JOIN tickets ON ticket_reply_ticket_id = ticket_id + LEFT JOIN clients ON ticket_client_id = client_id + WHERE ticket_reply_archived_at IS NULL + AND (ticket_reply LIKE '%$query%' OR ticket_subject LIKE '%$query%' OR ticket_details LIKE '%$query%') + ORDER BY ticket_id DESC LIMIT 5" + ); + $q = nullable_htmlentities($_GET['query']); ?> -

Search all things

-
+
+
+

Global Search

+
+
+ 0) { ?> @@ -617,11 +635,62 @@ -
+ 0) { ?> + + + +
+ +
+
+
Ticket Replies
+
+
+ + purify($row['ticket_reply']); + $client_id = intval($row['ticket_client_id']); + $client_name = nullable_htmlentities($row['client_name']); + + ?> +
+
+

+ - +

+
+ Open +
+
+
+
+
+ +
+
+
+
+ + +
- +
+ +
+ + + + Date: Wed, 20 Mar 2024 13:00:50 -0400 Subject: [PATCH 02/21] Include Client Name in Ticket Replies Global Search --- global_search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global_search.php b/global_search.php index a52b5c2cf..25b2f59b3 100644 --- a/global_search.php +++ b/global_search.php @@ -662,7 +662,7 @@

- - +

Open From 6790464e909422a7536b13180f0c10827d98ea5c Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 20 Mar 2024 13:05:10 -0400 Subject: [PATCH 03/21] Do not show DHCP if IP is null under assets --- client_assets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client_assets.php b/client_assets.php index cf0881f89..60dde070f 100644 --- a/client_assets.php +++ b/client_assets.php @@ -224,7 +224,7 @@ } $asset_ip = nullable_htmlentities($row['asset_ip']); if (empty($asset_ip)) { - $asset_ip_display = "DHCP"; + $asset_ip_display = "-"; } else { $asset_ip_display = $asset_ip; } From c0115a26c5fb87963bc1a8cec9afef584830f1ea Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 20 Mar 2024 13:36:04 -0400 Subject: [PATCH 04/21] Group Ticket Replies and only search in ticket reply not ticket subject or ticket details In global search --- global_search.php | 74 +++++++++++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 25 deletions(-) diff --git a/global_search.php b/global_search.php index 25b2f59b3..379f142c9 100644 --- a/global_search.php +++ b/global_search.php @@ -103,8 +103,8 @@ LEFT JOIN tickets ON ticket_reply_ticket_id = ticket_id LEFT JOIN clients ON ticket_client_id = client_id WHERE ticket_reply_archived_at IS NULL - AND (ticket_reply LIKE '%$query%' OR ticket_subject LIKE '%$query%' OR ticket_details LIKE '%$query%') - ORDER BY ticket_id DESC LIMIT 5" + AND (ticket_reply LIKE '%$query%') + ORDER BY ticket_id DESC, ticket_reply_id ASC LIMIT 20" ); $q = nullable_htmlentities($_GET['query']); @@ -648,36 +648,60 @@
'; + } + + $ticket_prefix = nullable_htmlentities($row['ticket_prefix']); + $ticket_number = intval($row['ticket_number']); + $ticket_subject = nullable_htmlentities($row['ticket_subject']); + $client_id = intval($row['ticket_client_id']); + $client_name = nullable_htmlentities($row['client_name']); + + // Output the ticket header + ?> +
+
+

+ +

+
+ Open +
+
+
+ purify($row['ticket_reply']); - $client_id = intval($row['ticket_client_id']); - $client_name = nullable_htmlentities($row['client_name']); + // Output the ticket reply ?> -
-
-

- -

-
- Open -
+
+ +
+
-
-
-
- -
-
-
-
- - +
+
+
'; + } + ?>
From 845e1689429918d26e46d582e9ae98a55a9bcee3 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 20 Mar 2024 14:22:57 -0400 Subject: [PATCH 05/21] Updated the rest of wording regarding email being sent to email been queued with a link to the Mail Queuer --- post/invoice.php | 10 +++++----- post/quote.php | 4 ++-- post/setting.php | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/post/invoice.php b/post/invoice.php index da872849d..965b3cffc 100644 --- a/post/invoice.php +++ b/post/invoice.php @@ -694,9 +694,9 @@ // Email Logging - $_SESSION['alert_message'] = "Email receipt sent "; + $_SESSION['alert_message'] = "Email queued successfully! Check Admin > Mail queue"; - mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Emailed Receipt!', history_invoice_id = $invoice_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Email Receipt Queued', history_invoice_id = $invoice_id"); } @@ -726,7 +726,7 @@ // Email Logging - $_SESSION['alert_message'] .= "Email receipt sent "; + $_SESSION['alert_message'] = "Test email queued successfully! Check Admin > Mail queue"; mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Payment Receipt sent to mail queue ID: $email_id!', history_invoice_id = $invoice_id"); @@ -877,7 +877,7 @@ // Email Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Payment', log_action = 'Email', log_description = 'Bulk Payment receipt for multiple Invoices queued to $contact_email Email ID: $email_id', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $payment_id"); - $_SESSION['alert_message'] .= "Email receipt sent and "; + $_SESSION['alert_message'] .= "Email receipt queued and "; } // End Email @@ -1013,7 +1013,7 @@ // Get Email ID for reference $email_id = mysqli_insert_id($mysqli); - $_SESSION['alert_message'] = "Invoice has been sent"; + $_SESSION['alert_message'] = "Invoice sent to mail queue! Check Admin > Mail queue"; mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Invoice sent to the mail queue ID: $email_id', history_invoice_id = $invoice_id"); // Don't change the status to sent if the status is anything but draft diff --git a/post/quote.php b/post/quote.php index 69c2075a0..c0a4fa92b 100644 --- a/post/quote.php +++ b/post/quote.php @@ -407,10 +407,10 @@ addToMailQueue($mysqli, $data); // Logging - mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Emailed Quote!', history_quote_id = $quote_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Email Quote Queued', history_quote_id = $quote_id"); mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Quote', log_action = 'Email', log_description = '$session_name emailed Quote $quote_prefix$quote_number to $contact_email Email ID: ', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $quote_id"); - $_SESSION['alert_message'] = "Quote has been sent"; + $_SESSION['alert_message'] = "Quote has been queued successfully! Check Admin > Mail queue"; //Don't change the status to sent if the status is anything but draft if ($quote_status == 'Draft') { diff --git a/post/setting.php b/post/setting.php index fa99eed19..303c74909 100644 --- a/post/setting.php +++ b/post/setting.php @@ -184,7 +184,7 @@ $mail = addToMailQueue($mysqli, $data); if ($mail === true) { - $_SESSION['alert_message'] = "Test email queued successfully - Check Admin > Mail queue"; + $_SESSION['alert_message'] = "Test email queued successfully! Check Admin > Mail queue"; } else { $_SESSION['alert_type'] = "error"; $_SESSION['alert_message'] = "Failed to add test mail to queue"; From 534096f182683c46922c22c69ab879ed913832d7 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 20 Mar 2024 16:54:38 -0400 Subject: [PATCH 06/21] Software Licenese / Template Enhancements: Fixed create Software from template, added description, user media css for licenses and templates, reworked the add edit modal, Removed Software Login --- admin_software_template_add_modal.php | 14 +++++- admin_software_template_edit_modal.php | 14 +++++- admin_software_templates.php | 31 ++++++++----- client_software.php | 64 ++++++-------------------- client_software_add_modal.php | 42 +++++------------ client_software_edit_modal.php | 52 ++++++++------------- post/software.php | 56 +++++++--------------- 7 files changed, 105 insertions(+), 168 deletions(-) diff --git a/admin_software_template_add_modal.php b/admin_software_template_add_modal.php index 823c1c89c..2454dfb17 100644 --- a/admin_software_template_add_modal.php +++ b/admin_software_template_add_modal.php @@ -2,7 +2,7 @@
-
New License Template
+
New License Template
@@ -30,6 +30,16 @@
+
+ +
+
+ +
+ +
+
+
@@ -64,7 +74,7 @@
- +
diff --git a/admin_software_template_edit_modal.php b/admin_software_template_edit_modal.php index 2cf30347e..c51df9e80 100644 --- a/admin_software_template_edit_modal.php +++ b/admin_software_template_edit_modal.php @@ -2,7 +2,7 @@
-
Editing template:
+
Editing template:
@@ -31,6 +31,16 @@
+
+ +
+
+ +
+ +
+
+
@@ -64,7 +74,7 @@
- +
diff --git a/admin_software_templates.php b/admin_software_templates.php index 2a98a09ce..462751cd8 100644 --- a/admin_software_templates.php +++ b/admin_software_templates.php @@ -12,10 +12,9 @@ $sql = mysqli_query( $mysqli, - "SELECT SQL_CALC_FOUND_ROWS * FROM software - LEFT JOIN logins ON login_software_id = software_id + "SELECT SQL_CALC_FOUND_ROWS * FROM software WHERE software_template = 1 - AND (software_name LIKE '%$q%' OR software_type LIKE '%$q%' OR software_key LIKE '%$q%') + AND (software_name LIKE '%$q%' OR software_type LIKE '%$q%') ORDER BY $sort $order LIMIT $record_from, $record_to" ); @@ -25,7 +24,7 @@
-

License Templates

+

License Templates

@@ -36,7 +35,7 @@
- +
@@ -56,7 +55,6 @@ Template Type License Type - Seats Action @@ -67,20 +65,29 @@ $software_id = intval($row['software_id']); $software_name = nullable_htmlentities($row['software_name']); $software_version = nullable_htmlentities($row['software_version']); + $software_description = nullable_htmlentities($row['software_description']); $software_type = nullable_htmlentities($row['software_type']); $software_license_type = nullable_htmlentities($row['software_license_type']); - $software_key = nullable_htmlentities($row['software_key']); - $software_seats = nullable_htmlentities($row['software_seats']); - $software_purchase = nullable_htmlentities($row['software_purchase']); - $software_expire = nullable_htmlentities($row['software_expire']); $software_notes = nullable_htmlentities($row['software_notes']); ?> - $software_version"; ?> + + +
+ +
+

+ $software_version"; ?> +
+ +

+
+
+ + -
- - +
+ +
+
+ +
+ +
+
+
@@ -178,34 +185,7 @@
- - -
- -
- -
- -
-
- -
- -
-
- -
- -
-
- -
- -
- -
-
-
+
diff --git a/client_software_edit_modal.php b/client_software_edit_modal.php index e379394d0..fcae235df 100644 --- a/client_software_edit_modal.php +++ b/client_software_edit_modal.php @@ -9,7 +9,6 @@
-
@@ -18,16 +17,16 @@ Details
  • - Device Licenses + License
  • - User Licenses + Devices
  • - Notes + Users
  • - Login + Notes
    • @@ -57,6 +56,16 @@
    +
    + +
    +
    + +
    + +
    +
    +
    @@ -71,6 +80,10 @@
    +
    + +
    +
    @@ -203,34 +216,7 @@
    - - -
    - -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    -
    - -
    - -
    - -
    -
    -
    +
    diff --git a/post/software.php b/post/software.php index 4d412dd23..57c518922 100644 --- a/post/software.php +++ b/post/software.php @@ -12,11 +12,12 @@ $name = sanitizeInput($_POST['name']); $version = sanitizeInput($_POST['version']); + $description = sanitizeInput($_POST['description']); $type = sanitizeInput($_POST['type']); $license_type = sanitizeInput($_POST['license_type']); $notes = sanitizeInput($_POST['notes']); - mysqli_query($mysqli,"INSERT INTO software SET software_name = '$name', software_version = '$version', software_type = '$type', software_license_type = '$license_type', software_notes = '$notes', software_template = 1, software_client_id = 0"); + mysqli_query($mysqli,"INSERT INTO software SET software_name = '$name', software_version = '$version', software_description = '$description', software_type = '$type', software_license_type = '$license_type', software_notes = '$notes', software_template = 1, software_client_id = 0"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Software Template', log_action = 'Create', log_description = '$session_user_name created software template $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); @@ -34,11 +35,12 @@ $software_id = intval($_POST['software_id']); $name = sanitizeInput($_POST['name']); $version = sanitizeInput($_POST['version']); + $description = sanitizeInput($_POST['description']); $type = sanitizeInput($_POST['type']); $license_type = sanitizeInput($_POST['license_type']); $notes = sanitizeInput($_POST['notes']); - mysqli_query($mysqli,"UPDATE software SET software_name = '$name', software_version = '$version', software_type = '$type', software_license_type = '$license_type', software_notes = '$notes' WHERE software_id = $software_id"); + mysqli_query($mysqli,"UPDATE software SET software_name = '$name', software_version = '$version', software_description = '$description', software_type = '$type', software_license_type = '$license_type', software_notes = '$notes' WHERE software_id = $software_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Software Teplate', log_action = 'Modify', log_description = '$session_name modified software template $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); @@ -60,14 +62,15 @@ $row = mysqli_fetch_array($sql_software); - $name = sanitizeInput($_POST['name']); - $version = sanitizeInput($_POST['version']); - $type = sanitizeInput($_POST['type']); - $license_type = sanitizeInput($_POST['license_type']); - $notes = sanitizeInput($_POST['notes']); + $name = sanitizeInput($row['software_name']); + $version = sanitizeInput($row['software_version']); + $description = sanitizeInput($row['software_description']); + $type = sanitizeInput($row['software_type']); + $license_type = sanitizeInput($row['software_license_type']); + $notes = sanitizeInput($row['software_notes']); // Software add query - mysqli_query($mysqli,"INSERT INTO software SET software_name = '$name', software_version = '$version', software_type = '$type', software_license_type = '$license_type', software_notes = '$notes', software_client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO software SET software_name = '$name', software_version = '$version', software_description = '$description', software_type = '$type', software_license_type = '$license_type', software_notes = '$notes', software_client_id = $client_id"); // Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Software', log_action = 'Create', log_description = 'Software created from template $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id"); @@ -85,6 +88,7 @@ $client_id = intval($_POST['client_id']); $name = sanitizeInput($_POST['name']); $version = sanitizeInput($_POST['version']); + $description = sanitizeInput($_POST['description']); $type = sanitizeInput($_POST['type']); $license_type = sanitizeInput($_POST['license_type']); $notes = sanitizeInput($_POST['notes']); @@ -104,7 +108,7 @@ } $notes = sanitizeInput($_POST['notes']); - mysqli_query($mysqli,"INSERT INTO software SET software_name = '$name', software_version = '$version', software_type = '$type', software_key = '$key', software_license_type = '$license_type', software_seats = $seats, software_purchase = $purchase, software_expire = $expire, software_notes = '$notes', software_client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO software SET software_name = '$name', software_version = '$version', software_description = '$description', software_type = '$type', software_key = '$key', software_license_type = '$license_type', software_seats = $seats, software_purchase = $purchase, software_expire = $expire, software_notes = '$notes', software_client_id = $client_id"); $software_id = mysqli_insert_id($mysqli); @@ -126,14 +130,6 @@ } } - if (!empty($_POST['username'])) { - $username = sanitizeInput(encryptLoginEntry($_POST['username'])); - $password = sanitizeInput(encryptLoginEntry($_POST['password'])); - - mysqli_query($mysqli,"INSERT INTO logins SET login_name = '$name', login_username = '$username', login_password = '$password', login_software_id = $software_id, login_client_id = $client_id"); - - } - //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Software', log_action = 'Create', log_description = '$session_name created software $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 = $software_id"); @@ -148,10 +144,10 @@ validateTechRole(); $software_id = intval($_POST['software_id']); - $login_id = intval($_POST['login_id']); $client_id = intval($_POST['client_id']); $name = sanitizeInput($_POST['name']); $version = sanitizeInput($_POST['version']); + $description = sanitizeInput($_POST['description']); $type = sanitizeInput($_POST['type']); $license_type = sanitizeInput($_POST['license_type']); $notes = sanitizeInput($_POST['notes']); @@ -171,7 +167,7 @@ } $notes = sanitizeInput($_POST['notes']); - mysqli_query($mysqli,"UPDATE software SET software_name = '$name', software_version = '$version', software_type = '$type', software_key = '$key', software_license_type = '$license_type', software_seats = $seats, software_purchase = $purchase, software_expire = $expire, software_notes = '$notes' WHERE software_id = $software_id"); + mysqli_query($mysqli,"UPDATE software SET software_name = '$name', software_version = '$version', software_description = '$description', software_type = '$type', software_key = '$key', software_license_type = '$license_type', software_seats = $seats, software_purchase = $purchase, software_expire = $expire, software_notes = '$notes' WHERE software_id = $software_id"); // Update Asset Licenses @@ -192,23 +188,6 @@ } } - //If login exists then update the login - if ($login_id > 0) { - $username = encryptLoginEntry($_POST['username']); - $password = encryptLoginEntry($_POST['password']); - - mysqli_query($mysqli,"UPDATE logins SET login_name = '$name', login_username = '$username', login_password = '$password' WHERE login_id = $login_id"); - }else{ - //If Username is filled in then add a login - if (!empty($_POST['username'])) { - $username = encryptLoginEntry($_POST['username']); - $password = encryptLoginEntry($_POST['password']); - - mysqli_query($mysqli,"INSERT INTO logins SET login_name = '$name', login_username = '$username', login_password = '$password', login_software_id = $software_id, login_client_id = $client_id"); - - } - } - //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Software', log_action = 'Modify', log_description = '$session_name modified software $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 = $software_id"); @@ -298,7 +277,7 @@ $f = fopen('php://memory', 'w'); //set column headers - $fields = array('Name', 'Version', 'Type', 'License Type', 'Seats', 'Key', 'Assets', 'Contacts', 'Purchased', 'Expires', 'Notes'); + $fields = array('Name', 'Version', 'Description', 'Type', 'License Type', 'Seats', 'Key', 'Assets', 'Contacts', 'Purchased', 'Expires', 'Notes'); fputcsv($f, $fields, $delimiter); //output each row of the data, format line as csv and write to file pointer @@ -328,7 +307,7 @@ $assigned_to_contacts .= $contact_row['contact_name'] . ", "; } - $lineData = array($row['software_name'], $row['software_version'], $row['software_type'], $row['software_license_type'], $row['software_seats'], $row['software_key'], $assigned_to_assets, $assigned_to_contacts, $row['software_purchase'], $row['software_expire'], $row['software_notes']); + $lineData = array($row['software_name'], $row['software_version'], $row['software_description'], $row['software_type'], $row['software_license_type'], $row['software_seats'], $row['software_key'], $assigned_to_assets, $assigned_to_contacts, $row['software_purchase'], $row['software_expire'], $row['software_notes']); fputcsv($f, $lineData, $delimiter); } @@ -349,4 +328,3 @@ exit; } - From 71c45372638b61b304ef33b1eab83b7769a7d904 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 20 Mar 2024 17:28:09 -0400 Subject: [PATCH 07/21] Client Logins Enhancement: Moved to the new media CSS Class, fixed password reveal would take you to the top of the page, moved open URI to the action bar as a button, fixed password alignment for copy to clipboard, description is now below the login name, made set button to type=button to prevent submits if wrapped in a form --- client_login_add_modal.php | 2 +- client_login_edit_modal.php | 2 +- client_logins.php | 69 +++++++++++++++++++------------------ 3 files changed, 38 insertions(+), 35 deletions(-) diff --git a/client_login_add_modal.php b/client_login_add_modal.php index 00aab3e36..40cc6d271 100644 --- a/client_login_add_modal.php +++ b/client_login_add_modal.php @@ -225,7 +225,7 @@
    - +
    diff --git a/client_login_edit_modal.php b/client_login_edit_modal.php index dfe8ed535..49e08bbcf 100644 --- a/client_login_edit_modal.php +++ b/client_login_edit_modal.php @@ -230,7 +230,7 @@
    - +
    diff --git a/client_logins.php b/client_logins.php index 575ed27b3..05fc667eb 100644 --- a/client_logins.php +++ b/client_logins.php @@ -72,7 +72,6 @@ } ?>"> Name - Description Username Password OTP @@ -87,23 +86,18 @@ $login_id = intval($row['login_id']); $login_name = nullable_htmlentities($row['login_name']); $login_description = nullable_htmlentities($row['login_description']); - if (empty($login_description)) { - $login_description_display = "-"; - } else { - $login_description_display = $login_description; - } $login_uri = nullable_htmlentities($row['login_uri']); if (empty($login_uri)) { $login_uri_display = "-"; } else { - $login_uri_display = "$login_uri"; + $login_uri_display = "$login_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 = "-"; } else { - $login_username_display = "$login_username"; + $login_username_display = "$login_username"; } $login_password = nullable_htmlentities(decryptLoginEntry($row['login_password'])); $login_otp_secret = nullable_htmlentities($row['login_otp_secret']); @@ -121,42 +115,51 @@ $login_software_id = intval($row['login_software_id']); ?> - "> + "> - - +
    + +
    +

    + +
    + +

    +
    +
    - - + - -
    - -
    - - Edit - - )"> - Share - - -
    - - Delete + +
    + + + +
    + +
    + + Edit + + )"> + Share - + +
    + + Delete + + +
    -
    From bfe7c3098dd8f230558a158e5da999b25fd00992 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 20 Mar 2024 17:31:04 -0400 Subject: [PATCH 08/21] Fix broken open uri --- client_logins.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client_logins.php b/client_logins.php index 05fc667eb..e106601d6 100644 --- a/client_logins.php +++ b/client_logins.php @@ -139,7 +139,7 @@
    - +
    + +
    + +
    +
    +  https:// +
    + +
    + +
    +
    -
    -
    -
    - -
    -
    - +
    + +
    +
    + +
    + +
    - -
    -
    -
    - -
    -
    - +
    + +
    +
    + +
    + +
    - -
    -
    -
    - -
    -
    - +
    + +
    +
    + +
    + +
    - -
    -
    -
    - - -
    +
    + +
    +
    + +
    + +
    +
    + +
    -
    - -
    -
    - +
    +
    +
    -
    +
    +
    diff --git a/client_certificate_edit_modal.php b/client_certificate_edit_modal.php index 13e55c146..f6884fcb1 100644 --- a/client_certificate_edit_modal.php +++ b/client_certificate_edit_modal.php @@ -22,6 +22,16 @@
    +
    + +
    +
    + +
    + +
    +
    +
    diff --git a/client_certificates.php b/client_certificates.php index 6dd592d07..63a0f4519 100644 --- a/client_certificates.php +++ b/client_certificates.php @@ -94,6 +94,7 @@ 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 @@
    - - )" data-target="#editCertificateModal"> - + + )" data-target="#editCertificateModal"> +
    + +
    +
    +
    +
    +
    +     + diff --git a/js/certificate_edit_modal.js b/js/certificate_edit_modal.js index 6ac93561f..4a64e321b 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 ec933db0a..a177974b5 100644 --- a/post/certificate.php +++ b/post/certificate.php @@ -10,6 +10,7 @@ $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 @@ $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 @@ $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 @@ $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 @@ $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); } From ed20681790df086e024610fd000eaf8f4e9c44c1 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 21 Mar 2024 15:56:09 -0400 Subject: [PATCH 16/21] Update Client Vendors to use the new media css function --- client_vendors.php | 28 ++++++++++++---------------- vendor_add_modal.php | 2 +- vendor_edit_modal.php | 2 +- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/client_vendors.php b/client_vendors.php index c07b44557..1807148b2 100644 --- a/client_vendors.php +++ b/client_vendors.php @@ -78,7 +78,6 @@ "> Vendor - Description Contact Website Action @@ -91,11 +90,6 @@ $vendor_id = intval($row['vendor_id']); $vendor_name = nullable_htmlentities($row['vendor_name']); $vendor_description = nullable_htmlentities($row['vendor_description']); - if (empty($vendor_description)) { - $vendor_description_display = "-"; - } else { - $vendor_description_display = $vendor_description; - } $vendor_account_number = nullable_htmlentities($row['vendor_account_number']); $vendor_contact_name = nullable_htmlentities($row['vendor_contact_name']); if (empty($vendor_contact_name)) { @@ -121,16 +115,18 @@ ?> - - - - -
    - - - - + + +
    + +
    +
    +
    +
    +
    +     + + diff --git a/vendor_add_modal.php b/vendor_add_modal.php index 327e9fad0..806228563 100644 --- a/vendor_add_modal.php +++ b/vendor_add_modal.php @@ -147,7 +147,7 @@
    - +
    diff --git a/vendor_edit_modal.php b/vendor_edit_modal.php index 9d67d6948..281c9e640 100644 --- a/vendor_edit_modal.php +++ b/vendor_edit_modal.php @@ -166,7 +166,7 @@
    - +
    From 7d22f208b8bf2532ccc94d088dd31ab4dc346af5 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 21 Mar 2024 16:07:54 -0400 Subject: [PATCH 17/21] Enhancement moved to media css for domain listing and added description field --- client_domain_add_modal.php | 139 +++++++++++++++++++++-------------- client_domain_edit_modal.php | 10 +++ client_domains.php | 13 +++- js/domain_edit_modal.js | 1 + post/domain.php | 10 ++- 5 files changed, 114 insertions(+), 59 deletions(-) diff --git a/client_domain_add_modal.php b/client_domain_add_modal.php index 41caf7e4c..f705e50cd 100644 --- a/client_domain_add_modal.php +++ b/client_domain_add_modal.php @@ -11,73 +11,104 @@
    -
    - -
    -
    - + + +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    - -
    -
    -
    - -
    -
    - +
    + +
    +
    + +
    + +
    - -
    -
    +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    -
    -
    -
    - -
    -
    - +
    +
    +
    -
    -
    -
    - -
    - +
    diff --git a/client_domain_edit_modal.php b/client_domain_edit_modal.php index 07e90b797..4f3c371ec 100644 --- a/client_domain_edit_modal.php +++ b/client_domain_edit_modal.php @@ -37,6 +37,16 @@
    +
    + +
    +
    + +
    + +
    +
    +
    diff --git a/client_domains.php b/client_domains.php index b91c9983a..215b80832 100644 --- a/client_domains.php +++ b/client_domains.php @@ -95,6 +95,7 @@ while ($row = mysqli_fetch_array($sql)) { $domain_id = intval($row['domain_id']); $domain_name = nullable_htmlentities($row['domain_name']); + $domain_description = nullable_htmlentities($row['domain_description']); $domain_registrar = intval($row['domain_registrar']); $domain_webhost = intval($row['domain_webhost']); $domain_expire = nullable_htmlentities($row['domain_expire']); @@ -119,7 +120,17 @@
    - )" data-target="#editDomainModal"> + + )" data-target="#editDomainModal"> +
    + +
    +
    +
    +
    +
    +     + diff --git a/js/domain_edit_modal.js b/js/domain_edit_modal.js index c045869cd..e8a0b4d0f 100644 --- a/js/domain_edit_modal.js +++ b/js/domain_edit_modal.js @@ -17,6 +17,7 @@ function populateDomainEditModal(client_id, domain_id) { document.getElementById("editDomainHeader").innerText = domain.domain_name; document.getElementById("editDomainId").value = domain_id; document.getElementById("editDomainName").value = domain.domain_name; + document.getElementById("editDomainDescription").value = domain.domain_description; document.getElementById("editDomainExpire").value = domain.domain_expire; document.getElementById("editDomainNotes").value = domain.domain_notes; document.getElementById("editDomainIP").value = domain.domain_ip; diff --git a/post/domain.php b/post/domain.php index e1a2d9ede..1fd4c99c8 100644 --- a/post/domain.php +++ b/post/domain.php @@ -10,6 +10,7 @@ $client_id = intval($_POST['client_id']); $name = preg_replace("(^https?://)", "", sanitizeInput($_POST['name'])); + $description = sanitizeInput($_POST['description']); $registrar = intval($_POST['registrar']); $webhost = intval($_POST['webhost']); $extended_log_description = ''; @@ -38,7 +39,7 @@ $whois = sanitizeInput($records['whois']); // Add domain record - mysqli_query($mysqli,"INSERT INTO domains SET domain_name = '$name', domain_registrar = $registrar, domain_webhost = $webhost, domain_expire = $expire, domain_ip = '$a', domain_name_servers = '$ns', domain_mail_servers = '$mx', domain_txt = '$txt', domain_raw_whois = '$whois', domain_notes = '$notes', domain_client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO domains SET domain_name = '$name', domain_description = '$description', domain_registrar = $registrar, domain_webhost = $webhost, domain_expire = $expire, domain_ip = '$a', domain_name_servers = '$ns', domain_mail_servers = '$mx', domain_txt = '$txt', domain_raw_whois = '$whois', domain_notes = '$notes', domain_client_id = $client_id"); // Get inserted ID (for linking certificate, if exists) $domain_id = mysqli_insert_id($mysqli); @@ -69,6 +70,7 @@ $domain_id = intval($_POST['domain_id']); $name = preg_replace("(^https?://)", "", sanitizeInput($_POST['name'])); + $description = sanitizeInput($_POST['description']); $registrar = intval($_POST['registrar']); $webhost = intval($_POST['webhost']); $expire = sanitizeInput($_POST['expire']); @@ -102,7 +104,7 @@ $txt = sanitizeInput($records['txt']); $whois = sanitizeInput($records['whois']); - mysqli_query($mysqli,"UPDATE domains SET domain_name = '$name', domain_registrar = $registrar, domain_webhost = $webhost, domain_expire = $expire, domain_ip = '$a', domain_name_servers = '$ns', domain_mail_servers = '$mx', domain_txt = '$txt', domain_raw_whois = '$whois', domain_notes = '$notes' WHERE domain_id = $domain_id"); + mysqli_query($mysqli,"UPDATE domains SET domain_name = '$name', domain_description = '$description', domain_registrar = $registrar, domain_webhost = $webhost, domain_expire = $expire, domain_ip = '$a', domain_name_servers = '$ns', domain_mail_servers = '$mx', domain_txt = '$txt', domain_raw_whois = '$whois', domain_notes = '$notes' WHERE domain_id = $domain_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Domain', log_action = 'Modify', log_description = '$session_name modified domain $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 = $domain_id"); @@ -191,12 +193,12 @@ $f = fopen('php://memory', 'w'); //set column headers - $fields = array('Domain', 'Registrar', 'Web Host', 'Expiration Date'); + $fields = array('Domain', 'Description', 'Registrar', 'Web Host', '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['domain_name'], $row['domain_registrar'], $row['domain_webhost'], $row['domain_expire']); + $lineData = array($row['domain_name'], $row['domain_description'], $row['domain_registrar'], $row['domain_webhost'], $row['domain_expire']); fputcsv($f, $lineData, $delimiter); } From 1f1197be50a75aaa8fdc4b838bd1f3f8de55eb28 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 21 Mar 2024 16:16:32 -0400 Subject: [PATCH 18/21] Missing var --- cron_ticket_email_parser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cron_ticket_email_parser.php b/cron_ticket_email_parser.php index 10c404eaf..b8cee1ffc 100644 --- a/cron_ticket_email_parser.php +++ b/cron_ticket_email_parser.php @@ -27,7 +27,7 @@ $config_ticket_from_name = sanitizeInput($config_ticket_from_name); // Get company name & phone & timezone -mysqli_query($mysqli, "SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1"); +$sql = mysqli_query($mysqli, "SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1"); $row = mysqli_fetch_array($sql); $company_name = sanitizeInput($row['company_name']); $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'])); From e34f66f00a2645de965ea5d21a33a3cb340b87dc Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 21 Mar 2024 17:12:13 -0400 Subject: [PATCH 19/21] Updated Services to use the media css function --- client_services.php | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/client_services.php b/client_services.php index bb5adc097..48bcd92b2 100644 --- a/client_services.php +++ b/client_services.php @@ -58,8 +58,8 @@ Name Category - Updated Importance + Updated Action @@ -93,10 +93,21 @@ - + + +
    + +
    +
    +
    +
    +
    +     + + - + From 0c62ce169f85c09baa4cad509fbef76ed01f42b5 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 21 Mar 2024 17:19:06 -0400 Subject: [PATCH 20/21] Add Pretty content JS function to global search so HTML ticket replies look nicer and fit to width --- global_search.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/global_search.php b/global_search.php index 379f142c9..14fceb2c2 100644 --- a/global_search.php +++ b/global_search.php @@ -718,3 +718,7 @@ } require_once "footer.php"; + +?> + + \ No newline at end of file From a6a763c24c36183fec1a00525335a199fb888c68 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Thu, 21 Mar 2024 18:01:41 -0400 Subject: [PATCH 21/21] Move View Queue Message away from a modal as tables tend to break the modal causing distorted view, more ui work for this to come --- admin_mail_queue.php | 29 ++---------- admin_mail_queue_message_view.php | 77 +++++++++++++++++++++++++++++++ admin_side_nav.php | 2 +- 3 files changed, 81 insertions(+), 27 deletions(-) create mode 100644 admin_mail_queue_message_view.php diff --git a/admin_mail_queue.php b/admin_mail_queue.php index a06c621dc..8d0e6364f 100644 --- a/admin_mail_queue.php +++ b/admin_mail_queue.php @@ -6,14 +6,6 @@ require_once "inc_all_admin.php"; - -//Initialize the HTML Purifier to prevent XSS -require "plugins/htmlpurifier/HTMLPurifier.standalone.php"; - -$purifier_config = HTMLPurifier_Config::createDefault(); -$purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]); -$purifier = new HTMLPurifier($purifier_config); - //Rebuild URL $url_query_strings_sort = http_build_query($get_copy); @@ -104,7 +96,6 @@ $email_recipient = nullable_htmlentities($row['email_recipient']); $email_recipient_name = nullable_htmlentities($row['email_recipient_name']); $email_subject = nullable_htmlentities($row['email_subject']); - $email_content = $purifier->purify($row['email_content']); $email_attempts = intval($row['email_attempts']); $email_queued_at = nullable_htmlentities($row['email_queued_at']); $email_failed_at = nullable_htmlentities($row['email_failed_at']); @@ -131,7 +122,9 @@ - + + + 3) { ?> @@ -146,22 +139,6 @@ - - diff --git a/admin_mail_queue_message_view.php b/admin_mail_queue_message_view.php new file mode 100644 index 000000000..ce44cd9e9 --- /dev/null +++ b/admin_mail_queue_message_view.php @@ -0,0 +1,77 @@ +set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]); +$purifier = new HTMLPurifier($purifier_config); + +if (isset($_GET['email_id'])) { + $email_id = intval($_GET['email_id']); +} else { + echo "You dont belong here"; + exit(); +} + +$sql = mysqli_query($mysqli, "SELECT * FROM email_queue WHERE email_id = $email_id"); + +$row = mysqli_fetch_array($sql); + +$email_from = nullable_htmlentities($row['email_from']); +$email_from_name = nullable_htmlentities($row['email_from_name']); +$email_recipient = nullable_htmlentities($row['email_recipient']); +$email_recipient_name = nullable_htmlentities($row['email_recipient_name']); +$email_subject = nullable_htmlentities($row['email_subject']); +$email_content = $purifier->purify($row['email_content']); +$email_attempts = intval($row['email_attempts']); +$email_queued_at = nullable_htmlentities($row['email_queued_at']); +$email_failed_at = nullable_htmlentities($row['email_failed_at']); +$email_sent_at = nullable_htmlentities($row['email_sent_at']); +$email_status = intval($row['email_status']); +if ($email_status == 0) { + $email_status_display = "
    Queued
    "; +} elseif($email_status == 1) { + $email_status_display = "
    Sending
    "; +} elseif($email_status == 2) { + $email_status_display = "
    Failed
    $email_failed_at"; +} else { + $email_status_display = "
    Sent
    $email_sent_at"; +} + +?> + +
      +
    1. + Admin +
      2. +
    2. + Mail Queue +
      3. +
      4. +
    + +
    + +
    +
    +
    +
    From: ($email_from)"; ?>
    +
    To: ($email_recipient)"; ?>
    +
    Subject:
    +
    +
    + +
    +
    +
    + +
    + + + +MAINTENANCE
  • - ">