Changeset 3799692

Timestamp:

11/13/2026 05:12:46 AM (2 hours ago)

Author:

aaronhsieh

Message:

Release 1.10.0: tabbed dashboard, lighter page loads, uninstall cleanup

Location:

site-add-on-watchdog/trunk

Files:

• CHANGELOG.md (modified) (1 diff)
• assets/css/admin.css (modified) (1 diff)
• assets/js/admin-table.js (modified) (1 diff)
• languages/site-add-on-watchdog.pot (modified) (15 diffs)
• readme.txt (modified) (8 diffs)
• site-add-on-watchdog.php (modified) (2 diffs)
• src/Admin/RiskSorter.php (modified) (6 diffs)
• src/AdminPage.php (modified) (12 diffs)
• src/Bootstrap.php (modified) (1 diff)
• src/Plugin.php (modified) (10 diffs)
• src/Repository/MigratesLegacyOptions.php (added)
• src/Repository/RiskRepository.php (modified) (4 diffs)
• src/Repository/SettingsRepository.php (modified) (3 diffs)
• src/Scanner.php (modified) (4 diffs)
• src/Services/NotificationQueue.php (modified) (2 diffs)
• src/Services/WPScanClient.php (modified) (3 diffs)
• src/Version.php (modified) (1 diff)
• templates/admin-page.php (modified) (6 diffs)
• templates/history.php (modified) (2 diffs)
• uninstall.php (added)

site-add-on-watchdog/trunk/CHANGELOG.md

@@ -5 +5 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [1.10.0] - 2026-11-13
+
+### Added
+
+- Split the dashboard into Risks, History, Settings, and Delivery tabs. The overview now shows when the last scan ran and when the next one is due.
+- Check plugins that have no WordPress.org directory entry against WPScan when an API key is configured. The "not in the directory" answer is cached for six hours.
+- Delete the plugin's settings, saved risks, ignore list, scan history, notification queue, and scheduled events when the plugin is deleted from the Plugins screen.
+- Add copy buttons for the server cron endpoint, secret, and command.
+
+### Changed
+
+- Take the dashboard accent color from the WordPress admin, so it matches the admin color scheme on WordPress 6 and 7.
+- Declare `Tested up to` only in `readme.txt`, as the current Plugin Check requires.
+- Verify the packaged plugin against WordPress 7.1.4.
+- Hide a notification channel's fields while the channel is switched off. Saved values are kept.
+- Show the site-wide WP-Cron notice only after the scheduled scan is overdue. Sites that disable WP-Cron and run it from a system cron no longer see a permanent error.
+- Remove the "Retry notifications" button that appeared when WP-Cron was disabled. It did the same thing as "Send notifications now".
+
+### Fixed
+
+- Turn email alerts on by default, as the readme has always described. A new install saved the setting as off. Sites that never saved the Watchdog settings will start emailing risk alerts to their administrators after this update; sites that saved the settings keep their choice.
+- Stop writing the cron status option and running two option deletes on every page load. A front-end request now makes one plugin query instead of five.
+- Stop looking up administrator accounts before `plugins_loaded` on a new install, which logged a WordPress notice in debug mode.
+- Leave the recipient field empty when the site owner empties it. It was refilled with the administrator addresses, at the cost of a user query on every request. Administrators are still included when an alert is sent.
+- Remove a plugin from the risk table as soon as it is ignored. It used to stay listed until the next scan.
+- Show every column of the risk table on narrow screens. Only the plugin name was visible.
+- Send the report again when a REST cron scan is requested with `force`, even if nothing changed. The parameter was previously ignored for scans.
+- Stop repeating an earlier notice after a later action or a page reload.
+- Keep the "Download payload" button usable after the first download.
+- Stop recording a diagnostic failure on every scan for plugins that have no WordPress.org directory entry.
 
 ## [1.9.0] - 2026-10-28

site-add-on-watchdog/trunk/assets/css/admin.css

@@ -1 +1 @@
 .wp-watchdog-admin {
-    --watchdog-brand: #135e96;
-    --watchdog-brand-strong: #0a4b78;
-    --watchdog-ink: #1d2327;
-    --watchdog-muted: #50575e;
-    --watchdog-border: #dcdcde;
-    --watchdog-canvas: #f6f7f7;
-    max-width: 1440px;
-}
-
-.wp-watchdog-admin * {
-    box-sizing: border-box;
-}
-
-.wp-watchdog-admin .wp-watchdog-hero {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    gap: 24px;
-    margin: 20px 0 0;
-    padding: 24px 28px;
+  --watchdog-accent: #2271b1;
+  --watchdog-accent-strong: #135e96;
+  --watchdog-accent-soft: #f0f6fc;
+  --watchdog-ink: #1d2327;
+  --watchdog-muted: #50575e;
+  --watchdog-border: #dcdcde;
+  --watchdog-divider: #f0f0f1;
+  --watchdog-canvas: #f6f7f7;
+  --watchdog-ok: #007017;
+  --watchdog-ok-soft: #edfaef;
+  --watchdog-warn: #7a5a00;
+  --watchdog-warn-soft: #fcf5dc;
+  --watchdog-danger: #b32d2e;
+  --watchdog-danger-soft: #fcf0f1;
+  --watchdog-radius: 12px;
+  max-width: 1200px;
+  color: var(--watchdog-ink);
+}
+
+/* Keep the tint in step when the script swaps in the admin accent color. */
+@supports (color: color-mix(in srgb, red, blue)) {
+  .wp-watchdog-admin {
+    --watchdog-accent-soft: color-mix(in srgb, var(--watchdog-accent) 9%, #fff);
+  }
+}
+
+.wp-watchdog-admin *,
+.wp-watchdog-admin *::before,
+.wp-watchdog-admin *::after {
+  box-sizing: border-box;
+}
+
+/* Buttons with an icon */
+.wp-watchdog-admin .button {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+}
+
+.wp-watchdog-admin .button .dashicons {
+  width: 16px;
+  height: 16px;
+  font-size: 16px;
+}
+
+.wp-watchdog-actions {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+/* Header */
+.wp-watchdog-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  gap: 16px 24px;
+  margin: 20px 0 16px;
+  padding: 20px 24px;
+  background: #fff;
+  border: 1px solid var(--watchdog-border);
+  border-radius: var(--watchdog-radius);
+}
+
+.wp-watchdog-header__brand {
+  display: flex;
+  align-items: center;
+  gap: 16px;
+  min-width: 0;
+}
+
+.wp-watchdog-header__icon {
+  display: flex;
+  flex: none;
+  align-items: center;
+  justify-content: center;
+  width: 48px;
+  height: 48px;
+  color: #fff;
+  background: var(--watchdog-accent);
+  border-radius: var(--watchdog-radius);
+  font-size: 28px;
+}
+
+.wp-watchdog-admin .wp-watchdog-header__title {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 4px 10px;
+  margin: 0;
+  padding: 0;
+  font-size: 22px;
+  font-weight: 600;
+  line-height: 1.3;
+}
+
+.wp-watchdog-header__version {
+  padding: 2px 8px;
+  color: var(--watchdog-muted);
+  background: var(--watchdog-canvas);
+  border: 1px solid var(--watchdog-border);
+  border-radius: 999px;
+  font-size: 12px;
+  font-weight: 500;
+  line-height: 1.5;
+}
+
+.wp-watchdog-header__summary {
+  margin: 4px 0 0;
+  color: var(--watchdog-muted);
+  font-size: 14px;
+}
+
+.wp-watchdog-header .button {
+  min-height: 36px;
+  padding: 0 14px;
+}
+
+/* Overview tiles */
+.wp-watchdog-overview {
+  display: grid;
+  grid-template-columns: repeat(4, minmax(0, 1fr));
+  gap: 12px;
+  margin: 16px 0 0;
+}
+
+.wp-watchdog-stat {
+  display: grid;
+  grid-template-columns: auto minmax(0, 1fr);
+  align-content: start;
+  gap: 2px 12px;
+  padding: 16px;
+  color: var(--watchdog-ink);
+  background: #fff;
+  border: 1px solid var(--watchdog-border);
+  border-radius: var(--watchdog-radius);
+  text-decoration: none;
+  transition:
+    border-color 120ms ease,
+    box-shadow 120ms ease;
+}
+
+.wp-watchdog-stat:hover,
+.wp-watchdog-stat:focus {
+  color: var(--watchdog-ink);
+  border-color: var(--watchdog-accent);
+  box-shadow: 0 0 0 1px var(--watchdog-accent);
+  outline: none;
+}
+
+.wp-watchdog-stat__icon {
+  display: flex;
+  grid-row: 1 / span 3;
+  align-items: center;
+  justify-content: center;
+  width: 36px;
+  height: 36px;
+  color: var(--watchdog-accent);
+  background: var(--watchdog-accent-soft);
+  border-radius: 10px;
+  font-size: 20px;
+}
+
+.wp-watchdog-stat__label {
+  color: var(--watchdog-muted);
+  font-size: 12px;
+  font-weight: 600;
+}
+
+.wp-watchdog-stat__value {
+  font-size: 24px;
+  font-weight: 600;
+  line-height: 1.25;
+}
+
+.wp-watchdog-stat__value--text {
+  font-size: 18px;
+  line-height: 1.65;
+}
+
+.wp-watchdog-stat__hint {
+  overflow: hidden;
+  color: var(--watchdog-muted);
+  font-size: 12px;
+  text-overflow: ellipsis;
+}
+
+.wp-watchdog-stat--ok .wp-watchdog-stat__icon {
+  color: var(--watchdog-ok);
+  background: var(--watchdog-ok-soft);
+}
+
+.wp-watchdog-stat--warn .wp-watchdog-stat__icon {
+  color: var(--watchdog-warn);
+  background: var(--watchdog-warn-soft);
+}
+
+.wp-watchdog-stat--danger .wp-watchdog-stat__icon {
+  color: var(--watchdog-danger);
+  background: var(--watchdog-danger-soft);
+}
+
+.wp-watchdog-stat--danger .wp-watchdog-stat__hint {
+  color: var(--watchdog-danger);
+  font-weight: 600;
+}
+
+/* Section tabs */
+.wp-watchdog-tabs {
+  display: flex;
+  gap: 4px;
+  margin: 20px 0 16px;
+  overflow-x: auto;
+  border-bottom: 1px solid var(--watchdog-border);
+}
+
+.wp-watchdog-tabs__tab {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  margin-bottom: -1px;
+  padding: 10px 14px;
+  color: var(--watchdog-muted);
+  border-bottom: 2px solid transparent;
+  font-size: 14px;
+  font-weight: 600;
+  text-decoration: none;
+  white-space: nowrap;
+}
+
+.wp-watchdog-tabs__tab:hover {
+  color: var(--watchdog-ink);
+}
+
+.wp-watchdog-tabs__tab:focus {
+  color: var(--watchdog-ink);
+  box-shadow: inset 0 0 0 2px var(--watchdog-accent);
+  outline: none;
+}
+
+.wp-watchdog-tabs__tab[aria-current="true"] {
+  color: var(--watchdog-accent);
+  border-bottom-color: var(--watchdog-accent);
+}
+
+.wp-watchdog-tabs__count {
+  min-width: 20px;
+  padding: 0 6px;
+  color: #fff;
+  background: var(--watchdog-danger);
+  border-radius: 999px;
+  font-size: 11px;
+  line-height: 20px;
+  text-align: center;
+}
+
+.wp-watchdog-tabs__dot {
+  width: 8px;
+  height: 8px;
+  background: var(--watchdog-danger);
+  border-radius: 50%;
+}
+
+.wp-watchdog-panel {
+  scroll-margin-top: 48px;
+}
+
+.wp-watchdog-panel[hidden] {
+  display: none;
+}
+
+.wp-watchdog-admin--js .wp-watchdog-no-js {
+  display: none;
+}
+
+/* Cards */
+.wp-watchdog-card {
+  margin: 0 0 16px;
+  padding: 20px 24px;
+  background: #fff;
+  border: 1px solid var(--watchdog-border);
+  border-radius: var(--watchdog-radius);
+}
+
+.wp-watchdog-card__header {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  gap: 8px 16px;
+}
+
+.wp-watchdog-admin .wp-watchdog-card__title {
+  margin: 0;
+  padding: 0;
+  color: var(--watchdog-ink);
+  font-size: 16px;
+  font-weight: 600;
+  line-height: 1.4;
+}
+
+.wp-watchdog-admin .wp-watchdog-card__description {
+  max-width: 76ch;
+  margin: 4px 0 0;
+  color: var(--watchdog-muted);
+  font-size: 13px;
+}
+
+.wp-watchdog-card-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(320px, 1fr));
+  gap: 16px;
+}
+
+.wp-watchdog-card-grid .wp-watchdog-card {
+  margin: 0;
+}
+
+.wp-watchdog-card .wp-watchdog-actions {
+  margin-top: 16px;
+}
+
+.wp-watchdog-error-text {
+  margin: 8px 0 0;
+  padding: 8px 12px;
+  overflow-wrap: anywhere;
+  color: var(--watchdog-danger);
+  background: var(--watchdog-danger-soft);
+  border-radius: 6px;
+  font-size: 13px;
+}
+
+/* Badges */
+.wp-watchdog-badge {
+  display: inline-flex;
+  flex: none;
+  align-items: center;
+  padding: 2px 10px;
+  color: var(--watchdog-muted);
+  background: var(--watchdog-canvas);
+  border-radius: 999px;
+  font-size: 12px;
+  font-weight: 600;
+  line-height: 1.6;
+  white-space: nowrap;
+}
+
+.wp-watchdog-badge--ok {
+  color: var(--watchdog-ok);
+  background: var(--watchdog-ok-soft);
+}
+
+.wp-watchdog-badge--warn {
+  color: var(--watchdog-warn);
+  background: var(--watchdog-warn-soft);
+}
+
+.wp-watchdog-badge--danger {
+  color: var(--watchdog-danger);
+  background: var(--watchdog-danger-soft);
+}
+
+/* Empty state */
+.wp-watchdog-empty {
+  padding: 32px 16px 16px;
+  text-align: center;
+}
+
+.wp-watchdog-empty__icon {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 56px;
+  height: 56px;
+  color: var(--watchdog-ok);
+  background: var(--watchdog-ok-soft);
+  border-radius: 50%;
+  font-size: 28px;
+}
+
+.wp-watchdog-empty__icon.dashicons-search {
+  color: var(--watchdog-accent);
+  background: var(--watchdog-accent-soft);
+}
+
+.wp-watchdog-admin .wp-watchdog-empty__title {
+  margin: 12px 0 0;
+  font-size: 15px;
+  font-weight: 600;
+}
+
+.wp-watchdog-admin .wp-watchdog-empty__text {
+  margin: 4px 0 0;
+  color: var(--watchdog-muted);
+}
+
+/* Risk table */
+.wp-watchdog-risk-table {
+  margin-top: 16px;
+}
+
+.wp-watchdog-risk-table__controls {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  gap: 8px 16px;
+  margin-bottom: 12px;
+}
+
+.wp-watchdog-risk-table__filter-form {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+.wp-watchdog-risk-table__search input[type="search"] {
+  width: 260px;
+  max-width: 100%;
+}
+
+.wp-watchdog-risk-table__pagination {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.wp-watchdog-risk-table__pagination .button {
+  justify-content: center;
+  min-width: 32px;
+}
+
+.wp-watchdog-risk-table__page-status {
+  color: var(--watchdog-muted);
+  font-size: 13px;
+}
+
+.wp-watchdog-risk-table__scroll {
+  overflow-x: auto;
+  border: 1px solid var(--watchdog-border);
+  border-radius: 8px;
+}
+
+.wp-watchdog-risk-table__scroll table.widefat {
+  margin: 0;
+  border: 0;
+  box-shadow: none;
+}
+
+.wp-watchdog-risk-table table.widefat th,
+.wp-watchdog-risk-table table.widefat td {
+  padding: 12px;
+  vertical-align: top;
+}
+
+.wp-watchdog-risk-table__col-plugin {
+  width: 24%;
+}
+
+.wp-watchdog-risk-table__col-local,
+.wp-watchdog-risk-table__col-remote {
+  width: 13%;
+}
+
+.wp-watchdog-risk-table__col-actions {
+  width: 90px;
+}
+
+.wp-watchdog-risk-table__sort {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 0;
+  color: inherit;
+  background: none;
+  border: 0;
+  font: inherit;
+  font-weight: 600;
+  text-align: left;
+  cursor: pointer;
+}
+
+.wp-watchdog-risk-table__sort:focus-visible {
+  border-radius: 2px;
+  outline: 2px solid var(--watchdog-accent);
+  outline-offset: 2px;
+}
+
+.wp-watchdog-risk-table__sort-indicator {
+  width: 0;
+  height: 0;
+  border-top: 6px solid currentColor;
+  border-right: 4px solid transparent;
+  border-left: 4px solid transparent;
+  opacity: 0.3;
+  transition:
+    transform 0.2s ease,
+    opacity 0.2s ease;
+}
+
+.wp-watchdog-risk-table__sort[aria-sort="ascending"]
+  .wp-watchdog-risk-table__sort-indicator {
+  opacity: 1;
+  transform: rotate(180deg);
+}
+
+.wp-watchdog-risk-table__sort[aria-sort="descending"]
+  .wp-watchdog-risk-table__sort-indicator {
+  opacity: 1;
+}
+
+.wp-watchdog-admin .wp-watchdog-reasons {
+  margin: 0;
+  padding-left: 18px;
+  list-style: disc;
+}
+
+.wp-watchdog-admin .wp-watchdog-reasons li {
+  margin-bottom: 4px;
+}
+
+.wp-watchdog-admin .wp-watchdog-vulnerabilities {
+  display: grid;
+  gap: 6px;
+  margin: 8px 0 0;
+  padding: 10px 12px;
+  background: var(--watchdog-canvas);
+  border-radius: 6px;
+  list-style: none;
+}
+
+.wp-watchdog-admin .wp-watchdog-vulnerabilities li {
+  display: flex;
+  align-items: baseline;
+  flex-wrap: wrap;
+  gap: 4px 8px;
+  margin: 0;
+}
+
+.wp-watchdog-vulnerability__meta {
+  color: var(--watchdog-muted);
+  font-size: 12px;
+}
+
+.wp-watchdog-severity {
+  display: inline-flex;
+  align-items: center;
+  padding: 1px 8px;
+  border-radius: 999px;
+  font-size: 11px;
+  font-weight: 600;
+  letter-spacing: 0.04em;
+  text-transform: uppercase;
+}
+
+.wp-watchdog-severity--low {
+  color: #1c5f3a;
+  background: #e7f7ed;
+}
+
+.wp-watchdog-severity--medium {
+  color: #7a5a00;
+  background: #fff4d6;
+}
+
+.wp-watchdog-severity--high {
+  color: #922424;
+  background: #fde4df;
+}
+
+.wp-watchdog-severity--severe {
+  color: #fff;
+  background: #b32d2e;
+}
+
+/* Ignored plugins */
+.wp-watchdog-admin .wp-watchdog-chips {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  margin: 12px 0 0;
+  padding: 0;
+  list-style: none;
+}
+
+.wp-watchdog-admin .wp-watchdog-chips li {
+  margin: 0;
+}
+
+.wp-watchdog-chip {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  padding: 4px 6px 4px 12px;
+  color: var(--watchdog-ink);
+  background: var(--watchdog-canvas);
+  border: 1px solid var(--watchdog-border);
+  border-radius: 999px;
+  font-size: 13px;
+  line-height: 1.5;
+  cursor: pointer;
+}
+
+.wp-watchdog-chip:hover,
+.wp-watchdog-chip:focus-visible {
+  color: var(--watchdog-danger);
+  border-color: var(--watchdog-danger);
+  outline: none;
+}
+
+.wp-watchdog-chip .dashicons {
+  width: 16px;
+  height: 16px;
+  font-size: 16px;
+}
+
+/* History */
+.wp-watchdog-admin .wp-watchdog-history {
+  margin: 16px 0 0;
+  padding: 0;
+  border: 1px solid var(--watchdog-border);
+  border-radius: 8px;
+  list-style: none;
+}
+
+.wp-watchdog-admin .wp-watchdog-history__item {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px 16px;
+  margin: 0;
+  padding: 10px 14px;
+  border-top: 1px solid var(--watchdog-divider);
+}
+
+.wp-watchdog-admin .wp-watchdog-history__item:first-child {
+  border-top: 0;
+}
+
+.wp-watchdog-history__date {
+  display: inline-flex;
+  flex: 1 1 220px;
+  align-items: center;
+  gap: 8px;
+  font-weight: 600;
+}
+
+.wp-watchdog-history__date .dashicons {
+  color: var(--watchdog-muted);
+}
+
+.wp-watchdog-history__downloads {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+/* Settings */
+.wp-watchdog-field {
+  display: grid;
+  grid-template-columns: 220px minmax(0, 1fr);
+  gap: 8px 24px;
+  padding: 16px 0;
+  border-top: 1px solid var(--watchdog-divider);
+}
+
+.wp-watchdog-card__title + .wp-watchdog-field,
+.wp-watchdog-card__title
+  + [data-watchdog-frequency-options]
+  > .wp-watchdog-field:first-child {
+  margin-top: 12px;
+}
+
+.wp-watchdog-card > .wp-watchdog-field:last-child {
+  padding-bottom: 0;
+}
+
+.wp-watchdog-field__label {
+  padding-top: 5px;
+  font-weight: 600;
+}
+
+.wp-watchdog-field__inline {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+.wp-watchdog-admin .wp-watchdog-field .description,
+.wp-watchdog-admin .wp-watchdog-channel .description {
+  max-width: 76ch;
+  margin: 6px 0 0;
+}
+
+.wp-watchdog-settings-form input.regular-text {
+  width: 100%;
+  max-width: 560px;
+}
+
+.wp-watchdog-admin .wp-watchdog-frequency-description--testing {
+  color: var(--watchdog-danger);
+  font-weight: 600;
+}
+
+.wp-watchdog-channels {
+  margin-top: 16px;
+  border: 1px solid var(--watchdog-border);
+  border-radius: 8px;
+}
+
+.wp-watchdog-channel + .wp-watchdog-channel {
+  border-top: 1px solid var(--watchdog-border);
+}
+
+.wp-watchdog-channel__header {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  padding: 12px 16px;
+}
+
+.wp-watchdog-channel__icon {
+  display: flex;
+  flex: none;
+  align-items: center;
+  justify-content: center;
+  width: 32px;
+  height: 32px;
+  color: var(--watchdog-accent);
+  background: var(--watchdog-accent-soft);
+  border-radius: 8px;
+}
+
+.wp-watchdog-admin .wp-watchdog-channel__title {
+  flex: 1 1 auto;
+  margin: 0;
+  font-size: 14px;
+  font-weight: 600;
+}
+
+.wp-watchdog-channel__body {
+  padding: 0 16px 16px 60px;
+}
+
+.wp-watchdog-channel__body[hidden] {
+  display: none;
+}
+
+.wp-watchdog-admin .wp-watchdog-channel__field {
+  margin: 0 0 12px;
+}
+
+.wp-watchdog-channel__field label {
+  display: block;
+  margin-bottom: 4px;
+  font-weight: 600;
+}
+
+.wp-watchdog-admin .wp-watchdog-channel__actions {
+  margin: 12px 0 0;
+}
+
+/* Switch */
+.wp-watchdog-switch {
+  display: inline-flex;
+  flex: none;
+  align-items: center;
+  gap: 8px;
+  cursor: pointer;
+}
+
+.wp-watchdog-admin .wp-watchdog-switch input[type="checkbox"] {
+  position: relative;
+  width: 36px;
+  min-width: 36px;
+  height: 20px;
+  margin: 0;
+  background: #8c8f94;
+  border: 0;
+  border-radius: 999px;
+  box-shadow: none;
+  transition: background-color 120ms ease;
+  appearance: none;
+}
+
+.wp-watchdog-admin .wp-watchdog-switch input[type="checkbox"]::before {
+  position: absolute;
+  top: 2px;
+  left: 2px;
+  float: none;
+  width: 16px;
+  height: 16px;
+  margin: 0;
+  background: #fff;
+  border-radius: 50%;
+  content: "";
+  transition: transform 120ms ease;
+}
+
+.wp-watchdog-admin .wp-watchdog-switch input[type="checkbox"]:checked {
+  background: var(--watchdog-accent);
+}
+
+.wp-watchdog-admin .wp-watchdog-switch input[type="checkbox"]:checked::before {
+  content: "";
+  transform: translateX(16px);
+}
+
+.wp-watchdog-admin .wp-watchdog-switch input[type="checkbox"]:focus-visible {
+  outline: 2px solid var(--watchdog-accent);
+  outline-offset: 2px;
+}
+
+.wp-watchdog-switch__state {
+  min-width: 24px;
+  color: var(--watchdog-muted);
+  font-size: 12px;
+  font-weight: 600;
+}
+
+.wp-watchdog-switch__state::after {
+  content: attr(data-off);
+}
+
+.wp-watchdog-switch input:checked + .wp-watchdog-switch__state {
+  color: var(--watchdog-accent);
+}
+
+.wp-watchdog-switch input:checked + .wp-watchdog-switch__state::after {
+  content: attr(data-on);
+}
+
+.wp-watchdog-admin .wp-watchdog-settings-form__submit {
+  position: sticky;
+  z-index: 2;
+  bottom: 0;
+  margin: 0;
+  padding: 12px 0;
+  background: #f0f0f1;
+  border-top: 1px solid var(--watchdog-border);
+}
+
+/* Server cron details */
+.wp-watchdog-details {
+  margin-top: 16px;
+  padding-top: 12px;
+  border-top: 1px solid var(--watchdog-divider);
+}
+
+.wp-watchdog-details summary {
+  color: var(--watchdog-accent);
+  font-weight: 600;
+  cursor: pointer;
+}
+
+.wp-watchdog-details__body {
+  margin-top: 12px;
+}
+
+.wp-watchdog-copy {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) auto;
+  align-items: center;
+  gap: 4px 8px;
+  margin-bottom: 12px;
+}
+
+.wp-watchdog-copy__label {
+  grid-column: 1 / -1;
+  font-weight: 600;
+}
+
+.wp-watchdog-copy code {
+  display: block;
+  padding: 8px 10px;
+  overflow-wrap: anywhere;
+  background: var(--watchdog-canvas);
+  border: 1px solid var(--watchdog-border);
+  border-radius: 6px;
+  font-size: 12px;
+}
+
+/* Submitting state */
+.wp-watchdog-admin form.is-busy {
+  opacity: 0.72;
+  pointer-events: none;
+}
+
+.wp-watchdog-admin form.is-busy button[type="submit"] .dashicons {
+  animation: watchdog-spin 0.8s linear infinite;
+}
+
+@keyframes watchdog-spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .wp-watchdog-admin *,
+  .wp-watchdog-admin *::before {
+    transition: none !important;
+    animation: none !important;
+  }
+}
+
+@media (max-width: 960px) {
+  .wp-watchdog-overview {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
+}
+
+@media (max-width: 782px) {
+  .wp-watchdog-admin {
+    margin-right: 10px;
+  }
+
+  .wp-watchdog-header,
+  .wp-watchdog-card {
+    padding: 16px;
+  }
+
+  .wp-watchdog-header .wp-watchdog-actions,
+  .wp-watchdog-header .wp-watchdog-actions form {
+    flex: 1 1 100%;
+  }
+
+  .wp-watchdog-header .wp-watchdog-actions .button {
+    justify-content: center;
+    width: 100%;
+  }
+
+  .wp-watchdog-field {
+    grid-template-columns: minmax(0, 1fr);
+  }
+
+  .wp-watchdog-field__label {
+    padding-top: 0;
+  }
+
+  .wp-watchdog-channel__body {
+    padding-left: 16px;
+  }
+
+  .wp-watchdog-admin .wp-watchdog-switch input[type="checkbox"] {
+    width: 44px;
+    min-width: 44px;
+    height: 24px;
+  }
+
+  .wp-watchdog-admin .wp-watchdog-switch input[type="checkbox"]::before {
+    width: 20px;
+    height: 20px;
+  }
+
+  .wp-watchdog-admin
+    .wp-watchdog-switch
+    input[type="checkbox"]:checked::before {
+    margin: 0;
+    transform: translateX(20px);
+  }
+
+  .wp-watchdog-risk-table__search,
+  .wp-watchdog-risk-table__search input[type="search"] {
+    width: 100%;
+  }
+
+  /* Each risk becomes a card. */
+  .wp-watchdog-risk-table__scroll {
+    border: 0;
+  }
+
+  .wp-watchdog-risk-table__scroll table,
+  .wp-watchdog-risk-table__scroll tbody,
+  .wp-watchdog-risk-table__scroll td {
+    display: block;
+  }
+
+  .wp-watchdog-risk-table__scroll thead {
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    margin: -1px;
+    padding: 0;
     overflow: hidden;
-    color: #fff;
-    background:
-        radial-gradient(circle at 88% 10%, rgba(255, 255, 255, 0.2), transparent 28%),
-        linear-gradient(135deg, var(--watchdog-brand-strong), var(--watchdog-brand));
-    border-radius: 14px;
-    box-shadow: 0 8px 24px rgba(10, 75, 120, 0.16);
-}
-
-.wp-watchdog-hero__content {
-    max-width: 760px;
-}
-
-.wp-watchdog-hero__eyebrow {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    margin-bottom: 8px;
-    color: rgba(255, 255, 255, 0.78);
-    font-size: 12px;
-    font-weight: 600;
-    letter-spacing: 0.05em;
-    text-transform: uppercase;
-}
-
-.wp-watchdog-admin .wp-watchdog-hero__title {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-    margin: 0;
-    color: #fff;
-    font-size: clamp(24px, 3vw, 34px);
-    line-height: 1.2;
-}
-
-.wp-watchdog-hero__title .dashicons {
-    width: 36px;
-    height: 36px;
-    font-size: 36px;
-}
-
-.wp-watchdog-hero__description {
-    margin: 10px 0 0;
-    color: rgba(255, 255, 255, 0.88);
-    font-size: 15px;
-    line-height: 1.6;
-}
-
-.wp-watchdog-actions {
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: 8px;
-}
-
-.wp-watchdog-hero .button {
-    min-height: 40px;
-    border-color: rgba(255, 255, 255, 0.85);
-}
-
-.wp-watchdog-hero .button.button-primary {
-    color: var(--watchdog-brand-strong);
-    background: #fff;
-}
-
-.wp-watchdog-hero .button.button-secondary {
-    color: #fff;
-    background: rgba(255, 255, 255, 0.1);
-}
-
-.wp-watchdog-nav {
-    position: sticky;
-    z-index: 5;
-    top: 32px;
-    display: flex;
-    gap: 4px;
-    margin: 16px 0;
-    padding: 6px;
-    overflow-x: auto;
-    background: rgba(255, 255, 255, 0.96);
-    border: 1px solid var(--watchdog-border);
-    border-radius: 10px;
-}
-
-.wp-watchdog-nav a {
-    padding: 8px 14px;
-    color: var(--watchdog-ink);
-    border-radius: 7px;
-    font-weight: 600;
-    text-decoration: none;
-    white-space: nowrap;
-}
-
-.wp-watchdog-nav a:hover,
-.wp-watchdog-nav a:focus-visible {
-    color: var(--watchdog-brand);
-    background: #f0f6fc;
-    outline: none;
-    box-shadow: 0 0 0 2px var(--watchdog-brand);
-}
-
-.wp-watchdog-overview {
+    clip: rect(0, 0, 0, 0);
+    border: 0;
+  }
+
+  .wp-watchdog-risk-table__scroll tbody tr {
     display: grid;
-    grid-template-columns: repeat(4, minmax(0, 1fr));
-    gap: 12px;
-    margin: 16px 0;
-}
-
-.wp-watchdog-stat {
-    display: grid;
-    grid-template-columns: auto 1fr;
-    gap: 2px 12px;
-    min-height: 96px;
-    padding: 16px;
-    color: var(--watchdog-ink);
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+    margin-bottom: 12px;
+    padding: 8px 0;
     background: #fff;
     border: 1px solid var(--watchdog-border);
-    border-radius: 10px;
-    text-decoration: none;
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.03);
-    transition: border-color 120ms ease, box-shadow 120ms ease, transform 120ms ease;
-}
-
-.wp-watchdog-stat:hover,
-.wp-watchdog-stat:focus-visible {
-    color: var(--watchdog-ink);
-    border-color: var(--watchdog-brand);
-    outline: none;
-    box-shadow: 0 4px 12px rgba(19, 94, 150, 0.12);
-    transform: translateY(-1px);
-}
-
-.wp-watchdog-stat__icon {
-    grid-row: 1 / span 2;
-    width: 34px;
-    height: 34px;
-    padding: 7px;
-    color: var(--watchdog-brand);
-    background: #f0f6fc;
     border-radius: 8px;
-    font-size: 20px;
-}
-
-.wp-watchdog-stat__value {
-    align-self: end;
-    font-size: 26px;
-    font-weight: 700;
-    line-height: 1.1;
-}
-
-.wp-watchdog-stat__value--text {
-    font-size: 18px;
-}
-
-.wp-watchdog-stat__label {
+  }
+
+  .wp-watchdog-risk-table__scroll tbody tr:last-child {
+    margin-bottom: 0;
+  }
+
+  .wp-watchdog-risk-table table.widefat td {
+    padding: 6px 16px;
+    border: 0;
+  }
+
+  .wp-watchdog-risk-table table.widefat td[data-column="plugin"],
+  .wp-watchdog-risk-table table.widefat td[data-column="reasons"],
+  .wp-watchdog-risk-table table.widefat td[data-column="actions"] {
+    grid-column: 1 / -1;
+  }
+
+  .wp-watchdog-risk-table table.widefat td[data-column="plugin"] {
+    font-size: 15px;
+  }
+
+  .wp-watchdog-risk-table table.widefat td::before {
+    display: block;
+    margin-bottom: 2px;
     color: var(--watchdog-muted);
-    font-size: 13px;
-}
-
-.wp-watchdog-risk-table {
-    margin-top: 1.5rem;
-}
-
-.wp-watchdog-notification-toggle {
-    display: inline-flex;
-    align-items: center;
-    gap: 0.5rem;
+    font-size: 11px;
     font-weight: 600;
-}
-
-.wp-watchdog-notification-fields {
-    margin-top: 0.5rem;
-}
-
-.wp-watchdog-notification-fields--disabled {
-    opacity: 0.65;
-}
-
-.wp-watchdog-notification-fields--disabled input,
-.wp-watchdog-notification-fields--disabled textarea,
-.wp-watchdog-notification-fields--disabled select {
-    background-color: #f6f7f7;
-    cursor: not-allowed;
-}
-
-.wp-watchdog-frequency-description--testing {
-    color: #b32d2e;
-    font-weight: 600;
-}
-
-.wp-watchdog-frequency-options {
-    margin-top: 0.5rem;
-    display: grid;
-    gap: 0.75rem;
-}
-
-.wp-watchdog-frequency-options__row {
-    padding: 0.75rem;
-    border: 1px solid #c3c4c7;
-    border-radius: 4px;
-    background: #fff;
-}
-
-.wp-watchdog-frequency-label {
-    display: block;
-    font-weight: 600;
-    margin-bottom: 0.35rem;
-}
-
-.wp-watchdog-frequency-weekly {
-    display: flex;
-    align-items: center;
-    gap: 0.5rem;
-    margin-bottom: 0.35rem;
-    flex-wrap: wrap;
-}
-
-.wp-watchdog-risk-table__controls {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    gap: 1rem;
-    margin-bottom: 0.75rem;
-    flex-wrap: wrap;
-}
-
-.wp-watchdog-risk-table__filter-form {
-    display: flex;
-    align-items: center;
-    gap: 0.75rem;
-    flex-wrap: wrap;
-}
-
-.wp-watchdog-risk-table__search input[type="search"] {
-    min-width: 220px;
-}
-
-.wp-watchdog-risk-table__sort-select {
-    display: flex;
-    align-items: center;
-    gap: 0.5rem;
-    flex-wrap: wrap;
-}
-
-.wp-watchdog-risk-table__pagination {
-    display: flex;
-    align-items: center;
-    gap: 0.5rem;
-}
-
-.wp-watchdog-risk-table__pagination button.button {
-    min-width: 2.5rem;
-    text-align: center;
-}
-
-.wp-watchdog-risk-table__page-status {
-    font-weight: 600;
-}
-
-.wp-watchdog-risk-table__scroll {
-    overflow-x: auto;
-    border: 1px solid #c3c4c7;
-    border-radius: 4px;
-    background: #fff;
-}
-
-.wp-watchdog-risk-table__scroll table {
-    margin: 0;
-}
-
-.wp-watchdog-risk-table table.wp-list-table th {
-    vertical-align: middle;
-}
-
-.wp-watchdog-risk-table__sort {
-    background: none;
-    border: 0;
-    padding: 0;
-    font: inherit;
-    color: inherit;
-    cursor: pointer;
-    display: inline-flex;
-    align-items: center;
-    gap: 0.25rem;
-}
-
-.wp-watchdog-risk-table__sort:focus {
-    outline: 2px solid #2271b1;
-    outline-offset: 2px;
-    border-radius: 2px;
-}
-
-.wp-watchdog-risk-table__sort-indicator {
-    width: 0;
-    height: 0;
-    border-left: 4px solid transparent;
-    border-right: 4px solid transparent;
-    border-top: 6px solid currentColor;
-    transform: rotate(0deg);
-    opacity: 0.3;
-    transition: transform 0.2s ease, opacity 0.2s ease;
-}
-
-.wp-watchdog-risk-table__sort[aria-sort="ascending"] .wp-watchdog-risk-table__sort-indicator {
-    transform: rotate(180deg);
-    opacity: 1;
-}
-
-.wp-watchdog-risk-table__sort[aria-sort="descending"] .wp-watchdog-risk-table__sort-indicator {
-    transform: rotate(0deg);
-    opacity: 1;
-}
-
-.wp-watchdog-risk-table__sort[aria-sort="none"] .wp-watchdog-risk-table__sort-indicator {
-    opacity: 0.3;
-}
-
-.wp-watchdog-risk-table table.wp-list-table tbody td ul {
-    margin: 0;
-    padding-left: 1.2rem;
-}
-
-.wp-watchdog-risk-table table.wp-list-table tbody td ul ul {
-    margin-top: 0.5rem;
-}
-
-.wp-watchdog-risk-table table.wp-list-table tbody td ul li {
-    margin-bottom: 0.25rem;
-}
-
-.wp-watchdog-severity {
-    display: inline-flex;
-    align-items: center;
-    gap: 0.25rem;
-    padding: 0.125rem 0.5rem;
-    border-radius: 999px;
-    font-size: 0.75rem;
-    font-weight: 600;
+    letter-spacing: 0.04em;
     text-transform: uppercase;
-    letter-spacing: 0.04em;
-    margin-right: 0.5rem;
-}
-
-.wp-watchdog-severity--low {
-    background: #e7f7ed;
-    color: #1c5f3a;
-}
-
-.wp-watchdog-severity--medium {
-    background: #fff4d6;
-    color: #7a5a00;
-}
-
-.wp-watchdog-severity--high {
-    background: #fde4df;
-    color: #922424;
-}
-
-.wp-watchdog-severity--severe {
-    background: #fbe0e6;
-    color: #80102a;
-}
-
-.wp-watchdog-vulnerability__title,
-.wp-watchdog-vulnerability__cve,
-.wp-watchdog-vulnerability__fixed {
-    display: inline-block;
-    margin-right: 0.25rem;
-}
-
-.wp-watchdog-admin .wp-watchdog-grid {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(280px, 1fr));
-    gap: 16px;
-    margin: 16px 0;
-}
-
-.wp-watchdog-admin .wp-watchdog-surface {
-    background: #fff;
-    border: 1px solid #dcdcde;
-    border-radius: 10px;
-    padding: 16px;
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
-}
-
-.wp-watchdog-admin .wp-watchdog-surface[id] {
-    scroll-margin-top: 92px;
-}
-
-.wp-watchdog-admin .wp-watchdog-surface--wide {
-    grid-column: 1 / -1;
-}
-
-.wp-watchdog-admin .wp-watchdog-section-title {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    margin-bottom: 12px;
-    font-size: 16px;
-    font-weight: 600;
-}
-
-.wp-watchdog-admin .wp-watchdog-badge {
-    display: inline-flex;
-    align-items: center;
-    gap: 6px;
-    padding: 4px 10px;
-    border-radius: 999px;
-    font-weight: 600;
-    font-size: 12px;
-    text-transform: uppercase;
-    letter-spacing: 0.02em;
-}
-
-.wp-watchdog-admin .wp-watchdog-badge--success {
-    background: #e7f7ed;
-    color: #1c5f3a;
-}
-
-.wp-watchdog-admin .wp-watchdog-badge--warning {
-    background: #fff4d6;
-    color: #7a5a00;
-}
-
-.wp-watchdog-admin .wp-watchdog-badge--muted {
-    background: #eef1f3;
-    color: #1d2327;
-}
-
-.wp-watchdog-admin .wp-watchdog-section-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: 12px;
-}
-
-.wp-watchdog-admin .button-hero {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-}
-
-.wp-watchdog-admin .wp-watchdog-inline-list {
-    display: flex;
-    gap: 8px;
-    flex-wrap: wrap;
-    margin: 8px 0 0;
-    padding: 0;
-    list-style: none;
-}
-
-.wp-watchdog-admin .wp-watchdog-inline-list li {
-    margin: 0;
-}
-
-.wp-watchdog-admin .wp-watchdog-summary {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-}
-
-.wp-watchdog-admin .wp-watchdog-summary__count {
-    font-size: 32px;
-    font-weight: 700;
-}
-
-.wp-watchdog-admin .wp-watchdog-summary__label {
-    color: #4b5563;
-}
-
-.wp-watchdog-admin .wp-watchdog-card-stack {
-    display: flex;
-    flex-direction: column;
-    gap: 12px;
-}
-
-.wp-watchdog-admin .wp-watchdog-muted {
-    color: #4b5563;
-    margin: 0;
-}
-
-.wp-watchdog-endpoint {
-    overflow-wrap: anywhere;
-}
-
-.wp-watchdog-subheading {
-    margin-bottom: 8px !important;
-}
-
-.wp-watchdog-block-action {
-    margin: 12px 0;
-}
-
-.wp-watchdog-channel-summary {
-    margin-top: 12px !important;
-}
-
-.wp-watchdog-inline-form {
-    display: inline;
-}
-
-.wp-watchdog-settings-form .form-table {
-    margin-top: 8px;
-}
-
-.wp-watchdog-settings-form .form-table > tbody > tr > th,
-.wp-watchdog-settings-form .form-table > tbody > tr > td {
-    padding-top: 18px;
-    padding-bottom: 18px;
-    border-top: 1px solid #f0f0f1;
-}
-
-.wp-watchdog-settings-form .form-table > tbody > tr:first-child > th,
-.wp-watchdog-settings-form .form-table > tbody > tr:first-child > td {
-    border-top: 0;
-}
-
-.wp-watchdog-settings-form input[type="url"],
-.wp-watchdog-settings-form input[type="text"],
-.wp-watchdog-settings-form input[type="password"] {
-    width: min(100%, 620px);
-}
-
-.wp-watchdog-settings-form .description {
-    max-width: 720px;
-}
-
-.wp-watchdog-admin form.is-busy {
-    pointer-events: none;
-    opacity: 0.72;
-}
-
-.wp-watchdog-admin form.is-busy button[type="submit"] .dashicons {
-    animation: watchdog-spin 0.8s linear infinite;
-}
-
-@keyframes watchdog-spin {
-    to {
-        transform: rotate(360deg);
-    }
-}
-
-.wp-watchdog-admin .wp-watchdog-divider {
-    border-top: 1px solid #dcdcde;
-    margin: 16px 0;
-}
-
-.wp-watchdog-admin .wp-watchdog-history-table {
-    margin-top: 12px;
-}
-
-.wp-watchdog-history-grid {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
-    gap: 12px;
-}
-
-.wp-watchdog-history-card {
-    background: #f6f7f7;
-    border: 1px solid #dcdcde;
-    border-radius: 8px;
-    padding: 12px 14px;
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.02);
-}
-
-.wp-watchdog-history-card__header {
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-start;
-    gap: 8px;
-    margin-bottom: 8px;
-    flex-wrap: wrap;
-}
-
-.wp-watchdog-history-card__title {
-    margin: 0;
-    font-weight: 600;
-    font-size: 14px;
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    flex: 1 1 auto;
-    min-width: 0;
-}
-
-.wp-watchdog-history-card__meta {
-    color: #4b5563;
-    font-size: 12px;
-    margin: 0;
-}
-
-.wp-watchdog-history-badge {
-    display: inline-flex;
-    align-items: center;
-    gap: 6px;
-    padding: 4px 8px;
-    border-radius: 999px;
-    font-weight: 600;
-    font-size: 12px;
-    text-transform: uppercase;
-    align-self: flex-start;
-}
-
-.wp-watchdog-history-badge--safe {
-    background: #e7f7ed;
-    color: #1c5f3a;
-}
-
-.wp-watchdog-history-badge--risk {
-    background: #fff4d6;
-    color: #7a5a00;
-}
-
-.wp-watchdog-history-card__downloads {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 8px;
-    margin-top: 10px;
-}
-
-@media (max-width: 960px) {
-    .wp-watchdog-overview {
-        grid-template-columns: repeat(2, minmax(0, 1fr));
-    }
-
-    .wp-watchdog-risk-table__controls {
-        flex-direction: column;
-        align-items: flex-start;
-    }
-}
-
-@media (max-width: 782px) {
-    .wp-watchdog-admin {
-        margin-right: 10px;
-    }
-
-    .wp-watchdog-admin .wp-watchdog-hero {
-        align-items: flex-start;
-        flex-direction: column;
-        padding: 20px;
-    }
-
-    .wp-watchdog-hero .wp-watchdog-actions,
-    .wp-watchdog-hero .wp-watchdog-actions form,
-    .wp-watchdog-hero .wp-watchdog-actions .button {
-        width: 100%;
-    }
-
-    .wp-watchdog-hero .wp-watchdog-actions .button {
-        justify-content: center;
-    }
-
-    .wp-watchdog-nav {
-        top: 46px;
-    }
-
-    .wp-watchdog-overview {
-        grid-template-columns: 1fr;
-    }
-
-    .wp-watchdog-settings-form .form-table th,
-    .wp-watchdog-settings-form .form-table td {
-        display: block;
-        width: 100%;
-    }
-
-    .wp-watchdog-settings-form .form-table th {
-        padding-bottom: 6px;
-    }
-
-    .wp-watchdog-risk-table__scroll {
-        border: none;
-    }
-
-    .wp-watchdog-risk-table__scroll table,
-    .wp-watchdog-risk-table__scroll thead,
-    .wp-watchdog-risk-table__scroll tbody,
-    .wp-watchdog-risk-table__scroll th,
-    .wp-watchdog-risk-table__scroll td,
-    .wp-watchdog-risk-table__scroll tr {
-        display: block;
-    }
-
-    .wp-watchdog-risk-table__scroll thead tr {
-        position: absolute;
-        width: 1px;
-        height: 1px;
-        padding: 0;
-        margin: -1px;
-        overflow: hidden;
-        clip: rect(0, 0, 0, 0);
-        border: 0;
-    }
-
-    .wp-watchdog-risk-table__scroll tbody tr {
-        border: 1px solid #c3c4c7;
-        border-radius: 4px;
-        margin-bottom: 1rem;
-        padding: 0.75rem 0;
-        background: #fff;
-    }
-
-    .wp-watchdog-risk-table__scroll tbody tr:last-child {
-        margin-bottom: 0;
-    }
-
-    .wp-watchdog-risk-table__scroll td {
-        border: none;
-        position: relative;
-        padding: 0.5rem 1rem 0.5rem 45%;
-        min-height: 2.5rem;
-    }
-
-    .wp-watchdog-risk-table__scroll td::before {
-        content: attr(data-column-label);
-        position: absolute;
-        left: 1rem;
-        top: 0.5rem;
-        font-weight: 600;
-        width: 40%;
-        padding-right: 0.5rem;
-        white-space: normal;
-    }
-
-    .wp-watchdog-risk-table table.wp-list-table tbody td ul {
-        padding-left: 1rem;
-    }
-}
+    content: attr(data-column-label);
+  }
+
+  .wp-watchdog-risk-table table.widefat td[data-column="plugin"]::before,
+  .wp-watchdog-risk-table table.widefat td[data-column="actions"]::before {
+    content: none;
+  }
+}
+
+@media (max-width: 480px) {
+  .wp-watchdog-overview {
+    grid-template-columns: minmax(0, 1fr);
+  }
+}

