Users: an API or service account keeps its role for API keys but is left out of agent lists, pickers, notifications and admin alerts, cannot sign in, and has its own API accounts tab on Admin Users; database 3.8.1 adds users.user_service_account; 26.11.9 changelog entries

This commit is contained in:
johnnyq
2026-11-17 19:24:04 -05:00
parent 46a2dfe96c
commit 1c4c8be8de
53 changed files with 201 additions and 49 deletions

View File

@@ -2448,7 +2448,7 @@ if (isset($_GET['get_internal_users'])) {
$mysqli,
"SELECT user_id, user_name
FROM users
WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL
WHERE user_type = 1" . serviceAccountsOutSql() . " AND user_status = 1 AND user_archived_at IS NULL
ORDER BY user_name"
);

View File

@@ -34,7 +34,7 @@ $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT user_config_calendar_fir
$first_day = intval($row['user_config_calendar_first_day'] ?? 0);
$agents = [];
$sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name");
$sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1" . serviceAccountsOutSql() . " AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name");
while ($row = mysqli_fetch_assoc($sql)) {
$agents[] = $row;
}

View File

@@ -23,7 +23,7 @@ while ($co_signer = mysqli_fetch_assoc($co_sql)) {
$co_signers[intval($co_signer['contact_id'])] = $co_signer['contact_name'] . ' - ' . $co_signer['contact_email'];
}
$co_agents = [];
$co_sql = mysqli_query($mysqli, "SELECT user_id, user_name FROM users WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC");
$co_sql = mysqli_query($mysqli, "SELECT user_id, user_name FROM users WHERE user_type = 1" . serviceAccountsOutSql() . " AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC");
while ($co_agent = mysqli_fetch_assoc($co_sql)) {
$co_agents[intval($co_agent['user_id'])] = $co_agent['user_name'];
}

View File

@@ -31,7 +31,7 @@ while ($co_template = mysqli_fetch_assoc($co_sql)) {
}
}
$co_agents = [];
$co_sql = mysqli_query($mysqli, "SELECT user_id, user_name FROM users WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC");
$co_sql = mysqli_query($mysqli, "SELECT user_id, user_name FROM users WHERE user_type = 1" . serviceAccountsOutSql() . " AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC");
while ($co_agent = mysqli_fetch_assoc($co_sql)) {
$co_agents[intval($co_agent['user_id'])] = $co_agent['user_name'];
}

View File

