From d2fdc5f7d8ae0502afb08c2f4453c06c99038e60 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Wed, 14 Dec 2022 22:18:44 -0500 Subject: [PATCH] Spruce up the share UI modal and client logins --- calendar_event_add_modal.php | 5 +- client_logins.php | 2 +- cron_ticket_email_parser.php | 1 + guest_view_item.php | 6 +- share_modal.php | 152 +++++++++++++++++++---------------- 5 files changed, 90 insertions(+), 76 deletions(-) diff --git a/calendar_event_add_modal.php b/calendar_event_add_modal.php index 236875d2..cccc1ce6 100644 --- a/calendar_event_add_modal.php +++ b/calendar_event_add_modal.php @@ -72,7 +72,8 @@
- +
@@ -157,4 +158,4 @@ - + \ No newline at end of file diff --git a/client_logins.php b/client_logins.php index 4033f43f..74bc5223 100644 --- a/client_logins.php +++ b/client_logins.php @@ -105,7 +105,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); - + diff --git a/cron_ticket_email_parser.php b/cron_ticket_email_parser.php index 8b42ea5e..66093c47 100644 --- a/cron_ticket_email_parser.php +++ b/cron_ticket_email_parser.php @@ -12,6 +12,7 @@ TODO: - Better handle replying to closed tickets - Support for authenticating with OAuth - Documentation + - Seperate Mailbox Account for tickets 2022-12-14 - JQ Relate PRs to https://github.com/itflow-org/itflow/issues/225 & https://forum.itflow.org/d/11-road-map & https://forum.itflow.org/d/31-tickets-from-email */ diff --git a/guest_view_item.php b/guest_view_item.php index f8b2e514..dab808aa 100644 --- a/guest_view_item.php +++ b/guest_view_item.php @@ -78,8 +78,7 @@ if($item_type == "Document"){ // Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Sharing', log_action = 'View', log_description = 'Viewed shared $item_type via link - Item ID: $item_id', log_client_id = '$client_id', log_created_at = NOW(), log_ip = '$ip', log_user_agent = '$user_agent', company_id = '1'"); -} -elseif($item_type == "File"){ +}elseif($item_type == "File"){ $file_sql = mysqli_query($mysqli, "SELECT * FROM files WHERE file_id = '$item_related_id' AND file_client_id = '$client_id' LIMIT 1"); $file_row = mysqli_fetch_array($file_sql); @@ -98,8 +97,7 @@ elseif($item_type == "File"){ echo "Download $file_name"; -} -elseif($item_type == "Login"){ +}elseif($item_type == "Login"){ $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"); diff --git a/share_modal.php b/share_modal.php index b8876f7e..c7315773 100644 --- a/share_modal.php +++ b/share_modal.php @@ -1,82 +1,96 @@ +