site-add-on-watchdog/trunk/assets/js/admin-table.js

@@ -1 +1 @@
 (function () {
-    'use strict';
-
-    const i18n = window.siteAddOnWatchdogTable || {};
-
-    /**
-     * @param {HTMLElement} tableWrapper
-     */
-    function initTable(tableWrapper) {
-        const tbody = tableWrapper.querySelector('tbody');
-        if (!tbody) {
+  "use strict";
+
+  const i18n = window.siteAddOnWatchdogTable || {};
+
+  /**
+   * @param {HTMLElement} tableWrapper
+   */
+  function initTable(tableWrapper) {
+    const tbody = tableWrapper.querySelector("tbody");
+    if (!tbody) {
+      return;
+    }
+
+    const perPage = parseInt(tableWrapper.dataset.perPage || "10", 10);
+    const baseRows = Array.from(tbody.querySelectorAll("tr"));
+    let rows = baseRows.slice();
+    const pagination = tableWrapper.querySelector("[data-pagination]");
+    const statusEl = tableWrapper.querySelector("[data-page-status]");
+    const prevBtn = pagination
+      ? pagination.querySelector('[data-action="prev"]')
+      : null;
+    const nextBtn = pagination
+      ? pagination.querySelector('[data-action="next"]')
+      : null;
+    const headers = Array.from(
+      tableWrapper.querySelectorAll("[data-sort-key]"),
+    );
+    const searchInput = tableWrapper.querySelector("[data-risk-search]");
+    const sortSelect = tableWrapper.querySelector("[data-risk-sort]");
+    const orderSelect = tableWrapper.querySelector("[data-risk-order]");
+
+    const state = {
+      page: 1,
+      perPage: Number.isFinite(perPage) && perPage > 0 ? perPage : rows.length,
+      sortKey: null,
+      sortOrder: "asc",
+      filterQuery: searchInput ? searchInput.value.trim() : "",
+    };
+
+    const initialHeader = headers.find((header) =>
+      header.hasAttribute("data-sort-initial"),
+    );
+    if (initialHeader) {
+      state.sortKey = initialHeader.getAttribute("data-sort-key");
+      state.sortOrder =
+        initialHeader.getAttribute("data-sort-default") || "asc";
+    }
+
+    const VERSION_SORT_KEYS = new Set(["sortLocal", "sortRemote"]);
+    const NUMERIC_SORT_KEYS = new Set(["sortRiskCount", "sortVersionGap"]);
+    const NUMERIC_TOKEN_PATTERN = /^\d+$/;
+
+    if (sortSelect) {
+      const selectedOption = sortSelect.selectedOptions[0];
+      if (selectedOption && selectedOption.dataset.sortKey) {
+        state.sortKey = selectedOption.dataset.sortKey;
+        state.sortOrder = orderSelect
+          ? orderSelect.value
+          : selectedOption.dataset.sortDefault || "asc";
+      }
+    }
+
+    function getSortValue(row, key, options = {}) {
+      const { raw = false } = options;
+
+      if (NUMERIC_SORT_KEYS.has(key)) {
+        const datasetKey = key.replace(/-([a-z])/g, (_, char) =>
+          char.toUpperCase(),
+        );
+        const value = row.dataset[datasetKey];
+        const parsed = value ? parseFloat(value) : 0;
+        return Number.isFinite(parsed) ? parsed : 0;
+      }
+
+      if (VERSION_SORT_KEYS.has(key)) {
+        const columnKey = key === "sortLocal" ? "local" : "remote";
+        const text = (
+          row.querySelector(`[data-column="${columnKey}"]`)?.textContent || ""
+        ).trim();
+        if (!text) {
+          return raw ? "" : null;
+        }
+        if (text.toLowerCase() === "n/a") {
+          return raw ? "N/A" : null;
+        }
+        return raw ? text : text.toLowerCase();
+      }
+
+      const datasetKey = key.replace(/-([a-z])/g, (_, char) =>
+        char.toUpperCase(),
+      );
+      const value = row.dataset[datasetKey];
+      if (value !== undefined) {
+        return raw ? value : value.toLowerCase();
+      }
+      const fallback = (
+        row.querySelector(`[data-column="${key}"]`)?.textContent || ""
+      ).trim();
+      return raw ? fallback : fallback.toLowerCase();
+    }
+
+    function parseVersionForSort(value) {
+      if (typeof value !== "string") {
+        return { tokens: [], isMissing: true };
+      }
+
+      const trimmed = value.trim();
+      if (!trimmed || trimmed.toLowerCase() === "n/a") {
+        return { tokens: [], isMissing: true };
+      }
+
+      const tokens = trimmed.match(/[0-9]+|[a-zA-Z]+/g) || [];
+      return { tokens, isMissing: tokens.length === 0 };
+    }
+
+    function compareVersionTokens(a, b) {
+      if (a.isMissing && b.isMissing) {
+        return 0;
+      }
+
+      if (a.isMissing) {
+        return 1;
+      }
+
+      if (b.isMissing) {
+        return -1;
+      }
+
+      const maxLength = Math.max(a.tokens.length, b.tokens.length);
+      for (let index = 0; index < maxLength; index += 1) {
+        const tokenA = a.tokens[index];
+        const tokenB = b.tokens[index];
+
+        if (tokenA === undefined && tokenB === undefined) {
+          return 0;
+        }
+
+        if (tokenA === undefined) {
+          if (tokenB === undefined) {
+            return 0;
+          }
+          const bIsNumeric = NUMERIC_TOKEN_PATTERN.test(tokenB);
+          return bIsNumeric ? -1 : 1;
+        }
+
+        if (tokenB === undefined) {
+          const aIsNumeric = NUMERIC_TOKEN_PATTERN.test(tokenA);
+          return aIsNumeric ? 1 : -1;
+        }
+
+        const aIsNumeric = NUMERIC_TOKEN_PATTERN.test(tokenA);
+        const bIsNumeric = NUMERIC_TOKEN_PATTERN.test(tokenB);
+
+        if (aIsNumeric && bIsNumeric) {
+          const diff = parseInt(tokenA, 10) - parseInt(tokenB, 10);
+          if (diff !== 0) {
+            return diff;
+          }
+          continue;
+        }
+
+        if (aIsNumeric && !bIsNumeric) {
+          return 1;
+        }
+
+        if (!aIsNumeric && bIsNumeric) {
+          return -1;
+        }
+
+        const tokenALower = tokenA.toLowerCase();
+        const tokenBLower = tokenB.toLowerCase();
+        if (tokenALower === tokenBLower) {
+          continue;
+        }
+
+        return tokenALower > tokenBLower ? 1 : -1;
+      }
+
+      return 0;
+    }
+
+    function updateSortIndicators() {
+      headers.forEach((header) => {
+        const sortKey = header.getAttribute("data-sort-key");
+        if (!sortKey) {
+          return;
+        }
+        if (sortKey === state.sortKey) {
+          header.setAttribute(
+            "aria-sort",
+            state.sortOrder === "asc" ? "ascending" : "descending",
+          );
+        } else {
+          header.setAttribute("aria-sort", "none");
+        }
+      });
+    }
+
+    function applyPagination() {
+      const totalPages = Math.max(1, Math.ceil(rows.length / state.perPage));
+      if (state.page > totalPages) {
+        state.page = totalPages;
+      }
+
+      const start = (state.page - 1) * state.perPage;
+      const end = start + state.perPage;
+
+      baseRows.forEach((row) => {
+        row.style.display = "none";
+      });
+
+      if (statusEl) {
+        if (rows.length === 0) {
+          statusEl.textContent = i18n.noResults || "No results.";
+        } else {
+          const template = i18n.pageStatus || "Page %1$d of %2$d";
+          statusEl.textContent = template
+            .replace("%1$d", String(state.page))
+            .replace("%2$d", String(totalPages));
+        }
+      }
+
+      if (prevBtn) {
+        prevBtn.disabled = state.page <= 1 || rows.length === 0;
+      }
+
+      if (nextBtn) {
+        nextBtn.disabled = state.page >= totalPages || rows.length === 0;
+      }
+
+      rows.forEach((row, index) => {
+        row.style.display = index >= start && index < end ? "" : "none";
+      });
+    }
+
+    function applySort() {
+      if (!state.sortKey) {
+        return;
+      }
+
+      const isVersionSort = VERSION_SORT_KEYS.has(state.sortKey);
+
+      const sortedRows = rows.slice().sort((a, b) => {
+        let comparison = 0;
+
+        if (NUMERIC_SORT_KEYS.has(state.sortKey)) {
+          const aValue = getSortValue(a, state.sortKey);
+          const bValue = getSortValue(b, state.sortKey);
+          comparison = aValue - bValue;
+        } else if (isVersionSort) {
+          const aVersion = parseVersionForSort(
+            getSortValue(a, state.sortKey, { raw: true }),
+          );
+          const bVersion = parseVersionForSort(
+            getSortValue(b, state.sortKey, { raw: true }),
+          );
+          comparison = compareVersionTokens(aVersion, bVersion);
+        } else {
+          const aValue = getSortValue(a, state.sortKey);
+          const bValue = getSortValue(b, state.sortKey);
+
+          if (aValue !== bValue) {
+            comparison = aValue > bValue ? 1 : -1;
+          }
+        }
+
+        if (state.sortOrder === "asc") {
+          return comparison;
+        }
+
+        return -comparison;
+      });
+
+      rows = sortedRows;
+
+      sortedRows.forEach((row) => tbody.appendChild(row));
+    }
+
+    function syncSortControls() {
+      if (sortSelect) {
+        const option = sortSelect.querySelector(
+          `[data-sort-key="${state.sortKey}"]`,
+        );
+        if (option) {
+          sortSelect.value = option.value;
+        }
+      }
+
+      if (orderSelect) {
+        orderSelect.value = state.sortOrder;
+      }
+    }
+
+    function getFilterText(row) {
+      return (row.dataset.filterText || row.textContent || "").toLowerCase();
+    }
+
+    function applyFilter() {
+      const query = state.filterQuery.trim().toLowerCase();
+      if (!query) {
+        rows = baseRows.slice();
+      } else {
+        rows = baseRows.filter((row) => getFilterText(row).includes(query));
+      }
+
+      applySort();
+      updateSortIndicators();
+      syncSortControls();
+      state.page = 1;
+      applyPagination();
+    }
+
+    headers.forEach((header) => {
+      header.addEventListener("click", () => {
+        const sortKey = header.getAttribute("data-sort-key");
+        if (!sortKey) {
+          return;
+        }
+
+        if (state.sortKey === sortKey) {
+          state.sortOrder = state.sortOrder === "asc" ? "desc" : "asc";
+        } else {
+          state.sortKey = sortKey;
+          state.sortOrder = header.getAttribute("data-sort-default") || "asc";
+        }
+
+        applySort();
+        updateSortIndicators();
+        syncSortControls();
+        state.page = 1;
+        applyPagination();
+      });
+
+      header.setAttribute("aria-sort", "none");
+    });
+
+    if (searchInput) {
+      searchInput.addEventListener("input", () => {
+        state.filterQuery = searchInput.value;
+        applyFilter();
+      });
+    }
+
+    if (sortSelect) {
+      sortSelect.addEventListener("change", () => {
+        const option = sortSelect.selectedOptions[0];
+        if (!option || !option.dataset.sortKey) {
+          return;
+        }
+        state.sortKey = option.dataset.sortKey;
+        state.sortOrder = orderSelect
+          ? orderSelect.value
+          : option.dataset.sortDefault || "asc";
+        applySort();
+        updateSortIndicators();
+        syncSortControls();
+        state.page = 1;
+        applyPagination();
+      });
+    }
+
+    if (orderSelect) {
+      orderSelect.addEventListener("change", () => {
+        state.sortOrder = orderSelect.value;
+        applySort();
+        updateSortIndicators();
+        syncSortControls();
+        state.page = 1;
+        applyPagination();
+      });
+    }
+
+    if (prevBtn) {
+      prevBtn.addEventListener("click", () => {
+        if (state.page > 1) {
+          state.page -= 1;
+          applyPagination();
+        }
+      });
+    }
+
+    if (nextBtn) {
+      nextBtn.addEventListener("click", () => {
+        const totalPages = Math.max(1, Math.ceil(rows.length / state.perPage));
+        if (state.page < totalPages) {
+          state.page += 1;
+          applyPagination();
+        }
+      });
+    }
+
+    applyFilter();
+  }
+
+  function initNotificationToggles() {
+    document.querySelectorAll("[data-watchdog-toggle]").forEach((toggle) => {
+      const container = toggle.closest("[data-watchdog-notification]");
+      if (!container) {
+        return;
+      }
+
+      const fieldWrapper = container.querySelector("[data-watchdog-fields]");
+      if (!fieldWrapper) {
+        return;
+      }
+
+      // Hidden fields are still submitted, so a disabled channel keeps its saved values.
+      const syncState = () => {
+        fieldWrapper.hidden = !toggle.checked;
+      };
+
+      toggle.addEventListener("change", syncState);
+      syncState();
+    });
+  }
+
+  function initFrequencyDescription() {
+    const select = document.getElementById(
+      "wp-watchdog-notification-frequency",
+    );
+    const description = document.querySelector(
+      "[data-watchdog-frequency-description]",
+    );
+    const optionContainer = document.querySelector(
+      "[data-watchdog-frequency-options]",
+    );
+
+    if (!select || !description) {
+      return;
+    }
+
+    const defaultMessage =
+      description.getAttribute("data-default-message") ||
+      description.textContent ||
+      "";
+    const testingMessage =
+      description.getAttribute("data-testing-message") || defaultMessage;
+
+    const updateMessage = () => {
+      if (select.value === "testing") {
+        description.textContent = testingMessage;
+        description.classList.add("wp-watchdog-frequency-description--testing");
+      } else {
+        description.textContent = defaultMessage;
+        description.classList.remove(
+          "wp-watchdog-frequency-description--testing",
+        );
+      }
+    };
+
+    const updateOptionsVisibility = () => {
+      if (!optionContainer) {
+        return;
+      }
+
+      const active = select.value;
+      optionContainer
+        .querySelectorAll("[data-watchdog-frequency-target]")
+        .forEach((section) => {
+          const target = section.getAttribute("data-watchdog-frequency-target");
+          const visible = target === active;
+          section.style.display = visible ? "" : "none";
+
+          section.querySelectorAll("input, select").forEach((field) => {
+            field.disabled = !visible;
+          });
+        });
+    };
+
+    select.addEventListener("change", () => {
+      updateMessage();
+      updateOptionsVisibility();
+    });
+
+    updateMessage();
+    updateOptionsVisibility();
+  }
+
+  // WordPress exposes no variable for the admin accent color, and it differs
+  // between versions and color schemes, so take it from a primary button.
+  function initAccentColor() {
+    const root = document.querySelector(".wp-watchdog-admin");
+    const primary = root ? root.querySelector(".button-primary") : null;
+    if (!primary) {
+      return;
+    }
+
+    const color = window.getComputedStyle(primary).backgroundColor;
+    if (color && color !== "transparent" && color !== "rgba(0, 0, 0, 0)") {
+      root.style.setProperty("--watchdog-accent", color);
+    }
+  }
+
+  function initTabs() {
+    const root = document.querySelector(".wp-watchdog-admin");
+    if (!root) {
+      return;
+    }
+
+    const tabs = Array.from(root.querySelectorAll("[data-watchdog-tab]"));
+    const panels = Array.from(root.querySelectorAll("[data-watchdog-panel]"));
+    if (tabs.length === 0 || panels.length === 0) {
+      return;
+    }
+
+    const ids = panels.map((panel) => panel.id);
+    const storageKey = "siteAddOnWatchdogTab";
+
+    const readRemembered = () => {
+      try {
+        return window.sessionStorage.getItem(storageKey);
+      } catch (error) {
+        return null;
+      }
+    };
+
+    const activate = (id) => {
+      panels.forEach((panel) => {
+        panel.hidden = panel.id !== id;
+      });
+      tabs.forEach((tab) => {
+        if (tab.dataset.watchdogTab === id) {
+          tab.setAttribute("aria-current", "true");
+        } else {
+          tab.removeAttribute("aria-current");
+        }
+      });
+
+      try {
+        window.sessionStorage.setItem(storageKey, id);
+      } catch (error) {
+        // Storage can be unavailable in private windows; the tab still switches.
+      }
+    };
+
+    // The address bar uses "#tab-risks" for the "watchdog-risks" panel. A hash
+    // that matched the panel id would make the browser scroll past the header.
+    const hashFor = (id) => `#${id.replace("watchdog-", "tab-")}`;
+
+    const panelFromHash = () => {
+      const hash = window.location.hash.slice(1);
+      if (!hash) {
+        return null;
+      }
+
+      const id = hash.replace(/^tab-/, "watchdog-");
+      if (ids.includes(id)) {
+        return id;
+      }
+
+      const target = document.getElementById(hash);
+      const panel = target ? target.closest("[data-watchdog-panel]") : null;
+      return panel ? panel.id : null;
+    };
+
+    const requested = root.dataset.watchdogInitialTab || "";
+    const remembered = readRemembered();
+    let initial = panelFromHash();
+    if (!initial && ids.includes(requested)) {
+      initial = requested;
+    }
+    if (!initial && ids.includes(remembered)) {
+      initial = remembered;
+    }
+
+    root.classList.add("wp-watchdog-admin--js");
+    activate(initial || ids[0]);
+
+    root.addEventListener("click", (event) => {
+      const link = event.target.closest('a[href^="#"]');
+      if (!link) {
+        return;
+      }
+
+      const id = link.getAttribute("href").slice(1);
+      if (!ids.includes(id)) {
+        return;
+      }
+
+      event.preventDefault();
+      activate(id);
+      if (window.history.replaceState) {
+        window.history.replaceState(null, "", hashFor(id));
+      }
+    });
+
+    window.addEventListener("hashchange", () => {
+      const id = panelFromHash();
+      if (id) {
+        activate(id);
+      }
+    });
+  }
+
+  function initCopyButtons() {
+    if (!navigator.clipboard || !navigator.clipboard.writeText) {
+      return;
+    }
+
+    document.querySelectorAll("[data-watchdog-copy]").forEach((button) => {
+      const source = document.getElementById(button.dataset.watchdogCopy);
+      if (!source) {
+        return;
+      }
+
+      const label = button.textContent;
+      button.hidden = false;
+      button.addEventListener("click", () => {
+        navigator.clipboard
+          .writeText(source.textContent.trim())
+          .then(() => {
+            button.textContent = i18n.copied || "Copied";
+            window.setTimeout(() => {
+              button.textContent = label;
+            }, 2000);
+          })
+          .catch(() => {
+            // Clipboard permission was denied; the text can still be selected by hand.
+          });
+      });
+    });
+  }
+
+  function initFormBusyState() {
+    // Downloads leave the page in place, so those forms must stay usable.
+    document
+      .querySelectorAll(".wp-watchdog-admin form:not([data-watchdog-download])")
+      .forEach((form) => {
+        form.addEventListener("submit", (event) => {
+          if (form.dataset.submitting === "true") {
+            event.preventDefault();
             return;
-        }
-
-        const perPage = parseInt(tableWrapper.dataset.perPage || '10', 10);
-        const baseRows = Array.from(tbody.querySelectorAll('tr'));
-        let rows = baseRows.slice();
-        const pagination = tableWrapper.querySelector('[data-pagination]');
-        const statusEl = tableWrapper.querySelector('[data-page-status]');
-        const prevBtn = pagination ? pagination.querySelector('[data-action="prev"]') : null;
-        const nextBtn = pagination ? pagination.querySelector('[data-action="next"]') : null;
-        const headers = Array.from(tableWrapper.querySelectorAll('[data-sort-key]'));
-        const searchInput = tableWrapper.querySelector('[data-risk-search]');
-        const sortSelect = tableWrapper.querySelector('[data-risk-sort]');
-        const orderSelect = tableWrapper.querySelector('[data-risk-order]');
-
-        const state = {
-            page: 1,
-            perPage: Number.isFinite(perPage) && perPage > 0 ? perPage : rows.length,
-            sortKey: null,
-            sortOrder: 'asc',
-            filterQuery: searchInput ? searchInput.value.trim() : ''
-        };
-
-        const initialHeader = headers.find((header) => header.hasAttribute('data-sort-initial'));
-        if (initialHeader) {
-            state.sortKey = initialHeader.getAttribute('data-sort-key');
-            state.sortOrder = initialHeader.getAttribute('data-sort-default') || 'asc';
-        }
-
-        const VERSION_SORT_KEYS = new Set(['sortLocal', 'sortRemote']);
-        const NUMERIC_SORT_KEYS = new Set(['sortRiskCount', 'sortVersionGap']);
-        const NUMERIC_TOKEN_PATTERN = /^\d+$/;
-
-        if (sortSelect) {
-            const selectedOption = sortSelect.selectedOptions[0];
-            if (selectedOption && selectedOption.dataset.sortKey) {
-                state.sortKey = selectedOption.dataset.sortKey;
-                state.sortOrder = orderSelect
-                    ? orderSelect.value
-                    : (selectedOption.dataset.sortDefault || 'asc');
-            }
-        }
-
-        function getSortValue(row, key, options = {}) {
-            const { raw = false } = options;
-
-            if (NUMERIC_SORT_KEYS.has(key)) {
-                const datasetKey = key.replace(/-([a-z])/g, (_, char) => char.toUpperCase());
-                const value = row.dataset[datasetKey];
-                const parsed = value ? parseFloat(value) : 0;
-                return Number.isFinite(parsed) ? parsed : 0;
-            }
-
-            if (VERSION_SORT_KEYS.has(key)) {
-                const columnKey = key === 'sortLocal' ? 'local' : 'remote';
-                const text = (row.querySelector(`[data-column="${columnKey}"]`)?.textContent || '').trim();
-                if (!text) {
-                    return raw ? '' : null;
-                }
-                if (text.toLowerCase() === 'n/a') {
-                    return raw ? 'N/A' : null;
-                }
-                return raw ? text : text.toLowerCase();
-            }
-
-            const datasetKey = key.replace(/-([a-z])/g, (_, char) => char.toUpperCase());
-            const value = row.dataset[datasetKey];
-            if (value !== undefined) {
-                return raw ? value : value.toLowerCase();
-            }
-            const fallback = (row.querySelector(`[data-column="${key}"]`)?.textContent || '').trim();
-            return raw ? fallback : fallback.toLowerCase();
-        }
-
-        function parseVersionForSort(value) {
-            if (typeof value !== 'string') {
-                return { tokens: [], isMissing: true };
-            }
-
-            const trimmed = value.trim();
-            if (!trimmed || trimmed.toLowerCase() === 'n/a') {
-                return { tokens: [], isMissing: true };
-            }
-
-            const tokens = trimmed.match(/[0-9]+|[a-zA-Z]+/g) || [];
-            return { tokens, isMissing: tokens.length === 0 };
-        }
-
-        function compareVersionTokens(a, b) {
-            if (a.isMissing && b.isMissing) {
-                return 0;
-            }
-
-            if (a.isMissing) {
-                return 1;
-            }
-
-            if (b.isMissing) {
-                return -1;
-            }
-
-            const maxLength = Math.max(a.tokens.length, b.tokens.length);
-            for (let index = 0; index < maxLength; index += 1) {
-                const tokenA = a.tokens[index];
-                const tokenB = b.tokens[index];
-
-                if (tokenA === undefined && tokenB === undefined) {
-                    return 0;
-                }
-
-                if (tokenA === undefined) {
-                    if (tokenB === undefined) {
-                        return 0;
-                    }
-                    const bIsNumeric = NUMERIC_TOKEN_PATTERN.test(tokenB);
-                    return bIsNumeric ? -1 : 1;
-                }
-
-                if (tokenB === undefined) {
-                    const aIsNumeric = NUMERIC_TOKEN_PATTERN.test(tokenA);
-                    return aIsNumeric ? 1 : -1;
-                }
-
-                const aIsNumeric = NUMERIC_TOKEN_PATTERN.test(tokenA);
-                const bIsNumeric = NUMERIC_TOKEN_PATTERN.test(tokenB);
-
-                if (aIsNumeric && bIsNumeric) {
-                    const diff = parseInt(tokenA, 10) - parseInt(tokenB, 10);
-                    if (diff !== 0) {
-                        return diff;
-                    }
-                    continue;
-                }
-
-                if (aIsNumeric && !bIsNumeric) {
-                    return 1;
-                }
-
-                if (!aIsNumeric && bIsNumeric) {
-                    return -1;
-                }
-
-                const tokenALower = tokenA.toLowerCase();
-                const tokenBLower = tokenB.toLowerCase();
-                if (tokenALower === tokenBLower) {
-                    continue;
-                }
-
-                return tokenALower > tokenBLower ? 1 : -1;
-            }
-
-            return 0;
-        }
-
-        function updateSortIndicators() {
-            headers.forEach((header) => {
-                const sortKey = header.getAttribute('data-sort-key');
-                if (!sortKey) {
-                    return;
-                }
-                if (sortKey === state.sortKey) {
-                    header.setAttribute('aria-sort', state.sortOrder === 'asc' ? 'ascending' : 'descending');
-                } else {
-                    header.setAttribute('aria-sort', 'none');
-                }
-            });
-        }
-
-        function applyPagination() {
-            const totalPages = Math.max(1, Math.ceil(rows.length / state.perPage));
-            if (state.page > totalPages) {
-                state.page = totalPages;
-            }
-
-            const start = (state.page - 1) * state.perPage;
-            const end = start + state.perPage;
-
-            baseRows.forEach((row) => {
-                row.style.display = 'none';
-            });
-
-            if (statusEl) {
-                if (rows.length === 0) {
-                    statusEl.textContent = i18n.noResults || 'No results.';
-                } else {
-                    const template = i18n.pageStatus || 'Page %1$d of %2$d';
-                    statusEl.textContent = template
-                        .replace('%1$d', String(state.page))
-                        .replace('%2$d', String(totalPages));
-                }
-            }
-
-            if (prevBtn) {
-                prevBtn.disabled = state.page <= 1 || rows.length === 0;
-            }
-
-            if (nextBtn) {
-                nextBtn.disabled = state.page >= totalPages || rows.length === 0;
-            }
-
-            rows.forEach((row, index) => {
-                row.style.display = index >= start && index < end ? '' : 'none';
-            });
-        }
-
-        function applySort() {
-            if (!state.sortKey) {
-                return;
-            }
-
-            const isVersionSort = VERSION_SORT_KEYS.has(state.sortKey);
-
-            const sortedRows = rows.slice().sort((a, b) => {
-                let comparison = 0;
-
-                if (NUMERIC_SORT_KEYS.has(state.sortKey)) {
-                    const aValue = getSortValue(a, state.sortKey);
-                    const bValue = getSortValue(b, state.sortKey);
-                    comparison = aValue - bValue;
-                } else if (isVersionSort) {
-                    const aVersion = parseVersionForSort(getSortValue(a, state.sortKey, { raw: true }));
-                    const bVersion = parseVersionForSort(getSortValue(b, state.sortKey, { raw: true }));
-                    comparison = compareVersionTokens(aVersion, bVersion);
-                } else {
-                    const aValue = getSortValue(a, state.sortKey);
-                    const bValue = getSortValue(b, state.sortKey);
-
-                    if (aValue !== bValue) {
-                        comparison = aValue > bValue ? 1 : -1;
-                    }
-                }
-
-                if (state.sortOrder === 'asc') {
-                    return comparison;
-                }
-
-                return -comparison;
-            });
-
-            rows = sortedRows;
-
-            sortedRows.forEach((row) => tbody.appendChild(row));
-        }
-
-        function syncSortControls() {
-            if (sortSelect) {
-                const option = sortSelect.querySelector(`[data-sort-key="${state.sortKey}"]`);
-                if (option) {
-                    sortSelect.value = option.value;
-                }
-            }
-
-            if (orderSelect) {
-                orderSelect.value = state.sortOrder;
-            }
-        }
-
-        function getFilterText(row) {
-            return (row.dataset.filterText || row.textContent || '').toLowerCase();
-        }
-
-        function applyFilter() {
-            const query = state.filterQuery.trim().toLowerCase();
-            if (!query) {
-                rows = baseRows.slice();
-            } else {
-                rows = baseRows.filter((row) => getFilterText(row).includes(query));
-            }
-
-            applySort();
-            updateSortIndicators();
-            syncSortControls();
-            state.page = 1;
-            applyPagination();
-        }
-
-        headers.forEach((header) => {
-            header.addEventListener('click', () => {
-                const sortKey = header.getAttribute('data-sort-key');
-                if (!sortKey) {
-                    return;
-                }
-
-                if (state.sortKey === sortKey) {
-                    state.sortOrder = state.sortOrder === 'asc' ? 'desc' : 'asc';
-                } else {
-                    state.sortKey = sortKey;
-                    state.sortOrder = header.getAttribute('data-sort-default') || 'asc';
-                }
-
-                applySort();
-                updateSortIndicators();
-                syncSortControls();
-                state.page = 1;
-                applyPagination();
-            });
-
-            header.setAttribute('aria-sort', 'none');
+          }
+
+          form.dataset.submitting = "true";
+          form.classList.add("is-busy");
+
+          const submitter = event.submitter;
+          if (submitter) {
+            submitter.setAttribute("aria-busy", "true");
+          }
+
+          // Delay disabling buttons so the clicked channel-test value remains in the request.
+          window.setTimeout(() => {
+            form
+              .querySelectorAll('button[type="submit"], input[type="submit"]')
+              .forEach((button) => {
+                button.disabled = true;
+              });
+          }, 0);
         });
-
-        if (searchInput) {
-            searchInput.addEventListener('input', () => {
-                state.filterQuery = searchInput.value;
-                applyFilter();
-            });
-        }
-
-        if (sortSelect) {
-            sortSelect.addEventListener('change', () => {
-                const option = sortSelect.selectedOptions[0];
-                if (!option || !option.dataset.sortKey) {
-                    return;
-                }
-                state.sortKey = option.dataset.sortKey;
-                state.sortOrder = orderSelect ? orderSelect.value : (option.dataset.sortDefault || 'asc');
-                applySort();
-                updateSortIndicators();
-                syncSortControls();
-                state.page = 1;
-                applyPagination();
-            });
-        }
-
-        if (orderSelect) {
-            orderSelect.addEventListener('change', () => {
-                state.sortOrder = orderSelect.value;
-                applySort();
-                updateSortIndicators();
-                syncSortControls();
-                state.page = 1;
-                applyPagination();
-            });
-        }
-
-        if (prevBtn) {
-            prevBtn.addEventListener('click', () => {
-                if (state.page > 1) {
-                    state.page -= 1;
-                    applyPagination();
-                }
-            });
-        }
-
-        if (nextBtn) {
-            nextBtn.addEventListener('click', () => {
-                const totalPages = Math.max(1, Math.ceil(rows.length / state.perPage));
-                if (state.page < totalPages) {
-                    state.page += 1;
-                    applyPagination();
-                }
-            });
-        }
-
-        applyFilter();
-    }
-
-    function initNotificationToggles() {
-        document.querySelectorAll('[data-watchdog-toggle]').forEach((toggle) => {
-            const container = toggle.closest('[data-watchdog-notification]');
-            if (!container) {
-                return;
-            }
-
-            const fieldWrapper = container.querySelector('[data-watchdog-fields]');
-            if (!fieldWrapper) {
-                return;
-            }
-
-            const controlledFields = fieldWrapper.querySelectorAll('input, textarea, select');
-
-            const syncState = () => {
-                const disabled = !toggle.checked;
-                fieldWrapper.classList.toggle('wp-watchdog-notification-fields--disabled', disabled);
-
-                controlledFields.forEach((field) => {
-                    if ('readOnly' in field) {
-                        field.readOnly = disabled;
-                    }
-
-                    if (disabled) {
-                        field.setAttribute('aria-disabled', 'true');
-                    } else {
-                        field.removeAttribute('aria-disabled');
-                    }
-                });
-            };
-
-            toggle.addEventListener('change', syncState);
-            syncState();
-        });
-    }
-
-    function initFrequencyDescription() {
-        const select = document.getElementById('wp-watchdog-notification-frequency');
-        const description = document.querySelector('[data-watchdog-frequency-description]');
-        const optionContainer = document.querySelector('[data-watchdog-frequency-options]');
-
-        if (!select || !description) {
-            return;
-        }
-
-        const defaultMessage = description.getAttribute('data-default-message') || description.textContent || '';
-        const testingMessage = description.getAttribute('data-testing-message') || defaultMessage;
-
-        const updateMessage = () => {
-            if (select.value === 'testing') {
-                description.textContent = testingMessage;
-                description.classList.add('wp-watchdog-frequency-description--testing');
-            } else {
-                description.textContent = defaultMessage;
-                description.classList.remove('wp-watchdog-frequency-description--testing');
-            }
-        };
-
-        const updateOptionsVisibility = () => {
-            if (!optionContainer) {
-                return;
-            }
-
-            const active = select.value;
-            optionContainer.querySelectorAll('[data-watchdog-frequency-target]').forEach((section) => {
-                const target = section.getAttribute('data-watchdog-frequency-target');
-                const visible = target === active;
-                section.style.display = visible ? '' : 'none';
-
-                section.querySelectorAll('input, select').forEach((field) => {
-                    field.disabled = !visible;
-                });
-            });
-        };
-
-        select.addEventListener('change', () => {
-            updateMessage();
-            updateOptionsVisibility();
-        });
-
-        updateMessage();
-        updateOptionsVisibility();
-    }
-
-    function initFormBusyState() {
-        document.querySelectorAll('.wp-watchdog-admin form').forEach((form) => {
-            form.addEventListener('submit', (event) => {
-                if (form.dataset.submitting === 'true') {
-                    event.preventDefault();
-                    return;
-                }
-
-                form.dataset.submitting = 'true';
-                form.classList.add('is-busy');
-
-                const submitter = event.submitter;
-                if (submitter) {
-                    submitter.setAttribute('aria-busy', 'true');
-                }
-
-                // Delay disabling buttons so the clicked channel-test value remains in the request.
-                window.setTimeout(() => {
-                    form.querySelectorAll('button[type="submit"], input[type="submit"]').forEach((button) => {
-                        button.disabled = true;
-                    });
-                }, 0);
-            });
-        });
-    }
-
-    window.addEventListener('DOMContentLoaded', () => {
-        document.querySelectorAll('[data-wp-watchdog-table]').forEach((tableWrapper) => {
-            initTable(tableWrapper);
-        });
-
-        initNotificationToggles();
-        initFrequencyDescription();
-        initFormBusyState();
-    });
+      });
+  }
+
+  window.addEventListener("DOMContentLoaded", () => {
+    initAccentColor();
+    initTabs();
+
+    document
+      .querySelectorAll("[data-wp-watchdog-table]")
+      .forEach((tableWrapper) => {
+        initTable(tableWrapper);
+      });
+
+    initNotificationToggles();
+    initFrequencyDescription();
+    initCopyButtons();
+    initFormBusyState();
+  });
 })();

site-add-on-watchdog/trunk/languages/site-add-on-watchdog.pot

@@ -3 +3 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Site Add-on Watchdog 1.9.0\n"
+"Project-Id-Version: Site Add-on Watchdog 1.10.0\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/site-add-on-watchdog\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2026-10-28T07:35:21+00:00\n"
+"POT-Creation-Date: 2026-11-13T04:50:43+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.12.0\n"
@@ -17 +17 @@
 #. Plugin Name of the plugin
 #: site-add-on-watchdog.php
-#: src/AdminPage.php:60
+#: src/AdminPage.php:82
 #: src/Notifications/MessageFormatter.php:293
 #: src/Notifications/MessageFormatter.php:376
-#: templates/admin-page.php:57
+#: templates/admin-page.php:171
 msgid "Site Add-on Watchdog"
 msgstr ""
@@ -39 +39 @@
 msgstr ""
 
-#: site-add-on-watchdog.php:21
+#: site-add-on-watchdog.php:20
 msgid "Site Add-on Watchdog requires PHP 8.1 or higher. The plugin has been disabled."
 msgstr ""
 
-#: site-add-on-watchdog.php:74
+#: site-add-on-watchdog.php:73
 msgid "Site Add-on Watchdog could not start. The rest of the site is still available; check the PHP error log and reinstall the plugin files."
 msgstr ""
 
-#: src/AdminPage.php:61
+#: src/AdminPage.php:83
 msgid "Watchdog"
 msgstr ""
 
-#: src/AdminPage.php:72
+#: src/AdminPage.php:94
 msgid "You do not have permission to access this page."
 msgstr ""
 
-#: src/AdminPage.php:216
+#: src/AdminPage.php:248
 msgid "History retention cannot exceed 15 scans. The value has been limited to 15."
 msgstr ""
 
-#: src/AdminPage.php:323
+#: src/AdminPage.php:353
 msgid "No failed notification payload is available."
 msgstr ""
 
-#: src/AdminPage.php:342
+#: src/AdminPage.php:372
 msgid "Invalid history request."
 msgstr ""
 
-#: src/AdminPage.php:353
+#: src/AdminPage.php:383
 msgid "History entry not found."
 msgstr ""
 
-#: src/AdminPage.php:368
+#: src/AdminPage.php:398
 msgid "You do not have permission to perform this action."
 msgstr ""
 
 #. translators: 1: current page number, 2: total number of pages.
-#: src/AdminPage.php:408
+#: src/AdminPage.php:438
 #, php-format
 msgid "Page %1$d of %2$d"
 msgstr ""
 
-#: src/AdminPage.php:409
+#: src/AdminPage.php:439
 msgid "No risks match your search."
 msgstr ""
 
-#: src/AdminPage.php:493
-msgid "Unable to generate history export."
+#: src/AdminPage.php:440
+msgid "Copied"
 msgstr ""
 
 #: src/Bootstrap.php:97
-#: templates/admin-page.php:86
+#: templates/admin-page.php:161
 msgid "Settings"
 msgstr ""
@@ -141 +141 @@
 #: src/Notifications/MessageFormatter.php:402
 #: src/Notifications/MessageFormatter.php:459
-#: templates/admin-page.php:568
+#: templates/admin-page.php:473
 msgid "N/A"
 msgstr ""
@@ -172 +172 @@
 #: src/Notifications/MessageFormatter.php:226
 #: src/Notifications/MessageFormatter.php:385
+#: templates/admin-page.php:355
 msgid "Review updates"
 msgstr ""
@@ -223 +224 @@
 
 #: src/Notifications/MessageFormatter.php:348
-#: templates/admin-page.php:409
+#: templates/admin-page.php:375
 msgid "Directory Version"
 msgstr ""
@@ -242 +243 @@
 #: src/Notifications/MessageFormatter.php:401
 #: src/Notifications/MessageFormatter.php:458
-#: templates/admin-page.php:505
+#: templates/admin-page.php:384
 msgid "Directory version"
 msgstr ""
@@ -249 +250 @@
 #: src/Notifications/MessageFormatter.php:425
 #: src/Notifications/MessageFormatter.php:483
-#: templates/admin-page.php:641
+#: templates/admin-page.php:499
 #, php-format
 msgid "Fixed in %s"
@@ -255 +256 @@
 
 #: src/Notifications/MessageFormatter.php:465
-#: templates/admin-page.php:410
-#: templates/admin-page.php:513
+#: templates/admin-page.php:376
+#: templates/admin-page.php:385
 msgid "Reasons"
 msgstr ""
@@ -281 +282 @@
 
 #: src/Notifier.php:149
-#: templates/admin-page.php:180
+#: templates/admin-page.php:55
 msgid "Custom webhook"
 msgstr ""
@@ -325 +326 @@
 msgstr ""
 
-#: src/Plugin.php:151
+#: src/Plugin.php:154
 msgid "The scan could not be completed. No saved results were changed; please try again."
 msgstr ""
 
-#: src/Plugin.php:240
+#: src/Plugin.php:245
 msgid "Once Weekly"
 msgstr ""
 
-#: src/Plugin.php:247
-#: src/Plugin.php:254
+#: src/Plugin.php:252
+#: src/Plugin.php:259
 msgid "Every 5 Minutes (Watchdog queue)"
 msgstr ""
 
 #. translators: %d: interval minutes
-#: src/Plugin.php:263
+#: src/Plugin.php:268
 #, php-format
 msgid "Every %d Minutes (testing)"
 msgstr ""
 
-#: src/Plugin.php:352
-msgid "WP-Cron appears disabled. Set a system cron job to trigger wp-cron.php for Site Add-on Watchdog."
-msgstr ""
-
-#: src/Plugin.php:363
+#: src/Plugin.php:350
+msgid "The scheduled Site Add-on Watchdog scan is overdue and WP-Cron is disabled on this site. Make sure a system cron job calls wp-cron.php."
+msgstr ""
+
+#: src/Plugin.php:355
 msgid "Site Add-on Watchdog scans are overdue. Ensure system cron calls wp-cron.php regularly."
 msgstr ""
 
-#: src/Plugin.php:656
+#: src/Plugin.php:668
 msgid "Notifications processed."
 msgstr ""
 
-#: src/Plugin.php:667
+#: src/Plugin.php:679
 msgid "Scan triggered successfully."
 msgstr ""
 
-#: src/Plugin.php:710
+#: src/Plugin.php:693
 msgid "The cron endpoint only accepts POST requests."
 msgstr ""
 
+#: src/Plugin.php:702
+msgid "Cron secret is missing. Please resave your settings."
+msgstr ""
+
+#: src/Plugin.php:711
+msgid "Invalid cron secret."
+msgstr ""
+
 #: src/Plugin.php:719
-msgid "Cron secret is missing. Please resave your settings."
-msgstr ""
-
-#: src/Plugin.php:728
-msgid "Invalid cron secret."
-msgstr ""
-
-#: src/Plugin.php:736
 msgid "Force requests require header authentication."
 msgstr ""
 
-#: src/Scanner.php:89
+#: src/Scanner.php:90
 msgid "An update is available in the plugin directory."
 msgstr ""
 
-#: src/Scanner.php:100
+#: src/Scanner.php:101
 msgid "Local version is more than two minor releases behind the directory version."
 msgstr ""
 
-#: src/Scanner.php:115
+#: src/Scanner.php:116
 msgid "Changelog mentions security-related updates."
 msgstr ""
 
-#: src/Scanner.php:131
+#: src/Scanner.php:132
 msgid "Active vulnerabilities reported by WPScan."
 msgstr ""
 
-#: src/Scanner.php:190
+#: src/Scanner.php:191
 msgid "Severe"
 msgstr ""
 
-#: src/Scanner.php:197
+#: src/Scanner.php:198
 msgid "High"
 msgstr ""
 
-#: src/Scanner.php:204
+#: src/Scanner.php:205
 msgid "Medium"
 msgstr ""
 
-#: src/Scanner.php:210
+#: src/Scanner.php:211
 msgid "Low"
 msgstr ""
@@ -436 +437 @@
 msgstr ""
 
-#: templates/admin-page.php:38
-#: templates/admin-page.php:751
+#: templates/admin-page.php:51
+msgid "Email"
+msgstr ""
+
+#: templates/admin-page.php:52
+msgid "Discord"
+msgstr ""
+
+#: templates/admin-page.php:53
+msgid "Slack"
+msgstr ""
+
+#: templates/admin-page.php:54
+msgid "Microsoft Teams"
+msgstr ""
+
+#: templates/admin-page.php:65
+#: templates/admin-page.php:594
 msgid "Daily"
 msgstr ""
 
-#: templates/admin-page.php:39
-#: templates/admin-page.php:752
+#: templates/admin-page.php:66
+#: templates/admin-page.php:595
 msgid "Weekly"
 msgstr ""
 
-#: templates/admin-page.php:40
+#: templates/admin-page.php:67
 msgid "Testing"
 msgstr ""
 
-#: templates/admin-page.php:41
+#: templates/admin-page.php:68
+#: templates/admin-page.php:120
 msgid "Manual"
 msgstr ""
 
-#: templates/admin-page.php:51
-msgid "Plugin health and security"
-msgstr ""
-
-#: templates/admin-page.php:59
-msgid "Monitor plugin health, review scan history, and verify every alert channel from one focused dashboard."
-msgstr ""
-
-#: templates/admin-page.php:67
+#: templates/admin-page.php:77
+msgid "No scan has run yet. Run a manual scan to create your first report."
+msgstr ""
+
+#. translators: %s: number of plugins.
+#: templates/admin-page.php:81
+#, php-format
+msgid "%s plugin needs attention."
+msgid_plural "%s plugins need attention."
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/admin-page.php:85
+msgid "No risks found in the latest scan."
+msgstr ""
+
+#: templates/admin-page.php:91
+msgid "Not scanned yet"
+msgstr ""
+
+#: templates/admin-page.php:94
+msgid "All clear"
+msgstr ""
+
+#. translators: %s: number of vulnerabilities.
+#: templates/admin-page.php:99
+#, php-format
+msgid "%s known vulnerability"
+msgid_plural "%s known vulnerabilities"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/admin-page.php:104
+msgid "Updates available"
+msgstr ""
+
+#: templates/admin-page.php:108
+msgid "Never"
+msgstr ""
+
+#: templates/admin-page.php:109
+msgid "Run a manual scan"
+msgstr ""
+
+#. translators: %s: human-readable time difference, for example "2 hours".
+#: templates/admin-page.php:113
+#, php-format
+msgid "%s ago"
+msgstr ""
+
+#: templates/admin-page.php:121
+msgid "Automatic scans are off"
+msgstr ""
+
+#: templates/admin-page.php:123
+msgid "Not scheduled"
+msgstr ""
+
+#: templates/admin-page.php:124
+msgid "Save the settings to reschedule"
+msgstr ""
+
+#. translators: %s: human-readable time difference, for example "2 hours".
+#: templates/admin-page.php:129
+#, php-format
+msgid "In %s"
+msgstr ""
+
+#: templates/admin-page.php:132
+msgid "Due now"
+msgstr ""
+
+#. translators: 1: scan frequency, 2: date and time.
+#: templates/admin-page.php:135
+#, php-format
+msgid "%1$s, %2$s"
+msgstr ""
+
+#: templates/admin-page.php:144
+msgid "Last delivery failed"
+msgstr ""
+
+#. translators: %s: number of queued alerts.
+#: templates/admin-page.php:148
+#, php-format
+msgid "%s alert queued"
+msgid_plural "%s alerts queued"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/admin-page.php:153
+msgid "No channel enabled"
+msgstr ""
+
+#: templates/admin-page.php:155
+msgid "No failed deliveries"
+msgstr ""
+
+#: templates/admin-page.php:159
+msgid "Risks"
+msgstr ""
+
+#: templates/admin-page.php:160
+msgid "History"
+msgstr ""
+
+#: templates/admin-page.php:162
+msgid "Delivery"
+msgstr ""
+
+#: templates/admin-page.php:183
+msgid "Send notifications now"
+msgstr ""
+
+#: templates/admin-page.php:191
 msgid "Run manual scan"
 msgstr ""
 
-#: templates/admin-page.php:76
-msgid "Send notifications now"
-msgstr ""
-
-#: templates/admin-page.php:82
+#: templates/admin-page.php:213
+msgid "Cron secret has not been initialized or could not be saved. Please try saving the settings again."
+msgstr ""
+
+#. translators: 1: WPScan response code, 2: message
+#: templates/admin-page.php:223
+#, php-format
+msgid "WPScan error (%1$s): %2$s"
+msgstr ""
+
+#: templates/admin-page.php:235
+msgid "Settings saved."
+msgstr ""
+
+#: templates/admin-page.php:239
+msgid "Manual scan completed."
+msgstr ""
+
+#: templates/admin-page.php:243
+msgid "Notifications were dispatched."
+msgstr ""
+
+#: templates/admin-page.php:245
+msgid "Notifications skipped to avoid rapid re-sends. Please wait a moment and try again."
+msgstr ""
+
+#: templates/admin-page.php:249
+msgid "Queued the captured notification payload for resend."
+msgstr ""
+
+#: templates/admin-page.php:251
+msgid "No failed notification payload was available to resend."
+msgstr ""
+
+#: templates/admin-page.php:257
+msgid "Notification channel"
+msgstr ""
+
+#: templates/admin-page.php:263
+msgid "WordPress accepted the test email for sending. This does not confirm inbox delivery. If it does not arrive, check spam and your site mail or SMTP configuration."
+msgstr ""
+
+#. translators: %s: notification channel name.
+#: templates/admin-page.php:267
+#, php-format
+msgid "%s test notification sent successfully."
+msgstr ""
+
+#. translators: %s: notification channel name.
+#: templates/admin-page.php:278
+#, php-format
+msgid "%s could not be tested until its settings are corrected."
+msgstr ""
+
+#. translators: %s: notification channel name.
+#: templates/admin-page.php:288
+#, php-format
+msgid "%s is not configured yet."
+msgstr ""
+
+#. translators: %s: notification channel name.
+#: templates/admin-page.php:298
+#, php-format
+msgid "%s test delivery failed. Open the Delivery tab for details."
+msgstr ""
+
+#: templates/admin-page.php:306
+msgid "Watchdog overview"
+msgstr ""
+
+#: templates/admin-page.php:309
+msgid "Open risks"
+msgstr ""
+
+#: templates/admin-page.php:315
+msgid "Last scan"
+msgstr ""
+
+#: templates/admin-page.php:321
+msgid "Next scan"
+msgstr ""
+
+#: templates/admin-page.php:327
+msgid "Active channels"
+msgstr ""
+
+#: templates/admin-page.php:333
 msgid "Watchdog sections"
 msgstr ""
 
-#: templates/admin-page.php:83
-msgid "Risks"
-msgstr ""
-
-#: templates/admin-page.php:84
-msgid "History"
-msgstr ""
-
-#: templates/admin-page.php:85
-msgid "Delivery"
-msgstr ""
-
-#: templates/admin-page.php:89
-msgid "Watchdog overview"
-msgstr ""
-
-#: templates/admin-page.php:93
-msgid "Open risks"
-msgstr ""
-
-#: templates/admin-page.php:98
-msgid "Active channels"
-msgstr ""
-
-#: templates/admin-page.php:103
-msgid "Queued alerts"
-msgstr ""
-
-#: templates/admin-page.php:108
-msgid "Scan schedule"
-msgstr ""
-
-#: templates/admin-page.php:126
-msgid "Cron secret has not been initialized or could not be saved. Please try saving the settings again."
-msgstr ""
-
-#. translators: 1: WPScan response code, 2: message
-#: templates/admin-page.php:136
-#, php-format
-msgid "WPScan error (%1$s): %2$s"
-msgstr ""
-
-#: templates/admin-page.php:148
-msgid "Settings saved."
-msgstr ""
-
-#: templates/admin-page.php:152
-msgid "Manual scan completed."
-msgstr ""
-
-#: templates/admin-page.php:157
-msgid "Notifications were dispatched."
-msgstr ""
-
-#: templates/admin-page.php:159
-msgid "Notifications skipped to avoid rapid re-sends. Please wait a moment and try again."
-msgstr ""
-
-#: templates/admin-page.php:161
-msgid "No notification changes detected since the last send."
-msgstr ""
-
-#: templates/admin-page.php:167
-msgid "Queued the captured notification payload for resend."
-msgstr ""
-
-#: templates/admin-page.php:169
-msgid "No failed notification payload was available to resend."
-msgstr ""
-
-#: templates/admin-page.php:176
+#: templates/admin-page.php:341
+msgid "Needs attention"
+msgstr ""
+
+#: templates/admin-page.php:351
+msgid "Potential Risks"
+msgstr ""
+
+#: templates/admin-page.php:352
+msgid "Plugins with a newer release, a security note in the latest changelog, or a known vulnerability."
+msgstr ""
+
+#: templates/admin-page.php:363
+msgid "No scan results yet"
+msgstr ""
+
 #: templates/admin-page.php:364
-msgid "Email"
-msgstr ""
-
-#: templates/admin-page.php:177
+msgid "Run a manual scan to check your plugins now."
+msgstr ""
+
+#: templates/admin-page.php:366
+msgid "No risks detected."
+msgstr ""
+
 #: templates/admin-page.php:367
-msgid "Discord"
-msgstr ""
-
-#: templates/admin-page.php:178
-#: templates/admin-page.php:365
-msgid "Slack"
-msgstr ""
-
-#: templates/admin-page.php:179
-#: templates/admin-page.php:366
-msgid "Microsoft Teams"
-msgstr ""
-
-#: templates/admin-page.php:183
-msgid "Notification channel"
-msgstr ""
-
-#: templates/admin-page.php:189
-msgid "WordPress accepted the test email for sending. This does not confirm inbox delivery. If it does not arrive, check spam and your site mail or SMTP configuration."
+msgid "Nothing was flagged in the latest scan."
+msgstr ""
+
+#: templates/admin-page.php:373
+msgid "Plugin"
+msgstr ""
+
+#: templates/admin-page.php:374
+msgid "Local Version"
+msgstr ""
+
+#: templates/admin-page.php:377
+msgid "Actions"
+msgstr ""
+
+#: templates/admin-page.php:380
+msgid "Plugin name"
+msgstr ""
+
+#: templates/admin-page.php:381
+msgid "Risk count"
+msgstr ""
+
+#: templates/admin-page.php:382
+msgid "Version gap"
+msgstr ""
+
+#: templates/admin-page.php:383
+msgid "Local version"
+msgstr ""
+
+#: templates/admin-page.php:400
+msgid "Search risks"
+msgstr ""
+
+#: templates/admin-page.php:405
+msgid "Search plugin or reason"
+msgstr ""
+
+#: templates/admin-page.php:409
+msgid "Sort risks by"
+msgstr ""
+
+#: templates/admin-page.php:420
+msgid "Sort order"
+msgstr ""
+
+#: templates/admin-page.php:422
+msgid "Ascending"
+msgstr ""
+
+#: templates/admin-page.php:423
+msgid "Descending"
+msgstr ""
+
+#: templates/admin-page.php:425
+msgid "Apply"
+msgstr ""
+
+#: templates/admin-page.php:428
+msgid "Previous page"
+msgstr ""
+
+#: templates/admin-page.php:430
+msgid "Next page"
+msgstr ""
+
+#: templates/admin-page.php:482
+msgid "WPScan vulnerabilities:"
+msgstr ""
+
+#: templates/admin-page.php:515
+msgid "Ignore"
+msgstr ""
+
+#: templates/admin-page.php:528
+msgid "Ignored Plugins"
+msgstr ""
+
+#: templates/admin-page.php:530
+msgid "No plugins are being ignored."
+msgstr ""
+
+#: templates/admin-page.php:532
+msgid "Ignored plugins are skipped by every scan. Select one to watch it again."
+msgstr ""
+
+#: templates/admin-page.php:543
+msgid "Stop ignoring"
+msgstr ""
+
+#: templates/admin-page.php:555
+msgid "Scan History"
+msgstr ""
+
+#: templates/admin-page.php:566
+msgid "Scanning"
+msgstr ""
+
+#: templates/admin-page.php:568
+msgid "Choose how often the automatic scan should run."
+msgstr ""
+
+#. translators: 1: interval minutes, 2: duration hours
+#: templates/admin-page.php:571
+#, php-format
+msgid "Testing mode sends notifications every %1$d minutes to all configured channels and automatically switches back to daily scans after %2$d hours."
+msgstr ""
+
+#: templates/admin-page.php:581
+msgid "Monday"
+msgstr ""
+
+#: templates/admin-page.php:582
+msgid "Tuesday"
+msgstr ""
+
+#: templates/admin-page.php:583
+msgid "Wednesday"
+msgstr ""
+
+#: templates/admin-page.php:584
+msgid "Thursday"
+msgstr ""
+
+#: templates/admin-page.php:585
+msgid "Friday"
+msgstr ""
+
+#: templates/admin-page.php:586
+msgid "Saturday"
+msgstr ""
+
+#: templates/admin-page.php:587
+msgid "Sunday"
+msgstr ""
+
+#: templates/admin-page.php:591
+msgid "Scan frequency"
+msgstr ""
+
+#. translators: %d: interval minutes
+#: templates/admin-page.php:600
+#, php-format
+msgid "Testing (every %d minutes)"
+msgstr ""
+
+#: templates/admin-page.php:605
+msgid "Manual (no automatic scans)"
+msgstr ""
+
+#. translators: 1: datetime, 2: relative time
+#: templates/admin-page.php:621
+#, php-format
+msgid "Testing mode will automatically switch back to daily scans on %1$s (%2$s remaining)."
+msgstr ""
+
+#: templates/admin-page.php:632
+msgid "Daily send time"
+msgstr ""
+
+#: templates/admin-page.php:641
+msgid "Time of day to start the daily scan in the WordPress site timezone."
+msgstr ""
+
+#: templates/admin-page.php:645
+msgid "Weekly send day"
+msgstr ""
+
+#: templates/admin-page.php:653
+msgid "Weekly send time"
+msgstr ""
+
+#: templates/admin-page.php:662
+msgid "Day and time to start the weekly scan in the WordPress site timezone."
+msgstr ""
+
+#: templates/admin-page.php:667
+msgid "History retention"
+msgstr ""
+
+#: templates/admin-page.php:679
+msgid "Number of recent scans to keep available for review and download (maximum 15)."
+msgstr ""
+
+#: templates/admin-page.php:688
+msgid "Save and test email"
+msgstr ""
+
+#: templates/admin-page.php:690
+msgid "Recipients (comma separated)"
+msgstr ""
+
+#: templates/admin-page.php:693
+msgid "Separate addresses with commas, semicolons, or spaces. WordPress administrator accounts are always included."
+msgstr ""
+
+#: templates/admin-page.php:694
+msgid "Email uses WordPress mail delivery. Your host must support sending mail, or you must configure an SMTP/mail plugin. Discord and other webhooks do not use this mail configuration."
+msgstr ""
+
+#: templates/admin-page.php:699
+msgid "Save and test Discord"
+msgstr ""
+
+#: templates/admin-page.php:701
+msgid "Discord webhook URL"
+msgstr ""
+
+#: templates/admin-page.php:707
+msgid "Save and test Slack"
+msgstr ""
+
+#: templates/admin-page.php:709
+msgid "Slack webhook URL"
+msgstr ""
+
+#: templates/admin-page.php:715
+msgid "Save and test Teams"
+msgstr ""
+
+#: templates/admin-page.php:717
+msgid "Teams webhook URL"
+msgstr ""
+
+#: templates/admin-page.php:720
+msgid "Supports Microsoft Teams Workflows and existing Incoming Webhook connectors."
+msgstr ""
+
+#: templates/admin-page.php:725
+msgid "Save and test webhook"
+msgstr ""
+
+#: templates/admin-page.php:727
+msgid "Webhook URL"
+msgstr ""
+
+#: templates/admin-page.php:728
+msgid "Webhook secret (optional)"
+msgstr ""
+
+#: templates/admin-page.php:731
+msgid "Signs the exact JSON body with HMAC-SHA256 in the X-Watchdog-Signature header. Test messages are marked in the payload."
+msgstr ""
+
+#: templates/admin-page.php:737
+msgid "Notification channels"
+msgstr ""
+
+#: templates/admin-page.php:738
+msgid "Save and test buttons save all settings on this form, then send a test to the selected channel."
+msgstr ""
+
+#: templates/admin-page.php:760
+msgid "On"
+msgstr ""
+
+#: templates/admin-page.php:761
+msgid "Off"
 msgstr ""
 
 #. translators: %s: notification channel name.
-#: templates/admin-page.php:193
-#, php-format
-msgid "%s test notification sent successfully."
-msgstr ""
-
-#. translators: %s: notification channel name.
-#: templates/admin-page.php:204
-#, php-format
-msgid "%s could not be tested until its settings are corrected."
-msgstr ""
-
-#. translators: %s: notification channel name.
-#: templates/admin-page.php:214
-#, php-format
-msgid "%s is not configured yet."
-msgstr ""
-
-#. translators: %s: notification channel name.
-#: templates/admin-page.php:224
-#, php-format
-msgid "%s test delivery failed. Review Delivery health for details."
-msgstr ""
-
-#: templates/admin-page.php:236
-msgid "Delivery health"
-msgstr ""
-
-#: templates/admin-page.php:240
+#: templates/admin-page.php:768
+#, php-format
+msgid "Enable %s notifications"
+msgstr ""
+
+#: templates/admin-page.php:803
+msgid "Vulnerability data"
+msgstr ""
+
+#: templates/admin-page.php:805
+msgid "WPScan API key"
+msgstr ""
+
+#: templates/admin-page.php:815
+msgid "Optional. Provide your own WPScan API key to enrich vulnerability reports."
+msgstr ""
+
+#: templates/admin-page.php:821
+msgid "Save settings"
+msgstr ""
+
+#: templates/admin-page.php:829
+msgid "Scheduler"
+msgstr ""
+
+#: templates/admin-page.php:831
+msgid "WP-Cron disabled"
+msgstr ""
+
+#: templates/admin-page.php:833
+msgid "WP-Cron enabled"
+msgstr ""
+
+#: templates/admin-page.php:837
 msgid "WP-Cron appears disabled. Use a real cron job or the server endpoint below to keep scans running."
 msgstr ""
 
-#: templates/admin-page.php:248
-msgid "Retry notifications"
-msgstr ""
-
-#: templates/admin-page.php:252
+#: templates/admin-page.php:839
 msgid "WP-Cron is enabled. Scheduled tasks depend on site traffic or a server cron job."
 msgstr ""
 
-#: templates/admin-page.php:256
+#: templates/admin-page.php:843
+msgid "Trigger scans from a server cron job"
+msgstr ""
+
+#: templates/admin-page.php:846
 msgid "Server cron endpoint:"
 msgstr ""
 
-#: templates/admin-page.php:261
+#: templates/admin-page.php:848
+#: templates/admin-page.php:854
+#: templates/admin-page.php:859
+msgid "Copy"
+msgstr ""
+
+#: templates/admin-page.php:852
 msgid "Generated Cron secret:"
 msgstr ""
 
-#: templates/admin-page.php:265
+#: templates/admin-page.php:857
 msgid "Authenticated command:"
 msgstr ""
 
-#: templates/admin-page.php:268
+#: templates/admin-page.php:861
 msgid "Use POST and keep the generated secret private. The header-authenticated request can trigger scans or notification retries even when wp-cron is disabled."
 msgstr ""
 
-#: templates/admin-page.php:272
+#: templates/admin-page.php:870
 msgid "Queue status"
 msgstr ""
 
-#. translators: %d: number of queued jobs.
-#: templates/admin-page.php:280
-#, php-format
-msgid "Queued jobs: %d"
+#. translators: %s: number of queued jobs.
+#: templates/admin-page.php:875
+#, php-format
+msgid "Queued jobs: %s"
 msgstr ""
 
 #. translators: 1: scheduled time
-#: templates/admin-page.php:290
+#: templates/admin-page.php:886
 #, php-format
 msgid "Next attempt: %1$s"
 msgstr ""
 
-#: templates/admin-page.php:296
+#: templates/admin-page.php:892
 msgid "No pending notifications in the queue."
 msgstr ""
 
-#: templates/admin-page.php:301
+#: templates/admin-page.php:898
 msgid "Captured notification payloads"
 msgstr ""
 
-#: templates/admin-page.php:308
+#: templates/admin-page.php:900
+msgid "Delivery failed"
+msgstr ""
+
+#: templates/admin-page.php:909
 msgid "Unknown channel"
 msgstr ""
 
 #. translators: 1: human readable time, 2: channel name
-#: templates/admin-page.php:315
+#: templates/admin-page.php:916
 #, php-format
 msgid "Last failure recorded %1$s via %2$s."
 msgstr ""
 
-#: templates/admin-page.php:330
+#: templates/admin-page.php:931
 msgid "Re-queue payload"
 msgstr ""
 
-#: templates/admin-page.php:338
+#: templates/admin-page.php:939
 msgid "Download payload"
 msgstr ""
 
-#: templates/admin-page.php:343
+#: templates/admin-page.php:944
 msgid "No failed notification payload has been captured yet."
 msgstr ""
 
-#: templates/admin-page.php:353
-msgid "Scan History"
-msgstr ""
-
-#: templates/admin-page.php:360
-msgid "Notification channels"
-msgstr ""
-
-#: templates/admin-page.php:368
-msgid "Custom Webhook"
-msgstr ""
-
-#: templates/admin-page.php:380
-msgid "On"
-msgstr ""
-
-#: templates/admin-page.php:380
-msgid "Off"
-msgstr ""
-
-#: templates/admin-page.php:386
-msgid "Keep channels enabled to receive instant alerts and download-ready reports."
-msgstr ""
-
-#: templates/admin-page.php:395
-msgid "Potential Risks"
-msgstr ""
-
-#: templates/admin-page.php:399
-msgid "items flagged"
-msgstr ""
-
-#: templates/admin-page.php:403
-msgid "No risks detected."
-msgstr ""
-
-#: templates/admin-page.php:407
-msgid "Plugin"
-msgstr ""
-
-#: templates/admin-page.php:408
-msgid "Local Version"
-msgstr ""
-
-#: templates/admin-page.php:411
-msgid "Actions"
-msgstr ""
-
-#: templates/admin-page.php:455
-msgid "Search risks"
-msgstr ""
-
-#: templates/admin-page.php:460
-msgid "Search plugin or reason"
-msgstr ""
-
-#: templates/admin-page.php:465
-msgid "Sort risks by"
-msgstr ""
-
-#: templates/admin-page.php:473
-msgid "Plugin name"
-msgstr ""
-
-#: templates/admin-page.php:481
-msgid "Risk count"
-msgstr ""
-
-#: templates/admin-page.php:489
-msgid "Version gap"
-msgstr ""
-
-#: templates/admin-page.php:497
-msgid "Local version"
-msgstr ""
-
-#: templates/admin-page.php:516
-msgid "Sort order"
-msgstr ""
-
-#: templates/admin-page.php:519
-msgid "Ascending"
-msgstr ""
-
-#: templates/admin-page.php:522
-msgid "Descending"
-msgstr ""
-
-#: templates/admin-page.php:525
-msgid "Apply"
-msgstr ""
-
-#: templates/admin-page.php:529
-msgid "Previous page"
-msgstr ""
-
-#: templates/admin-page.php:531
-msgid "Next page"
-msgstr ""
-
-#: templates/admin-page.php:623
-msgid "WPScan vulnerabilities:"
-msgstr ""
-
-#: templates/admin-page.php:658
-msgid "Ignore"
-msgstr ""
-
-#: templates/admin-page.php:674
-msgid "Ignored Plugins"
-msgstr ""
-
-#: templates/admin-page.php:677
-msgid "No plugins are being ignored."
-msgstr ""
-
-#: templates/admin-page.php:699
-msgid "Settings and notifications"
-msgstr ""
-
-#: templates/admin-page.php:701
-msgid "Save and test buttons save all settings on this form, then send a test to the selected channel."
-msgstr ""
-
-#: templates/admin-page.php:707
-#: templates/admin-page.php:709
-msgid "History retention"
-msgstr ""
-
-#: templates/admin-page.php:720
-msgid "Number of recent scans to keep available for review and download (maximum 15)."
-msgstr ""
-
-#: templates/admin-page.php:725
-#: templates/admin-page.php:749
-msgid "Scan frequency"
-msgstr ""
-
-#: templates/admin-page.php:728
-msgid "Choose how often the automatic scan should run."
-msgstr ""
-
-#. translators: 1: interval minutes, 2: duration hours
-#: templates/admin-page.php:731
-#, php-format
-msgid "Testing mode sends notifications every %1$d minutes to all configured channels and automatically switches back to daily scans after %2$d hours."
-msgstr ""
-
-#. translators: %d: interval minutes
-#: templates/admin-page.php:756
-#, php-format
-msgid "Testing (every %d minutes)"
-msgstr ""
-
-#: templates/admin-page.php:760
-msgid "Manual (no automatic scans)"
-msgstr ""
-
-#: templates/admin-page.php:780
-msgid "Daily send time"
-msgstr ""
-
-#: templates/admin-page.php:790
-msgid "Time of day to start the daily scan in the WordPress site timezone."
-msgstr ""
-
-#: templates/admin-page.php:796
-msgid "Weekly send day"
-msgstr ""
-
-#: templates/admin-page.php:799
-msgid "Monday"
-msgstr ""
-
-#: templates/admin-page.php:800
-msgid "Tuesday"
-msgstr ""
-
-#: templates/admin-page.php:801
-msgid "Wednesday"
-msgstr ""
-
-#: templates/admin-page.php:802
-msgid "Thursday"
-msgstr ""
-
-#: templates/admin-page.php:803
-msgid "Friday"
-msgstr ""
-
-#: templates/admin-page.php:804
-msgid "Saturday"
-msgstr ""
-
-#: templates/admin-page.php:805
-msgid "Sunday"
-msgstr ""
-
-#: templates/admin-page.php:810
-msgid "Weekly send time"
-msgstr ""
-
-#: templates/admin-page.php:821
-msgid "Day and time to start the weekly scan in the WordPress site timezone."
-msgstr ""
-
-#. translators: 1: datetime, 2: relative time
-#: templates/admin-page.php:861
-#, php-format
-msgid "Testing mode will automatically switch back to daily scans on %1$s (%2$s remaining)."
-msgstr ""
-
-#: templates/admin-page.php:877
-msgid "Email notifications"
-msgstr ""
-
-#: templates/admin-page.php:881
-#: templates/admin-page.php:899
-#: templates/admin-page.php:915
-#: templates/admin-page.php:931
-#: templates/admin-page.php:948
-msgid "Enabled"
-msgstr ""
-
-#: templates/admin-page.php:885
-msgid "Recipients (comma separated)"
-msgstr ""
-
-#: templates/admin-page.php:888
-msgid "Separate addresses with commas, semicolons, or spaces. WordPress administrator accounts are always included."
-msgstr ""
-
-#: templates/admin-page.php:889
-msgid "Email uses WordPress mail delivery. Your host must support sending mail, or you must configure an SMTP/mail plugin. Discord and other webhooks do not use this mail configuration."
-msgstr ""
-
-#: templates/admin-page.php:890
-msgid "Save and test email"
-msgstr ""
-
-#: templates/admin-page.php:895
-msgid "Discord notifications"
-msgstr ""
-
-#: templates/admin-page.php:903
-msgid "Discord webhook URL"
-msgstr ""
-
-#: templates/admin-page.php:906
-msgid "Save and test Discord"
-msgstr ""
-
-#: templates/admin-page.php:911
-msgid "Slack notifications"
-msgstr ""
-
-#: templates/admin-page.php:919
-msgid "Slack webhook URL"
-msgstr ""
-
-#: templates/admin-page.php:922
-msgid "Save and test Slack"
-msgstr ""
-
-#: templates/admin-page.php:927
-msgid "Microsoft Teams notifications"
-msgstr ""
-
-#: templates/admin-page.php:935
-msgid "Teams webhook URL"
-msgstr ""
-
-#: templates/admin-page.php:938
-msgid "Supports Microsoft Teams Workflows and existing Incoming Webhook connectors."
-msgstr ""
-
-#: templates/admin-page.php:939
-msgid "Save and test Teams"
-msgstr ""
-
-#: templates/admin-page.php:944
-msgid "Generic webhook"
-msgstr ""
-
-#: templates/admin-page.php:952
-msgid "Webhook URL"
-msgstr ""
-
-#: templates/admin-page.php:957
-msgid "Webhook secret (optional)"
-msgstr ""
-
-#: templates/admin-page.php:960
-msgid "Signs the exact JSON body with HMAC-SHA256 in the X-Watchdog-Signature header. Test messages are marked in the payload."
-msgstr ""
-
-#: templates/admin-page.php:962
-msgid "Save and test webhook"
-msgstr ""
-
-#: templates/admin-page.php:967
-msgid "WPScan API key"
-msgstr ""
-
-#: templates/admin-page.php:970
-msgid "Optional. Provide your own WPScan API key to enrich vulnerability reports."
-msgstr ""
-
-#: templates/admin-page.php:974
-msgid "Save settings"
-msgstr ""
-
-#: templates/history.php:21
+#: templates/history.php:14
 msgid "No scans have been recorded yet. Run a scan to populate your history."
 msgstr ""
 
 #. translators: 1: number of scans shown, 2: total scans retained
-#: templates/history.php:30
+#: templates/history.php:20
 #, php-format
 msgid "Showing the last %1$s scans (retaining %2$s in total)."
@@ -997 +1095 @@
 
 #. translators: %s: number of risks.
-#: templates/history.php:55
+#: templates/history.php:41
 #, php-format
 msgid "%s risk"
@@ -1004 +1102 @@
 msgstr[1] ""
 
-#: templates/history.php:69
-msgid "Download the report for this run:"
-msgstr ""
-
-#: templates/history.php:73
+#: templates/history.php:48
 msgid "Download JSON"
 msgstr ""
 
-#: templates/history.php:76
+#: templates/history.php:51
 msgid "Download CSV"
 msgstr ""

site-add-on-watchdog/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 7.1
 Requires PHP: 8.1
-Stable tag: 1.9.0
+Stable tag: 1.10.0
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -17 +17 @@
 * A newer release is available for an installed plugin, with an additional warning when it is two or more minor releases behind.
 * The latest release's official changelog mentions security or vulnerability fixes.
-* (Optional) WPScan reports vulnerabilities affecting the installed version when you provide your own API key.
-
-The plugin runs on a schedule you control—choose daily, weekly, a twenty-minute testing cadence, or rely on manual scans—and stores results locally. To compare public versions and changelogs, Watchdog looks up plugin slugs individually on WordPress.org and caches successful responses for six hours. WPScan lookups are optional. Email risk alerts to site administrators are enabled by default; webhook channels require setup and activation.
+* (Optional) WPScan reports vulnerabilities affecting the installed version when you provide your own API key. This also covers plugins that are not listed on WordPress.org.
+
+The plugin runs on a schedule you control—choose daily, weekly, a twenty-minute testing cadence, or rely on manual scans—and stores results locally. To compare public versions and changelogs, Watchdog looks up plugin slugs individually on WordPress.org and caches each answer for six hours, including the answer that a plugin is not in the directory. A lookup that fails is retried on the next scan. WPScan lookups are optional. Email risk alerts to site administrators are enabled by default; webhook channels require setup and activation.
 
 === Privacy first ===
@@ -38 +38 @@
 === Admin tools ===
 
-* Focused dashboard with risk summaries, searchable history, delivery health, and manual actions.
+* Tabbed dashboard with a searchable risk table, downloadable scan history, delivery status, and manual actions.
 * Ignore list to suppress noisy plugins.
 * Validated notification settings with a save-and-test action for every channel.
@@ -83 +83 @@
 = How do I resend a failed notification payload? =
 
-Open the Watchdog admin page and check the **Delivery health** section. If a notification fails, the payload is captured there with buttons to re-queue or download it.
+Open the Watchdog admin page and select the **Delivery** tab. If a notification fails, the payload is captured there with buttons to re-queue or download it.
+
+= What happens to my data when I delete the plugin? =
+
+Deleting the plugin from the Plugins screen removes its settings, saved risks, ignore list, scan history, notification queue, and scheduled events. Deactivating it only stops the schedule and keeps the data.
 
 = Where can I find the test suite? =
@@ -93 +97 @@
 === Scheduled scans are not running ===
 
-Watchdog relies on WP-Cron to trigger scheduled scans and notifications. If you have set `DISABLE_WP_CRON` to `true` or your site receives very little traffic (so WP-Cron rarely runs), configure a system cron job to call either `wp-cron.php` or the plugin's REST endpoint. The admin **Delivery health** panel shows the endpoint and generated secret. Send the secret in an HTTP header so it does not appear in access logs; a typical example looks like this:
+Watchdog relies on WP-Cron to trigger scheduled scans and notifications. If you have set `DISABLE_WP_CRON` to `true` or your site receives very little traffic (so WP-Cron rarely runs), configure a system cron job to call either `wp-cron.php` or the plugin's REST endpoint. The **Delivery** tab on the Watchdog admin page shows the endpoint and generated secret. Send the secret in an HTTP header so it does not appear in access logs; a typical example looks like this:
 
 `curl -X POST -H "X-Watchdog-Cron-Key: YOUR_GENERATED_SECRET" https://example.com/wp-json/site-add-on-watchdog/v1/cron`
@@ -103 +107 @@
 Email uses WordPress's `wp_mail()` function and your site's mail configuration. Discord and other webhooks use HTTP, so a working webhook does not confirm that the server can send email.
 
-Use "Save and test email", then check Delivery health for a mail or SMTP error. Configure your host's mail service or an SMTP/mail plugin if needed. If WordPress accepts the test but no email arrives, check spam and your mail provider's delivery logs, sender verification, and SPF/DKIM settings. Acceptance for sending does not confirm inbox delivery.
+Use "Save and test email", then check the Delivery tab for a mail or SMTP error. Configure your host's mail service or an SMTP/mail plugin if needed. If WordPress accepts the test but no email arrives, check spam and your mail provider's delivery logs, sender verification, and SPF/DKIM settings. Acceptance for sending does not confirm inbox delivery.
 
 == CLI Usage ==
@@ -125 +129 @@
 
 == Changelog ==
+
+= 1.10.0 =
+* Split the dashboard into Risks, History, Settings, and Delivery tabs, and show when the last scan ran and when the next one is due.
+* Check plugins that are not in the WordPress.org directory against WPScan when an API key is configured.
+* Remove the plugin's saved data when the plugin is deleted.
+* Turn email alerts on by default, as documented. New installs had them off. Sites that never saved the Watchdog settings will start emailing alerts to administrators.
+* Show the WP-Cron notice only when the scheduled scan is overdue.
+* Stop writing to the database on every page load.
+* Remove an ignored plugin from the risk table at once, and show every table column on narrow screens.
+* Honor `force` on REST cron scan requests and stop repeating old notices.
 
 = 1.9.0 =
@@ -173 +187 @@
 == Upgrade Notice ==
 
+= 1.10.0 =
+Email alerts to administrators are now on by default as documented. If you never saved the Watchdog settings and do not want them, switch Email off under Settings. Also adds a tabbed dashboard and removes a database write from every page load.
+
 = 1.9.0 =
 Adds custom webhook event metadata and clarifies test and scan status messages.

site-add-on-watchdog/trunk/site-add-on-watchdog.php

@@ -4 +4 @@
  * Plugin Name: Site Add-on Watchdog
  * Description: Monitors installed plugins for potential security risks and outdated versions.
- * Version:     1.9.0
+ * Version:     1.10.0
  * Author:      Aaron
  * Author URI:  https://www.worksbyaaron.com/
@@ -11 +11 @@
  * Requires at least: 6.0
  * Requires PHP: 8.1
- * Tested up to: 7.1
  */
 

site-add-on-watchdog/trunk/src/Admin/RiskSorter.php

@@ -21 +21 @@
                 'remote' => $this->compareVersions($left->remoteVersion, $right->remoteVersion),
                 'reasons' => $this->compareText(
-                    $this->reasonSortValue($left),
-                    $this->reasonSortValue($right)
+                    $this->reasonText($left),
+                    $this->reasonText($right)
                 ),
-                'risk_count' => $this->riskSignalCount($left) <=> $this->riskSignalCount($right),
-                'version_gap' => $this->versionGapScore($left) <=> $this->versionGapScore($right),
+                'risk_count' => $this->signalCount($left) <=> $this->signalCount($right),
+                'version_gap' => $this->versionGap($left) <=> $this->versionGap($right),
                 default => 0,
             };
@@ -43 +43 @@
     }
 
