diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccb4a0ae2..f7d33b655 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -223,6 +223,7 @@ Update from Maintenance > Update — Queue Update hands the job to cron, which u
- Dropdowns: the empty first choice reads the same way everywhere - - Select a client -, - Select an account - and so on where you pick one, - Any client -, - Any status - where a list is filtered, and - None -, - No contact -, - Nobody - where it can be left blank. They had said - Select Client -, - Pick a role -, - Which account -, - How it was paid -, - All Clients -, Not Assigned and the like.
- Capitals: page and window titles, menu items and buttons are in Title Case - New Ticket, Mark Reviewed, Back Up Now, Turn Off Portal Access - and field labels, section headings, tabs and help are in sentence case - Postal code, Tax rate, Physical location - in the agent pages, Admin and the client portal alike. The settings pages in the menu are now Company Details, Invoices and Billing, Purchase Orders, Client Portal and Single Sign-on.
- Lists: the first click on a column you aren't sorting by sorts names A-Z and dates, money and counts newest or largest first, and a second click flips it. It used to go the opposite way to the column you were on, so the first click could go either way.
+- Badges and blanks: every badge is a rounded pill, the menu counts included, and an empty value shows as a grey dash everywhere. A request that can't be done - credit over the balance, say - shows in red like every other error, and the client portal's search boxes read Search ... like the agent pages'.
### Bug Fixes
@@ -282,6 +283,7 @@ Update from Maintenance > Update — Queue Update hands the job to cron, which u
- Contacts: the button in the archive window read Arhive.
- Tickets: cancelling Reset the timer still marked the timer as stopped in that browser, so it showed as stopped after a reload while it was still counting.
- Browser tabs: many pages were named after their file - Kb, Ai Providers, Rmm Providers, Sla, Settings Ticket, Profit Loss - and one with & in its name showed &. Each tab now has the name the menu gives the page, and a rack, an instance and a ticket, document or project template show their own name.
+- Client menu: a client's Domains count never turned amber or red for domains about to expire or expired, and the Certificates and Licenses counts carried two text colours at once.
### Developer Updates
@@ -450,6 +452,7 @@ Update from Maintenance > Update — Queue Update hands the job to cron, which u
- Lists: `sortLink($column, $label, $first, $title, $class)` in `functions/format.php` draws a sortable column header from what `includes/filter_header.php` sets, and `sortFirstOrder()` picks the first direction from the column's name. It replaces the 48 copied `$sort_link` closures and the 115 header links written out by hand; a page with its own first directions passes `$first`.
- Tab titles: `includes/page_title.php` takes a report's title from `reportCatalog()`, a settings page's from `settingsPages()` and a few others from a short list, and makes the rest from the file name with its acronyms in capitals. `$page_title` is no longer HTML-escaped there - the footer writes it with `json_encode()` and `emptyStateHtml()` escapes it.
- Bootstrap 5 classes: `fw-bold` in place of the `text-bold` shim, `text-body-secondary` in place of `text-muted`, and `fas` as the icon prefix in place of Font Awesome 5's `fa` alias, everywhere. The user menu's buttons are `btn-light border`. `css/itflow_custom.css` loses the shims for `text-bold`, `text-xs`, `btn-default`, `btn-flat`, `bg-olive`, `bg-pink` and `bg-purple` and the unused `.small-box` styles. The `data-bs-toggle="tooltip"` on the menu counts did nothing - their `title` still shows - and is gone.
+- Messages: `flashAlert()` and `itflowToast()` are called with 'success', 'info', 'warning' and 'error' only - the 'danger' and 'alert' callers now say 'error' (both are still understood), and the unused 'errpr' alias is gone. Column headings are sentence case like field labels.
## [26.11.8]
diff --git a/admin/agent_banners.php b/admin/agent_banners.php
index 04d6a95f6..9ca549f07 100644
--- a/admin/agent_banners.php
+++ b/admin/agent_banners.php
@@ -140,7 +140,7 @@ $csrf = $_SESSION['csrf_token'];
$preview = mb_strimwidth(trim(preg_replace('/\s+/', ' ', (string) $row['announcement_body'])), 0, 140, '...');
$for_html = intval($row['announcement_client_id'])
? ($row['client_name'] !== null ? '' . escapeHtml($row['client_name']) . '' : 'A client no longer here')
- : 'Every client';
+ : 'Every client';
$from = $row['announcement_starts_at'] ? date('M j, Y g:i A', strtotime($row['announcement_starts_at'])) : date('M j, Y', strtotime($row['announcement_created_at']));
$until = $row['announcement_ends_at'] ? date('M j, Y g:i A', strtotime($row['announcement_ends_at'])) : 'Until archived';
?>
diff --git a/admin/ai_models.php b/admin/ai_models.php
index cdb9eee7e..7df61aec0 100644
--- a/admin/ai_models.php
+++ b/admin/ai_models.php
@@ -137,7 +137,7 @@ $csrf = $_SESSION['csrf_token'];
@@ -152,7 +152,7 @@ $csrf = $_SESSION['csrf_token'];
= escapeHtml($model['ai_model_name']) ?>· = escapeHtml($model['ai_model_use_case']) ?>
- Not used
+ Not used
- = $bad ?> to look at
+ = $bad ?> to look at
diff --git a/admin/identity_providers.php b/admin/identity_providers.php
index 25f672f9b..e65a9cd06 100644
--- a/admin/identity_providers.php
+++ b/admin/identity_providers.php
@@ -28,7 +28,7 @@ echo settingsPageStart('identity');
= settingsSectionStart('entra', 'Microsoft Entra', 'A contact with portal access signs in with their Microsoft 365 work account - its email has to be theirs in ITFlow. Register an app in Microsoft Entra for accounts in any organization\'s directory, with the redirect address below, and put its ID and a secret here.') ?>
- = $config_azure_client_id ? 'Set up' : 'Not set up' ?>
+ = $config_azure_client_id ? 'Set up' : 'Not set up' ?>= $config_azure_client_id ? 'The portal\'s sign-in page offers Sign in with Microsoft.' : 'Contacts sign in with a password.' ?>
Next on = escapeHtml(date('M j', strtotime($use['next']))) ?> - it will be declined
diff --git a/admin/settings_client_portal.php b/admin/settings_client_portal.php
index b782be0bf..24cb088ae 100644
--- a/admin/settings_client_portal.php
+++ b/admin/settings_client_portal.php
@@ -83,7 +83,7 @@ $signup_clients = $signup_ready ? portalSignupClients() : [];
Shown at the top of the portal's home page - to every client, or one - between their start and end. For a banner your agents see instead, use Agent Banners.
= intval($row['announcement_client_id']) ? escapeHtml($row['client_name'] ?? 'A client no longer here') : 'Every client' ?>
+
= intval($row['announcement_client_id']) ? escapeHtml($row['client_name'] ?? 'A client no longer here') : 'Every client' ?>
= escapeHtml(implode(' ', $when)) ?>
Posted by = escapeHtml($row['user_name'] ?: 'someone') ?>
diff --git a/admin/settings_mail.php b/admin/settings_mail.php
index 9dbfff3e1..be20eb1f0 100644
--- a/admin/settings_mail.php
+++ b/admin/settings_mail.php
@@ -277,7 +277,7 @@ if (!$config_module_enable_ticketing) {
= settingsSectionStart('oauth-connect', 'Connecting the mailbox', 'Signing in to the mailbox once gives ITFlow a refresh token - lasting permission to use it. ITFlow renews what it signs in with from it, on its own.') ?>
- = $oauth_connected ? 'Connected' : 'Not connected' ?>
+ = $oauth_connected ? 'Connected' : 'Not connected' ?>
A refresh token is saved.= !empty($config_mail_oauth_access_token_expires_at) && strtotime($config_mail_oauth_access_token_expires_at) > time()
@@ -358,9 +358,9 @@ if (!$config_module_enable_ticketing) {
Mail Queue- = $mail_queue['last_sent'] ? 'last sent ' . escapeHtml(timeAgo($mail_queue['last_sent'])) : 'nothing sent yet' ?>
- = $mail_queue['waiting'] ?> waiting
- = $mail_queue['retrying'] ?> retrying
- = $mail_queue['failed_day'] ?> failed in the last day
+ = $mail_queue['waiting'] ?> waiting
+ = $mail_queue['retrying'] ?> retrying
+ = $mail_queue['failed_day'] ?> failed in the last dayOpen the Mail Queue
diff --git a/admin/settings_notification.php b/admin/settings_notification.php
index b642a4574..2fc4e6f0f 100644
--- a/admin/settings_notification.php
+++ b/admin/settings_notification.php
@@ -64,7 +64,7 @@ echo settingsPageStart('notification');
= settingsSwitch('config_recurring_auto_send_invoice', $config_recurring_auto_send_invoice, ['help' => 'Each recurring invoice set to send itself goes to the client\'s primary and billing contacts. Off, they are made as drafts to check and send.']) ?>
';
+ . (!empty($category['category_archived_at']) ? ' Archived' : '') . '';
foreach ($columns as $i => [$label, $first, $last]) {
[$dtf, $dtt] = reportColumnDates($year, $first, $last);
$url = $cat || $uncategorised !== '' ? "/agent/$list?" . ($cat ? "category=$cat" : $uncategorised) . "&canned_date=custom&dtf=$dtf&dtt=$dtt" : '';
diff --git a/functions/sanitize.php b/functions/sanitize.php
index 6db70fe6f..bf10d4e77 100644
--- a/functions/sanitize.php
+++ b/functions/sanitize.php
@@ -172,9 +172,9 @@ function escapeCsvFormula($value) {
/**
* Map a flashAlert type onto a real Bootstrap contextual class.
*
- * flashAlert() is called with more type names than Bootstrap has classes -
- * 'error', 'alert' and a typo'd 'errpr' among them - so interpolating the raw
- * value produced alert-error / alert-alert, which style nothing at all.
+ * flashAlert() takes 'success', 'info', 'warning' and 'error'; 'danger' and
+ * 'alert' are still understood. Bootstrap has no alert-error, so the raw type
+ * can't be used as the class.
*/
function alertStyleClass($type) {
@@ -184,7 +184,6 @@ function alertStyleClass($type) {
'warning' => 'warning',
'alert' => 'warning',
'error' => 'danger',
- 'errpr' => 'danger',
'danger' => 'danger',
];
diff --git a/functions/ticket.php b/functions/ticket.php
index ed2e45cff..a3b76dcf3 100644
--- a/functions/ticket.php
+++ b/functions/ticket.php
@@ -1650,7 +1650,7 @@ function ticketReplyEmailHtml($reply_id, array $state, $queue_url = '') {
$item_state = $recipient['state'];
$address = $recipient['name'] !== '' ? escapeHtml($recipient['name']) . ' <' . escapeHtml($recipient['email']) . '>' : escapeHtml($recipient['email']);
$items .= '
'
- . ($item_state ? '' . escapeHtml($item_state['label']) . '' : '')
+ . ($item_state ? '' . escapeHtml($item_state['label']) . '' : '')
. '' . $address . ''
. ($item_state && $item_state['detail'] !== '' ? '' . escapeHtml($item_state['detail']) . '' : '')
. ($item_state && $item_state['error'] !== '' ? '' . escapeHtml($item_state['error']) . '' : '')
diff --git a/functions/user_timezone.php b/functions/user_timezone.php
index 1539ef3d8..0aededd71 100644
--- a/functions/user_timezone.php
+++ b/functions/user_timezone.php
@@ -146,7 +146,7 @@ function timezoneNote() {
if (!timezoneShifted($zone)) {
return '';
}
- return ''
+ return ''
. 'Times in ' . escapeHtml(timezoneName($zone)) . ' · company: ' . escapeHtml(timezoneName(timezoneCompany())) . '';
}
diff --git a/includes/inc_alert_feedback.php b/includes/inc_alert_feedback.php
index d1b6c5d34..e5d5ce479 100644
--- a/includes/inc_alert_feedback.php
+++ b/includes/inc_alert_feedback.php
@@ -26,9 +26,8 @@ if (!empty($_SESSION['alert_message'])) {
$alert_type = $_SESSION['alert_type'] ?? 'success';
// One mapping for both renderers - see alertStyleClass() in
- // functions/sanitize.php. flashAlert() is called with more type names than
- // Bootstrap has classes ('danger', 'alert' and a typo'd 'errpr' among
- // them), and an unmapped value used to resolve to nothing at all.
+ // functions/sanitize.php - 'error' is Bootstrap's 'danger', and an unmapped
+ // value used to resolve to nothing at all.
$alert_style_class = alertStyleClass($alert_type);
$alert_style = 'text-bg-' . $alert_style_class;
// text-bg-info and text-bg-warning are the two Bootstrap pairs with dark text
@@ -36,7 +35,7 @@ if (!empty($_SESSION['alert_message'])) {
// Font Awesome 5 names - the vendored build is 5.15.4, so no fa-circle-*
// aliases. Keyed on alertStyleClass()' output rather than the raw type, so
- // 'error', 'errpr' and 'danger' all land on the same icon the same way they
+ // 'error' and 'danger' land on the same icon the same way they
// already land on the same colour.
$alert_icons = [
'success' => 'fa-check-circle',
diff --git a/includes/top_nav.php b/includes/top_nav.php
index 89f06bf07..520992a11 100644
--- a/includes/top_nav.php
+++ b/includes/top_nav.php
@@ -71,9 +71,9 @@