From 956f18430bf4915707c29ee12bc319791e3695af Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 3 Oct 2025 11:12:48 -0400 Subject: [PATCH] Fix Microsoft SSO Login in Client Portal, fix ticket templates due to regression from changing from user to agent --- admin/post/ticket_template.php | 4 ++-- client/login.php | 12 +++++++++++- client/login_microsoft.php | 11 ++++++++++- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/admin/post/ticket_template.php b/admin/post/ticket_template.php index eecd0d89..c968b6df 100644 --- a/admin/post/ticket_template.php +++ b/admin/post/ticket_template.php @@ -5,8 +5,8 @@ defined('FROM_POST_HANDLER') || die("Direct file access is not allowed"); // Import shared code from user-side tickets/tasks as we reuse functions -require_once '../user/post/ticket.php'; -require_once '../user/post/task.php'; +require_once '../agent/post/ticket.php'; +require_once '../agent/post/task.php'; if (isset($_POST['add_ticket_template'])) { diff --git a/client/login.php b/client/login.php index d0b6aff8..c3b0dea1 100644 --- a/client/login.php +++ b/client/login.php @@ -57,7 +57,17 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['login'])) { } else { - $sql = mysqli_query($mysqli, "SELECT * FROM users LEFT JOIN contacts ON user_id = contact_user_id LEFT JOIN clients ON contact_client_id = client_id WHERE user_email = '$email' AND client_archived_at IS NULL AND user_archived_at IS NULL AND user_type = 2 AND user_status = 1 LIMIT 1"); + $sql = mysqli_query($mysqli, "SELECT * FROM users + LEFT JOIN contacts ON user_id = contact_user_id + LEFT JOIN clients ON contact_client_id = client_id + WHERE user_email = '$email' + AND client_archived_at IS NULL + AND user_archived_at IS NULL + AND user_type = 2 + AND user_status = 1 + LIMIT 1" + ); + $row = mysqli_fetch_array($sql); $client_id = intval($row['contact_client_id']); $user_id = intval($row['user_id']); diff --git a/client/login_microsoft.php b/client/login_microsoft.php index c182a16d..64d60d06 100644 --- a/client/login_microsoft.php +++ b/client/login_microsoft.php @@ -100,7 +100,16 @@ if (isset($_POST['code']) && $_POST['state'] == session_id()) { $upn = mysqli_real_escape_string($mysqli, $msgraph_response["userPrincipalName"]); - $sql = mysqli_query($mysqli, "SELECT * FROM users LEFT JOIN contacts ON user_id = contact_user_id LEFT JOIN contact_client_id = client_id WHERE user_email = '$upn' AND user_archived_at IS NULL AND client_archived_at IS NULL AND user_type = 2 AND user_status = 1 LIMIT 1"); + $sql = mysqli_query($mysqli, "SELECT * FROM users + LEFT JOIN contacts ON user_id = contact_user_id + LEFT JOIN clients contact_client_id = client_id + WHERE user_email = '$upn' + AND user_archived_at IS NULL + AND client_archived_at IS NULL + AND user_type = 2 + AND user_status = 1 + LIMIT 1" + ); $row = mysqli_fetch_array($sql); $client_id = intval($row['contact_client_id']); $user_id = intval($row['user_id']);