-    private function normalizeText(string $value): string
+    public function normalizeText(string $value): string
     {
         $normalized = function_exists('remove_accents') ? remove_accents($value) : $value;
@@ -50 +50 @@
     }
 
-    private function reasonSortValue(Risk $risk): string
+    public function reasonText(Risk $risk): string
     {
         $parts = $risk->reasons;
@@ -64 +64 @@
     }
 
-    private function riskSignalCount(Risk $risk): int
+    public function signalCount(Risk $risk): int
     {
         return count($risk->reasons) + count($this->vulnerabilities($risk));
@@ -72 +72 @@
      * @return array<int, array<string, mixed>>
      */
-    private function vulnerabilities(Risk $risk): array
+    public function vulnerabilities(Risk $risk): array
     {
         $vulnerabilities = $risk->details['vulnerabilities'] ?? [];
@@ -154 +154 @@
     }
 
-    private function versionGapScore(Risk $risk): int
+    public function versionGap(Risk $risk): int
     {
         return abs(

site-add-on-watchdog/trunk/src/AdminPage.php

@@ -9 +9 @@
 use Watchdog\Repository\SettingsRepository;
 use Watchdog\Version;
-use WP_Filesystem_Direct;
 
 class AdminPage
@@ -16 +15 @@
     private const MENU_SLUG = 'site-add-on-watchdog';
     private const HISTORY_DOWNLOAD_ACTION = self::PREFIX . '_history_download';
+    private const NOTICE_ARGS = [
+        'updated',
+        'scan',
+        'notifications',
+        'failed_notification',
+        'channel_test',
+        'channel_test_status',
+        '_wpnonce',
+    ];
 
     private ?string $menuHook = null;
     private bool $assetsEnqueued = false;
-    /**
-     * @var WP_Filesystem_Direct|null
-     */
-    private $filesystem = null;
     private readonly RiskSorter $riskSorter;
 
@@ -53 +57 @@
         );
         add_action('admin_enqueue_scripts', [$this, 'enqueueAssets']);
+        add_filter('removable_query_args', [$this, 'filterRemovableQueryArgs']);
+    }
+
+    /**
+     * Lets WordPress drop one-time notice arguments from the address bar so a
+     * reload does not show the same notice again.
+     *
+     * @param string[] $args
+     * @return string[]
+     */
+    public function filterRemovableQueryArgs(array $args): array
+    {
+        $page = filter_input(INPUT_GET, 'page', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        if ($page !== self::MENU_SLUG) {
+            return $args;
+        }
+
+        return array_merge($args, self::NOTICE_ARGS);
     }
 
@@ -105 +127 @@
         $watchdogRiskSortSelection = $watchdogRiskSort !== '' ? $watchdogRiskSort : 'plugin';
         $watchdogRiskOrderSelection = $watchdogRiskOrder !== '' ? $watchdogRiskOrder : 'asc';
+        $watchdogRiskRows = $this->buildRiskRows($watchdogRisks);
+        $watchdogVulnerabilityCount = 0;
+        foreach ($watchdogRiskRows as $watchdogRiskRow) {
+            $watchdogVulnerabilityCount += count($watchdogRiskRow['vulnerabilities']);
+        }
 
         $watchdogSettingsError = get_transient(self::PREFIX . '_settings_error');
@@ -140 +167 @@
             ];
         }
