AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-08-15 03:55:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

clientScopeSql sweep whicn now removed the extra unessesary client joins

Browse Source
This commit is contained in:
johnnyq
2026-08-06 11:45:56 -04:00
parent 83383599a1
commit ddd9c2b56a
79 changed files with 139 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agent/modals/ticket/ticket_add.php
View File

@@ -62,7 +62,7 @@ ob_start();
<option value="">- Select a Client -</option>
<?php
$sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_lead = 0 AND client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
$sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_lead = 0 AND client_archived_at IS NULL " . clientScopeSql('clients.client_id') . " ORDER BY client_name ASC");
while ($row = mysqli_fetch_assoc($sql)) {
$client_id_select = intval($row['client_id']);
$client_name = escapeHtml($row['client_name']); ?>

2
agent/modals/ticket/ticket_change_client.php
View File

@@ -42,7 +42,7 @@ ob_start();
</div>
<select class="form-control select2" name="new_client_id" id="client_select" required>
<?php
$sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_lead = 0 AND client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
$sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_lead = 0 AND client_archived_at IS NULL " . clientScopeSql('clients.client_id') . " ORDER BY client_name ASC");
while ($row = mysqli_fetch_assoc($sql_clients)) {
$client_id_select = intval($row['client_id']);
$client_name = escapeHtml($row['client_name']);

10
agent/modals/ticket/ticket_edit.php
View File

@@ -4,14 +4,8 @@ require_once '../../../includes/modal_header.php';
enforceUserPermission('module_support', 2);
// Ticket client access overide - This is the only way to show tickets without a client to agents with restricted client access
$access_permission_query_overide = '';
if ($client_access_string) {
$access_permission_query_overide .= " AND ticket_client_id IN (0,$client_access_string)";
}
if ($client_deny_string) {
$access_permission_query_overide .= " AND ticket_client_id NOT IN ($client_deny_string)";
}
// Tickets with no client stay visible to restricted agents - clientScopeSql() includes 0
$access_permission_query_overide = clientScopeSql('ticket_client_id');
$ticket_id = intval($_GET['id']);

2
agent/modals/ticket/ticket_invoice_add.php
View File

@@ -15,7 +15,7 @@ $ticket_sql = mysqli_query(
LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
LEFT JOIN categories ON ticket_category = category_id
WHERE ticket_id = $ticket_id
$access_permission_query
" . clientScopeSql('ticket_client_id') . "
LIMIT 1"
);

2
agent/modals/ticket/ticket_merge.php
View File

@@ -27,7 +27,7 @@ $sql_merge = mysqli_query($mysqli, "SELECT * FROM tickets
LEFT JOIN clients ON client_id = ticket_client_id
WHERE ticket_closed_at IS NULL
AND ticket_id != $ticket_id
$access_permission_query
" . clientScopeSql('ticket_client_id') . "
ORDER BY ticket_status ASC, ticket_id DESC"
);

2
agent/modals/ticket/ticket_quote_add.php
View File

@@ -15,7 +15,7 @@ $ticket_sql = mysqli_query(
LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
LEFT JOIN categories ON ticket_category = category_id
WHERE ticket_id = $ticket_id
$access_permission_query
" . clientScopeSql('ticket_client_id') . "
LIMIT 1"
);