Release 2.8.0

CHANGELOG.md

@@ -2,6 +2,52 @@
 
 All notable changes to this project will be documented in this file.
 
+## 2.8.0 - 2026-08-16
+
+### Added
+
+- Filtered audit-log CSV export with a dedicated `audit-log.export` permission.
+- Canvas Sizes as an individual Content audit category.
+- Audit events for slide, template, playlist, and screen changes.
+- Audit events for System Settings changes.
+- Administration audit events for user and role management.
+- Audit logging enablement, category selection, and request metadata controls.
+- The extensible audit event storage, retention setting, dedicated audit-log permission, and paginated viewer foundation.
+- A Defaults settings section for player and announcement defaults.
+- A configurable maximum active session limit that removes the oldest sessions first.
+- IP address and user-agent metadata to active sessions.
+- The option for users to sign out their other active sessions from My Account.
+- Persistent administrator-controlled account locking and unlocking.
+- Database-backed login rate limiting with configurable attempts, lockout duration, and tracking scope.
+- A permissions-gated System Settings page for announcement icon suggestions, media upload limits and MIME types, session lifetime, and password-change policies.
+- Configurable forced password changes for newly created users and administrator password resets.
+- The database foundation for key-based application settings, including typed defaults and validation.
+
+### Changed
+
+- Updated the API and database documentation and added the Docker publish status badge to the project README.
+- Renamed the audit export permission to `audit-log.allow`.
+- Made Content and Data Sources audit categories opt-in and excluded automatic data-source refreshes from audit logging.
+- Split Content audit logging into individual Slides, Templates, Playlists, Screens, and Announcements categories.
+- Renamed the System Settings audit category key from `settings` to `system-settings`.
+- Split audit administration events into separate Users and Roles categories.
+- Split RSS and API data-source refresh defaults.
+- Made the default announcement duration use a value and unit selector, matching announcement forms.
+- Replaced password strength presets with customizable length, category, and character requirements.
+- Session expiration now uses the configured system setting, and user and role administration is grouped under the Settings area.
+- Renamed the system settings permissions to the `system-settings.*` namespace and migrated existing role assignments.
+- Added numeric auto-increment identifiers to every table and retained natural or relationship keys as unique constraints.
+
+## 2.7.6 - 2026-08-15
+
+### Changed
+
+- The announcement icon picker now supports searching the full Bootstrap Icons catalog while still showing the curated suggestion set by default.
+
+### Fixed
+
+- The announcement Play/Stop button now refreshes after saving screen-group changes, so Play stays disabled until the announcement actually has targets again.
+
 ## 2.7.5 - 2026-08-15
 
 ### Changed

README.md

@@ -1,5 +1,7 @@
 # Pulse Signage
 
+[![Publish Docker Image](https://git.lzstealth.com/lzstealth/pulse-signage/actions/workflows/docker-publish.yml/badge.svg?branch=main)](https://git.lzstealth.com/lzstealth/pulse-signage/actions?workflow=docker-publish.yml)
+
 Pulse Signage is a self-hosted digital signage platform for teams that want clear, reliable control over the content on every screen.
 
 It gives you one place to publish playlists, slides, announcements, and live updates without handing the workflow to a third-party service.

build/package.player.json

@@ -1,6 +1,6 @@
 {
   "name": "pulse-signage-player",
-  "version": "2.7.5",
+  "version": "2.8.0",
   "private": false,
   "description": "Pulse Signage player application bundle",
   "engines": {

build/package.web.json

@@ -1,6 +1,6 @@
 {
   "name": "pulse-signage-web",
-  "version": "2.7.5",
+  "version": "2.8.0",
   "private": false,
   "description": "Pulse Signage web and bridge application bundle",
   "engines": {

docker-compose/.env.example

@@ -17,7 +17,6 @@ PLAYER_PUBLIC_URL="http://localhost:8081"
 PLAYER_INTERNAL_URL="http://player:8081"
 
 # Web app bootstrap settings
-SESSION_MAX_AGE_DAYS=14
 DEFAULT_ADMIN_USERNAME="admin"
 DEFAULT_ADMIN_NAME="Admin"
 DEFAULT_ADMIN_PASSWORD="password123"

docker-compose/README.md

@@ -45,7 +45,6 @@ Key configuration:
 
 - `DB_HOST`, `DB_PORT`, `DB_NAME`, `DB_USER`, `DB_PASSWORD`
 - `PULSE_SIGNAGE_SHARED_SECRET`
-- `SESSION_MAX_AGE_DAYS`
 - `DEFAULT_ADMIN_USERNAME`
 - `DEFAULT_ADMIN_NAME`
 - `DEFAULT_ADMIN_PASSWORD`
@@ -122,7 +121,6 @@ Important values:
 - `PLAYER_INTERNAL_URL` - internal URL the web app uses for local player calls
 - `BRIDGE_INTERNAL_URL` - bridge URL the web app uses for player snapshot and command forwarding
 - `WEB_INTERNAL_URL` - internal URL the bridge uses to call the web app directly
-- `SESSION_MAX_AGE_DAYS` - dashboard session lifetime
 - `DEFAULT_ADMIN_*` - bootstrap admin account values
 - `PASSWORD_HASH_ITERATIONS` - password hashing cost
 - `MYSQL_ROOT_PASSWORD` - root password for the local MySQL container
@@ -167,7 +165,6 @@ Leave it blank only if you intentionally want to run without request signing in
 | `DB_USER` | web, player, bridge, mysql | Database user. |
 | `DB_PASSWORD` | web, player, bridge, mysql | Database password. |
 | `MYSQL_ROOT_PASSWORD` | mysql | Root password for the local MySQL container. |
-| `SESSION_MAX_AGE_DAYS` | web | Session cookie lifetime. |
 | `DEFAULT_ADMIN_USERNAME` | web | Bootstrap admin username. |
 | `DEFAULT_ADMIN_NAME` | web | Bootstrap admin display name. |
 | `DEFAULT_ADMIN_PASSWORD` | web | Bootstrap admin password. |

docker-compose/docker-compose.yml

@@ -16,7 +16,6 @@ services:
       DB_PASSWORD: ${DB_PASSWORD:-signage_password}
       PULSE_SIGNAGE_SHARED_SECRET: ${PULSE_SIGNAGE_SHARED_SECRET:-}
       BRIDGE_INTERNAL_URL: ${BRIDGE_INTERNAL_URL:-http://player-bridge:8090}
-      SESSION_MAX_AGE_DAYS: ${SESSION_MAX_AGE_DAYS:-14}
       DEFAULT_ADMIN_USERNAME: ${DEFAULT_ADMIN_USERNAME:-admin}
       DEFAULT_ADMIN_NAME: ${DEFAULT_ADMIN_NAME:-Admin}
       DEFAULT_ADMIN_PASSWORD: ${DEFAULT_ADMIN_PASSWORD:-password123}

docs/api.md

@@ -286,6 +286,8 @@ Response fields:
 - `id`
 - `name`
 - `fade_between_slides`
+- `skip_unavailable_rtmp`
+- `canvas_id`
 
 ### Slide
 
@@ -293,12 +295,9 @@ Response fields:
 - `title`
 - `body`
 - `duration_seconds`
-- `schedule_mode`
-- `schedule_start_datetime`
-- `schedule_end_datetime`
-- `schedule_start_time`
-- `schedule_end_time`
-- `schedule_days_json`
+- `use_video_duration`
+- `disable_audio`
+- `scheduleRules`
 - `media_url`
 - `media_type`
 - `kind`

docs/schema.md

@@ -3,7 +3,7 @@
 This app creates and maintains its schema at startup through `src/db/index.js`.
 The sections below summarize the current tables and their purpose.
 
-Primary keys are `id` unless noted otherwise. Timestamps are stored as `created_at` and `modified_at` when a table supports auditing.
+Tables generally use a numeric auto-increment `id` primary key. The relationship table `d_announcement_screens` intentionally uses the composite `(announcement_id, screen_id)` primary key instead. Natural and relationship keys remain as unique constraints where needed. Timestamps are stored as `created_at` and `modified_at` when a table supports auditing.
 
 ## Admin
 
@@ -16,7 +16,7 @@ Primary keys are `id` unless noted otherwise. Timestamps are stored as `created_
 
 ### `a_users`
 
-- `id`, `name`, `username`, `password_hash`, `password_salt`, `password_iterations`, `created_at`, `created_by`, `modified_at`, `modified_by`
+- `id`, `name`, `username`, `password_hash`, `password_salt`, `password_iterations`, `must_change_password`, `account_locked`, `created_at`, `created_by`, `modified_at`, `modified_by`
 - `username` is unique.
 
 ### `a_roles`
@@ -32,24 +32,24 @@ Primary keys are `id` unless noted otherwise. Timestamps are stored as `created_
 
 ### `a_role_permissions`
 
-- `role_id`, `permission_id`, `created_at`, `modified_at`
+- `id`, `role_id`, `permission_id`, `created_at`, `modified_at`
 - Foreign keys:
         - `role_id` -> `a_roles.id`
         - `permission_id` -> `a_permissions.id`
-- Composite primary key: `(role_id, permission_id)`
+- Unique key: `(role_id, permission_id)`
 
 ### `a_user_roles`
 
-- `user_id`, `role_id`, `created_at`, `modified_at`
+- `id`, `user_id`, `role_id`, `created_at`, `modified_at`
 - Foreign keys:
         - `user_id` -> `a_users.id`
         - `role_id` -> `a_roles.id`
-- Composite primary key: `(user_id, role_id)`
+- Unique key: `(user_id, role_id)`
 
 ### `a_sessions`
 
-- `session_hash`, `user_id`, `expires_at`, `created_at`, `created_by`, `last_used_at`, `modified_by`
-- `session_hash` is the primary key.
+- `id`, `session_hash`, `user_id`, `ip_address`, `user_agent`, `expires_at`, `created_at`, `created_by`, `last_used_at`, `modified_by`
+- `session_hash` is unique.
 - Foreign key:
         - `user_id` -> `a_users.id`
 
@@ -116,11 +116,6 @@ Primary keys are `id` unless noted otherwise. Timestamps are stored as `created_
 - `d_screens` - screen records and playlist assignment.
 - `d_onboarding_devices` - device-to-screen bindings and onboarded client names.
 
-## Announcements
-
-- `d_announcements` - announcement content and display metadata.
-- `d_announcement_screens` - announcement-to-screen assignments.
-
 ### `d_players`
 
 - `id`, `identifier`, `public_base_url`, `internal_base_url`, `last_seen_at`, `created_at`, `modified_at`
@@ -138,11 +133,20 @@ Primary keys are `id` unless noted otherwise. Timestamps are stored as `created_
 
 ### `d_onboarding_devices`
 
-- `device_id`, `client_name`, `screen_id`, `created_at`, `created_by`, `modified_at`, `modified_by`
-- `device_id` is the primary key.
+- `id`, `device_id`, `client_name`, `screen_id`, `created_at`, `created_by`, `modified_at`, `modified_by`
+- `device_id` is unique.
 - Foreign key:
         - `screen_id` -> `d_screens.id` with `ON DELETE SET NULL`
 
+## Onboarding
+
+- The onboarding flow uses `d_onboarding_devices` to bind a device to a screen and persist the client name.
+
+## Announcements
+
+- `d_announcements` - announcement content and display metadata.
+- `d_announcement_screens` - announcement-to-screen assignments.
+
 ### `d_announcements`
 
 - `id`, `message`, `short_label`, `announcement_type`, `color_key`, `icon_key`, `duration_seconds`, `expires_at`, `created_at`, `created_by`, `modified_at`, `modified_by`
@@ -154,11 +158,7 @@ Primary keys are `id` unless noted otherwise. Timestamps are stored as `created_
 - Foreign keys:
         - `announcement_id` -> `d_announcements.id` with `ON DELETE CASCADE`
         - `screen_id` -> `d_screens.id` with `ON DELETE CASCADE`
-- Composite primary key: `(announcement_id, screen_id)`
-
-## Onboarding
-
-- The onboarding flow uses `d_onboarding_devices` to bind a device to a screen and persist the client name.
+- Unique key: `(announcement_id, screen_id)`
 
 ## Integrations
 
@@ -201,6 +201,8 @@ Primary keys are `id` unless noted otherwise. Timestamps are stored as `created_
 
 - `o_background_tasks` - queue and history for background jobs.
 - `o_app_state` - generic app state and version markers stored as key/value pairs.
+- `o_app_settings` - administrator-configurable application settings stored by key.
+- `o_audit_events` - retained audit events for administrator activity and system changes.
 
 ### `o_background_tasks`
 
@@ -209,10 +211,21 @@ Primary keys are `id` unless noted otherwise. Timestamps are stored as `created_
 
 ### `o_app_state`
 
-- `state_key`, `state_value`, `created_at`, `modified_at`
-- `state_key` is the primary key.
+- `id`, `state_key`, `state_value`, `created_at`, `modified_at`
+- `state_key` is unique.
 - `schema_version` is stored here so startup can detect the previously recorded schema version before deciding whether migrations need to run.
 
+### `o_app_settings`
+
+- `id`, `setting_key`, `setting_value`, `created_at`, `created_by`, `modified_at`, `modified_by`
+- `setting_key` is unique.
+- Values are stored as JSON and validated against the application setting definitions in `src/data/app-settings.js`.
+
+### `o_audit_events`
+
+- `id`, `occurred_at`, `category`, `event_type`, `actor_user_id`, `target_type`, `target_id`, `target_label`, `ip_address`, `user_agent`, `details_json`
+- Indexed by occurrence time, category and event type, actor, and target.
+
 ## Notes
 
 - The schema is initialized with `CREATE TABLE IF NOT EXISTS`, so new installs can start from an empty database.
@@ -269,14 +282,19 @@ erDiagram
         }
         O_APP_STATE {
         }
+        O_APP_SETTINGS {
+        }
         O_BACKGROUND_TASKS {
         }
+        O_AUDIT_EVENTS {
+        }
 
         A_USERS ||--o{ A_USER_ROLES : has
         A_ROLES ||--o{ A_USER_ROLES : assigned_to
         A_ROLES ||--o{ A_ROLE_PERMISSIONS : has
         A_PERMISSIONS ||--o{ A_ROLE_PERMISSIONS : granted_to
         A_USERS ||--o{ A_SESSIONS : owns
+        A_USERS ||--o{ O_AUDIT_EVENTS : acts
 
         C_CANVAS_SIZES ||--o{ C_TEMPLATES : used_by
         C_CANVAS_SIZES ||--o{ C_PLAYLISTS : used_by

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "pulse-signage",
-  "version": "2.7.5",
+  "version": "2.8.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "pulse-signage",
-      "version": "2.7.5",
+      "version": "2.8.0",
       "dependencies": {
         "@sparticuz/chromium": "^149.0.0",
         "animate.css": "^4.1.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pulse-signage",
-  "version": "2.7.5",
+  "version": "2.8.0",
   "private": false,
   "description": "Pulse Signage application with MySQL and media storage",
   "engines": {

src/auth.js

@@ -7,21 +7,55 @@ const PASSWORD_KEY_LENGTH = 32;
 const PASSWORD_DIGEST = 'sha256';
 const SESSION_BYTES = 32;
 
-function validatePasswordStrength(password) {
+function validatePasswordStrength(password, options) {
   const value = String(password || '');
+  const requirements = options && options.policy
+    ? getPasswordPolicyPreset(options.policy)
+    : {
+      minimumLength: Number(options && options.minimumLength) || 10,
+      minimumCategories: Number(options && options.minimumCategories) || 3,
+      requireLowercase: Boolean(options && options.requireLowercase),
+      requireUppercase: Boolean(options && options.requireUppercase),
+      requireNumber: Boolean(options && options.requireNumber),
+      requireSymbol: Boolean(options && options.requireSymbol)
+    };
   const hasLowercase = /[a-z]/.test(value);
   const hasUppercase = /[A-Z]/.test(value);
   const hasNumber = /[0-9]/.test(value);
   const hasSymbol = /[^A-Za-z0-9]/.test(value);
   const categoryCount = [hasLowercase, hasUppercase, hasNumber, hasSymbol].filter(Boolean).length;
 
-  if (value.length < 10 || categoryCount < 3) {
-    return 'Password must be at least 10 characters and include 3 of: uppercase, lowercase, number, and symbol.';
+  const missingRequiredCategory = requirements.requireLowercase && !hasLowercase
+    || requirements.requireUppercase && !hasUppercase
+    || requirements.requireNumber && !hasNumber
+    || requirements.requireSymbol && !hasSymbol;
+  if (value.length < requirements.minimumLength || categoryCount < requirements.minimumCategories || missingRequiredCategory) {
+    if (missingRequiredCategory) {
+      const requiredCategories = [];
+      if (requirements.requireLowercase) requiredCategories.push('lowercase');
+      if (requirements.requireUppercase) requiredCategories.push('uppercase');
+      if (requirements.requireNumber) requiredCategories.push('number');
+      if (requirements.requireSymbol) requiredCategories.push('symbol');
+      return `Password must be at least ${requirements.minimumLength} characters and include ${requiredCategories.join(', ')}.`;
+    }
+    if (requirements.minimumCategories === 4) {
+      return `Password must be at least ${requirements.minimumLength} characters and include uppercase, lowercase, number, and symbol.`;
+    }
+    return `Password must be at least ${requirements.minimumLength} characters and include ${requirements.minimumCategories} of: uppercase, lowercase, number, and symbol.`;
   }
 
   return '';
 }
 
+function getPasswordPolicyPreset(policy) {
+  const normalizedPolicy = String(policy || 'standard').trim().toLowerCase();
+  return normalizedPolicy === 'strict'
+    ? { minimumLength: 14, minimumCategories: 4 }
+    : normalizedPolicy === 'strong'
+      ? { minimumLength: 12, minimumCategories: 3 }
+      : { minimumLength: 10, minimumCategories: 3 };
+}
+
 function hashPassword(password, salt) {
   const safePassword = String(password || '');
   const safeSalt = salt || crypto.randomBytes(16).toString('hex');

src/common.js

@@ -27,7 +27,7 @@ const dbBootstrap = require('#src/db/bootstrap');
 const data = require('#src/data');
 const player = require('#src/player/render');
 const listQuery = require('#src/web/lib/list-query');
-const { fetchPlaylistCanvasId, fetchPlaylistCanvasSignature } = require('#src/web/lib/helpers');
+const { fetchPlaylistCanvasId } = require('#src/web/lib/helpers');
 
 module.exports = {
   createPool: dbCommon.createPool,
@@ -63,7 +63,6 @@ module.exports = {
   getSortDirectionQuery: listQuery.getSortDirectionQuery,
   fetchPlaylistById: data.fetchPlaylistById,
   fetchPlaylistCanvasId: fetchPlaylistCanvasId,
-  fetchPlaylistCanvasSignature: fetchPlaylistCanvasSignature,
   normalizeDisplayMode: data.normalizeDisplayMode,
   fetchTimetablesData: data.fetchTimetablesData,
   fetchTimetableGroupsPage: data.fetchTimetableGroupsPage,

src/data/announcement-icons.js

@@ -1,55 +1,69 @@
-const ANNOUNCEMENT_ICON_OPTIONS = [
-  { value: 'megaphone-fill', label: 'Megaphone' },
-  { value: 'megaphone', label: 'Megaphone outline' },
-  { value: 'bell-fill', label: 'Bell' },
-  { value: 'bell', label: 'Bell outline' },
-  { value: 'exclamation-triangle-fill', label: 'Warning' },
-  { value: 'exclamation-triangle', label: 'Warning outline' },
-  { value: 'info-circle-fill', label: 'Info' },
-  { value: 'info-circle', label: 'Info outline' },
-  { value: 'check-circle-fill', label: 'Success' },
-  { value: 'check-circle', label: 'Success outline' },
-  { value: 'lightbulb-fill', label: 'Idea' },
-  { value: 'lightbulb', label: 'Idea outline' },
-  { value: 'calendar-event-fill', label: 'Calendar' },
-  { value: 'calendar-event', label: 'Calendar outline' },
-  { value: 'clock-fill', label: 'Clock' },
-  { value: 'clock', label: 'Clock outline' },
-  { value: 'wifi-off', label: 'Wi-Fi Offline' },
-  { value: 'wifi', label: 'Wi-Fi' },
-  { value: 'hdd-network', label: 'Network' },
-  { value: 'hdd-network-fill', label: 'Network fill' },
-  { value: 'speaker-fill', label: 'Speaker' },
-  { value: 'speaker', label: 'Speaker outline' },
-  { value: 'shield-fill', label: 'Shield' },
-  { value: 'shield', label: 'Shield outline' },
-  { value: 'collection-play-fill', label: 'Playlist' },
-  { value: 'collection-play', label: 'Playlist outline' },
-  { value: 'broadcast', label: 'Broadcast' },
-  { value: 'broadcast-pin', label: 'Broadcast pin' },
-  { value: 'plug-fill', label: 'Plug' },
-  { value: 'plug', label: 'Plug outline' },
-  { value: 'lightning-charge-fill', label: 'Urgent' },
-  { value: 'lightning-charge', label: 'Urgent outline' },
-  { value: 'car-front-fill', label: 'Car Front' },
-  { value: 'car-front', label: 'Car Front outline' },
-  { value: 'lamp-fill', label: 'Lamp' },
-  { value: 'lamp', label: 'Lamp outline' },
-  { value: 'envelope-fill', label: 'Message' },
-  { value: 'envelope', label: 'Message outline' },
-  { value: 'people-fill', label: 'Audience' },
-  { value: 'people', label: 'Audience outline' },
-  { value: 'browser-chrome', label: 'Browser Chrome' },
-  { value: 'browser-edge', label: 'Browser Edge' },
-  { value: 'browser-firefox', label: 'Browser Firefox' },
-  { value: 'browser-safari', label: 'Browser Safari' },
-  { value: 'cone', label: 'Cone' },
-  { value: 'cone-striped', label: 'Cone striped' },
-  { value: 'cup-straw', label: 'Cup straw' },
-  { value: 'fire', label: 'Fire' }
+const fs = require('fs');
+const path = require('path');
+
+const BOOTSTRAP_ICON_CSS_PATH = path.join(__dirname, '..', 'web', 'public', 'adminlte', 'bootstrap-icons', 'css', 'bootstrap-icons.min.css');
+
+const DEFAULT_ANNOUNCEMENT_ICON_KEYS = [
+  'megaphone-fill', 'megaphone', 'bell-fill', 'bell',
+  'exclamation-triangle-fill', 'exclamation-triangle', 'info-circle-fill', 'info-circle',
+  'check-circle-fill', 'check-circle', 'lightbulb-fill', 'lightbulb',
+  'calendar-event-fill', 'calendar-event', 'clock-fill', 'clock',
+  'wifi-off', 'wifi', 'hdd-network', 'hdd-network-fill',
+  'speaker-fill', 'speaker', 'shield-fill', 'shield',
+  'collection-play-fill', 'collection-play', 'broadcast', 'broadcast-pin',
+  'plug-fill', 'plug', 'lightning-charge-fill', 'lightning-charge',
+  'car-front-fill', 'car-front', 'lamp-fill', 'lamp',
+  'envelope-fill', 'envelope', 'people-fill', 'people',
+  'browser-chrome', 'browser-edge', 'browser-firefox', 'browser-safari',
+  'cone', 'cone-striped', 'cup-straw', 'fire'
 ];
 
-const ANNOUNCEMENT_ICON_KEYS = ANNOUNCEMENT_ICON_OPTIONS.map(function (option) {
+function humanizeBootstrapIconLabel(iconKey) {
+  return String(iconKey || '')
+    .trim()
+    .replace(/[-_]+/g, ' ')
+    .replace(/\b\w/g, function (character) {
+      return character.toUpperCase();
+    });
+}
+
+function loadBootstrapIconCatalog() {
+  try {
+    const css = fs.readFileSync(BOOTSTRAP_ICON_CSS_PATH, 'utf8');
+    const keys = Array.from(new Set((css.match(/\.bi-([a-z0-9-]+)::?before/g) || []).map(function (match) {
+      return String(match || '')
+        .replace(/^\.bi-/, '')
+        .replace(/::?before$/, '')
+        .trim()
+        .toLowerCase();
+    }).filter(Boolean)));
+
+    return keys.map(function (value) {
+      return {
+        value: value,
+        label: humanizeBootstrapIconLabel(value)
+      };
+    }).sort(function (left, right) {
+      return left.value.localeCompare(right.value);
+    });
+  } catch (_error) {
+    return DEFAULT_ANNOUNCEMENT_ICON_KEYS.map(function (value) {
+      return { value: value, label: humanizeBootstrapIconLabel(value) };
+    });
+  }
+}
+
+const ANNOUNCEMENT_ICON_CATALOG = loadBootstrapIconCatalog();
+const ANNOUNCEMENT_ICON_OPTIONS = DEFAULT_ANNOUNCEMENT_ICON_KEYS.map(function (value) {
+  const catalogOption = ANNOUNCEMENT_ICON_CATALOG.find(function (option) {
+    return option.value === value;
+  });
+  return catalogOption || { value: value, label: humanizeBootstrapIconLabel(value) };
+});
+
+const ANNOUNCEMENT_ICON_KEYS = DEFAULT_ANNOUNCEMENT_ICON_KEYS.slice();
+
+const ANNOUNCEMENT_ICON_CATALOG_KEYS = ANNOUNCEMENT_ICON_CATALOG.map(function (option) {
   return option.value;
 });
 
@@ -58,17 +72,27 @@ const ANNOUNCEMENT_ICON_LABELS = ANNOUNCEMENT_ICON_OPTIONS.reduce(function (labe
   return labels;
 }, Object.create(null));
 
+ANNOUNCEMENT_ICON_CATALOG.forEach(function (option) {
+  if (!Object.prototype.hasOwnProperty.call(ANNOUNCEMENT_ICON_LABELS, option.value)) {
+    ANNOUNCEMENT_ICON_LABELS[option.value] = option.label;
+  }
+});
+
 const DEFAULT_ANNOUNCEMENT_ICON = 'megaphone-fill';
 
 function normalizeAnnouncementIcon(value) {
   const normalized = String(value || '').trim().toLowerCase();
-  return ANNOUNCEMENT_ICON_KEYS.includes(normalized) ? normalized : DEFAULT_ANNOUNCEMENT_ICON;
+  return ANNOUNCEMENT_ICON_CATALOG_KEYS.includes(normalized) ? normalized : DEFAULT_ANNOUNCEMENT_ICON;
 }
 
 module.exports = {
+  DEFAULT_ANNOUNCEMENT_ICON_KEYS,
   ANNOUNCEMENT_ICON_OPTIONS,
   ANNOUNCEMENT_ICON_KEYS,
+  ANNOUNCEMENT_ICON_CATALOG,
+  ANNOUNCEMENT_ICON_CATALOG_KEYS,
   ANNOUNCEMENT_ICON_LABELS,
   DEFAULT_ANNOUNCEMENT_ICON,
+  humanizeBootstrapIconLabel,
   normalizeAnnouncementIcon
 };

src/data/api-sources.js

@@ -22,10 +22,6 @@ function normalizeAuthMethod(value) {
   return ['basic', 'bearer', 'api_key_header'].includes(method) ? method : 'none';
 }
 
-function getItemsPath(source) {
-  return String(source && (source.items_path || source.itemsPath) || '').trim();
-}
-
 function buildAuthHeaders(source) {
   const method = normalizeAuthMethod(source && (source.auth_method || source.authMethod));
   const headers = {};

src/data/app-settings.js

@@ -0,0 +1,199 @@
+const { DEFAULT_ANNOUNCEMENT_ICON_KEYS } = require('./announcement-icons');
+
+const SETTING_DEFINITIONS = [
+  { key: 'app.name', type: 'string', defaultValue: 'Pulse Signage' },
+  { key: 'locale.timezone', type: 'string', defaultValue: 'Europe/London' },
+  { key: 'locale.language', type: 'string', defaultValue: 'en' },
+  { key: 'ui.theme', type: 'enum', values: ['dark', 'light', 'auto'], defaultValue: 'dark' },
+  { key: 'security.session_lifetime_days', type: 'integer', min: 1, defaultValue: 14 },
+  { key: 'security.allow_user_session_revocation', type: 'boolean', defaultValue: true },
+  { key: 'security.max_active_sessions', type: 'integer', min: 0, defaultValue: 0 },
+  { key: 'security.password_min_length', type: 'integer', min: 8, defaultValue: 10 },
+  { key: 'security.password_min_categories', type: 'integer', min: 1, defaultValue: 3 },
+  { key: 'security.password_require_lowercase', type: 'boolean', defaultValue: false },
+  { key: 'security.password_require_uppercase', type: 'boolean', defaultValue: false },
+  { key: 'security.password_require_number', type: 'boolean', defaultValue: false },
+  { key: 'security.password_require_symbol', type: 'boolean', defaultValue: false },
+  { key: 'security.require_password_change_for_new_users', type: 'boolean', defaultValue: true },
+  { key: 'security.require_password_change_after_admin_reset', type: 'boolean', defaultValue: true },
+  { key: 'security.login_max_attempts', type: 'integer', min: 1, defaultValue: 5 },
+  { key: 'security.login_lockout_minutes', type: 'integer', min: 1, defaultValue: 15 },
+  { key: 'security.login_rate_limit_scope', type: 'enum', values: ['both', 'username', 'ip'], defaultValue: 'both' },
+  { key: 'audit.enabled', type: 'boolean', defaultValue: true },
+  { key: 'audit.categories', type: 'string_array', defaultValue: ['authentication', 'security', 'sessions', 'users', 'roles', 'system-settings'] },
+  { key: 'audit.include_request_metadata', type: 'boolean', defaultValue: true },
+  { key: 'audit.retention_days', type: 'integer', min: 0, defaultValue: 180 },
+  { key: 'uploads.image_max_bytes', type: 'integer', min: 1, defaultValue: 100 * 1024 * 1024 },
+  { key: 'uploads.video_max_bytes', type: 'integer', min: 1, defaultValue: 1024 * 1024 * 1024 },
+  { key: 'uploads.wysiwyg_image_max_bytes', type: 'integer', min: 1, defaultValue: 2 * 1024 * 1024 },
+  { key: 'uploads.allowed_mime_types', type: 'string_array', defaultValue: ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/svg+xml', 'video/mp4', 'video/webm', 'video/ogg'] },
+  { key: 'uploads.cleanup_days', type: 'integer', min: 0, defaultValue: 30 },
+  { key: 'uploads.optimize_images', type: 'boolean', defaultValue: true },
+  { key: 'announcements.default_icon', type: 'string', defaultValue: 'megaphone-fill' },
+  { key: 'announcements.default_duration_value', type: 'integer', min: 1, defaultValue: 10 },
+  { key: 'announcements.default_duration_unit', type: 'enum', values: ['seconds', 'minutes'], defaultValue: 'seconds' },
+  { key: 'announcements.suggested_icons', type: 'string_array', defaultValue: DEFAULT_ANNOUNCEMENT_ICON_KEYS.slice() },
+  { key: 'player.default_slide_duration_seconds', type: 'integer', min: 1, defaultValue: 10 },
+  { key: 'player.default_fade_between_slides', type: 'boolean', defaultValue: true },
+  { key: 'player.skip_unavailable_rtmp', type: 'boolean', defaultValue: true }
+  ,{ key: 'data-sources.rss_default_interval_value', type: 'integer', min: 1, defaultValue: 60 }
+  ,{ key: 'data-sources.rss_default_interval_unit', type: 'enum', values: ['seconds', 'minutes', 'hours'], defaultValue: 'minutes' }
+  ,{ key: 'data-sources.api_default_interval_value', type: 'integer', min: 1, defaultValue: 60 }
+  ,{ key: 'data-sources.api_default_interval_unit', type: 'enum', values: ['seconds', 'minutes', 'hours'], defaultValue: 'minutes' }
+];
+
+const DEFINITIONS_BY_KEY = new Map(SETTING_DEFINITIONS.map(function (definition) {
+  return [definition.key, definition];
+}));
+
+function cloneValue(value) {
+  if (Array.isArray(value)) {
+    return value.slice();
+  }
+  return value;
+}
+
+function getAppSettingDefinitions() {
+  return SETTING_DEFINITIONS.map(function (definition) {
+    return Object.assign({}, definition, {
+      values: definition.values ? definition.values.slice() : undefined,
+      defaultValue: cloneValue(definition.defaultValue)
+    });
+  });
+}
+
+function getDefaultAppSettings() {
+  return SETTING_DEFINITIONS.reduce(function (settings, definition) {
+    settings[definition.key] = cloneValue(definition.defaultValue);
+    return settings;
+  }, {});
+}
+
+function normalizeSettingValue(key, value) {
+  const definition = DEFINITIONS_BY_KEY.get(String(key || '').trim());
+  if (!definition) {
+    throw new Error('Unknown application setting: ' + key);
+  }
+
+  if (definition.type === 'string') {
+    return String(value == null ? '' : value).trim();
+  }
+
+  if (definition.type === 'integer') {
+    const normalized = Number(value);
+    if (!Number.isInteger(normalized) || normalized < definition.min) {
+      throw new Error('Invalid value for application setting: ' + definition.key);
+    }
+    return normalized;
+  }
+
+  if (definition.type === 'boolean') {
+    if (value === true || value === 1 || value === '1' || value === 'true') {
+      return true;
+    }
+    if (value === false || value === 0 || value === '0' || value === 'false') {
+      return false;
+    }
+    throw new Error('Invalid value for application setting: ' + definition.key);
+  }
+
+  if (definition.type === 'enum') {
+    const normalized = String(value == null ? '' : value).trim();
+    if (!definition.values.includes(normalized)) {
+      throw new Error('Invalid value for application setting: ' + definition.key);
+    }
+    return normalized;
+  }
+
+  if (definition.type === 'string_array') {
+    if (!Array.isArray(value)) {
+      throw new Error('Invalid value for application setting: ' + definition.key);
+    }
+    return Array.from(new Set(value.map(function (item) {
+      return String(item || '').trim();
+    }).filter(Boolean)));
+  }
+
+  throw new Error('Unsupported application setting type: ' + definition.type);
+}
+
+function normalizeAppSettings(settings) {
+  const input = settings && typeof settings === 'object' ? settings : {};
+  return SETTING_DEFINITIONS.reduce(function (normalized, definition) {
+    const value = Object.prototype.hasOwnProperty.call(input, definition.key)
+      ? input[definition.key]
+      : definition.defaultValue;
+    normalized[definition.key] = normalizeSettingValue(definition.key, value);
+    return normalized;
+  }, {});
+}
+
+function parseStoredValue(value) {
+  if (typeof value !== 'string') {
+    return value;
+  }
+  try {
+    return JSON.parse(value);
+  } catch (_error) {
+    return value;
+  }
+}
+
+async function fetchAppSettings(pool) {
+  const [rows] = await pool.query('SELECT id, setting_key, setting_value FROM o_app_settings ORDER BY setting_key');
+  const storedSettings = {};
+  (rows || []).forEach(function (row) {
+    const key = String(row && row.setting_key || '').trim();
+    if (DEFINITIONS_BY_KEY.has(key)) {
+      storedSettings[key] = parseStoredValue(row.setting_value);
+    }
+  });
+  return normalizeAppSettings(Object.assign({}, getDefaultAppSettings(), storedSettings));
+}
+
+async function saveAppSettings(pool, settings, modifiedBy) {
+  const inputSettings = settings && typeof settings === 'object' ? settings : {};
+  const normalizedSettings = normalizeAppSettings(inputSettings);
+  const connection = typeof pool.getConnection === 'function' ? await pool.getConnection() : pool;
+  const shouldRelease = connection !== pool;
+
+  try {
+    if (typeof connection.beginTransaction === 'function') {
+      await connection.beginTransaction();
+    }
+    for (const definition of SETTING_DEFINITIONS) {
+      if (!Object.prototype.hasOwnProperty.call(inputSettings, definition.key)) {
+        continue;
+      }
+      await connection.query(
+        `INSERT INTO o_app_settings (setting_key, setting_value, created_by, modified_by)
+         VALUES (?, ?, ?, ?)
+         ON DUPLICATE KEY UPDATE setting_value = VALUES(setting_value), modified_by = VALUES(modified_by)`,
+        [definition.key, JSON.stringify(normalizedSettings[definition.key]), modifiedBy || null, modifiedBy || null]
+      );
+    }
+    if (typeof connection.commit === 'function') {
+      await connection.commit();
+    }
+  } catch (error) {
+    if (typeof connection.rollback === 'function') {
+      await connection.rollback();
+    }
+    throw error;
+  } finally {
+    if (shouldRelease && typeof connection.release === 'function') {
+      connection.release();
+    }
+  }
+
+  return normalizedSettings;
+}
+
+module.exports = {
+  getAppSettingDefinitions,
+  getDefaultAppSettings,
+  normalizeSettingValue,
+  normalizeAppSettings,
+  fetchAppSettings,
+  saveAppSettings
+};

src/data/audit-log.js

@@ -0,0 +1,102 @@
+const AUDIT_EVENT_CATEGORIES = Object.freeze({
+  AUTHENTICATION: 'authentication',
+  SECURITY: 'security',
+  SESSIONS: 'sessions',
+  USERS: 'users',
+  ROLES: 'roles',
+  SETTINGS: 'system-settings',
+  SLIDES: 'slides',
+  TEMPLATES: 'templates',
+  PLAYLISTS: 'playlists',
+  SCREENS: 'screens',
+  ANNOUNCEMENTS: 'announcements',
+  CANVAS_SIZES: 'canvas-sizes',
+  API_SOURCES: 'api-sources',
+  RSS_FEEDS: 'rss-feeds',
+  TIMETABLES: 'timetables'
+});
+const AUDIT_CATEGORY_KEYS = Object.freeze(Object.values(AUDIT_EVENT_CATEGORIES));
+const AUDIT_CATEGORY_LABELS = Object.freeze({
+  authentication: 'Authentication',
+  security: 'Security',
+  sessions: 'Sessions',
+  users: 'Users',
+  roles: 'Roles',
+  'system-settings': 'System Settings',
+  slides: 'Slides',
+  templates: 'Templates',
+  playlists: 'Playlists',
+  screens: 'Screens',
+  announcements: 'Announcements',
+  'canvas-sizes': 'Canvas Sizes',
+  'api-sources': 'API Sources',
+  'rss-feeds': 'RSS Feeds',
+  timetables: 'Timetables'
+});
+const { fetchAppSettings } = require('./app-settings');
+
+function normalizeDetails(details) {
+  if (details === undefined || details === null) {
+    return null;
+  }
+  return JSON.stringify(details);
+}
+
+function getRequestMetadata(req) {
+  const forwardedAddress = String(req && req.headers && req.headers['x-forwarded-for'] || '').split(',')[0].trim();
+  return {
+    ipAddress: forwardedAddress || String(req && req.ip || req && req.socket && req.socket.remoteAddress || '').trim() || null,
+    userAgent: String(req && req.headers && req.headers['user-agent'] || '').trim() || null
+  };
+}
+
+async function recordAuditEvent(pool, event) {
+  const input = event && typeof event === 'object' ? event : {};
+  const category = String(input.category || '').trim().toLowerCase();
+  const eventType = String(input.eventType || '').trim().toLowerCase();
+  if (!category || !eventType) {
+    throw new Error('Audit events require a category and event type.');
+  }
+
+  await pool.query(
+    `INSERT INTO o_audit_events
+      (category, event_type, actor_user_id, target_type, target_id, target_label, ip_address, user_agent, details_json)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+    [
+      category,
+      eventType,
+      Number.isInteger(Number(input.actorUserId)) && Number(input.actorUserId) > 0 ? Number(input.actorUserId) : null,
+      String(input.targetType || '').trim() || null,
+      String(input.targetId || '').trim() || null,
+      String(input.targetLabel || '').trim() || null,
+      String(input.ipAddress || '').trim() || null,
+      String(input.userAgent || '').trim() || null,
+      normalizeDetails(input.details)
+    ]
+  );
+}
+
+async function recordRequestAuditEvent(pool, req, event) {
+  try {
+    const settings = await fetchAppSettings(pool);
+    const category = String(event && event.category || '').trim().toLowerCase();
+    const enabledCategories = Array.isArray(settings['audit.categories']) ? settings['audit.categories'] : AUDIT_CATEGORY_KEYS;
+    if (!settings['audit.enabled'] || !enabledCategories.includes(category)) {
+      return;
+    }
+    const metadata = settings['audit.include_request_metadata'] ? getRequestMetadata(req) : {};
+    await recordAuditEvent(pool, Object.assign({}, event, metadata));
+  } catch (error) {
+    // Auditing must not turn a successful login or administration action into a failed request.
+    console.error('Unable to record audit event:', error.message);
+  }
+}
+
+module.exports = {
+  AUDIT_EVENT_CATEGORIES,
+  AUDIT_CATEGORY_KEYS,
+  AUDIT_CATEGORY_LABELS,
+  getRequestMetadata,
+  recordAuditEvent,
+  recordRequestAuditEvent
+};

src/data/qr-code.js

@@ -1,17 +1,6 @@
-const fs = require('fs');
 const path = require('path');
 const QRCodeStyling = require(path.join(__dirname, '..', 'web', 'public', 'vendor', 'qr-code-styling', 'qr-code-styling.js'));
 const QR_PNG_WIDTH = 2048;
-const QR_STYLING_SCRIPT_PATH = path.join(__dirname, '..', 'web', 'public', 'vendor', 'qr-code-styling', 'qr-code-styling.js');
-const SYSTEM_CHROMIUM_PATHS = [
-  process.env.PUPPETEER_EXECUTABLE_PATH,
-  process.env.CHROMIUM_PATH,
-  '/usr/bin/chromium',
-  '/usr/bin/chromium-browser',
-  '/usr/local/bin/chromium',
-  '/snap/bin/chromium'
-].filter(Boolean);
-let qrBrowserPromise = null;
 
 function escapeXml(value) {
   return String(value === undefined || value === null ? '' : value).replace(/[&<>"']/g, function (character) {
@@ -340,81 +329,6 @@ function buildQrStylingOptions(source) {
   };
 }
 
-function getQrBrowser() {
-  if (qrBrowserPromise) {
-    return qrBrowserPromise;
-  }
-
-  qrBrowserPromise = (async function () {
-    const puppeteer = require('puppeteer-core');
-    const chromiumModule = require('@sparticuz/chromium');
-    const chromium = chromiumModule && typeof chromiumModule.executablePath === 'function'
-      ? chromiumModule
-      : chromiumModule && chromiumModule.default && typeof chromiumModule.default.executablePath === 'function'
-        ? chromiumModule.default
-        : chromiumModule;
-    let executablePath = SYSTEM_CHROMIUM_PATHS.find(function (candidate) {
-      return fs.existsSync(candidate);
-    }) || '';
-    const usingSystemChromium = Boolean(executablePath);
-
-    if (!executablePath && chromium && typeof chromium.executablePath === 'function') {
-      executablePath = await chromium.executablePath();
-    }
-
-    if (!executablePath || !fs.existsSync(executablePath)) {
-      throw new Error('Chromium executable was not found.');
-    }
-
-    return puppeteer.launch({
-      args: usingSystemChromium
-        ? [
-            '--no-sandbox',
-            '--disable-setuid-sandbox',
-            '--disable-dev-shm-usage',
-            '--disable-gpu'
-          ]
-        : puppeteer.defaultArgs({
-            args: chromium && chromium.args ? chromium.args : [],
-            headless: 'shell'
-          }),
-      defaultViewport: usingSystemChromium
-        ? { width: QR_PNG_WIDTH, height: QR_PNG_WIDTH, deviceScaleFactor: 1 }
-        : chromium && chromium.defaultViewport ? chromium.defaultViewport : null,
-      executablePath: executablePath,
-      headless: usingSystemChromium ? true : 'shell'
-    });
-  })();
-
-  return qrBrowserPromise;
-}
-
-async function blobToDataUrl(blob) {
-  if (!blob) {
-    return '';
-  }
-
-  if (typeof blob === 'string') {
-    return blob;
-  }
-
-  if (typeof blob.arrayBuffer === 'function') {
-    const buffer = await blob.arrayBuffer();
-    const bytes = new Uint8Array(buffer);
-    let binary = '';
-    for (let index = 0; index < bytes.length; index += 1) {
-      binary += String.fromCharCode(bytes[index]);
-    }
-    return 'data:' + String(blob.type || 'image/png') + ';base64,' + Buffer.from(binary, 'binary').toString('base64');
-  }
-
-  if (typeof blob.text === 'function') {
-    return blob.text();
-  }
-
-  return '';
-}
-
 async function createStyledQrCodeDataUrl(value) {
   const source = value && typeof value === 'object' ? value : { value: value };
   const options = buildQrStylingOptions(source);
@@ -435,10 +349,6 @@ async function createStyledQrCodeSvg(value) {
   return renderStyledQrRawData(options, 'svg');
 }
 
-async function createQrCodeDataUrlPlain(value) {
-  return createStyledQrCodeDataUrl(value);
-}
-
 async function createQrCodeSvg(value) {
   return createStyledQrCodeSvg(value);
 }

src/data/slides.js

@@ -93,14 +93,6 @@ function sanitizeRichText(html) {
   });
 }
 
-function normalizePlainText(value) {
-  return String(value === undefined || value === null ? '' : value)
-    .replace(/<\s*br\s*\/?\s*>/gi, '\n')
-    .replace(/<[^>]*>/g, '')
-    .replace(/&nbsp;/gi, ' ')
-    .trim();
-}
-
 function stripEditorOnlyMarkup(value) {
   return String(value || '')
     .replace(/<pre[^>]*class="[^"]*api-region-sample-preview[^"]*"[^>]*>[\s\S]*?<\/pre>/gi, '')

src/data/templates.js

@@ -194,43 +194,6 @@ function extractTemplateRegions(body) {
   return regions;
 }
 
-function extractGenericRegionContent(region, body, filesByField, existingContent) {
-  const content = {};
-  const current = existingContent && existingContent[region.region_key] && typeof existingContent[region.region_key] === 'object' ? existingContent[region.region_key] : {};
-  const suffix = '_' + region.id;
-
-  Object.keys(body || {}).forEach((key) => {
-    if (!key.startsWith('region_') || !key.endsWith(suffix)) {
-      return;
-    }
-    const field = key.slice('region_'.length, -suffix.length);
-    if (!field || field === 'type' || field === 'key' || field === 'name' || field === 'label') {
-      return;
-    }
-    content[field] = body[key];
-  });
-
-  Object.keys(filesByField || {}).forEach((fieldName) => {
-    if (!fieldName.startsWith('region_') || !fieldName.endsWith(suffix)) {
-      return;
-    }
-    const field = fieldName.slice('region_'.length, -suffix.length);
-    if (!field) {
-      return;
-    }
-    content[field] = `/media/uploads/${filesByField[fieldName].filename}`;
-  });
-
-  Object.keys(current).forEach((key) => {
-    if (content[key] === undefined) {
-      content[key] = current[key];
-    }
-  });
-
-  content.type = region.region_type;
-  return content;
-}
-
 function getFilesByField(files) {
   const map = {};
   (files || []).forEach((file) => {

src/db/bootstrap.js

@@ -35,8 +35,6 @@ async function bootstrapDatabase(pool) {
     );
   }
 
-  await pool.query('UPDATE a_users SET name = username WHERE name IS NULL OR name = ""');
-
   await pool.query(
     `INSERT INTO a_roles (role_key, name, description, created_by, modified_by)
      VALUES (?, ?, ?, ?, ?)

src/db/index.js

@@ -184,13 +184,14 @@ async function ensureSchema(pool, options) {
 
   await pool.query(`
     CREATE TABLE IF NOT EXISTS d_announcement_screens (
+      id BIGINT AUTO_INCREMENT PRIMARY KEY,
       announcement_id INT NOT NULL,
       screen_id INT NOT NULL,
       created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
       created_by INT NULL,
       modified_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
       modified_by INT NULL,
-      PRIMARY KEY (announcement_id, screen_id),
+      UNIQUE KEY uq_announcement_screens_pair (announcement_id, screen_id),
       INDEX idx_announcement_screens_screen_id (screen_id),
       CONSTRAINT fk_announcement_screens_announcement FOREIGN KEY (announcement_id) REFERENCES d_announcements(id) ON DELETE CASCADE,
       CONSTRAINT fk_announcement_screens_screen FOREIGN KEY (screen_id) REFERENCES d_screens(id) ON DELETE CASCADE
@@ -278,7 +279,8 @@ async function ensureSchema(pool, options) {
 
   await pool.query(`
     CREATE TABLE IF NOT EXISTS d_onboarding_devices (
-      device_id VARCHAR(128) PRIMARY KEY,
+      id BIGINT AUTO_INCREMENT PRIMARY KEY,
+      device_id VARCHAR(128) NOT NULL UNIQUE,
       client_name VARCHAR(255) NULL,
       screen_id INT NULL,
       created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -297,6 +299,8 @@ async function ensureSchema(pool, options) {
       password_hash CHAR(64) NOT NULL,
       password_salt VARCHAR(64) NOT NULL,
       password_iterations INT NOT NULL,
+      must_change_password TINYINT(1) NOT NULL DEFAULT 0,
+      account_locked TINYINT(1) NOT NULL DEFAULT 0,
       created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
       created_by INT NULL,
       modified_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
@@ -333,13 +337,14 @@ async function ensureSchema(pool, options) {
 
   await pool.query(`
     CREATE TABLE IF NOT EXISTS a_role_permissions (
+      id BIGINT AUTO_INCREMENT PRIMARY KEY,
       role_id INT NOT NULL,
       permission_id INT NOT NULL,
       created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
       created_by INT NULL,
       modified_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
       modified_by INT NULL,
-      PRIMARY KEY (role_id, permission_id),
+      UNIQUE KEY uq_role_permissions_pair (role_id, permission_id),
       CONSTRAINT fk_role_permissions_role FOREIGN KEY (role_id) REFERENCES a_roles(id) ON DELETE CASCADE,
       CONSTRAINT fk_role_permissions_permission FOREIGN KEY (permission_id) REFERENCES a_permissions(id) ON DELETE CASCADE
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
@@ -347,13 +352,14 @@ async function ensureSchema(pool, options) {
 
   await pool.query(`
     CREATE TABLE IF NOT EXISTS a_user_roles (
+      id BIGINT AUTO_INCREMENT PRIMARY KEY,
       user_id INT NOT NULL,
       role_id INT NOT NULL,
       created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
       created_by INT NULL,
       modified_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
       modified_by INT NULL,
-      PRIMARY KEY (user_id, role_id),
+      UNIQUE KEY uq_user_roles_pair (user_id, role_id),
       CONSTRAINT fk_user_roles_user FOREIGN KEY (user_id) REFERENCES a_users(id) ON DELETE CASCADE,
       CONSTRAINT fk_user_roles_role FOREIGN KEY (role_id) REFERENCES a_roles(id) ON DELETE CASCADE
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
@@ -361,8 +367,11 @@ async function ensureSchema(pool, options) {
 
   await pool.query(`
     CREATE TABLE IF NOT EXISTS a_sessions (
-      session_hash CHAR(64) PRIMARY KEY,
+      id BIGINT AUTO_INCREMENT PRIMARY KEY,
+      session_hash CHAR(64) NOT NULL UNIQUE,
       user_id INT NOT NULL,
+      ip_address VARCHAR(255) NULL,
+      user_agent VARCHAR(512) NULL,
       expires_at DATETIME NOT NULL,
       created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
       created_by INT NULL,
@@ -372,6 +381,18 @@ async function ensureSchema(pool, options) {
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
   `);
 
+  await pool.query(`
+    CREATE TABLE IF NOT EXISTS a_login_attempts (
+      id BIGINT AUTO_INCREMENT PRIMARY KEY,
+      rate_key VARCHAR(600) NOT NULL UNIQUE,
+      failed_count INT NOT NULL DEFAULT 0,
+      last_failed_at DATETIME NULL,
+      locked_until DATETIME NULL,
+      created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+      modified_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+  `);
+
   await pool.query(`
     CREATE TABLE IF NOT EXISTS o_background_tasks (
       id BIGINT AUTO_INCREMENT PRIMARY KEY,
@@ -393,6 +414,18 @@ async function ensureSchema(pool, options) {
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
   `);
 
+  await pool.query(`
+    CREATE TABLE IF NOT EXISTS o_app_settings (
+      id BIGINT AUTO_INCREMENT PRIMARY KEY,
+      setting_key VARCHAR(191) NOT NULL UNIQUE,
+      setting_value JSON NOT NULL,
+      created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+      created_by INT NULL,
+      modified_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+      modified_by INT NULL
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+  `);
+
       await runMigrations(pool, Object.assign({}, options, { currentVersion: currentVersion }));
       await recordSchemaVersion(pool, appVersion);
     } finally {

src/db/migrations.js

@@ -385,6 +385,113 @@ const VERSIONED_MIGRATIONS = [
         await pool.query('DROP TABLE i_schedule_groups');
       }
     }
+  },
+  {
+    version: '2.8.0',
+    label: 'v2.8.0 combined application schema',
+    run: async function (pool) {
+      await pool.query(`
+        CREATE TABLE IF NOT EXISTS o_app_settings (
+          id BIGINT AUTO_INCREMENT PRIMARY KEY,
+          setting_key VARCHAR(191) NOT NULL UNIQUE,
+          setting_value JSON NOT NULL,
+          created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+          created_by INT NULL,
+          modified_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+          modified_by INT NULL
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+      `);
+      await pool.query(`
+        CREATE TABLE IF NOT EXISTS o_app_state (
+          id BIGINT AUTO_INCREMENT PRIMARY KEY,
+          state_key VARCHAR(191) NOT NULL UNIQUE,
+          state_value MEDIUMTEXT NULL,
+          created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+          modified_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+      `);
+
+      const numericIdTables = [
+        ['d_announcement_screens', 'uq_announcement_screens_pair', '(announcement_id, screen_id)'],
+        ['d_onboarding_devices', 'uq_onboarding_devices_device_id', '(device_id)'],
+        ['a_role_permissions', 'uq_role_permissions_pair', '(role_id, permission_id)'],
+        ['a_user_roles', 'uq_user_roles_pair', '(user_id, role_id)'],
+        ['a_sessions', 'uq_sessions_hash', '(session_hash)'],
+        ['o_app_state', 'uq_app_state_key', '(state_key)']
+      ];
+
+      for (const [tableName, uniqueKeyName, uniqueColumns] of numericIdTables) {
+        if (!(await tableExists(pool, tableName)) || await columnExists(pool, tableName, 'id')) {
+          continue;
+        }
+        await pool.query('ALTER TABLE ' + tableName + ' DROP PRIMARY KEY, ADD COLUMN id BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST, ADD UNIQUE KEY ' + uniqueKeyName + ' ' + uniqueColumns);
+      }
+      await ensureColumn(pool, 'a_users', 'must_change_password', 'TINYINT(1) NOT NULL DEFAULT 0', 'password_iterations');
+      await pool.query(`
+        CREATE TABLE IF NOT EXISTS a_login_attempts (
+          id BIGINT AUTO_INCREMENT PRIMARY KEY,
+          rate_key VARCHAR(600) NOT NULL UNIQUE,
+          failed_count INT NOT NULL DEFAULT 0,
+          last_failed_at DATETIME NULL,
+          locked_until DATETIME NULL,
+          created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+          modified_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+      `);
+      await ensureColumn(pool, 'a_users', 'account_locked', 'TINYINT(1) NOT NULL DEFAULT 0', 'must_change_password');
+      await ensureColumn(pool, 'a_sessions', 'ip_address', 'VARCHAR(255) NULL', 'user_id');
+      await ensureColumn(pool, 'a_sessions', 'user_agent', 'VARCHAR(512) NULL', 'ip_address');
+      await pool.query(`
+        CREATE TABLE IF NOT EXISTS o_audit_events (
+          id BIGINT AUTO_INCREMENT PRIMARY KEY,
+          occurred_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+          category VARCHAR(64) NOT NULL,
+          event_type VARCHAR(128) NOT NULL,
+          actor_user_id INT NULL,
+          target_type VARCHAR(64) NULL,
+          target_id VARCHAR(191) NULL,
+          target_label VARCHAR(255) NULL,
+          ip_address VARCHAR(255) NULL,
+          user_agent VARCHAR(512) NULL,
+          details_json JSON NULL,
+          INDEX idx_audit_events_occurred_at (occurred_at),
+          INDEX idx_audit_events_category_type (category, event_type),
+          INDEX idx_audit_events_actor (actor_user_id),
+          INDEX idx_audit_events_target (target_type, target_id)
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+      `);
+      await pool.query(
+        `INSERT INTO o_app_settings (setting_key, setting_value, created_by, modified_by)
+         VALUES (?, ?, NULL, NULL) ON DUPLICATE KEY UPDATE setting_value = VALUES(setting_value)`,
+        ['audit.retention_days', JSON.stringify(30)]
+      );
+      const settings = [
+        ['audit.enabled', true],
+        ['audit.categories', ['authentication', 'security', 'sessions', 'users', 'roles', 'system-settings']],
+        ['audit.include_request_metadata', true]
+      ];
+      for (const [key, value] of settings) {
+        await pool.query(
+          `INSERT INTO o_app_settings (setting_key, setting_value, created_by, modified_by)
+           VALUES (?, ?, NULL, NULL) ON DUPLICATE KEY UPDATE setting_value = VALUES(setting_value)`,
+          [key, JSON.stringify(value)]
+        );
+      }
+      await pool.query(
+        `INSERT IGNORE INTO a_permissions
+          (permission_key, name, section_name, description, created_by, modified_by)
+         VALUES (?, ?, ?, ?, NULL, NULL)`,
+        ['audit-log.allow', 'Audit log', 'Settings', 'Download filtered audit events.']
+      );
+      await pool.query(
+        `INSERT IGNORE INTO a_role_permissions (role_id, permission_id, created_by, modified_by)
+         SELECT roles.id, permissions.id, NULL, NULL
+           FROM a_roles roles
+           CROSS JOIN a_permissions permissions
+          WHERE roles.role_key = 'administrators'
+            AND permissions.permission_key = 'audit-log.allow'`
+      );
+    }
   }
 ];
 
@@ -441,7 +548,8 @@ async function detectSchemaVersion(pool) {
 async function recordSchemaVersion(pool, version) {
   await pool.query(
     `CREATE TABLE IF NOT EXISTS ${APP_STATE_TABLE} (
-      state_key VARCHAR(191) NOT NULL PRIMARY KEY,
+      id BIGINT AUTO_INCREMENT PRIMARY KEY,
+      state_key VARCHAR(191) NOT NULL UNIQUE,
       state_value MEDIUMTEXT NULL,
       created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
       modified_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP

src/rbac.js

@@ -140,6 +140,24 @@ const PERMISSION_SECTIONS = [
     sectionName: 'Settings',
     order: 40,
     permissions: [
+      {
+        key: 'system-settings',
+        order: 70,
+        name: 'System settings',
+        permissions: [
+          { key: 'read', name: 'Read', description: 'View global application settings.' },
+          { key: 'update', name: 'Update', description: 'Update global application settings.' }
+        ]
+      },
+      {
+        key: 'audit-log',
+        order: 60,
+        name: 'Audit log',
+        permissions: [
+          { key: 'read', name: 'Read', description: 'View security and session audit events.' },
+          { key: 'allow', name: 'Allow', description: 'Download filtered audit events.' }
+        ]
+      },
       {
         key: 'users',
         order: 10,

src/web.js

@@ -9,6 +9,7 @@ const common = require('./common');
 const { verifyPassword, createSessionToken, hashSessionToken, hashPassword, validatePasswordStrength } = require('#src/auth');
 const pages = require('#src/web/pages');
 const registerMiddleware = require('#src/web/middleware');
+const registerNotFoundHandler = require('#src/web/middleware/not-found');
 const { createBackgroundTaskQueue } = require('#src/web/lib/background-tasks/queue');
 const { initializeBackgroundTasks } = require('#src/web/lib/background-tasks');
 const { createDataSourceTaskService } = require('#src/web/lib/background-tasks/tasks-scheduled/data-source-refresh');
@@ -23,6 +24,8 @@ const { rbacData } = require('#src/web/lib/auth');
 const { createPlayerActionService } = require('#src/web/lib/player-actions');
 const { isClientNameAvailable, withClientNameReservation } = require('#src/data/client-name-check');
 const { createSessionService } = require('#src/web/lib/auth');
+const { fetchAppSettings } = require('#src/data/app-settings');
+const { recordRequestAuditEvent } = require('#src/data/audit-log');
 const { hasAnyPermission } = require('#src/rbac');
 const { ensureFontLibrary } = require('#src/web/lib/media/font-library');
 const {
@@ -34,7 +37,6 @@ const {
   getAuditUserId,
   getCanvasSignature,
   fetchPlaylistCanvasId,
-  fetchPlaylistCanvasSignature,
   fetchScreensByPlaylistId,
   fetchScreensBySlideId,
   fetchScreensByTemplateId,
@@ -92,6 +94,14 @@ async function start() {
   const sessionService = createSessionService({
     sessionCookieName: webConfig.sessionCookieName,
     sessionMaxAgeMs: webConfig.sessionMaxAgeMs,
+    getConfiguredSessionMaxAgeMs: async function () {
+      const settings = await fetchAppSettings(pool);
+      return Number(settings['security.session_lifetime_days']) * 24 * 60 * 60 * 1000;
+    },
+    getConfiguredMaxActiveSessions: async function () {
+      const settings = await fetchAppSettings(pool);
+      return Number(settings['security.max_active_sessions']);
+    },
     hashSessionToken: hashSessionToken,
     createSessionToken: createSessionToken
   });
@@ -99,6 +109,7 @@ async function start() {
   const createUserSession = sessionService.createUserSession;
   const clearSessionCookie = sessionService.clearSessionCookie;
   const setSessionCookie = sessionService.setSessionCookie;
+  const getSessionMaxAgeMs = sessionService.getSessionMaxAgeMs;
   const setAuthMessageCookie = sessionService.setAuthMessageCookie;
   const consumeAuthMessageCookie = sessionService.consumeAuthMessageCookie;
   const loadCurrentUser = sessionService.loadCurrentUser;
@@ -119,9 +130,11 @@ async function start() {
     common: common,
     pages: pages,
     upload: upload,
+    mediaDir: webConfig.mediaDir,
     uploadDir: webConfig.uploadsDir,
     createUserSession: createUserSession,
     setSessionCookie: setSessionCookie,
+    getSessionMaxAgeMs: getSessionMaxAgeMs,
     clearSessionCookie: clearSessionCookie,
     setAuthMessageCookie: setAuthMessageCookie,
     consumeAuthMessageCookie: consumeAuthMessageCookie,
@@ -131,6 +144,7 @@ async function start() {
     sessionCookieName: webConfig.sessionCookieName,
     formatDashboardDate: formatDashboardDate,
     getAuditUserId: getAuditUserId,
+    recordRequestAuditEvent: recordRequestAuditEvent,
     hashPassword: hashPassword,
     validatePasswordStrength: validatePasswordStrength,
     readArrayField: readArrayField,
@@ -140,7 +154,6 @@ async function start() {
     fetchScreensBySlideId: fetchScreensBySlideId,
     fetchScreensByTemplateId: fetchScreensByTemplateId,
     fetchPlaylistCanvasId: fetchPlaylistCanvasId,
-    fetchPlaylistCanvasSignature: fetchPlaylistCanvasSignature,
     getCanvasSignature: getCanvasSignature,
     normalizeScheduleMode: normalizeScheduleMode,
     parseDateTimeLocal: parseDateTimeLocal,
@@ -157,7 +170,6 @@ async function start() {
     },
     hasAnyPermission: hasAnyPermission,
     backgroundTaskQueue: backgroundTaskQueue,
-    mediaDir: webConfig.mediaDir,
     uploadSyncService: webBootstrap.uploadSyncService,
     collectUploadReferencesFromSlide: collectUploadReferencesFromSlide,
     collectUploadReferencesFromTemplate: collectUploadReferencesFromTemplate,
@@ -167,9 +179,15 @@ async function start() {
     buildDashboardState: webBootstrap.buildDashboardState
   });
 
+  registerNotFoundHandler(app);
+
   app.use(function (error, req, res, _next) {
-    console.error(error);
     const statusCode = Number(error && (error.statusCode || error.status)) || 500;
+    if (statusCode >= 500) {
+      console.error(error);
+    } else if (statusCode >= 400 && statusCode !== 404) {
+      console.warn(error && error.message ? error.message : 'Request failed.', { statusCode: statusCode });
+    }
     const isXhr = String(req.get && req.get('X-Requested-With') || '').toLowerCase() === 'xmlhttprequest';
     const wantsHtml = !isXhr && !String(req.originalUrl || '').startsWith('/api/') && (!req.accepts || req.accepts('html'));
 

src/web/lib/auth/rbac-data.js

@@ -113,7 +113,7 @@ async function fetchRolesForUser(pool, userId) {
 
 async function fetchUsersWithRoles(pool) {
   const [rows] = await pool.query(
-    `SELECT u.id, u.name, u.username, u.created_at, u.modified_at,
+    `SELECT u.id, u.name, u.username, u.account_locked, u.created_at, u.modified_at,
             COALESCE(role_data.role_names, '') AS role_names,
             COALESCE(role_data.role_ids_csv, '') AS role_ids_csv
     FROM a_users u
@@ -142,7 +142,7 @@ async function fetchUsersWithRolesPage(pool, page, pageSize, searchTerm, sortKey
   const whereSql = hasExcludedUserId ? 'WHERE u.id <> ?' : '';
   const queryArgs = hasExcludedUserId ? [excludedUserId] : [];
   const paged = await fetchPagedRows(pool, {
-    selectSql: `SELECT u.id, u.name, u.username, u.created_at, u.modified_at,
+    selectSql: `SELECT u.id, u.name, u.username, u.account_locked, u.created_at, u.modified_at,
             COALESCE(role_data.role_names, '') AS role_names,
             COALESCE(role_data.role_ids_csv, '') AS role_ids_csv
     FROM a_users u
@@ -189,7 +189,7 @@ async function fetchUsersWithRolesPage(pool, page, pageSize, searchTerm, sortKey
 
 async function fetchUserWithRoles(pool, userId) {
   const [rows] = await pool.query(
-    `SELECT u.id, u.name, u.username, u.created_at, u.modified_at,
+    `SELECT u.id, u.name, u.username, u.account_locked, u.created_at, u.modified_at,
             COALESCE(role_data.role_names, '') AS role_names,
             COALESCE(role_data.role_ids_csv, '') AS role_ids_csv
     FROM a_users u
@@ -216,6 +216,17 @@ async function fetchUserWithRoles(pool, userId) {
   });
 }
 
+async function fetchActiveUserSessions(pool, userId) {
+  const [rows] = await pool.query(
+    `SELECT id, ip_address, user_agent, created_at, last_used_at, expires_at
+     FROM a_sessions
+     WHERE user_id = ? AND expires_at > NOW()
+     ORDER BY last_used_at DESC`,
+    [userId]
+  );
+  return rows || [];
+}
+
 async function syncUserRoles(pool, userId, roleIds) {
   const uniqueRoleIds = Array.from(new Set((Array.isArray(roleIds) ? roleIds : []).map(function (roleId) {
     return Number(roleId);
@@ -273,6 +284,7 @@ module.exports = {
   fetchUsersWithRoles,
   fetchUsersWithRolesPage,
   fetchUserWithRoles,
+  fetchActiveUserSessions,
   syncUserRoles,
   syncRoleUsers,
   syncRolePermissions

src/web/lib/auth/session.js

@@ -34,6 +34,8 @@ function normalizeReturnToPath(value, baseUrl) {
 function createSessionService(options) {
   const sessionCookieName = String(options && options.sessionCookieName || '').trim();
   const sessionMaxAgeMs = Number(options && options.sessionMaxAgeMs);
+  const getConfiguredSessionMaxAgeMs = options && options.getConfiguredSessionMaxAgeMs;
+  const getConfiguredMaxActiveSessions = options && options.getConfiguredMaxActiveSessions;
   const hashSessionToken = options && options.hashSessionToken;
   const createSessionToken = options && options.createSessionToken;
   const authMessageCookieName = 'pulse_auth_message';
@@ -88,7 +90,20 @@ function createSessionService(options) {
   }
 
   function setSessionCookie(res, token) {
-    appendCookieHeader(res, serializeCookie(sessionCookieName, token, { maxAge: sessionMaxAgeMs }));
+    const hasRequestedMaxAge = arguments.length > 2;
+    const requestedMaxAgeMs = hasRequestedMaxAge ? Number(arguments[2]) : sessionMaxAgeMs;
+    const cookieOptions = hasRequestedMaxAge && arguments[2] === null
+      ? {}
+      : { maxAge: Number.isFinite(requestedMaxAgeMs) && requestedMaxAgeMs > 0 ? requestedMaxAgeMs : sessionMaxAgeMs };
+    appendCookieHeader(res, serializeCookie(sessionCookieName, token, cookieOptions));
+  }
+
+  async function getSessionMaxAgeMs() {
+    const configuredValue = typeof getConfiguredSessionMaxAgeMs === 'function'
+      ? await getConfiguredSessionMaxAgeMs()
+      : sessionMaxAgeMs;
+    const normalizedValue = Number(configuredValue);
+    return Number.isFinite(normalizedValue) && normalizedValue > 0 ? normalizedValue : sessionMaxAgeMs;
   }
 
   function setAuthMessageCookie(res, message) {
@@ -113,7 +128,7 @@ function createSessionService(options) {
 
     const tokenHash = hashSessionToken(token);
     const [rows] = await pool.query(
-      `SELECT s.user_id, u.id, u.name, u.username
+      `SELECT s.user_id, u.id, u.name, u.username, u.must_change_password
       FROM a_sessions s
       JOIN a_users u ON u.id = s.user_id
        WHERE s.session_hash = ?
@@ -146,6 +161,7 @@ function createSessionService(options) {
 
     await pool.query('UPDATE a_sessions SET last_used_at = CURRENT_TIMESTAMP, modified_by = ? WHERE session_hash = ?', [rows[0].user_id, tokenHash]);
     return Object.assign({}, rows[0], {
+      mustChangePassword: Boolean(rows[0].must_change_password),
       roleKeys: roleRows.map(function (row) {
         return String(row.role_key || '').trim();
       }).filter(Boolean),
@@ -155,14 +171,34 @@ function createSessionService(options) {
     });
   }
 
-  async function createUserSession(pool, userId) {
+  async function createUserSession(pool, userId, configuredMaxAgeMs, metadata) {
     const token = createSessionToken();
     const tokenHash = hashSessionToken(token);
-    const expiresAt = new Date(Date.now() + sessionMaxAgeMs);
+    const maxAgeMs = Number.isFinite(Number(configuredMaxAgeMs)) && Number(configuredMaxAgeMs) > 0
+      ? Number(configuredMaxAgeMs)
+      : await getSessionMaxAgeMs();
+    const expiresAt = new Date(Date.now() + maxAgeMs);
+    const sessionMetadata = metadata && typeof metadata === 'object' ? metadata : {};
     await pool.query(
-      'INSERT INTO a_sessions (session_hash, user_id, expires_at, created_by, modified_by) VALUES (?, ?, ?, ?, ?)',
-      [tokenHash, userId, expiresAt, userId, userId]
+      'INSERT INTO a_sessions (session_hash, user_id, ip_address, user_agent, expires_at, created_by, modified_by) VALUES (?, ?, ?, ?, ?, ?, ?)',
+      [tokenHash, userId, String(sessionMetadata.ipAddress || '').slice(0, 255) || null, String(sessionMetadata.userAgent || '').slice(0, 512) || null, expiresAt, userId, userId]
     );
+
+    if (typeof getConfiguredMaxActiveSessions === 'function') {
+      const maxActiveSessions = Number(await getConfiguredMaxActiveSessions());
+      if (Number.isInteger(maxActiveSessions) && maxActiveSessions > 0) {
+        const [sessionRows] = await pool.query(
+          'SELECT id, session_hash FROM a_sessions WHERE user_id = ? AND expires_at > NOW() ORDER BY last_used_at ASC, created_at ASC, id ASC',
+          [userId]
+        );
+        const sessionsToRemove = (sessionRows || []).filter(function (session) {
+          return session.session_hash !== tokenHash;
+        }).slice(0, Math.max(0, sessionRows.length - maxActiveSessions));
+        for (const session of sessionsToRemove) {
+          await pool.query('DELETE FROM a_sessions WHERE id = ? AND user_id = ?', [session.id, userId]);
+        }
+      }
+    }
     return token;
   }
 
@@ -184,6 +220,7 @@ function createSessionService(options) {
     consumeAuthMessageCookie: consumeAuthMessageCookie,
     loadCurrentUser: loadCurrentUser,
     createUserSession: createUserSession,
+    getSessionMaxAgeMs: getSessionMaxAgeMs,
     requireAuth: requireAuth,
     getRequestOrigin: getRequestOrigin
   };

src/web/lib/background-tasks/tasks-scheduled/audit-log-sweep.js

@@ -0,0 +1,34 @@
+const { fetchAppSettings } = require('#src/data/app-settings');
+
+const TASK = {
+  key: 'audit-log-sweep',
+  title: 'Audit log cleanup',
+  category: 'cleanup',
+  intervalMs: 24 * 60 * 60 * 1000
+};
+
+function registerAuditLogSweepTask(options) {
+  const backgroundTaskQueue = options && options.backgroundTaskQueue;
+  const pool = options && options.pool;
+  if (!backgroundTaskQueue || !pool) {
+    throw new Error('registerAuditLogSweepTask requires audit cleanup dependencies.');
+  }
+  backgroundTaskQueue.registerRecurringTask({
+    key: TASK.key,
+    title: TASK.title,
+    category: TASK.category,
+    intervalMs: TASK.intervalMs,
+    metadata: {},
+    run: async function () {
+      const settings = await fetchAppSettings(pool);
+      const retentionDays = Number(settings['audit.retention_days']);
+      if (!Number.isInteger(retentionDays) || retentionDays <= 0) {
+        return;
+      }
+      const cutoff = new Date(Date.now() - retentionDays * 24 * 60 * 60 * 1000);
+      await pool.query('DELETE FROM o_audit_events WHERE occurred_at < ?', [cutoff]);
+    }
+  });
+}
+
+module.exports = { registerAuditLogSweepTask };

src/web/lib/background-tasks/tasks-scheduled/expired-session-sweep.js

@@ -0,0 +1,31 @@
+const TASK = {
+  key: 'expired-session-sweep',
+  title: 'Expired session cleanup',
+  category: 'cleanup',
+  trigger: 'scheduled recurring task, hourly',
+  purpose: 'remove expired authentication sessions and their metadata.',
+  taskType: 'recurring-run',
+  intervalMs: 60 * 60 * 1000
+};
+
+function registerExpiredSessionSweepTask(options) {
+  const backgroundTaskQueue = options && options.backgroundTaskQueue;
+  const pool = options && options.pool;
+
+  if (!backgroundTaskQueue || !pool) {
+    throw new Error('registerExpiredSessionSweepTask requires the session cleanup dependencies.');
+  }
+
+  backgroundTaskQueue.registerRecurringTask({
+    key: TASK.key,
+    title: TASK.title,
+    category: TASK.category,
+    intervalMs: TASK.intervalMs,
+    metadata: {},
+    run: async function () {
+      await pool.query('DELETE FROM a_sessions WHERE expires_at <= NOW()');
+    }
+  });
+}
+
+module.exports = { registerExpiredSessionSweepTask };

src/web/lib/config.js

@@ -9,8 +9,7 @@ function createWebConfig() {
   const bridgeInternalUrl = (process.env.BRIDGE_INTERNAL_URL || 'http://player-bridge:8090').replace(/\/$/, '');
   const webInternalUrl = (process.env.WEB_INTERNAL_URL || `http://127.0.0.1:${Number(process.env.WEB_PORT || 8080)}`).replace(/\/$/, '');
   const sessionCookieName = 'digital_signage_session';
-  const sessionMaxAgeDays = Number(process.env.SESSION_MAX_AGE_DAYS || 14);
-  const sessionMaxAgeMs = (Number.isFinite(sessionMaxAgeDays) && sessionMaxAgeDays > 0 ? sessionMaxAgeDays : 14) * 24 * 60 * 60 * 1000;
+  const sessionMaxAgeMs = 14 * 24 * 60 * 60 * 1000;
   const port = Number(process.env.WEB_PORT || 8080);
   const dataSourceStartupRefreshStaggerMs = Math.max(100, Number(process.env.DATA_SOURCE_STARTUP_REFRESH_STAGGER_MS || 250));
 

src/web/lib/helpers.js

@@ -198,7 +198,6 @@ module.exports = {
   getAuditUserId: getAuditUserId,
   getCanvasSignature: getCanvasSignature,
   fetchPlaylistCanvasId: fetchPlaylistCanvasId,
-  fetchPlaylistCanvasSignature: fetchPlaylistCanvasId,
   fetchScreensByPlaylistId: fetchScreensByPlaylistId,
   fetchScreensBySlideId: fetchScreensBySlideId,
   fetchScreensByTemplateId: fetchScreensByTemplateId,

src/web/middleware.js

@@ -33,6 +33,11 @@ module.exports = function registerMiddleware(app, deps) {
       return next();
     }
 
-    return requireAuth(req, res, next);
+    return requireAuth(req, res, function () {
+      if (req.currentUser && req.currentUser.mustChangePassword && req.path !== '/account' && req.path !== '/account/password' && req.path !== '/account/sessions/revoke' && req.path !== '/logout') {
+        return res.redirect('/account?message=' + encodeURIComponent('Please change your password before continuing.'));
+      }
+      next();
+    });
   });
 };

src/web/middleware/not-found.js

@@ -0,0 +1,9 @@
+// Forward unmatched requests to the shared error-page handler.
+
+module.exports = function registerNotFoundHandler(app) {
+  app.use(function (_req, _res, next) {
+    const error = new Error('Page not found.');
+    error.statusCode = 404;
+    next(error);
+  });
+};

src/web/pages/index.js

@@ -9,6 +9,7 @@ function routePath(...segments) {
 module.exports = {
   renderLoginPage: require(routePath('auth', 'login')),
   renderAccountPage: require(routePath('account', 'password')),
+  renderSettingsPage: require(routePath('settings', 'index')),
   renderAboutPage: require(routePath('settings', 'about', 'index')),
   renderUsersPage: require(routePath('settings', 'users', 'list')),
   renderUsersAddPage: require(routePath('settings', 'users', 'add')),

src/web/public/css/theme-custom.css

@@ -163,6 +163,37 @@
   opacity: 0.8;
 }
 
+.settings-nav-card {
+  position: sticky;
+  top: 1rem;
+}
+
+.settings-section-card h4.text-uppercase {
+  color: var(--bs-emphasis-color) !important;
+  font-size: 0.86rem;
+  font-weight: 700;
+  letter-spacing: 0.04em;
+  margin-top: 0.25rem;
+}
+
+.settings-audit-retention-input {
+  max-width: 18rem;
+}
+
+.settings-audit-category-label {
+  color: var(--bs-secondary-color);
+  font-size: 0.75rem;
+  font-weight: 600;
+  letter-spacing: 0.06em;
+  text-transform: uppercase;
+}
+
+@media (max-width: 991.98px) {
+  .settings-nav-card {
+    position: static;
+  }
+}
+
 .card {
   box-shadow: none;
 }
@@ -263,6 +294,12 @@
   border-bottom-width: 0;
 }
 
+.rbac-permissions-table > thead > tr > * {
+  background-color: var(--bs-tertiary-bg) !important;
+  color: var(--bs-emphasis-color) !important;
+  border-bottom-color: var(--bs-border-color) !important;
+}
+
 .template-designer-form--previewing .region-item [disabled],
 .template-designer-form--previewing .template-details-card [disabled],
 .template-designer-form--previewing .template-options-card [disabled],
@@ -405,6 +442,11 @@
   border-radius: 1rem;
   background: var(--bs-body-bg);
   box-shadow: 0 1rem 2rem rgba(15, 23, 42, 0.18);
+  display: flex;
+  flex-direction: column;
+  gap: 0.75rem;
+  max-height: min(32rem, calc(100vh - 3rem));
+  overflow: hidden;
 }
 
 .announcement-type-picker__menu {
@@ -437,15 +479,61 @@
   align-items: center;
   justify-content: space-between;
   gap: 0.75rem;
-  margin-bottom: 0.75rem;
   font-size: 0.875rem;
   font-weight: 700;
 }
 
+.announcement-icon-picker__search {
+  flex: 0 0 auto;
+}
+
+.announcement-icon-picker__search .input-group-text {
+  background: var(--bs-body-bg);
+  color: var(--bs-secondary-color);
+}
+
+.announcement-icon-picker__section {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+  min-height: 0;
+}
+
+.announcement-icon-picker__section-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 0.75rem;
+  color: var(--bs-secondary-color);
+  font-size: 0.75rem;
+  font-weight: 700;
+  letter-spacing: 0.05em;
+  text-transform: uppercase;
+}
+
+.announcement-icon-picker__section-count {
+  font-size: 0.7rem;
+  letter-spacing: 0;
+  text-transform: none;
+}
+
 .announcement-icon-picker__grid {
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(2.75rem, 1fr));
   gap: 0.5rem;
+  align-content: start;
+}
+
+.announcement-icon-picker__search-grid {
+  max-height: none;
+  overflow: hidden;
+  padding-right: 0;
+}
+
+.announcement-icon-picker__search-empty {
+  color: var(--bs-secondary-color);
+  font-size: 0.875rem;
+  line-height: 1.35;
 }
 
 .announcement-type-picker__grid {
@@ -742,6 +830,10 @@
   overflow: auto;
 }
 
+[data-table-pagination-card] > .card-header {
+  flex: 0 0 auto;
+}
+
 [data-table-pagination-card] > .card-footer {
   margin-top: auto;
   background: var(--bs-body-bg);
@@ -752,6 +844,18 @@
   box-shadow: none;
 }
 
+.account-lock-label-locked {
+  display: none;
+}
+
+.btn-check:checked + label .account-lock-label-unlocked {
+  display: none;
+}
+
+.btn-check:checked + label .account-lock-label-locked {
+  display: inline;
+}
+
 .admin-form-card .card-header {
   background: var(--bs-tertiary-bg);
 }

src/web/public/js/admin/admin-page.js

@@ -441,6 +441,21 @@
         });
       }
 
+      try {
+        form.dispatchEvent(new CustomEvent('web-async-save:success', {
+          bubbles: true,
+          detail: {
+            form: form,
+            response: response,
+            responseText: responseText,
+            responseDocument: responseDocument,
+            submitterValue: submitterValue
+          }
+        }));
+      } catch (_error) {
+        // Ignore event dispatch failures and continue the save flow.
+      }
+
       clearFormDirty(form);
 
       if (submitterValue === 'close' || submitterValue === 'new') {

src/web/public/js/announcements/announcement-form.js

@@ -39,6 +39,63 @@ function setAnnouncementScreenSelection(isSelected) {
   });
 }
 
+function getAnnouncementActionButtonState() {
+  var actionForm = document.getElementById('announcement-action-form');
+  var visibleButton = document.querySelector('button[form="announcement-action-form"]');
+  var actionPath = actionForm ? String(actionForm.getAttribute('action') || '').trim() : '';
+  var isPlay = /\/play$/.test(actionPath);
+  var isActive = !isPlay;
+  var selectedScreenCount = document.querySelectorAll('input[name="screen_ids[]"]:checked').length;
+
+  return {
+    visibleButton: visibleButton,
+    actionForm: actionForm,
+    isActive: isActive,
+    hasTargets: selectedScreenCount > 0,
+    actionDisabled: !isActive && selectedScreenCount === 0,
+    actionLabel: isActive ? 'Stop' : 'Play',
+    actionIcon: isActive ? 'bi-stop-fill' : 'bi-play-fill',
+    actionClassName: !isActive && selectedScreenCount === 0
+      ? 'btn-outline-info'
+      : (isActive ? 'btn-outline-warning' : 'btn-info'),
+    actionDisabledTitle: !isActive && selectedScreenCount === 0
+      ? 'Select at least one screen group to play this announcement.'
+      : '',
+    actionConfirmMessage: isActive
+      ? 'Stop this announcement on the selected screens now?'
+      : 'Send this announcement to the selected screens now?'
+  };
+}
+
+function updateAnnouncementActionButtonState() {
+  var state = getAnnouncementActionButtonState();
+  if (!state.visibleButton) {
+    return;
+  }
+
+  state.visibleButton.className = state.visibleButton.className.replace(/btn-outline-(info|warning|success)|btn-info/g, state.actionClassName);
+  state.visibleButton.disabled = state.actionDisabled;
+  state.visibleButton.setAttribute('aria-disabled', state.actionDisabled ? 'true' : 'false');
+  state.visibleButton.setAttribute('title', state.actionDisabled ? state.actionDisabledTitle : state.actionConfirmMessage);
+  state.visibleButton.setAttribute('aria-label', state.actionLabel);
+
+  var icon = state.visibleButton.querySelector('i.bi');
+  if (icon) {
+    icon.className = 'bi ' + state.actionIcon + ' me-1';
+  }
+
+  var label = state.visibleButton.childNodes.length > 1 ? state.visibleButton.childNodes[state.visibleButton.childNodes.length - 1] : null;
+  if (label && label.nodeType === Node.TEXT_NODE) {
+    label.textContent = state.actionLabel;
+  } else {
+    state.visibleButton.textContent = state.actionLabel;
+  }
+
+  if (state.actionForm) {
+    state.actionForm.setAttribute('data-confirm-message', state.actionConfirmMessage);
+  }
+}
+
 function positionAnnouncementTypePicker() {
   var picker = document.querySelector('[data-announcement-type-picker]');
   var toggle = document.querySelector('[data-announcement-type-picker-toggle]');
@@ -141,125 +198,6 @@ function setAnnouncementTypeValue(typeKey) {
   updateAnnouncementTypePickerSelection();
 }
 
-function updateAnnouncementIconPreview() {
-  var iconSelect = document.getElementById('announcement-icon');
-  var preview = document.querySelector('[data-announcement-icon-preview]');
-  if (!iconSelect || !preview) {
-    return;
-  }
-
-  var selectedOption = iconSelect.options[iconSelect.selectedIndex] || null;
-  var iconKey = selectedOption ? String(selectedOption.value || '').trim().toLowerCase() : '';
-  var label = selectedOption ? String(selectedOption.textContent || selectedOption.label || iconKey).trim() : iconKey;
-
-  preview.className = 'announcement-icon-preview';
-  preview.innerHTML = '<i class="bi bi-' + iconKey + '" aria-hidden="true"></i>';
-  preview.setAttribute('aria-label', label);
-  preview.setAttribute('title', label);
-}
-
-function positionAnnouncementIconPicker() {
-  var picker = document.querySelector('[data-announcement-icon-picker]');
-  var toggle = document.querySelector('[data-announcement-icon-picker-toggle]');
-  var shell = document.querySelector('[data-announcement-icon-picker-shell]');
-  if (!picker || picker.hidden || !toggle || !shell) {
-    return;
-  }
-
-  var padding = 8;
-  var toggleRect = toggle.getBoundingClientRect();
-  var menuRect = picker.getBoundingClientRect();
-  var viewportHeight = window.innerHeight || document.documentElement.clientHeight || toggleRect.bottom;
-  var placementAbove = false;
-  var spaceBelow = viewportHeight - toggleRect.bottom - padding;
-  var spaceAbove = toggleRect.top - padding;
-
-  if (menuRect.height > spaceBelow && spaceAbove > spaceBelow) {
-    placementAbove = true;
-  }
-
-  picker.classList.toggle('is-open-above', placementAbove);
-}
-
-function closeAnnouncementIconPicker() {
-  var picker = document.querySelector('[data-announcement-icon-picker]');
-  var toggle = document.querySelector('[data-announcement-icon-picker-toggle]');
-  if (!picker) {
-    return;
-  }
-
-  picker.hidden = true;
-  picker.classList.remove('is-open-above');
-  if (toggle) {
-    toggle.setAttribute('aria-expanded', 'false');
-  }
-}
-
-function openAnnouncementIconPicker() {
-  var picker = document.querySelector('[data-announcement-icon-picker]');
-  var toggle = document.querySelector('[data-announcement-icon-picker-toggle]');
-  if (!picker) {
-    return;
-  }
-
-  picker.hidden = false;
-  if (toggle) {
-    toggle.setAttribute('aria-expanded', 'true');
-  }
-
-  if (typeof window !== 'undefined' && window.requestAnimationFrame) {
-    window.requestAnimationFrame(positionAnnouncementIconPicker);
-  } else {
-    positionAnnouncementIconPicker();
-  }
-}
-
-function updateAnnouncementIconPickerSelection() {
-  var iconSelect = document.getElementById('announcement-icon');
-  var previewButton = document.querySelector('[data-announcement-icon-picker-toggle]');
-  var picker = document.querySelector('[data-announcement-icon-picker]');
-  if (!iconSelect || !previewButton || !picker) {
-    return;
-  }
-
-  var selectedOption = iconSelect.options[iconSelect.selectedIndex] || null;
-  var selectedValue = selectedOption ? String(selectedOption.value || '').trim().toLowerCase() : '';
-  var label = selectedOption ? String(selectedOption.textContent || selectedOption.label || selectedValue).trim() : selectedValue;
-  var icon = previewButton.querySelector('[data-announcement-icon-picker-icon]');
-  var text = previewButton.querySelector('[data-announcement-icon-picker-label]');
-
-  previewButton.setAttribute('aria-label', label);
-  previewButton.setAttribute('title', label);
-  if (icon) {
-    icon.className = 'bi bi-' + selectedValue;
-  }
-  if (text) {
-    text.textContent = label;
-  }
-
-  picker.querySelectorAll('[data-announcement-icon-option]').forEach(function (button) {
-    var isSelected = String(button.getAttribute('data-icon-key') || '').trim().toLowerCase() === selectedValue;
-    button.classList.toggle('is-selected', isSelected);
-    button.setAttribute('aria-pressed', isSelected ? 'true' : 'false');
-  });
-}
-
-function setAnnouncementIconValue(iconKey) {
-  var iconSelect = document.getElementById('announcement-icon');
-  if (!iconSelect) {
-    return;
-  }
-
-  var normalized = String(iconKey || '').trim().toLowerCase();
-  if (!normalized) {
-    return;
-  }
-
-  iconSelect.value = normalized;
-  updateAnnouncementIconPreview();
-  updateAnnouncementIconPickerSelection();
-}
-
 function initAnnouncementForm() {
   var typeInput = document.getElementById('announcement-type');
   var typePickerToggle = document.querySelector('[data-announcement-type-picker-toggle]');
@@ -270,10 +208,6 @@ function initAnnouncementForm() {
   var colorPicker = document.querySelector('[data-announcement-color-picker-shell]');
   var screenSelectAll = document.querySelector('[data-announcement-screen-select-all]');
   var screenSelectNone = document.querySelector('[data-announcement-screen-select-none]');
-  var iconSelect = document.getElementById('announcement-icon');
-  var iconPickerToggle = document.querySelector('[data-announcement-icon-picker-toggle]');
-  var iconPicker = document.querySelector('[data-announcement-icon-picker]');
-  var iconPickerClose = document.querySelector('[data-announcement-icon-picker-close]');
 
   if (typeInput) {
     updateAnnouncementTypePickerSelection();
@@ -347,44 +281,16 @@ function initAnnouncementForm() {
     });
   }
 
-  if (iconSelect) {
-    iconSelect.addEventListener('change', updateAnnouncementIconPreview);
-    updateAnnouncementIconPreview();
-  }
+  document.addEventListener('web-async-save:success', function (event) {
+    var detail = event && event.detail ? event.detail : null;
+    var form = detail && detail.form ? detail.form : null;
+    if (!form || form.id !== 'announcement-form') {
+      return;
+    }
 
-  if (iconPickerToggle) {
-    iconPickerToggle.addEventListener('click', function (event) {
-      event.preventDefault();
-      var isExpanded = iconPicker && !iconPicker.hidden;
-      if (isExpanded) {
-        closeAnnouncementIconPicker();
-      } else {
-        openAnnouncementIconPicker();
-      }
-    });
-  }
+    updateAnnouncementActionButtonState();
+  });
 
-  if (iconPickerClose) {
-    iconPickerClose.addEventListener('click', function (event) {
-      event.preventDefault();
-      closeAnnouncementIconPicker();
-    });
-  }
-
-  if (iconPicker) {
-    iconPicker.addEventListener('click', function (event) {
-      var button = event.target && event.target.closest ? event.target.closest('[data-announcement-icon-option]') : null;
-      if (!button) {
-        return;
-      }
-
-      event.preventDefault();
-      setAnnouncementIconValue(button.getAttribute('data-icon-key'));
-      closeAnnouncementIconPicker();
-    });
-  }
-
-  window.addEventListener('resize', positionAnnouncementIconPicker);
   window.addEventListener('resize', positionAnnouncementTypePicker);
 
   document.addEventListener('click', function (event) {
@@ -396,20 +302,9 @@ function initAnnouncementForm() {
       }
     }
 
-    var picker = document.querySelector('[data-announcement-icon-picker]');
-    var toggle = document.querySelector('[data-announcement-icon-picker-toggle]');
-    if (!picker || picker.hidden) {
-      return;
-    }
-
-    if (picker.contains(event.target) || (toggle && toggle.contains(event.target))) {
-      return;
-    }
-
-    closeAnnouncementIconPicker();
   });
 
-  updateAnnouncementIconPickerSelection();
+  updateAnnouncementActionButtonState();
 }
 
 if (typeof document !== 'undefined') {

src/web/public/js/icon-picker.js

@@ -0,0 +1,111 @@
+(function () {
+  'use strict';
+
+  function initIconPicker(root) {
+    var select = root.querySelector('select');
+    var toggle = root.querySelector('[data-icon-picker-toggle]');
+    var menu = root.querySelector('[data-icon-picker-menu]');
+    var preview = root.querySelector('[data-icon-picker-preview]');
+    var label = root.querySelector('[data-icon-picker-label]');
+    var search = root.querySelector('[data-icon-picker-search]');
+    var close = root.querySelector('[data-icon-picker-close]');
+    var grid = root.querySelector('[data-icon-picker-grid]');
+    var empty = root.querySelector('[data-icon-picker-empty]');
+    var initialOptions = Array.prototype.slice.call(root.querySelectorAll('[data-icon-picker-option]'));
+
+    if (!select || !toggle || !menu || !grid) {
+      return;
+    }
+
+    function catalogOptions() {
+      return Array.prototype.slice.call(select.options).map(function (option) {
+        return { value: option.value, label: option.textContent || option.label || option.value };
+      });
+    }
+
+    function createOption(option, selectedValue) {
+      var button = document.createElement('button');
+      button.type = 'button';
+      button.className = 'announcement-icon-picker__option';
+      button.setAttribute('data-icon-picker-option', '');
+      button.setAttribute('data-icon-key', option.value);
+      button.setAttribute('data-icon-label', option.label);
+      button.setAttribute('aria-pressed', option.value === selectedValue ? 'true' : 'false');
+      button.title = option.label;
+      button.innerHTML = '<i class="bi bi-' + option.value + '" aria-hidden="true"></i><span class="visually-hidden">' + option.label + '</span>';
+      return button;
+    }
+
+    function getOptionLimit() {
+      var firstOption = grid.querySelector('[data-icon-picker-option]');
+      var gridStyle = window.getComputedStyle(grid);
+      var gap = parseFloat(gridStyle.columnGap || gridStyle.gap || '0') || 0;
+      var optionWidth = firstOption ? firstOption.getBoundingClientRect().width : 0;
+      var columns = optionWidth && grid.clientWidth
+        ? Math.max(1, Math.floor((grid.clientWidth + gap) / (optionWidth + gap)))
+        : 4;
+      return columns * 6;
+    }
+
+    function updatePreview() {
+      var option = select.options[select.selectedIndex];
+      var value = option ? option.value : '';
+      if (preview) {
+        preview.className = 'announcement-icon-picker__toggle-icon bi bi-' + value;
+      }
+      if (label) {
+        label.textContent = option ? option.textContent : 'Select an icon';
+      }
+      root.querySelectorAll('[data-icon-picker-option]').forEach(function (optionButton) {
+        var selected = optionButton.getAttribute('data-icon-key') === value;
+        optionButton.classList.toggle('is-selected', selected);
+        optionButton.setAttribute('aria-pressed', selected ? 'true' : 'false');
+      });
+    }
+
+    function render(query) {
+      var normalizedQuery = String(query || '').trim().toLowerCase();
+      var selectedValue = String(select.value || '').trim();
+      var options = normalizedQuery
+        ? catalogOptions().filter(function (option) { return (option.value + ' ' + option.label).toLowerCase().indexOf(normalizedQuery) !== -1; })
+        : initialOptions.map(function (option) { return { value: option.getAttribute('data-icon-key') || '', label: option.getAttribute('data-icon-label') || '' }; });
+      var visibleOptions = options.slice(0, getOptionLimit());
+      grid.innerHTML = '';
+      visibleOptions.forEach(function (option) { grid.appendChild(createOption(option, selectedValue)); });
+      if (empty) empty.hidden = options.length > 0;
+      updatePreview();
+    }
+
+    function closeMenu() {
+      menu.hidden = true;
+      toggle.setAttribute('aria-expanded', 'false');
+    }
+
+    toggle.addEventListener('click', function (event) {
+      event.preventDefault();
+      menu.hidden = !menu.hidden;
+      toggle.setAttribute('aria-expanded', menu.hidden ? 'false' : 'true');
+      if (!menu.hidden) {
+        render(search ? search.value : '');
+        if (search) search.focus();
+      }
+    });
+    if (close) close.addEventListener('click', function (event) { event.preventDefault(); closeMenu(); });
+    grid.addEventListener('click', function (event) {
+      var option = event.target.closest ? event.target.closest('[data-icon-picker-option]') : null;
+      if (!option) return;
+      select.value = option.getAttribute('data-icon-key') || '';
+      select.dispatchEvent(new Event('change', { bubbles: true }));
+      closeMenu();
+    });
+    if (search) search.addEventListener('input', function () { render(search.value); });
+    select.addEventListener('change', updatePreview);
+    document.addEventListener('click', function (event) {
+      if (!menu.hidden && !root.contains(event.target)) closeMenu();
+    });
+    updatePreview();
+  }
+
+  window.PulseIconPicker = { init: initIconPicker };
+  document.querySelectorAll('[data-icon-picker]').forEach(initIconPicker);
+}());

src/web/public/js/playlists/playlist-schedule.js

@@ -1665,6 +1665,7 @@
     var slidePickerSlides = [];
     var lastDurationPointerDown = null;
     var lastDurationPointerUp = null;
+    var defaultSlideDuration = Number(tbody.getAttribute('data-default-slide-duration')) || 10;
 
     if (!tbody || !form) {
       return;
@@ -1961,8 +1962,8 @@
           videoDurationSeconds: slide.videoDurationSeconds,
           disableAudio: slide.disableAudio,
           title: slide.title || 'Slide',
-          duration_seconds: 10,
-          durationSeconds: 10,
+          duration_seconds: defaultSlideDuration,
+          durationSeconds: defaultSlideDuration,
           scheduleRules: [],
           summary: 'Always visible'
         });

src/web/public/js/rbac-permissions.js

@@ -105,6 +105,13 @@
     return document.querySelector('[data-permission-row-id="' + targetId + '"]');
   }
 
+  function markPermissionFormDirty(control) {
+    var form = control && (control.form || (typeof control.closest === 'function' ? control.closest('form') : null));
+    if (form && form.dataset) {
+      form.dataset.dirty = 'true';
+    }
+  }
+
   function handleRowChange(event) {
     var checkbox = event.target && event.target.matches ? event.target : null;
     if (!checkbox || checkbox.tagName !== 'INPUT' || checkbox.type !== 'checkbox') {
@@ -162,6 +169,7 @@
 
       if (control.hasAttribute('data-permission-row-toggle')) {
         toggleRowCheckboxes(findPermissionRow(targetId));
+        markPermissionFormDirty(control);
       }
     });
 

src/web/public/js/regions/type/image.js

@@ -76,17 +76,31 @@
 
   function buildEditorCardContext(context) {
     var defaultConfig = context && context.uploadConfig ? context.uploadConfig : {};
+    var configuredTypes = Array.isArray(context && context.uploadMimeTypes)
+      ? context.uploadMimeTypes.filter(function (mimeType) { return String(mimeType || '').indexOf('image/') === 0; })
+      : [];
+    var accept = configuredTypes.length
+      ? configuredTypes
+      : (Array.isArray(defaultConfig.accept) ? defaultConfig.accept : ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/svg+xml']);
+    var acceptLabels = accept.map(function (mimeType) {
+      var subtype = String(mimeType).split('/')[1] || '';
+      return subtype === 'jpeg' ? 'JPG' : subtype === 'svg+xml' ? 'SVG' : subtype.toUpperCase();
+    });
+    var acceptLabel = acceptLabels.length > 1
+      ? acceptLabels.slice(0, -1).join(', ') + ' or ' + acceptLabels[acceptLabels.length - 1]
+      : (acceptLabels[0] || 'supported image');
     return {
       region: context.region,
       current: String(context.current || ''),
       regionRatio: String(context.regionRatio || '1:1'),
       uploadConfig: {
-        accept: Array.isArray(defaultConfig.accept) ? defaultConfig.accept : ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/svg+xml'],
-        limitBytes: defaultConfig.limitBytes,
+        accept: accept,
+        limitBytes: defaultConfig.limitBytes || context.uploadMaxBytes,
         limitLabel: defaultConfig.limitLabel || context.uploadMaxLabel || '100 MB',
-        helpText: defaultConfig.helpText || 'PNG, JPG, GIF, WebP, or SVG'
+        helpText: defaultConfig.helpText || acceptLabel
       },
-      uploadMaxLabel: context.uploadMaxLabel || '100 MB'
+      uploadMaxLabel: context.uploadMaxLabel || '100 MB',
+      uploadMimeTypes: context.uploadMimeTypes || []
     };
   }
 
@@ -108,10 +122,17 @@
 
     var uploadConfig = context.uploadConfig || {};
     var accept = uploadConfig.accept || ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/svg+xml'];
+    var acceptLabels = accept.map(function (mimeType) {
+      var subtype = String(mimeType).split('/')[1] || '';
+      return subtype === 'jpeg' ? 'JPG' : subtype === 'svg+xml' ? 'SVG' : subtype.toUpperCase();
+    });
+    var acceptLabel = acceptLabels.length > 1
+      ? acceptLabels.slice(0, -1).join(', ') + (acceptLabels.length > 2 ? ', or ' : ' or ') + acceptLabels[acceptLabels.length - 1]
+      : (acceptLabels[0] || 'supported image');
     var limitBytes = Number(uploadConfig.limitBytes || 100 * 1024 * 1024);
 
     if (!utils.fileMatchesAccept || !utils.fileMatchesAccept(context.file, accept)) {
-      showUploadWarning('This image region accepts PNG, JPG, GIF, WebP, or SVG files.');
+      showUploadWarning('This image region accepts ' + acceptLabel + ' files.');
       return false;
     }
 
@@ -133,7 +154,7 @@
 
       return {
         accept: ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/svg+xml'],
-        limitBytes: defaultConfig.limitBytes,
+        limitBytes: defaultConfig.limitBytes || context.uploadMaxBytes,
         limitLabel: defaultConfig.limitLabel,
         helpText: 'PNG, JPG, GIF, WebP, or SVG'
       };

src/web/public/js/regions/type/video.js

@@ -82,17 +82,30 @@
 
   function buildEditorCardContext(context) {
     var defaultConfig = context && context.uploadConfig ? context.uploadConfig : {};
+    var configuredTypes = Array.isArray(context && context.uploadMimeTypes)
+      ? context.uploadMimeTypes.filter(function (mimeType) { return String(mimeType || '').indexOf('video/') === 0; })
+      : [];
+    var accept = configuredTypes.length
+      ? configuredTypes
+      : (Array.isArray(defaultConfig.accept) ? defaultConfig.accept : ['video/mp4', 'video/webm', 'video/ogg']);
+    var acceptLabels = accept.map(function (mimeType) {
+      return (String(mimeType).split('/')[1] || '').toUpperCase();
+    });
+    var acceptLabel = acceptLabels.length > 1
+      ? acceptLabels.slice(0, -1).join(', ') + ' or ' + acceptLabels[acceptLabels.length - 1]
+      : (acceptLabels[0] || 'supported video');
     return {
       region: context.region,
       current: String(context.current || ''),
       currentDuration: String(context.currentDuration || ''),
       uploadConfig: {
-        accept: Array.isArray(defaultConfig.accept) ? defaultConfig.accept : ['video/mp4', 'video/webm', 'video/ogg'],
-        limitBytes: defaultConfig.limitBytes,
+        accept: accept,
+        limitBytes: defaultConfig.limitBytes || context.uploadVideoMaxBytes,
         limitLabel: defaultConfig.limitLabel || context.uploadVideoMaxLabel || '1 GB',
-        helpText: defaultConfig.helpText || 'MP4, WebM, or Ogg'
+        helpText: defaultConfig.helpText || acceptLabel
       },
-      uploadVideoMaxLabel: context.uploadVideoMaxLabel || '1 GB'
+      uploadVideoMaxLabel: context.uploadVideoMaxLabel || '1 GB',
+      uploadMimeTypes: context.uploadMimeTypes || []
     };
   }
 
@@ -114,10 +127,16 @@
 
     var uploadConfig = context.uploadConfig || {};
     var accept = uploadConfig.accept || ['video/mp4', 'video/webm', 'video/ogg'];
+    var acceptLabels = accept.map(function (mimeType) {
+      return (String(mimeType).split('/')[1] || '').toUpperCase();
+    });
+    var acceptLabel = acceptLabels.length > 1
+      ? acceptLabels.slice(0, -1).join(', ') + (acceptLabels.length > 2 ? ', or ' : ' or ') + acceptLabels[acceptLabels.length - 1]
+      : (acceptLabels[0] || 'supported video');
     var limitBytes = Number(uploadConfig.limitBytes || 1024 * 1024 * 1024);
 
     if (!utils.fileMatchesAccept || !utils.fileMatchesAccept(context.file, accept)) {
-      showUploadWarning('This video region accepts MP4, WebM, or Ogg files.');
+      showUploadWarning('This video region accepts ' + acceptLabel + ' files.');
       return false;
     }
 
@@ -163,7 +182,7 @@
 
       return {
         accept: ['video/mp4', 'video/webm', 'video/ogg'],
-        limitBytes: defaultConfig.limitBytes,
+        limitBytes: defaultConfig.limitBytes || context.uploadVideoMaxBytes,
         limitLabel: defaultConfig.limitLabel,
         helpText: 'MP4, WebM, or Ogg'
       };

src/web/public/js/settings/settings-page.js

@@ -0,0 +1,392 @@
+(function () {
+  'use strict';
+
+  function initIconSuggestions() {
+    var searchInput = document.querySelector('[data-icon-suggestions-search]');
+    var countNode = document.querySelector('[data-icon-suggestions-count]');
+    var selectedList = document.querySelector('[data-selected-icon-list]');
+    var noSelectedNode = document.querySelector('[data-no-selected-icons]');
+    var addButton = document.querySelector('[data-add-icon-button]');
+    var iconForm = document.querySelector('[data-settings-form="icons"]');
+    var options = Array.prototype.slice.call(document.querySelectorAll('[data-icon-suggestion-option]'));
+    var maxSelected = 48;
+    var draggedItem = null;
+    var initialOrder = [];
+
+    if (!searchInput || !countNode || !selectedList || !options.length) {
+      return;
+    }
+
+    function getOptionByKey(key) {
+      return options.find(function (option) {
+        var checkbox = option.querySelector('[data-icon-picker-checkbox]');
+        return checkbox && checkbox.value === key;
+      }) || null;
+    }
+
+    function getCheckedKeys() {
+      return options.filter(function (option) {
+        var checkbox = option.querySelector('[data-icon-picker-checkbox]');
+        return checkbox && checkbox.checked;
+      }).map(function (option) {
+        return option.querySelector('[data-icon-picker-checkbox]').value;
+      });
+    }
+
+    function getSelectedOrder() {
+      return Array.prototype.slice.call(selectedList.querySelectorAll('[data-selected-icon-item]')).map(function (item) {
+        return item.getAttribute('data-icon-key');
+      });
+    }
+
+    function createSelectedItem(key) {
+      var option = getOptionByKey(key);
+      var checkbox = option && option.querySelector('[data-icon-picker-checkbox]');
+      if (!option || !checkbox) {
+        return null;
+      }
+
+      var item = document.createElement('div');
+      var content = document.createElement('div');
+      var dragButton = document.createElement('button');
+      var dragIcon = document.createElement('i');
+      var icon = document.createElement('i');
+      var label = document.createElement('span');
+      var hiddenInput = document.createElement('input');
+      var removeButton = document.createElement('button');
+      var removeIcon = document.createElement('i');
+      var iconLabel = String(option.getAttribute('data-icon-label') || key);
+
+      item.className = 'col-12 col-sm-6 col-xl-3';
+      content.className = 'd-flex align-items-center gap-2 border rounded p-2 h-100';
+      item.draggable = true;
+      item.setAttribute('data-selected-icon-item', '');
+      item.setAttribute('data-icon-key', key);
+
+      dragButton.type = 'button';
+      dragButton.className = 'btn btn-link text-body-secondary p-1';
+      dragButton.setAttribute('data-drag-icon', '');
+      dragButton.title = 'Drag to reorder';
+      dragButton.setAttribute('aria-label', 'Drag ' + iconLabel + ' to reorder');
+      dragIcon.className = 'bi bi-grip-vertical';
+      dragIcon.setAttribute('aria-hidden', 'true');
+      dragButton.appendChild(dragIcon);
+
+      icon.className = 'bi bi-' + key + ' fs-5 text-primary';
+      icon.setAttribute('aria-hidden', 'true');
+      label.className = 'flex-grow-1';
+      label.textContent = iconLabel;
+
+      hiddenInput.type = 'hidden';
+      hiddenInput.name = 'suggested_icons[]';
+      hiddenInput.value = key;
+      hiddenInput.setAttribute('data-ordered-icon-input', '');
+
+      removeButton.type = 'button';
+      removeButton.className = 'btn btn-link text-danger p-1';
+      removeButton.setAttribute('data-remove-icon', '');
+      removeButton.title = 'Remove ' + iconLabel;
+      removeButton.setAttribute('aria-label', 'Remove ' + iconLabel);
+      removeIcon.className = 'bi bi-x-lg';
+      removeIcon.setAttribute('aria-hidden', 'true');
+      removeButton.appendChild(removeIcon);
+
+      content.appendChild(dragButton);
+      content.appendChild(icon);
+      content.appendChild(label);
+      content.appendChild(hiddenInput);
+      content.appendChild(removeButton);
+      item.appendChild(content);
+      return item;
+    }
+
+    function renderSelectedItems(order) {
+      selectedList.querySelectorAll('[data-selected-icon-item]').forEach(function (item) {
+        item.remove();
+      });
+      order.forEach(function (key) {
+        var item = createSelectedItem(key);
+        if (item) {
+          selectedList.insertBefore(item, noSelectedNode);
+        }
+      });
+    }
+
+    function syncSelectionState() {
+      var checkedKeys = getCheckedKeys();
+      var checkedSet = new Set(checkedKeys);
+      var currentOrder = getSelectedOrder().filter(function (key) {
+        return checkedSet.has(key);
+      });
+      checkedKeys.forEach(function (key) {
+        if (currentOrder.indexOf(key) === -1) {
+          currentOrder.push(key);
+        }
+      });
+      renderSelectedItems(currentOrder);
+      countNode.textContent = String(currentOrder.length);
+      if (noSelectedNode) {
+        noSelectedNode.hidden = currentOrder.length > 0;
+      }
+      if (addButton) {
+        addButton.disabled = currentOrder.length >= maxSelected;
+        addButton.setAttribute('aria-disabled', addButton.disabled ? 'true' : 'false');
+      }
+      options.forEach(function (option) {
+        var checkbox = option.querySelector('[data-icon-picker-checkbox]');
+        if (checkbox) {
+          checkbox.disabled = !checkbox.checked && currentOrder.length >= maxSelected;
+        }
+      });
+    }
+
+    function resetIconForm() {
+      var initialSet = new Set(initialOrder);
+      options.forEach(function (option) {
+        var checkbox = option.querySelector('[data-icon-picker-checkbox]');
+        if (checkbox) {
+          checkbox.checked = initialSet.has(checkbox.value);
+        }
+      });
+      renderSelectedItems(initialOrder.slice());
+      syncSelectionState();
+      if (iconForm) {
+        iconForm.dataset.dirty = 'false';
+      }
+    }
+
+    function markIconFormDirty() {
+      if (iconForm) {
+        iconForm.dataset.dirty = 'true';
+      }
+    }
+
+    function filterOptions() {
+      var query = String(searchInput.value || '').trim().toLowerCase();
+      options.forEach(function (option) {
+        var label = String(option.getAttribute('data-icon-label') || '').toLowerCase();
+        option.hidden = Boolean(query && label.indexOf(query) === -1);
+      });
+    }
+
+    options.forEach(function (option) {
+      var checkbox = option.querySelector('[data-icon-picker-checkbox]');
+      if (checkbox) {
+        checkbox.addEventListener('change', function () {
+          markIconFormDirty();
+          syncSelectionState();
+        });
+      }
+    });
+
+    selectedList.addEventListener('click', function (event) {
+      var removeButton = event.target.closest ? event.target.closest('[data-remove-icon]') : null;
+      if (!removeButton) {
+        return;
+      }
+      var item = removeButton.closest('[data-selected-icon-item]');
+      var key = item && item.getAttribute('data-icon-key');
+      var option = getOptionByKey(key);
+      var checkbox = option && option.querySelector('[data-icon-picker-checkbox]');
+      if (checkbox) {
+        checkbox.checked = false;
+      }
+      markIconFormDirty();
+      syncSelectionState();
+    });
+
+    selectedList.addEventListener('dragstart', function (event) {
+      var item = event.target.closest ? event.target.closest('[data-selected-icon-item]') : null;
+      if (!item) {
+        return;
+      }
+      draggedItem = item;
+      item.classList.add('opacity-50');
+      event.dataTransfer.effectAllowed = 'move';
+      event.dataTransfer.setData('text/plain', item.getAttribute('data-icon-key') || '');
+    });
+
+    selectedList.addEventListener('dragover', function (event) {
+      if (!draggedItem) {
+        return;
+      }
+      event.preventDefault();
+      var target = event.target.closest ? event.target.closest('[data-selected-icon-item]') : null;
+      if (!target || target === draggedItem) {
+        return;
+      }
+      var bounds = target.getBoundingClientRect();
+      var insertBefore = event.clientY < bounds.top + bounds.height / 2;
+      selectedList.insertBefore(draggedItem, insertBefore ? target : target.nextSibling);
+    });
+
+    selectedList.addEventListener('dragend', function () {
+      if (!draggedItem) {
+        return;
+      }
+      draggedItem.classList.remove('opacity-50');
+      draggedItem = null;
+      markIconFormDirty();
+      syncSelectionState();
+    });
+
+    searchInput.addEventListener('input', filterOptions);
+    syncSelectionState();
+    initialOrder = getSelectedOrder();
+    document.addEventListener('settings:reset', resetIconForm);
+  }
+
+  function initDefaultAnnouncementIconPicker() {
+    return;
+    var shell = document.querySelector('[data-settings-default-icon-picker]');
+    if (!shell) return;
+    var select = shell.querySelector('select');
+    var toggle = shell.querySelector('[data-settings-default-icon-toggle]');
+    var menu = shell.querySelector('[data-settings-default-icon-menu]');
+    var preview = shell.querySelector('[data-settings-default-icon-preview]');
+    var label = shell.querySelector('[data-settings-default-icon-label]');
+    var search = shell.querySelector('[data-settings-default-icon-search]');
+    var empty = shell.querySelector('[data-settings-default-icon-empty]');
+    var options = Array.prototype.slice.call(shell.querySelectorAll('[data-settings-default-icon-option]'));
+
+    function getCatalogOptions() {
+      return Array.prototype.slice.call(select.options).map(function (option) {
+        return { value: option.value, label: option.textContent || option.label || option.value };
+      });
+    }
+
+    function createOption(option, selectedValue) {
+      var item = document.createElement('button');
+      item.type = 'button';
+      item.className = 'announcement-icon-picker__option';
+      item.setAttribute('data-settings-default-icon-option', '');
+      item.setAttribute('data-icon-key', option.value);
+      item.setAttribute('data-icon-label', option.label);
+      item.setAttribute('data-icon-search-terms', option.value + ' ' + option.label);
+      item.setAttribute('aria-pressed', option.value === selectedValue ? 'true' : 'false');
+      item.title = option.label;
+      item.innerHTML = '<i class="bi bi-' + option.value + '" aria-hidden="true"></i><span class="visually-hidden">' + option.label + '</span>';
+      return item;
+    }
+
+    function renderOptions(query) {
+      var normalizedQuery = String(query || '').trim().toLowerCase();
+      var selectedValue = String(select.value || '').trim();
+      var sourceOptions = normalizedQuery ? getCatalogOptions().filter(function (option) {
+        return (option.value + ' ' + option.label).toLowerCase().indexOf(normalizedQuery) !== -1;
+      }) : options.map(function (option) {
+        return { value: option.getAttribute('data-icon-key') || '', label: option.getAttribute('data-icon-label') || '' };
+      });
+      var grid = shell.querySelector('[data-settings-default-icon-grid]');
+      grid.innerHTML = '';
+      sourceOptions.forEach(function (option) {
+        grid.appendChild(createOption(option, selectedValue));
+      });
+      options = Array.prototype.slice.call(grid.querySelectorAll('[data-settings-default-icon-option]'));
+      options.forEach(bindOption);
+      empty.hidden = Boolean(sourceOptions.length);
+    }
+
+    function bindOption(item) {
+      item.addEventListener('click', function () {
+        select.value = item.getAttribute('data-icon-key') || '';
+        select.dispatchEvent(new Event('change', { bubbles: true }));
+        menu.hidden = true;
+        toggle.setAttribute('aria-expanded', 'false');
+      });
+    }
+
+    function render() {
+      var option = select.options[select.selectedIndex];
+      var key = option ? option.value : '';
+      var text = option ? option.textContent : 'Select an icon';
+      preview.className = 'announcement-icon-picker__toggle-icon bi bi-' + key;
+      if (label) label.textContent = text;
+      options.forEach(function (item) {
+        item.classList.toggle('is-selected', item.getAttribute('data-icon-key') === key);
+      });
+    }
+    toggle.addEventListener('click', function () {
+      menu.hidden = !menu.hidden;
+      toggle.setAttribute('aria-expanded', menu.hidden ? 'false' : 'true');
+      if (!menu.hidden && search) search.focus();
+    });
+    shell.querySelector('[data-settings-default-icon-close]').addEventListener('click', function () {
+      menu.hidden = true;
+      toggle.setAttribute('aria-expanded', 'false');
+    });
+    options.forEach(bindOption);
+    if (search) search.addEventListener('input', function () {
+      renderOptions(search.value);
+    });
+    select.addEventListener('change', render);
+    render();
+  }
+
+  function initSettingsSectionNavigation() {
+    var links = Array.prototype.slice.call(document.querySelectorAll('[data-settings-section-link]'));
+    var sections = Array.prototype.slice.call(document.querySelectorAll('[data-settings-section]'));
+    if (!links.length || !sections.length) {
+      return;
+    }
+
+    function setActiveSection(sectionId) {
+      links.forEach(function (link) {
+        var isActive = link.getAttribute('href') === '#' + sectionId;
+        link.classList.toggle('active', isActive);
+        link.setAttribute('aria-current', isActive ? 'page' : 'false');
+      });
+      sections.forEach(function (section) {
+        section.hidden = section.id !== sectionId;
+      });
+    }
+
+    function hasDirtySettingsForm() {
+      return Array.prototype.some.call(document.querySelectorAll('[data-settings-form]'), function (form) {
+        return form.dataset && form.dataset.dirty === 'true';
+      });
+    }
+
+    function resetSettingsForms() {
+      document.querySelectorAll('[data-settings-form]').forEach(function (form) {
+        if (typeof form.reset === 'function') {
+          form.reset();
+        }
+        form.dataset.dirty = 'false';
+      });
+      document.dispatchEvent(new CustomEvent('settings:reset'));
+    }
+
+    links.forEach(function (link) {
+      link.addEventListener('click', function (event) {
+        var target = document.getElementById(String(link.getAttribute('href') || '').replace(/^#/, ''));
+        if (!target) {
+          return;
+        }
+        var currentSection = sections.find(function (section) { return !section.hidden; });
+        if (currentSection && target.id !== currentSection.id && hasDirtySettingsForm()) {
+          if (!window.confirm('You have unsaved settings. Switch sections anyway?')) {
+            event.preventDefault();
+            return;
+          }
+          resetSettingsForms();
+        }
+        event.preventDefault();
+        setActiveSection(target.id);
+        window.history.replaceState(null, '', '#' + target.id);
+      });
+    });
+
+    var hashSectionId = String(window.location.hash || '').replace(/^#/, '');
+    var initialSection = sections.some(function (section) {
+      return section.id === hashSectionId;
+    }) ? hashSectionId : sections[0].id;
+    setActiveSection(initialSection);
+  }
+
+  document.addEventListener('DOMContentLoaded', function () {
+    initIconSuggestions();
+    initDefaultAnnouncementIconPicker();
+    initSettingsSectionNavigation();
+  });
+}());

src/web/public/js/slides/slide-form-editor.js

@@ -3,6 +3,7 @@ export function createSlideFormEditorController(options) {
   var templateFields = settings.templateFields || null;
   var templateSelectorLock = settings.templateSelectorLock || null;
   var requestPreviewRender = typeof settings.requestPreviewRender === 'function' ? settings.requestPreviewRender : function () {};
+  var markFormDirty = typeof settings.markFormDirty === 'function' ? settings.markFormDirty : function () {};
   var defaultFontSize = Math.max(1, Number(settings.defaultFontSize || 32));
   var fontFamilyFormats = String(settings.fontFamilyFormats || '').trim();
   var fontStylesheetHref = String(settings.fontStylesheetHref || '').trim();
@@ -17,8 +18,16 @@ export function createSlideFormEditorController(options) {
   var imageUploadMaxBytes = Math.max(1, Number(settings.imageUploadMaxBytes || 2 * 1024 * 1024));
   var imageUploadLimitLabel = String(settings.imageUploadLimitLabel || '').trim() || Math.max(1, Math.round(imageUploadMaxBytes / (1024 * 1024))) + ' MB';
   var imageUploadContext = String(settings.imageUploadContext || 'wysiwyg').trim() || 'wysiwyg';
-  var imageUploadAllowedExtensions = ['png', 'jpg', 'jpeg', 'gif', 'webp', 'svg'];
-  var imageUploadAllowedMimeTypes = ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/svg+xml'];
+  var configuredImageMimeTypes = Array.isArray(settings.uploadMimeTypes)
+    ? settings.uploadMimeTypes.filter(function (mimeType) { return String(mimeType || '').indexOf('image/') === 0; })
+    : [];
+  var imageUploadAllowedMimeTypes = configuredImageMimeTypes.length
+    ? configuredImageMimeTypes
+    : ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/svg+xml'];
+  var imageUploadAllowedExtensions = imageUploadAllowedMimeTypes.map(function (mimeType) {
+    var subtype = String(mimeType).split('/')[1] || '';
+    return subtype === 'jpeg' ? 'jpg' : subtype === 'svg+xml' ? 'svg' : subtype;
+  });
   var imageUploadFileTypes = imageUploadAllowedExtensions.join(',');
   var wysiwygEditorHeightStep = Math.max(1, Number(settings.wysiwygEditorHeightStep || 80));
   var wysiwygEditorHeightMin = Math.max(1, Number(settings.wysiwygEditorHeightMin || 240));
@@ -542,6 +551,9 @@ export function createSlideFormEditorController(options) {
     ['change', 'keyup', 'undo', 'redo', 'Paste', 'input'].forEach(function (eventName) {
       editor.on(eventName, function () {
         syncState(true);
+        if (hydrated) {
+          markFormDirty();
+        }
       });
     });
   }

src/web/public/js/slides/slide-form-regions.js

@@ -30,6 +30,9 @@ export function createSlideFormRegionHelpers(options) {
   var defaultFontSize = Math.max(1, Number(settings.defaultFontSize || 32));
   var uploadMaxLabel = String(settings.uploadMaxLabel || '100 MB');
   var uploadVideoMaxLabel = String(settings.uploadVideoMaxLabel || '1 GB');
+  var uploadMaxBytes = Number(settings.uploadMaxBytes || 100 * 1024 * 1024);
+  var uploadVideoMaxBytes = Number(settings.uploadVideoMaxBytes || 1024 * 1024 * 1024);
+  var uploadMimeTypes = Array.isArray(settings.uploadMimeTypes) ? settings.uploadMimeTypes : [];
 
   function sanitizeFontSize(value) {
     var raw = String(value || '').trim().toLowerCase();
@@ -539,6 +542,9 @@ export function createSlideFormRegionHelpers(options) {
         regionRatio: reduceAspectRatio(region.width, region.height),
         uploadMaxLabel: uploadMaxLabel,
         uploadVideoMaxLabel: uploadVideoMaxLabel,
+        uploadMaxBytes: uploadMaxBytes,
+        uploadVideoMaxBytes: uploadVideoMaxBytes,
+        uploadMimeTypes: uploadMimeTypes,
         disableAudio: (existingContent[region.region_key] || {}).disable_audio,
         config: region.region_type === 'api' ? getCurrentApiConfig(region) : region.region_type === 'timetable' ? getCurrentTimetableConfig(region) : getCurrentRssConfig(region),
         style: getCurrentTextStyle(region),
@@ -579,6 +585,9 @@ export function createSlideFormRegionHelpers(options) {
       regionRatio: reduceAspectRatio(region.width, region.height),
       uploadMaxLabel: uploadMaxLabel,
       uploadVideoMaxLabel: uploadVideoMaxLabel,
+      uploadMaxBytes: uploadMaxBytes,
+      uploadVideoMaxBytes: uploadVideoMaxBytes,
+      uploadMimeTypes: uploadMimeTypes,
       disableAudio: currentContent.disable_audio,
       config: region.region_type === 'api' ? apiConfig : region.region_type === 'timetable' ? getCurrentTimetableConfig(region) : rssConfig,
       style: textStyle,

src/web/public/js/slides/slide-form.js

@@ -6,6 +6,14 @@ import { createSlideFormPreviewHelpers } from '/assets/js/slides/slide-form-prev
 (function () {
   var DEFAULT_FONT_SIZE = 32;
 
+  function formatUploadLimitLabel(bytes) {
+    var megabytes = Number(bytes || 0) / 1024 / 1024;
+    if (megabytes >= 1024 && megabytes % 1024 === 0) {
+      return String(megabytes / 1024) + ' GB';
+    }
+    return (Number.isInteger(megabytes) ? String(megabytes) : megabytes.toFixed(2).replace(/0+$/, '').replace(/\.$/, '')) + ' MB';
+  }
+
   var dataElement = document.getElementById('slide-editor-data');
   if (!dataElement) {
     return;
@@ -37,12 +45,14 @@ import { createSlideFormPreviewHelpers } from '/assets/js/slides/slide-form-prev
   var slidePreviewEmpty = document.getElementById('slide-preview-empty');
   var slidePreviewOverlay = document.getElementById('slide-preview-overlay');
   var openPreviewPopupButton = document.getElementById('open-preview-popup');
-  var uploadMaxBytes = 100 * 1024 * 1024;
-  var uploadMaxLabel = '100 MB';
-  var uploadVideoMaxBytes = 1024 * 1024 * 1024;
-  var uploadVideoMaxLabel = '1 GB';
-  var wysiwygImageUploadMaxBytes = 2 * 1024 * 1024;
-  var wysiwygImageUploadLimitLabel = '2 MB';
+  var uploadLimits = slideEditorData.uploadLimits || {};
+  var uploadMaxBytes = Number(uploadLimits.imageMaxBytes || 100 * 1024 * 1024);
+  var uploadMaxLabel = formatUploadLimitLabel(uploadMaxBytes);
+  var uploadVideoMaxBytes = Number(uploadLimits.videoMaxBytes || 1024 * 1024 * 1024);
+  var uploadVideoMaxLabel = formatUploadLimitLabel(uploadVideoMaxBytes);
+  var wysiwygImageUploadMaxBytes = Number(uploadLimits.wysiwygImageMaxBytes || 2 * 1024 * 1024);
+  var wysiwygImageUploadLimitLabel = formatUploadLimitLabel(wysiwygImageUploadMaxBytes);
+  var uploadMimeTypes = Array.isArray(uploadLimits.allowedMimeTypes) ? uploadLimits.allowedMimeTypes : [];
   var videoDurationCache = Object.create(null);
   var previewRenderFrame = 0;
   var previewPopupWindow = null;
@@ -111,7 +121,11 @@ import { createSlideFormPreviewHelpers } from '/assets/js/slides/slide-form-prev
     imageUploadMaxBytes: wysiwygImageUploadMaxBytes,
     imageUploadLimitLabel: wysiwygImageUploadLimitLabel,
     imageUploadContext: 'wysiwyg',
+    uploadMimeTypes: uploadMimeTypes,
     getRegionTypeModule: getRegionTypeModule,
+    markFormDirty: function () {
+      slideForm.dataset.dirty = 'true';
+    },
     getEditorBackgroundColor: function () {
       var template = getTemplateById(templateSelect.value);
       return template && template.background_color ? String(template.background_color) : '#111111';
@@ -128,6 +142,9 @@ import { createSlideFormPreviewHelpers } from '/assets/js/slides/slide-form-prev
     defaultFontSize: DEFAULT_FONT_SIZE,
     uploadMaxLabel: uploadMaxLabel,
     uploadVideoMaxLabel: uploadVideoMaxLabel,
+    uploadMaxBytes: uploadMaxBytes,
+    uploadVideoMaxBytes: uploadVideoMaxBytes,
+    uploadMimeTypes: uploadMimeTypes,
     escapeHtml: escapeHtml,
     getRegionTypeModule: getRegionTypeModule,
     requestPreviewRender: requestPreviewRender

src/web/public/js/slides/slide-image-cropper.js

@@ -23,6 +23,14 @@
   var listenersAttached = false;
   var uploadMaxBytes = 100 * 1024 * 1024;
   var uploadMaxLabel = '100 MB';
+  var editorDataElement = document.getElementById('slide-editor-data');
+  try {
+    var editorData = JSON.parse(editorDataElement && (editorDataElement.value || editorDataElement.textContent) || '{}') || {};
+    uploadMaxBytes = Number(editorData.uploadLimits && editorData.uploadLimits.imageMaxBytes) || uploadMaxBytes;
+    var megabytes = uploadMaxBytes / 1024 / 1024;
+    uploadMaxLabel = Number.isInteger(megabytes) ? String(megabytes) + ' MB' : megabytes.toFixed(2).replace(/0+$/, '').replace(/\.$/, '') + ' MB';
+  } catch (_error) {
+  }
 
   function getRegionId(input) {
     var match = String(input && input.name || '').match(/^region_image_(\d+)$/);

src/web/routes/account/password.js

@@ -13,7 +13,26 @@ function normalizeReturnUrl(value) {
   return url;
 }
 
-module.exports = function renderAccountPage(currentUser, message, returnUrl) {
+module.exports = function renderAccountPage(currentUser, message, returnUrl, allowUserSessionRevocation, sessions, passwordRequirements) {
+  const requirements = passwordRequirements || {
+    minimumLength: 10,
+    minimumCategories: 3,
+    requireLowercase: false,
+    requireUppercase: false,
+    requireNumber: false,
+    requireSymbol: false
+  };
+  const requiredCategories = [];
+  if (requirements.requireLowercase) requiredCategories.push('lowercase');
+  if (requirements.requireUppercase) requiredCategories.push('uppercase');
+  if (requirements.requireNumber) requiredCategories.push('number');
+  if (requirements.requireSymbol) requiredCategories.push('symbol');
+  const passwordRequirementsText = requiredCategories.length
+    ? 'Use at least ' + requirements.minimumLength + ' characters and include ' + requiredCategories.join(', ') + '.'
+    : requirements.minimumCategories === 4
+      ? 'Use at least ' + requirements.minimumLength + ' characters and include uppercase, lowercase, number, and symbol.'
+      : 'Use at least ' + requirements.minimumLength + ' characters and include ' + requirements.minimumCategories + ' of: uppercase, lowercase, number, and symbol.';
+
   return renderView('account/password', {
     title: 'My account',
     active: 'account',
@@ -21,6 +40,10 @@ module.exports = function renderAccountPage(currentUser, message, returnUrl) {
     message: message || '',
     username: currentUser ? currentUser.username : '',
     name: currentUser ? String(currentUser.name || '') : '',
-    returnUrl: normalizeReturnUrl(returnUrl)
+    returnUrl: normalizeReturnUrl(returnUrl),
+    allowUserSessionRevocation: Boolean(allowUserSessionRevocation),
+    sessions: Array.isArray(sessions) ? sessions : [],
+    passwordMinimumLength: requirements.minimumLength,
+    passwordRequirementsText: passwordRequirementsText
   });
 };

src/web/routes/admin/account.js

@@ -1,5 +1,7 @@
 // Admin account route registration and profile helpers.
 
+const { fetchAppSettings } = require('../../../data/app-settings');
+
 module.exports = function registerAccountRoutes(app, deps) {
   const pool = deps.pool;
   const common = deps.common;
@@ -11,9 +13,129 @@ module.exports = function registerAccountRoutes(app, deps) {
   const validatePasswordStrength = deps.validatePasswordStrength;
   const createUserSession = deps.createUserSession;
   const setSessionCookie = deps.setSessionCookie;
+  const getSessionMaxAgeMs = deps.getSessionMaxAgeMs;
+  const parseCookies = deps.parseCookies;
+  const hashSessionToken = deps.hashSessionToken;
+  const sessionCookieName = deps.sessionCookieName;
+  const recordRequestAuditEvent = deps.recordRequestAuditEvent;
+
+  async function getPasswordRequirements() {
+    const settings = await fetchAppSettings(pool);
+    return buildPasswordRequirements(settings);
+  }
+
+  function buildPasswordRequirements(settings) {
+    return {
+      minimumLength: settings['security.password_min_length'],
+      minimumCategories: settings['security.password_min_categories'],
+      requireLowercase: settings['security.password_require_lowercase'],
+      requireUppercase: settings['security.password_require_uppercase'],
+      requireNumber: settings['security.password_require_number'],
+      requireSymbol: settings['security.password_require_symbol']
+    };
+  }
+
+  function getSessionMetadata(req) {
+    const forwardedAddress = String(req && req.headers && req.headers['x-forwarded-for'] || '').split(',')[0].trim();
+    return {
+      ipAddress: forwardedAddress || String(req && req.ip || req && req.socket && req.socket.remoteAddress || 'unknown').trim(),
+      userAgent: req && req.headers && req.headers['user-agent']
+    };
+  }
 
   app.get('/account', function (req, res) {
-    res.send(pages.renderAccountPage(req.currentUser, req.query.message ? String(req.query.message) : '', '/dashboard'));
+    fetchAppSettings(pool).then(function (settings) {
+      const passwordRequirements = buildPasswordRequirements(settings);
+      if (!settings['security.allow_user_session_revocation']) {
+        return res.send(pages.renderAccountPage(req.currentUser, req.query.message ? String(req.query.message) : '', '/dashboard', false, [], passwordRequirements));
+      }
+      const cookies = parseCookies(req.headers.cookie || '');
+      const tokenHash = cookies[sessionCookieName] ? hashSessionToken(cookies[sessionCookieName]) : '';
+      return pool.query(
+        'SELECT id, session_hash, ip_address, user_agent, created_at, last_used_at, expires_at FROM a_sessions WHERE user_id = ? AND expires_at > NOW() ORDER BY last_used_at DESC',
+        [req.currentUser.id]
+      ).then(function (result) {
+        const rows = result[0] || [];
+        const sessions = rows.map(function (session) {
+          return {
+            id: Number(session.id),
+            isCurrent: Boolean(tokenHash && session.session_hash === tokenHash),
+            ipAddress: String(session.ip_address || 'Unknown'),
+            userAgent: String(session.user_agent || 'Unknown browser'),
+            createdAtLabel: formatDashboardDate(session.created_at),
+            lastUsedAtLabel: formatDashboardDate(session.last_used_at),
+            expiresAtLabel: formatDashboardDate(session.expires_at)
+          };
+        });
+        res.send(pages.renderAccountPage(req.currentUser, req.query.message ? String(req.query.message) : '', '/dashboard', true, sessions, passwordRequirements));
+      });
+    }).catch(function (error) {
+      res.status(500).send(error.message || 'Unable to load account settings.');
+    });
+  });
+
+  app.post('/account/sessions/:id/revoke', async function (req, res, next) {
+    try {
+      const sessionId = Number(req.params.id);
+      if (!Number.isInteger(sessionId) || sessionId <= 0) {
+        return res.status(400).send('Invalid session.');
+      }
+      const settings = await fetchAppSettings(pool);
+      if (!settings['security.allow_user_session_revocation']) {
+        return res.redirect('/account?message=' + encodeURIComponent('Signing out other sessions is disabled by an administrator.'));
+      }
+      const cookies = parseCookies(req.headers.cookie || '');
+      const token = cookies[sessionCookieName];
+      if (!token) {
+        return res.redirect('/account?message=' + encodeURIComponent('Current session could not be identified.'));
+      }
+      const [result] = await pool.query(
+        'DELETE FROM a_sessions WHERE id = ? AND user_id = ? AND session_hash <> ?',
+        [sessionId, req.currentUser.id, hashSessionToken(token)]
+      );
+      if (result && result.affectedRows && typeof recordRequestAuditEvent === 'function') {
+        await recordRequestAuditEvent(pool, req, {
+          category: 'sessions',
+          eventType: 'session.revoked',
+          actorUserId: req.currentUser.id,
+          targetType: 'user',
+          targetId: req.currentUser.id,
+          targetLabel: req.currentUser.username,
+          details: { scope: 'single' }
+        });
+      }
+      res.redirect('/account?message=' + encodeURIComponent(result && result.affectedRows ? 'Session signed out.' : 'The current session cannot be signed out.'));
+    } catch (error) {
+      next(error);
+    }
+  });
+
+  app.post('/account/sessions/revoke', async function (req, res, next) {
+    try {
+      const settings = await fetchAppSettings(pool);
+      if (!settings['security.allow_user_session_revocation']) {
+        return res.redirect('/account?message=' + encodeURIComponent('Signing out other sessions is disabled by an administrator.'));
+      }
+      const cookies = parseCookies(req.headers.cookie || '');
+      const token = cookies[sessionCookieName];
+      if (token) {
+        await pool.query('DELETE FROM a_sessions WHERE user_id = ? AND session_hash <> ?', [req.currentUser.id, hashSessionToken(token)]);
+      }
+      if (typeof recordRequestAuditEvent === 'function') {
+        await recordRequestAuditEvent(pool, req, {
+          category: 'sessions',
+          eventType: 'session.revoked',
+          actorUserId: req.currentUser.id,
+          targetType: 'user',
+          targetId: req.currentUser.id,
+          targetLabel: req.currentUser.username,
+          details: { scope: 'other_sessions' }
+        });
+      }
+      res.redirect('/account?message=' + encodeURIComponent('Other active sessions were signed out.'));
+    } catch (error) {
+      next(error);
+    }
   });
 
   app.post('/account/name', async function (req, res, next) {
@@ -53,7 +175,7 @@ module.exports = function registerAccountRoutes(app, deps) {
       if (!verifyPassword(currentPassword, user)) {
         return res.status(400).send('Current password is incorrect.');
       }
-      const passwordStrengthMessage = validatePasswordStrength(newPassword);
+      const passwordStrengthMessage = validatePasswordStrength(newPassword, await getPasswordRequirements());
       if (passwordStrengthMessage) {
         return res.status(400).send(passwordStrengthMessage);
       }
@@ -63,13 +185,25 @@ module.exports = function registerAccountRoutes(app, deps) {
 
       const passwordRecord = hashPassword(newPassword);
       await pool.query(
-        'UPDATE a_users SET password_hash = ?, password_salt = ?, password_iterations = ?, modified_by = ? WHERE id = ?',
+        'UPDATE a_users SET password_hash = ?, password_salt = ?, password_iterations = ?, must_change_password = 0, modified_by = ? WHERE id = ?',
         [passwordRecord.hash, passwordRecord.salt, passwordRecord.iterations, getAuditUserId(req), user.id]
       );
       await pool.query('DELETE FROM a_sessions WHERE user_id = ?', [user.id]);
+      if (typeof recordRequestAuditEvent === 'function') {
+        await recordRequestAuditEvent(pool, req, {
+          category: 'security',
+          eventType: 'password.changed',
+          actorUserId: user.id,
+          targetType: 'user',
+          targetId: user.id,
+          targetLabel: user.username,
+          details: { source: 'account' }
+        });
+      }
 
-      const token = await createUserSession(pool, user.id);
-      setSessionCookie(res, token);
+      const sessionMaxAgeMs = typeof getSessionMaxAgeMs === 'function' ? await getSessionMaxAgeMs() : undefined;
+      const token = await createUserSession(pool, user.id, sessionMaxAgeMs, getSessionMetadata(req));
+      setSessionCookie(res, token, sessionMaxAgeMs);
       res.redirect('/account?message=' + encodeURIComponent('Password updated.'));
     } catch (error) {
       next(error);

src/web/routes/admin/content.js

@@ -3,6 +3,7 @@
 const fs = require('fs');
 const path = require('path');
 const { loadFontLibrary } = require('#src/web/lib/media/font-library');
+const { fetchAppSettings } = require('#src/data/app-settings');
 const { PERMISSION_DENIED_MESSAGE } = require('#src/rbac');
 
 module.exports = function registerContentRoutes(app, deps) {
@@ -19,6 +20,7 @@ module.exports = function registerContentRoutes(app, deps) {
   const removeUnusedUploadFiles = deps.removeUnusedUploadFiles;
   const syncPlaylistUploadsOnChange = deps.syncPlaylistUploadsOnChange;
   const getAuditUserId = deps.getAuditUserId;
+  const recordRequestAuditEvent = deps.recordRequestAuditEvent;
   const redirectAfterSave = deps.redirectAfterSave;
   const notifyPlayerScreens = deps.notifyPlayerScreens;
   const broadcastDashboardState = deps.broadcastDashboardState;
@@ -42,6 +44,7 @@ module.exports = function registerContentRoutes(app, deps) {
     const rssData = await common.fetchRssFeedsData(pool);
     const apiData = typeof common.fetchApiSourcesData === 'function' ? await common.fetchApiSourcesData(pool) : { apiSources: [] };
     const timetableData = typeof common.fetchTimetablesData === 'function' ? await common.fetchTimetablesData(pool) : { timetableGroups: [] };
+    const appSettings = await fetchAppSettings(pool);
     const apiSources = Array.isArray(apiData.apiSources) ? apiData.apiSources.map(function (source) {
       return Object.assign({}, source, {
         responseJson: typeof common.parseJsonSafe === 'function' ? common.parseJsonSafe(source.last_response_json) : null
@@ -60,7 +63,13 @@ module.exports = function registerContentRoutes(app, deps) {
       rssFeeds: rssFeeds,
       apiSources: apiSources,
       timetableGroups: timetableData.timetableGroups || [],
-      fontLibrary: loadFontLibrary(deps.uploadDir)
+      fontLibrary: loadFontLibrary(deps.uploadDir),
+      uploadLimits: {
+        imageMaxBytes: Number(appSettings['uploads.image_max_bytes']) || IMAGE_UPLOAD_MAX_BYTES,
+        videoMaxBytes: Number(appSettings['uploads.video_max_bytes']) || VIDEO_UPLOAD_MAX_BYTES,
+        wysiwygImageMaxBytes: Number(appSettings['uploads.wysiwyg_image_max_bytes']) || WYSIWYG_IMAGE_UPLOAD_MAX_BYTES,
+        allowedMimeTypes: Array.isArray(appSettings['uploads.allowed_mime_types']) ? appSettings['uploads.allowed_mime_types'] : []
+      }
     });
   }
 
@@ -123,20 +132,24 @@ module.exports = function registerContentRoutes(app, deps) {
     return null;
   }
 
-  function getUploadedFileLimitBytes(file, uploadContext) {
+  function getUploadedFileLimitBytes(file, uploadContext, settings) {
     if (String(uploadContext || '').trim().toLowerCase() === 'wysiwyg') {
-      return WYSIWYG_IMAGE_UPLOAD_MAX_BYTES;
+      return Number(settings && settings['uploads.wysiwyg_image_max_bytes']) || WYSIWYG_IMAGE_UPLOAD_MAX_BYTES;
     }
 
-    return getUploadedFileMediaType(file, uploadContext) === 'video' ? VIDEO_UPLOAD_MAX_BYTES : IMAGE_UPLOAD_MAX_BYTES;
+    return getUploadedFileMediaType(file, uploadContext) === 'video'
+      ? Number(settings && settings['uploads.video_max_bytes']) || VIDEO_UPLOAD_MAX_BYTES
+      : Number(settings && settings['uploads.image_max_bytes']) || IMAGE_UPLOAD_MAX_BYTES;
   }
 
-  function getUploadedFileLimitLabel(file, uploadContext) {
+  function getUploadedFileLimitLabel(file, uploadContext, settings) {
     if (String(uploadContext || '').trim().toLowerCase() === 'wysiwyg') {
-      return '10 MB';
+      const limitMb = getUploadedFileLimitBytes(file, uploadContext, settings) / 1024 / 1024;
+      return (Number.isInteger(limitMb) ? String(limitMb) : limitMb.toFixed(2).replace(/0+$/, '').replace(/\.$/, '')) + ' MB';
     }
 
-    return getUploadedFileMediaType(file, uploadContext) === 'video' ? '1 GB' : '100 MB';
+    const limitMb = Math.round(getUploadedFileLimitBytes(file, uploadContext, settings) / 1024 / 1024);
+    return limitMb >= 1024 && limitMb % 1024 === 0 ? (limitMb / 1024) + ' GB' : limitMb + ' MB';
   }
 
   async function removeUploadedFile(file) {
@@ -154,8 +167,18 @@ module.exports = function registerContentRoutes(app, deps) {
 
   async function validateUploadedFiles(files, uploadContext) {
     const list = Array.isArray(files) ? files.filter(Boolean) : [];
+    const settings = await fetchAppSettings(pool);
     for (let i = 0; i < list.length; i += 1) {
       const file = list[i];
+      const fileMimeType = String(file && file.mimetype || '').trim().toLowerCase();
+      const allowedMimeTypes = Array.isArray(settings['uploads.allowed_mime_types']) ? settings['uploads.allowed_mime_types'] : [];
+      if (allowedMimeTypes.indexOf(fileMimeType) === -1) {
+        await removeUploadedFile(file);
+        const error = new Error('This upload type is disabled in Media Uploads settings.');
+        error.statusCode = 400;
+        error.expose = true;
+        throw error;
+      }
       const mediaType = getUploadedFileMediaType(file, uploadContext);
       if (!mediaType) {
         await removeUploadedFile(file);
@@ -165,11 +188,11 @@ module.exports = function registerContentRoutes(app, deps) {
         throw error;
       }
 
-      if (Number(file.size || 0) > getUploadedFileLimitBytes(file, uploadContext)) {
+      if (Number(file.size || 0) > getUploadedFileLimitBytes(file, uploadContext, settings)) {
         await removeUploadedFile(file);
         const error = new Error(String(uploadContext || '').trim().toLowerCase() === 'wysiwyg'
-          ? 'Image must be 2 MB or smaller. Larger images should use the dedicated Image region.'
-          : 'File must be ' + getUploadedFileLimitLabel(file, uploadContext) + ' or smaller.');
+          ? 'Image must be ' + getUploadedFileLimitLabel(file, uploadContext, settings) + ' or smaller. Larger images should use the dedicated Image region.'
+          : 'File must be ' + getUploadedFileLimitLabel(file, uploadContext, settings) + ' or smaller.');
         error.statusCode = 400;
         error.expose = true;
         throw error;
@@ -447,6 +470,7 @@ module.exports = function registerContentRoutes(app, deps) {
       queueSlideThumbnailRefresh(result.insertId, null).catch(function (error) {
         console.warn('Unable to queue slide thumbnail refresh:', error);
       });
+      if (typeof recordRequestAuditEvent === 'function') await recordRequestAuditEvent(pool, req, { category: 'slides', eventType: 'slide.created', actorUserId: actorId, targetType: 'slide', targetId: result.insertId, targetLabel: payload.title });
       redirectAfterSave(req, res, '/slides/' + result.insertId + '/edit', {
         closeUrl: '/slides',
         newUrl: '/slides/new',
@@ -488,6 +512,7 @@ module.exports = function registerContentRoutes(app, deps) {
         screenSlideCounts: screenSlideCounts
       });
       await broadcastDashboardState();
+      if (typeof recordRequestAuditEvent === 'function') await recordRequestAuditEvent(pool, req, { category: 'slides', eventType: 'slide.updated', actorUserId: actorId, targetType: 'slide', targetId: slide.id, targetLabel: payload.title });
       queueSlideThumbnailRefresh(slide.id, slide.thumbnail_path).catch(function (error) {
         console.warn('Unable to queue slide thumbnail refresh:', error);
       });
@@ -526,6 +551,7 @@ module.exports = function registerContentRoutes(app, deps) {
         screenSlideCounts: screenSlideCounts
       });
       await broadcastDashboardState();
+      if (typeof recordRequestAuditEvent === 'function') await recordRequestAuditEvent(pool, req, { category: 'slides', eventType: 'slide.deleted', actorUserId: getAuditUserId(req), targetType: 'slide', targetId: slide.id, targetLabel: slide.title });
       res.redirect('/slides?message=' + encodeURIComponent('Slide deleted.'));
     } catch (error) {
       next(error);
@@ -584,6 +610,7 @@ module.exports = function registerContentRoutes(app, deps) {
         localUploadDir: deps.uploadDir,
         nextUploadRefs: collectUploadReferencesFromPayload(payload)
       });
+      if (typeof recordRequestAuditEvent === 'function') await recordRequestAuditEvent(pool, req, { category: 'templates', eventType: 'template.created', actorUserId: actorId, targetType: 'template', targetId: result.insertId, targetLabel: payload.name });
       redirectAfterSave(req, res, '/templates/' + result.insertId + '/edit', {
         closeUrl: '/templates',
         newUrl: '/templates/new',
@@ -654,6 +681,7 @@ module.exports = function registerContentRoutes(app, deps) {
         });
       }
       await notifyPlayerScreens(affectedScreens, 'refresh');
+      if (typeof recordRequestAuditEvent === 'function') await recordRequestAuditEvent(pool, req, { category: 'templates', eventType: 'template.updated', actorUserId: actorId, targetType: 'template', targetId: template.id, targetLabel: payload.name });
       redirectAfterSave(req, res, '/templates/' + template.id + '/edit', {
         closeUrl: '/templates',
         newUrl: '/templates/new',
@@ -686,6 +714,7 @@ module.exports = function registerContentRoutes(app, deps) {
         previousUploadRefs: uploadRefs
       });
       await notifyPlayerScreens(affectedScreens, 'refresh');
+      if (typeof recordRequestAuditEvent === 'function') await recordRequestAuditEvent(pool, req, { category: 'templates', eventType: 'template.deleted', actorUserId: getAuditUserId(req), targetType: 'template', targetId: template.id, targetLabel: template.name });
       res.redirect('/templates?message=' + encodeURIComponent('Template deleted.'));
     } catch (error) {
       next(error);
@@ -743,6 +772,7 @@ module.exports = function registerContentRoutes(app, deps) {
       }
       const actorId = getAuditUserId(req);
       const [result] = await pool.query('INSERT INTO c_canvas_sizes (name, width, height, created_by, modified_by) VALUES (?, ?, ?, ?, ?)', [payload.name, payload.width, payload.height, actorId, actorId]);
+      if (typeof recordRequestAuditEvent === 'function') await recordRequestAuditEvent(pool, req, { category: 'canvas-sizes', eventType: 'canvas-size.created', actorUserId: actorId, targetType: 'canvas-size', targetId: result.insertId, targetLabel: payload.name, details: { width: payload.width, height: payload.height } });
       redirectAfterSave(req, res, '/canvas-sizes/' + result.insertId + '/edit', {
         closeUrl: '/canvas-sizes',
         newUrl: '/canvas-sizes/new',
@@ -784,6 +814,7 @@ module.exports = function registerContentRoutes(app, deps) {
         return res.status(400).send('That canvas size already exists.');
       }
       await pool.query('UPDATE c_canvas_sizes SET name = ?, width = ?, height = ?, modified_by = ? WHERE id = ?', [payload.name, payload.width, payload.height, getAuditUserId(req), canvasSize.id]);
+      if (typeof recordRequestAuditEvent === 'function') await recordRequestAuditEvent(pool, req, { category: 'canvas-sizes', eventType: 'canvas-size.updated', actorUserId: getAuditUserId(req), targetType: 'canvas-size', targetId: canvasSize.id, targetLabel: payload.name, details: { width: payload.width, height: payload.height } });
       redirectAfterSave(req, res, '/canvas-sizes', {
         closeUrl: '/canvas-sizes',
         newUrl: '/canvas-sizes/new',
@@ -806,6 +837,7 @@ module.exports = function registerContentRoutes(app, deps) {
       }
       await pool.query('UPDATE c_templates SET canvas_size_id = NULL, modified_by = ? WHERE canvas_size_id = ?', [getAuditUserId(req), canvasSize.id]);
       await pool.query('DELETE FROM c_canvas_sizes WHERE id = ?', [canvasSize.id]);
+      if (typeof recordRequestAuditEvent === 'function') await recordRequestAuditEvent(pool, req, { category: 'canvas-sizes', eventType: 'canvas-size.deleted', actorUserId: getAuditUserId(req), targetType: 'canvas-size', targetId: canvasSize.id, targetLabel: canvasSize.name });
       res.redirect('/canvas-sizes?message=' + encodeURIComponent('Canvas size deleted.'));
     } catch (error) {
       next(error);

src/web/routes/admin/manage.js

@@ -5,6 +5,7 @@ module.exports = function registerManageRoutes(app, deps) {
   const common = deps.common;
   const pages = deps.pages;
   const getAuditUserId = deps.getAuditUserId;
+  const recordRequestAuditEvent = deps.recordRequestAuditEvent;
   const redirectAfterSave = deps.redirectAfterSave;
   const notifyPlayerScreens = deps.notifyPlayerScreens;
   const broadcastDashboardState = deps.broadcastDashboardState;
@@ -217,6 +218,7 @@ module.exports = function registerManageRoutes(app, deps) {
       const slug = await common.uniqueScreenSlug(pool, common.slugify(slugInput || name));
       const actorId = getAuditUserId(req);
       const [result] = await pool.query('INSERT INTO d_screens (name, slug, playlist_id, created_by, modified_by) VALUES (?, ?, ?, ?, ?)', [name, slug, playlistId, actorId, actorId]);
+      if (typeof recordRequestAuditEvent === 'function') await recordRequestAuditEvent(pool, req, { category: 'screens', eventType: 'screen.created', actorUserId: actorId, targetType: 'screen', targetId: result.insertId, targetLabel: name, details: { slug: slug, playlistId: playlistId } });
       redirectAfterSave(req, res, '/screens?edit=' + result.insertId, {
         closeUrl: '/screens',
         newUrl: '/screens/new',
@@ -262,6 +264,7 @@ module.exports = function registerManageRoutes(app, deps) {
           await forwardPlayerCommand(previousSlug, redirectPayload);
         }
       }
+      if (typeof recordRequestAuditEvent === 'function') await recordRequestAuditEvent(pool, req, { category: 'screens', eventType: 'screen.updated', actorUserId: getAuditUserId(req), targetType: 'screen', targetId: screen.id, targetLabel: name, details: { slug: slug, playlistId: playlistId } });
       redirectAfterSave(req, res, '/screens?edit=' + screen.id, {
         closeUrl: '/screens',
         newUrl: '/screens/new',
@@ -283,6 +286,7 @@ module.exports = function registerManageRoutes(app, deps) {
         return res.redirect('/screens?message=' + encodeURIComponent(blockMessage));
       }
       await pool.query('DELETE FROM d_screens WHERE id = ?', [screen.id]);
+      if (typeof recordRequestAuditEvent === 'function') await recordRequestAuditEvent(pool, req, { category: 'screens', eventType: 'screen.deleted', actorUserId: getAuditUserId(req), targetType: 'screen', targetId: screen.id, targetLabel: screen.name });
       res.redirect('/screens?message=' + encodeURIComponent('Screen deleted.'));
     } catch (error) {
       next(error);

src/web/routes/admin/playlists.js

@@ -1,5 +1,7 @@
 // Playlist admin routes and playlist-slide management.
 
+const { fetchAppSettings } = require('../../../data/app-settings');
+
 module.exports = function registerPlaylistRoutes(app, deps) {
   const pool = deps.pool;
   const common = deps.common;
@@ -9,6 +11,7 @@ module.exports = function registerPlaylistRoutes(app, deps) {
   const fetchPlaylistCanvasId = deps.fetchPlaylistCanvasId;
   const readArrayField = deps.readArrayField;
   const getAuditUserId = deps.getAuditUserId;
+  const recordRequestAuditEvent = deps.recordRequestAuditEvent;
   const redirectAfterSave = deps.redirectAfterSave;
   const notifyPlayerScreens = deps.notifyPlayerScreens;
   const broadcastDashboardState = deps.broadcastDashboardState;
@@ -295,6 +298,7 @@ module.exports = function registerPlaylistRoutes(app, deps) {
       };
       await savePlaylistItems(connection, playlist, req.body, actorId, { updatePlaylist: false });
       await connection.commit();
+      if (typeof recordRequestAuditEvent === 'function') await recordRequestAuditEvent(pool, req, { category: 'playlists', eventType: 'playlist.created', actorUserId: actorId, targetType: 'playlist', targetId: result.insertId, targetLabel: name });
       redirectAfterSave(req, res, '/playlists/' + result.insertId + '/edit', {
         closeUrl: '/playlists',
         newUrl: '/playlists/new',
@@ -352,6 +356,7 @@ module.exports = function registerPlaylistRoutes(app, deps) {
       await connection.commit();
       await notifyPlayerScreens(saveResult.affectedScreens, 'refresh');
       await broadcastDashboardState();
+      if (typeof recordRequestAuditEvent === 'function') await recordRequestAuditEvent(pool, req, { category: 'playlists', eventType: 'playlist.updated', actorUserId: actorId, targetType: 'playlist', targetId: playlist.id, targetLabel: name });
       redirectAfterSave(req, res, '/playlists/' + playlist.id + '/edit', {
         closeUrl: '/playlists',
         newUrl: '/playlists/new',
@@ -383,6 +388,7 @@ module.exports = function registerPlaylistRoutes(app, deps) {
         return res.redirect('/playlists?message=' + encodeURIComponent(blockMessage));
       }
       await pool.query('DELETE FROM c_playlists WHERE id = ?', [playlist.id]);
+      if (typeof recordRequestAuditEvent === 'function') await recordRequestAuditEvent(pool, req, { category: 'playlists', eventType: 'playlist.deleted', actorUserId: getAuditUserId(req), targetType: 'playlist', targetId: playlist.id, targetLabel: playlist.name });
       res.redirect('/playlists?message=' + encodeURIComponent('Playlist deleted.'));
     } catch (error) {
       next(error);
@@ -411,7 +417,9 @@ module.exports = function registerPlaylistRoutes(app, deps) {
       if (playlistCanvasId && slideCanvasId !== playlistCanvasId) {
         return res.status(400).send('The slide canvas size must match the existing playlist items.');
       }
-      const durationValue = Number(req.body.duration_seconds || 10);
+      const hasSubmittedDuration = req.body.duration_seconds !== undefined && String(req.body.duration_seconds).trim() !== '';
+      const settings = hasSubmittedDuration ? null : await fetchAppSettings(pool);
+      const durationValue = Number(hasSubmittedDuration ? req.body.duration_seconds : settings['player.default_slide_duration_seconds']);
       const durationSeconds = Number.isFinite(durationValue) ? Math.max(0.001, Math.round(durationValue * 1000) / 1000) : 10;
       const [positionRows] = await pool.query('SELECT COALESCE(MAX(position), -1) AS max_position FROM c_playlist_slides WHERE playlist_id = ?', [playlist.id]);
       const nextPosition = Number(positionRows[0].max_position) + 1;

src/web/routes/admin/rbac.js

@@ -5,6 +5,7 @@
 	const common = deps.common;
 	const pages = deps.pages;
 	const getAuditUserId = deps.getAuditUserId;
+	const recordRequestAuditEvent = deps.recordRequestAuditEvent;
 	const rbacData = deps.rbacData;
 	const permissions = Array.isArray(deps.permissions) ? deps.permissions : [];
 	const readArrayField = deps.readArrayField;
@@ -114,6 +115,7 @@
 					sectionIndex: toSortIndex(permission.sectionIndex),
 					sectionOrder: Number(permission.sectionOrder) || 999,
 					resourceIndex: toSortIndex(permission.resourceIndex),
+						resourceOrder: Number(permission.resourceOrder) || 999,
 					permissions: []
 				};
 				groupIndex.set(sectionKey, group);
@@ -191,7 +193,7 @@
 		};
 	}
 
-	app.get('/rbac', requirePermission('rbac.read'), async function (req, res, next) {
+	app.get('/settings/roles', requirePermission('rbac.read'), async function (req, res, next) {
 		try {
 			const page = Math.max(1, Math.floor(Number(req.query.page) || 1));
 			const search = common.getSearchQuery(req);
@@ -207,7 +209,7 @@
 		}
 	});
 
-	app.get('/rbac/new', requirePermission('rbac.create'), function (req, res, next) {
+	app.get('/settings/roles/new', requirePermission('rbac.create'), function (req, res, next) {
 		const page = Math.max(1, Math.floor(Number(req.query.page) || 1));
 		const search = common.getSearchQuery(req);
 		const sort = common.getSortQuery(req);
@@ -223,7 +225,7 @@
 		});
 	});
 
-	app.get('/rbac/:id/duplicate', requirePermission('rbac.read'), requirePermission('rbac.create'), async function (req, res, next) {
+	app.get('/settings/roles/:id/duplicate', requirePermission('rbac.read'), requirePermission('rbac.create'), async function (req, res, next) {
 		try {
 			const roleId = Number(req.params.id);
 			if (!Number.isInteger(roleId) || roleId <= 0) {
@@ -252,7 +254,7 @@
 		}
 	});
 
-	app.post('/rbac', requirePermission('rbac.create'), async function (req, res, next) {
+	app.post('/settings/roles', requirePermission('rbac.create'), async function (req, res, next) {
 		try {
 			const name = common.validateMaxLength(req.body.name || '', ROLE_NAME_MAX_LENGTH, 'Role name');
 			const description = common.validateMaxLength(req.body.description || '', ROLE_DESCRIPTION_MAX_LENGTH, 'Role description');
@@ -319,13 +321,24 @@
 			} finally {
 				connection.release();
 			}
-			res.redirect('/rbac/' + insertedRoleId + '/edit?message=' + encodeURIComponent('Role created.'));
+			if (typeof recordRequestAuditEvent === 'function') {
+				await recordRequestAuditEvent(pool, req, {
+					category: 'roles',
+					eventType: 'role.created',
+					actorUserId: actorId,
+					targetType: 'role',
+					targetId: insertedRoleId,
+					targetLabel: name,
+					details: { permissionKeys: selectedPermissionKeys, userIds: normalizedUserIds }
+				});
+			}
+			res.redirect('/settings/roles/' + insertedRoleId + '/edit?message=' + encodeURIComponent('Role created.'));
 		} catch (error) {
 			next(error);
 		}
 	});
 
-	app.get('/rbac/:id/edit', requirePermission('rbac.update'), async function (req, res, next) {
+	app.get('/settings/roles/:id/edit', requirePermission('rbac.update'), async function (req, res, next) {
 		try {
 			const roleId = Number(req.params.id);
 			if (!Number.isInteger(roleId) || roleId <= 0) {
@@ -354,7 +367,7 @@
 		}
 	});
 
-	app.post('/rbac/:id', requirePermission('rbac.update'), async function (req, res, next) {
+	app.post('/settings/roles/:id', requirePermission('rbac.update'), async function (req, res, next) {
 		try {
 			const roleId = Number(req.params.id);
 			if (!Number.isInteger(roleId) || roleId <= 0) {
@@ -376,15 +389,18 @@
 			const selectedUserIds = shouldSyncUsers
 				? readArrayField(req.body, ['user_ids[]', 'user_ids'])
 				: [];
+			const visibleUserIds = shouldSyncUsers
+				? normalizeSelectedIds(readArrayField(req.body, ['user_ids_present[]', 'user_ids_present']))
+				: [];
 			const normalizedPermissionKeys = shouldSyncPermissions ? normalizePermissionKeys(selectedPermissionKeys) : [];
-			const normalizedUserIds = shouldSyncUsers ? normalizeSelectedIds(selectedUserIds) : [];
+			let normalizedUserIds = shouldSyncUsers ? normalizeSelectedIds(selectedUserIds) : [];
 
 			if (!name) {
-				return res.redirect('/rbac/' + roleId + '/edit?message=' + encodeURIComponent('Role name is required.'));
+				return res.redirect('/settings/roles/' + roleId + '/edit?message=' + encodeURIComponent('Role name is required.'));
 			}
 
 			if (await common.fetchDuplicateName(pool, 'a_roles', name, roleId)) {
-				return res.redirect('/rbac/' + roleId + '/edit?message=' + encodeURIComponent('A role with that name already exists.'));
+				return res.redirect('/settings/roles/' + roleId + '/edit?message=' + encodeURIComponent('A role with that name already exists.'));
 			}
 
 			const validPermissionKeys = new Set(permissions.map(function (permission) {
@@ -393,12 +409,17 @@
 			if (shouldSyncPermissions && normalizedPermissionKeys.some(function (permissionKey) {
 				return !validPermissionKeys.has(permissionKey);
 			})) {
-				return res.redirect('/rbac/' + roleId + '/edit?message=' + encodeURIComponent('One or more selected permissions are invalid.'));
+				return res.redirect('/settings/roles/' + roleId + '/edit?message=' + encodeURIComponent('One or more selected permissions are invalid.'));
 			}
 
 			let availableUsers = [];
 			if (shouldSyncUsers) {
 				availableUsers = await rbacData.fetchUsersWithRoles(pool);
+				const existingRoleUserIds = await rbacData.fetchRoleUserIds(pool, roleId);
+				const visibleUserIdSet = new Set(visibleUserIds);
+				normalizedUserIds = existingRoleUserIds.filter(function (userId) {
+					return !visibleUserIdSet.has(userId);
+				}).concat(normalizedUserIds);
 			}
 			const validUserIds = new Set(availableUsers.map(function (user) {
 				return Number(user.id);
@@ -406,7 +427,7 @@
 			if (shouldSyncUsers && normalizedUserIds.some(function (userId) {
 				return !validUserIds.has(userId);
 			})) {
-				return res.redirect('/rbac/' + roleId + '/edit?message=' + encodeURIComponent('One or more selected users are invalid.'));
+				return res.redirect('/settings/roles/' + roleId + '/edit?message=' + encodeURIComponent('One or more selected users are invalid.'));
 			}
 
 			const connection = await pool.getConnection();
@@ -429,13 +450,24 @@
 			} finally {
 				connection.release();
 			}
-			res.redirect('/rbac/' + roleId + '/edit?message=' + encodeURIComponent('Role updated.'));
+			if (typeof recordRequestAuditEvent === 'function') {
+				await recordRequestAuditEvent(pool, req, {
+					category: 'roles',
+					eventType: 'role.updated',
+					actorUserId: req.currentUser.id,
+					targetType: 'role',
+					targetId: roleId,
+					targetLabel: name,
+					details: { permissionsChanged: shouldSyncPermissions, usersChanged: shouldSyncUsers }
+				});
+			}
+			res.redirect('/settings/roles/' + roleId + '/edit?message=' + encodeURIComponent('Role updated.'));
 		} catch (error) {
 			next(error);
 		}
 	});
 
-	app.post('/rbac/:id/permissions', requirePermission('rbac.update'), async function (req, res, next) {
+	app.post('/settings/roles/:id/permissions', requirePermission('rbac.update'), async function (req, res, next) {
 		try {
 			const roleId = Number(req.params.id);
 			if (!Number.isInteger(roleId) || roleId <= 0) {
@@ -459,7 +491,7 @@
 			if (normalizedPermissionKeys.some(function (permissionKey) {
 				return !validPermissionKeys.has(permissionKey);
 			})) {
-				return res.redirect('/rbac/' + roleId + '/edit?message=' + encodeURIComponent('One or more selected permissions are invalid.'));
+				return res.redirect('/settings/roles/' + roleId + '/edit?message=' + encodeURIComponent('One or more selected permissions are invalid.'));
 			}
 
 			const connection = await pool.getConnection();
@@ -473,13 +505,24 @@
 			} finally {
 				connection.release();
 			}
-			res.redirect('/rbac/' + roleId + '/edit?message=' + encodeURIComponent('Permissions updated.'));
+			if (typeof recordRequestAuditEvent === 'function') {
+				await recordRequestAuditEvent(pool, req, {
+					category: 'roles',
+					eventType: 'role.permissions_updated',
+					actorUserId: req.currentUser.id,
+					targetType: 'role',
+					targetId: roleId,
+					targetLabel: role.name,
+					details: { permissionKeys: normalizedPermissionKeys }
+				});
+			}
+			res.redirect('/settings/roles/' + roleId + '/edit?message=' + encodeURIComponent('Permissions updated.'));
 		} catch (error) {
 			next(error);
 		}
 	});
 
-	app.post('/rbac/:id/users', requirePermission('rbac.update'), async function (req, res, next) {
+	app.post('/settings/roles/:id/users', requirePermission('rbac.update'), async function (req, res, next) {
 		try {
 			const roleId = Number(req.params.id);
 			if (!Number.isInteger(roleId) || roleId <= 0) {
@@ -505,17 +548,28 @@
 			if (normalizedUserIds.some(function (userId) {
 				return !validUserIds.has(userId);
 			})) {
-				return res.redirect('/rbac/' + roleId + '/edit?message=' + encodeURIComponent('One or more selected users are invalid.'));
+				return res.redirect('/settings/roles/' + roleId + '/edit?message=' + encodeURIComponent('One or more selected users are invalid.'));
 			}
 
 			await rbacData.syncRoleUsers(pool, roleId, normalizedUserIds);
-			res.redirect('/rbac/' + roleId + '/edit?message=' + encodeURIComponent('Users updated.'));
+			if (typeof recordRequestAuditEvent === 'function') {
+				await recordRequestAuditEvent(pool, req, {
+					category: 'roles',
+					eventType: 'role.users_updated',
+					actorUserId: req.currentUser.id,
+					targetType: 'role',
+					targetId: roleId,
+					targetLabel: role.name,
+					details: { userIds: normalizedUserIds }
+				});
+			}
+			res.redirect('/settings/roles/' + roleId + '/edit?message=' + encodeURIComponent('Users updated.'));
 		} catch (error) {
 			next(error);
 		}
 	});
 
-	app.post('/rbac/:id/delete', requirePermission('rbac.delete'), async function (req, res, next) {
+	app.post('/settings/roles/:id/delete', requirePermission('rbac.delete'), async function (req, res, next) {
 		try {
 			const roleId = Number(req.params.id);
 			if (!Number.isInteger(roleId) || roleId <= 0) {
@@ -527,14 +581,24 @@
 				return res.status(404).send('Role not found.');
 			}
 			if (String(role.role_key || '') === 'administrators') {
-				return res.redirect('/rbac?message=' + encodeURIComponent('The built-in Administrators role cannot be deleted.'));
+				return res.redirect('/settings/roles?message=' + encodeURIComponent('The built-in Administrators role cannot be deleted.'));
 			}
 			if (Number(role.user_count) > 0) {
-				return res.redirect('/rbac?message=' + encodeURIComponent('Remove all users from this role before deleting it.'));
+				return res.redirect('/settings/roles?message=' + encodeURIComponent('Remove all users from this role before deleting it.'));
 			}
 
 			await pool.query('DELETE FROM a_roles WHERE id = ?', [roleId]);
-			res.redirect('/rbac?message=' + encodeURIComponent('Role deleted.'));
+			if (typeof recordRequestAuditEvent === 'function') {
+				await recordRequestAuditEvent(pool, req, {
+					category: 'roles',
+					eventType: 'role.deleted',
+					actorUserId: req.currentUser.id,
+					targetType: 'role',
+					targetId: roleId,
+					targetLabel: role.name
+				});
+			}
+			res.redirect('/settings/roles?message=' + encodeURIComponent('Role deleted.'));
 		} catch (error) {
 			next(error);
 		}

src/web/routes/admin/users.js

@@ -1,11 +1,14 @@
 	// Admin user route registration and user-role management.
 
+	const { fetchAppSettings } = require('../../../data/app-settings');
+
 	module.exports = function registerUsersRoutes(app, deps) {
 	const pool = deps.pool;
 	const common = deps.common;
 	const pages = deps.pages;
 	const formatDashboardDate = deps.formatDashboardDate;
 	const getAuditUserId = deps.getAuditUserId;
+	const recordRequestAuditEvent = deps.recordRequestAuditEvent;
 	const hashPassword = deps.hashPassword;
 	const validatePasswordStrength = deps.validatePasswordStrength;
 	const readArrayField = deps.readArrayField;
@@ -23,6 +26,23 @@
 		return rbacData.fetchRoles(pool);
 	}
 
+	async function shouldRequirePasswordChange(settingKey) {
+		const settings = await fetchAppSettings(pool);
+		return Boolean(settings[settingKey]);
+	}
+
+	async function getPasswordRequirements() {
+		const settings = await fetchAppSettings(pool);
+		return {
+			minimumLength: settings['security.password_min_length'],
+			minimumCategories: settings['security.password_min_categories'],
+			requireLowercase: settings['security.password_require_lowercase'],
+			requireUppercase: settings['security.password_require_uppercase'],
+			requireNumber: settings['security.password_require_number'],
+			requireSymbol: settings['security.password_require_symbol']
+		};
+	}
+
 	function mapRolesForForm(roles, selectedRoleIds) {
 		const selectedIds = new Set((Array.isArray(selectedRoleIds) ? selectedRoleIds : []).map(function (roleId) {
 			return Number(roleId);
@@ -57,7 +77,7 @@
 		return { ok: true, roleIds: normalizedRoleIds };
 	}
 
-	app.get('/users', requirePermission('users.read'), async function (req, res, next) {
+	app.get('/settings/users', requirePermission('users.read'), async function (req, res, next) {
 		try {
 			const page = Math.max(1, Math.floor(Number(req.query.page) || 1));
 			const search = common.getSearchQuery(req);
@@ -81,7 +101,7 @@
 		}
 	});
 
-	app.get('/users/new', requirePermission('users.create'), function (req, res) {
+	app.get('/settings/users/new', requirePermission('users.create'), function (req, res) {
 		fetchRoleOptions().then(function (roles) {
 			res.send(pages.renderUsersAddPage(req.query.message ? String(req.query.message) : '', req.currentUser, mapRolesForForm(roles, []), {}, 'primary'));
 		}).catch(function (error) {
@@ -89,7 +109,7 @@
 		});
 	});
 
-	app.get('/users/:id/duplicate', requirePermission('users.read'), requirePermission('users.create'), async function (req, res, next) {
+	app.get('/settings/users/:id/duplicate', requirePermission('users.read'), requirePermission('users.create'), async function (req, res, next) {
 		try {
 			const userId = Number(req.params.id);
 			if (!Number.isInteger(userId) || userId <= 0) {
@@ -100,8 +120,9 @@
 			if (!user) {
 				return res.status(404).send('User not found.');
 			}
+
 			if (Number(req.currentUser.id) === userId) {
-				return res.redirect('/users?message=' + encodeURIComponent('Use Add user to create another login for yourself.'));
+				return res.redirect('/settings/users?message=' + encodeURIComponent('Use Add user to create another login for yourself.'));
 			}
 
 			const roles = await fetchRoleOptions();
@@ -121,7 +142,7 @@
 		}
 	});
 
-	app.get('/users/:id/edit', requirePermission('users.update'), async function (req, res, next) {
+	app.get('/settings/users/:id/edit', requirePermission('users.update'), async function (req, res, next) {
 		try {
 			const userId = Number(req.params.id);
 			if (!Number.isInteger(userId) || userId <= 0) {
@@ -140,19 +161,62 @@
 			const canDelete = !countRows.length || Number(countRows[0].user_count) > 1;
 
 			const roles = await fetchRoleOptions();
+			const sessions = (await rbacData.fetchActiveUserSessions(pool, userId)).map(function (session) {
+				return {
+					id: Number(session.id),
+					ipAddress: String(session.ip_address || 'Unknown'),
+					userAgent: String(session.user_agent || 'Unknown browser'),
+					createdAtLabel: formatDashboardDate(session.created_at),
+					lastUsedAtLabel: formatDashboardDate(session.last_used_at),
+					expiresAtLabel: formatDashboardDate(session.expires_at)
+				};
+			});
 			res.send(pages.renderUsersEditPage(Object.assign({}, user, {
 				isCurrentUser: false,
 				createdAtLabel: formatDashboardDate(user.created_at),
 				modifiedAtLabel: formatDashboardDate(user.modified_at),
 				roleNames: String(user.roleNames || '').trim() || 'No roles assigned',
 				inUse: !canDelete
-			}), req.query.message ? String(req.query.message) : '', req.currentUser, mapRolesForForm(roles, user.roleIds)));
+			}), req.query.message ? String(req.query.message) : '', req.currentUser, mapRolesForForm(roles, user.roleIds), sessions));
 		} catch (error) {
 			next(error);
 		}
 	});
 
-	app.post('/users', requirePermission('users.create'), async function (req, res, next) {
+	app.post('/settings/users/:id/sessions/:sessionId/revoke', requirePermission('users.update'), async function (req, res, next) {
+		try {
+			const userId = Number(req.params.id);
+			const sessionId = Number(req.params.sessionId);
+			if (!Number.isInteger(userId) || userId <= 0 || !Number.isInteger(sessionId) || sessionId <= 0) {
+				return res.status(400).send('Invalid session.');
+			}
+			if (Number(req.currentUser.id) === userId) {
+				return res.redirect('/account?message=' + encodeURIComponent('Use My Account to manage your own sessions.'));
+			}
+			const [result] = await pool.query('DELETE FROM a_sessions WHERE id = ? AND user_id = ?', [sessionId, userId]);
+			res.redirect('/settings/users/' + userId + '/edit?message=' + encodeURIComponent(result && result.affectedRows ? 'Session signed out.' : 'Session was not found.'));
+		} catch (error) {
+			next(error);
+		}
+	});
+
+	app.post('/settings/users/:id/sessions/revoke-all', requirePermission('users.update'), async function (req, res, next) {
+		try {
+			const userId = Number(req.params.id);
+			if (!Number.isInteger(userId) || userId <= 0) {
+				return res.status(400).send('Invalid user.');
+			}
+			if (Number(req.currentUser.id) === userId) {
+				return res.redirect('/account?message=' + encodeURIComponent('Use My Account to manage your own sessions.'));
+			}
+			await pool.query('DELETE FROM a_sessions WHERE user_id = ?', [userId]);
+			res.redirect('/settings/users/' + userId + '/edit?message=' + encodeURIComponent('All sessions signed out.'));
+		} catch (error) {
+			next(error);
+		}
+	});
+
+	app.post('/settings/users', requirePermission('users.create'), async function (req, res, next) {
 		const connection = await pool.getConnection();
 		try {
 			const name = common.validateMaxLength(req.body.name || '', USER_NAME_MAX_LENGTH, 'Name');
@@ -178,7 +242,7 @@
 			if (!username) {
 				return renderValidationError('Username is required.');
 			}
-			const passwordStrengthMessage = validatePasswordStrength(password);
+			const passwordStrengthMessage = validatePasswordStrength(password, await getPasswordRequirements());
 			if (passwordStrengthMessage) {
 				return renderValidationError(passwordStrengthMessage);
 			}
@@ -198,18 +262,30 @@
 			}
 
 			const passwordRecord = hashPassword(password);
+			const mustChangePassword = await shouldRequirePasswordChange('security.require_password_change_for_new_users');
 			const actorId = getAuditUserId(req);
 			await connection.beginTransaction();
 			const [result] = await connection.query(
-				'INSERT INTO a_users (name, username, password_hash, password_salt, password_iterations, created_by, modified_by) VALUES (?, ?, ?, ?, ?, ?, ?)',
-				[name, username, passwordRecord.hash, passwordRecord.salt, passwordRecord.iterations, actorId, actorId]
+				'INSERT INTO a_users (name, username, password_hash, password_salt, password_iterations, must_change_password, created_by, modified_by) VALUES (?, ?, ?, ?, ?, ?, ?, ?)',
+				[name, username, passwordRecord.hash, passwordRecord.salt, passwordRecord.iterations, mustChangePassword ? 1 : 0, actorId, actorId]
 			);
 			await rbacData.syncUserRoles(connection, result.insertId, roleCheck.roleIds);
 			await connection.commit();
-			if (saveAction === 'new') {
-				return res.redirect('/users/new?message=' + encodeURIComponent('User created.'));
+			if (typeof recordRequestAuditEvent === 'function') {
+				await recordRequestAuditEvent(pool, req, {
+					category: 'users',
+					eventType: 'user.created',
+					actorUserId: actorId,
+					targetType: 'user',
+					targetId: result.insertId,
+					targetLabel: username,
+					details: { roleIds: roleCheck.roleIds }
+				});
 			}
-			res.redirect('/users/' + result.insertId + '/edit?message=' + encodeURIComponent('User created.'));
+			if (saveAction === 'new') {
+				return res.redirect('/settings/users/new?message=' + encodeURIComponent('User created.'));
+			}
+			res.redirect('/settings/users/' + result.insertId + '/edit?message=' + encodeURIComponent('User created.'));
 		} catch (error) {
 			try {
 				await connection.rollback();
@@ -222,7 +298,7 @@
 		}
 	});
 
-	app.post('/users/:id/roles', requirePermission('users.update'), async function (req, res, next) {
+	app.post('/settings/users/:id/roles', requirePermission('users.update'), async function (req, res, next) {
 		try {
 			const userId = Number(req.params.id);
 			if (!Number.isInteger(userId) || userId <= 0) {
@@ -240,17 +316,28 @@
 			const selectedRoleIds = readArrayField(req.body, ['role_ids[]', 'role_ids']);
 			const roleCheck = await validateRoleIds(selectedRoleIds);
 			if (!roleCheck.ok) {
-				return res.redirect('/users/' + userId + '/edit?message=' + encodeURIComponent(roleCheck.message));
+				return res.redirect('/settings/users/' + userId + '/edit?message=' + encodeURIComponent(roleCheck.message));
 			}
 
 			await rbacData.syncUserRoles(pool, userId, roleCheck.roleIds);
-			res.redirect('/users/' + userId + '/edit?message=' + encodeURIComponent('Roles updated.'));
+			if (typeof recordRequestAuditEvent === 'function') {
+				await recordRequestAuditEvent(pool, req, {
+					category: 'users',
+					eventType: 'user.roles_updated',
+					actorUserId: req.currentUser.id,
+					targetType: 'user',
+					targetId: userId,
+					targetLabel: String(userId),
+					details: { roleIds: roleCheck.roleIds }
+				});
+			}
+			res.redirect('/settings/users/' + userId + '/edit?message=' + encodeURIComponent('Roles updated.'));
 		} catch (error) {
 			next(error);
 		}
 	});
 
-	app.post('/users/:id/username', requirePermission('users.update'), async function (req, res, next) {
+	app.post('/settings/users/:id/username', requirePermission('users.update'), async function (req, res, next) {
 		const connection = await pool.getConnection();
 		try {
 			const userId = Number(req.params.id);
@@ -274,6 +361,7 @@
 			}
 
 			const username = common.validateMaxLength(req.body.username || user.username || '', USER_USERNAME_MAX_LENGTH, 'Username');
+			const accountLocked = req.body.account_locked === '1' || (Array.isArray(req.body.account_locked) && req.body.account_locked.includes('1'));
 
 			const [countRows] = await pool.query('SELECT COUNT(*) AS user_count FROM a_users');
 			const canDelete = !countRows.length || Number(countRows[0].user_count) > 1;
@@ -296,7 +384,7 @@
 				return renderValidationError('Username is required.');
 			}
 			if (shouldUpdatePassword) {
-				const passwordStrengthMessage = validatePasswordStrength(password);
+				const passwordStrengthMessage = validatePasswordStrength(password, await getPasswordRequirements());
 				if (passwordStrengthMessage) {
 					return renderValidationError(passwordStrengthMessage);
 				}
@@ -317,25 +405,61 @@
 			}
 
 			await connection.beginTransaction();
-			const [result] = await connection.query('UPDATE a_users SET name = ?, username = ?, modified_by = ? WHERE id = ?', [name, username, getAuditUserId(req), userId]);
+			const [result] = await connection.query('UPDATE a_users SET name = ?, username = ?, account_locked = ?, modified_by = ? WHERE id = ?', [name, username, accountLocked ? 1 : 0, getAuditUserId(req), userId]);
 			if (!result.affectedRows) {
 				await connection.rollback();
 				return res.status(404).send('User not found.');
 			}
 			await rbacData.syncUserRoles(connection, userId, roleCheck.roleIds);
+			if (accountLocked) {
+				await connection.query('DELETE FROM a_sessions WHERE user_id = ?', [userId]);
+			}
 			if (shouldUpdatePassword) {
 				const passwordRecord = hashPassword(password);
+				const mustChangePassword = await shouldRequirePasswordChange('security.require_password_change_after_admin_reset');
 				await connection.query(
-					'UPDATE a_users SET password_hash = ?, password_salt = ?, password_iterations = ?, modified_by = ? WHERE id = ?',
-					[passwordRecord.hash, passwordRecord.salt, passwordRecord.iterations, getAuditUserId(req), userId]
+					'UPDATE a_users SET password_hash = ?, password_salt = ?, password_iterations = ?, must_change_password = ?, modified_by = ? WHERE id = ?',
+					[passwordRecord.hash, passwordRecord.salt, passwordRecord.iterations, mustChangePassword ? 1 : 0, getAuditUserId(req), userId]
 				);
 				await connection.query('DELETE FROM a_sessions WHERE user_id = ?', [userId]);
 			}
 			await connection.commit();
-			if (saveAction === 'new') {
-				return res.redirect('/users/new?message=' + encodeURIComponent('User updated.'));
+			if (typeof recordRequestAuditEvent === 'function') {
+				await recordRequestAuditEvent(pool, req, {
+					category: 'users',
+					eventType: 'user.updated',
+					actorUserId: req.currentUser.id,
+					targetType: 'user',
+					targetId: userId,
+					targetLabel: username,
+					details: { roleIds: roleCheck.roleIds, passwordReset: shouldUpdatePassword, accountLocked: accountLocked }
+				});
+				if (Boolean(user.account_locked) !== accountLocked) {
+					await recordRequestAuditEvent(pool, req, {
+						category: 'security',
+						eventType: accountLocked ? 'account.locked' : 'account.unlocked',
+						actorUserId: req.currentUser.id,
+						targetType: 'user',
+						targetId: userId,
+						targetLabel: username
+					});
+				}
+				if (shouldUpdatePassword) {
+					await recordRequestAuditEvent(pool, req, {
+						category: 'security',
+						eventType: 'password.reset',
+						actorUserId: req.currentUser.id,
+						targetType: 'user',
+						targetId: userId,
+						targetLabel: username,
+						details: { source: 'administrator' }
+					});
+				}
 			}
-			res.redirect('/users?message=' + encodeURIComponent('User updated.'));
+			if (saveAction === 'new') {
+				return res.redirect('/settings/users/new?message=' + encodeURIComponent('User updated.'));
+			}
+			res.redirect('/settings/users?message=' + encodeURIComponent('User updated.'));
 		} catch (error) {
 			try {
 				await connection.rollback();
@@ -348,12 +472,12 @@
 		}
 	});
 
-	app.post('/users/:id/password', requirePermission('users.update'), async function (req, res, next) {
+	app.post('/settings/users/:id/password', requirePermission('users.update'), async function (req, res, next) {
 		try {
 			const userId = Number(req.params.id);
 			const password = String(req.body.password || '');
 			const confirmPassword = String(req.body.confirm_password || '');
-			const editUrl = '/users/' + userId + '/edit';
+			const editUrl = '/settings/users/' + userId + '/edit';
 
 			if (!Number.isInteger(userId) || userId <= 0) {
 				return res.status(400).send('Invalid user.');
@@ -361,7 +485,7 @@
 			if (Number(req.currentUser.id) === userId) {
 				return res.redirect('/account?message=' + encodeURIComponent('Use My Account to change your own password.'));
 			}
-			const passwordStrengthMessage = validatePasswordStrength(password);
+			const passwordStrengthMessage = validatePasswordStrength(password, await getPasswordRequirements());
 			if (passwordStrengthMessage) {
 				return res.redirect(editUrl + '?message=' + encodeURIComponent(passwordStrengthMessage));
 			}
@@ -375,37 +499,60 @@
 			}
 
 			const passwordRecord = hashPassword(password);
+			const mustChangePassword = await shouldRequirePasswordChange('security.require_password_change_after_admin_reset');
 			await pool.query(
-				'UPDATE a_users SET password_hash = ?, password_salt = ?, password_iterations = ?, modified_by = ? WHERE id = ?',
-				[passwordRecord.hash, passwordRecord.salt, passwordRecord.iterations, getAuditUserId(req), userId]
+				'UPDATE a_users SET password_hash = ?, password_salt = ?, password_iterations = ?, must_change_password = ?, modified_by = ? WHERE id = ?',
+				[passwordRecord.hash, passwordRecord.salt, passwordRecord.iterations, mustChangePassword ? 1 : 0, getAuditUserId(req), userId]
 			);
 			await pool.query('DELETE FROM a_sessions WHERE user_id = ?', [userId]);
+			if (typeof recordRequestAuditEvent === 'function') {
+				await recordRequestAuditEvent(pool, req, {
+					category: 'security',
+					eventType: 'password.reset',
+					actorUserId: req.currentUser.id,
+					targetType: 'user',
+					targetId: userId,
+					targetLabel: rows[0].username || String(userId),
+					details: { source: 'administrator' }
+				});
+			}
 			res.redirect(editUrl + '?message=' + encodeURIComponent('Password updated.'));
 		} catch (error) {
 			next(error);
 		}
 	});
 
-	app.post('/users/:id/delete', requirePermission('users.delete'), async function (req, res, next) {
+	app.post('/settings/users/:id/delete', requirePermission('users.delete'), async function (req, res, next) {
 		try {
 			const userId = Number(req.params.id);
 			if (!Number.isInteger(userId) || userId <= 0) {
 				return res.status(400).send('Invalid user.');
 			}
 			if (Number(req.currentUser.id) === userId) {
-				return res.redirect('/users?message=' + encodeURIComponent('You cannot delete your own account from the users page.'));
+				return res.redirect('/settings/users?message=' + encodeURIComponent('You cannot delete your own account from the users page.'));
 			}
 
 			const [countRows] = await pool.query('SELECT COUNT(*) AS user_count FROM a_users');
 			if (!countRows.length || Number(countRows[0].user_count) <= 1) {
-				return res.redirect('/users?message=' + encodeURIComponent('At least one user must remain.'));
+				return res.redirect('/settings/users?message=' + encodeURIComponent('At least one user must remain.'));
 			}
 
+			const [userRows] = await pool.query('SELECT username FROM a_users WHERE id = ? LIMIT 1', [userId]);
 			const [result] = await pool.query('DELETE FROM a_users WHERE id = ?', [userId]);
 			if (!result.affectedRows) {
 				return res.status(404).send('User not found.');
 			}
-			res.redirect('/users?message=' + encodeURIComponent('User deleted.'));
+			if (typeof recordRequestAuditEvent === 'function') {
+				await recordRequestAuditEvent(pool, req, {
+					category: 'users',
+					eventType: 'user.deleted',
+					actorUserId: req.currentUser.id,
+					targetType: 'user',
+					targetId: userId,
+					targetLabel: userRows[0] && userRows[0].username ? userRows[0].username : String(userId)
+				});
+			}
+			res.redirect('/settings/users?message=' + encodeURIComponent('User deleted.'));
 		} catch (error) {
 			next(error);
 		}

src/web/routes/auth/index.js

@@ -1,12 +1,14 @@
 // Authentication route registration for the web app.
 
 const { normalizeReturnToPath, getRequestOrigin } = require('../../lib/auth/session');
+const { fetchAppSettings } = require('../../../data/app-settings');
 
 module.exports = function registerAuthRoutes(app, deps) {
   const pool = deps.pool;
   const pages = deps.pages;
   const createUserSession = deps.createUserSession;
   const setSessionCookie = deps.setSessionCookie;
+  const getSessionMaxAgeMs = deps.getSessionMaxAgeMs;
   const clearSessionCookie = deps.clearSessionCookie;
   const parseCookies = deps.parseCookies;
   const consumeAuthMessageCookie = deps.consumeAuthMessageCookie;
@@ -14,13 +16,65 @@ module.exports = function registerAuthRoutes(app, deps) {
   const hashSessionToken = deps.hashSessionToken;
   const verifyPassword = deps.verifyPassword;
   const sessionCookieName = deps.sessionCookieName;
+  const recordRequestAuditEvent = deps.recordRequestAuditEvent;
 
   function getReturnTo(req) {
     return normalizeReturnToPath(req && (req.query && req.query.returnTo || req.body && req.body.returnTo), getRequestOrigin(req));
   }
 
-  function buildLoginRedirect(returnTo) {
-    return returnTo ? '/login?returnTo=' + encodeURIComponent(returnTo) : '/login';
+  function buildLoginRedirect(returnTo, username) {
+    const query = [];
+    if (returnTo) query.push('returnTo=' + encodeURIComponent(returnTo));
+    if (username) query.push('username=' + encodeURIComponent(username));
+    return query.length ? '/login?' + query.join('&') : '/login';
+  }
+
+  function getClientAddress(req) {
+    const forwardedAddress = String(req && req.headers && req.headers['x-forwarded-for'] || '').split(',')[0].trim();
+    return forwardedAddress || String(req && req.ip || req && req.socket && req.socket.remoteAddress || 'unknown').trim() || 'unknown';
+  }
+
+  function getRateLimitKey(username, address, scope) {
+    if (scope === 'username') return 'username:' + username;
+    if (scope === 'ip') return 'ip:' + address;
+    return 'both:' + JSON.stringify([username, address]);
+  }
+
+  async function getLoginRateLimitSettings() {
+    const settings = await fetchAppSettings(pool);
+    return {
+      maxAttempts: Number(settings['security.login_max_attempts']) || 5,
+      lockoutMinutes: Number(settings['security.login_lockout_minutes']) || 15,
+      scope: String(settings['security.login_rate_limit_scope'] || 'both')
+    };
+  }
+
+  async function getLoginRateLimitStatus(rateKey) {
+    const [rows] = await pool.query('SELECT locked_until FROM a_login_attempts WHERE rate_key = ? LIMIT 1', [rateKey]);
+    const lockedUntil = rows && rows[0] && rows[0].locked_until ? new Date(rows[0].locked_until).getTime() : 0;
+    return {
+      limited: lockedUntil > Date.now(),
+      remainingMinutes: Math.max(1, Math.ceil((lockedUntil - Date.now()) / 60000))
+    };
+  }
+
+  async function recordFailedLogin(rateKey, settings) {
+    const [rows] = await pool.query('SELECT failed_count, locked_until FROM a_login_attempts WHERE rate_key = ? LIMIT 1', [rateKey]);
+    const existing = rows && rows[0] ? rows[0] : null;
+    const existingLockedUntil = existing && existing.locked_until ? new Date(existing.locked_until).getTime() : 0;
+    const currentCount = existingLockedUntil && existingLockedUntil <= Date.now() ? 0 : Number(existing && existing.failed_count) || 0;
+    const failedCount = currentCount + 1;
+    const lockedUntil = failedCount >= settings.maxAttempts ? new Date(Date.now() + settings.lockoutMinutes * 60 * 1000) : null;
+    if (existing) {
+      await pool.query('UPDATE a_login_attempts SET failed_count = ?, last_failed_at = ?, locked_until = ? WHERE rate_key = ?', [failedCount, new Date(), lockedUntil, rateKey]);
+      return lockedUntil ? { remainingMinutes: Math.max(1, Math.ceil((lockedUntil.getTime() - Date.now()) / 60000)) } : null;
+    }
+    await pool.query('INSERT INTO a_login_attempts (rate_key, failed_count, last_failed_at, locked_until) VALUES (?, ?, ?, ?)', [rateKey, failedCount, new Date(), lockedUntil]);
+    return lockedUntil ? { remainingMinutes: Math.max(1, Math.ceil((lockedUntil.getTime() - Date.now()) / 60000)) } : null;
+  }
+
+  async function clearFailedLogins(rateKey) {
+    await pool.query('DELETE FROM a_login_attempts WHERE rate_key = ?', [rateKey]);
   }
 
   app.get('/', function (req, res) {
@@ -36,7 +90,7 @@ module.exports = function registerAuthRoutes(app, deps) {
     const message = typeof consumeAuthMessageCookie === 'function'
       ? consumeAuthMessageCookie(req, res)
       : (req.query.message ? String(req.query.message) : '');
-    res.send(pages.renderLoginPage(message, returnTo));
+    res.send(pages.renderLoginPage(message, returnTo, req.query.username ? String(req.query.username) : ''));
   });
 
   app.post('/login', async function (req, res, next) {
@@ -47,21 +101,92 @@ module.exports = function registerAuthRoutes(app, deps) {
         return res.status(400).send('Username and password are required.');
       }
 
-      const [rows] = await pool.query('SELECT id, name, username, password_hash, password_salt, password_iterations FROM a_users WHERE username = ? LIMIT 1', [username]);
-      const user = rows[0] || null;
-      if (!user || !verifyPassword(password, user)) {
+      const loginRateLimitSettings = await getLoginRateLimitSettings();
+      const rateKey = getRateLimitKey(username.toLowerCase(), getClientAddress(req), loginRateLimitSettings.scope);
+      const rateLimitStatus = await getLoginRateLimitStatus(rateKey);
+      if (rateLimitStatus.limited) {
+        if (typeof recordRequestAuditEvent === 'function') {
+          await recordRequestAuditEvent(pool, req, {
+            category: 'authentication',
+            eventType: 'login.locked_out',
+            targetType: 'user',
+            targetLabel: username,
+            details: { reason: 'rate_limit' }
+          });
+        }
+        const message = 'Too many failed login attempts. Try again in ' + rateLimitStatus.remainingMinutes + ' minute' + (rateLimitStatus.remainingMinutes === 1 ? '' : 's') + '.';
         const returnTo = getReturnTo(req);
         if (typeof setAuthMessageCookie === 'function') {
-          setAuthMessageCookie(res, 'Invalid username or password.');
-          return res.redirect(buildLoginRedirect(returnTo));
+          setAuthMessageCookie(res, message);
+          return res.redirect(buildLoginRedirect(returnTo, username));
         }
-
-        return res.status(401).send(pages.renderLoginPage('Invalid username or password.', returnTo));
+        return res.status(401).send(pages.renderLoginPage(message, returnTo, username));
       }
 
+      const [rows] = await pool.query('SELECT id, name, username, password_hash, password_salt, password_iterations, account_locked FROM a_users WHERE username = ? LIMIT 1', [username]);
+      const user = rows[0] || null;
+      if (user && user.account_locked) {
+        if (typeof recordRequestAuditEvent === 'function') {
+          await recordRequestAuditEvent(pool, req, {
+            category: 'security',
+            eventType: 'login.blocked_account_locked',
+            targetType: 'user',
+            targetId: user.id,
+            targetLabel: user.username
+          });
+        }
+        const returnTo = getReturnTo(req);
+        const message = 'This account is locked. Contact an administrator.';
+        if (typeof setAuthMessageCookie === 'function') {
+          setAuthMessageCookie(res, message);
+          return res.redirect(buildLoginRedirect(returnTo, username));
+        }
+        return res.status(401).send(pages.renderLoginPage(message, returnTo, username));
+      }
+      if (!user || !verifyPassword(password, user)) {
+        const lockout = await recordFailedLogin(rateKey, loginRateLimitSettings);
+        if (typeof recordRequestAuditEvent === 'function') {
+          await recordRequestAuditEvent(pool, req, {
+            category: 'authentication',
+            eventType: lockout ? 'login.lockout' : 'login.failed',
+            targetType: user ? 'user' : 'username',
+            targetId: user ? user.id : null,
+            targetLabel: user ? user.username : username,
+            details: { reason: user ? 'invalid_password' : 'unknown_username' }
+          });
+        }
+        const message = lockout
+          ? 'Too many failed login attempts. Try again in ' + lockout.remainingMinutes + ' minute' + (lockout.remainingMinutes === 1 ? '' : 's') + '.'
+          : 'Invalid username or password.';
+        const returnTo = getReturnTo(req);
+        if (typeof setAuthMessageCookie === 'function') {
+          setAuthMessageCookie(res, message);
+          return res.redirect(buildLoginRedirect(returnTo, username));
+        }
+
+        return res.status(401).send(pages.renderLoginPage(message, returnTo, username));
+      }
+
+      await clearFailedLogins(rateKey);
       const returnTo = getReturnTo(req);
-      const token = await createUserSession(pool, user.id);
-      setSessionCookie(res, token);
+      const sessionMaxAgeMs = typeof getSessionMaxAgeMs === 'function' ? await getSessionMaxAgeMs() : undefined;
+      const token = await createUserSession(pool, user.id, sessionMaxAgeMs, {
+        ipAddress: getClientAddress(req),
+        userAgent: req.headers && req.headers['user-agent']
+      });
+      const rememberMe = req.body.remember_me === '1' || req.body.remember_me === 'true' || req.body.remember_me === true;
+      setSessionCookie(res, token, rememberMe ? sessionMaxAgeMs : null);
+      if (typeof recordRequestAuditEvent === 'function') {
+        await recordRequestAuditEvent(pool, req, {
+          category: 'authentication',
+          eventType: 'login.success',
+          actorUserId: user.id,
+          targetType: 'user',
+          targetId: user.id,
+          targetLabel: user.username,
+          details: { rememberMe: rememberMe }
+        });
+      }
       res.redirect(returnTo || '/dashboard');
     } catch (error) {
       next(error);
@@ -75,6 +200,16 @@ module.exports = function registerAuthRoutes(app, deps) {
       if (token) {
         await pool.query('DELETE FROM a_sessions WHERE session_hash = ?', [hashSessionToken(token)]);
       }
+      if (typeof recordRequestAuditEvent === 'function' && req.currentUser) {
+        await recordRequestAuditEvent(pool, req, {
+          category: 'sessions',
+          eventType: 'session.logout',
+          actorUserId: req.currentUser.id,
+          targetType: 'user',
+          targetId: req.currentUser.id,
+          targetLabel: req.currentUser.username
+        });
+      }
       clearSessionCookie(res);
       if (typeof setAuthMessageCookie === 'function') {
         setAuthMessageCookie(res, 'You have been signed out.');

src/web/routes/auth/login.js

@@ -2,13 +2,14 @@
 
 const { renderView } = require('../../view');
 
-module.exports = function renderLoginPage(message, returnTo) {
+module.exports = function renderLoginPage(message, returnTo, username) {
   return renderView('auth/login', {
     title: 'Sign in',
     authShell: true,
     bodyClass: 'login-page-body',
     message: message || '',
     returnTo: returnTo || '',
+    username: username || '',
     messageVariant: 'warning'
   });
 };

src/web/routes/data-sources/api-sources/routes.js

@@ -5,6 +5,7 @@ const renderApiSourcesPage = require('./list');
 const renderApiSourceAddPage = require('./add');
 const renderApiSourceEditPage = require('./edit');
 const { buildDuplicateApiSourceName, buildDuplicateApiSource } = require('./duplicate');
+const { fetchAppSettings } = require('../../../../data/app-settings');
 
 function toIsoTimestamp(value) {
   if (!value) {
@@ -123,8 +124,16 @@ module.exports = function registerApiSourceRoutes(app, deps) {
     }
   });
 
-  app.get('/data-sources/api-sources/new', requirePermission('api-sources.create'), function (req, res) {
-    res.send(renderApiSourceAddPage(null, req.query.message ? String(req.query.message) : '', req.currentUser));
+  app.get('/data-sources/api-sources/new', requirePermission('api-sources.create'), async function (req, res, next) {
+    try {
+      const settings = await fetchAppSettings(pool);
+      res.send(renderApiSourceAddPage({
+        updateIntervalValue: settings['data-sources.api_default_interval_value'],
+        updateIntervalUnit: settings['data-sources.api_default_interval_unit']
+      }, req.query.message ? String(req.query.message) : '', req.currentUser));
+    } catch (error) {
+      next(error);
+    }
   });
 
   app.get('/data-sources/api-sources/:id/edit', requirePermission('api-sources.update'), async function (req, res, next) {

src/web/routes/data-sources/rss-feeds/routes.js

@@ -5,6 +5,7 @@ const renderRssFeedsPage = require('./list');
 const renderRssFeedAddPage = require('./add');
 const renderRssFeedEditPage = require('./edit');
 const { buildDuplicateRssFeedName, buildDuplicateRssFeed } = require('./duplicate');
+const { fetchAppSettings } = require('../../../../data/app-settings');
 
 async function getDataSourceUsageMaps(pool, common) {
   const [slides] = await pool.query('SELECT content_json FROM c_slides WHERE content_json IS NOT NULL');
@@ -99,8 +100,16 @@ module.exports = function registerRssFeedRoutes(app, deps) {
     }
   });
 
-  app.get('/data-sources/rss-feeds/new', requirePermission('rss-feeds.create'), function (req, res) {
-    res.send(renderRssFeedAddPage(null, req.query.message ? String(req.query.message) : '', req.currentUser));
+  app.get('/data-sources/rss-feeds/new', requirePermission('rss-feeds.create'), async function (req, res, next) {
+    try {
+      const settings = await fetchAppSettings(pool);
+      res.send(renderRssFeedAddPage({
+        updateIntervalValue: settings['data-sources.rss_default_interval_value'],
+        updateIntervalUnit: settings['data-sources.rss_default_interval_unit']
+      }, req.query.message ? String(req.query.message) : '', req.currentUser));
+    } catch (error) {
+      next(error);
+    }
   });
 
   app.get('/data-sources/rss-feeds/:id/edit', requirePermission('rss-feeds.update'), async function (req, res, next) {

src/web/routes/register.js

@@ -15,6 +15,8 @@ const registerRssFeedRoutes = require('./data-sources/rss-feeds/routes');
 const registerTimetableRoutes = require('./data-sources/timetables/routes');
 const registerSettingsRoutes = require('./settings/background-tasks');
 const registerFontRoutes = require('./settings/fonts');
+const registerSettingsPageRoutes = require('./settings/routes');
+const registerAuditLogRoutes = require('./settings/audit-log');
 const registerAboutRoutes = require('./settings/about/routes');
 const registerInternalSyncRoutes = require('./internal/sync');
 const registerScreensRoutes = require('./signage/screens/routes');
@@ -25,6 +27,18 @@ function registerRoutes(app, deps) {
   registerAuthAndAccountRoutes(app, deps);
   registerSignageRoutes(app, deps);
   registerSettingsAndContentRoutes(app, deps);
+  registerSettingsPageRoutes(app, {
+    pool: deps.pool,
+    pages: deps.pages,
+    mediaDir: deps.mediaDir,
+    requirePermission: deps.requirePermission,
+    recordRequestAuditEvent: deps.recordRequestAuditEvent
+  });
+  registerAuditLogRoutes(app, {
+    pool: deps.pool,
+    formatDashboardDate: deps.formatDashboardDate,
+    setAuthMessageCookie: deps.setAuthMessageCookie
+  });
   registerAboutRoutes(app, deps);
   registerInternalSyncRoutes(app, {
     backgroundTaskQueue: deps.backgroundTaskQueue,
@@ -52,13 +66,16 @@ function registerAuthAndAccountRoutes(app, deps) {
     pages: deps.pages,
     createUserSession: deps.createUserSession,
     setSessionCookie: deps.setSessionCookie,
+    getSessionMaxAgeMs: deps.getSessionMaxAgeMs,
+    getConfiguredMaxActiveSessions: deps.getConfiguredMaxActiveSessions,
     clearSessionCookie: deps.clearSessionCookie,
     setAuthMessageCookie: deps.setAuthMessageCookie,
     consumeAuthMessageCookie: deps.consumeAuthMessageCookie,
     parseCookies: deps.parseCookies,
     hashSessionToken: deps.hashSessionToken,
     verifyPassword: deps.verifyPassword,
-    sessionCookieName: deps.sessionCookieName
+    sessionCookieName: deps.sessionCookieName,
+    recordRequestAuditEvent: deps.recordRequestAuditEvent
   });
 
   registerPagesRoutes(app, {
@@ -82,7 +99,12 @@ function registerAuthAndAccountRoutes(app, deps) {
     hashPassword: deps.hashPassword,
     validatePasswordStrength: deps.validatePasswordStrength,
     createUserSession: deps.createUserSession,
-    setSessionCookie: deps.setSessionCookie
+    setSessionCookie: deps.setSessionCookie,
+    getSessionMaxAgeMs: deps.getSessionMaxAgeMs,
+    parseCookies: deps.parseCookies,
+    hashSessionToken: deps.hashSessionToken,
+    sessionCookieName: deps.sessionCookieName,
+    recordRequestAuditEvent: deps.recordRequestAuditEvent
   });
 
   registerUsersRoutes(app, {
@@ -95,7 +117,8 @@ function registerAuthAndAccountRoutes(app, deps) {
     validatePasswordStrength: deps.validatePasswordStrength,
     readArrayField: deps.readArrayField,
     rbacData: deps.rbacData,
-    requirePermission: deps.requirePermission
+    requirePermission: deps.requirePermission,
+    recordRequestAuditEvent: deps.recordRequestAuditEvent
   });
 }
 
@@ -114,7 +137,8 @@ function registerSignageRoutes(app, deps) {
     notifyPlayerScreens: deps.notifyPlayerScreens,
     broadcastDashboardState: deps.broadcastDashboardState,
     getPlaylistDeleteBlockMessage: deps.playerActionService.getPlaylistDeleteBlockMessage,
-    requirePermission: deps.requirePermission
+     requirePermission: deps.requirePermission,
+     recordRequestAuditEvent: deps.recordRequestAuditEvent
   });
 
   registerManageRoutes(app, {
@@ -130,7 +154,8 @@ function registerSignageRoutes(app, deps) {
     forwardPlayerCommand: deps.playerActionService.forwardPlayerCommand,
     forwardPlayerCommandToBaseUrl: deps.playerActionService.forwardPlayerCommandToBaseUrl,
     forwardPlayerCommandToDevice: deps.playerActionService.forwardPlayerCommandToDevice,
-    requirePermission: deps.requirePermission
+     requirePermission: deps.requirePermission,
+     recordRequestAuditEvent: deps.recordRequestAuditEvent
   });
 
   registerAnnouncementRoutes(app, {
@@ -169,7 +194,8 @@ function registerSettingsAndContentRoutes(app, deps) {
     readArrayField: deps.readArrayField,
     permissions: PERMISSIONS,
     normalizePermissionKeys: normalizePermissionKeys,
-    requirePermission: deps.requirePermission
+    requirePermission: deps.requirePermission,
+    recordRequestAuditEvent: deps.recordRequestAuditEvent
   });
 
   registerContentRoutes(app, {
@@ -195,7 +221,8 @@ function registerSettingsAndContentRoutes(app, deps) {
     getSlideDeleteBlockMessage: deps.playerActionService.getSlideDeleteBlockMessage,
     getTemplateDeleteBlockMessage: deps.playerActionService.getTemplateDeleteBlockMessage,
     getCanvasSizeDeleteBlockMessage: deps.playerActionService.getCanvasSizeDeleteBlockMessage,
-    requirePermission: deps.requirePermission
+     requirePermission: deps.requirePermission,
+     recordRequestAuditEvent: deps.recordRequestAuditEvent
   });
 
   registerRootDataSourceRoutes(app, {

src/web/routes/settings/audit-log.js

@@ -0,0 +1,181 @@
+const { renderView } = require('#src/web/view');
+const { hasPermission, PERMISSION_DENIED_MESSAGE } = require('#src/rbac');
+const { AUDIT_CATEGORY_KEYS } = require('#src/data/audit-log');
+const { buildPagination } = require('#src/web/lib/pagination');
+const { createSearchMatcher, getSearchQuery, getSortDirectionQuery, getSortQuery, parsePageNumber, sortRows } = require('#src/web/lib/list-query');
+
+const PAGE_SIZE = 25;
+
+function requireAuditLogAccess(setAuthMessageCookie) {
+  return function (req, res, next) {
+    if (!req.currentUser) {
+      if (typeof setAuthMessageCookie === 'function') {
+        setAuthMessageCookie(res, 'Please sign in to continue.');
+      }
+      return res.redirect('/login');
+    }
+    if (hasPermission(req.currentUser, 'audit-log.read')) {
+      return next();
+    }
+    const error = new Error(PERMISSION_DENIED_MESSAGE);
+    error.statusCode = 403;
+    error.expose = true;
+    return next(error);
+  };
+}
+
+function requireAuditExportAccess(setAuthMessageCookie) {
+  return function (req, res, next) {
+    if (!req.currentUser) {
+      if (typeof setAuthMessageCookie === 'function') setAuthMessageCookie(res, 'Please sign in to continue.');
+      return res.redirect('/login');
+    }
+    if (hasPermission(req.currentUser, 'audit-log.allow')) return next();
+    const error = new Error(PERMISSION_DENIED_MESSAGE);
+    error.statusCode = 403;
+    error.expose = true;
+    return next(error);
+  };
+}
+
+function csvCell(value) {
+  let text = String(value === undefined || value === null ? '' : value);
+  if (/^[=+\-@]/.test(text)) text = "'" + text;
+  return '"' + text.replace(/"/g, '""').replace(/\r?\n/g, ' ') + '"';
+}
+
+function mapAuditRow(row, formatDashboardDate) {
+  let details = '';
+  if (row.details_json) {
+    try {
+      details = JSON.stringify(typeof row.details_json === 'string' ? JSON.parse(row.details_json) : row.details_json);
+    } catch (_error) {
+      details = String(row.details_json);
+    }
+  }
+  const occurredAt = new Date(row.occurred_at);
+  return Object.assign({}, row, {
+    occurredAtValue: Number.isNaN(occurredAt.getTime()) ? '' : occurredAt.toISOString(),
+    occurredAtLabel: formatDashboardDate(row.occurred_at),
+    actorLabel: row.actor_name || row.actor_username || 'System',
+    eventLabel: String(row.event_type || '').replace(/[._-]+/g, ' '),
+    targetLabelDisplay: row.target_label || (row.target_type && row.target_id ? row.target_type + ' #' + row.target_id : ''),
+    detailsDisplay: details
+  });
+}
+
+function filterAuditRows(rows, req, formatDashboardDate) {
+  const category = String(req.query.category || '').trim().toLowerCase();
+  const eventType = String(req.query.event_type || '').trim().toLowerCase();
+  const search = getSearchQuery(req);
+  const requestedSort = getSortQuery(req);
+  const sort = requestedSort || 'time';
+  const direction = requestedSort ? getSortDirectionQuery(req) : 'desc';
+  const mappedRows = (rows || []).map(function (row) { return mapAuditRow(row, formatDashboardDate); });
+  const filteredRows = sortRows(mappedRows.filter(function (event) {
+    return (!category || event.category === category) && (!eventType || event.event_type === eventType);
+  }).filter(createSearchMatcher(search, ['category', 'event_type', 'actorLabel', 'targetLabelDisplay', 'ip_address', 'user_agent'])), function (event) {
+    if (sort === 'event') return event.eventLabel;
+    if (sort === 'actor') return event.actorLabel;
+    if (sort === 'target') return event.targetLabelDisplay;
+    if (sort === 'category') return event.category;
+    return event.occurred_at;
+  }, direction);
+  return { rows: filteredRows, category: category, eventType: eventType, search: search, sort: sort, direction: direction };
+}
+
+async function fetchAuditRows(pool) {
+  const [rows] = await pool.query(
+    `SELECT e.id, e.occurred_at, e.category, e.event_type, e.target_type, e.target_id,
+            e.target_label, e.ip_address, e.user_agent, e.details_json,
+            u.name AS actor_name, u.username AS actor_username
+       FROM o_audit_events e
+       LEFT JOIN a_users u ON u.id = e.actor_user_id
+     ORDER BY e.occurred_at DESC, e.id DESC`, []
+  );
+  return rows || [];
+}
+
+module.exports = function registerAuditLogRoutes(app, deps) {
+  const pool = deps.pool;
+  const formatDashboardDate = deps.formatDashboardDate;
+  if (!pool || typeof formatDashboardDate !== 'function') {
+    throw new Error('registerAuditLogRoutes requires pool and formatDashboardDate.');
+  }
+
+  app.get('/settings/audit-log', requireAuditLogAccess(deps.setAuthMessageCookie), async function (req, res, next) {
+    try {
+      const category = String(req.query.category || '').trim().toLowerCase();
+      const eventType = String(req.query.event_type || '').trim().toLowerCase();
+      const search = getSearchQuery(req);
+      const sort = getSortQuery(req);
+      const direction = getSortDirectionQuery(req);
+      const filtered = filterAuditRows(await fetchAuditRows(pool), req, formatDashboardDate);
+      const filteredEvents = filtered.rows;
+      const eventTypes = Array.from(new Set(filtered.rows.map(function (event) {
+        return String(event.event_type || '').trim();
+      }).filter(Boolean))).sort();
+      const exportQuery = new URLSearchParams({
+        category: filtered.category,
+        event_type: filtered.eventType,
+        search: filtered.search,
+        sort: filtered.sort,
+        direction: filtered.direction
+      }).toString();
+      const pagination = buildPagination(filteredEvents.length, parsePageNumber(req.query.page), 'page', {
+        search: search,
+        sort: sort,
+        direction: direction,
+        category: category,
+        event_type: eventType
+      }, PAGE_SIZE, 'events', 'Audit event pages');
+      const startIndex = (pagination.currentPage - 1) * PAGE_SIZE;
+      const events = filteredEvents.slice(startIndex, startIndex + PAGE_SIZE);
+      res.send(renderView('settings/audit-log/index', {
+        title: 'Audit log',
+        active: 'audit-log',
+        currentUser: req.currentUser,
+        events: events,
+        categories: AUDIT_CATEGORY_KEYS,
+        eventTypes: eventTypes,
+        selectedCategory: category,
+        selectedEventType: eventType,
+        search: search,
+        sort: sort,
+        direction: direction,
+        pagination: pagination,
+        exportUrl: '/settings/audit-log/export' + (exportQuery ? '?' + exportQuery : '')
+      }));
+    } catch (error) {
+      next(error);
+    }
+  });
+
+  app.get('/settings/audit-log/export', requireAuditExportAccess(deps.setAuthMessageCookie), async function (req, res, next) {
+    try {
+      const filtered = filterAuditRows(await fetchAuditRows(pool), req, formatDashboardDate);
+      const lines = [
+        ['Occurred At (UTC)', 'Category', 'Event Type', 'Actor', 'Target Type', 'Target ID', 'Target', 'IP Address', 'User Agent', 'Details'].map(csvCell).join(',')
+      ];
+      filtered.rows.forEach(function (event) {
+        lines.push([
+          event.occurredAtValue,
+          event.category,
+          event.event_type,
+          event.actorLabel,
+          event.target_type,
+          event.target_id,
+          event.targetLabelDisplay,
+          event.ip_address,
+          event.user_agent,
+          event.detailsDisplay
+        ].map(csvCell).join(','));
+      });
+      res.setHeader('Content-Type', 'text/csv; charset=utf-8');
+      res.setHeader('Content-Disposition', 'attachment; filename="pulse-signage-audit-log.csv"');
+      res.send('\ufeff' + lines.join('\r\n') + '\r\n');
+    } catch (error) {
+      next(error);
+    }
+  });
+};

src/web/routes/settings/index.js

@@ -0,0 +1,19 @@
+// Visual-only application settings page.
+
+const { renderView } = require('../../view');
+
+module.exports = function renderSettingsPage(settings, suggestedAnnouncementIcons, currentUser, message, mediaSettings, diagnostics) {
+  const iconOptions = Array.isArray(suggestedAnnouncementIcons) ? suggestedAnnouncementIcons : [];
+  return renderView('settings/system/index', {
+    title: 'Settings',
+    active: 'settings',
+    currentUser: currentUser || null,
+    message: message || '',
+    settings: settings || {},
+    suggestedAnnouncementIcons: iconOptions,
+    defaultAnnouncementIconSuggestions: iconOptions.filter(function (option) { return option.isSelected; }),
+    mediaSettings: mediaSettings || {},
+    diagnostics: diagnostics || {},
+    scripts: ['js/icon-picker.js', 'js/settings/settings-page.js']
+  });
+};

src/web/routes/settings/rbac/form-view-model.js

@@ -53,17 +53,17 @@ function buildPermissionSections(permissionGroups) {
     });
 
     section.groups.sort(function (left, right) {
-      const leftIndex = toSortIndex(left.resourceIndex);
-      const rightIndex = toSortIndex(right.resourceIndex);
-      if (leftIndex !== rightIndex) {
-        return leftIndex - rightIndex;
-      }
-
       const leftOrder = toSortIndex(left.resourceOrder);
       const rightOrder = toSortIndex(right.resourceOrder);
       if (leftOrder !== rightOrder) {
         return leftOrder - rightOrder;
       }
+
+      const leftIndex = toSortIndex(left.resourceIndex);
+      const rightIndex = toSortIndex(right.resourceIndex);
+      if (leftIndex !== rightIndex) {
+        return leftIndex - rightIndex;
+      }
       return String(left.title || '').localeCompare(String(right.title || ''));
     });
 
@@ -77,17 +77,17 @@ function buildPermissionSections(permissionGroups) {
   });
 
   sections.sort(function (left, right) {
-    const leftIndex = toSortIndex(left.sourceIndex);
-    const rightIndex = toSortIndex(right.sourceIndex);
-    if (leftIndex !== rightIndex) {
-      return leftIndex - rightIndex;
-    }
-
     const leftOrder = toSortIndex(left.sectionOrder);
     const rightOrder = toSortIndex(right.sectionOrder);
     if (leftOrder !== rightOrder) {
       return leftOrder - rightOrder;
     }
+
+    const leftIndex = toSortIndex(left.sourceIndex);
+    const rightIndex = toSortIndex(right.sourceIndex);
+    if (leftIndex !== rightIndex) {
+      return leftIndex - rightIndex;
+    }
     return String(left.title || '').localeCompare(String(right.title || ''));
   });
 
@@ -101,9 +101,10 @@ function buildRbacAddViewModel(message, currentUser, formValues, permissionGroup
     isEdit: false,
     usersPresent: true,
     formId: 'role-create-form',
-    formAction: '/rbac',
-    footerSaveUrl: '/rbac',
-    footerCancelUrl: '/rbac',
+    formAction: '/settings/roles',
+    footerSaveUrl: '/settings/roles',
+    footerCancelUrl: '/settings/roles',
+    cancelConfirmMessage: "You've made changes. Are you sure you want to leave this page?",
     footerDeleteUrl: '',
     footerDeleteDisabled: true,
     footerDeleteTitle: 'Delete is available after the role has been created.',
@@ -116,9 +117,9 @@ function buildRbacAddViewModel(message, currentUser, formValues, permissionGroup
     permissionSections: buildPermissionSections(permissionGroups),
     users: users || [],
     pagination: pagination || null,
-    roleEditBasePath: '/rbac/new',
+    roleEditBasePath: '/settings/roles/new',
     scripts: ['js/rbac-permissions.js'],
-    formAttrs: 'data-async-save data-async-save-close-url="/rbac" data-async-save-new-redirect="response-url" data-async-save-new-url="/rbac/new"'
+    formAttrs: 'data-async-save data-async-save-close-url="/settings/roles" data-async-save-new-redirect="response-url" data-async-save-new-url="/settings/roles/new"'
   };
 }
 
@@ -129,10 +130,11 @@ function buildRbacEditViewModel(role, message, currentUser, permissionGroups, us
     isEdit: true,
     usersPresent: true,
     formId: 'role-edit-form',
-    formAction: '/rbac/' + Number(role && role.id),
-    footerSaveUrl: '/rbac/' + Number(role && role.id),
-    footerCancelUrl: '/rbac',
-    footerDeleteUrl: '/rbac/' + Number(role && role.id) + '/delete',
+    formAction: '/settings/roles/' + Number(role && role.id),
+    footerSaveUrl: '/settings/roles/' + Number(role && role.id),
+    footerCancelUrl: '/settings/roles',
+    cancelConfirmMessage: "You've made changes. Are you sure you want to leave this page?",
+    footerDeleteUrl: '/settings/roles/' + Number(role && role.id) + '/delete',
     footerDeleteDisabled: Boolean(role && role.inUse),
     footerDeleteTitle: role && role.inUse ? 'Delete is disabled while this role is assigned to users.' : '',
     footerShowDelete: true,
@@ -144,9 +146,9 @@ function buildRbacEditViewModel(role, message, currentUser, permissionGroups, us
     permissionSections: buildPermissionSections(permissionGroups),
     users: users || [],
     pagination: pagination || null,
-    roleEditBasePath: '/rbac/' + Number(role && role.id) + '/edit',
+    roleEditBasePath: '/settings/roles/' + Number(role && role.id) + '/edit',
     scripts: ['js/rbac-permissions.js'],
-    formAttrs: 'data-async-save data-async-save-close-url="/rbac" data-async-save-new-url="/rbac/new"'
+    formAttrs: 'data-async-save data-async-save-close-url="/settings/roles" data-async-save-new-url="/settings/roles/new"'
   };
 }
 

src/web/routes/settings/routes.js

@@ -0,0 +1,397 @@
+// Settings page route registration.
+
+const { ANNOUNCEMENT_ICON_CATALOG } = require('#src/data/announcement-icons');
+const { AUDIT_CATEGORY_KEYS, AUDIT_CATEGORY_LABELS } = require('#src/data/audit-log');
+const { fetchAppSettings, saveAppSettings } = require('#src/data/app-settings');
+const { appVersion, detectSchemaVersion } = require('#src/db/migrations');
+
+const UPLOAD_MIME_TYPE_OPTIONS = [
+  { value: 'image/png', label: 'PNG', category: 'Images' },
+  { value: 'image/jpeg', label: 'JPEG', category: 'Images' },
+  { value: 'image/gif', label: 'GIF', category: 'Images' },
+  { value: 'image/webp', label: 'WebP', category: 'Images' },
+  { value: 'image/svg+xml', label: 'SVG', category: 'Images' },
+  { value: 'video/mp4', label: 'MP4', category: 'Video' },
+  { value: 'video/webm', label: 'WebM', category: 'Video' },
+  { value: 'video/ogg', label: 'Ogg', category: 'Video' }
+];
+
+module.exports = function registerSettingsPageRoutes(app, deps) {
+  const pages = deps.pages;
+  const pool = deps.pool;
+  const recordRequestAuditEvent = deps.recordRequestAuditEvent;
+
+  if (!pages || !pool || typeof deps.requirePermission !== 'function') {
+    throw new Error('registerSettingsPageRoutes requires pool, pages, and requirePermission.');
+  }
+
+  const requireSettingsRead = deps.requirePermission('system-settings.read');
+  const MAX_SUGGESTED_ICONS = 48;
+  const SECTION_SETTING_KEYS = {
+    defaults: [
+      'player.default_slide_duration_seconds',
+      'player.default_fade_between_slides',
+      'player.skip_unavailable_rtmp',
+      'announcements.default_icon',
+      'announcements.default_duration_value',
+      'announcements.default_duration_unit',
+      'data-sources.rss_default_interval_value',
+      'data-sources.rss_default_interval_unit',
+      'data-sources.api_default_interval_value',
+      'data-sources.api_default_interval_unit'
+    ],
+    security: [
+      'security.session_lifetime_days',
+      'security.allow_user_session_revocation',
+      'security.max_active_sessions',
+      'security.login_max_attempts',
+      'security.login_lockout_minutes',
+      'security.login_rate_limit_scope',
+      'security.password_min_length',
+      'security.password_min_categories',
+      'security.password_require_lowercase',
+      'security.password_require_uppercase',
+      'security.password_require_number',
+      'security.password_require_symbol',
+      'security.require_password_change_for_new_users',
+      'security.require_password_change_after_admin_reset'
+    ],
+    audit: ['audit.enabled', 'audit.categories', 'audit.include_request_metadata', 'audit.retention_days'],
+    media: ['uploads.image_max_bytes', 'uploads.video_max_bytes', 'uploads.wysiwyg_image_max_bytes', 'uploads.allowed_mime_types'],
+    icons: ['announcements.suggested_icons']
+  };
+
+  function buildSettingChanges(previousSettings, nextSettings, keys) {
+    const changes = {};
+    (Array.isArray(keys) ? keys : []).forEach(function (key) {
+      const previousValue = previousSettings && previousSettings[key];
+      const nextValue = nextSettings[key];
+      if (JSON.stringify(previousValue) !== JSON.stringify(nextValue)) {
+        changes[key] = { from: previousValue, to: nextValue };
+      }
+    });
+    return changes;
+  }
+
+  async function recordSettingsAuditEvent(req, previousSettings, nextSettings, section) {
+    if (typeof recordRequestAuditEvent !== 'function') {
+      return;
+    }
+    const changes = buildSettingChanges(previousSettings, nextSettings, SECTION_SETTING_KEYS[section]);
+    const changedKeys = Object.keys(changes);
+    if (!changedKeys.length) {
+      return;
+    }
+    await recordRequestAuditEvent(pool, req, {
+      category: 'system-settings',
+      eventType: 'system-settings.updated',
+      actorUserId: req.currentUser && req.currentUser.id,
+      targetType: 'settings',
+      targetId: section,
+      targetLabel: section,
+      details: { section: section, changes: changes }
+    });
+  }
+
+  function buildSuggestedAnnouncementIcons(settings) {
+    const configuredKeys = settings && Array.isArray(settings['announcements.suggested_icons'])
+      ? settings['announcements.suggested_icons']
+      : [];
+    const selectedKeys = new Set(configuredKeys.map(function (key) {
+      return String(key || '').trim().toLowerCase();
+    }));
+    const catalogByKey = new Map(ANNOUNCEMENT_ICON_CATALOG.map(function (option) {
+      return [option.value, option];
+    }));
+    const selectedOptions = Array.from(new Set(configuredKeys.map(function (key) {
+      return catalogByKey.get(String(key || '').trim().toLowerCase()) || null;
+    }).filter(Boolean)));
+    const remainingOptions = ANNOUNCEMENT_ICON_CATALOG.filter(function (option) {
+      return !selectedKeys.has(option.value);
+    });
+    return selectedOptions.concat(remainingOptions).map(function (option) {
+      return Object.assign({}, option, {
+        isSelected: selectedKeys.has(option.value),
+        isDefault: selectedOptions.length > 0 && selectedOptions[0].value === option.value
+      });
+    });
+  }
+
+  async function renderSettings(req, res, message) {
+    const settings = await fetchAppSettings(pool);
+    const diagnostics = await buildDiagnostics();
+    res.send(pages.renderSettingsPage(settings, buildSuggestedAnnouncementIcons(settings), req.currentUser, message, {
+      imageMaxMb: Math.round(Number(settings['uploads.image_max_bytes']) / 1024 / 1024),
+      videoMaxMb: Math.round(Number(settings['uploads.video_max_bytes']) / 1024 / 1024),
+      wysiwygImageMaxMb: (Number(settings['uploads.wysiwyg_image_max_bytes']) / 1024 / 1024).toFixed(2).replace(/0+$/, '').replace(/\.$/, '')
+      ,allowedMimeTypes: UPLOAD_MIME_TYPE_OPTIONS.map(function (option) {
+        return Object.assign({}, option, { isSelected: settings['uploads.allowed_mime_types'].indexOf(option.value) !== -1 });
+      }),
+      imageMimeTypes: UPLOAD_MIME_TYPE_OPTIONS.filter(function (option) { return option.category === 'Images'; }).map(function (option) {
+        return Object.assign({}, option, { isSelected: settings['uploads.allowed_mime_types'].indexOf(option.value) !== -1 });
+      }),
+      videoMimeTypes: UPLOAD_MIME_TYPE_OPTIONS.filter(function (option) { return option.category === 'Video'; }).map(function (option) {
+        return Object.assign({}, option, { isSelected: settings['uploads.allowed_mime_types'].indexOf(option.value) !== -1 });
+          }),
+          sessionLifetimeDays: Number(settings['security.session_lifetime_days']) || 14,
+          allowUserSessionRevocation: Boolean(settings['security.allow_user_session_revocation']),
+          maxActiveSessions: Number(settings['security.max_active_sessions']) || 0,
+          loginMaxAttempts: Number(settings['security.login_max_attempts']) || 5,
+          loginLockoutMinutes: Number(settings['security.login_lockout_minutes']) || 15,
+          loginRateLimitScope: String(settings['security.login_rate_limit_scope'] || 'both'),
+          passwordMinLength: Number(settings['security.password_min_length']) || 10,
+          passwordMinCategories: Number(settings['security.password_min_categories']) || 3,
+          passwordRequireLowercase: Boolean(settings['security.password_require_lowercase']),
+          passwordRequireUppercase: Boolean(settings['security.password_require_uppercase']),
+          passwordRequireNumber: Boolean(settings['security.password_require_number']),
+          passwordRequireSymbol: Boolean(settings['security.password_require_symbol']),
+          requirePasswordChangeForNewUsers: Boolean(settings['security.require_password_change_for_new_users']),
+              requirePasswordChangeAfterAdminReset: Boolean(settings['security.require_password_change_after_admin_reset']),
+              defaultSlideDurationSeconds: Number(settings['player.default_slide_duration_seconds']) || 10,
+              defaultFadeBetweenSlides: Boolean(settings['player.default_fade_between_slides']),
+              defaultSkipUnavailableRtmp: Boolean(settings['player.skip_unavailable_rtmp']),
+              defaultAnnouncementIcon: String(settings['announcements.default_icon'] || 'megaphone-fill'),
+              defaultAnnouncementDurationValue: Number(settings['announcements.default_duration_value']) || 10,
+              defaultAnnouncementDurationUnit: String(settings['announcements.default_duration_unit'] || 'seconds')
+              ,rssDefaultIntervalValue: Number(settings['data-sources.rss_default_interval_value']) || 60
+              ,rssDefaultIntervalUnit: String(settings['data-sources.rss_default_interval_unit'] || 'minutes')
+              ,apiDefaultIntervalValue: Number(settings['data-sources.api_default_interval_value']) || 60
+              ,apiDefaultIntervalUnit: String(settings['data-sources.api_default_interval_unit'] || 'minutes')
+              ,auditRetentionDays: Number(settings['audit.retention_days']) || 0
+              ,auditEnabled: Boolean(settings['audit.enabled'])
+              ,auditIncludeRequestMetadata: Boolean(settings['audit.include_request_metadata'])
+              ,auditCategories: AUDIT_CATEGORY_KEYS.map(function (category) {
+                return { key: category, label: AUDIT_CATEGORY_LABELS[category] || category, isSelected: settings['audit.categories'].includes(category) };
+              })
+              ,auditEventCategories: AUDIT_CATEGORY_KEYS.filter(function (category) { return category !== 'users' && category !== 'roles' && category !== 'system-settings' && category !== 'slides' && category !== 'templates' && category !== 'playlists' && category !== 'screens' && category !== 'announcements' && category !== 'canvas-sizes' && category !== 'api-sources' && category !== 'rss-feeds' && category !== 'timetables'; }).map(function (category) {
+                return { key: category, label: AUDIT_CATEGORY_LABELS[category] || category, isSelected: settings['audit.categories'].includes(category) };
+              })
+              ,auditAdministrationCategories: AUDIT_CATEGORY_KEYS.filter(function (category) { return category === 'users' || category === 'roles' || category === 'system-settings'; }).map(function (category) {
+                return { key: category, label: AUDIT_CATEGORY_LABELS[category] || category, isSelected: settings['audit.categories'].includes(category) };
+              })
+              ,auditContentCategories: AUDIT_CATEGORY_KEYS.filter(function (category) { return category === 'slides' || category === 'templates' || category === 'playlists' || category === 'screens' || category === 'announcements' || category === 'canvas-sizes'; }).map(function (category) {
+                return { key: category, label: AUDIT_CATEGORY_LABELS[category] || category, isSelected: settings['audit.categories'].includes(category) };
+              })
+              ,auditDataSourceCategories: AUDIT_CATEGORY_KEYS.filter(function (category) { return category === 'api-sources' || category === 'rss-feeds' || category === 'timetables'; }).map(function (category) {
+                return { key: category, label: AUDIT_CATEGORY_LABELS[category] || category, isSelected: settings['audit.categories'].includes(category) };
+              })
+    }, diagnostics));
+  }
+
+  async function buildDiagnostics() {
+    const diagnostics = {
+      applicationVersion: appVersion,
+      schemaVersion: 'Unknown',
+      databaseStatus: 'Unavailable',
+      activeSessionCount: 0,
+      backgroundTaskCount: 0,
+      criticalTableCounts: []
+    };
+    try {
+      await pool.query('SELECT 1 AS health');
+      diagnostics.databaseStatus = 'Connected';
+      diagnostics.schemaVersion = await detectSchemaVersion(pool);
+      const [sessionRows] = await pool.query('SELECT COUNT(*) AS count FROM a_sessions WHERE expires_at > NOW()');
+      diagnostics.activeSessionCount = Number(sessionRows && sessionRows[0] && sessionRows[0].count) || 0;
+      const [taskRows] = await pool.query('SELECT COUNT(*) AS count FROM o_background_tasks');
+      diagnostics.backgroundTaskCount = Number(taskRows && taskRows[0] && taskRows[0].count) || 0;
+      const criticalTables = [
+        ['Users', 'a_users'],
+        ['Roles', 'a_roles'],
+        ['Screens', 'd_screens'],
+        ['Playlists', 'c_playlists'],
+        ['Slides', 'c_slides'],
+        ['Templates', 'c_templates'],
+        ['Announcements', 'd_announcements'],
+        ['RSS feeds', 'i_rss_feeds'],
+        ['API sources', 'i_api_sources']
+      ];
+      for (const [label, tableName] of criticalTables) {
+        try {
+          const [rows] = await pool.query('SELECT COUNT(*) AS count FROM ' + tableName);
+          diagnostics.criticalTableCounts.push({ label: label, count: Number(rows && rows[0] && rows[0].count) || 0 });
+        } catch (_error) {
+          diagnostics.criticalTableCounts.push({ label: label, count: 'Unavailable' });
+        }
+      }
+    } catch (_error) {
+      // Keep diagnostics page renderable while the database is unavailable.
+    }
+    return diagnostics;
+  }
+
+  app.get('/settings/system', requireSettingsRead, async function (req, res, next) {
+    try {
+      await renderSettings(req, res, req.query.message ? String(req.query.message) : '');
+    } catch (error) {
+      next(error);
+    }
+  });
+
+  app.post('/settings/system', deps.requirePermission('system-settings.update'), async function (req, res, next) {
+    try {
+      const section = String(req.body && req.body.settings_section || '').trim().toLowerCase();
+      if (section !== 'icons' && section !== 'media' && section !== 'security' && section !== 'defaults' && section !== 'audit') {
+        const error = new Error('Unknown settings section.');
+        error.statusCode = 400;
+        error.expose = true;
+        throw error;
+      }
+      const previousSettings = await fetchAppSettings(pool);
+
+      if (section === 'defaults') {
+        const defaultSlideDurationSeconds = Number(req.body && req.body.default_slide_duration_seconds);
+        const defaultAnnouncementDurationValue = Number(req.body && req.body.default_announcement_duration_value);
+        const defaultAnnouncementDurationUnit = String(req.body && req.body.default_announcement_duration_unit || 'seconds').trim().toLowerCase();
+        const rssDefaultIntervalValue = Number(req.body && req.body.rss_default_interval_value);
+        const rssDefaultIntervalUnit = String(req.body && req.body.rss_default_interval_unit || 'minutes').trim().toLowerCase();
+        const apiDefaultIntervalValue = Number(req.body && req.body.api_default_interval_value);
+        const apiDefaultIntervalUnit = String(req.body && req.body.api_default_interval_unit || 'minutes').trim().toLowerCase();
+        const defaultFadeBetweenSlides = req.body && (req.body.default_fade_between_slides === '1' || req.body.default_fade_between_slides === 'true');
+        const defaultSkipUnavailableRtmp = req.body && (req.body.default_skip_unavailable_rtmp === '1' || req.body.default_skip_unavailable_rtmp === 'true');
+        const defaultAnnouncementIcon = String(req.body && req.body.default_announcement_icon || '').trim();
+        if (!Number.isInteger(defaultSlideDurationSeconds) || defaultSlideDurationSeconds < 1 || defaultSlideDurationSeconds > 3600 || !Number.isInteger(defaultAnnouncementDurationValue) || defaultAnnouncementDurationValue < 1 || defaultAnnouncementDurationValue > 3600 || !['seconds', 'minutes'].includes(defaultAnnouncementDurationUnit) || !Number.isInteger(rssDefaultIntervalValue) || rssDefaultIntervalValue < 1 || rssDefaultIntervalValue > 86400 || !['seconds', 'minutes', 'hours'].includes(rssDefaultIntervalUnit) || !Number.isInteger(apiDefaultIntervalValue) || apiDefaultIntervalValue < 1 || apiDefaultIntervalValue > 86400 || !['seconds', 'minutes', 'hours'].includes(apiDefaultIntervalUnit) || !ANNOUNCEMENT_ICON_CATALOG.some(function (option) { return option.value === defaultAnnouncementIcon; })) {
+          const error = new Error('Default values must be valid.');
+          error.statusCode = 400;
+          error.expose = true;
+          throw error;
+        }
+        const savedSettings = await saveAppSettings(pool, {
+          'player.default_slide_duration_seconds': defaultSlideDurationSeconds,
+          'player.default_fade_between_slides': defaultFadeBetweenSlides,
+          'player.skip_unavailable_rtmp': defaultSkipUnavailableRtmp,
+          'announcements.default_icon': defaultAnnouncementIcon,
+          'announcements.default_duration_value': defaultAnnouncementDurationValue,
+          'announcements.default_duration_unit': defaultAnnouncementDurationUnit,
+          'data-sources.rss_default_interval_value': rssDefaultIntervalValue,
+          'data-sources.rss_default_interval_unit': rssDefaultIntervalUnit,
+          'data-sources.api_default_interval_value': apiDefaultIntervalValue,
+          'data-sources.api_default_interval_unit': apiDefaultIntervalUnit
+        }, req.currentUser && req.currentUser.id);
+        await recordSettingsAuditEvent(req, previousSettings, savedSettings, section);
+        return res.redirect('/settings/system?message=' + encodeURIComponent('Defaults saved.') + '#application-defaults');
+      }
+
+      if (section === 'security') {
+        const sessionLifetimeDays = Number(req.body && req.body.session_lifetime_days);
+        const allowUserSessionRevocation = req.body && (req.body.allow_user_session_revocation === '1' || req.body.allow_user_session_revocation === 'true');
+        const maxActiveSessions = Number(req.body && req.body.max_active_sessions);
+        const loginMaxAttempts = Number(req.body && req.body.login_max_attempts);
+        const loginLockoutMinutes = Number(req.body && req.body.login_lockout_minutes);
+        const loginRateLimitScope = String(req.body && req.body.login_rate_limit_scope || 'both').trim().toLowerCase();
+        const passwordMinLength = Number(req.body && req.body.password_min_length);
+        const passwordMinCategories = Number(req.body && req.body.password_min_categories);
+        const passwordRequireLowercase = req.body && (req.body.password_require_lowercase === '1' || req.body.password_require_lowercase === 'true');
+        const passwordRequireUppercase = req.body && (req.body.password_require_uppercase === '1' || req.body.password_require_uppercase === 'true');
+        const passwordRequireNumber = req.body && (req.body.password_require_number === '1' || req.body.password_require_number === 'true');
+        const passwordRequireSymbol = req.body && (req.body.password_require_symbol === '1' || req.body.password_require_symbol === 'true');
+        const requirePasswordChangeForNewUsers = req.body && (req.body.require_password_change_for_new_users === '1' || req.body.require_password_change_for_new_users === 'true');
+        const requirePasswordChangeAfterAdminReset = req.body && (req.body.require_password_change_after_admin_reset === '1' || req.body.require_password_change_after_admin_reset === 'true');
+        const requiredCategoryCount = [passwordRequireLowercase, passwordRequireUppercase, passwordRequireNumber, passwordRequireSymbol].filter(Boolean).length;
+        if (!Number.isInteger(sessionLifetimeDays) || sessionLifetimeDays < 1 || sessionLifetimeDays > 365 || !Number.isInteger(maxActiveSessions) || maxActiveSessions < 0 || maxActiveSessions > 100 || !Number.isInteger(loginMaxAttempts) || loginMaxAttempts < 1 || loginMaxAttempts > 100 || !Number.isInteger(loginLockoutMinutes) || loginLockoutMinutes < 1 || loginLockoutMinutes > 1440 || !['both', 'username', 'ip'].includes(loginRateLimitScope) || !Number.isInteger(passwordMinLength) || passwordMinLength < 8 || passwordMinLength > 128 || !Number.isInteger(passwordMinCategories) || passwordMinCategories < 1 || passwordMinCategories > 4 || requiredCategoryCount > passwordMinCategories) {
+          const error = new Error('Session and password settings must use valid values; required password categories cannot exceed the minimum category count.');
+          error.statusCode = 400;
+          error.expose = true;
+          throw error;
+        }
+        const savedSettings = await saveAppSettings(pool, {
+          'security.session_lifetime_days': sessionLifetimeDays,
+          'security.allow_user_session_revocation': allowUserSessionRevocation,
+          'security.max_active_sessions': maxActiveSessions,
+          'security.login_max_attempts': loginMaxAttempts,
+          'security.login_lockout_minutes': loginLockoutMinutes,
+          'security.login_rate_limit_scope': loginRateLimitScope,
+          'security.password_min_length': passwordMinLength,
+          'security.password_min_categories': passwordMinCategories,
+          'security.password_require_lowercase': passwordRequireLowercase,
+          'security.password_require_uppercase': passwordRequireUppercase,
+          'security.password_require_number': passwordRequireNumber,
+          'security.password_require_symbol': passwordRequireSymbol,
+          'security.require_password_change_for_new_users': requirePasswordChangeForNewUsers,
+          'security.require_password_change_after_admin_reset': requirePasswordChangeAfterAdminReset
+        }, req.currentUser && req.currentUser.id);
+        await recordSettingsAuditEvent(req, previousSettings, savedSettings, section);
+        return res.redirect('/settings/system?message=' + encodeURIComponent('Security settings saved.') + '#security-sessions');
+      }
+
+      if (section === 'audit') {
+        const auditEnabled = req.body && (req.body.audit_enabled === '1' || req.body.audit_enabled === 'true');
+        const includeRequestMetadata = req.body && (req.body.include_request_metadata === '1' || req.body.include_request_metadata === 'true');
+        const selectedCategories = req.body && (req.body['audit_categories[]'] !== undefined ? req.body['audit_categories[]'] : req.body.audit_categories);
+        const auditCategories = Array.from(new Set((Array.isArray(selectedCategories) ? selectedCategories : selectedCategories ? [selectedCategories] : []).map(function (category) {
+          return String(category || '').trim().toLowerCase();
+        }).filter(function (category) {
+          return AUDIT_CATEGORY_KEYS.includes(category);
+        })));
+        const retentionDays = Number(req.body && req.body.audit_retention_days);
+        if (!auditCategories.length || !Number.isInteger(retentionDays) || retentionDays < 0 || retentionDays > 3650) {
+          const error = new Error('Select at least one audit category and use a retention period between 0 and 3650 days.');
+          error.statusCode = 400;
+          error.expose = true;
+          throw error;
+        }
+        const savedSettings = await saveAppSettings(pool, {
+          'audit.enabled': auditEnabled,
+          'audit.categories': auditCategories,
+          'audit.include_request_metadata': includeRequestMetadata,
+          'audit.retention_days': retentionDays
+        }, req.currentUser && req.currentUser.id);
+        await recordSettingsAuditEvent(req, previousSettings, savedSettings, section);
+        return res.redirect('/settings/system?message=' + encodeURIComponent('Audit logging settings saved.') + '#audit-logging');
+      }
+
+      if (section === 'media') {
+        const imageMaxMb = Number(req.body && req.body.image_max_mb);
+        const videoMaxMb = Number(req.body && req.body.video_max_mb);
+        const wysiwygImageMaxMb = Number(req.body && req.body.wysiwyg_image_max_mb);
+        const selectedMimeTypes = req.body && (req.body['allowed_mime_types[]'] !== undefined ? req.body['allowed_mime_types[]'] : req.body.allowed_mime_types);
+        const allowedMimeTypes = Array.from(new Set((Array.isArray(selectedMimeTypes) ? selectedMimeTypes : selectedMimeTypes ? [selectedMimeTypes] : []).map(function (mimeType) {
+          return String(mimeType || '').trim().toLowerCase();
+        }).filter(function (mimeType) {
+          return UPLOAD_MIME_TYPE_OPTIONS.some(function (option) { return option.value === mimeType; });
+        })));
+        const hasImageMimeType = allowedMimeTypes.some(function (mimeType) { return mimeType.indexOf('image/') === 0; });
+        const hasVideoMimeType = allowedMimeTypes.some(function (mimeType) { return mimeType.indexOf('video/') === 0; });
+        if (!Number.isInteger(imageMaxMb) || imageMaxMb < 1 || imageMaxMb > 1024 || !Number.isInteger(videoMaxMb) || videoMaxMb < 1 || videoMaxMb > 4096 || !Number.isFinite(wysiwygImageMaxMb) || wysiwygImageMaxMb < 0.1 || wysiwygImageMaxMb > imageMaxMb || !hasImageMimeType || !hasVideoMimeType) {
+          const error = new Error('Media upload limits must be valid and at least one image and video type must remain enabled.');
+          error.statusCode = 400;
+          error.expose = true;
+          throw error;
+        }
+        await pool.query('DELETE FROM o_app_settings WHERE setting_key NOT IN (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', ['announcements.suggested_icons', 'announcements.default_icon', 'announcements.default_duration_value', 'announcements.default_duration_unit', 'player.default_slide_duration_seconds', 'player.default_fade_between_slides', 'player.skip_unavailable_rtmp', 'data-sources.rss_default_interval_value', 'data-sources.rss_default_interval_unit', 'data-sources.api_default_interval_value', 'data-sources.api_default_interval_unit', 'uploads.image_max_bytes', 'uploads.video_max_bytes', 'uploads.wysiwyg_image_max_bytes', 'uploads.allowed_mime_types', 'security.session_lifetime_days', 'security.allow_user_session_revocation', 'security.max_active_sessions', 'security.login_max_attempts', 'security.login_lockout_minutes', 'security.login_rate_limit_scope', 'security.password_min_length', 'security.password_min_categories', 'security.password_require_lowercase', 'security.password_require_uppercase', 'security.password_require_number', 'security.password_require_symbol', 'security.require_password_change_for_new_users', 'security.require_password_change_after_admin_reset', 'audit.enabled', 'audit.categories', 'audit.include_request_metadata', 'audit.retention_days']);
+        const savedSettings = await saveAppSettings(pool, {
+          'uploads.image_max_bytes': imageMaxMb * 1024 * 1024,
+          'uploads.video_max_bytes': videoMaxMb * 1024 * 1024,
+          'uploads.wysiwyg_image_max_bytes': Math.round(wysiwygImageMaxMb * 1024 * 1024),
+          'uploads.allowed_mime_types': allowedMimeTypes
+        }, req.currentUser && req.currentUser.id);
+        await recordSettingsAuditEvent(req, previousSettings, savedSettings, section);
+        return res.redirect('/settings/system?message=' + encodeURIComponent('Media settings saved.') + '#media-uploads');
+      }
+
+      const selectedIcons = req.body && (req.body['suggested_icons[]'] !== undefined ? req.body['suggested_icons[]'] : req.body.suggested_icons);
+      const catalogKeys = new Set(ANNOUNCEMENT_ICON_CATALOG.map(function (option) {
+        return option.value;
+      }));
+      const suggestedIcons = Array.from(new Set((Array.isArray(selectedIcons) ? selectedIcons : selectedIcons ? [selectedIcons] : []).map(function (iconKey) {
+        return String(iconKey || '').trim().toLowerCase();
+      }).filter(function (iconKey) {
+        return catalogKeys.has(iconKey);
+      })));
+      if (suggestedIcons.length > MAX_SUGGESTED_ICONS) {
+        const error = new Error('Choose no more than ' + MAX_SUGGESTED_ICONS + ' suggested icons.');
+        error.statusCode = 400;
+        error.expose = true;
+        throw error;
+      }
+      await pool.query('DELETE FROM o_app_settings WHERE setting_key NOT IN (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', ['announcements.suggested_icons', 'announcements.default_icon', 'announcements.default_duration_value', 'announcements.default_duration_unit', 'player.default_slide_duration_seconds', 'player.default_fade_between_slides', 'player.skip_unavailable_rtmp', 'data-sources.rss_default_interval_value', 'data-sources.rss_default_interval_unit', 'data-sources.api_default_interval_value', 'data-sources.api_default_interval_unit', 'uploads.image_max_bytes', 'uploads.video_max_bytes', 'uploads.wysiwyg_image_max_bytes', 'uploads.allowed_mime_types', 'security.session_lifetime_days', 'security.allow_user_session_revocation', 'security.max_active_sessions', 'security.login_max_attempts', 'security.login_lockout_minutes', 'security.login_rate_limit_scope', 'security.password_min_length', 'security.password_min_categories', 'security.password_require_lowercase', 'security.password_require_uppercase', 'security.password_require_number', 'security.password_require_symbol', 'security.require_password_change_for_new_users', 'security.require_password_change_after_admin_reset', 'audit.enabled', 'audit.categories', 'audit.include_request_metadata', 'audit.retention_days']);
+      const savedSettings = await saveAppSettings(pool, {
+        'announcements.suggested_icons': suggestedIcons
+      }, req.currentUser && req.currentUser.id);
+      await recordSettingsAuditEvent(req, previousSettings, savedSettings, section);
+      res.redirect('/settings/system?message=' + encodeURIComponent('Settings saved.'));
+    } catch (error) {
+      next(error);
+    }
+  });
+};

src/web/routes/settings/users/edit.js

@@ -3,6 +3,6 @@
 const { renderView } = require('../../../view');
 const { buildUsersEditViewModel } = require('./form-view-model');
 
-module.exports = function renderUsersEditPage(user, message, currentUser, roles) {
-  return renderView('settings/users/form', buildUsersEditViewModel(user, message, currentUser, roles));
+module.exports = function renderUsersEditPage(user, message, currentUser, roles, sessions) {
+  return renderView('settings/users/form', buildUsersEditViewModel(user, message, currentUser, roles, sessions));
 };

src/web/routes/settings/users/form-view-model.js

@@ -24,9 +24,9 @@ function buildUsersAddViewModel(message, currentUser, roles, formValues, message
     active: 'users',
     isEdit: false,
     formId: 'user-form',
-    formAction: '/users',
-    footerSaveUrl: '/users',
-    footerCancelUrl: '/users',
+    formAction: '/settings/users',
+    footerSaveUrl: '/settings/users',
+    footerCancelUrl: '/settings/users',
     footerDeleteUrl: '',
     footerDeleteDisabled: true,
     footerDeleteTitle: 'Delete is available after the user has been created.',
@@ -36,21 +36,21 @@ function buildUsersAddViewModel(message, currentUser, roles, formValues, message
     currentUser: currentUser || null,
     roles: mapRolesForForm(roles, []),
     formValues: formValues || {},
-    formAttrs: 'data-async-save data-async-save-close-url="/users" data-async-save-new-redirect="response-url" data-async-save-new-url="/users/new"'
+    formAttrs: 'data-async-save data-async-save-close-url="/settings/users" data-async-save-new-redirect="response-url" data-async-save-new-url="/settings/users/new"'
   };
 }
 
-function buildUsersEditViewModel(user, message, currentUser, roles) {
+function buildUsersEditViewModel(user, message, currentUser, roles, sessions) {
   return {
     title: 'Edit user',
     active: 'users',
     isEdit: true,
     formId: 'user-profile-form',
-    formAction: '/users/' + user.id + '/username',
-    formAttrs: 'data-async-save data-async-save-close-url="/users"',
-    footerSaveUrl: '/users/' + user.id + '/username',
-    footerCancelUrl: '/users',
-    footerDeleteUrl: '/users/' + user.id + '/delete',
+    formAction: '/settings/users/' + user.id + '/username',
+    formAttrs: 'data-async-save data-async-save-close-url="/settings/users"',
+    footerSaveUrl: '/settings/users/' + user.id + '/username',
+    footerCancelUrl: '/settings/users',
+    footerDeleteUrl: '/settings/users/' + user.id + '/delete',
     footerDeleteDisabled: Boolean(user && user.inUse),
     footerDeleteConfirmMessage: 'Delete this user?',
     footerDeleteTitle: user && user.inUse ? 'Delete is disabled while this user is the only account left.' : '',
@@ -59,9 +59,10 @@ function buildUsersEditViewModel(user, message, currentUser, roles) {
     message: message,
     currentUser: currentUser || null,
     user: user,
+    sessions: Array.isArray(sessions) ? sessions : [],
     inUse: Boolean(user && user.inUse),
     roles: mapRolesForForm(roles, user && user.roleIds),
-    formAttrs: 'data-async-save data-async-save-close-url="/users" data-async-save-new-url="/users/new"'
+    formAttrs: 'data-async-save data-async-save-close-url="/settings/users" data-async-save-new-url="/settings/users/new"'
   };
 }
 

src/web/routes/signage/announcements/form-view-model.js

@@ -23,6 +23,7 @@ function buildAnnouncementFormViewModel(announcement, message, currentUser, opti
   const announcementTypes = Array.isArray(options && options.announcementTypes) ? options.announcementTypes : [];
   const announcementColors = Array.isArray(options && options.announcementColors) ? options.announcementColors : [];
   const announcementIcons = Array.isArray(options && options.announcementIcons) ? options.announcementIcons : [];
+  const announcementIconCatalog = Array.isArray(options && options.announcementIconCatalog) ? options.announcementIconCatalog : announcementIcons;
   const announcementScreens = Array.isArray(options && options.announcementScreens) ? options.announcementScreens : [];
   const viewOptions = options || {};
   const viewAnnouncement = Object.assign({}, buildDefaultAnnouncement(), announcement || {});
@@ -68,6 +69,7 @@ function buildAnnouncementFormViewModel(announcement, message, currentUser, opti
     announcementTypes: announcementTypes,
     announcementColors: announcementColors,
     announcementIcons: announcementIcons,
+    announcementIconCatalog: announcementIconCatalog,
     announcementScreens: announcementScreens
   };
 }

src/web/routes/signage/announcements/routes.js

@@ -11,6 +11,7 @@ module.exports = function registerAnnouncementRoutes(app, deps) {
   const { buildPagination } = require('../../../lib/pagination');
   const announcementData = require('#src/data/announcements');
   const announcementIcons = require('#src/data/announcement-icons');
+  const { fetchAppSettings } = require('#src/data/app-settings');
   const { buildDuplicateAnnouncementName, buildDuplicateAnnouncement } = require('./duplicate');
 
   const LIST_PAGE_SIZE = 25;
@@ -30,6 +31,21 @@ module.exports = function registerAnnouncementRoutes(app, deps) {
     { value: 'light', label: 'Light' }
   ];
   const ANNOUNCEMENT_ICONS = announcementIcons.ANNOUNCEMENT_ICON_OPTIONS || [];
+   const ANNOUNCEMENT_ICON_CATALOG = announcementIcons.ANNOUNCEMENT_ICON_CATALOG || ANNOUNCEMENT_ICONS;
+
+  async function fetchSuggestedAnnouncementIcons() {
+    const settings = await fetchAppSettings(pool);
+    const catalogByKey = new Map(ANNOUNCEMENT_ICON_CATALOG.map(function (option) {
+      return [option.value, option];
+    }));
+    const configuredKeys = Array.isArray(settings['announcements.suggested_icons'])
+      ? settings['announcements.suggested_icons']
+      : [];
+    const configuredOptions = configuredKeys.map(function (key) {
+      return catalogByKey.get(String(key || '').trim().toLowerCase()) || null;
+    }).filter(Boolean);
+    return configuredOptions.length ? configuredOptions : ANNOUNCEMENT_ICONS;
+  }
 
   function normalizeDurationUnit(value) {
     return String(value || 'minutes').trim().toLowerCase() === 'seconds' ? 'seconds' : 'minutes';
@@ -269,21 +285,28 @@ module.exports = function registerAnnouncementRoutes(app, deps) {
   app.get('/announcements/new', requirePermission('announcements.create'), async function (req, res, next) {
     try {
       const screens = await fetchAnnouncementScreens();
+      const suggestedAnnouncementIcons = await fetchSuggestedAnnouncementIcons();
+      const settings = await fetchAppSettings(pool);
+      const configuredIcon = String(settings['announcements.default_icon'] || '').trim().toLowerCase();
+      const defaultIcon = ANNOUNCEMENT_ICON_CATALOG.some(function (option) { return option.value === configuredIcon; })
+        ? configuredIcon
+        : (suggestedAnnouncementIcons[0] && suggestedAnnouncementIcons[0].value ? suggestedAnnouncementIcons[0].value : announcementIcons.DEFAULT_ANNOUNCEMENT_ICON);
       res.send(pages.renderAnnouncementAddPage(buildAnnouncementFormData({
         message: '',
         short_label: '',
         announcement_type: 'lower-third',
         color_key: 'primary',
-        icon_key: announcementIcons.DEFAULT_ANNOUNCEMENT_ICON,
+        icon_key: defaultIcon,
         durationMode: 'duration',
         duration_seconds: null,
-        durationValue: 5,
-        durationUnit: 'minutes',
+        durationValue: Number(settings['announcements.default_duration_value']) || 10,
+        durationUnit: String(settings['announcements.default_duration_unit'] || 'seconds'),
         screen_ids: []
       }), req.query.message ? String(req.query.message) : '', req.currentUser, {
         announcementTypes: ANNOUNCEMENT_TYPES,
         announcementColors: ANNOUNCEMENT_COLORS,
-        announcementIcons: ANNOUNCEMENT_ICONS,
+        announcementIcons: suggestedAnnouncementIcons,
+        announcementIconCatalog: ANNOUNCEMENT_ICON_CATALOG,
         announcementScreens: buildAnnouncementScreenOptions(screens, [])
       }));
     } catch (error) {
@@ -301,7 +324,8 @@ module.exports = function registerAnnouncementRoutes(app, deps) {
       res.send(pages.renderAnnouncementEditPage(buildAnnouncementFormData(announcement), null, req.query.message ? String(req.query.message) : '', req.currentUser, {
         announcementTypes: ANNOUNCEMENT_TYPES,
         announcementColors: ANNOUNCEMENT_COLORS,
-        announcementIcons: ANNOUNCEMENT_ICONS,
+        announcementIcons: await fetchSuggestedAnnouncementIcons(),
+         announcementIconCatalog: ANNOUNCEMENT_ICON_CATALOG,
         announcementScreens: buildAnnouncementScreenOptions(screens, announcement.screen_ids || [])
       }));
     } catch (error) {
@@ -327,7 +351,8 @@ module.exports = function registerAnnouncementRoutes(app, deps) {
       res.send(pages.renderAnnouncementAddPage(buildAnnouncementFormData(buildDuplicateAnnouncement(announcement, duplicateName)), req.query.message ? String(req.query.message) : 'Review the copied values and save when ready.', req.currentUser, {
         announcementTypes: ANNOUNCEMENT_TYPES,
         announcementColors: ANNOUNCEMENT_COLORS,
-        announcementIcons: ANNOUNCEMENT_ICONS,
+        announcementIcons: await fetchSuggestedAnnouncementIcons(),
+         announcementIconCatalog: ANNOUNCEMENT_ICON_CATALOG,
         announcementScreens: buildAnnouncementScreenOptions(screens, announcement.screen_ids || []),
         messageVariant: 'info'
       }));

src/web/routes/signage/playlists/form-view-model.js

@@ -175,6 +175,7 @@ function formatCanvasSizeLabel(size) {
 
 function buildPlaylistFormViewModel(playlist, data, message, currentUser, options) {
   const isEdit = Boolean(options && options.isEdit);
+  const defaultSlideDurationSeconds = Number(data && data.defaultSlideDurationSeconds) || 10;
   const viewPlaylist = Object.assign({
     id: null,
     name: '',
@@ -245,7 +246,7 @@ function buildPlaylistFormViewModel(playlist, data, message, currentUser, option
     videoDurationSeconds: '',
     useVideoDuration: false,
     disableAudio: true,
-    durationSeconds: 10,
+    durationSeconds: defaultSlideDurationSeconds,
     scheduleRules: [],
     scheduleSummary: 'Always visible',
     displayOrder: ''
@@ -280,7 +281,8 @@ function buildPlaylistFormViewModel(playlist, data, message, currentUser, option
     selectableSlides: selectableSlides,
     playlistCanvasId: playlistCanvasId,
     playlistCanvasMismatch: playlistCanvasMismatch,
-    scripts: ['js/lib/modal.js?v=20260726.7', 'js/playlists/playlist-table-drag.js?v=20260802.5', 'js/playlists/playlist-schedule.js?v=20260803.1'],
+    defaultSlideDurationSeconds: defaultSlideDurationSeconds,
+    scripts: ['js/lib/modal.js?v=20260726.7', 'js/playlists/playlist-table-drag.js?v=20260802.5', 'js/playlists/playlist-schedule.js?v=20260816.1'],
     message: message,
     currentUser: currentUser || null,
     inUse: Boolean(viewPlaylist.inUse)

src/web/routes/signage/playlists/routes.js

@@ -8,6 +8,7 @@ module.exports = function registerPlaylistsRoutes(app, deps) {
   const { buildPagination } = require('../../../lib/pagination');
   const requirePermission = deps.requirePermission;
   const { buildDuplicatePlaylistName, buildDuplicatePlaylist } = require('./duplicate');
+  const { fetchAppSettings } = require('../../../../data/app-settings');
 
   const LIST_PAGE_SIZE = 25;
 
@@ -31,6 +32,8 @@ module.exports = function registerPlaylistsRoutes(app, deps) {
           return res.status(404).send('Playlist not found');
         }
         playlist.inUse = (await fetchScreensByPlaylistId(pool, playlist.id)).length > 0;
+        const settings = await fetchAppSettings(pool);
+        data.defaultSlideDurationSeconds = Number(settings['player.default_slide_duration_seconds']) || 10;
         return res.send(pages.renderPlaylistEditPage(playlist, data, req.query.message ? String(req.query.message) : '', req.currentUser));
       }
       const data = await common.fetchPlaylistsPage(pool, page, LIST_PAGE_SIZE, search, sort, direction);
@@ -46,7 +49,12 @@ module.exports = function registerPlaylistsRoutes(app, deps) {
   app.get('/playlists/new', requirePermission('playlists.create'), function (req, res) {
     (async function () {
       const data = await common.fetchAdminData(pool);
-      res.send(await pages.renderPlaylistFormPage(req.query.message ? String(req.query.message) : '', req.currentUser, data, pool));
+      const settings = await fetchAppSettings(pool);
+      data.defaultSlideDurationSeconds = Number(settings['player.default_slide_duration_seconds']) || 10;
+      res.send(await pages.renderPlaylistFormPage({
+        fade_between_slides: Boolean(settings['player.default_fade_between_slides']),
+        skip_unavailable_rtmp: Boolean(settings['player.skip_unavailable_rtmp'])
+      }, req.query.message ? String(req.query.message) : '', req.currentUser, data, pool));
     })().catch(function (error) {
       res.status(500).send(error.message || 'Unable to load page.');
     });
@@ -81,6 +89,8 @@ module.exports = function registerPlaylistsRoutes(app, deps) {
         return res.status(404).send('Playlist not found');
       }
       const data = await common.fetchAdminData(pool);
+      const settings = await fetchAppSettings(pool);
+      data.defaultSlideDurationSeconds = Number(settings['player.default_slide_duration_seconds']) || 10;
       playlist.inUse = (await fetchScreensByPlaylistId(pool, playlist.id)).length > 0;
       res.send(pages.renderPlaylistEditPage(playlist, data, req.query.message ? String(req.query.message) : '', req.currentUser));
     } catch (error) {

src/web/routes/signage/slides/form-view-model.js

@@ -26,6 +26,7 @@ function buildSlideFormViewModel(data, slide, message, currentUser, isEdit) {
   const apiSources = data && data.apiSources ? data.apiSources : [];
   const timetableGroups = data && data.timetableGroups ? data.timetableGroups : [];
   const fontLibrary = data && data.fontLibrary ? data.fontLibrary : null;
+  const uploadLimits = data && data.uploadLimits ? data.uploadLimits : {};
   const templates = buildTemplates(data && data.templates ? data.templates : [], templateRegions);
   const viewSlide = slide || buildDefaultSlide();
 
@@ -50,7 +51,8 @@ function buildSlideFormViewModel(data, slide, message, currentUser, isEdit) {
       fontStylesheetHref: fontLibrary && fontLibrary.stylesheetHref ? fontLibrary.stylesheetHref : '',
       fontFamilyFormats: fontLibrary && fontLibrary.fontFamilyFormats ? fontLibrary.fontFamilyFormats : '',
       existingTemplateId: viewSlide && viewSlide.template_id ? viewSlide.template_id : null,
-      existingContent: viewSlide && viewSlide.content ? viewSlide.content : {}
+      existingContent: viewSlide && viewSlide.content ? viewSlide.content : {},
+      uploadLimits: uploadLimits
     },
     assetVersion: assetVersion,
     slideEditorScripts: ['vendor/qr-code-styling/qr-code-styling-loader.js?v=' + assetVersion].concat(getRegionEditorScripts(assetVersion)),

src/web/views/account/password.hbs

@@ -13,9 +13,7 @@
       </div>
       <form id="account-name-form" method="post" action="/account/name" data-async-save>
         <div class="card-body">
-          <div class="mb-3">
-            <input id="account-name" type="text" name="name" class="form-control" value="{{name}}" autocomplete="name" required />
-          </div>
+          <input id="account-name" type="text" name="name" class="form-control" value="{{name}}" autocomplete="name" required />
         </div>
         <div class="card-footer d-flex justify-content-end">
           <div class="btn-group" role="group" aria-label="Display name actions">
@@ -25,10 +23,47 @@
         </div>
       </form>
     </div>
+
+    {{#if allowUserSessionRevocation}}
+      <div class="card card-outline card-secondary admin-form-card mt-3">
+        <div class="card-header">
+          <h3 class="card-title">Active sessions</h3>
+        </div>
+        <div class="card-body">
+          <div class="d-flex flex-column gap-2">
+            {{#if sessions.length}}
+              {{#each sessions}}
+                <div class="border rounded p-3 {{#if isCurrent}}border-primary bg-primary-subtle{{/if}}">
+                  <div class="d-flex align-items-start justify-content-between gap-3">
+                    <div>
+                      <div class="fw-semibold">{{#if isCurrent}}Current session{{else}}Active session{{/if}}</div>
+                    </div>
+                    {{#unless isCurrent}}
+                      <form method="post" action="/account/sessions/{{id}}/revoke">
+                        <button type="submit" class="btn btn-sm btn-outline-danger">Sign out</button>
+                      </form>
+                    {{/unless}}
+                  </div>
+                  <div class="text-body-secondary small mt-2">{{ipAddress}} · {{userAgent}}</div>
+                  <div class="text-body-secondary small">Created {{createdAtLabel}} · Last used {{lastUsedAtLabel}} · Expires {{expiresAtLabel}}</div>
+                </div>
+              {{/each}}
+            {{else}}
+              <p class="mb-0 text-body-secondary">No active sessions were found.</p>
+            {{/if}}
+          </div>
+        </div>
+        <div class="card-footer d-flex justify-content-end">
+          <form method="post" action="/account/sessions/revoke">
+            <button type="submit" class="btn btn-danger">Sign out other sessions</button>
+          </form>
+        </div>
+      </div>
+    {{/if}}
   </div>
 
   <div class="col-12 col-xl-6">
-    <div class="card card-outline card-warning admin-form-card h-100">
+    <div class="card card-outline card-warning admin-form-card">
       <div class="card-header">
         <h3 class="card-title">Password</h3>
       </div>
@@ -40,13 +75,13 @@
           </div>
           <div class="mb-3">
             <label for="account-new-password" class="form-label">New password</label>
-            <input id="account-new-password" type="password" name="new_password" class="form-control" autocomplete="new-password" minlength="10" required />
+            <input id="account-new-password" type="password" name="new_password" class="form-control" autocomplete="new-password" minlength="{{passwordMinimumLength}}" required />
           </div>
           <div class="mb-0">
             <label for="account-confirm-password" class="form-label">Confirm new password</label>
-            <input id="account-confirm-password" type="password" name="confirm_password" class="form-control" autocomplete="new-password" minlength="10" required />
+            <input id="account-confirm-password" type="password" name="confirm_password" class="form-control" autocomplete="new-password" minlength="{{passwordMinimumLength}}" required />
           </div>
-          <div class="form-text mt-2">Use at least 10 characters and include 3 of: uppercase, lowercase, a number, and a symbol.</div>
+          <div class="form-text mt-2">{{passwordRequirementsText}}</div>
         </div>
         <div class="card-footer d-flex justify-content-end">
           <div class="btn-group" role="group" aria-label="Password actions">

src/web/views/auth/login.hbs

@@ -13,12 +13,16 @@
       {{/if}}
       <div class="mb-3">
         <label for="username" class="form-label">Username</label>
-        <input id="username" name="username" type="text" class="form-control" autocomplete="username" required />
+        <input id="username" name="username" type="text" class="form-control" autocomplete="username" value="{{username}}" required />
       </div>
       <div class="mb-3">
         <label for="password" class="form-label">Password</label>
         <input id="password" name="password" type="password" class="form-control" autocomplete="current-password" required />
       </div>
+      <div class="form-check mb-3">
+        <input id="remember-me" name="remember_me" type="checkbox" class="form-check-input" value="1" />
+        <label for="remember-me" class="form-check-label">Remember me</label>
+      </div>
       <button type="submit" class="btn btn-primary w-100">Sign in</button>
     </form>
   </div>

src/web/views/settings/audit-log/index.hbs

@@ -0,0 +1,57 @@
+<div class="page-header d-flex flex-wrap align-items-start gap-3">
+  <div>
+    <h2>Audit log</h2>
+    <p>Review recorded authentication, security, and session events.</p>
+  </div>
+</div>
+
+<div class="card card-outline card-secondary" data-table-search-container data-table-pagination-card>
+  <div class="card-header">
+    <form method="get" action="/settings/audit-log" class="row g-2 align-items-end">
+      <div class="col-12 col-md-3">
+        <label class="form-label small" for="audit-category">Category</label>
+        <select id="audit-category" name="category" class="form-select form-select-sm">
+          <option value="">All categories</option>
+          {{#each categories}}<option value="{{this}}" {{#if (eq ../selectedCategory this)}}selected{{/if}}>{{this}}</option>{{/each}}
+        </select>
+      </div>
+      <div class="col-12 col-md-3">
+        <label class="form-label small" for="audit-event-type">Event type</label>
+        <input id="audit-event-type" name="event_type" class="form-control form-control-sm" value="{{selectedEventType}}" placeholder="e.g. login.success" list="audit-event-type-options" autocomplete="off">
+        <datalist id="audit-event-type-options">
+          {{#each eventTypes}}<option value="{{this}}"></option>{{/each}}
+        </datalist>
+      </div>
+      <div class="col-12 col-md-4">
+        <label class="form-label small" for="audit-search">Search</label>
+        <input id="audit-search" name="search" type="search" class="form-control form-control-sm" value="{{search}}" placeholder="Event, actor, or target" data-table-search>
+      </div>
+      <div class="col-12 col-md-2 d-flex gap-2">
+        <button type="submit" class="btn btn-primary btn-sm flex-fill"><i class="bi bi-search me-1" aria-hidden="true"></i>Filter</button>
+        {{#if (hasPermission currentUser 'audit-log.allow')}}<a class="btn btn-outline-primary btn-sm flex-fill" href="{{exportUrl}}"><i class="bi bi-download me-1" aria-hidden="true"></i>Export</a>{{/if}}
+      </div>
+    </form>
+  </div>
+  <div class="card-body p-0 table-responsive">
+    <table class="table table-striped align-middle mb-0" data-table-searchable>
+      <thead><tr><th data-table-sort-key="time">Time</th><th data-table-sort-key="event">Event</th><th data-table-sort-key="actor">Actor</th><th data-table-sort-key="target">Target</th><th>Source</th><th>Details</th></tr></thead>
+      <tbody>
+        {{#if events.length}}
+          {{#each events}}
+            <tr data-table-search-row>
+              <td class="text-nowrap"><time data-local-datetime data-local-datetime-format="24h" datetime="{{occurredAtValue}}">{{occurredAtValue}}</time></td>
+              <td><div class="fw-semibold text-capitalize">{{eventLabel}}</div><div class="text-muted small">{{category}}</div></td>
+              <td>{{actorLabel}}</td>
+              <td>{{targetLabelDisplay}}</td>
+              <td><div>{{ip_address}}</div><div class="text-muted small text-break">{{user_agent}}</div></td>
+              <td class="text-break"><small>{{detailsDisplay}}</small></td>
+            </tr>
+          {{/each}}
+        {{else}}
+          <tr data-table-search-empty-default><td colspan="6" class="empty">No audit events match these filters.</td></tr>
+        {{/if}}
+      </tbody>
+    </table>
+  </div>
+  {{> table-pagination pagination=pagination basePath="/settings/audit-log" alwaysShow=true}}
+</div>

src/web/views/settings/rbac/form.hbs

@@ -27,7 +27,7 @@
         </div>
         <div class="card-footer d-flex justify-content-end flex-wrap">
           <div class="btn-group" role="group" aria-label="Role actions">
-            {{{saveActionButtons formId=formId saveUrl=footerSaveUrl cancelUrl=footerCancelUrl deleteUrl=footerDeleteUrl deleteDisabled=footerDeleteDisabled deleteTitle=footerDeleteTitle showDelete=footerShowDelete}}}
+            {{{saveActionButtons formId=formId saveUrl=footerSaveUrl cancelUrl=footerCancelUrl cancelConfirmMessage=cancelConfirmMessage deleteUrl=footerDeleteUrl deleteDisabled=footerDeleteDisabled deleteTitle=footerDeleteTitle showDelete=footerShowDelete}}}
           </div>
         </div>
       </div>
@@ -58,6 +58,7 @@
                 {{#each users}}
                   <tr data-table-search-row>
                     <td data-label="Select">
+                      <input type="hidden" name="user_ids_present[]" value="{{id}}" />
                       <input class="form-check-input" type="checkbox" name="user_ids[]" value="{{id}}" {{#if isSelected}}checked{{/if}} />
                     </td>
                     <td data-label="Username">
@@ -80,14 +81,13 @@
     </div>
 
     <div class="col-12 col-xl-8 d-flex flex-column gap-4">
-      <div class="card card-outline card-secondary admin-form-card">
+      <div class="card card-outline card-secondary admin-form-card overflow-hidden">
         <div class="card-header">
           <h3 class="card-title">Permissions</h3>
         </div>
-        <div class="card-body">
+        <div class="card-body p-0">
           {{#if permissionSections.length}}
-            <div class="card card-outline card-secondary overflow-hidden">
-              <div class="accordion accordion-flush" id="role-permissions-accordion">
+            <div class="accordion accordion-flush" id="role-permissions-accordion">
               {{#each permissionSections}}
                 <div class="accordion-item overflow-hidden" data-permission-section data-permission-section-id="{{id}}">
                   <h2 class="accordion-header" id="permission-section-heading-{{id}}">
@@ -95,7 +95,7 @@
                       <span class="fw-semibold">{{title}}</span>
                     </button>
                   </h2>
-                  <div id="permission-section-collapse-{{id}}" class="accordion-collapse collapse {{#if @first}}show{{/if}}" aria-labelledby="permission-section-heading-{{id}}">
+                  <div id="permission-section-collapse-{{id}}" class="accordion-collapse collapse {{#if @first}}show{{/if}}" data-bs-parent="#role-permissions-accordion" aria-labelledby="permission-section-heading-{{id}}">
                     <div class="accordion-body p-0">
                       <div class="table-responsive">
                               <table class="table table-striped align-middle mb-0 rbac-permissions-table" style="table-layout: fixed; width: 100%;">
@@ -105,7 +105,7 @@
                                     <col style="width: 5.5rem;" />
                                   {{/each}}
                                 </colgroup>
-                          <thead class="table-light">
+                          <thead class="rbac-permissions-table-head">
                             <tr>
                               <th scope="col">Type</th>
                               {{#each actions}}
@@ -117,7 +117,7 @@
                             {{#each groups}}
                               <tr data-permission-row data-permission-row-id="{{id}}">
                                 <th scope="row" class="align-top">
-                                  <button type="button" class="text-reset border-0 bg-transparent p-0 fw-semibold text-start rbac-row-toggle" style="color: inherit; text-decoration-line: underline; text-decoration-style: dotted; text-underline-offset: 0.2em; cursor: pointer;" data-permission-row-toggle data-permission-row-target="{{id}}">{{title}}</button>
+                                  <button type="button" class="text-reset border-0 bg-transparent p-0 text-start rbac-row-toggle" style="color: inherit; text-decoration-line: underline; text-decoration-style: dotted; text-underline-offset: 0.2em; cursor: pointer;" data-permission-row-toggle data-permission-row-target="{{id}}">{{title}}</button>
                                 </th>
                                 {{#each cells}}
                                         <td class="text-center">
@@ -140,7 +140,6 @@
                   </div>
                 </div>
               {{/each}}
-              </div>
             </div>
           {{else}}
             <div class="alert alert-warning mb-0">No permissions are available.</div>

src/web/views/settings/rbac/list.hbs

@@ -16,7 +16,7 @@
             <input type="search" class="form-control" placeholder="Search roles" aria-label="Search roles" data-table-search />
           </div>
           {{#if (hasPermission currentUser 'rbac.create')}}
-            <a class="btn btn-primary btn-sm" href="/rbac/new">Add role</a>
+            <a class="btn btn-primary btn-sm" href="/settings/roles/new">Add role</a>
           {{/if}}
         </div>
       </div>
@@ -55,13 +55,13 @@
                     {{#if (anyPermission ../currentUser 'rbac.update' 'rbac.delete')}}
                       <div class="actions users-row-actions">
                         {{#if (hasPermission ../currentUser 'rbac.update')}}
-                          <a class="btn btn-sm btn-primary" href="/rbac/{{id}}/edit">Edit</a>
+                          <a class="btn btn-sm btn-primary" href="/settings/roles/{{id}}/edit">Edit</a>
                         {{/if}}
                         {{#if (hasPermission ../currentUser 'rbac.create')}}
-                          <a class="btn btn-sm btn-secondary" href="/rbac/{{id}}/duplicate">Dupe</a>
+                          <a class="btn btn-sm btn-secondary" href="/settings/roles/{{id}}/duplicate">Dupe</a>
                         {{/if}}
                         {{#if (hasPermission ../currentUser 'rbac.delete')}}
-                            <form method="post" action="/rbac/{{id}}/delete" class="inline-form" data-confirm-message="Delete {{name}}?">
+                            <form method="post" action="/settings/roles/{{id}}/delete" class="inline-form" data-confirm-message="Delete {{name}}?">
                               {{#if (gt user_count 0)}}
                               <button type="submit" class="btn btn-sm btn-outline-danger" disabled>Delete</button>
                               {{else}}
@@ -80,7 +80,7 @@
           </tbody>
         </table>
       </div>
-      {{> table-pagination pagination=pagination basePath="/rbac" alwaysShow=true}}
+      {{> table-pagination pagination=pagination basePath="/settings/roles" alwaysShow=true}}
     </div>
   </div>
 </div>

src/web/views/settings/system/index.hbs

@@ -0,0 +1,451 @@
+<div class="page-header">
+  <div>
+    <h2>System Settings</h2>
+    <p>Configure the defaults and content policies used across Pulse Signage.</p>
+  </div>
+</div>
+
+<div class="row g-3 align-items-start">
+  <div class="col-12 col-lg-3 col-xl-2">
+    <div class="card settings-nav-card">
+      <div class="card-body p-2">
+        <div class="text-uppercase text-muted small fw-semibold px-2 pt-1 pb-2">Settings</div>
+        <nav class="nav nav-pills flex-column gap-1" aria-label="Settings sections">
+          <a class="nav-link active" href="#application-defaults" data-settings-section-link>
+            <i class="bi bi-sliders me-2" aria-hidden="true"></i>Defaults
+          </a>
+          <a class="nav-link" href="#media-uploads" data-settings-section-link>
+            <i class="bi bi-cloud-arrow-up me-2" aria-hidden="true"></i>Media Uploads
+          </a>
+          <a class="nav-link" href="#icon-suggestions" data-settings-section-link>
+            <i class="bi bi-grid-3x3-gap me-2" aria-hidden="true"></i>Icon Suggestions
+          </a>
+          <a class="nav-link" href="#security-sessions" data-settings-section-link>
+            <i class="bi bi-shield-lock me-2" aria-hidden="true"></i>Security and Sessions
+          </a>
+          <a class="nav-link" href="#audit-logging" data-settings-section-link>
+            <i class="bi bi-journal-text me-2" aria-hidden="true"></i>Audit Logging
+          </a>
+          <a class="nav-link" href="#diagnostics" data-settings-section-link>
+            <i class="bi bi-activity me-2" aria-hidden="true"></i>Diagnostics
+          </a>
+        </nav>
+      </div>
+    </div>
+  </div>
+
+  <div class="col-12 col-lg-9 col-xl-10">
+    <form method="post" action="/settings/system" data-async-save data-settings-form="defaults">
+      <input type="hidden" name="settings_section" value="defaults">
+      <div id="application-defaults" class="card settings-section-card" data-settings-section>
+        <div class="card-header d-flex align-items-start justify-content-between gap-3">
+          <div class="min-w-0">
+            <h3 class="h5 mb-1 fw-semibold"><i class="bi bi-sliders me-2 text-primary" aria-hidden="true"></i>Defaults</h3>
+            <p class="text-muted small mb-0">Set starting values for players and announcements.</p>
+          </div>
+        </div>
+        <div class="card-body">
+          <div class="row g-3">
+            <div class="col-12"><h4 class="h6 text-uppercase text-muted mb-0">Player defaults</h4></div>
+            <div class="col-12 col-md-4">
+              <label class="form-label" for="settings-default-slide-duration">Default slide duration</label>
+              <div class="input-group"><input id="settings-default-slide-duration" name="default_slide_duration_seconds" type="number" class="form-control" min="1" max="3600" required value="{{mediaSettings.defaultSlideDurationSeconds}}"><span class="input-group-text">seconds</span></div>
+            </div>
+            <div class="col-12 col-md-8">
+              <label class="form-label">Player behavior</label>
+              <div class="d-flex flex-wrap align-items-center gap-4 pt-2">
+                <div class="form-check form-switch">
+                  <input id="settings-default-fade" name="default_fade_between_slides" type="checkbox" class="form-check-input" value="1" {{#if mediaSettings.defaultFadeBetweenSlides}}checked{{/if}}>
+                  <label class="form-check-label" for="settings-default-fade">Fade between slides</label>
+                </div>
+                <div class="form-check form-switch">
+                  <input id="settings-default-skip-rtmp" name="default_skip_unavailable_rtmp" type="checkbox" class="form-check-input" value="1" {{#if mediaSettings.defaultSkipUnavailableRtmp}}checked{{/if}}>
+                  <label class="form-check-label" for="settings-default-skip-rtmp">Skip unavailable RTMP</label>
+                </div>
+              </div>
+            </div>
+            <div class="col-12"><hr class="my-2"><h4 class="h6 text-uppercase text-muted mb-0">Announcement defaults</h4></div>
+            <div class="col-12 col-md-6">
+              <label class="form-label" for="settings-default-announcement-icon">Default announcement icon</label>
+              <div class="announcement-icon-picker" data-icon-picker data-settings-default-icon-picker>
+                <select id="settings-default-announcement-icon" name="default_announcement_icon" class="d-none" tabindex="-1" aria-hidden="true">
+                  {{#each suggestedAnnouncementIcons}}<option value="{{value}}" data-icon-label="{{label}}" {{#if (eq value ../mediaSettings.defaultAnnouncementIcon)}}selected{{/if}}>{{label}}</option>{{/each}}
+                </select>
+                <button type="button" class="announcement-icon-picker__toggle" data-icon-picker-toggle data-settings-default-icon-toggle aria-expanded="false" aria-controls="settings-default-announcement-icon-menu" title="Select an icon">
+                  <span class="announcement-icon-picker__toggle-icon" data-icon-picker-preview data-settings-default-icon-preview aria-hidden="true"></span>
+                  <span class="announcement-icon-picker__toggle-content"><span class="announcement-icon-picker__toggle-label" data-icon-picker-label data-settings-default-icon-label>Select an icon</span><span class="announcement-icon-picker__toggle-hint">Click to choose</span></span>
+                  <i class="bi bi-chevron-down announcement-icon-picker__caret" aria-hidden="true"></i>
+                </button>
+                <div id="settings-default-announcement-icon-menu" class="announcement-icon-picker__menu" data-icon-picker-menu data-settings-default-icon-menu hidden>
+                  <div class="announcement-icon-picker__header"><span>Choose default icon</span><button type="button" class="btn btn-sm btn-link text-decoration-none p-0" data-icon-picker-close data-settings-default-icon-close>Close</button></div>
+                  <div class="input-group input-group-sm announcement-icon-picker__search"><span class="input-group-text"><i class="bi bi-search" aria-hidden="true"></i></span><input type="search" class="form-control" placeholder="Search icons" aria-label="Search icons" data-icon-picker-search data-settings-default-icon-search></div>
+                  <div class="announcement-icon-picker__grid" data-icon-picker-grid data-settings-default-icon-grid>
+                    {{#each defaultAnnouncementIconSuggestions}}<button type="button" class="announcement-icon-picker__option" data-icon-picker-option data-settings-default-icon-option data-icon-key="{{value}}" data-icon-label="{{label}}" aria-pressed="false" title="{{label}}"><i class="bi bi-{{value}}" aria-hidden="true"></i><span class="visually-hidden">{{label}}</span></button>{{/each}}
+                  </div>
+                  <div class="announcement-icon-picker__search-empty" data-icon-picker-empty data-settings-default-icon-empty hidden>No matching icons.</div>
+                </div>
+              </div>
+            </div>
+            <div class="col-12 col-md-6">
+              <label class="form-label" for="settings-default-announcement-duration">Default announcement duration</label>
+              <div class="row g-2"><div class="col-7"><input id="settings-default-announcement-duration" name="default_announcement_duration_value" type="number" class="form-control" min="1" max="3600" required value="{{mediaSettings.defaultAnnouncementDurationValue}}"></div><div class="col-5"><select name="default_announcement_duration_unit" class="form-select" required><option value="seconds" {{#if (eq mediaSettings.defaultAnnouncementDurationUnit 'seconds')}}selected{{/if}}>Seconds</option><option value="minutes" {{#if (eq mediaSettings.defaultAnnouncementDurationUnit 'minutes')}}selected{{/if}}>Minutes</option></select></div></div>
+            </div>
+            <div class="col-12"><hr class="my-2"><h4 class="h6 text-uppercase text-muted mb-0">Data source defaults</h4></div>
+            <div class="col-12 col-md-6">
+              <label class="form-label" for="settings-rss-interval-value">RSS feed refresh interval</label>
+              <div class="row g-2"><div class="col-7"><input id="settings-rss-interval-value" name="rss_default_interval_value" type="number" class="form-control" min="1" max="86400" required value="{{mediaSettings.rssDefaultIntervalValue}}"></div><div class="col-5"><select name="rss_default_interval_unit" class="form-select" required><option value="seconds" {{#if (eq mediaSettings.rssDefaultIntervalUnit 'seconds')}}selected{{/if}}>Seconds</option><option value="minutes" {{#if (eq mediaSettings.rssDefaultIntervalUnit 'minutes')}}selected{{/if}}>Minutes</option><option value="hours" {{#if (eq mediaSettings.rssDefaultIntervalUnit 'hours')}}selected{{/if}}>Hours</option></select></div></div>
+            </div>
+            <div class="col-12 col-md-6">
+              <label class="form-label" for="settings-api-interval-value">API source refresh interval</label>
+              <div class="row g-2"><div class="col-7"><input id="settings-api-interval-value" name="api_default_interval_value" type="number" class="form-control" min="1" max="86400" required value="{{mediaSettings.apiDefaultIntervalValue}}"></div><div class="col-5"><select name="api_default_interval_unit" class="form-select" required><option value="seconds" {{#if (eq mediaSettings.apiDefaultIntervalUnit 'seconds')}}selected{{/if}}>Seconds</option><option value="minutes" {{#if (eq mediaSettings.apiDefaultIntervalUnit 'minutes')}}selected{{/if}}>Minutes</option><option value="hours" {{#if (eq mediaSettings.apiDefaultIntervalUnit 'hours')}}selected{{/if}}>Hours</option></select></div></div>
+            </div>
+          </div>
+        </div>
+        <div class="card-footer d-flex justify-content-end">{{#if (hasPermission currentUser 'system-settings.update')}}<button type="submit" class="btn btn-success">Save</button>{{else}}<button type="button" class="btn btn-outline-success" disabled>Save</button>{{/if}}</div>
+      </div>
+    </form>
+
+    <form method="post" action="/settings/system" data-async-save data-settings-form="icons">
+      <input type="hidden" name="settings_section" value="icons">
+      <div id="icon-suggestions" class="card settings-section-card" data-settings-section hidden>
+        <div class="card-header d-flex align-items-start justify-content-between gap-3">
+          <div class="min-w-0">
+            <h3 class="h5 mb-1 fw-semibold"><i class="bi bi-grid-3x3-gap me-2 text-primary" aria-hidden="true"></i>Icon Suggestions</h3>
+            <p class="text-muted small mb-0">Choose up to 48 icons shown first in icon pickers.</p>
+          </div>
+        </div>
+        <div class="card-body">
+          <div class="row g-3" data-selected-icon-list>
+            {{#each suggestedAnnouncementIcons}}
+              {{#if isSelected}}
+                <div class="col-12 col-sm-6 col-xl-3" draggable="true" data-selected-icon-item data-icon-key="{{value}}">
+                  <div class="d-flex align-items-center gap-2 border rounded p-2 h-100">
+                    <button type="button" class="btn btn-link text-body-secondary p-1" data-drag-icon title="Drag to reorder" aria-label="Drag {{label}} to reorder"><i class="bi bi-grip-vertical" aria-hidden="true"></i></button>
+                    <i class="bi bi-{{value}} fs-5 text-primary" aria-hidden="true"></i>
+                    <span class="flex-grow-1">{{label}}</span>
+                    <input type="hidden" name="suggested_icons[]" value="{{value}}" data-ordered-icon-input>
+                    <button type="button" class="btn btn-link text-danger p-1" data-remove-icon title="Remove {{label}}" aria-label="Remove {{label}}"><i class="bi bi-x-lg" aria-hidden="true"></i></button>
+                  </div>
+                </div>
+              {{/if}}
+            {{/each}}
+            <span class="col-12 text-muted small" data-no-selected-icons hidden>No icons selected.</span>
+          </div>
+          <div class="d-flex flex-wrap align-items-center gap-3 mt-3">
+            <button type="button" class="btn btn-outline-primary btn-sm" data-add-icon-button data-bs-toggle="modal" data-bs-target="#icon-suggestions-modal"><i class="bi bi-plus-lg me-1" aria-hidden="true"></i>Add icon</button>
+            <span class="text-muted small"><strong data-icon-suggestions-count>0</strong> of 48 selected</span>
+          </div>
+        </div>
+        <div class="card-footer d-flex justify-content-end">
+          {{#if (hasPermission currentUser 'system-settings.update')}}
+            <button type="submit" class="btn btn-success">Save</button>
+          {{else}}
+            <button type="button" class="btn btn-outline-success" disabled>Save</button>
+          {{/if}}
+        </div>
+      </div>
+    </form>
+
+    <form method="post" action="/settings/system" data-async-save data-settings-form="media">
+      <input type="hidden" name="settings_section" value="media">
+      <div id="media-uploads" class="card settings-section-card" data-settings-section hidden>
+        <div class="card-header d-flex align-items-start justify-content-between gap-3">
+          <div class="min-w-0">
+            <h3 class="h5 mb-1 fw-semibold"><i class="bi bi-cloud-arrow-up me-2 text-primary" aria-hidden="true"></i>Media Uploads</h3>
+            <p class="text-muted small mb-0">Set the maximum file sizes accepted by the slide and template upload flows.</p>
+          </div>
+        </div>
+        <div class="card-body">
+          <div class="row g-3">
+            <div class="col-12 col-md-4">
+              <label class="form-label" for="settings-image-max">Image max</label>
+              <div class="input-group">
+                <input id="settings-image-max" name="image_max_mb" type="number" class="form-control" min="1" max="1024" required value="{{mediaSettings.imageMaxMb}}">
+                <span class="input-group-text">MB</span>
+              </div>
+              <div class="form-text">Between 1 MB and 1 GB.</div>
+            </div>
+            <div class="col-12 col-md-4">
+              <label class="form-label" for="settings-video-max">Video max</label>
+              <div class="input-group">
+                <input id="settings-video-max" name="video_max_mb" type="number" class="form-control" min="1" max="4096" required value="{{mediaSettings.videoMaxMb}}">
+                <span class="input-group-text">MB</span>
+              </div>
+              <div class="form-text">Between 1 MB and 4 GB.</div>
+            </div>
+            <div class="col-12 col-md-4">
+              <label class="form-label" for="settings-wysiwyg-image-max">Rich text image max</label>
+              <div class="input-group">
+                <input id="settings-wysiwyg-image-max" name="wysiwyg_image_max_mb" type="number" class="form-control" min="0.1" max="1024" step="0.1" required value="{{mediaSettings.wysiwygImageMaxMb}}">
+                <span class="input-group-text">MB</span>
+              </div>
+              <div class="form-text">0.1 MB minimum; no larger than Image max.</div>
+            </div>
+            <div class="col-12">
+              <label class="form-label">Allowed upload types</label>
+              <div class="row g-3">
+                <div class="col-12 col-lg-6">
+                  <div class="small text-muted fw-semibold mb-2">Images</div>
+                  <div class="d-flex flex-wrap gap-2">
+                    {{#each mediaSettings.imageMimeTypes}}
+                      <input class="btn-check" type="checkbox" id="mime-{{value}}" name="allowed_mime_types[]" value="{{value}}" {{#if isSelected}}checked{{/if}}>
+                      <label class="btn btn-outline-primary" for="mime-{{value}}">{{label}}</label>
+                    {{/each}}
+                  </div>
+                </div>
+                <div class="col-12 col-lg-6">
+                  <div class="small text-muted fw-semibold mb-2">Video</div>
+                  <div class="d-flex flex-wrap gap-2">
+                    {{#each mediaSettings.videoMimeTypes}}
+                      <input class="btn-check" type="checkbox" id="mime-{{value}}" name="allowed_mime_types[]" value="{{value}}" {{#if isSelected}}checked{{/if}}>
+                      <label class="btn btn-outline-primary" for="mime-{{value}}">{{label}}</label>
+                    {{/each}}
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="card-footer d-flex justify-content-end">
+          {{#if (hasPermission currentUser 'system-settings.update')}}
+            <button type="submit" class="btn btn-success">Save</button>
+          {{else}}
+            <button type="button" class="btn btn-outline-success" disabled>Save</button>
+          {{/if}}
+        </div>
+      </div>
+    </form>
+
+    <form method="post" action="/settings/system" data-async-save data-settings-form="security">
+      <input type="hidden" name="settings_section" value="security">
+      <div id="security-sessions" class="card settings-section-card" data-settings-section hidden>
+        <div class="card-header d-flex align-items-start justify-content-between gap-3">
+          <div class="min-w-0">
+            <h3 class="h5 mb-1 fw-semibold"><i class="bi bi-shield-lock me-2 text-primary" aria-hidden="true"></i>Security and Sessions</h3>
+            <p class="text-muted small mb-0">Manage sessions, password restrictions, and account protection.</p>
+          </div>
+        </div>
+        <div class="card-body">
+          <div class="row g-3">
+            <div class="col-12"><h4 class="h6 text-uppercase text-muted mb-0">Sessions</h4></div>
+            <div class="col-12 col-md-6">
+              <label class="form-label" for="settings-session-lifetime">Session lifetime</label>
+              <div class="input-group">
+                <input id="settings-session-lifetime" name="session_lifetime_days" type="number" class="form-control" min="1" max="365" required value="{{mediaSettings.sessionLifetimeDays}}">
+                <span class="input-group-text">days</span>
+              </div>
+              <div class="form-text">Applies to new logins. Existing sessions keep their current expiry.</div>
+            </div>
+            <div class="col-12 col-md-6">
+              <label class="form-label" for="settings-max-active-sessions">Maximum active sessions</label>
+              <div class="input-group">
+                <input id="settings-max-active-sessions" name="max_active_sessions" type="number" class="form-control" min="0" max="100" required value="{{mediaSettings.maxActiveSessions}}">
+                <span class="input-group-text">sessions</span>
+              </div>
+              <div class="form-text">Use 0 for unlimited. Oldest sessions are removed first.</div>
+            </div>
+            <div class="col-12">
+              <div class="form-check form-switch">
+                <input id="settings-allow-session-revocation" name="allow_user_session_revocation" type="checkbox" class="form-check-input" value="1" {{#if mediaSettings.allowUserSessionRevocation}}checked{{/if}}>
+                <label class="form-check-label" for="settings-allow-session-revocation">Allow users to sign out their other active sessions</label>
+              </div>
+            </div>
+            <div class="col-12"><hr class="my-2"><h4 class="h6 text-uppercase text-muted mb-0">Login protection</h4></div>
+            <div class="col-12 col-md-4">
+              <label class="form-label" for="settings-login-attempts">Failed attempts before lockout</label>
+              <input id="settings-login-attempts" name="login_max_attempts" type="number" class="form-control" min="1" max="100" required value="{{mediaSettings.loginMaxAttempts}}">
+            </div>
+            <div class="col-12 col-md-4">
+              <label class="form-label" for="settings-login-lockout">Lockout duration</label>
+              <div class="input-group">
+                <input id="settings-login-lockout" name="login_lockout_minutes" type="number" class="form-control" min="1" max="1440" required value="{{mediaSettings.loginLockoutMinutes}}">
+                <span class="input-group-text">minutes</span>
+              </div>
+            </div>
+            <div class="col-12 col-md-4">
+              <label class="form-label" for="settings-login-scope">Track failed logins by</label>
+              <select id="settings-login-scope" name="login_rate_limit_scope" class="form-select" required>
+                <option value="both" {{#if (eq mediaSettings.loginRateLimitScope 'both')}}selected{{/if}}>Username and IP address</option>
+                <option value="username" {{#if (eq mediaSettings.loginRateLimitScope 'username')}}selected{{/if}}>Username</option>
+                <option value="ip" {{#if (eq mediaSettings.loginRateLimitScope 'ip')}}selected{{/if}}>IP address</option>
+              </select>
+              <div class="form-text">Failed login responses remain generic.</div>
+            </div>
+            <div class="col-12"><hr class="my-2"><h4 class="h6 text-uppercase text-muted mb-0">Password and account protection</h4></div>
+            <div class="col-12 col-md-6 col-xl-3">
+              <label class="form-label" for="settings-password-min-length">Minimum length</label>
+              <input id="settings-password-min-length" name="password_min_length" type="number" class="form-control" min="8" max="128" required value="{{mediaSettings.passwordMinLength}}">
+            </div>
+            <div class="col-12 col-md-6 col-xl-3">
+              <label class="form-label" for="settings-password-min-categories">Minimum required categories</label>
+              <input id="settings-password-min-categories" name="password_min_categories" type="number" class="form-control" min="1" max="4" required value="{{mediaSettings.passwordMinCategories}}">
+              <div class="form-text">Lowercase, uppercase, number, or symbol.</div>
+            </div>
+            <div class="col-12 col-xl-6">
+              <label class="form-label">Always require</label>
+              <div class="d-flex flex-wrap gap-3">
+                <input id="settings-password-lowercase" name="password_require_lowercase" type="checkbox" class="btn-check" value="1" autocomplete="off" {{#if mediaSettings.passwordRequireLowercase}}checked{{/if}}>
+                <label class="btn btn-outline-primary" for="settings-password-lowercase">Lowercase</label>
+                <input id="settings-password-uppercase" name="password_require_uppercase" type="checkbox" class="btn-check" value="1" autocomplete="off" {{#if mediaSettings.passwordRequireUppercase}}checked{{/if}}>
+                <label class="btn btn-outline-primary" for="settings-password-uppercase">Uppercase</label>
+                <input id="settings-password-number" name="password_require_number" type="checkbox" class="btn-check" value="1" autocomplete="off" {{#if mediaSettings.passwordRequireNumber}}checked{{/if}}>
+                <label class="btn btn-outline-primary" for="settings-password-number">Number</label>
+                <input id="settings-password-symbol" name="password_require_symbol" type="checkbox" class="btn-check" value="1" autocomplete="off" {{#if mediaSettings.passwordRequireSymbol}}checked{{/if}}>
+                <label class="btn btn-outline-primary" for="settings-password-symbol">Symbol</label>
+              </div>
+            </div>
+            <div class="col-12">
+              <div class="form-check form-switch mb-2">
+                <input id="settings-require-password-new" name="require_password_change_for_new_users" type="checkbox" class="form-check-input" value="1" {{#if mediaSettings.requirePasswordChangeForNewUsers}}checked{{/if}}>
+                <label class="form-check-label" for="settings-require-password-new">Require password change for newly created users</label>
+              </div>
+              <div class="form-check form-switch">
+                <input id="settings-require-password-reset" name="require_password_change_after_admin_reset" type="checkbox" class="form-check-input" value="1" {{#if mediaSettings.requirePasswordChangeAfterAdminReset}}checked{{/if}}>
+                <label class="form-check-label" for="settings-require-password-reset">Require password change after an administrator reset</label>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="card-footer d-flex justify-content-end">
+          {{#if (hasPermission currentUser 'system-settings.update')}}
+            <button type="submit" class="btn btn-success">Save</button>
+          {{else}}
+            <button type="button" class="btn btn-outline-success" disabled>Save</button>
+          {{/if}}
+        </div>
+      </div>
+    </form>
+
+    <div id="diagnostics" class="card settings-section-card" data-settings-section hidden>
+      <div class="card-header d-flex align-items-start justify-content-between gap-3">
+        <div class="min-w-0">
+          <h3 class="h5 mb-1 fw-semibold"><i class="bi bi-activity me-2 text-primary" aria-hidden="true"></i>Diagnostics</h3>
+          <p class="text-muted small mb-0">Read-only application, database, data, session, and task health information.</p>
+        </div>
+      </div>
+      <div class="card-body">
+        <div class="row g-3">
+          <div class="col-12 col-md-4"><div class="text-body-secondary small">Application version</div><div class="fw-semibold">{{diagnostics.applicationVersion}}</div></div>
+          <div class="col-12 col-md-4"><div class="text-body-secondary small">Schema version</div><div class="fw-semibold">{{diagnostics.schemaVersion}}</div></div>
+          <div class="col-12 col-md-4"><div class="text-body-secondary small">Database</div><div class="fw-semibold">{{diagnostics.databaseStatus}}</div></div>
+          <div class="col-12 col-md-6"><div class="text-body-secondary small">Active sessions</div><div class="fw-semibold">{{diagnostics.activeSessionCount}}</div></div>
+          <div class="col-12 col-md-6"><div class="text-body-secondary small">Background tasks</div><div class="fw-semibold">{{diagnostics.backgroundTaskCount}}</div></div>
+          <div class="col-12"><hr class="my-2"><h4 class="h6 text-uppercase text-muted mb-0">Table counts</h4></div>
+          {{#each diagnostics.criticalTableCounts}}
+            <div class="col-6 col-md-4 col-xl-3"><div class="text-body-secondary small">{{label}}</div><div class="fw-semibold">{{count}}</div></div>
+          {{/each}}
+        </div>
+      </div>
+    </div>
+
+    <form method="post" action="/settings/system" data-async-save data-settings-form="audit">
+      <input type="hidden" name="settings_section" value="audit">
+      <div id="audit-logging" class="card settings-section-card" data-settings-section hidden>
+        <div class="card-header d-flex align-items-start justify-content-between gap-3">
+          <div class="min-w-0">
+            <h3 class="h5 mb-1 fw-semibold"><i class="bi bi-journal-text me-2 text-primary" aria-hidden="true"></i>Audit Logging</h3>
+            <p class="text-muted small mb-0">Retain security, administration, content, and data-source events for review.</p>
+          </div>
+        </div>
+        <div class="card-body">
+          <div class="row g-3">
+            <div class="col-12">
+              <div class="form-check form-switch">
+                <input id="settings-audit-enabled" name="audit_enabled" type="checkbox" class="form-check-input" value="1" {{#if mediaSettings.auditEnabled}}checked{{/if}}>
+                <label class="form-check-label" for="settings-audit-enabled">Enable audit logging</label>
+              </div>
+            </div>
+            <div class="col-12"><hr class="my-2"><h4 class="h6 text-uppercase text-muted mb-0">Audit controls</h4></div>
+            <div class="col-12">
+              <div class="form-check form-switch">
+                <input id="settings-audit-metadata" name="include_request_metadata" type="checkbox" class="form-check-input" value="1" {{#if mediaSettings.auditIncludeRequestMetadata}}checked{{/if}}>
+                <label class="form-check-label" for="settings-audit-metadata">Store IP address and user agent</label>
+              </div>
+              <div class="form-text fst-italic">Disable this for reduced request metadata storage.</div>
+            </div>
+            <div class="col-12 col-md-6">
+              <label class="form-label" for="settings-audit-retention">Retain audit events for</label>
+              <div class="input-group settings-audit-retention-input">
+                <input id="settings-audit-retention" name="audit_retention_days" type="number" class="form-control" min="0" max="3650" required value="{{mediaSettings.auditRetentionDays}}">
+                <span class="input-group-text">days</span>
+              </div>
+              <div class="form-text fst-italic">Use 0 to retain events indefinitely. Cleanup runs daily.</div>
+            </div>
+            <div class="col-12"><hr class="my-2"><h4 class="h6 text-uppercase text-muted mb-0">Audited events</h4></div>
+            <div class="col-12">
+              <h4 class="settings-audit-category-label mb-1">General events</h4>
+              <p class="text-muted small fst-italic mb-2">Authentication, security, and session activity.</p>
+              <div class="d-flex flex-wrap gap-3">
+                {{#each mediaSettings.auditEventCategories}}
+                  <div class="form-check"><input id="settings-audit-event-{{key}}" name="audit_categories[]" type="checkbox" class="form-check-input" value="{{key}}" {{#if isSelected}}checked{{/if}}><label class="form-check-label text-capitalize" for="settings-audit-event-{{key}}">{{label}}</label></div>
+                {{/each}}
+              </div>
+            </div>
+            <div class="col-12">
+              <h4 class="settings-audit-category-label mb-1">Administrative changes</h4>
+              <p class="text-muted small fst-italic mb-2">Changes to users, roles, and system settings.</p>
+              <div class="d-flex flex-wrap gap-3">
+                {{#each mediaSettings.auditAdministrationCategories}}
+                  <div class="form-check"><input id="settings-audit-administration-{{key}}" name="audit_categories[]" type="checkbox" class="form-check-input" value="{{key}}" {{#if isSelected}}checked{{/if}}><label class="form-check-label text-capitalize" for="settings-audit-administration-{{key}}">{{label}}</label></div>
+                {{/each}}
+              </div>
+            </div>
+            <div class="col-12">
+              <h4 class="settings-audit-category-label mb-1">Content</h4>
+              <p class="text-muted small fst-italic mb-2">Changes to individual content and screen types.</p>
+              <div class="d-flex flex-wrap gap-3">
+                {{#each mediaSettings.auditContentCategories}}
+                  <div class="form-check"><input id="settings-audit-content-{{key}}" name="audit_categories[]" type="checkbox" class="form-check-input" value="{{key}}" {{#if isSelected}}checked{{/if}}><label class="form-check-label text-capitalize" for="settings-audit-content-{{key}}">{{label}}</label></div>
+                {{/each}}
+              </div>
+            </div>
+            <div class="col-12">
+              <h4 class="settings-audit-category-label mb-1">Data sources</h4>
+              <p class="text-muted small fst-italic mb-2">Configuration changes only; automatic feed refreshes are not logged.</p>
+              <div class="d-flex flex-wrap gap-3">
+                {{#each mediaSettings.auditDataSourceCategories}}
+                  <div class="form-check"><input id="settings-audit-data-source-{{key}}" name="audit_categories[]" type="checkbox" class="form-check-input" value="{{key}}" {{#if isSelected}}checked{{/if}}><label class="form-check-label text-capitalize" for="settings-audit-data-source-{{key}}">{{label}}</label></div>
+                {{/each}}
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="card-footer d-flex justify-content-end">
+          {{#if (hasPermission currentUser 'system-settings.update')}}<button type="submit" class="btn btn-success">Save</button>{{else}}<button type="button" class="btn btn-outline-success" disabled>Save</button>{{/if}}
+        </div>
+      </div>
+    </form>
+
+    <div class="modal fade" id="icon-suggestions-modal" tabindex="-1" aria-labelledby="icon-suggestions-modal-title" aria-hidden="true">
+      <div class="modal-dialog modal-dialog-scrollable modal-lg">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h2 class="modal-title fs-5" id="icon-suggestions-modal-title">Add suggested icons</h2>
+            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+          </div>
+          <div class="modal-body">
+            <label class="visually-hidden" for="icon-suggestions-search">Search icons</label>
+            <div class="input-group mb-3">
+              <span class="input-group-text" aria-hidden="true"><i class="bi bi-search"></i></span>
+              <input id="icon-suggestions-search" class="form-control" type="search" placeholder="Search all Bootstrap icons" data-icon-suggestions-search>
+            </div>
+            <div class="row g-2">
+              {{#each suggestedAnnouncementIcons}}
+                <div class="col-12 col-sm-6 col-lg-4 icon-suggestion-option" data-icon-suggestion-option data-icon-label="{{label}}">
+                  <label class="d-flex align-items-center gap-2 border rounded px-3 py-2 h-100" for="suggested-icon-{{value}}">
+                    <input class="form-check-input mt-0" type="checkbox" id="suggested-icon-{{value}}" value="{{value}}" data-icon-picker-checkbox {{#if isSelected}}checked{{/if}}>
+                    <i class="bi bi-{{value}} fs-5 text-primary" aria-hidden="true"></i>
+                    <span>{{label}}</span>
+                  </label>
+                </div>
+              {{/each}}
+            </div>
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Done</button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

src/web/views/settings/users/form.hbs

@@ -23,6 +23,12 @@
                 <input id="{{#if isEdit}}edit-user-name{{else}}user-name{{/if}}" type="text" name="name" class="form-control" autocomplete="name" value="{{#if isEdit}}{{user.name}}{{else}}{{formValues.name}}{{/if}}" maxlength="128" data-limit-text-length required />
               </div>
             </div>
+            {{#if isEdit}}
+              <div class="mt-3">
+                <input id="edit-user-account-locked" name="account_locked" type="checkbox" class="btn-check" value="1" autocomplete="off" {{#if user.account_locked}}checked{{/if}}>
+                <label class="btn btn-outline-danger" for="edit-user-account-locked"><span class="account-lock-label-unlocked">Account unlocked</span><span class="account-lock-label-locked">Account locked</span></label>
+              </div>
+            {{/if}}
           </div>
           <div class="card-footer d-flex justify-content-end">
             <div class="btn-group" role="group" aria-label="{{#if isEdit}}Profile actions{{else}}User actions{{/if}}">
@@ -86,3 +92,36 @@
     </div>
   </form>
 
+  {{#if isEdit}}
+    <div class="card card-outline card-secondary admin-form-card mt-3">
+      <div class="card-header d-flex align-items-center justify-content-between">
+        <h3 class="card-title">Active sessions</h3>
+        {{#if sessions.length}}
+          <form method="post" action="/settings/users/{{user.id}}/sessions/revoke-all" class="ms-auto flex-shrink-0" data-confirm-message="Sign out all sessions for this user?">
+            <button type="submit" class="btn btn-sm btn-danger">Sign out all</button>
+          </form>
+        {{/if}}
+      </div>
+      <div class="card-body">
+        {{#if sessions.length}}
+          <div class="d-flex flex-column gap-2">
+            {{#each sessions}}
+              <div class="border rounded p-3">
+                <div class="d-flex align-items-start justify-content-between">
+                  <div class="fw-semibold">Active session</div>
+                  <form method="post" action="/settings/users/{{../user.id}}/sessions/{{id}}/revoke">
+                    <button type="submit" class="btn btn-sm btn-outline-danger">Sign out</button>
+                  </form>
+                </div>
+                <div class="text-body-secondary small mt-2">{{ipAddress}} · {{userAgent}}</div>
+                <div class="text-body-secondary small">Created {{createdAtLabel}} · Last used {{lastUsedAtLabel}} · Expires {{expiresAtLabel}}</div>
+              </div>
+            {{/each}}
+          </div>
+        {{else}}
+          <p class="mb-0 text-body-secondary">No active sessions were found.</p>
+        {{/if}}
+      </div>
+    </div>
+  {{/if}}
+

src/web/views/settings/users/list.hbs

@@ -14,7 +14,7 @@
         <input type="search" class="form-control" placeholder="Search users" aria-label="Search users" data-table-search />
       </div>
       {{#if (hasPermission currentUser 'users.create')}}
-        <a class="btn btn-primary btn-sm" href="/users/new">Add user</a>
+        <a class="btn btn-primary btn-sm" href="/settings/users/new">Add user</a>
       {{/if}}
     </div>
   </div>
@@ -25,6 +25,7 @@
         <th data-table-sort-key="user">User</th>
         <th data-table-sort-key="name">Name</th>
         <th data-table-sort-key="roles">Roles</th>
+        <th>Status</th>
         <th>Actions</th>
       </tr>
     </thead>
@@ -66,18 +67,25 @@
                 </div>
               </div>
             </td>
+            <td data-label="Status">
+              {{#if account_locked}}
+                <span class="badge text-bg-danger">Locked</span>
+              {{else}}
+                <span class="badge text-bg-success">Active</span>
+              {{/if}}
+            </td>
             <td data-label="Actions">
               {{#if (anyPermission ../currentUser 'users.create' 'users.update' 'users.delete')}}
                 <div class="actions users-row-actions">
                   {{#unless isCurrentUser}}
                     {{#if (hasPermission ../currentUser 'users.update')}}
-                      <a class="btn btn-sm btn-primary" href="/users/{{id}}/edit">Edit</a>
+                      <a class="btn btn-sm btn-primary" href="/settings/users/{{id}}/edit">Edit</a>
                     {{/if}}
                     {{#if (hasPermission ../currentUser 'users.create')}}
-                      <a class="btn btn-sm btn-secondary" href="/users/{{id}}/duplicate">Dupe</a>
+                      <a class="btn btn-sm btn-secondary" href="/settings/users/{{id}}/duplicate">Dupe</a>
                     {{/if}}
                     {{#if (hasPermission ../currentUser 'users.delete')}}
-                      <form method="post" action="/users/{{id}}/delete" class="inline-form" data-confirm-message="Delete {{username}}?">
+                        <form method="post" action="/settings/users/{{id}}/delete" class="inline-form" data-confirm-message="Delete {{username}}?">
                         <button type="submit" class="btn btn-sm btn-danger">Delete</button>
                       </form>
                     {{/if}}
@@ -92,10 +100,10 @@
           </tr>
         {{/each}}
       {{else}}
-        <tr data-table-search-empty-default><td colspan="4" class="empty">No users found.</td></tr>
+        <tr data-table-search-empty-default><td colspan="5" class="empty">No users found.</td></tr>
       {{/if}}
     </tbody>
   </table>
   </div>
-  {{> table-pagination pagination=pagination basePath="/users" alwaysShow=true}}
+  {{> table-pagination pagination=pagination basePath="/settings/users" alwaysShow=true}}
 </div>

src/web/views/shared/layout.hbs

@@ -267,12 +267,20 @@
                     </a>
                   </li>
                 {{/if}}
-                {{#if (anyPermission currentUser 'background-tasks.read' 'scheduled-tasks.read' 'users.read' 'rbac.read' 'fonts.read')}}
+                {{#if (anyPermission currentUser 'system-settings.read' 'audit-log.read' 'background-tasks.read' 'scheduled-tasks.read' 'users.read' 'rbac.read' 'fonts.read')}}
                   <li class="nav-header">SETTINGS</li>
                 {{/if}}
+                {{#if (hasPermission currentUser 'fonts.read')}}
+                  <li class="nav-item">
+                    <a class="nav-link {{#if (eq active 'fonts')}}active{{/if}}" href="/settings/fonts">
+                      <i class="nav-icon bi bi-type"></i>
+                      <p>Fonts</p>
+                    </a>
+                  </li>
+                {{/if}}
                 {{#if (hasPermission currentUser 'users.read')}}
                   <li class="nav-item">
-                    <a class="nav-link {{#if (eq active 'users')}}active{{/if}}" href="/users">
+                    <a class="nav-link {{#if (eq active 'users')}}active{{/if}}" href="/settings/users">
                       <i class="nav-icon bi bi-people"></i>
                       <p>Users</p>
                     </a>
@@ -280,20 +288,12 @@
                 {{/if}}
                 {{#if (hasPermission currentUser 'rbac.read')}}
                   <li class="nav-item">
-                    <a class="nav-link {{#if (eq active 'rbac')}}active{{/if}}" href="/rbac">
+                    <a class="nav-link {{#if (eq active 'rbac')}}active{{/if}}" href="/settings/roles">
                       <i class="nav-icon bi bi-shield-lock"></i>
                       <p>Roles and permissions</p>
                     </a>
                   </li>
                 {{/if}}
-                {{#if (hasPermission currentUser 'fonts.read')}}
-                  <li class="nav-item">
-                    <a class="nav-link {{#if (eq active 'fonts')}}active{{/if}}" href="/settings/fonts">
-                      <i class="nav-icon bi bi-type"></i>
-                      <p>Fonts</p>
-                    </a>
-                  </li>
-                {{/if}}
                 {{#if (anyPermission currentUser 'background-tasks.read' 'scheduled-tasks.read')}}
                   <li class="nav-item has-treeview{{#if backgroundTasksMenuOpen}} menu-open{{/if}}">
                     <a class="nav-link{{#if backgroundTasksMenuOpen}} active{{/if}}" href="#">
@@ -323,12 +323,28 @@
                     </ul>
                   </li>
                 {{/if}}
+                {{#if (hasPermission currentUser 'audit-log.read')}}
+                  <li class="nav-item">
+                    <a class="nav-link {{#if (eq active 'audit-log')}}active{{/if}}" href="/settings/audit-log">
+                      <i class="nav-icon bi bi-journal-text"></i>
+                      <p>Audit log</p>
+                    </a>
+                  </li>
+                {{/if}}
+                {{#if (hasPermission currentUser 'system-settings.read')}}
+                  <li class="nav-item">
+                    <a class="nav-link {{#if (eq active 'settings')}}active{{/if}}" href="/settings/system">
+                      <i class="nav-icon bi bi-sliders"></i>
+                      <p>System Settings</p>
+                    </a>
+                  </li>
+                {{/if}}
               </ul>
             </nav>
             <div class="sidebar-version mt-auto pt-2 text-secondary small">
               <div class="sidebar-version__inner border-top pt-2 d-flex align-items-center justify-content-between gap-3">
                 <span>v{{appVersion}}</span>
-                <a href="/settings/about" class="text-secondary text-decoration-none text-nowrap">Pulse Signage</a>
+                <a href="/settings/about" class="text-secondary text-decoration-none text-nowrap">About Pulse</a>
               </div>
             </div>
           </div>

src/web/views/signage/announcements/form.hbs

@@ -51,33 +51,42 @@
             </div>
             <div class="col-12 col-lg-6">
               <div class="form-label">Icon</div>
-              <div class="announcement-icon-picker" data-announcement-icon-picker-shell>
+              <div class="announcement-icon-picker" data-icon-picker data-announcement-icon-picker-shell>
                 <select id="announcement-icon" name="icon_key" class="d-none" tabindex="-1" aria-hidden="true">
-                  {{#each announcementIcons}}
+                  {{#each announcementIconCatalog}}
                     <option value="{{value}}" {{#if (eq ../announcement.icon_key value)}}selected{{/if}}>{{label}}</option>
                   {{/each}}
                 </select>
-                <button type="button" class="announcement-icon-picker__toggle" data-announcement-icon-picker-toggle aria-expanded="false" aria-controls="announcement-icon-picker-menu" title="Select an icon">
-                  <span class="announcement-icon-picker__toggle-icon" data-announcement-icon-picker-icon aria-hidden="true"></span>
+                <button type="button" class="announcement-icon-picker__toggle" data-icon-picker-toggle data-announcement-icon-picker-toggle aria-expanded="false" aria-controls="announcement-icon-picker-menu" title="Select an icon">
+                  <span class="announcement-icon-picker__toggle-icon" data-icon-picker-preview data-announcement-icon-picker-icon aria-hidden="true"></span>
                   <span class="announcement-icon-picker__toggle-content">
-                    <span class="announcement-icon-picker__toggle-label" data-announcement-icon-picker-label>Select an icon</span>
+                    <span class="announcement-icon-picker__toggle-label" data-icon-picker-label data-announcement-icon-picker-label>Select an icon</span>
                     <span class="announcement-icon-picker__toggle-hint">Click to choose</span>
                   </span>
                   <i class="bi bi-chevron-down announcement-icon-picker__caret" aria-hidden="true"></i>
                 </button>
-                <div id="announcement-icon-picker-menu" class="announcement-icon-picker__menu" data-announcement-icon-picker hidden>
+                <div id="announcement-icon-picker-menu" class="announcement-icon-picker__menu" data-icon-picker-menu data-announcement-icon-picker hidden>
                   <div class="announcement-icon-picker__header">
                     <span>Choose an icon</span>
-                    <button type="button" class="btn btn-sm btn-link text-decoration-none p-0" data-announcement-icon-picker-close>Close</button>
+                    <button type="button" class="btn btn-sm btn-link text-decoration-none p-0" data-icon-picker-close data-announcement-icon-picker-close>Close</button>
                   </div>
-                  <div class="announcement-icon-picker__grid">
+                  <div class="input-group input-group-sm announcement-icon-picker__search">
+                    <span class="input-group-text" aria-hidden="true"><i class="bi bi-search"></i></span>
+                    <input type="search" class="form-control" placeholder="Search all Bootstrap icons" aria-label="Search all Bootstrap icons" data-icon-picker-search data-announcement-icon-search />
+                  </div>
+                  <div class="announcement-icon-picker__section-header">
+                    <span data-announcement-icon-grid-title>Suggested icons</span>
+                    <span class="announcement-icon-picker__section-count" data-announcement-icon-search-count></span>
+                  </div>
+                  <div class="announcement-icon-picker__grid" data-icon-picker-grid data-announcement-icon-grid>
                     {{#each announcementIcons}}
-                      <button type="button" class="announcement-icon-picker__option" data-announcement-icon-option data-icon-key="{{value}}" aria-pressed="false" title="{{label}}">
+                      <button type="button" class="announcement-icon-picker__option" data-icon-picker-option data-announcement-icon-option data-icon-key="{{value}}" data-icon-label="{{label}}" data-icon-search-terms="{{value}} {{label}}" aria-pressed="false" title="{{label}}">
                         <i class="bi bi-{{value}}" aria-hidden="true"></i>
                         <span class="visually-hidden">{{label}}</span>
                       </button>
                     {{/each}}
                   </div>
+                  <div class="announcement-icon-picker__search-empty" data-icon-picker-empty data-announcement-icon-search-empty hidden>No matching icons.</div>
                 </div>
               </div>
             </div>
@@ -165,6 +174,7 @@
       </div>
     </div>
   </div>
+  <script src="/assets/js/icon-picker.js?v={{appVersion}}"></script>
   <script type="module" src="/assets/js/announcements/announcement-form.js?v={{appVersion}}"></script>
 </form>
 

src/web/views/signage/dashboard/index.hbs

@@ -177,7 +177,7 @@
           <span>Download for Windows</span>
         </a>
         <a class="btn btn-outline-secondary btn-lg flex-fill disabled dashboard-kiosk-launcher-download" data-kiosk-launcher-download data-kiosk-launcher-download-base="/downloads/kiosk/pulse-signage-kiosk.sh" aria-disabled="true" tabindex="-1">
-          <i class="bi bi-terminal me-2" aria-hidden="true"></i>
+          <i class="bi bi-tux me-2" aria-hidden="true"></i>
           <span>Download for Linux</span>
         </a>
       </div>

src/web/views/signage/playlists/form.hbs

@@ -67,7 +67,7 @@
       <div class="card-body p-0 playlist-items-table-responsive">
         <table class="table table-striped w-100 mb-0">
           <thead><tr><th>Order</th><th>Slide</th><th>Schedule</th><th>Playback</th><th>Actions</th></tr></thead>
-          <tbody id="playlist-items-body" data-playlist-id="{{playlist.id}}" data-playlist-canvas-id="{{playlistCanvasId}}">
+          <tbody id="playlist-items-body" data-playlist-id="{{playlist.id}}" data-playlist-canvas-id="{{playlistCanvasId}}" data-default-slide-duration="{{defaultSlideDurationSeconds}}">
             {{#if playlistSlides.length}}
               {{#each playlistSlides}}
                 {{> signage/playlists/slide-row slide=this playlistScheduleConfigUrl=../playlistScheduleConfigUrl}}

test/action-buttons.test.js

@@ -60,8 +60,8 @@ test('save action buttons can hide the secondary dropdown and delete control', (
 test('save action buttons keep the new action wired for create pages', () => {
   const html = compileActionButtons({
     formId: 'example-form',
-    saveUrl: '/users',
-    cancelUrl: '/users',
+    saveUrl: '/settings/users',
+    cancelUrl: '/settings/users',
     showSaveAndClose: true,
     showSaveAndNew: true,
     showDelete: true

test/admin-users-create-no-roles-route.test.js

@@ -71,7 +71,7 @@ test('user create route allows users without roles', async () => {
 
   registerUsersRoutes(app, deps);
 
-  const routeHandlers = handlers['/users'];
+  const routeHandlers = handlers['/settings/users'];
   assert.equal(Array.isArray(routeHandlers), true);
 
   const req = {
@@ -99,7 +99,7 @@ test('user create route allows users without roles', async () => {
 
   assert.ok(insertedArgs);
   assert.deepEqual(syncedRoles, { userId: 11, roleIds: [] });
-  assert.equal(res.redirectedTo, '/users/11/edit?message=User%20created.');
+  assert.equal(res.redirectedTo, '/settings/users/11/edit?message=User%20created.');
 });
 
 test('user create save and new goes to the blank create page', async () => {
@@ -164,7 +164,7 @@ test('user create save and new goes to the blank create page', async () => {
 
   registerUsersRoutes(app, deps);
 
-  const routeHandlers = handlers['/users'];
+  const routeHandlers = handlers['/settings/users'];
   const req = {
     body: {
       name: 'No Roles User',
@@ -189,5 +189,5 @@ test('user create save and new goes to the blank create page', async () => {
 
   await routeHandlers[1](req, res, () => {});
 
-  assert.equal(res.redirectedTo, '/users/new?message=User%20created.');
+  assert.equal(res.redirectedTo, '/settings/users/new?message=User%20created.');
 });

test/admin-users-edit-save-new-route.test.js

@@ -27,7 +27,7 @@ test('user edit save and new goes to the blank create page', async () => {
         return {
           async beginTransaction() {},
           async query(sql) {
-            if (sql.includes('UPDATE a_users SET name = ?, username = ?, modified_by = ? WHERE id = ?')) {
+            if (sql.includes('UPDATE a_users SET name = ?, username = ?, account_locked = ?, modified_by = ? WHERE id = ?')) {
               return [{ affectedRows: 1 }];
             }
             return [[]];
@@ -65,7 +65,7 @@ test('user edit save and new goes to the blank create page', async () => {
 
   registerUsersRoutes(app, deps);
 
-  const routeHandlers = handlers['/users/:id/username'];
+  const routeHandlers = handlers['/settings/users/:id/username'];
   assert.equal(Array.isArray(routeHandlers), true);
 
   const req = {
@@ -91,5 +91,5 @@ test('user edit save and new goes to the blank create page', async () => {
 
   await routeHandlers[1](req, res, () => {});
 
-  assert.equal(res.redirectedTo, '/users/new?message=User%20updated.');
+  assert.equal(res.redirectedTo, '/settings/users/new?message=User%20updated.');
 });

test/admin-users-password-route.test.js

@@ -52,7 +52,7 @@ test('user password reset redirects back to the selected user edit page', async
 
   registerUsersRoutes(app, deps);
 
-  const routeHandlers = handlers['/users/:id/password'];
+  const routeHandlers = handlers['/settings/users/:id/password'];
   assert.equal(Array.isArray(routeHandlers), true);
 
   const req = {
@@ -74,5 +74,5 @@ test('user password reset redirects back to the selected user edit page', async
 
   await routeHandlers[1](req, res, () => {});
 
-  assert.equal(res.redirectedTo, '/users/7/edit?message=Password%20updated.');
+  assert.equal(res.redirectedTo, '/settings/users/7/edit?message=Password%20updated.');
 });

test/announcements-duplicate.test.js

@@ -18,6 +18,7 @@ Module._resolveFilename = function (request, parent, isMain, options) {
 const { buildDuplicateAnnouncementName, buildDuplicateAnnouncement } = require('../src/web/routes/signage/announcements/duplicate');
 const { buildAnnouncementFormViewModel } = require('../src/web/routes/signage/announcements/form-view-model');
 const renderAnnouncementsPage = require('../src/web/routes/signage/announcements/list');
+const announcementIcons = require('../src/data/announcement-icons');
 
 test('announcement duplicate helper copies editable fields and resets runtime state', () => {
   const source = {
@@ -98,6 +99,23 @@ test('announcement form template uses an icon-backed type picker', () => {
   assert.match(template, /data-type-icon="\{\{icon\}\}"/);
 });
 
+test('announcement form template includes a searchable bootstrap icon catalog', () => {
+  const template = fs.readFileSync(path.join(__dirname, '..', 'src', 'web', 'views', 'signage', 'announcements', 'form.hbs'), 'utf8');
+
+  assert.match(template, /data-announcement-icon-search/);
+  assert.match(template, /announcementIconCatalog/);
+  assert.match(template, /data-announcement-icon-grid/);
+  assert.ok(!/data-announcement-icon-search-section/.test(template));
+});
+
+test('announcement icons accept catalog-only bootstrap icon keys', () => {
+  assert.equal(announcementIcons.normalizeAnnouncementIcon('bank'), 'bank');
+  assert.ok(announcementIcons.ANNOUNCEMENT_ICON_CATALOG.some(function (icon) {
+    return icon.value === 'bank';
+  }));
+  assert.equal(announcementIcons.ANNOUNCEMENT_ICON_LABELS.bank, 'Bank');
+});
+
 test('announcement form template uses a checkbox card grid for screen groups', () => {
   const template = fs.readFileSync(path.join(__dirname, '..', 'src', 'web', 'views', 'signage', 'announcements', 'form.hbs'), 'utf8');
 

test/app-settings.test.js

@@ -0,0 +1,80 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+
+const {
+  getDefaultAppSettings,
+  normalizeSettingValue,
+  normalizeAppSettings,
+  fetchAppSettings,
+  saveAppSettings
+} = require('../src/data/app-settings');
+
+test('application settings expose typed defaults', () => {
+  const settings = getDefaultAppSettings();
+
+  assert.equal(settings['app.name'], 'Pulse Signage');
+  assert.equal(settings['uploads.image_max_bytes'], 100 * 1024 * 1024);
+  assert.deepEqual(settings['uploads.allowed_mime_types'], ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/svg+xml', 'video/mp4', 'video/webm', 'video/ogg']);
+  assert.equal(settings['uploads.optimize_images'], true);
+  assert.equal(settings['security.session_lifetime_days'], 14);
+  assert.equal(settings['security.allow_user_session_revocation'], true);
+  assert.equal(settings['security.max_active_sessions'], 0);
+  assert.equal(settings['security.password_min_length'], 10);
+  assert.equal(settings['security.password_min_categories'], 3);
+  assert.equal(settings['security.require_password_change_for_new_users'], true);
+  assert.equal(settings['security.require_password_change_after_admin_reset'], true);
+  assert.equal(settings['security.login_max_attempts'], 5);
+  assert.equal(settings['security.login_lockout_minutes'], 15);
+  assert.equal(settings['security.login_rate_limit_scope'], 'both');
+  assert.equal(settings['data-sources.rss_default_interval_value'], 60);
+  assert.equal(settings['data-sources.rss_default_interval_unit'], 'minutes');
+  assert.equal(settings['data-sources.api_default_interval_value'], 60);
+  assert.equal(settings['data-sources.api_default_interval_unit'], 'minutes');
+});
+
+test('application settings normalize supported values and reject invalid values', () => {
+  assert.equal(normalizeSettingValue('player.default_fade_between_slides', 'false'), false);
+  assert.equal(normalizeSettingValue('uploads.optimize_images', 'false'), false);
+  assert.deepEqual(normalizeSettingValue('uploads.allowed_mime_types', ['image/png', ' image/png', 'video/mp4']), ['image/png', 'video/mp4']);
+  assert.throws(() => normalizeSettingValue('player.default_fade_between_slides', 'bounce'), /Invalid value/);
+  assert.throws(() => normalizeSettingValue('uploads.image_max_bytes', 0), /Invalid value/);
+  assert.throws(() => normalizeSettingValue('unknown.setting', 'value'), /Unknown application setting/);
+});
+
+test('fetch app settings merges stored values with defaults', async () => {
+  const pool = {
+    async query() {
+      return [[
+        { setting_key: 'uploads.image_max_bytes', setting_value: '2097152' },
+        { setting_key: 'uploads.optimize_images', setting_value: 'false' },
+        { setting_key: 'unknown.setting', setting_value: 'ignored' }
+      ]];
+    }
+  };
+
+  const settings = await fetchAppSettings(pool);
+  assert.equal(settings['uploads.image_max_bytes'], 2097152);
+  assert.equal(settings['uploads.optimize_images'], false);
+  assert.equal(settings['player.default_fade_between_slides'], true);
+});
+
+test('save app settings writes only supplied keys in one transaction', async () => {
+  const queries = [];
+  const connection = {
+    async beginTransaction() { queries.push('begin'); },
+    async query(sql, params) { queries.push({ sql, params }); },
+    async commit() { queries.push('commit'); },
+    async rollback() { queries.push('rollback'); },
+    release() { queries.push('release'); }
+  };
+  const pool = {
+    async getConnection() { return connection; }
+  };
+
+  const saved = await saveAppSettings(pool, { 'player.default_fade_between_slides': false }, 7);
+  assert.equal(saved['player.default_fade_between_slides'], false);
+  assert.equal(queries[0], 'begin');
+  assert.equal(queries[queries.length - 2], 'commit');
+  assert.equal(queries[queries.length - 1], 'release');
+  assert.equal(queries.filter(function (entry) { return entry && entry.sql; }).length, 1);
+});

test/audit-log-route.test.js

@@ -0,0 +1,82 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+
+require('../src/common');
+
+const registerAuditLogRoutes = require('../src/web/routes/settings/audit-log');
+
+test('audit log uses its own read permission and shared pagination partial', async () => {
+  const handlers = {};
+  const app = {
+    get(path, ...routeHandlers) {
+      handlers[path] = routeHandlers;
+    }
+  };
+
+  registerAuditLogRoutes(app, {
+    pool: {
+      async query(sql) {
+        if (String(sql).includes('FROM o_audit_events')) {
+          return [[
+            {
+              id: 1,
+              occurred_at: '2026-08-16T12:00:00.000Z',
+              category: 'authentication',
+              event_type: 'login.success',
+              target_label: 'newer',
+              details_json: null
+            },
+            {
+              id: 2,
+              occurred_at: '2026-08-15T12:00:00.000Z',
+              category: 'authentication',
+              event_type: 'login.failed',
+              target_label: 'older',
+              details_json: null
+            }
+          ]];
+        }
+        return [[]];
+      }
+    },
+    formatDashboardDate() {
+      return 'Aug 16, 2026';
+    }
+  });
+
+  assert.ok(handlers['/settings/audit-log']);
+  const request = {
+    currentUser: { id: 7, permissions: ['audit-log.read', 'audit-log.allow'] },
+    query: {}
+  };
+  let continued = false;
+  handlers['/settings/audit-log'][0](request, {}, function () {
+    continued = true;
+  });
+  assert.equal(continued, true);
+
+  const response = { send(value) { this.body = value; } };
+  await handlers['/settings/audit-log'][1](request, response, function (error) {
+    throw error;
+  });
+  assert.match(response.body, /Audit log/);
+  assert.match(response.body, /table-pagination/);
+  assert.match(response.body, /data-local-datetime/);
+  assert.match(response.body, /audit-event-type-options/);
+  assert.match(response.body, /login\.success/);
+  assert.ok(response.body.indexOf('login.success') < response.body.indexOf('login.failed'));
+  assert.match(response.body, />Export</);
+  assert.ok(handlers['/settings/audit-log/export']);
+
+  const exportResponse = {
+    headers: {},
+    setHeader(name, value) { this.headers[name] = value; },
+    send(value) { this.body = value; }
+  };
+  await handlers['/settings/audit-log/export'][1](request, exportResponse, function (error) {
+    throw error;
+  });
+  assert.match(exportResponse.headers['Content-Type'], /text\/csv/);
+  assert.match(exportResponse.body, /Occurred At \(UTC\)/);
+  assert.match(exportResponse.body, /login.success/);
+});

test/audit-log-settings.test.js

@@ -0,0 +1,47 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+
+require('../src/common');
+
+const { recordRequestAuditEvent } = require('../src/data/audit-log');
+
+function createPool(settings) {
+  const inserts = [];
+  return {
+    inserts,
+    async query(sql, params) {
+      if (String(sql).includes('SELECT id, setting_key, setting_value FROM o_app_settings')) {
+        return [[
+          { setting_key: 'audit.enabled', setting_value: JSON.stringify(settings.enabled) },
+          { setting_key: 'audit.categories', setting_value: JSON.stringify(settings.categories) },
+          { setting_key: 'audit.include_request_metadata', setting_value: JSON.stringify(settings.includeMetadata) }
+        ]];
+      }
+      if (String(sql).includes('INSERT INTO o_audit_events')) {
+        inserts.push(params);
+      }
+      return [[]];
+    }
+  };
+}
+
+const request = {
+  ip: '192.0.2.10',
+  headers: {
+    'user-agent': 'audit-test'
+  }
+};
+
+test('audit writer skips disabled categories', async () => {
+  const pool = createPool({ enabled: true, categories: ['security'], includeMetadata: true });
+  await recordRequestAuditEvent(pool, request, { category: 'authentication', eventType: 'login.success' });
+  assert.equal(pool.inserts.length, 0);
+});
+
+test('audit writer omits request metadata when disabled', async () => {
+  const pool = createPool({ enabled: true, categories: ['authentication'], includeMetadata: false });
+  await recordRequestAuditEvent(pool, request, { category: 'authentication', eventType: 'login.success' });
+  assert.equal(pool.inserts.length, 1);
+  assert.equal(pool.inserts[0][6], null);
+  assert.equal(pool.inserts[0][7], null);
+});

test/auth-routes.test.js

@@ -8,10 +8,12 @@ const renderLoginPage = require('../src/web/routes/auth/login');
 const { createSessionService, normalizeReturnToPath } = require('../src/web/lib/auth/session');
 
 test('login page preserves the return target in a hidden field', () => {
-  const html = renderLoginPage('', '/slides/6/edit');
+  const html = renderLoginPage('', '/slides/6/edit', 'demo');
 
   assert.match(html, /name="returnTo"/);
   assert.match(html, /value="\/slides\/6\/edit"/);
+  assert.match(html, /name="remember_me"/);
+  assert.match(html, /name="username"[^>]*value="demo"/);
 });
 
 test('requireAuth preserves the original request path when redirecting to login', () => {
@@ -80,8 +82,10 @@ test('successful login returns to the requested link instead of the dashboard',
       }
     },
     createUserSession: async () => 'session-token',
-    setSessionCookie(res, token) {
+    getSessionMaxAgeMs: async () => 7 * 24 * 60 * 60 * 1000,
+    setSessionCookie(res, token, maxAgeMs) {
       res.sessionToken = token;
+      res.sessionMaxAgeMs = maxAgeMs;
     },
     clearSessionCookie() {},
     parseCookies() {
@@ -126,5 +130,31 @@ test('successful login returns to the requested link instead of the dashboard',
   await handlers['POST /login'][0](req, res, () => {});
 
   assert.equal(res.sessionToken, 'session-token');
+  assert.equal(res.sessionMaxAgeMs, null);
   assert.equal(res.redirectedTo, '/slides/6/edit?tab=content');
+
+  const rememberedRequest = {
+    body: {
+      username: 'demo',
+      password: 'secret',
+      remember_me: '1'
+    },
+    query: {}
+  };
+  const rememberedResponse = {
+    redirect(url) {
+      this.redirectedTo = url;
+    },
+    status() {
+      return this;
+    },
+    send(value) {
+      this.sentValue = value;
+      return this;
+    }
+  };
+
+  await handlers['POST /login'][0](rememberedRequest, rememberedResponse, () => {});
+
+  assert.equal(rememberedResponse.sessionMaxAgeMs, 7 * 24 * 60 * 60 * 1000);
 });

test/background-tasks-expired-session-sweep.test.js

@@ -0,0 +1,27 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+
+const { registerExpiredSessionSweepTask } = require('../src/web/lib/background-tasks/tasks-scheduled/expired-session-sweep');
+
+test('expired session sweep registers and deletes expired sessions', async () => {
+  let definition = null;
+  const queries = [];
+  registerExpiredSessionSweepTask({
+    backgroundTaskQueue: {
+      registerRecurringTask(value) {
+        definition = value;
+      }
+    },
+    pool: {
+      async query(sql) {
+        queries.push(sql);
+        return [{ affectedRows: 3 }];
+      }
+    }
+  });
+
+  assert.equal(definition.key, 'expired-session-sweep');
+  assert.equal(definition.intervalMs, 60 * 60 * 1000);
+  await definition.run();
+  assert.deepEqual(queries, ['DELETE FROM a_sessions WHERE expires_at <= NOW()']);
+});

test/not-found-middleware.test.js

@@ -0,0 +1,21 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+
+const registerNotFoundHandler = require('../src/web/middleware/not-found');
+
+test('unmatched requests are forwarded as 404 errors', () => {
+  let handler = null;
+  registerNotFoundHandler({
+    use(value) {
+      handler = value;
+    }
+  });
+
+  let receivedError = null;
+  handler({}, {}, function (error) {
+    receivedError = error;
+  });
+
+  assert.equal(receivedError.statusCode, 404);
+  assert.equal(receivedError.message, 'Page not found.');
+});

test/password-strength.test.js

@@ -8,4 +8,23 @@ test('password strength requires a longer mixed-character password', () => {
   assert.equal(validatePasswordStrength('1234567890'), 'Password must be at least 10 characters and include 3 of: uppercase, lowercase, number, and symbol.');
   assert.equal(validatePasswordStrength('Password12'), '');
   assert.equal(validatePasswordStrength('NewPassword!1'), '');
+});
+
+test('password strength supports strong and strict policies', () => {
+  assert.equal(validatePasswordStrength('Password12', { policy: 'strong' }), 'Password must be at least 12 characters and include 3 of: uppercase, lowercase, number, and symbol.');
+  assert.equal(validatePasswordStrength('Password12!!', { policy: 'strong' }), '');
+  assert.equal(validatePasswordStrength('Password12!Abc', { policy: 'strict' }), '');
+  assert.equal(validatePasswordStrength('Password12!Ab', { policy: 'strict' }), 'Password must be at least 14 characters and include uppercase, lowercase, number, and symbol.');
+});
+
+test('password strength supports custom category requirements', () => {
+  const requirements = {
+    minimumLength: 8,
+    minimumCategories: 2,
+    requireUppercase: true,
+    requireSymbol: true
+  };
+
+  assert.equal(validatePasswordStrength('password1!', requirements), 'Password must be at least 8 characters and include uppercase, symbol.');
+  assert.equal(validatePasswordStrength('Password!', requirements), '');
 });

test/rbac-permissions.test.js

@@ -4,17 +4,23 @@ const fs = require('node:fs');
 
 const rbacPermissionsScript = fs.readFileSync(require.resolve('../src/web/public/js/rbac-permissions.js'), 'utf8');
 const rbacFormTemplate = fs.readFileSync(require.resolve('../src/web/views/settings/rbac/form.hbs'), 'utf8');
+const rbacRoutesSource = fs.readFileSync(require.resolve('../src/web/routes/admin/rbac.js'), 'utf8');
 const { buildPermissionSections } = require('../src/web/routes/settings/rbac/form-view-model');
 const rbacFormViewModel = fs.readFileSync(require.resolve('../src/web/routes/settings/rbac/form-view-model.js'), 'utf8');
 const rbacSource = fs.readFileSync(require.resolve('../src/rbac.js'), 'utf8');
 
 test('rbac form exposes bulk permission controls', () => {
   assert.match(rbacFormTemplate, /name="permissions_present" value="1"/);
+  assert.match(rbacFormTemplate, /name="user_ids_present\[\]" value="\{\{id\}\}"/);
   assert.match(rbacFormTemplate, /accordion accordion-flush/);
-  assert.match(rbacFormTemplate, /card card-outline card-secondary overflow-hidden/);
+  assert.match(rbacFormTemplate, /rbac-permissions-table-head/);
+  assert.ok(!rbacFormTemplate.includes('table-light'));
+  assert.match(rbacFormTemplate, /<h3 class="card-title">Permissions<\/h3>[\s\S]*<div class="card-body p-0">[\s\S]*accordion accordion-flush/);
+  assert.match(rbacFormTemplate, /card card-outline card-secondary admin-form-card overflow-hidden[\s\S]*<h3 class="card-title">Permissions<\/h3>/);
+  assert.ok(!rbacFormTemplate.includes('card card-outline card-secondary overflow-hidden'));
   assert.match(rbacFormTemplate, /accordion-item overflow-hidden" data-permission-section/);
   assert.match(rbacFormTemplate, /accordion-body p-0/);
-  assert.ok(!rbacFormTemplate.includes('data-bs-parent="#role-permissions-accordion"'));
+  assert.match(rbacFormTemplate, /data-bs-parent="#role-permissions-accordion"/);
   assert.match(rbacFormTemplate, /table-layout: fixed; width: 100%;/);
   assert.match(rbacFormTemplate, /<col style="width: 5\.5rem;" \/>/);
   assert.match(rbacFormTemplate, /class="text-center"/);
@@ -37,9 +43,12 @@ test('rbac form exposes bulk permission controls', () => {
   assert.ok(rbacFormViewModel.includes("label: 'Delete'"));
   assert.ok(rbacFormViewModel.includes("label: 'Allow'"));
   assert.ok(rbacFormViewModel.includes('left.resourceOrder'));
+  assert.ok(rbacRoutesSource.includes('resourceOrder: Number(permission.resourceOrder) || 999'));
   assert.ok(rbacFormViewModel.includes('section.actions = actionDefinitions.map'));
-  assert.ok(rbacFormViewModel.includes('data-async-save-new-url="/rbac/new"'));
-  assert.ok(rbacFormViewModel.includes('data-async-save-close-url="/rbac" data-async-save-new-url="/rbac/new"'));
+  assert.ok(rbacFormViewModel.includes('data-async-save-new-url="/settings/roles/new"'));
+  assert.ok(rbacFormViewModel.includes('data-async-save-close-url="/settings/roles" data-async-save-new-url="/settings/roles/new"'));
+  assert.ok(rbacFormViewModel.includes('cancelConfirmMessage: "You\'ve made changes. Are you sure you want to leave this page?"'));
+  assert.match(rbacFormTemplate, /cancelConfirmMessage=cancelConfirmMessage/);
   assert.ok(rbacSource.includes("sectionName: 'Main navigation'"));
   assert.ok(rbacSource.includes("permissions: ["));
   assert.ok(rbacSource.includes("resourceOrder: resource.order"));
@@ -50,15 +59,16 @@ test('rbac permissions script supports bulk permission selection', () => {
   assert.ok(rbacPermissionsScript.includes('function toggleRowCheckboxes(row)'));
   assert.ok(rbacPermissionsScript.includes('data-permission-row-toggle'));
   assert.ok(rbacPermissionsScript.includes("toggleRowCheckboxes(findPermissionRow(targetId));"));
+  assert.match(rbacPermissionsScript, /toggleRowCheckboxes\(findPermissionRow\(targetId\)\);\s*markPermissionFormDirty\(control\);/);
   assert.ok(!rbacPermissionsScript.includes('data-permission-select-none'));
   assert.ok(!rbacPermissionsScript.includes('data-permission-section-select-none'));
 });
 
-test('rbac accordion sections follow source order', () => {
+test('rbac accordion sections follow configured order', () => {
   const sections = buildPermissionSections([
     {
       categoryName: 'Settings',
-      sectionIndex: 3,
+      sectionIndex: 0,
       sectionOrder: 40,
       resourceIndex: 1,
       resourceOrder: 20,
@@ -67,9 +77,9 @@ test('rbac accordion sections follow source order', () => {
     },
     {
       categoryName: 'Main navigation',
-      sectionIndex: 0,
+      sectionIndex: 3,
       sectionOrder: 10,
-      resourceIndex: 1,
+      resourceIndex: 0,
       resourceOrder: 20,
       title: 'Clients',
       permissions: []
@@ -78,7 +88,7 @@ test('rbac accordion sections follow source order', () => {
       categoryName: 'Main navigation',
       sectionIndex: 0,
       sectionOrder: 10,
-      resourceIndex: 0,
+      resourceIndex: 1,
       resourceOrder: 10,
       title: 'Dashboard',
       permissions: []
@@ -97,7 +107,7 @@ test('rbac duplicate route exists', () => {
   const rbacRoutes = fs.readFileSync(require.resolve('../src/web/routes/admin/rbac.js'), 'utf8');
   const duplicateHelpers = fs.readFileSync(require.resolve('../src/web/routes/settings/rbac/duplicate.js'), 'utf8');
 
-  assert.match(rbacRoutes, /\/rbac\/:id\/duplicate/);
+  assert.match(rbacRoutes, /\/settings\/roles\/:id\/duplicate/);
   assert.ok(rbacRoutes.includes("requirePermission('rbac.create')"));
   assert.ok(duplicateHelpers.includes('buildDuplicateRoleName'));
   assert.ok(duplicateHelpers.includes('buildDuplicateRole'));