+
+        $watchdogLastScanAt = isset($watchdogHistoryRecords[0]['run_at'])
+            ? (int) $watchdogHistoryRecords[0]['run_at']
+            : null;
+        $watchdogNextScanAt = $this->plugin->getNextScanTimestamp();
 
         $watchdogLastFailedNotification = $this->notifier->getLastFailedNotification();
@@ -259 +291 @@
         }
 
-        wp_safe_redirect(wp_get_referer() ?: admin_url('admin.php?page=' . self::MENU_SLUG));
+        wp_safe_redirect($this->returnUrl());
         exit;
     }
@@ -273 +305 @@
         }
 
-        wp_safe_redirect(wp_get_referer() ?: admin_url('admin.php?page=' . self::MENU_SLUG));
+        wp_safe_redirect($this->returnUrl());
         exit;
     }
@@ -293 +325 @@
         check_admin_referer(self::PREFIX . '_send_notifications');
 
-        $force           = ! empty($_POST['force']);
-        $respectThrottle = empty($_POST['ignore_throttle']);
-        $result          = $this->plugin->sendNotifications($force, $respectThrottle);
+        $result = $this->plugin->sendNotifications(true);
 
         $this->redirectWithNotice(['notifications' => $result]);
@@ -408 +438 @@
             'pageStatus' => __('Page %1$d of %2$d', 'site-add-on-watchdog'),
             'noResults' => __('No risks match your search.', 'site-add-on-watchdog'),