@@ -83,7 +83,7 @@ ob_start();
$sql = mysqli_query(
$mysqli,
"SELECT user_id, user_name, user_avatar FROM users
WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
WHERE user_type = 1" . serviceAccountsOutSql() . " AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
);
while ($row = mysqli_fetch_assoc($sql)) {
$user_id = intval($row['user_id']);

View File

@@ -178,7 +178,7 @@ $form_can_email = calendarCanEmail();
<span class="input-group-text"><i class="fas fa-fw fa-user-tie"></i></span>
<select class="form-select select2" name="agents[]" multiple data-placeholder="Agents">
<?php
$sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1 AND user_archived_at IS NULL AND (user_status = 1 OR user_id IN (0" . implode('', array_map(function ($id) {
$sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1" . serviceAccountsOutSql() . " AND user_archived_at IS NULL AND (user_status = 1 OR user_id IN (0" . implode('', array_map(function ($id) {
return ',' . intval($id);
}, $form_attendees['agents'])) . ")) ORDER BY user_name");
while ($row = mysqli_fetch_assoc($sql)) { ?>

View File

@@ -87,7 +87,7 @@ ob_start();
$sql = mysqli_query(
$mysqli,
"SELECT user_id, user_name, user_avatar FROM users
WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
WHERE user_type = 1" . serviceAccountsOutSql() . " AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
);
while ($row = mysqli_fetch_assoc($sql)) {
$user_id = intval($row['user_id']);

View File

@@ -63,7 +63,7 @@ if ($c_new && !$c_contact_id && $c_client_id) {
}
$c_owner_id = intval($c_value('owner_id', $c_new ? ($session_user_id ?? 0) : 0));
$c_owners = [];
$sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1 AND (user_archived_at IS NULL OR user_id = $c_owner_id) ORDER BY user_name ASC");
$sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1" . serviceAccountsOutSql() . " AND (user_archived_at IS NULL OR user_id = $c_owner_id) ORDER BY user_name ASC");
while ($row = mysqli_fetch_assoc($sql)) {
$c_owners[intval($row['user_id'])] = $row;
}

View File

@@ -32,7 +32,7 @@ ob_start();
<select class="form-select select2" name="project_manager">
<option value="0" data-icon="fas fa-user-slash">No manager</option>
<?php
$sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL
$sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1" . serviceAccountsOutSql() . " AND user_status = 1 AND user_archived_at IS NULL
ORDER BY user_id = " . intval($session_user_id) . " DESC, user_name ASC");
while ($row = mysqli_fetch_assoc($sql)) {
$user_id = intval($row['user_id']); ?>

View File

@@ -67,7 +67,7 @@ ob_start();
<option value="">- Any manager -</option>
<option value="none" <?= $manager_filter === 'none' ? 'selected' : '' ?>>No manager</option>
<?php
$sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1 AND EXISTS (SELECT 1 FROM projects WHERE project_manager = user_id) ORDER BY user_name ASC");
$sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1" . serviceAccountsOutSql() . " AND EXISTS (SELECT 1 FROM projects WHERE project_manager = user_id) ORDER BY user_name ASC");
while ($row = mysqli_fetch_assoc($sql)) { ?>
<option value="<?= intval($row['user_id']) ?>" <?= $manager_filter === (string) intval($row['user_id']) ? 'selected' : '' ?><?= selectOptionUser($row['user_id'], $row['user_name'], $row['user_avatar'] ?? '') ?>><?= escapeHtml($row['user_name']) ?></option>
<?php } ?>

View File

@@ -85,7 +85,7 @@ $form_manager_id = intval($form['project_manager'] ?? 0);
<option value="0" data-icon="fas fa-user-slash">No manager</option>
<?php
$sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users
WHERE user_type = 1 AND ((user_status = 1 AND user_archived_at IS NULL) OR user_id = $form_manager_id)
WHERE user_type = 1" . serviceAccountsOutSql() . " AND ((user_status = 1 AND user_archived_at IS NULL) OR user_id = $form_manager_id)
ORDER BY user_id = " . intval($session_user_id) . " DESC, user_name ASC");
while ($row = mysqli_fetch_assoc($sql)) {
$user_id = intval($row['user_id']); ?>

View File

@@ -153,7 +153,7 @@ ob_start();
$sql = mysqli_query(
$mysqli,
"SELECT user_id, user_name, user_avatar FROM users
WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
WHERE user_type = 1" . serviceAccountsOutSql() . " AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
);
while ($row = mysqli_fetch_assoc($sql)) {
$user_id = intval($row['user_id']);

View File

@@ -30,7 +30,7 @@ ob_start();
<option value="0">Not Assigned</option>
<?php
$sql_users_select = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users
WHERE user_type = 1
WHERE user_type = 1" . serviceAccountsOutSql() . "
AND user_status = 1
AND user_archived_at IS NULL
ORDER BY user_name DESC"

View File

@@ -165,7 +165,7 @@ ob_start();
<option value="0">- Unassigned -</option>
<?php
$sql_agents = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users
WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC");
WHERE user_type = 1" . serviceAccountsOutSql() . " AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC");
while ($row = mysqli_fetch_assoc($sql_agents)) {
$user_id = intval($row['user_id']); ?>
<option <?= $assigned_to === $user_id ? 'selected' : '' ?> value="<?= $user_id ?>"<?= selectOptionUser($row['user_id'], $row['user_name'], $row['user_avatar'] ?? '') ?>><?= escapeHtml($row['user_name']) ?><?= $user_id === intval($session_user_id) ? ' (me)' : '' ?></option>

View File

@@ -206,7 +206,7 @@ ob_start();
$sql = mysqli_query(
$mysqli,
"SELECT user_id, user_name, user_avatar FROM users
WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
WHERE user_type = 1" . serviceAccountsOutSql() . " AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
);
while ($row = mysqli_fetch_assoc($sql)) {
$user_id = intval($row['user_id']);

View File

@@ -31,7 +31,7 @@ ob_start();
<option value="0">Not Assigned</option>
<?php
$sql_users_select = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users
WHERE user_type = 1
WHERE user_type = 1" . serviceAccountsOutSql() . "
AND user_status = 1
AND user_archived_at IS NULL
ORDER BY user_name ASC"

View File

@@ -150,7 +150,7 @@ ob_start();
<option value="0">- Unassigned -</option>
<?php
$sql_agents = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users
WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC");
WHERE user_type = 1" . serviceAccountsOutSql() . " AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC");
while ($row = mysqli_fetch_assoc($sql_agents)) {
$user_id = intval($row['user_id']); ?>
<option <?= $ticket_assigned_to === $user_id ? 'selected' : '' ?> value="<?= $user_id ?>"<?= selectOptionUser($row['user_id'], $row['user_name'], $row['user_avatar'] ?? '') ?>><?= escapeHtml($row['user_name']) ?><?= $user_id === intval($session_user_id) ? ' (me)' : '' ?></option>

View File

@@ -156,7 +156,7 @@ ob_start();
<select class="form-select select2" name="assigned">
<option value="">- Anyone -</option>
<?php
$sql_assigned_filter = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1 AND user_archived_at IS NULL ORDER BY user_name ASC");
$sql_assigned_filter = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1" . serviceAccountsOutSql() . " AND user_archived_at IS NULL ORDER BY user_name ASC");
while ($row = mysqli_fetch_assoc($sql_assigned_filter)) {
$filter_option_id = intval($row['user_id']);
$filter_option_name = escapeHtml($row['user_name']);

View File

@@ -192,7 +192,7 @@ $hidden_filter_count = $date_filter_active ? 1 : 0;
<option value="none" <?= $manager_filter === 'none' ? 'selected' : '' ?> data-icon="fas fa-user-slash">No manager</option>
<?php
$manager_filter_id = is_int($manager_filter) ? $manager_filter : 0;
$sql_managers = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1
$sql_managers = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1" . serviceAccountsOutSql() . "
AND (EXISTS (SELECT 1 FROM projects WHERE project_manager = user_id) OR user_id = $manager_filter_id OR (user_archived_at IS NULL AND user_status = 1))
ORDER BY user_id = " . intval($session_user_id) . " DESC, user_name ASC");
while ($row = mysqli_fetch_assoc($sql_managers)) {

View File

@@ -172,7 +172,7 @@ $sort_link = function ($column, $label) use ($url_query_strings_sort, $sort, $di
<select class="form-select select2" name="assigned_agent" onchange="this.form.submit()">
<option value="">- Any agent -</option>
<?php
$sql_agents_filter = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1
$sql_agents_filter = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1" . serviceAccountsOutSql() . "
AND (EXISTS (SELECT 1 FROM recurring_tickets WHERE recurring_ticket_assigned_to = user_id) OR user_id = $agent_filter) ORDER BY user_name ASC");
while ($row = mysqli_fetch_assoc($sql_agents_filter)) {
$user_id = intval($row['user_id']); ?>

View File

@@ -56,7 +56,7 @@ $by_bucket = $grouped(reportBucketSql('tickets.ticket_closed_at', $buckets['unit
// By agent
$names = [];
$sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1");
$sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1" . serviceAccountsOutSql());
while ($row = mysqli_fetch_assoc($sql)) {
$names[intval($row['user_id'])] = $row;
}

View File

@@ -47,7 +47,7 @@ foreach (['Urgent', 'High', 'Medium', 'Low'] as $priority) {
}
$agent_rows = [];
$names = [];
$sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1");
$sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1" . serviceAccountsOutSql());
while ($row = mysqli_fetch_assoc($sql)) {
$names[intval($row['user_id'])] = $row;
}

View File

@@ -149,7 +149,7 @@ $bucket_tones = ['day' => 'success', '3' => 'info', '7' => 'accent', '30' => 'wa
$agent_choices = '<div class="col-sm-6 col-lg-2"><select class="form-select select2" name="agent" data-report-autosubmit aria-label="Agent">'
. '<option value="">- All agents -</option>'
. '<option value="none"' . ($unassigned_only ? ' selected' : '') . ' data-icon="fas fa-user-slash">Unassigned</option>';
$sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1 AND ((user_archived_at IS NULL AND user_status = 1) OR user_id = $agent_id) ORDER BY user_name");
$sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1" . serviceAccountsOutSql() . " AND ((user_archived_at IS NULL AND user_status = 1) OR user_id = $agent_id) ORDER BY user_name");
while ($row = mysqli_fetch_assoc($sql)) {
$id = intval($row['user_id']);
$agent_choices .= '<option value="' . $id . '"' . ($id === $agent_id ? ' selected' : '') . selectOptionUser($id, $row['user_name'], $row['user_avatar'] ?? '') . '>' . escapeHtml($row['user_name']) . '</option>';

View File

@@ -24,7 +24,7 @@ $scope = reportClientSql('ticket_client_id', $client_id);
// Every active agent, and anyone else with something in the period
$agents = [];
$sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar, user_status, user_archived_at FROM users WHERE user_type = 1 ORDER BY user_name");
$sql = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar, user_status, user_archived_at FROM users WHERE user_type = 1" . serviceAccountsOutSql() . " ORDER BY user_name");
while ($row = mysqli_fetch_assoc($sql)) {
$agents[intval($row['user_id'])] = ['user_id' => intval($row['user_id']), 'agent' => $row['user_name'], 'avatar' => $row['user_avatar'] ?? '',
'active' => intval($row['user_status']) === 1 && $row['user_archived_at'] === null,

View File

@@ -347,7 +347,7 @@ $export_extra = [
<option value="">- Anyone -</option>
<option value="unassigned" <?= $assigned_filter === 'unassigned' ? 'selected' : '' ?> data-icon="fas fa-user-slash">Unassigned</option>
<?php
$sql_agents_filter = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1 AND user_archived_at IS NULL ORDER BY user_id = " . intval($session_user_id) . " DESC, user_name ASC");
$sql_agents_filter = mysqli_query($mysqli, "SELECT user_id, user_name, user_avatar FROM users WHERE user_type = 1" . serviceAccountsOutSql() . " AND user_archived_at IS NULL ORDER BY user_id = " . intval($session_user_id) . " DESC, user_name ASC");
while ($row = mysqli_fetch_assoc($sql_agents_filter)) {
$filter_user_id = intval($row['user_id']); ?>
<option value="<?= $filter_user_id ?>" <?= $assigned_filter === $filter_user_id ? 'selected' : '' ?><?= selectOptionUser($row['user_id'], $row['user_name'], $row['user_avatar'] ?? '') ?>><?= escapeHtml($row['user_name']) ?><?= $filter_user_id === intval($session_user_id) ? ' (me)' : '' ?></option>