+            'copied' => __('Copied', 'site-add-on-watchdog'),
         ]);
 
@@ -480 +511 @@
         }
 
-        $target = 'php://output';
-
-        if ($target === 'php://output') {
-            $csvContent = $this->buildCsvContent($rows);
-            // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- CSV download response.
-            echo $csvContent;
-        } else {
-            $filesystem = $this->getFilesystem();
-            $csvContent  = $this->buildCsvContent($rows);
-
-            if (! $filesystem->put_contents($target, $csvContent)) {
-                wp_die(esc_html__('Unable to generate history export.', 'site-add-on-watchdog'));
-            }
-        }
+        // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- CSV download response.
+        echo $this->buildCsvContent($rows);
         exit;
     }
@@ -534 +553 @@
         $args['_wpnonce'] = wp_create_nonce(self::PREFIX . '_admin_notice');
 
-        wp_safe_redirect(
-            add_query_arg(
-                $args,
-                wp_get_referer() ?: admin_url('admin.php?page=' . self::MENU_SLUG)
-            )
-        );
+        wp_safe_redirect(add_query_arg($args, $this->returnUrl()));
+    }
+
+    /**
+     * The page to return to, without the notice arguments of an earlier action.
+     * Leaving them in would replay an old notice next to the new one.
+     */
+    private function returnUrl(): string
+    {
+        $referer = wp_get_referer();
+        if (! $referer) {
+            return admin_url('admin.php?page=' . self::MENU_SLUG);
+        }
+
+        return remove_query_arg(self::NOTICE_ARGS, $referer);
     }
 
@@ -554 +582 @@
     }
 
-    private function getFilesystem()
-    {
-        if ($this->filesystem !== null) {
-            return $this->filesystem;
-        }
-
-        $this->ensureFilesystemDependenciesLoaded();
-
-        global $wp_filesystem;
-
-        if (! $wp_filesystem instanceof WP_Filesystem_Direct) {
-            WP_Filesystem();
-        }
-
-        if ($wp_filesystem instanceof WP_Filesystem_Direct) {
-            $this->filesystem = $wp_filesystem;
-
-            return $this->filesystem;
-        }
-
-        $this->filesystem = new WP_Filesystem_Direct(false);
-
-        return $this->filesystem;
-    }
-
-    private function ensureFilesystemDependenciesLoaded(): void
-    {
-        if (! function_exists('request_filesystem_credentials')) {
-            require_once ABSPATH . 'wp-admin/includes/file.php';
-        }
-
-        if (! class_exists('WP_Filesystem_Base')) {
-            require_once ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php';
-        }
-
-        if (! class_exists('WP_Filesystem_Direct')) {
-            require_once ABSPATH . 'wp-admin/includes/class-wp-filesystem-direct.php';
-        }
+    /**
+     * Prepares the sort and search attributes the risk table script reads.
+     *
+     * @param Risk[] $risks
+     * @return array<int, array{
+     *     risk: Risk,
+     *     vulnerabilities: array<int, array<string, mixed>>,
+     *     attributes: array<string, string>
+     * }>
+     */
+    private function buildRiskRows(array $risks): array
+    {
+        $rows = [];
+
+        foreach ($risks as $risk) {
+            $reasonText = $this->riskSorter->reasonText($risk);
+
+            $rows[] = [
+                'risk'            => $risk,
+                'vulnerabilities' => $this->riskSorter->vulnerabilities($risk),
+                'attributes'      => [
+                    'data-sort-plugin'      => $this->riskSorter->normalizeText($risk->pluginName),
+                    'data-sort-local'       => $this->riskSorter->normalizeText($risk->localVersion),
+                    'data-sort-remote'      => $this->riskSorter->normalizeText((string) $risk->remoteVersion),
+                    'data-sort-reasons'     => $this->riskSorter->normalizeText($reasonText),
+                    'data-sort-risk-count'  => (string) $this->riskSorter->signalCount($risk),
+                    'data-sort-version-gap' => (string) $this->riskSorter->versionGap($risk),
+                    'data-filter-text'      => $this->riskSorter->normalizeText(implode(' ', [
+                        $risk->pluginName,
+                        $risk->localVersion,
+                        (string) $risk->remoteVersion,
+                        $reasonText,
+                    ])),
+                ],
+            ];
+        }
+
+        return $rows;
     }
 }

site-add-on-watchdog/trunk/src/Bootstrap.php

@@ -27 +27 @@
         $settingsRepository = new SettingsRepository();
         $riskRepository     = new RiskRepository();
-        $settings           = $settingsRepository->get();
+        // Read the key on first use. Loading the settings here would run before
+        // `plugins_loaded`, which is too early for the user query behind the
+        // default recipient list.
         $wpscanClient       = new WPScanClient(
-            (string) ($settings['notifications']['wpscan_api_key'] ?? '')
+            static fn (): string => (string) ($settingsRepository->get()['notifications']['wpscan_api_key'] ?? '')
         );
         $scanner            = new Scanner(

site-add-on-watchdog/trunk/src/Plugin.php

@@ -4 +4 @@
 
 use Watchdog\Models\Risk;
+use Watchdog\Repository\MigratesLegacyOptions;
 use Watchdog\Repository\RiskRepository;
 use Watchdog\Repository\SettingsRepository;
@@ -12 +13 @@
 class Plugin
 {
+    use MigratesLegacyOptions;
+
     private const PREFIX = Version::PREFIX;
     private const CRON_HOOK = self::PREFIX . '_scheduled_scan';
@@ -55 +58 @@
         add_action('rest_api_init', [$this, 'registerRestRoutes']);
 
-        $this->cleanupUpdateCheckState();
-
         $this->hooksRegistered = true;
     }
@@ -137 +138 @@
      * Executes the scan and persists results.
      *
-     * @param bool $notify Whether notifications should be dispatched.
+     * @param bool   $notify  Whether notifications should be dispatched.
+     * @param string $context 'automatic', 'manual', 'rest', or 'rest-force'. Manual scans are
+     *                        throttled; forced REST scans notify even when nothing changed.
      *
      * @return bool Whether notifications were dispatched.
@@ -176 +179 @@
         $lastHash      = $settings['last_notification'] ?? '';
         $isTestingMode = ($settings['notifications']['frequency'] ?? 'daily') === 'testing';
-
-        $shouldNotify = $notify && ($isTestingMode || (! empty($risks) && $hash !== $lastHash));
+        $isForced      = $context === 'rest-force';
+
+        $shouldNotify = $notify
+            && ($isTestingMode || $isForced || (! empty($risks) && $hash !== $lastHash));
         $manualThrottle = $context === 'manual'
             && $this->isManualNotificationThrottled($settings, $runAt);
@@ -296 +301 @@
     }
 
-    private function cleanupUpdateCheckState(): void
-    {
-        delete_option(self::UPDATE_CHECK_OPTION);
-        delete_option(self::LEGACY_UPDATE_CHECK_OPTION);
-    }
-
     private function scheduleNotificationQueueProcessor(): void
     {
-        $this->clearScheduledHook(self::LEGACY_QUEUE_CRON_HOOK);
-
         $timestamp = wp_next_scheduled(self::QUEUE_CRON_HOOK);
         $currentSchedule = $timestamp ? wp_get_schedule(self::QUEUE_CRON_HOOK) : false;
@@ -343 +340 @@
         }
 
-        $status = $this->getOptionWithLegacy(self::CRON_STATUS_OPTION, self::LEGACY_CRON_STATUS_OPTION, []);
-        if (! is_array($status)) {
-            return;
-        }
-
-        if (! empty($status['cron_disabled'])) {
-            echo '<div class="notice notice-error"><p>'
-                . esc_html__(
-                    'WP-Cron appears disabled. Set a system cron job to trigger wp-cron.php for Site Add-on Watchdog.',
-                    'site-add-on-watchdog'
-                )
-                . '</p></div>';
-
-            return;
-        }
-
-        if (($status['overdue_streak'] ?? 0) >= 2) {
-            echo '<div class="notice notice-warning"><p>'
-                . esc_html__(
-                    'Site Add-on Watchdog scans are overdue. Ensure system cron calls wp-cron.php regularly.',
-                    'site-add-on-watchdog'
-                )
-                . '</p></div>';
-        }
-    }
-
+        $status = $this->getCronStatus();
+        if ($status['overdue_streak'] < 2) {
+            return;
+        }
+
+        // A disabled WP-Cron is a normal production setup when a system cron
+        // calls wp-cron.php, so only warn once the scheduled scan is late.
+        $message = $status['cron_disabled']
+            ? __(
+                // phpcs:ignore Generic.Files.LineLength.TooLong -- Translation source must remain one literal string.
+                'The scheduled Site Add-on Watchdog scan is overdue and WP-Cron is disabled on this site. Make sure a system cron job calls wp-cron.php.',
+                'site-add-on-watchdog'
+            )
+            : __(
+                'Site Add-on Watchdog scans are overdue. Ensure system cron calls wp-cron.php regularly.',
+                'site-add-on-watchdog'
+            );
+
+        echo '<div class="notice notice-warning"><p>' . esc_html($message) . '</p></div>';
+    }
+
+    /**
+     * @return array{cron_disabled: bool, overdue_streak: int}
+     */
     public function getCronStatus(): array
     {
-        $status = $this->getOptionWithLegacy(self::CRON_STATUS_OPTION, self::LEGACY_CRON_STATUS_OPTION, []);
-        if (! is_array($status)) {
-            $status = [];
-        }
-
-        return [
-            'cron_disabled'  => ! empty($status['cron_disabled']),
-            'overdue_streak' => (int) ($status['overdue_streak'] ?? 0),
-            'last_checked'   => (int) ($status['last_checked'] ?? 0),
-        ];
+        return $this->normalizeCronStatus(
+            $this->getOptionWithLegacy(self::CRON_STATUS_OPTION, self::LEGACY_CRON_STATUS_OPTION, [])
+        );
+    }
+
+    public function getNextScanTimestamp(): ?int
+    {
+        $timestamp = wp_next_scheduled(self::CRON_HOOK);
+
+        return $timestamp ? (int) $timestamp : null;
     }
 
@@ -439 +434 @@
     }
 
+    /**
+     * Runs on every request, so it only writes when the status changes.
+     */
     private function recordCronStatus(bool $cronDisabled, bool $overdue): void
     {
-        $status = $this->getOptionWithLegacy(self::CRON_STATUS_OPTION, self::LEGACY_CRON_STATUS_OPTION, []);
-        if (! is_array($status)) {
-            $status = [
-                'overdue_streak' => 0,
-                'cron_disabled'  => false,
-            ];
-        }
-
-        $status['cron_disabled'] = $cronDisabled;
-        $status['last_checked']  = time();
-
-        if ($overdue) {
-            $status['overdue_streak'] = min(10, (int) ($status['overdue_streak'] ?? 0) + 1);
-        } else {
-            $status['overdue_streak'] = 0;
-        }
-
-        update_option(self::CRON_STATUS_OPTION, $status, false);
+        $stored   = $this->getOptionWithLegacy(self::CRON_STATUS_OPTION, self::LEGACY_CRON_STATUS_OPTION, []);
+        $previous = $this->normalizeCronStatus($stored);
+        $status   = [
+            'cron_disabled'  => $cronDisabled,
+            'overdue_streak' => $overdue ? min(10, $previous['overdue_streak'] + 1) : 0,
+        ];
+
+        if ($stored === $status) {
+            return;
+        }
+
+        // Autoloaded because the status is read on every request.
+        update_option(self::CRON_STATUS_OPTION, $status, true);
+
+        if ($status === $previous) {
+            return;
+        }
 
         if ($cronDisabled) {
@@ -467 +464 @@
                 . 'Ensure cron can reach wp-cron.php.');
         }
+    }
+
+    /**
+     * @return array{cron_disabled: bool, overdue_streak: int}
+     */
+    private function normalizeCronStatus(mixed $status): array
+    {
+        if (! is_array($status)) {
+            $status = [];
+        }
+
+        return [
+            'cron_disabled'  => ! empty($status['cron_disabled']),
+            'overdue_streak' => (int) ($status['overdue_streak'] ?? 0),
+        ];
     }
 
@@ -670 +682 @@
     }
 
-    private function getOptionWithLegacy(string $option, string $legacy, mixed $default): mixed
-    {
-        $value = get_option($option, $default);
-        if ($value !== $default) {
-            return $value;
-        }
-
-        $legacyValue = get_option($legacy, $default);
-        if ($legacyValue !== $default) {
-            update_option($option, $legacyValue, false);
-
-            return $legacyValue;
-        }
-
-        return $value;
-    }
-
-    public function validateCronRequest(WP_REST_Request $request): bool
-    {
-        [$provided] = $this->cronCredentialFromRequest($request);
-        $stored     = $this->getCronSecret();
-
-        if ($stored === '') {
-            return false;
-        }
-
-        return hash_equals($stored, $provided);
-    }
-
     public function authorizeCronRequest(WP_REST_Request $request): bool|\WP_Error
     {

site-add-on-watchdog/trunk/src/Repository/RiskRepository.php

@@ -8 +8 @@
 class RiskRepository
 {
+    use MigratesLegacyOptions;
+
     private const PREFIX = Version::PREFIX;
     private const RISKS_OPTION = self::PREFIX . '_risks';
@@ -29 +31 @@
         }
 
+        // Ignoring a plugin takes effect at once instead of waiting for the next scan.
+        $ignored    = $this->ignored();
         $normalized = [];
 
@@ -37 +41 @@
 
             if (! isset($entry['plugin_slug'], $entry['plugin_name'], $entry['local_version'])) {
+                continue;
+            }
+
+            if (in_array((string) $entry['plugin_slug'], $ignored, true)) {
                 continue;
             }
@@ -241 +249 @@
     }
 
-    private function getOptionWithLegacy(string $option, string $legacyOption, mixed $default): mixed
-    {
-        $value = get_option($option, $default);
-        if ($value !== $default) {
-            return $value;
-        }
-
-        $legacyValue = get_option($legacyOption, $default);
-        if ($legacyValue !== $default) {
-            update_option($option, $legacyValue, false);
-
-            return $legacyValue;
-        }
-
-        return $value;
-    }
-
     private function sanitizeRetention(?int $retention): int
     {

site-add-on-watchdog/trunk/src/Repository/SettingsRepository.php

@@ -69 +69 @@
         }
 
-        $normalized = $this->normalizeStoredSettings($stored);
+        $normalized = $this->withoutNulls($this->normalizeStoredSettings($stored));
         $settings   = array_replace_recursive($defaults, $normalized);
 
@@ -92 +92 @@
 
         $recipientList = $settings['notifications']['email']['recipients'] ?? '';
-        if (! is_string($recipientList) || trim($recipientList) === '') {
-            $settings['notifications']['email']['recipients'] = $this->buildAdministratorEmailList();
-        } else {
-            $settings['notifications']['email']['recipients'] = trim($recipientList);
-        }
+        $recipientList = is_string($recipientList) ? trim($recipientList) : '';
+        if ($recipientList === '' && $shouldPersistDefaults) {
+            // Prefill once, when the defaults are first stored. A field the site
+            // owner emptied stays empty: administrators are added at send time,
+            // and looking them up here would cost a user query on every request.
+            $recipientList = $this->buildAdministratorEmailList();
+        }
+        $settings['notifications']['email']['recipients'] = $recipientList;
 
         $settings['history']['retention'] = $this->sanitizeRetention($settings['history']['retention'] ?? null);
@@ -396 +399 @@
     }
 
+    /**
+     * A setting that was never saved is null after normalization. Merging that
+     * null over the defaults would switch default-on settings off, so drop it.
+     */
+    private function withoutNulls(array $values): array
+    {
+        foreach ($values as $key => $value) {
+            if (is_array($value)) {
+                $values[$key] = $this->withoutNulls($value);
+            } elseif ($value === null) {
+                unset($values[$key]);
+            }
+        }
+
+        return $values;
+    }
+
     private function sanitizeFrequency(mixed $frequency): string
     {

site-add-on-watchdog/trunk/src/Scanner.php

@@ -12 +12 @@
 {
     private const REMOTE_CACHE_HOURS = 6;
+    private const NOT_IN_DIRECTORY = 'not_in_directory';
 
     public function __construct(
@@ -229 +230 @@
             return $cached;
         }
+        if ($cached === self::NOT_IN_DIRECTORY) {
+            return false;
+        }
         require_once ABSPATH . 'wp-admin/includes/plugin-install.php';
 
@@ -240 +244 @@
 
         if (is_wp_error($result)) {
+            if ($this->isMissingFromDirectory($result)) {
+                // Premium and custom plugins have no directory entry. That is a
+                // definitive answer, so cache it and keep the WPScan lookup running.
+                set_transient($cacheKey, self::NOT_IN_DIRECTORY, $this->remoteCacheTtl());
+
+                return false;
+            }
+
             // A temporary directory/API failure must not erase a saved risk or
             // suppress retries for the full successful-response cache period.
@@ -248 +260 @@
 
         return $result;
+    }
+
+    /**
+     * WordPress.org answers an unknown slug with this exact, untranslated API
+     * message. Any other error is treated as temporary.
+     */
+    private function isMissingFromDirectory(object $error): bool
+    {
+        return method_exists($error, 'get_error_message')
+            && trim((string) $error->get_error_message()) === 'Plugin not found.';
     }
 

site-add-on-watchdog/trunk/src/Services/NotificationQueue.php

@@ -3 +3 @@
 namespace Watchdog\Services;
 
+use Watchdog\Repository\MigratesLegacyOptions;
 use Watchdog\Version;
 
 class NotificationQueue
 {
+    use MigratesLegacyOptions;
+
     private const PREFIX = Version::PREFIX;
     private const QUEUE_OPTION  = self::PREFIX . '_notification_queue';
@@ -256 +259 @@
     }
 
-    private function getOptionWithLegacy(string $option, string $legacy, mixed $default): mixed
-    {
-        $value = get_option($option, $default);
-        if ($value !== $default) {
-            return $value;
-        }
-
-        $legacyValue = get_option($legacy, $default);
-        if ($legacyValue !== $default) {
-            update_option($option, $legacyValue, false);
-
-            return $legacyValue;
-        }
-
-        return $value;
-    }
-
     private function calculateDelay(int $attempts): int
     {

site-add-on-watchdog/trunk/src/Services/WPScanClient.php

@@ -10 +10 @@
     private const ERROR_TTL_HOURS = 6;
 
-    public function __construct(private readonly ?string $apiKey)
+    /**
+     * @param string|\Closure|null $apiKey The key, or a callback that returns it. The callback
+     *                                     keeps the settings from being read while plugins load.
+     */
+    public function __construct(private string|\Closure|null $apiKey)
     {
     }
@@ -16 +20 @@
     public function isEnabled(): bool
     {
-        return ! empty($this->apiKey);
+        return $this->apiKey() !== '';
+    }
+
+    private function apiKey(): string
+    {
+        if ($this->apiKey instanceof \Closure) {
+            $this->apiKey = (string) ($this->apiKey)();
+        }
+
+        return (string) $this->apiKey;
     }
 
@@ -45 +58 @@
             [
                 'headers' => [
-                    'Authorization' => sprintf('Token token=%s', $this->apiKey),
+                    'Authorization' => sprintf('Token token=%s', $this->apiKey()),
                     'Accept'        => 'application/json',
                 ],

site-add-on-watchdog/trunk/src/Version.php

@@ -5 +5 @@
 final class Version
 {
-    public const NUMBER = '1.9.0';
+    public const NUMBER = '1.10.0';
     public const PREFIX = 'siteadwa';
 }

site-add-on-watchdog/trunk/templates/admin-page.php

@@ -1 +1 @@
 <?php
-/** @var Risk[] $watchdogRisks */
-/** @var string[] $watchdogIgnored */
-/** @var array $watchdogSettings */
-/** @var int $watchdogHistoryRetention */
-/** @var int $watchdogHistoryDisplay */
-/** @var array<int, array{run_at:int, risks:array<int, array<string, mixed>>, risk_count:int}> $watchdogHistoryRecords */
-/** @var array<int, array<string, string>> $watchdogHistoryDownloads */
-/** @var array $watchdogCronStatus */
-/** @var string $watchdogCronEndpoint */
-/** @var string $watchdogCronSecret */
-/** @var string|null $watchdogSettingsError */
-/** @var array|null $watchdogWpScanError */
-/** @var string|false $watchdogScanError */
-/** @var array|null $watchdogLastFailedNotification */
-/** @var array{length:int,next_attempt_at:?int} $watchdogQueueStatus */
-/** @var string $watchdogActionPrefix */
-/** @var array<string, bool> $watchdogNoticeFlags */
-/** @var string $watchdogNotificationResult */
-/** @var string $watchdogFailedNotificationStatus */
-/** @var bool $watchdogCronSecretPersisted */
-/** @var string $watchdogChannelTest */
-/** @var string $watchdogChannelTestStatus */
+/**
+ * Watchdog dashboard.
+ *
+ * @var array<int, array{risk: Risk, vulnerabilities: array<int, array<string, mixed>>, attributes: array<string, string>}> $watchdogRiskRows
+ * @var int $watchdogVulnerabilityCount
+ * @var string[] $watchdogIgnored
+ * @var array $watchdogSettings
+ * @var int $watchdogHistoryRetention
+ * @var int $watchdogHistoryDisplay
+ * @var array<int, array{run_at:int, risks:array<int, array<string, mixed>>, risk_count:int}> $watchdogHistoryRecords
+ * @var array<int, array<string, string>> $watchdogHistoryDownloads
+ * @var int|null $watchdogLastScanAt
+ * @var int|null $watchdogNextScanAt
+ * @var array{cron_disabled: bool, overdue_streak: int} $watchdogCronStatus
+ * @var string $watchdogCronEndpoint
+ * @var string $watchdogCronSecret
+ * @var bool $watchdogCronSecretPersisted
+ * @var string|false $watchdogSettingsError
+ * @var array|false $watchdogWpScanError
+ * @var string|false $watchdogScanError
+ * @var array|null $watchdogLastFailedNotification
+ * @var array{length:int,next_attempt_at:?int} $watchdogQueueStatus
+ * @var string $watchdogActionPrefix
+ * @var array<string, bool> $watchdogNoticeFlags
+ * @var string $watchdogNotificationResult
+ * @var string $watchdogFailedNotificationStatus
+ * @var string $watchdogChannelTest
+ * @var string $watchdogChannelTestStatus
+ * @var string $watchdogRiskSearch
+ * @var string $watchdogRiskSortSelection
+ * @var string $watchdogRiskOrderSelection
+ */
 
 use Watchdog\Models\Risk;
 use Watchdog\TestingMode;
+
 defined('ABSPATH') || exit;
 
-$watchdogActionPrefix = $watchdogActionPrefix ?? \Watchdog\Version::PREFIX;
+$watchdogNotifications = $watchdogSettings['notifications'];
+$watchdogPostUrl       = admin_url('admin-post.php');
+$watchdogDateFormat    = get_option('date_format') . ' ' . get_option('time_format');
+$watchdogNow           = time();
+$watchdogRiskTotal     = count($watchdogRiskRows);
+$watchdogQueueLength   = (int) ($watchdogQueueStatus['length'] ?? 0);
+$watchdogQueueNextAttempt = $watchdogQueueStatus['next_attempt_at'] ?? null;
+$watchdogHasFailedNotification = ! empty($watchdogLastFailedNotification);
+$watchdogIsCronDisabled = ! empty($watchdogCronStatus['cron_disabled']);
+
+$watchdogChannelLabels = [
+    'email'   => __('Email', 'site-add-on-watchdog'),
+    'discord' => __('Discord', 'site-add-on-watchdog'),
+    'slack'   => __('Slack', 'site-add-on-watchdog'),
+    'teams'   => __('Microsoft Teams', 'site-add-on-watchdog'),
+    'webhook' => __('Custom webhook', 'site-add-on-watchdog'),
+];
 $watchdogEnabledChannelCount = 0;
-foreach (['email', 'discord', 'slack', 'teams', 'webhook'] as $watchdogChannelKey) {
-    if (! empty($watchdogSettings['notifications'][$watchdogChannelKey]['enabled'])) {
+foreach (array_keys($watchdogChannelLabels) as $watchdogChannelKey) {
+    if (! empty($watchdogNotifications[$watchdogChannelKey]['enabled'])) {
         $watchdogEnabledChannelCount++;
     }
 }
-$watchdogQueueLength = (int) ($watchdogQueueStatus['length'] ?? 0);
+
 $watchdogFrequencyLabels = [
-    'daily' => __('Daily', 'site-add-on-watchdog'),
-    'weekly' => __('Weekly', 'site-add-on-watchdog'),
+    'daily'   => __('Daily', 'site-add-on-watchdog'),
+    'weekly'  => __('Weekly', 'site-add-on-watchdog'),
     'testing' => __('Testing', 'site-add-on-watchdog'),
-    'manual' => __('Manual', 'site-add-on-watchdog'),
+    'manual'  => __('Manual', 'site-add-on-watchdog'),
 ];
-$watchdogCurrentFrequency = (string) ($watchdogSettings['notifications']['frequency'] ?? 'daily');
-$watchdogFrequencyLabel = $watchdogFrequencyLabels[$watchdogCurrentFrequency]
-    ?? $watchdogFrequencyLabels['daily'];
+$watchdogCurrentFrequency = (string) ($watchdogNotifications['frequency'] ?? 'daily');
+if (! isset($watchdogFrequencyLabels[$watchdogCurrentFrequency])) {
+    $watchdogCurrentFrequency = 'daily';
+}
+
+// Header summary.
+if ($watchdogLastScanAt === null) {
+    $watchdogSummary = __('No scan has run yet. Run a manual scan to create your first report.', 'site-add-on-watchdog');
+} elseif ($watchdogRiskTotal > 0) {
+    $watchdogSummary = sprintf(
+        /* translators: %s: number of plugins. */
+        _n('%s plugin needs attention.', '%s plugins need attention.', $watchdogRiskTotal, 'site-add-on-watchdog'),
+        number_format_i18n($watchdogRiskTotal)
+    );
+} else {
+    $watchdogSummary = __('No risks found in the latest scan.', 'site-add-on-watchdog');
+}
+
+// Overview tiles.
+if ($watchdogLastScanAt === null) {
+    $watchdogRiskTone = 'neutral';
+    $watchdogRiskHint = __('Not scanned yet', 'site-add-on-watchdog');
+} elseif ($watchdogRiskTotal === 0) {
+    $watchdogRiskTone = 'ok';
+    $watchdogRiskHint = __('All clear', 'site-add-on-watchdog');
+} elseif ($watchdogVulnerabilityCount > 0) {
+    $watchdogRiskTone = 'danger';
+    $watchdogRiskHint = sprintf(
+        /* translators: %s: number of vulnerabilities. */
+        _n('%s known vulnerability', '%s known vulnerabilities', $watchdogVulnerabilityCount, 'site-add-on-watchdog'),
+        number_format_i18n($watchdogVulnerabilityCount)
+    );
+} else {
+    $watchdogRiskTone = 'warn';
+    $watchdogRiskHint = __('Updates available', 'site-add-on-watchdog');
+}
+
+if ($watchdogLastScanAt === null) {
+    $watchdogLastScanValue = __('Never', 'site-add-on-watchdog');
+    $watchdogLastScanHint  = __('Run a manual scan', 'site-add-on-watchdog');
+} else {
+    $watchdogLastScanValue = sprintf(
+        /* translators: %s: human-readable time difference, for example "2 hours". */
+        __('%s ago', 'site-add-on-watchdog'),
+        human_time_diff($watchdogLastScanAt, $watchdogNow)
+    );
+    $watchdogLastScanHint = wp_date($watchdogDateFormat, $watchdogLastScanAt);
+}
+
+if ($watchdogCurrentFrequency === 'manual') {
+    $watchdogNextScanValue = __('Manual', 'site-add-on-watchdog');
+    $watchdogNextScanHint  = __('Automatic scans are off', 'site-add-on-watchdog');
+} elseif ($watchdogNextScanAt === null) {
+    $watchdogNextScanValue = __('Not scheduled', 'site-add-on-watchdog');
+    $watchdogNextScanHint  = __('Save the settings to reschedule', 'site-add-on-watchdog');
+} else {
+    $watchdogNextScanValue = $watchdogNextScanAt > $watchdogNow
+        ? sprintf(
+            /* translators: %s: human-readable time difference, for example "2 hours". */
+            __('In %s', 'site-add-on-watchdog'),
+            human_time_diff($watchdogNow, $watchdogNextScanAt)
+        )
+        : __('Due now', 'site-add-on-watchdog');
+    $watchdogNextScanHint = sprintf(
+        /* translators: 1: scan frequency, 2: date and time. */
+        __('%1$s, %2$s', 'site-add-on-watchdog'),
+        $watchdogFrequencyLabels[$watchdogCurrentFrequency],
+        wp_date($watchdogDateFormat, $watchdogNextScanAt)
+    );
+}
+
+$watchdogChannelTone = 'neutral';
+if ($watchdogHasFailedNotification) {
+    $watchdogChannelTone = 'warn';
+    $watchdogChannelHint = __('Last delivery failed', 'site-add-on-watchdog');
+} elseif ($watchdogQueueLength > 0) {
+    $watchdogChannelHint = sprintf(
+        /* translators: %s: number of queued alerts. */
+        _n('%s alert queued', '%s alerts queued', $watchdogQueueLength, 'site-add-on-watchdog'),
+        number_format_i18n($watchdogQueueLength)
+    );
+} elseif ($watchdogEnabledChannelCount === 0) {
+    $watchdogChannelTone = 'warn';
+    $watchdogChannelHint = __('No channel enabled', 'site-add-on-watchdog');
+} else {
+    $watchdogChannelHint = __('No failed deliveries', 'site-add-on-watchdog');
+}
+
+$watchdogTabs = [
+    'watchdog-risks'    => __('Risks', 'site-add-on-watchdog'),
+    'watchdog-history'  => __('History', 'site-add-on-watchdog'),
+    'watchdog-settings' => __('Settings', 'site-add-on-watchdog'),
+    'watchdog-delivery' => __('Delivery', 'site-add-on-watchdog'),
+];
 ?>
-<div class="wrap wp-watchdog-admin">
-    <header class="wp-watchdog-hero">
-        <div class="wp-watchdog-hero__content">
-            <div class="wp-watchdog-hero__eyebrow">
-                <span><?php esc_html_e('Plugin health and security', 'site-add-on-watchdog'); ?></span>
-                <span aria-hidden="true">&middot;</span>
-                <span><?php echo esc_html('v' . \Watchdog\Version::NUMBER); ?></span>
+<div class="wrap wp-watchdog-admin"<?php echo ! empty($watchdogNoticeFlags['scan']) ? ' data-watchdog-initial-tab="watchdog-risks"' : ''; ?>>
+    <header class="wp-watchdog-header">
+        <div class="wp-watchdog-header__brand">
+            <span class="wp-watchdog-header__icon dashicons dashicons-shield" aria-hidden="true"></span>
+            <div>
+                <h1 class="wp-watchdog-header__title">
+                    <?php esc_html_e('Site Add-on Watchdog', 'site-add-on-watchdog'); ?>
+                    <span class="wp-watchdog-header__version"><?php echo esc_html('v' . \Watchdog\Version::NUMBER); ?></span>
+                </h1>
+                <p class="wp-watchdog-header__summary"><?php echo esc_html($watchdogSummary); ?></p>
             </div>
-            <h1 class="wp-watchdog-hero__title">
-                <span class="dashicons dashicons-shield"></span>
-                <?php esc_html_e('Site Add-on Watchdog', 'site-add-on-watchdog'); ?>
-            </h1>
-            <p class="wp-watchdog-hero__description"><?php esc_html_e('Monitor plugin health, review scan history, and verify every alert channel from one focused dashboard.', 'site-add-on-watchdog'); ?></p>
         </div>
         <div class="wp-watchdog-actions">
-            <form method="post" action="<?php echo esc_url(admin_url('admin-post.php')); ?>">
+            <form method="post" action="<?php echo esc_url($watchdogPostUrl); ?>">
+                <?php wp_nonce_field($watchdogActionPrefix . '_send_notifications'); ?>
+                <input type="hidden" name="action" value="<?php echo esc_attr($watchdogActionPrefix . '_send_notifications'); ?>">
+                <button class="button" type="submit">
+                    <span class="dashicons dashicons-megaphone" aria-hidden="true"></span>
+                    <?php esc_html_e('Send notifications now', 'site-add-on-watchdog'); ?>
+                </button>
+            </form>
+            <form method="post" action="<?php echo esc_url($watchdogPostUrl); ?>">
                 <?php wp_nonce_field($watchdogActionPrefix . '_scan'); ?>
                 <input type="hidden" name="action" value="<?php echo esc_attr($watchdogActionPrefix . '_scan'); ?>">
-                <button class="button button-primary button-hero" type="submit">
+                <button class="button button-primary" type="submit">
                     <span class="dashicons dashicons-update" aria-hidden="true"></span>
                     <?php esc_html_e('Run manual scan', 'site-add-on-watchdog'); ?>
                 </button>
             </form>
-            <form method="post" action="<?php echo esc_url(admin_url('admin-post.php')); ?>">
-                <?php wp_nonce_field($watchdogActionPrefix . '_send_notifications'); ?>
-                <input type="hidden" name="action" value="<?php echo esc_attr($watchdogActionPrefix . '_send_notifications'); ?>">
-                <input type="hidden" name="force" value="1" />
-                <button class="button button-secondary button-hero" type="submit">
-                    <span class="dashicons dashicons-megaphone" aria-hidden="true"></span>
-                    <?php esc_html_e('Send notifications now', 'site-add-on-watchdog'); ?>
-                </button>
-            </form>
         </div>
     </header>
 
-    <nav class="wp-watchdog-nav" aria-label="<?php esc_attr_e('Watchdog sections', 'site-add-on-watchdog'); ?>">
-        <a href="#watchdog-risks"><?php esc_html_e('Risks', 'site-add-on-watchdog'); ?></a>
-        <a href="#watchdog-history"><?php esc_html_e('History', 'site-add-on-watchdog'); ?></a>
-        <a href="#watchdog-delivery"><?php esc_html_e('Delivery', 'site-add-on-watchdog'); ?></a>
-        <a href="#watchdog-settings"><?php esc_html_e('Settings', 'site-add-on-watchdog'); ?></a>
-    </nav>
-
-    <section class="wp-watchdog-overview" aria-label="<?php esc_attr_e('Watchdog overview', 'site-add-on-watchdog'); ?>">
-        <a class="wp-watchdog-stat" href="#watchdog-risks">
-            <span class="wp-watchdog-stat__icon dashicons dashicons-shield-alt" aria-hidden="true"></span>
-            <span class="wp-watchdog-stat__value"><?php echo esc_html(number_format_i18n(count($watchdogRisks))); ?></span>
-            <span class="wp-watchdog-stat__label"><?php esc_html_e('Open risks', 'site-add-on-watchdog'); ?></span>
-        </a>
-        <a class="wp-watchdog-stat" href="#watchdog-settings">
-            <span class="wp-watchdog-stat__icon dashicons dashicons-megaphone" aria-hidden="true"></span>
-            <span class="wp-watchdog-stat__value"><?php echo esc_html(number_format_i18n($watchdogEnabledChannelCount)); ?>/5</span>
-            <span class="wp-watchdog-stat__label"><?php esc_html_e('Active channels', 'site-add-on-watchdog'); ?></span>
-        </a>
-        <a class="wp-watchdog-stat" href="#watchdog-delivery">
-            <span class="wp-watchdog-stat__icon dashicons dashicons-controls-repeat" aria-hidden="true"></span>
-            <span class="wp-watchdog-stat__value"><?php echo esc_html(number_format_i18n($watchdogQueueLength)); ?></span>
-            <span class="wp-watchdog-stat__label"><?php esc_html_e('Queued alerts', 'site-add-on-watchdog'); ?></span>
-        </a>
-        <a class="wp-watchdog-stat" href="#watchdog-settings">
-            <span class="wp-watchdog-stat__icon dashicons dashicons-clock" aria-hidden="true"></span>
-            <span class="wp-watchdog-stat__value wp-watchdog-stat__value--text"><?php echo esc_html($watchdogFrequencyLabel); ?></span>
-            <span class="wp-watchdog-stat__label"><?php esc_html_e('Scan schedule', 'site-add-on-watchdog'); ?></span>
-        </a>
-    </section>
+    <hr class="wp-header-end">
 
     <?php $watchdogWebhookError = get_transient($watchdogActionPrefix . '_webhook_error'); ?>
@@ -153 +240 @@
     <?php endif; ?>
 
-    <?php if ($watchdogNotificationResult !== '') : ?>
-        <?php if ($watchdogNotificationResult === 'sent') : ?>
-            <div class="notice notice-success is-dismissible"><p><?php esc_html_e('Notifications were dispatched.', 'site-add-on-watchdog'); ?></p></div>
-        <?php elseif ($watchdogNotificationResult === 'throttled') : ?>
-            <div class="notice notice-warning is-dismissible"><p><?php esc_html_e('Notifications skipped to avoid rapid re-sends. Please wait a moment and try again.', 'site-add-on-watchdog'); ?></p></div>
-        <?php elseif ($watchdogNotificationResult === 'unchanged') : ?>
-            <div class="notice notice-info is-dismissible"><p><?php esc_html_e('No notification changes detected since the last send.', 'site-add-on-watchdog'); ?></p></div>
-        <?php endif; ?>
+    <?php if ($watchdogNotificationResult === 'sent') : ?>
+        <div class="notice notice-success is-dismissible"><p><?php esc_html_e('Notifications were dispatched.', 'site-add-on-watchdog'); ?></p></div>
+    <?php elseif ($watchdogNotificationResult === 'throttled') : ?>
+        <div class="notice notice-warning is-dismissible"><p><?php esc_html_e('Notifications skipped to avoid rapid re-sends. Please wait a moment and try again.', 'site-add-on-watchdog'); ?></p></div>
     <?php endif; ?>
 
-    <?php if ($watchdogFailedNotificationStatus !== '') : ?>
-        <?php if ($watchdogFailedNotificationStatus === 'resent') : ?>
-            <div class="notice notice-success is-dismissible"><p><?php esc_html_e('Queued the captured notification payload for resend.', 'site-add-on-watchdog'); ?></p></div>
-        <?php elseif ($watchdogFailedNotificationStatus === 'missing') : ?>
-            <div class="notice notice-error is-dismissible"><p><?php esc_html_e('No failed notification payload was available to resend.', 'site-add-on-watchdog'); ?></p></div>
-        <?php endif; ?>
+    <?php if ($watchdogFailedNotificationStatus === 'resent') : ?>
+        <div class="notice notice-success is-dismissible"><p><?php esc_html_e('Queued the captured notification payload for resend.', 'site-add-on-watchdog'); ?></p></div>
+    <?php elseif ($watchdogFailedNotificationStatus === 'missing') : ?>
+        <div class="notice notice-error is-dismissible"><p><?php esc_html_e('No failed notification payload was available to resend.', 'site-add-on-watchdog'); ?></p></div>
     <?php endif; ?>
 
     <?php if ($watchdogChannelTest !== '' && $watchdogChannelTestStatus !== '') : ?>
         <?php
-        $watchdogChannelTestLabels = [
-            'email' => __('Email', 'site-add-on-watchdog'),
-            'discord' => __('Discord', 'site-add-on-watchdog'),
-            'slack' => __('Slack', 'site-add-on-watchdog'),
-            'teams' => __('Microsoft Teams', 'site-add-on-watchdog'),
-            'webhook' => __('Custom webhook', 'site-add-on-watchdog'),
-        ];
-        $watchdogChannelTestLabel = $watchdogChannelTestLabels[$watchdogChannelTest]
+        $watchdogChannelTestLabel = $watchdogChannelLabels[$watchdogChannelTest]
             ?? __('Notification channel', 'site-add-on-watchdog');
         ?>
@@ -222 +296 @@
                 printf(
                     /* translators: %s: notification channel name. */
-                    esc_html__('%s test delivery failed. Review Delivery health for details.', 'site-add-on-watchdog'),
+                    esc_html__('%s test delivery failed. Open the Delivery tab for details.', 'site-add-on-watchdog'),
                     esc_html($watchdogChannelTestLabel)
                 );
@@ -230 +304 @@
     <?php endif; ?>
 
-    <div class="wp-watchdog-grid">
-        <div class="wp-watchdog-surface" id="watchdog-delivery">
-            <div class="wp-watchdog-section-title">
-                <span class="dashicons dashicons-heart" aria-hidden="true"></span>
-                <?php esc_html_e('Delivery health', 'site-add-on-watchdog'); ?>
+    <section class="wp-watchdog-overview" aria-label="<?php esc_attr_e('Watchdog overview', 'site-add-on-watchdog'); ?>">
+        <a class="wp-watchdog-stat wp-watchdog-stat--<?php echo esc_attr($watchdogRiskTone); ?>" href="#watchdog-risks">
+            <span class="wp-watchdog-stat__icon dashicons dashicons-shield-alt" aria-hidden="true"></span>
+            <span class="wp-watchdog-stat__label"><?php esc_html_e('Open risks', 'site-add-on-watchdog'); ?></span>
+            <span class="wp-watchdog-stat__value"><?php echo esc_html(number_format_i18n($watchdogRiskTotal)); ?></span>
+            <span class="wp-watchdog-stat__hint"><?php echo esc_html($watchdogRiskHint); ?></span>
+        </a>
+        <a class="wp-watchdog-stat" href="#watchdog-history">
+            <span class="wp-watchdog-stat__icon dashicons dashicons-backup" aria-hidden="true"></span>
+            <span class="wp-watchdog-stat__label"><?php esc_html_e('Last scan', 'site-add-on-watchdog'); ?></span>
+            <span class="wp-watchdog-stat__value wp-watchdog-stat__value--text"><?php echo esc_html($watchdogLastScanValue); ?></span>
+            <span class="wp-watchdog-stat__hint"><?php echo esc_html($watchdogLastScanHint); ?></span>
+        </a>
+        <a class="wp-watchdog-stat" href="#watchdog-settings">
+            <span class="wp-watchdog-stat__icon dashicons dashicons-clock" aria-hidden="true"></span>
+            <span class="wp-watchdog-stat__label"><?php esc_html_e('Next scan', 'site-add-on-watchdog'); ?></span>
+            <span class="wp-watchdog-stat__value wp-watchdog-stat__value--text"><?php echo esc_html($watchdogNextScanValue); ?></span>
+            <span class="wp-watchdog-stat__hint"><?php echo esc_html($watchdogNextScanHint); ?></span>
+        </a>
+        <a class="wp-watchdog-stat wp-watchdog-stat--<?php echo esc_attr($watchdogChannelTone); ?>" href="#watchdog-delivery">
+            <span class="wp-watchdog-stat__icon dashicons dashicons-megaphone" aria-hidden="true"></span>
+            <span class="wp-watchdog-stat__label"><?php esc_html_e('Active channels', 'site-add-on-watchdog'); ?></span>
+            <span class="wp-watchdog-stat__value"><?php echo esc_html(number_format_i18n($watchdogEnabledChannelCount) . '/' . number_format_i18n(count($watchdogChannelLabels))); ?></span>
+            <span class="wp-watchdog-stat__hint"><?php echo esc_html($watchdogChannelHint); ?></span>
+        </a>
+    </section>
+
+    <nav class="wp-watchdog-tabs" aria-label="<?php esc_attr_e('Watchdog sections', 'site-add-on-watchdog'); ?>">
+        <?php foreach ($watchdogTabs as $watchdogTabId => $watchdogTabLabel) : ?>
+            <a class="wp-watchdog-tabs__tab" href="#<?php echo esc_attr($watchdogTabId); ?>" data-watchdog-tab="<?php echo esc_attr($watchdogTabId); ?>">
+                <?php echo esc_html($watchdogTabLabel); ?>
+                <?php if ($watchdogTabId === 'watchdog-risks' && $watchdogRiskTotal > 0) : ?>
+                    <span class="wp-watchdog-tabs__count"><?php echo esc_html(number_format_i18n($watchdogRiskTotal)); ?></span>
+                <?php elseif ($watchdogTabId === 'watchdog-delivery' && ($watchdogHasFailedNotification || $watchdogQueueLength > 0)) : ?>
+                    <span class="wp-watchdog-tabs__dot" aria-hidden="true"></span>
+                    <span class="screen-reader-text"><?php esc_html_e('Needs attention', 'site-add-on-watchdog'); ?></span>
+                <?php endif; ?>
+            </a>
+        <?php endforeach; ?>
+    </nav>
+
+    <section class="wp-watchdog-panel" id="watchdog-risks" data-watchdog-panel>
+        <div class="wp-watchdog-card">
+            <div class="wp-watchdog-card__header">
+                <div>
+                    <h2 class="wp-watchdog-card__title"><?php esc_html_e('Potential Risks', 'site-add-on-watchdog'); ?></h2>
+                    <p class="wp-watchdog-card__description"><?php esc_html_e('Plugins with a newer release, a security note in the latest changelog, or a known vulnerability.', 'site-add-on-watchdog'); ?></p>
+                </div>
+                <?php if ($watchdogRiskTotal > 0) : ?>
+                    <a class="button" href="<?php echo esc_url(admin_url('update-core.php')); ?>"><?php esc_html_e('Review updates', 'site-add-on-watchdog'); ?></a>
+                <?php endif; ?>
             </div>
-                <?php $watchdogIsCronDisabled = ! empty($watchdogCronStatus['cron_disabled']); ?>
+
+            <?php if ($watchdogRiskTotal === 0) : ?>
+                <div class="wp-watchdog-empty">
+                    <span class="wp-watchdog-empty__icon dashicons <?php echo $watchdogLastScanAt === null ? 'dashicons-search' : 'dashicons-yes-alt'; ?>" aria-hidden="true"></span>
+                    <?php if ($watchdogLastScanAt === null) : ?>
+                        <p class="wp-watchdog-empty__title"><?php esc_html_e('No scan results yet', 'site-add-on-watchdog'); ?></p>
+                        <p class="wp-watchdog-empty__text"><?php esc_html_e('Run a manual scan to check your plugins now.', 'site-add-on-watchdog'); ?></p>
+                    <?php else : ?>
+                        <p class="wp-watchdog-empty__title"><?php esc_html_e('No risks detected.', 'site-add-on-watchdog'); ?></p>
+                        <p class="wp-watchdog-empty__text"><?php esc_html_e('Nothing was flagged in the latest scan.', 'site-add-on-watchdog'); ?></p>
+                    <?php endif; ?>
+                </div>
+            <?php else : ?>
+                <?php
+                $watchdogColumns = [
+                    'plugin'  => __('Plugin', 'site-add-on-watchdog'),
+                    'local'   => __('Local Version', 'site-add-on-watchdog'),
+                    'remote'  => __('Directory Version', 'site-add-on-watchdog'),
+                    'reasons' => __('Reasons', 'site-add-on-watchdog'),
+                    'actions' => __('Actions', 'site-add-on-watchdog'),
+                ];
+                $watchdogSortOptions = [
+                    'plugin'      => ['sortPlugin', 'asc', __('Plugin name', 'site-add-on-watchdog')],
+                    'risk_count'  => ['sortRiskCount', 'desc', __('Risk count', 'site-add-on-watchdog')],
+                    'version_gap' => ['sortVersionGap', 'desc', __('Version gap', 'site-add-on-watchdog')],
+                    'local'       => ['sortLocal', 'desc', __('Local version', 'site-add-on-watchdog')],
+                    'remote'      => ['sortRemote', 'desc', __('Directory version', 'site-add-on-watchdog')],
+                    'reasons'     => ['sortReasons', 'asc', __('Reasons', 'site-add-on-watchdog')],
+                ];
+                $watchdogSortableColumns = [
+                    'plugin'  => ['sortPlugin', 'asc'],
+                    'local'   => ['sortLocal', 'desc'],
+                    'remote'  => ['sortRemote', 'desc'],
+                    'reasons' => ['sortReasons', 'asc'],
+                ];
+                $watchdogPerPage = max(1, (int) apply_filters('site_add_on_watchdog_admin_risks_per_page', 10));
+                ?>
+                <div class="wp-watchdog-risk-table" data-wp-watchdog-table data-per-page="<?php echo esc_attr((string) $watchdogPerPage); ?>">
+                    <div class="wp-watchdog-risk-table__controls">
+                        <form method="get" class="wp-watchdog-risk-table__filter-form">
+                            <input type="hidden" name="page" value="site-add-on-watchdog" />
+                            <label class="wp-watchdog-risk-table__search">
+                                <span class="screen-reader-text"><?php esc_html_e('Search risks', 'site-add-on-watchdog'); ?></span>
+                                <input
+                                    type="search"
+                                    name="risk_search"
+                                    value="<?php echo esc_attr($watchdogRiskSearch); ?>"
+                                    placeholder="<?php esc_attr_e('Search plugin or reason', 'site-add-on-watchdog'); ?>"
+                                    data-risk-search
+                                />
+                            </label>
+                            <label class="screen-reader-text" for="wp-watchdog-risk-sort"><?php esc_html_e('Sort risks by', 'site-add-on-watchdog'); ?></label>
+                            <select id="wp-watchdog-risk-sort" name="risk_sort" data-risk-sort>
+                                <?php foreach ($watchdogSortOptions as $watchdogSortValue => [$watchdogSortKey, $watchdogSortDefault, $watchdogSortLabel]) : ?>
+                                    <option
+                                        value="<?php echo esc_attr($watchdogSortValue); ?>"
+                                        data-sort-key="<?php echo esc_attr($watchdogSortKey); ?>"
+                                        data-sort-default="<?php echo esc_attr($watchdogSortDefault); ?>"
+                                        <?php selected($watchdogRiskSortSelection, $watchdogSortValue); ?>
+                                    ><?php echo esc_html($watchdogSortLabel); ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <label class="screen-reader-text" for="wp-watchdog-risk-order"><?php esc_html_e('Sort order', 'site-add-on-watchdog'); ?></label>
+                            <select id="wp-watchdog-risk-order" name="risk_order" data-risk-order>
+                                <option value="asc" <?php selected($watchdogRiskOrderSelection, 'asc'); ?>><?php esc_html_e('Ascending', 'site-add-on-watchdog'); ?></option>
+                                <option value="desc" <?php selected($watchdogRiskOrderSelection, 'desc'); ?>><?php esc_html_e('Descending', 'site-add-on-watchdog'); ?></option>
+                            </select>
+                            <button class="button wp-watchdog-no-js" type="submit"><?php esc_html_e('Apply', 'site-add-on-watchdog'); ?></button>
+                        </form>
+                        <div class="wp-watchdog-risk-table__pagination" data-pagination>
+                            <button type="button" class="button" data-action="prev" aria-label="<?php esc_attr_e('Previous page', 'site-add-on-watchdog'); ?>" disabled>&lsaquo;</button>
+                            <span class="wp-watchdog-risk-table__page-status" data-page-status aria-live="polite"></span>
+                            <button type="button" class="button" data-action="next" aria-label="<?php esc_attr_e('Next page', 'site-add-on-watchdog'); ?>" disabled>&rsaquo;</button>
+                        </div>
+                    </div>
+                    <div class="wp-watchdog-risk-table__scroll">
+                        <table class="widefat striped">
+                            <thead>
+                            <tr>
+                                <?php foreach ($watchdogSortableColumns as $watchdogColumnKey => [$watchdogSortKey, $watchdogSortDefault]) : ?>
+                                    <th scope="col" class="wp-watchdog-risk-table__col-<?php echo esc_attr($watchdogColumnKey); ?>">
+                                        <button
+                                            type="button"
+                                            class="wp-watchdog-risk-table__sort"
+                                            data-sort-key="<?php echo esc_attr($watchdogSortKey); ?>"
+                                            data-sort-default="<?php echo esc_attr($watchdogSortDefault); ?>"
+                                            <?php echo $watchdogColumnKey === 'plugin' ? 'data-sort-initial' : ''; ?>
+                                            aria-sort="none"
+                                        >
+                                            <?php echo esc_html($watchdogColumns[$watchdogColumnKey]); ?>
+                                            <span class="wp-watchdog-risk-table__sort-indicator" aria-hidden="true"></span>
+                                        </button>
+                                    </th>
+                                <?php endforeach; ?>
+                                <th scope="col" class="wp-watchdog-risk-table__col-actions"><?php echo esc_html($watchdogColumns['actions']); ?></th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <?php foreach ($watchdogRiskRows as $watchdogRiskRow) : ?>
+                                <?php
+                                $watchdogRisk = $watchdogRiskRow['risk'];
+                                $watchdogVulnerabilities = $watchdogRiskRow['vulnerabilities'];
+                                ?>
+                                <tr
+                                    <?php foreach ($watchdogRiskRow['attributes'] as $watchdogAttributeName => $watchdogAttributeValue) : ?>
+                                        <?php echo esc_attr($watchdogAttributeName); ?>="<?php echo esc_attr($watchdogAttributeValue); ?>"
+                                    <?php endforeach; ?>
+                                >
+                                    <td data-column="plugin" data-column-label="<?php echo esc_attr($watchdogColumns['plugin']); ?>">
+                                        <strong><?php echo esc_html($watchdogRisk->pluginName); ?></strong>
+                                    </td>
+                                    <td data-column="local" data-column-label="<?php echo esc_attr($watchdogColumns['local']); ?>">
+                                        <?php echo esc_html($watchdogRisk->localVersion); ?>
+                                    </td>
+                                    <td data-column="remote" data-column-label="<?php echo esc_attr($watchdogColumns['remote']); ?>">
+                                        <?php echo esc_html($watchdogRisk->remoteVersion ?? __('N/A', 'site-add-on-watchdog')); ?>
+                                    </td>
+                                    <td data-column="reasons" data-column-label="<?php echo esc_attr($watchdogColumns['reasons']); ?>">
+                                        <ul class="wp-watchdog-reasons">
+                                            <?php foreach ($watchdogRisk->reasons as $watchdogReason) : ?>
+                                                <li><?php echo esc_html($watchdogReason); ?></li>
+                                            <?php endforeach; ?>
+                                        </ul>
+                                        <?php if ($watchdogVulnerabilities !== []) : ?>
+                                            <ul class="wp-watchdog-vulnerabilities" aria-label="<?php esc_attr_e('WPScan vulnerabilities:', 'site-add-on-watchdog'); ?>">
+                                                <?php foreach ($watchdogVulnerabilities as $watchdogVuln) : ?>
+                                                    <li>
+                                                        <?php if (! empty($watchdogVuln['severity']) && ! empty($watchdogVuln['severity_label'])) : ?>
+                                                            <span class="wp-watchdog-severity wp-watchdog-severity--<?php echo esc_attr(sanitize_html_class((string) $watchdogVuln['severity'])); ?>"><?php echo esc_html($watchdogVuln['severity_label']); ?></span>
+                                                        <?php endif; ?>
+                                                        <?php if (! empty($watchdogVuln['title'])) : ?>
+                                                            <span class="wp-watchdog-vulnerability__title"><?php echo esc_html($watchdogVuln['title']); ?></span>
+                                                        <?php endif; ?>
+                                                        <?php if (! empty($watchdogVuln['cve'])) : ?>
+                                                            <span class="wp-watchdog-vulnerability__meta"><?php echo esc_html($watchdogVuln['cve']); ?></span>
+                                                        <?php endif; ?>
+                                                        <?php if (! empty($watchdogVuln['fixed_in'])) : ?>
+                                                            <span class="wp-watchdog-vulnerability__meta">
+                                                                <?php
+                                                                printf(
+                                                                    /* translators: %s: plugin version number. */
+                                                                    esc_html__('Fixed in %s', 'site-add-on-watchdog'),
+                                                                    esc_html($watchdogVuln['fixed_in'])
+                                                                );
+                                                                ?>
+                                                            </span>
+                                                        <?php endif; ?>
+                                                    </li>
+                                                <?php endforeach; ?>
+                                            </ul>
+                                        <?php endif; ?>
+                                    </td>
+                                    <td data-column="actions" data-column-label="<?php echo esc_attr($watchdogColumns['actions']); ?>">
+                                        <form method="post" action="<?php echo esc_url($watchdogPostUrl); ?>">
+                                            <?php wp_nonce_field($watchdogActionPrefix . '_ignore'); ?>
+                                            <input type="hidden" name="action" value="<?php echo esc_attr($watchdogActionPrefix . '_ignore'); ?>">
+                                            <input type="hidden" name="plugin_slug" value="<?php echo esc_attr($watchdogRisk->pluginSlug); ?>">
+                                            <button class="button button-small" type="submit"><?php esc_html_e('Ignore', 'site-add-on-watchdog'); ?></button>
+                                        </form>
+                                    </td>
+                                </tr>
+                            <?php endforeach; ?>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            <?php endif; ?>
+        </div>
+
+        <div class="wp-watchdog-card" id="watchdog-ignored">
+            <h2 class="wp-watchdog-card__title"><?php esc_html_e('Ignored Plugins', 'site-add-on-watchdog'); ?></h2>
+            <?php if (empty($watchdogIgnored)) : ?>
+                <p class="wp-watchdog-card__description"><?php esc_html_e('No plugins are being ignored.', 'site-add-on-watchdog'); ?></p>
+            <?php else : ?>
+                <p class="wp-watchdog-card__description"><?php esc_html_e('Ignored plugins are skipped by every scan. Select one to watch it again.', 'site-add-on-watchdog'); ?></p>
+                <ul class="wp-watchdog-chips">
+                    <?php foreach ($watchdogIgnored as $watchdogIgnoredSlug) : ?>
+                        <li>
+                            <form method="post" action="<?php echo esc_url($watchdogPostUrl); ?>">
+                                <?php wp_nonce_field($watchdogActionPrefix . '_unignore'); ?>
+                                <input type="hidden" name="action" value="<?php echo esc_attr($watchdogActionPrefix . '_unignore'); ?>">
+                                <input type="hidden" name="plugin_slug" value="<?php echo esc_attr($watchdogIgnoredSlug); ?>">
+                                <button class="wp-watchdog-chip" type="submit">
+                                    <?php echo esc_html($watchdogIgnoredSlug); ?>
+                                    <span class="dashicons dashicons-no-alt" aria-hidden="true"></span>
+                                    <span class="screen-reader-text"><?php esc_html_e('Stop ignoring', 'site-add-on-watchdog'); ?></span>
+                                </button>
+                            </form>
+                        </li>
+                    <?php endforeach; ?>
+                </ul>
+            <?php endif; ?>
+        </div>
+    </section>
+
+    <section class="wp-watchdog-panel" id="watchdog-history" data-watchdog-panel>
+        <div class="wp-watchdog-card">
+            <h2 class="wp-watchdog-card__title"><?php esc_html_e('Scan History', 'site-add-on-watchdog'); ?></h2>
+            <?php require __DIR__ . '/history.php'; ?>
+        </div>
+    </section>
+
+    <section class="wp-watchdog-panel" id="watchdog-settings" data-watchdog-panel>
+        <form class="wp-watchdog-settings-form" method="post" action="<?php echo esc_url($watchdogPostUrl); ?>">
+            <?php wp_nonce_field($watchdogActionPrefix . '_settings'); ?>
+            <input type="hidden" name="action" value="<?php echo esc_attr($watchdogActionPrefix . '_save_settings'); ?>">
+
+            <div class="wp-watchdog-card">
+                <h2 class="wp-watchdog-card__title"><?php esc_html_e('Scanning', 'site-add-on-watchdog'); ?></h2>
+                <?php
+                $watchdogDefaultFrequencyMessage = __('Choose how often the automatic scan should run.', 'site-add-on-watchdog');
+                $watchdogTestingFrequencyMessage = sprintf(
+                    /* translators: 1: interval minutes, 2: duration hours */
+                    __('Testing mode sends notifications every %1$d minutes to all configured channels and automatically switches back to daily scans after %2$d hours.', 'site-add-on-watchdog'),
+                    TestingMode::INTERVAL_MINUTES,
+                    TestingMode::DURATION_HOURS
+                );
+                $watchdogIsTestingFrequency = $watchdogCurrentFrequency === 'testing';
+                $watchdogTestingExpiresAt   = (int) ($watchdogNotifications['testing_expires_at'] ?? 0);
+                $watchdogDailyTime          = (string) ($watchdogNotifications['daily_time'] ?? '08:00');
+                $watchdogWeeklyDay          = (int) ($watchdogNotifications['weekly_day'] ?? 1);
+                $watchdogWeeklyTime         = (string) ($watchdogNotifications['weekly_time'] ?? '08:00');
+                $watchdogWeekdays           = [
+                    1 => __('Monday', 'site-add-on-watchdog'),
+                    2 => __('Tuesday', 'site-add-on-watchdog'),
+                    3 => __('Wednesday', 'site-add-on-watchdog'),
+                    4 => __('Thursday', 'site-add-on-watchdog'),
+                    5 => __('Friday', 'site-add-on-watchdog'),
+                    6 => __('Saturday', 'site-add-on-watchdog'),
+                    7 => __('Sunday', 'site-add-on-watchdog'),
+                ];
+                ?>
+                <div class="wp-watchdog-field">
+                    <label class="wp-watchdog-field__label" for="wp-watchdog-notification-frequency"><?php esc_html_e('Scan frequency', 'site-add-on-watchdog'); ?></label>
+                    <div class="wp-watchdog-field__control">
+                        <select id="wp-watchdog-notification-frequency" name="settings[notifications][frequency]">
+                            <option value="daily" <?php selected($watchdogCurrentFrequency, 'daily'); ?>><?php esc_html_e('Daily', 'site-add-on-watchdog'); ?></option>
+                            <option value="weekly" <?php selected($watchdogCurrentFrequency, 'weekly'); ?>><?php esc_html_e('Weekly', 'site-add-on-watchdog'); ?></option>
+                            <option value="testing" <?php selected($watchdogCurrentFrequency, 'testing'); ?>>
+                                <?php
+                                printf(
+                                    /* translators: %d: interval minutes */
+                                    esc_html__('Testing (every %d minutes)', 'site-add-on-watchdog'),
+                                    (int) TestingMode::INTERVAL_MINUTES
+                                );
+                                ?>
+                            </option>
+                            <option value="manual" <?php selected($watchdogCurrentFrequency, 'manual'); ?>><?php esc_html_e('Manual (no automatic scans)', 'site-add-on-watchdog'); ?></option>
+                        </select>
+                        <p
+                            class="description wp-watchdog-frequency-description<?php echo $watchdogIsTestingFrequency ? ' wp-watchdog-frequency-description--testing' : ''; ?>"
+                            data-watchdog-frequency-description
+                            data-default-message="<?php echo esc_attr($watchdogDefaultFrequencyMessage); ?>"
+                            data-testing-message="<?php echo esc_attr($watchdogTestingFrequencyMessage); ?>"
+                            aria-live="polite"
+                        >
+                            <?php echo esc_html($watchdogIsTestingFrequency ? $watchdogTestingFrequencyMessage : $watchdogDefaultFrequencyMessage); ?>
+                        </p>
+                        <?php if ($watchdogIsTestingFrequency && $watchdogTestingExpiresAt > $watchdogNow) : ?>
+                            <p class="description">
+                                <?php
+                                printf(
+                                    /* translators: 1: datetime, 2: relative time */
+                                    esc_html__('Testing mode will automatically switch back to daily scans on %1$s (%2$s remaining).', 'site-add-on-watchdog'),
+                                    esc_html(wp_date($watchdogDateFormat, $watchdogTestingExpiresAt)),
+                                    esc_html(human_time_diff($watchdogNow, $watchdogTestingExpiresAt))
+                                );
+                                ?>
+                            </p>
+                        <?php endif; ?>
+                    </div>
+                </div>
+                <div data-watchdog-frequency-options>
+                    <div class="wp-watchdog-field" data-watchdog-frequency-target="daily">
+                        <label class="wp-watchdog-field__label" for="wp-watchdog-daily-time"><?php esc_html_e('Daily send time', 'site-add-on-watchdog'); ?></label>
+                        <div class="wp-watchdog-field__control">
+                            <input
+                                id="wp-watchdog-daily-time"
+                                name="settings[notifications][daily_time]"
+                                type="time"
+                                value="<?php echo esc_attr($watchdogDailyTime); ?>"
+                                aria-describedby="wp-watchdog-daily-time-help"
+                            />
+                            <p class="description" id="wp-watchdog-daily-time-help"><?php esc_html_e('Time of day to start the daily scan in the WordPress site timezone.', 'site-add-on-watchdog'); ?></p>
+                        </div>
+                    </div>
+                    <div class="wp-watchdog-field" data-watchdog-frequency-target="weekly">
+                        <label class="wp-watchdog-field__label" for="wp-watchdog-weekly-day"><?php esc_html_e('Weekly send day', 'site-add-on-watchdog'); ?></label>
+                        <div class="wp-watchdog-field__control">
+                            <div class="wp-watchdog-field__inline">
+                                <select id="wp-watchdog-weekly-day" name="settings[notifications][weekly_day]">
+                                    <?php foreach ($watchdogWeekdays as $watchdogWeekdayNumber => $watchdogWeekdayLabel) : ?>
+                                        <option value="<?php echo esc_attr((string) $watchdogWeekdayNumber); ?>" <?php selected($watchdogWeeklyDay, $watchdogWeekdayNumber); ?>><?php echo esc_html($watchdogWeekdayLabel); ?></option>
+                                    <?php endforeach; ?>
+                                </select>
+                                <label class="screen-reader-text" for="wp-watchdog-weekly-time"><?php esc_html_e('Weekly send time', 'site-add-on-watchdog'); ?></label>
+                                <input
+                                    id="wp-watchdog-weekly-time"
+                                    name="settings[notifications][weekly_time]"
+                                    type="time"
+                                    value="<?php echo esc_attr($watchdogWeeklyTime); ?>"
+                                    aria-describedby="wp-watchdog-weekly-time-help"
+                                />
+                            </div>
+                            <p class="description" id="wp-watchdog-weekly-time-help"><?php esc_html_e('Day and time to start the weekly scan in the WordPress site timezone.', 'site-add-on-watchdog'); ?></p>
+                        </div>
+                    </div>
+                </div>
+                <div class="wp-watchdog-field">
+                    <label class="wp-watchdog-field__label" for="wp-watchdog-history-retention"><?php esc_html_e('History retention', 'site-add-on-watchdog'); ?></label>
+                    <div class="wp-watchdog-field__control">
+                        <input
+                            type="number"
+                            id="wp-watchdog-history-retention"
+                            class="small-text"
+                            name="settings[history][retention]"
+                            value="<?php echo esc_attr((string) ($watchdogSettings['history']['retention'] ?? $watchdogHistoryRetention)); ?>"
+                            min="1"
+                            max="15"
+                            step="1"
+                        />
+                        <p class="description"><?php esc_html_e('Number of recent scans to keep available for review and download (maximum 15).', 'site-add-on-watchdog'); ?></p>
+                    </div>
+                </div>
+            </div>
+
+            <?php
+            $watchdogChannels = [
+                'email' => [
+                    'icon'   => 'dashicons-email-alt',
+                    'test'   => __('Save and test email', 'site-add-on-watchdog'),
+                    'fields' => [
+                        'recipients' => ['text', __('Recipients (comma separated)', 'site-add-on-watchdog')],
+                    ],
+                    'notes'  => [
+                        __('Separate addresses with commas, semicolons, or spaces. WordPress administrator accounts are always included.', 'site-add-on-watchdog'),
+                        __('Email uses WordPress mail delivery. Your host must support sending mail, or you must configure an SMTP/mail plugin. Discord and other webhooks do not use this mail configuration.', 'site-add-on-watchdog'),
+                    ],
+                ],
+                'discord' => [
+                    'icon'   => 'dashicons-format-chat',
+                    'test'   => __('Save and test Discord', 'site-add-on-watchdog'),
+                    'fields' => [
+                        'webhook' => ['url', __('Discord webhook URL', 'site-add-on-watchdog')],
+                    ],
+                    'notes'  => [],
+                ],
+                'slack' => [
+                    'icon'   => 'dashicons-admin-comments',
+                    'test'   => __('Save and test Slack', 'site-add-on-watchdog'),
+                    'fields' => [
+                        'webhook' => ['url', __('Slack webhook URL', 'site-add-on-watchdog')],
+                    ],
+                    'notes'  => [],
+                ],
+                'teams' => [
+                    'icon'   => 'dashicons-groups',
+                    'test'   => __('Save and test Teams', 'site-add-on-watchdog'),
+                    'fields' => [
+                        'webhook' => ['url', __('Teams webhook URL', 'site-add-on-watchdog')],
+                    ],
+                    'notes'  => [
+                        __('Supports Microsoft Teams Workflows and existing Incoming Webhook connectors.', 'site-add-on-watchdog'),
+                    ],
+                ],
+                'webhook' => [
+                    'icon'   => 'dashicons-rest-api',
+                    'test'   => __('Save and test webhook', 'site-add-on-watchdog'),
+                    'fields' => [
+                        'url'    => ['url', __('Webhook URL', 'site-add-on-watchdog')],
+                        'secret' => ['password', __('Webhook secret (optional)', 'site-add-on-watchdog')],
+                    ],
+                    'notes'  => [
+                        __('Signs the exact JSON body with HMAC-SHA256 in the X-Watchdog-Signature header. Test messages are marked in the payload.', 'site-add-on-watchdog'),
+                    ],
+                ],
+            ];
+            ?>
+            <div class="wp-watchdog-card">
+                <h2 class="wp-watchdog-card__title"><?php esc_html_e('Notification channels', 'site-add-on-watchdog'); ?></h2>
+                <p class="wp-watchdog-card__description"><?php esc_html_e('Save and test buttons save all settings on this form, then send a test to the selected channel.', 'site-add-on-watchdog'); ?></p>
+                <div class="wp-watchdog-channels">
+                    <?php foreach ($watchdogChannels as $watchdogChannelKey => $watchdogChannel) : ?>
+                        <?php
+                        $watchdogChannelSettings = is_array($watchdogNotifications[$watchdogChannelKey] ?? null)
+                            ? $watchdogNotifications[$watchdogChannelKey]
+                            : [];
+                        $watchdogChannelName = 'settings[notifications][' . $watchdogChannelKey . ']';
+                        ?>
+                        <div class="wp-watchdog-channel" data-watchdog-notification>
+                            <div class="wp-watchdog-channel__header">
+                                <span class="wp-watchdog-channel__icon dashicons <?php echo esc_attr($watchdogChannel['icon']); ?>" aria-hidden="true"></span>
+                                <h3 class="wp-watchdog-channel__title"><?php echo esc_html($watchdogChannelLabels[$watchdogChannelKey]); ?></h3>
+                                <label class="wp-watchdog-switch">
+                                    <input
+                                        type="checkbox"
+                                        name="<?php echo esc_attr($watchdogChannelName . '[enabled]'); ?>"
+                                        <?php checked(! empty($watchdogChannelSettings['enabled'])); ?>
+                                        data-watchdog-toggle
+                                    />
+                                    <span
+                                        class="wp-watchdog-switch__state"
+                                        data-on="<?php esc_attr_e('On', 'site-add-on-watchdog'); ?>"
+                                        data-off="<?php esc_attr_e('Off', 'site-add-on-watchdog'); ?>"
+                                        aria-hidden="true"
+                                    ></span>
+                                    <span class="screen-reader-text">
+                                        <?php
+                                        printf(
+                                            /* translators: %s: notification channel name. */
+                                            esc_html__('Enable %s notifications', 'site-add-on-watchdog'),
+                                            esc_html($watchdogChannelLabels[$watchdogChannelKey])
+                                        );
+                                        ?>
+                                    </span>
+                                </label>
+                            </div>
+                            <div class="wp-watchdog-channel__body" data-watchdog-fields>
+                                <?php foreach ($watchdogChannel['fields'] as $watchdogFieldKey => [$watchdogFieldType, $watchdogFieldLabel]) : ?>
+                                    <?php $watchdogFieldId = 'wp-watchdog-' . $watchdogChannelKey . '-' . $watchdogFieldKey; ?>
+                                    <p class="wp-watchdog-channel__field">
+                                        <label for="<?php echo esc_attr($watchdogFieldId); ?>"><?php echo esc_html($watchdogFieldLabel); ?></label>
+                                        <input
+                                            type="<?php echo esc_attr($watchdogFieldType); ?>"
+                                            id="<?php echo esc_attr($watchdogFieldId); ?>"
+                                            class="regular-text"
+                                            name="<?php echo esc_attr($watchdogChannelName . '[' . $watchdogFieldKey . ']'); ?>"
+                                            value="<?php echo esc_attr((string) ($watchdogChannelSettings[$watchdogFieldKey] ?? '')); ?>"
+                                            <?php echo $watchdogFieldType === 'password' ? 'autocomplete="new-password"' : ''; ?>
+                                        />
+                                    </p>
+                                <?php endforeach; ?>
+                                <?php foreach ($watchdogChannel['notes'] as $watchdogChannelNote) : ?>
+                                    <p class="description"><?php echo esc_html($watchdogChannelNote); ?></p>
+                                <?php endforeach; ?>
+                                <p class="wp-watchdog-channel__actions">
+                                    <button class="button" type="submit" name="test_channel" value="<?php echo esc_attr($watchdogChannelKey); ?>"><?php echo esc_html($watchdogChannel['test']); ?></button>
+                                </p>
+                            </div>
+                        </div>
+                    <?php endforeach; ?>
+                </div>
+            </div>
+
+            <div class="wp-watchdog-card">
+                <h2 class="wp-watchdog-card__title"><?php esc_html_e('Vulnerability data', 'site-add-on-watchdog'); ?></h2>
+                <div class="wp-watchdog-field">
+                    <label class="wp-watchdog-field__label" for="wp-watchdog-wpscan-api-key"><?php esc_html_e('WPScan API key', 'site-add-on-watchdog'); ?></label>
+                    <div class="wp-watchdog-field__control">
+                        <input
+                            type="password"
+                            id="wp-watchdog-wpscan-api-key"
+                            class="regular-text"
+                            name="settings[notifications][wpscan_api_key]"
+                            value="<?php echo esc_attr((string) ($watchdogNotifications['wpscan_api_key'] ?? '')); ?>"
+                            autocomplete="new-password"
+                        />
+                        <p class="description"><?php esc_html_e('Optional. Provide your own WPScan API key to enrich vulnerability reports.', 'site-add-on-watchdog'); ?></p>
+                    </div>
+                </div>
+            </div>
+
+            <p class="wp-watchdog-settings-form__submit">
+                <button class="button button-primary" type="submit"><?php esc_html_e('Save settings', 'site-add-on-watchdog'); ?></button>
+            </p>
+        </form>
+    </section>
+
+    <section class="wp-watchdog-panel" id="watchdog-delivery" data-watchdog-panel>
+        <div class="wp-watchdog-card">
+            <div class="wp-watchdog-card__header">
+                <h2 class="wp-watchdog-card__title"><?php esc_html_e('Scheduler', 'site-add-on-watchdog'); ?></h2>
+                <?php if ($watchdogIsCronDisabled) : ?>
+                    <span class="wp-watchdog-badge wp-watchdog-badge--warn"><?php esc_html_e('WP-Cron disabled', 'site-add-on-watchdog'); ?></span>
+                <?php else : ?>
+                    <span class="wp-watchdog-badge wp-watchdog-badge--ok"><?php esc_html_e('WP-Cron enabled', 'site-add-on-watchdog'); ?></span>
+                <?php endif; ?>
+            </div>
             <?php if ($watchdogIsCronDisabled) : ?>
-                <p class="wp-watchdog-muted"><?php esc_html_e('WP-Cron appears disabled. Use a real cron job or the server endpoint below to keep scans running.', 'site-add-on-watchdog'); ?></p>
-                <form class="wp-watchdog-block-action" method="post" action="<?php echo esc_url(admin_url('admin-post.php')); ?>">
-                    <?php wp_nonce_field($watchdogActionPrefix . '_send_notifications'); ?>
-                    <input type="hidden" name="action" value="<?php echo esc_attr($watchdogActionPrefix . '_send_notifications'); ?>">
-                    <input type="hidden" name="force" value="1" />
-                    <input type="hidden" name="ignore_throttle" value="1" />
-                    <button class="button button-primary" type="submit">
-                        <span class="dashicons dashicons-controls-repeat" aria-hidden="true"></span>
-                        <?php esc_html_e('Retry notifications', 'site-add-on-watchdog'); ?>
-                    </button>
-                </form>
+                <p class="wp-watchdog-card__description"><?php esc_html_e('WP-Cron appears disabled. Use a real cron job or the server endpoint below to keep scans running.', 'site-add-on-watchdog'); ?></p>
             <?php else : ?>
-                <p class="wp-watchdog-muted"><?php esc_html_e('WP-Cron is enabled. Scheduled tasks depend on site traffic or a server cron job.', 'site-add-on-watchdog'); ?></p>
+                <p class="wp-watchdog-card__description"><?php esc_html_e('WP-Cron is enabled. Scheduled tasks depend on site traffic or a server cron job.', 'site-add-on-watchdog'); ?></p>
             <?php endif; ?>
-            <div class="wp-watchdog-divider"></div>
-            <p class="wp-watchdog-muted wp-watchdog-endpoint">
-                <strong><?php esc_html_e('Server cron endpoint:', 'site-add-on-watchdog'); ?></strong><br />
-                <code><?php echo esc_html($watchdogCronEndpoint); ?></code>
-            </p>
-            <?php if ($watchdogCronSecretPersisted) : ?>
-                <p class="wp-watchdog-muted wp-watchdog-endpoint">
-                    <strong><?php esc_html_e('Generated Cron secret:', 'site-add-on-watchdog'); ?></strong><br />
-                    <code><?php echo esc_html($watchdogCronSecret); ?></code>
-                </p>
-                <p class="wp-watchdog-muted wp-watchdog-endpoint">
-                    <strong><?php esc_html_e('Authenticated command:', 'site-add-on-watchdog'); ?></strong><br />
-                    <code><?php echo esc_html(sprintf('curl -X POST -H "X-Watchdog-Cron-Key: %s" "%s"', $watchdogCronSecret, $watchdogCronEndpoint)); ?></code>
-                </p>
-                <p class="wp-watchdog-muted"><?php esc_html_e('Use POST and keep the generated secret private. The header-authenticated request can trigger scans or notification retries even when wp-cron is disabled.', 'site-add-on-watchdog'); ?></p>
-            <?php endif; ?>
-            <div class="wp-watchdog-divider"></div>
-            <div>
-                <p class="wp-watchdog-muted wp-watchdog-subheading"><strong><?php esc_html_e('Queue status', 'site-add-on-watchdog'); ?></strong></p>
-                <?php
-                $watchdogQueueNextAttempt = $watchdogQueueStatus['next_attempt_at'] ?? null;
-                ?>
-                <p class="wp-watchdog-muted">
-                    <?php
-                    printf(
-                        /* translators: %d: number of queued jobs. */
-                        esc_html__('Queued jobs: %d', 'site-add-on-watchdog'),
-                        esc_html(number_format_i18n($watchdogQueueLength))
-                    );
-                    ?>
-                </p>
+
+            <details class="wp-watchdog-details">
+                <summary><?php esc_html_e('Trigger scans from a server cron job', 'site-add-on-watchdog'); ?></summary>
+                <div class="wp-watchdog-details__body">
+                    <div class="wp-watchdog-copy">
+                        <span class="wp-watchdog-copy__label"><?php esc_html_e('Server cron endpoint:', 'site-add-on-watchdog'); ?></span>
+                        <code id="wp-watchdog-cron-endpoint"><?php echo esc_html($watchdogCronEndpoint); ?></code>
+                        <button type="button" class="button button-small" data-watchdog-copy="wp-watchdog-cron-endpoint" hidden><?php esc_html_e('Copy', 'site-add-on-watchdog'); ?></button>
+                    </div>
+                    <?php if ($watchdogCronSecretPersisted) : ?>
+                        <div class="wp-watchdog-copy">
+                            <span class="wp-watchdog-copy__label"><?php esc_html_e('Generated Cron secret:', 'site-add-on-watchdog'); ?></span>
+                            <code id="wp-watchdog-cron-secret"><?php echo esc_html($watchdogCronSecret); ?></code>
+                            <button type="button" class="button button-small" data-watchdog-copy="wp-watchdog-cron-secret" hidden><?php esc_html_e('Copy', 'site-add-on-watchdog'); ?></button>
+                        </div>
+                        <div class="wp-watchdog-copy">
+                            <span class="wp-watchdog-copy__label"><?php esc_html_e('Authenticated command:', 'site-add-on-watchdog'); ?></span>
+                            <code id="wp-watchdog-cron-command"><?php echo esc_html(sprintf('curl -X POST -H "X-Watchdog-Cron-Key: %s" "%s"', $watchdogCronSecret, $watchdogCronEndpoint)); ?></code>
+                            <button type="button" class="button button-small" data-watchdog-copy="wp-watchdog-cron-command" hidden><?php esc_html_e('Copy', 'site-add-on-watchdog'); ?></button>
+                        </div>
+                        <p class="description"><?php esc_html_e('Use POST and keep the generated secret private. The header-authenticated request can trigger scans or notification retries even when wp-cron is disabled.', 'site-add-on-watchdog'); ?></p>
+                    <?php endif; ?>
+                </div>
+            </details>
+        </div>
+
+        <div class="wp-watchdog-card-grid">
+            <div class="wp-watchdog-card">
+                <div class="wp-watchdog-card__header">
+                    <h2 class="wp-watchdog-card__title"><?php esc_html_e('Queue status', 'site-add-on-watchdog'); ?></h2>
+                    <span class="wp-watchdog-badge <?php echo $watchdogQueueLength > 0 ? 'wp-watchdog-badge--warn' : 'wp-watchdog-badge--ok'; ?>">
+                        <?php
+                        printf(
+                            /* translators: %s: number of queued jobs. */
+                            esc_html__('Queued jobs: %s', 'site-add-on-watchdog'),
+                            esc_html(number_format_i18n($watchdogQueueLength))
+                        );
+                        ?>
+                    </span>
+                </div>
                 <?php if ($watchdogQueueLength > 0 && $watchdogQueueNextAttempt) : ?>
-                    <p class="wp-watchdog-muted">
+                    <p class="wp-watchdog-card__description">
                         <?php
                         printf(
                             /* translators: 1: scheduled time */
                             esc_html__('Next attempt: %1$s', 'site-add-on-watchdog'),
-                            esc_html(wp_date(get_option('date_format') . ' ' . get_option('time_format'), (int) $watchdogQueueNextAttempt))
+                            esc_html(wp_date($watchdogDateFormat, (int) $watchdogQueueNextAttempt))
                         );
                         ?>
                     </p>
                 <?php else : ?>
-                    <p class="wp-watchdog-muted"><?php esc_html_e('No pending notifications in the queue.', 'site-add-on-watchdog'); ?></p>
+                    <p class="wp-watchdog-card__description"><?php esc_html_e('No pending notifications in the queue.', 'site-add-on-watchdog'); ?></p>
                 <?php endif; ?>
             </div>
-            <div class="wp-watchdog-divider"></div>
-            <div>
-                <p class="wp-watchdog-muted wp-watchdog-subheading"><strong><?php esc_html_e('Captured notification payloads', 'site-add-on-watchdog'); ?></strong></p>
-                <?php if (! empty($watchdogLastFailedNotification)) : ?>
+
+            <div class="wp-watchdog-card">
+                <div class="wp-watchdog-card__header">
+                    <h2 class="wp-watchdog-card__title"><?php esc_html_e('Captured notification payloads', 'site-add-on-watchdog'); ?></h2>
+                    <?php if ($watchdogHasFailedNotification) : ?>
+                        <span class="wp-watchdog-badge wp-watchdog-badge--danger"><?php esc_html_e('Delivery failed', 'site-add-on-watchdog'); ?></span>
+                    <?php endif; ?>
+                </div>
+                <?php if ($watchdogHasFailedNotification) : ?>
                     <?php
                     $watchdogFailedTime = isset($watchdogLastFailedNotification['failed_at'])
                         ? (int) $watchdogLastFailedNotification['failed_at']
-                        : time();
+                        : $watchdogNow;
                     $watchdogFailedChannel = $watchdogLastFailedNotification['description']
                         ?: ($watchdogLastFailedNotification['channel'] ?? __('Unknown channel', 'site-add-on-watchdog'));
-                    $watchdogFailedError = $watchdogLastFailedNotification['last_error'] ?? '';
+                    $watchdogFailedError = (string) ($watchdogLastFailedNotification['last_error'] ?? '');
                     ?>
-                    <p class="wp-watchdog-muted">
+                    <p class="wp-watchdog-card__description">
                         <?php
                         printf(
                             /* translators: 1: human readable time, 2: channel name */
                             esc_html__('Last failure recorded %1$s via %2$s.', 'site-add-on-watchdog'),
-                            esc_html(wp_date(get_option('date_format') . ' ' . get_option('time_format'), $watchdogFailedTime)),
+                            esc_html(wp_date($watchdogDateFormat, $watchdogFailedTime)),
                             esc_html($watchdogFailedChannel)
                         );
-                        if ($watchdogFailedError !== '') {
-                            echo '<br />' . esc_html($watchdogFailedError);
-                        }
                         ?>
                     </p>
+                    <?php if ($watchdogFailedError !== '') : ?>
+                        <p class="wp-watchdog-error-text"><?php echo esc_html($watchdogFailedError); ?></p>
+                    <?php endif; ?>
                     <div class="wp-watchdog-actions">
-                        <form method="post" action="<?php echo esc_url(admin_url('admin-post.php')); ?>">
+                        <form method="post" action="<?php echo esc_url($watchdogPostUrl); ?>">
                             <?php wp_nonce_field($watchdogActionPrefix . '_resend_failed_notification'); ?>
                             <input type="hidden" name="action" value="<?php echo esc_attr($watchdogActionPrefix . '_resend_failed_notification'); ?>" />
@@ -331 +932 @@
                             </button>
                         </form>
-                        <form method="post" action="<?php echo esc_url(admin_url('admin-post.php')); ?>">
+                        <form method="post" action="<?php echo esc_url($watchdogPostUrl); ?>" data-watchdog-download>
                             <?php wp_nonce_field($watchdogActionPrefix . '_download_failed_notification'); ?>
                             <input type="hidden" name="action" value="<?php echo esc_attr($watchdogActionPrefix . '_download_failed_notification'); ?>" />
@@ -341 +942 @@
                     </div>
                 <?php else : ?>
-                    <p class="wp-watchdog-muted"><?php esc_html_e('No failed notification payload has been captured yet.', 'site-add-on-watchdog'); ?></p>
+                    <p class="wp-watchdog-card__description"><?php esc_html_e('No failed notification payload has been captured yet.', 'site-add-on-watchdog'); ?></p>
                 <?php endif; ?>
             </div>
         </div>
-    </div>
-
-    <div class="wp-watchdog-grid">
-        <div class="wp-watchdog-surface" id="watchdog-history">
-            <div class="wp-watchdog-section-title">
-                <span class="dashicons dashicons-list-view" aria-hidden="true"></span>
-                <?php esc_html_e('Scan History', 'site-add-on-watchdog'); ?>
-            </div>
-            <?php require __DIR__ . '/history.php'; ?>
-        </div>
-        <div class="wp-watchdog-surface" id="watchdog-channels">
-            <div class="wp-watchdog-section-title">
-                <span class="dashicons dashicons-format-status" aria-hidden="true"></span>
-                <?php esc_html_e('Notification channels', 'site-add-on-watchdog'); ?>
-            </div>
-            <?php
-            $watchdogChannels = [
-                'email'   => __('Email', 'site-add-on-watchdog'),
-                'slack'   => __('Slack', 'site-add-on-watchdog'),
-                'teams'   => __('Microsoft Teams', 'site-add-on-watchdog'),
-                'discord' => __('Discord', 'site-add-on-watchdog'),
-                'webhook' => __('Custom Webhook', 'site-add-on-watchdog'),
-            ];
-            ?>
-            <ul class="wp-watchdog-inline-list">
-                <?php foreach ($watchdogChannels as $watchdogChannelKey => $watchdogChannelLabel) : ?>
-                    <?php $watchdogChannelEnabled = ! empty($watchdogSettings['notifications'][$watchdogChannelKey]['enabled']); ?>
-                    <?php $watchdogBadgeClass = $watchdogChannelEnabled ? 'wp-watchdog-badge--success' : 'wp-watchdog-badge--muted'; ?>
-                    <li>
-                        <span class="wp-watchdog-badge <?php echo esc_attr($watchdogBadgeClass); ?>">
-                            <span class="dashicons <?php echo $watchdogChannelEnabled ? 'dashicons-yes-alt' : 'dashicons-dismiss'; ?>" aria-hidden="true"></span>
-                            <?php echo esc_html($watchdogChannelLabel); ?>
-                            <span aria-hidden="true">•</span>
-                            <?php echo $watchdogChannelEnabled ? esc_html__('On', 'site-add-on-watchdog') : esc_html__('Off', 'site-add-on-watchdog'); ?>
-                        </span>
-                    </li>
-                <?php endforeach; ?>
-            </ul>
-            <p class="wp-watchdog-muted wp-watchdog-channel-summary">
-                <?php esc_html_e('Keep channels enabled to receive instant alerts and download-ready reports.', 'site-add-on-watchdog'); ?>
-            </p>
-        </div>
-    </div>
-
-    <div class="wp-watchdog-surface" id="watchdog-risks">
-        <div class="wp-watchdog-section-header">
-            <div class="wp-watchdog-section-title">
-                <span class="dashicons dashicons-shield-alt" aria-hidden="true"></span>
-                <?php esc_html_e('Potential Risks', 'site-add-on-watchdog'); ?>
-            </div>
-            <div class="wp-watchdog-summary">
-                <span class="wp-watchdog-summary__count"><?php echo esc_html(number_format_i18n(count($watchdogRisks))); ?></span>
-                <span class="wp-watchdog-summary__label"><?php esc_html_e('items flagged', 'site-add-on-watchdog'); ?></span>
-            </div>
-        </div>
-    <?php if (empty($watchdogRisks)) : ?>
-        <p class="wp-watchdog-muted"><?php esc_html_e('No risks detected.', 'site-add-on-watchdog'); ?></p>
-    <?php else : ?>
-        <?php
-        $watchdogColumns = [
-            'plugin'   => __('Plugin', 'site-add-on-watchdog'),
-            'local'    => __('Local Version', 'site-add-on-watchdog'),
-            'remote'   => __('Directory Version', 'site-add-on-watchdog'),
-            'reasons'  => __('Reasons', 'site-add-on-watchdog'),
-            'actions'  => __('Actions', 'site-add-on-watchdog'),
-        ];
-        $watchdogPerPage = (int) apply_filters('site_add_on_watchdog_admin_risks_per_page', 10);
-        $watchdogNormalizeForSort = static function (string $watchdogValue): string {
-            $watchdogNormalized = function_exists('remove_accents') ? remove_accents($watchdogValue) : $watchdogValue;
-
-            return strtolower($watchdogNormalized);
-        };
-        $watchdogRiskCount = static function (Risk $watchdogRisk): int {
-            $watchdogCount = count($watchdogRisk->reasons);
-            $watchdogVulnerabilities = $watchdogRisk->details['vulnerabilities'] ?? [];
-            if (! is_array($watchdogVulnerabilities)) {
-                $watchdogVulnerabilities = [];
-            }
-            if ($watchdogVulnerabilities !== []) {
-                $watchdogCount += count($watchdogVulnerabilities);
-            }
-
-            return $watchdogCount;
-        };
-        $watchdogVersionScore = static function (string $watchdogVersion): int {
-            preg_match_all('/\d+/', $watchdogVersion, $watchdogMatches);
-            $watchdogNumbers = $watchdogMatches[0] ?? [];
-            if (empty($watchdogNumbers)) {
-                return 0;
-            }
-
-            $watchdogWeights = [100000000, 100000, 100, 1];
-            $watchdogScore = 0;
-            foreach ($watchdogWeights as $watchdogIndex => $watchdogWeight) {
-                if (! isset($watchdogNumbers[$watchdogIndex])) {
-                    continue;
-                }
-                $watchdogScore += ((int) $watchdogNumbers[$watchdogIndex]) * $watchdogWeight;
-            }
-
-            return $watchdogScore;
-        };
-        ?>
-        <div class="wp-watchdog-risk-table" data-wp-watchdog-table data-per-page="<?php echo esc_attr(max($watchdogPerPage, 1)); ?>">
-            <div class="wp-watchdog-risk-table__controls">
-                <form method="get" class="wp-watchdog-risk-table__filter-form">
-                    <input type="hidden" name="page" value="site-add-on-watchdog" />
-                    <label class="wp-watchdog-risk-table__search">
-                        <span class="screen-reader-text"><?php esc_html_e('Search risks', 'site-add-on-watchdog'); ?></span>
-                        <input
-                            type="search"
-                            name="risk_search"
-                            value="<?php echo esc_attr($watchdogRiskSearch); ?>"
-                            placeholder="<?php esc_attr_e('Search plugin or reason', 'site-add-on-watchdog'); ?>"
-                            data-risk-search
-                        />
-                    </label>
-                    <div class="wp-watchdog-risk-table__sort-select">
-                        <label class="screen-reader-text" for="wp-watchdog-risk-sort"><?php esc_html_e('Sort risks by', 'site-add-on-watchdog'); ?></label>
-                        <select id="wp-watchdog-risk-sort" name="risk_sort" data-risk-sort>
-                            <option
-                                value="plugin"
-                                data-sort-key="sortPlugin"
-                                data-sort-default="asc"
-                                <?php selected($watchdogRiskSortSelection, 'plugin'); ?>
-                            >
-                                <?php esc_html_e('Plugin name', 'site-add-on-watchdog'); ?>
-                            </option>
-                            <option
-                                value="risk_count"
-                                data-sort-key="sortRiskCount"
-                                data-sort-default="desc"
-                                <?php selected($watchdogRiskSortSelection, 'risk_count'); ?>
-                            >
-                                <?php esc_html_e('Risk count', 'site-add-on-watchdog'); ?>
-                            </option>
-                            <option
-                                value="version_gap"
-                                data-sort-key="sortVersionGap"
-                                data-sort-default="desc"
-                                <?php selected($watchdogRiskSortSelection, 'version_gap'); ?>
-                            >
-                                <?php esc_html_e('Version gap', 'site-add-on-watchdog'); ?>
-                            </option>
-                            <option
-                                value="local"
-                                data-sort-key="sortLocal"
-                                data-sort-default="desc"
-                                <?php selected($watchdogRiskSortSelection, 'local'); ?>
-                            >
-                                <?php esc_html_e('Local version', 'site-add-on-watchdog'); ?>
-                            </option>
-                            <option
-                                value="remote"
-                                data-sort-key="sortRemote"
-                                data-sort-default="desc"
-                                <?php selected($watchdogRiskSortSelection, 'remote'); ?>
-                            >
-                                <?php esc_html_e('Directory version', 'site-add-on-watchdog'); ?>
-                            </option>
-                            <option
-                                value="reasons"
-                                data-sort-key="sortReasons"
-                                data-sort-default="asc"
-                                <?php selected($watchdogRiskSortSelection, 'reasons'); ?>
-                            >
-                                <?php esc_html_e('Reasons', 'site-add-on-watchdog'); ?>
-                            </option>
-                        </select>
-                        <label class="screen-reader-text" for="wp-watchdog-risk-order"><?php esc_html_e('Sort order', 'site-add-on-watchdog'); ?></label>
-                        <select id="wp-watchdog-risk-order" name="risk_order" data-risk-order>
-                            <option value="asc" <?php selected($watchdogRiskOrderSelection, 'asc'); ?>>
-                                <?php esc_html_e('Ascending', 'site-add-on-watchdog'); ?>
-                            </option>
-                            <option value="desc" <?php selected($watchdogRiskOrderSelection, 'desc'); ?>>
-                                <?php esc_html_e('Descending', 'site-add-on-watchdog'); ?>
-                            </option>
-                        </select>
-                        <button class="button" type="submit"><?php esc_html_e('Apply', 'site-add-on-watchdog'); ?></button>
-                    </div>
-                </form>
-                <div class="wp-watchdog-risk-table__pagination" data-pagination>
-                    <button type="button" class="button" data-action="prev" aria-label="<?php esc_attr_e('Previous page', 'site-add-on-watchdog'); ?>" disabled>&lsaquo;</button>
-                    <span class="wp-watchdog-risk-table__page-status" data-page-status></span>
-                    <button type="button" class="button" data-action="next" aria-label="<?php esc_attr_e('Next page', 'site-add-on-watchdog'); ?>" disabled>&rsaquo;</button>
-                </div>
-            </div>
-            <div class="wp-watchdog-risk-table__scroll">
-                <table class="widefat fixed striped wp-list-table">
-                    <thead>
-                    <tr>
-                        <th scope="col">
-                            <button type="button" class="wp-watchdog-risk-table__sort" data-sort-key="sortPlugin" data-sort-default="asc" data-sort-initial aria-sort="ascending">
-                                <?php echo esc_html($watchdogColumns['plugin']); ?>
-                                <span class="wp-watchdog-risk-table__sort-indicator" aria-hidden="true"></span>
-                            </button>
-                        </th>
-                        <th scope="col">
-                            <button type="button" class="wp-watchdog-risk-table__sort" data-sort-key="sortLocal" data-sort-default="desc" aria-sort="none">
-                                <?php echo esc_html($watchdogColumns['local']); ?>
-                                <span class="wp-watchdog-risk-table__sort-indicator" aria-hidden="true"></span>
-                            </button>
-                        </th>
-                        <th scope="col">
-                            <button type="button" class="wp-watchdog-risk-table__sort" data-sort-key="sortRemote" data-sort-default="desc" aria-sort="none">
-                                <?php echo esc_html($watchdogColumns['remote']); ?>
-                                <span class="wp-watchdog-risk-table__sort-indicator" aria-hidden="true"></span>
-                            </button>
-                        </th>
-                        <th scope="col">
-                            <button type="button" class="wp-watchdog-risk-table__sort" data-sort-key="sortReasons" data-sort-default="asc" aria-sort="none">
-                                <?php echo esc_html($watchdogColumns['reasons']); ?>
-                                <span class="wp-watchdog-risk-table__sort-indicator" aria-hidden="true"></span>
-                            </button>
-                        </th>
-                        <th scope="col"><?php echo esc_html($watchdogColumns['actions']); ?></th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <?php foreach ($watchdogRisks as $watchdogRisk) : ?>
-                        <?php
-                        $watchdogRemoteVersion = $watchdogRisk->remoteVersion ?? __('N/A', 'site-add-on-watchdog');
-                        $watchdogRemoteSort    = is_string($watchdogRisk->remoteVersion) ? $watchdogNormalizeForSort($watchdogRisk->remoteVersion) : '';
-                        $watchdogReasonParts   = $watchdogRisk->reasons;
-                        $watchdogVulnerabilities = $watchdogRisk->details['vulnerabilities'] ?? [];
-                        if (! is_array($watchdogVulnerabilities)) {
-                            $watchdogVulnerabilities = [];
-                        }
-                        foreach ($watchdogVulnerabilities as $watchdogVulnerability) {
-                            if (! empty($watchdogVulnerability['severity_label'])) {
-                                $watchdogReasonParts[] = $watchdogVulnerability['severity_label'];
-                            }
-                            if (! empty($watchdogVulnerability['title'])) {
-                                $watchdogReasonParts[] = $watchdogVulnerability['title'];
-                            }
-                            if (! empty($watchdogVulnerability['cve'])) {
-                                $watchdogReasonParts[] = $watchdogVulnerability['cve'];
-                            }
-                        }
-                        $watchdogReasonSort = $watchdogNormalizeForSort(implode(' ', $watchdogReasonParts));
-                        $watchdogRiskCountValue = $watchdogRiskCount($watchdogRisk);
-                        $watchdogVersionGapValue = abs(
-                            $watchdogVersionScore($watchdogRemoteVersion) - $watchdogVersionScore($watchdogRisk->localVersion)
-                        );
-                        $watchdogFilterText = $watchdogNormalizeForSort(implode(' ', [
-                            $watchdogRisk->pluginName,
-                            $watchdogRisk->localVersion,
-                            $watchdogRemoteVersion,
-                            implode(' ', $watchdogReasonParts),
-                        ]));
-                        ?>
-                        <tr
-                            data-sort-plugin="<?php echo esc_attr($watchdogNormalizeForSort($watchdogRisk->pluginName)); ?>"
-                            data-sort-local="<?php echo esc_attr($watchdogNormalizeForSort($watchdogRisk->localVersion)); ?>"
-                            data-sort-remote="<?php echo esc_attr($watchdogRemoteSort); ?>"
-                            data-sort-reasons="<?php echo esc_attr($watchdogReasonSort); ?>"
-                            data-sort-risk-count="<?php echo esc_attr((string) $watchdogRiskCountValue); ?>"
-                            data-sort-version-gap="<?php echo esc_attr((string) $watchdogVersionGapValue); ?>"
-                            data-filter-text="<?php echo esc_attr($watchdogFilterText); ?>"
-                        >
-                            <td class="column-primary" data-column="plugin" data-column-label="<?php echo esc_attr($watchdogColumns['plugin']); ?>">
-                                <?php echo esc_html($watchdogRisk->pluginName); ?>
-                            </td>
-                            <td data-column="local" data-column-label="<?php echo esc_attr($watchdogColumns['local']); ?>">
-                                <?php echo esc_html($watchdogRisk->localVersion); ?>
-                            </td>
-                            <td data-column="remote" data-column-label="<?php echo esc_attr($watchdogColumns['remote']); ?>">
-                                <?php echo esc_html($watchdogRemoteVersion); ?>
-                            </td>
-                            <td data-column="reasons" data-column-label="<?php echo esc_attr($watchdogColumns['reasons']); ?>">
-                                <ul>
-                                    <?php foreach ($watchdogRisk->reasons as $watchdogReason) : ?>
-                                        <li><?php echo esc_html($watchdogReason); ?></li>
-                                    <?php endforeach; ?>
-                                    <?php if (! empty($watchdogVulnerabilities)) : ?>
-                                        <li>
-                                            <?php esc_html_e('WPScan vulnerabilities:', 'site-add-on-watchdog'); ?>
-                                            <ul>
-                                                <?php foreach ($watchdogVulnerabilities as $watchdogVuln) : ?>
-                                                    <li>
-                                                        <?php if (! empty($watchdogVuln['severity']) && ! empty($watchdogVuln['severity_label'])) : ?>
-                                                            <?php $watchdogSeverityClass = 'wp-watchdog-severity wp-watchdog-severity--' . sanitize_html_class((string) $watchdogVuln['severity']); ?>
-                                                            <span class="<?php echo esc_attr($watchdogSeverityClass); ?>"><?php echo esc_html($watchdogVuln['severity_label']); ?></span>
-                                                        <?php endif; ?>
-                                                        <?php if (! empty($watchdogVuln['title'])) : ?>
-                                                            <span class="wp-watchdog-vulnerability__title"><?php echo esc_html($watchdogVuln['title']); ?></span>
-                                                        <?php endif; ?>
-                                                        <?php if (! empty($watchdogVuln['cve'])) : ?>
-                                                            <span class="wp-watchdog-vulnerability__cve">- <?php echo esc_html($watchdogVuln['cve']); ?></span>
-                                                        <?php endif; ?>
-                                                        <?php if (! empty($watchdogVuln['fixed_in'])) : ?>
-                                                            <span class="wp-watchdog-vulnerability__fixed">(<?php
-                                                            printf(
-                                                                /* translators: %s: plugin version number. */
-                                                                esc_html__('Fixed in %s', 'site-add-on-watchdog'),
-                                                                esc_html($watchdogVuln['fixed_in'])
-                                                            );
-                                                            ?>)</span>
-                                                        <?php endif; ?>
-                                                    </li>
-                                                <?php endforeach; ?>
-                                            </ul>
-                                        </li>
-                                    <?php endif; ?>
-                                </ul>
-                            </td>
-                            <td data-column="actions" data-column-label="<?php echo esc_attr($watchdogColumns['actions']); ?>">
-                                <form method="post" action="<?php echo esc_url(admin_url('admin-post.php')); ?>">
-                                    <?php wp_nonce_field($watchdogActionPrefix . '_ignore'); ?>
-                                    <input type="hidden" name="action" value="<?php echo esc_attr($watchdogActionPrefix . '_ignore'); ?>">
-                                    <input type="hidden" name="plugin_slug" value="<?php echo esc_attr($watchdogRisk->pluginSlug); ?>">
-                                    <button class="button" type="submit"><?php esc_html_e('Ignore', 'site-add-on-watchdog'); ?></button>
-                                </form>
-                            </td>
-                        </tr>
-                    <?php endforeach; ?>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    <?php endif; ?>
-    </div>
-
-    <div class="wp-watchdog-grid">
-        <div class="wp-watchdog-surface" id="watchdog-ignored">
-            <div class="wp-watchdog-section-title">
-                <span class="dashicons dashicons-hidden" aria-hidden="true"></span>
-                <?php esc_html_e('Ignored Plugins', 'site-add-on-watchdog'); ?>
-            </div>
-            <?php if (empty($watchdogIgnored)) : ?>
-                <p class="wp-watchdog-muted"><?php esc_html_e('No plugins are being ignored.', 'site-add-on-watchdog'); ?></p>
-            <?php else : ?>
-                <ul class="wp-watchdog-inline-list">
-                    <?php foreach ($watchdogIgnored as $watchdogIgnoredSlug) : ?>
-                        <li>
-                            <form class="wp-watchdog-inline-form" method="post" action="<?php echo esc_url(admin_url('admin-post.php')); ?>">
-                                <?php wp_nonce_field($watchdogActionPrefix . '_unignore'); ?>
-                                <input type="hidden" name="action" value="<?php echo esc_attr($watchdogActionPrefix . '_unignore'); ?>">
-                                <input type="hidden" name="plugin_slug" value="<?php echo esc_attr($watchdogIgnoredSlug); ?>">
-                                <button class="button" type="submit">
-                                    <span class="dashicons dashicons-no" aria-hidden="true"></span>
-                                    <?php echo esc_html($watchdogIgnoredSlug); ?>
-                                </button>
-                            </form>
-                        </li>
-                    <?php endforeach; ?>
-                </ul>
-            <?php endif; ?>
-        </div>
-        <div class="wp-watchdog-surface wp-watchdog-surface--wide" id="watchdog-settings">
-            <div class="wp-watchdog-section-title">
-                <span class="dashicons dashicons-email-alt" aria-hidden="true"></span>
-                <?php esc_html_e('Settings and notifications', 'site-add-on-watchdog'); ?>
-            </div>
-    <p class="description"><?php esc_html_e('Save and test buttons save all settings on this form, then send a test to the selected channel.', 'site-add-on-watchdog'); ?></p>
-    <form class="wp-watchdog-settings-form" method="post" action="<?php echo esc_url(admin_url('admin-post.php')); ?>">
-        <?php wp_nonce_field($watchdogActionPrefix . '_settings'); ?>
-        <input type="hidden" name="action" value="<?php echo esc_attr($watchdogActionPrefix . '_save_settings'); ?>">
-        <table class="form-table" role="presentation">
-            <tr>
-                <th scope="row"><?php esc_html_e('History retention', 'site-add-on-watchdog'); ?></th>
-                <td>
-                    <label for="wp-watchdog-history-retention" class="screen-reader-text"><?php esc_html_e('History retention', 'site-add-on-watchdog'); ?></label>
-                    <input
-                        type="number"
-                        id="wp-watchdog-history-retention"
-                        name="settings[history][retention]"
-                        value="<?php echo esc_attr($watchdogSettings['history']['retention'] ?? $watchdogHistoryRetention); ?>"
-                        min="1"
-                        max="15"
-                        step="1"
-                    />
-                    <p class="description">
-                        <?php esc_html_e('Number of recent scans to keep available for review and download (maximum 15).', 'site-add-on-watchdog'); ?>
-                    </p>
-                </td>
-            </tr>
-            <tr>
-                <th scope="row"><?php esc_html_e('Scan frequency', 'site-add-on-watchdog'); ?></th>
-                <td>
-                    <?php
-                    $watchdogDefaultFrequencyMessage = __('Choose how often the automatic scan should run.', 'site-add-on-watchdog');
-                    $watchdogTestingFrequencyMessage = sprintf(
-                        /* translators: 1: interval minutes, 2: duration hours */
-                        __('Testing mode sends notifications every %1$d minutes to all configured channels and automatically switches back to daily scans after %2$d hours.', 'site-add-on-watchdog'),
-                        TestingMode::INTERVAL_MINUTES,
-                        TestingMode::DURATION_HOURS
-                    );
-                    $watchdogIsTestingFrequency      = ($watchdogSettings['notifications']['frequency'] ?? '') === 'testing';
-                    $watchdogTestingExpiresAt        = (int) ($watchdogSettings['notifications']['testing_expires_at'] ?? 0);
-                    $watchdogNow                     = time();
-                    $watchdogShowTestingExpiry       = $watchdogIsTestingFrequency && $watchdogTestingExpiresAt > $watchdogNow;
-                    $watchdogDailyTime               = isset($watchdogSettings['notifications']['daily_time'])
-                        ? (string) $watchdogSettings['notifications']['daily_time']
-                        : '08:00';
-                    $watchdogWeeklyDay = isset($watchdogSettings['notifications']['weekly_day'])
-                        ? (int) $watchdogSettings['notifications']['weekly_day']
-                        : 1;
-                    $watchdogWeeklyTime = isset($watchdogSettings['notifications']['weekly_time'])
-                        ? (string) $watchdogSettings['notifications']['weekly_time']
-                        : '08:00';
-                    ?>
-                    <label for="wp-watchdog-notification-frequency" class="screen-reader-text"><?php esc_html_e('Scan frequency', 'site-add-on-watchdog'); ?></label>
-                    <select id="wp-watchdog-notification-frequency" name="settings[notifications][frequency]">
-                        <option value="daily" <?php selected($watchdogSettings['notifications']['frequency'], 'daily'); ?>><?php esc_html_e('Daily', 'site-add-on-watchdog'); ?></option>
-                        <option value="weekly" <?php selected($watchdogSettings['notifications']['frequency'], 'weekly'); ?>><?php esc_html_e('Weekly', 'site-add-on-watchdog'); ?></option>
-                        <option value="testing" <?php selected($watchdogSettings['notifications']['frequency'], 'testing'); ?>><?php echo esc_html(
-                            sprintf(
-                                /* translators: %d: interval minutes */
-                                __('Testing (every %d minutes)', 'site-add-on-watchdog'),
-                                TestingMode::INTERVAL_MINUTES
-                            )
-                        ); ?></option>
-                        <option value="manual" <?php selected($watchdogSettings['notifications']['frequency'], 'manual'); ?>><?php esc_html_e('Manual (no automatic scans)', 'site-add-on-watchdog'); ?></option>
-                    </select>
-                    <?php
-                    $watchdogFrequencyDescriptionClass = 'description wp-watchdog-frequency-description';
-                    if ($watchdogIsTestingFrequency) {
-                        $watchdogFrequencyDescriptionClass .= ' wp-watchdog-frequency-description--testing';
-                    }
-                    ?>
-                    <p
-                        class="<?php echo esc_attr($watchdogFrequencyDescriptionClass); ?>"
-                        data-watchdog-frequency-description
-                        data-default-message="<?php echo esc_attr($watchdogDefaultFrequencyMessage); ?>"
-                        data-testing-message="<?php echo esc_attr($watchdogTestingFrequencyMessage); ?>"
-                        aria-live="polite"
-                    >
-                        <?php echo esc_html($watchdogIsTestingFrequency ? $watchdogTestingFrequencyMessage : $watchdogDefaultFrequencyMessage); ?>
-                    </p>
-                    <div class="wp-watchdog-frequency-options" data-watchdog-frequency-options>
-                        <div class="wp-watchdog-frequency-options__row" data-watchdog-frequency-target="daily">
-                            <label for="wp-watchdog-daily-time" class="wp-watchdog-frequency-label">
-                                <?php esc_html_e('Daily send time', 'site-add-on-watchdog'); ?>
-                            </label>
-                            <input
-                                id="wp-watchdog-daily-time"
-                                name="settings[notifications][daily_time]"
-                                type="time"
-                                value="<?php echo esc_attr($watchdogDailyTime); ?>"
-                                aria-describedby="wp-watchdog-daily-time-help"
-                            />
-                            <p class="description" id="wp-watchdog-daily-time-help">
-                                <?php esc_html_e('Time of day to start the daily scan in the WordPress site timezone.', 'site-add-on-watchdog'); ?>
-                            </p>
-                        </div>
-                        <div class="wp-watchdog-frequency-options__row" data-watchdog-frequency-target="weekly">
-                            <div class="wp-watchdog-frequency-weekly">
-                                <label for="wp-watchdog-weekly-day" class="wp-watchdog-frequency-label">
-                                    <?php esc_html_e('Weekly send day', 'site-add-on-watchdog'); ?>
-                                </label>
-                                <select id="wp-watchdog-weekly-day" name="settings[notifications][weekly_day]">
-                                    <option value="1" <?php selected($watchdogWeeklyDay, 1); ?>><?php esc_html_e('Monday', 'site-add-on-watchdog'); ?></option>
-                                    <option value="2" <?php selected($watchdogWeeklyDay, 2); ?>><?php esc_html_e('Tuesday', 'site-add-on-watchdog'); ?></option>
-                                    <option value="3" <?php selected($watchdogWeeklyDay, 3); ?>><?php esc_html_e('Wednesday', 'site-add-on-watchdog'); ?></option>
-                                    <option value="4" <?php selected($watchdogWeeklyDay, 4); ?>><?php esc_html_e('Thursday', 'site-add-on-watchdog'); ?></option>
-                                    <option value="5" <?php selected($watchdogWeeklyDay, 5); ?>><?php esc_html_e('Friday', 'site-add-on-watchdog'); ?></option>
-                                    <option value="6" <?php selected($watchdogWeeklyDay, 6); ?>><?php esc_html_e('Saturday', 'site-add-on-watchdog'); ?></option>
-                                    <option value="7" <?php selected($watchdogWeeklyDay, 7); ?>><?php esc_html_e('Sunday', 'site-add-on-watchdog'); ?></option>
-                                </select>
-                            </div>
-                            <div class="wp-watchdog-frequency-weekly">
-                                <label for="wp-watchdog-weekly-time" class="wp-watchdog-frequency-label">
-                                    <?php esc_html_e('Weekly send time', 'site-add-on-watchdog'); ?>
-                                </label>
-                                <input
-                                    id="wp-watchdog-weekly-time"
-                                    name="settings[notifications][weekly_time]"
-                                    type="time"
-                                    value="<?php echo esc_attr($watchdogWeeklyTime); ?>"
-                                    aria-describedby="wp-watchdog-weekly-time-help"
-                                />
-                            </div>
-                            <p class="description" id="wp-watchdog-weekly-time-help">
-                                <?php esc_html_e('Day and time to start the weekly scan in the WordPress site timezone.', 'site-add-on-watchdog'); ?>
-                            </p>
-                        </div>
-                    </div>
-                    <?php if ($watchdogShowTestingExpiry) : ?>
-                        <?php
-                        $watchdogTimezone = null;
-                        if (function_exists('wp_timezone')) {
-                            $watchdogTimezone = wp_timezone();
-                        } else {
-                            $watchdogTimezoneString = (string) get_option('timezone_string');
-                            if ($watchdogTimezoneString !== '') {
-                                try {
-                                    $watchdogTimezone = new DateTimeZone($watchdogTimezoneString);
-                                } catch (Exception $exception) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedCatch
-                                }
-                            }
-
-                            if (! $watchdogTimezone) {
-                                $watchdogGmtOffset = get_option('gmt_offset');
-                                if (is_numeric($watchdogGmtOffset)) {
-                                    $watchdogSecondsInHour = defined('HOUR_IN_SECONDS') ? HOUR_IN_SECONDS : 3600;
-                                    $watchdogSecondsOffset = (int) round((float) $watchdogGmtOffset * $watchdogSecondsInHour);
-                                    $watchdogTimezoneName  = timezone_name_from_abbr('', $watchdogSecondsOffset, 0);
-                                    if ($watchdogTimezoneName !== false) {
-                                        try {
-                                            $watchdogTimezone = new DateTimeZone($watchdogTimezoneName);
-                                        } catch (Exception $exception) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedCatch
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                        if (! $watchdogTimezone && class_exists('DateTimeZone')) {
-                            $watchdogTimezone = new DateTimeZone('UTC');
-                        }
-
-                        $watchdogTestingExpiryMessage = sprintf(
-                            /* translators: 1: datetime, 2: relative time */
-                            __('Testing mode will automatically switch back to daily scans on %1$s (%2$s remaining).', 'site-add-on-watchdog'),
-                            wp_date(
-                                get_option('date_format') . ' ' . get_option('time_format'),
-                                $watchdogTestingExpiresAt,
-                                $watchdogTimezone
-                            ),
-                            human_time_diff($watchdogNow, $watchdogTestingExpiresAt)
-                        );
-                        ?>
-                        <p class="description wp-watchdog-frequency-description wp-watchdog-frequency-description--expires">
-                            <?php echo esc_html($watchdogTestingExpiryMessage); ?>
-                        </p>
-                    <?php endif; ?>
-                </td>
-            </tr>
-            <tr>
-                <th scope="row"><?php esc_html_e('Email notifications', 'site-add-on-watchdog'); ?></th>
-                <td data-watchdog-notification>
-                    <label class="wp-watchdog-notification-toggle">
-                        <input type="checkbox" name="settings[notifications][email][enabled]" <?php checked($watchdogSettings['notifications']['email']['enabled']); ?> data-watchdog-toggle />
-                        <?php esc_html_e('Enabled', 'site-add-on-watchdog'); ?>
-                    </label>
-                    <div class="wp-watchdog-notification-fields" data-watchdog-fields>
-                        <label>
-                            <?php esc_html_e('Recipients (comma separated)', 'site-add-on-watchdog'); ?><br />
-                            <input type="text" name="settings[notifications][email][recipients]" value="<?php echo esc_attr($watchdogSettings['notifications']['email']['recipients']); ?>" class="regular-text" />
-                        </label>
-                        <p class="description"><?php esc_html_e('Separate addresses with commas, semicolons, or spaces. WordPress administrator accounts are always included.', 'site-add-on-watchdog'); ?></p>
-                        <p class="description"><?php esc_html_e('Email uses WordPress mail delivery. Your host must support sending mail, or you must configure an SMTP/mail plugin. Discord and other webhooks do not use this mail configuration.', 'site-add-on-watchdog'); ?></p>
-                        <p><button class="button" type="submit" name="test_channel" value="email"><?php esc_html_e('Save and test email', 'site-add-on-watchdog'); ?></button></p>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <th scope="row"><?php esc_html_e('Discord notifications', 'site-add-on-watchdog'); ?></th>
-                <td data-watchdog-notification>
-                    <label class="wp-watchdog-notification-toggle">
-                        <input type="checkbox" name="settings[notifications][discord][enabled]" <?php checked($watchdogSettings['notifications']['discord']['enabled']); ?> data-watchdog-toggle />
-                        <?php esc_html_e('Enabled', 'site-add-on-watchdog'); ?>
-                    </label>
-                    <div class="wp-watchdog-notification-fields" data-watchdog-fields>
-                        <label>
-                            <?php esc_html_e('Discord webhook URL', 'site-add-on-watchdog'); ?><br />
-                            <input type="url" name="settings[notifications][discord][webhook]" value="<?php echo esc_attr($watchdogSettings['notifications']['discord']['webhook']); ?>" class="regular-text" />
-                        </label>
-                        <p><button class="button" type="submit" name="test_channel" value="discord"><?php esc_html_e('Save and test Discord', 'site-add-on-watchdog'); ?></button></p>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <th scope="row"><?php esc_html_e('Slack notifications', 'site-add-on-watchdog'); ?></th>
-                <td data-watchdog-notification>
-                    <label class="wp-watchdog-notification-toggle">
-                        <input type="checkbox" name="settings[notifications][slack][enabled]" <?php checked($watchdogSettings['notifications']['slack']['enabled']); ?> data-watchdog-toggle />
-                        <?php esc_html_e('Enabled', 'site-add-on-watchdog'); ?>
-                    </label>
-                    <div class="wp-watchdog-notification-fields" data-watchdog-fields>
-                        <label>
-                            <?php esc_html_e('Slack webhook URL', 'site-add-on-watchdog'); ?><br />
-                            <input type="url" name="settings[notifications][slack][webhook]" value="<?php echo esc_attr($watchdogSettings['notifications']['slack']['webhook']); ?>" class="regular-text" />
-                        </label>
-                        <p><button class="button" type="submit" name="test_channel" value="slack"><?php esc_html_e('Save and test Slack', 'site-add-on-watchdog'); ?></button></p>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <th scope="row"><?php esc_html_e('Microsoft Teams notifications', 'site-add-on-watchdog'); ?></th>
-                <td data-watchdog-notification>
-                    <label class="wp-watchdog-notification-toggle">
-                        <input type="checkbox" name="settings[notifications][teams][enabled]" <?php checked($watchdogSettings['notifications']['teams']['enabled']); ?> data-watchdog-toggle />
-                        <?php esc_html_e('Enabled', 'site-add-on-watchdog'); ?>
-                    </label>
-                    <div class="wp-watchdog-notification-fields" data-watchdog-fields>
-                        <label>
-                            <?php esc_html_e('Teams webhook URL', 'site-add-on-watchdog'); ?><br />
-                            <input type="url" name="settings[notifications][teams][webhook]" value="<?php echo esc_attr($watchdogSettings['notifications']['teams']['webhook']); ?>" class="regular-text" />
-                        </label>
-                        <p class="description"><?php esc_html_e('Supports Microsoft Teams Workflows and existing Incoming Webhook connectors.', 'site-add-on-watchdog'); ?></p>
-                        <p><button class="button" type="submit" name="test_channel" value="teams"><?php esc_html_e('Save and test Teams', 'site-add-on-watchdog'); ?></button></p>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <th scope="row"><?php esc_html_e('Generic webhook', 'site-add-on-watchdog'); ?></th>
-                <td data-watchdog-notification>
-                    <label class="wp-watchdog-notification-toggle">
-                        <input type="checkbox" name="settings[notifications][webhook][enabled]" <?php checked($watchdogSettings['notifications']['webhook']['enabled']); ?> data-watchdog-toggle />
-                        <?php esc_html_e('Enabled', 'site-add-on-watchdog'); ?>
-                    </label>
-                    <div class="wp-watchdog-notification-fields" data-watchdog-fields>
-                        <label>
-                            <?php esc_html_e('Webhook URL', 'site-add-on-watchdog'); ?><br />
-                            <input type="url" name="settings[notifications][webhook][url]" value="<?php echo esc_attr($watchdogSettings['notifications']['webhook']['url']); ?>" class="regular-text" />
-                        </label>
-                        <p>
-                            <label>
-                                <?php esc_html_e('Webhook secret (optional)', 'site-add-on-watchdog'); ?><br />
-                                <input type="password" name="settings[notifications][webhook][secret]" value="<?php echo esc_attr($watchdogSettings['notifications']['webhook']['secret'] ?? ''); ?>" class="regular-text" autocomplete="new-password" />
-                            </label>
-                            <span class="description"><?php esc_html_e('Signs the exact JSON body with HMAC-SHA256 in the X-Watchdog-Signature header. Test messages are marked in the payload.', 'site-add-on-watchdog'); ?></span>
-                        </p>
-                        <p><button class="button" type="submit" name="test_channel" value="webhook"><?php esc_html_e('Save and test webhook', 'site-add-on-watchdog'); ?></button></p>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <th scope="row"><?php esc_html_e('WPScan API key', 'site-add-on-watchdog'); ?></th>
-                <td>
-                    <input type="password" name="settings[notifications][wpscan_api_key]" value="<?php echo esc_attr($watchdogSettings['notifications']['wpscan_api_key']); ?>" class="regular-text" autocomplete="new-password" />
-                    <p class="description"><?php esc_html_e('Optional. Provide your own WPScan API key to enrich vulnerability reports.', 'site-add-on-watchdog'); ?></p>
-                </td>
-            </tr>
-        </table>
-        <p><button class="button button-primary" type="submit"><?php esc_html_e('Save settings', 'site-add-on-watchdog'); ?></button></p>
-    </form>
-        </div>
-    </div>
+    </section>
 </div>

site-add-on-watchdog/trunk/templates/history.php

@@ -5 +5 @@
  * @var array $watchdogHistoryRecords
  * @var array $watchdogHistoryDownloads
- * @var int   $historyRetention
- * @var int   $historyDisplay
- * @var array $historyRecords
- * @var array $historyDownloads
  */
 defined('ABSPATH') || exit;
 
-$watchdogHistoryRetention = $watchdogHistoryRetention ?? $historyRetention ?? 0;
-$watchdogHistoryDisplay   = $watchdogHistoryDisplay ?? $historyDisplay ?? 0;
-$watchdogHistoryRecords   = $watchdogHistoryRecords ?? $historyRecords ?? [];
-$watchdogHistoryDownloads = $watchdogHistoryDownloads ?? $historyDownloads ?? [];
+$watchdogHistoryFormat = sprintf('%s %s', get_option('date_format', 'Y-m-d'), get_option('time_format', 'H:i'));
 ?>
 
 <?php if (empty($watchdogHistoryRecords)) : ?>
-    <p><?php echo esc_html__('No scans have been recorded yet. Run a scan to populate your history.', 'site-add-on-watchdog'); ?></p>
+    <p class="wp-watchdog-card__description"><?php esc_html_e('No scans have been recorded yet. Run a scan to populate your history.', 'site-add-on-watchdog'); ?></p>
 <?php else : ?>
-    <p class="description">
+    <p class="wp-watchdog-card__description">
         <?php
-        $watchdogDisplayCount = esc_html(number_format_i18n($watchdogHistoryDisplay));
-        $watchdogRetentionCount = esc_html(number_format_i18n($watchdogHistoryRetention));
-        echo esc_html(
-            sprintf(
-                /* translators: 1: number of scans shown, 2: total scans retained */
-                esc_html__('Showing the last %1$s scans (retaining %2$s in total).', 'site-add-on-watchdog'),
-                $watchdogDisplayCount,
-                $watchdogRetentionCount
-            )
+        printf(
+            /* translators: 1: number of scans shown, 2: total scans retained */
+            esc_html__('Showing the last %1$s scans (retaining %2$s in total).', 'site-add-on-watchdog'),
+            esc_html(number_format_i18n($watchdogHistoryDisplay)),
+            esc_html(number_format_i18n($watchdogHistoryRetention))
         );
         ?>
     </p>
-    <div class="wp-watchdog-history-grid" role="list">
+    <ul class="wp-watchdog-history">
         <?php foreach ($watchdogHistoryRecords as $watchdogRecord) : ?>
-            <?php $watchdogDownloads = $watchdogHistoryDownloads[$watchdogRecord['run_at']] ?? []; ?>
-            <?php $watchdogHasRisks  = (int) $watchdogRecord['risk_count'] > 0; ?>
-            <div class="wp-watchdog-history-card" role="listitem">
-                <div class="wp-watchdog-history-card__header">
-                    <h3 class="wp-watchdog-history-card__title">
-                        <span class="dashicons dashicons-backup" aria-hidden="true"></span>
-                        <?php
-                        $watchdogFormat = sprintf('%s %s', get_option('date_format', 'Y-m-d'), get_option('time_format', 'H:i'));
-                        echo esc_html(wp_date($watchdogFormat, $watchdogRecord['run_at']));
-                        ?>
-                    </h3>
-                    <span class="wp-watchdog-history-badge <?php echo $watchdogHasRisks ? 'wp-watchdog-history-badge--risk' : 'wp-watchdog-history-badge--safe'; ?>">
-                        <span class="dashicons <?php echo $watchdogHasRisks ? 'dashicons-warning' : 'dashicons-yes-alt'; ?>" aria-hidden="true"></span>
-                        <?php
-                        $watchdogRiskLabel = function_exists('_n')
-                            ? /* translators: %s: number of risks. */
-                            _n(
-                                '%s risk',
-                                '%s risks',
-                                $watchdogRecord['risk_count'],
-                                'site-add-on-watchdog'
-                            )
-                            : ($watchdogRecord['risk_count'] === 1 ? '%s risk' : '%s risks');
-
-                        $watchdogRiskCount = number_format_i18n($watchdogRecord['risk_count']);
-                        printf(esc_html($watchdogRiskLabel), esc_html($watchdogRiskCount));
-                        ?>
-                    </span>
-                </div>
-                <p class="wp-watchdog-history-card__meta">
-                    <?php echo esc_html__('Download the report for this run:', 'site-add-on-watchdog'); ?>
-                </p>
-                <div class="wp-watchdog-history-card__downloads">
+            <?php
+            $watchdogDownloads = $watchdogHistoryDownloads[$watchdogRecord['run_at']] ?? [];
+            $watchdogRecordRiskCount = (int) $watchdogRecord['risk_count'];
+            ?>
+            <li class="wp-watchdog-history__item">
+                <span class="wp-watchdog-history__date">
+                    <span class="dashicons dashicons-backup" aria-hidden="true"></span>
+                    <?php echo esc_html(wp_date($watchdogHistoryFormat, $watchdogRecord['run_at'])); ?>
+                </span>
+                <span class="wp-watchdog-badge <?php echo $watchdogRecordRiskCount > 0 ? 'wp-watchdog-badge--warn' : 'wp-watchdog-badge--ok'; ?>">
+                    <?php
+                    printf(
+                        /* translators: %s: number of risks. */
+                        esc_html(_n('%s risk', '%s risks', $watchdogRecordRiskCount, 'site-add-on-watchdog')),
+                        esc_html(number_format_i18n($watchdogRecordRiskCount))
+                    );
+                    ?>
+                </span>
+                <span class="wp-watchdog-history__downloads">
                     <?php if (! empty($watchdogDownloads['json'])) : ?>
                         <a class="button button-small" href="<?php echo esc_url($watchdogDownloads['json']); ?>"><?php esc_html_e('Download JSON', 'site-add-on-watchdog'); ?></a>
@@ -76 +51 @@
                         <a class="button button-small" href="<?php echo esc_url($watchdogDownloads['csv']); ?>"><?php esc_html_e('Download CSV', 'site-add-on-watchdog'); ?></a>
                     <?php endif; ?>
-                </div>
-            </div>
+                </span>
+            </li>
         <?php endforeach; ?>
-    </div>
+    </ul>
 <?php endif; ?>