From c64dc7a4b334a0fa33854b4d46a2f82bc843daa6 Mon Sep 17 00:00:00 2001 From: awehttam Date: Fri, 13 Mar 2026 20:41:15 -0700 Subject: [PATCH 001/246] Fix false PETSCII detection in imported messages --- CLAUDE.md | 1 + docs/UPGRADING_1.8.7.md | 117 +++++++++++++++++++++++++++ src/ArtFormatDetector.php | 54 +++++++++++-- src/Version.php | 2 +- tests/Unit/ArtFormatDetectorTest.php | 35 ++++++++ 5 files changed, 203 insertions(+), 6 deletions(-) create mode 100644 docs/UPGRADING_1.8.7.md create mode 100644 tests/Unit/ArtFormatDetectorTest.php diff --git a/CLAUDE.md b/CLAUDE.md index df176992..c056ded3 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -42,6 +42,7 @@ A modern web interface and mailer tool that receives and sends Fidonet message p - When adding features to netmail and echomail, keep in mind feature parity. Ask for clarification about whether a feature is appropriate to both - Leave the vendor directory alone. It's managed by composer only - **Composer Dependencies**: When adding a new required package to composer.json, the UPGRADING_x.x.x.md document for that version MUST include instructions to run `composer install` before `php scripts/setup.php`. Without this, the upgrade will fail because `vendor/autoload.php` is loaded before setup.php runs. + - **Upgrade docs TOC**: When creating or maintaining an `UPGRADING_x.y.z.md` document, always add or update its table of contents so the headings in that file remain navigable and in sync with the document. - When updating style.css, also update the theme stylesheets: amber.css, dark.css, greenterm.css, and cyberpunk.css - Database migrations are handled through scripts/setup.php. setup.php will also call upgrade.php which handles other upgrade related tasks. - Migrations can be SQL or PHP. Use the naming convention vX.Y.Z_description (e.g., v1.9.1.6_migrate_file_area_dirs.sql or .php). diff --git a/docs/UPGRADING_1.8.7.md b/docs/UPGRADING_1.8.7.md new file mode 100644 index 00000000..00e884c0 --- /dev/null +++ b/docs/UPGRADING_1.8.7.md @@ -0,0 +1,117 @@ +# Upgrading to 1.8.7 + +⚠️ Make sure you've made a backup of your database and files before upgrading. + +## Table of Contents + +- [Summary of Changes](#summary-of-changes) +- [Echomail Art Format Detection](#echomail-art-format-detection) + - [Existing Misdetected Messages](#existing-misdetected-messages) + - [psql Instructions](#psql-instructions) + - [Notes](#notes) +- [Upgrade Instructions](#upgrade-instructions) + - [From Git](#from-git) + - [Using the Installer](#using-the-installer) + +## Summary of Changes + +1.8.7 is a maintenance release. + +## Echomail Art Format Detection + +- Fixed a false-positive PETSCII detection bug when importing echomail and + netmail without a valid `CHRS` kludge. +- Previously, some non-UTF-8 messages containing arbitrary high-bit bytes could + be incorrectly stored with: + - `message_charset = null` + - `art_format = petscii` +- This was most visible in file listing / file echo announcement messages whose + body included 8-bit text from other character sets. +- PETSCII auto-detection is now more conservative. Messages are only tagged as + PETSCII when the raw body has stronger PETSCII-like characteristics. Unknown + 8-bit text should now remain untagged instead of being misclassified. + +### Existing Misdetected Messages + +If you already imported messages that were incorrectly stored with +`art_format = 'petscii'`, upgrading the code will not change those existing +rows automatically. + +If you want those messages to fall back to normal text rendering, reset the +stored metadata in PostgreSQL for the affected messages. + +### psql Instructions + +Start `psql` and connect to your BinktermPHP database: + +```bash +psql -U your_db_user -d your_db_name +``` + +Preview the rows that currently look misdetected: + +```sql +SELECT id, echoarea_id, subject, message_charset, art_format, date_written +FROM echomail +WHERE art_format = 'petscii' + AND message_charset IS NULL +ORDER BY id; +``` + +If that result set matches what you want to fix, reset those columns: + +```sql +UPDATE echomail +SET message_charset = NULL, + art_format = NULL +WHERE art_format = 'petscii' + AND message_charset IS NULL; +``` + +If you want to target only a specific message first, for example message +`39898`, do this instead: + +```sql +UPDATE echomail +SET message_charset = NULL, + art_format = NULL +WHERE id = 39898; +``` + +Check the result: + +```sql +SELECT id, message_charset, art_format +FROM echomail +WHERE id = 39898; +``` + +Then exit `psql`: + +```sql +\q +``` + +### Notes + +- This release does not add a schema migration. +- Resetting these columns only affects rendering hints stored in the database. +- It does not alter the message body text itself. + +## Upgrade Instructions + +### From Git + +```bash +git pull +php scripts/setup.php +scripts/restart_daemons.sh +``` + +### Using the Installer + +```bash +wget https://raw.githubusercontent.com/awehttam/binkterm-php-installer/main/binkterm-installer.phar +php binkterm-installer.phar +scripts/restart_daemons.sh +``` diff --git a/src/ArtFormatDetector.php b/src/ArtFormatDetector.php index 3b1d82df..f18876f7 100644 --- a/src/ArtFormatDetector.php +++ b/src/ArtFormatDetector.php @@ -7,6 +7,11 @@ */ class ArtFormatDetector { + private const PETSCII_HEURISTIC_MIN_CONTROL_HITS = 4; + private const PETSCII_HEURISTIC_MIN_UNIQUE_CONTROLS = 2; + private const PETSCII_HEURISTIC_MIN_TEXT_RATIO = 0.70; + private const PETSCII_HEURISTIC_MAX_HIGH_BYTE_RATIO = 0.15; + public static function normalizeDetectedEncoding(?string $encoding, ?string $rawBody = null): ?string { if ($encoding !== null && trim($encoding) !== '') { @@ -125,16 +130,55 @@ private static function looksLikePetscii(string $rawBody): bool ]; $controlHits = 0; + $uniqueControls = []; $length = strlen($rawBody); + if ($length === 0) { + return false; + } + + $textishBytes = 0; + $highBytes = 0; + for ($i = 0; $i < $length; $i++) { - if (in_array(ord($rawBody[$i]), $petsciiControlBytes, true)) { + $byte = ord($rawBody[$i]); + + if (in_array($byte, $petsciiControlBytes, true)) { $controlHits++; - if ($controlHits >= 2) { - return true; - } + $uniqueControls[$byte] = true; } + + if ( + $byte === 0x09 || + $byte === 0x0a || + $byte === 0x0d || + ($byte >= 0x20 && $byte <= 0x7e) + ) { + $textishBytes++; + } + + if ($byte >= 0x80) { + $highBytes++; + } + } + + if ($controlHits < self::PETSCII_HEURISTIC_MIN_CONTROL_HITS) { + return false; + } + + if (count($uniqueControls) < self::PETSCII_HEURISTIC_MIN_UNIQUE_CONTROLS) { + return false; + } + + $textRatio = $textishBytes / $length; + if ($textRatio < self::PETSCII_HEURISTIC_MIN_TEXT_RATIO) { + return false; + } + + $highByteRatio = $highBytes / $length; + if ($highByteRatio > self::PETSCII_HEURISTIC_MAX_HIGH_BYTE_RATIO) { + return false; } - return false; + return true; } } diff --git a/src/Version.php b/src/Version.php index de1b7c75..46ed5460 100644 --- a/src/Version.php +++ b/src/Version.php @@ -31,7 +31,7 @@ class Version * This should be updated when releasing new versions. * Format: MAJOR.MINOR.PATCH */ - private const VERSION = '1.8.6'; + private const VERSION = '1.8.7'; /** * Get the current application version diff --git a/tests/Unit/ArtFormatDetectorTest.php b/tests/Unit/ArtFormatDetectorTest.php new file mode 100644 index 00000000..7edd592d --- /dev/null +++ b/tests/Unit/ArtFormatDetectorTest.php @@ -0,0 +1,35 @@ +assertSame('petscii', ArtFormatDetector::detectArtFormat($body, 'PETSCII')); + } + + public function testAnsiSequencesAreDetected(): void + { + $body = "\x1b[31mRED\x1b[0m\n"; + + $this->assertSame('ansi', ArtFormatDetector::detectArtFormat($body, null)); + } + + public function testUnknownEightBitTextIsNotMisclassifiedAsPetscii(): void + { + $body = "Files arrived at Zruspa's BBS\n" + . "Area 957HELP\n" + . "\x91\x94\xe1\xef\xf0\x9d\xee\xeb\xea\xae\xbf\x80\x81\x82\n" + . "Orig: 2:5053/51\n" + . "From: 2:5020/1042\n"; + + $this->assertNull(ArtFormatDetector::detectArtFormat($body, null)); + } +} From 845a2fd3c5e736da257a04b9d0699d9be22ec5b5 Mon Sep 17 00:00:00 2001 From: awehttam Date: Fri, 13 Mar 2026 21:09:28 -0700 Subject: [PATCH 002/246] Show C64 badge in message list for PETSCII messages Add art_format to echomail list queries so the JS can detect PETSCII messages, and display a small C64 badge beside the envelope icon in both the echomail and netmail message lists. Co-Authored-By: Claude Sonnet 4.6 --- public_html/js/echomail.js | 3 ++- public_html/js/netmail.js | 2 +- src/MessageHandler.php | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/public_html/js/echomail.js b/public_html/js/echomail.js index 8fe84bab..dc0a9b96 100644 --- a/public_html/js/echomail.js +++ b/public_html/js/echomail.js @@ -472,6 +472,7 @@ function displayMessages(messages, isThreaded = false) { const isSaved = msg.is_saved == 1; const readClass = isRead ? 'read' : 'unread'; const readIcon = isRead ? `` : ``; + const petsciiIcon = msg.art_format === 'petscii' ? `C64` : ''; const shareIcon = isShared ? `` : ''; const saveIcon = ` - ${threadIcon}${readIcon}${shareIcon}${saveIcon}${escapeHtml(msg.from_name)} + ${threadIcon}${readIcon}${petsciiIcon}${shareIcon}${saveIcon}${escapeHtml(msg.from_name)} ${!currentEchoarea ? `
diff --git a/public_html/js/netmail.js b/public_html/js/netmail.js index 1f2cb230..306a0fb9 100644 --- a/public_html/js/netmail.js +++ b/public_html/js/netmail.js @@ -282,7 +282,7 @@ function displayMessages(messages, isThreaded = false) {
- ${isUnread ? `` : ``}${threadIcon}${escapeHtml(isSent ? `${uiT('ui.common.to_label', 'To:')} ` + msg.to_name : msg.from_name)} + ${isUnread ? `` : ``}${msg.art_format === 'petscii' ? `C64` : ''}${threadIcon}${escapeHtml(isSent ? `${uiT('ui.common.to_label', 'To:')} ` + msg.to_name : msg.from_name)}
diff --git a/src/MessageHandler.php b/src/MessageHandler.php index 99a22158..9920ae2e 100644 --- a/src/MessageHandler.php +++ b/src/MessageHandler.php @@ -297,6 +297,7 @@ public function getEchomail($echoareaTag = null, $domain = null, $page = 1, $lim em.subject, em.date_received, em.date_written, em.echoarea_id, em.message_id, em.reply_to_id, ea.tag as echoarea, ea.color as echoarea_color, ea.domain as echoarea_domain, + COALESCE(NULLIF(em.art_format, ''), NULLIF(ea.art_format_hint, '')) as art_format, CASE WHEN mrs.read_at IS NOT NULL THEN 1 ELSE 0 END as is_read, CASE WHEN sm.id IS NOT NULL THEN 1 ELSE 0 END as is_shared, CASE WHEN sav.id IS NOT NULL THEN 1 ELSE 0 END as is_saved @@ -342,6 +343,7 @@ public function getEchomail($echoareaTag = null, $domain = null, $page = 1, $lim em.subject, em.date_received, em.date_written, em.echoarea_id, em.message_id, em.reply_to_id, ea.tag as echoarea, ea.color as echoarea_color, ea.domain as echoarea_domain, + COALESCE(NULLIF(em.art_format, ''), NULLIF(ea.art_format_hint, '')) as art_format, CASE WHEN mrs.read_at IS NOT NULL THEN 1 ELSE 0 END as is_read, CASE WHEN sm.id IS NOT NULL THEN 1 ELSE 0 END as is_shared, CASE WHEN sav.id IS NOT NULL THEN 1 ELSE 0 END as is_saved From 2501710fbea21e31789fe707e44d23d5db2c9ab9 Mon Sep 17 00:00:00 2001 From: awehttam Date: Fri, 13 Mar 2026 21:12:49 -0700 Subject: [PATCH 003/246] Bump service worker cache version for echomail/netmail JS changes Co-Authored-By: Claude Sonnet 4.6 --- public_html/sw.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public_html/sw.js b/public_html/sw.js index c8bedcf3..8e9284e5 100644 --- a/public_html/sw.js +++ b/public_html/sw.js @@ -1,4 +1,4 @@ -const CACHE_NAME = 'binkcache-v220'; +const CACHE_NAME = 'binkcache-v221'; // Static assets to precache const staticAssets = [ From 965d5ea2225f33e315019998d3a87dcdb424c67a Mon Sep 17 00:00:00 2001 From: awehttam Date: Fri, 13 Mar 2026 21:21:50 -0700 Subject: [PATCH 004/246] Add art_format to all echomail list queries The C64 PETSCII badge was only visible from the two non-threaded flat list queries. All remaining list queries (threaded view, subscribed areas, thread context loading, child/parent loading) were also missing art_format from their SELECT clause. Co-Authored-By: Claude Sonnet 4.6 --- src/MessageHandler.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/MessageHandler.php b/src/MessageHandler.php index 9920ae2e..887bfa21 100644 --- a/src/MessageHandler.php +++ b/src/MessageHandler.php @@ -497,6 +497,7 @@ public function getEchomailFromSubscribedAreas($userId, $page = 1, $limit = null em.subject, em.date_received, em.date_written, em.echoarea_id, em.message_id, em.reply_to_id, ea.tag as echoarea, ea.color as echoarea_color, ea.domain as echoarea_domain, + COALESCE(NULLIF(em.art_format, ''), NULLIF(ea.art_format_hint, '')) as art_format, CASE WHEN mrs.read_at IS NOT NULL THEN 1 ELSE 0 END as is_read, CASE WHEN sm.id IS NOT NULL THEN 1 ELSE 0 END as is_shared, CASE WHEN sav.id IS NOT NULL THEN 1 ELSE 0 END as is_saved @@ -3368,6 +3369,7 @@ private function ensureCompleteThreadContext($messages, $userId) em.subject, em.date_received, em.date_written, em.echoarea_id, em.message_id, em.reply_to_id, ea.tag as echoarea, ea.color as echoarea_color, ea.domain as echoarea_domain, + COALESCE(NULLIF(em.art_format, ''), NULLIF(ea.art_format_hint, '')) as art_format, CASE WHEN mrs.read_at IS NOT NULL THEN 1 ELSE 0 END as is_read, CASE WHEN sm.id IS NOT NULL THEN 1 ELSE 0 END as is_shared, CASE WHEN sav.id IS NOT NULL THEN 1 ELSE 0 END as is_saved @@ -3401,6 +3403,7 @@ private function ensureCompleteThreadContext($messages, $userId) em.subject, em.date_received, em.date_written, em.echoarea_id, em.message_id, em.reply_to_id, ea.tag as echoarea, ea.color as echoarea_color, ea.domain as echoarea_domain, + COALESCE(NULLIF(em.art_format, ''), NULLIF(ea.art_format_hint, '')) as art_format, CASE WHEN mrs.read_at IS NOT NULL THEN 1 ELSE 0 END as is_read, CASE WHEN sm.id IS NOT NULL THEN 1 ELSE 0 END as is_shared, CASE WHEN sav.id IS NOT NULL THEN 1 ELSE 0 END as is_saved @@ -3687,6 +3690,7 @@ private function getThreadedEchomailFromSubscribedAreas($userId, $page = 1, $lim em.subject, em.date_received, em.date_written, em.echoarea_id, em.message_id, em.reply_to_id, ea.tag as echoarea, ea.color as echoarea_color, ea.domain as echoarea_domain, + COALESCE(NULLIF(em.art_format, ''), NULLIF(ea.art_format_hint, '')) as art_format, CASE WHEN mrs.read_at IS NOT NULL THEN 1 ELSE 0 END as is_read, CASE WHEN sm.id IS NOT NULL THEN 1 ELSE 0 END as is_shared, CASE WHEN sav.id IS NOT NULL THEN 1 ELSE 0 END as is_saved @@ -3879,6 +3883,7 @@ public function getThreadedEchomail($echoareaTag = null, $domain = null, $page = em.subject, em.date_received, em.date_written, em.echoarea_id, em.message_id, em.reply_to_id, ea.tag as echoarea, ea.color as echoarea_color, ea.domain as echoarea_domain, + COALESCE(NULLIF(em.art_format, ''), NULLIF(ea.art_format_hint, '')) as art_format, CASE WHEN mrs.read_at IS NOT NULL THEN 1 ELSE 0 END as is_read, CASE WHEN sm.id IS NOT NULL THEN 1 ELSE 0 END as is_shared, CASE WHEN sav.id IS NOT NULL THEN 1 ELSE 0 END as is_saved @@ -3908,6 +3913,7 @@ public function getThreadedEchomail($echoareaTag = null, $domain = null, $page = em.subject, em.date_received, em.date_written, em.echoarea_id, em.message_id, em.reply_to_id, ea.tag as echoarea, ea.color as echoarea_color, ea.domain as echoarea_domain, + COALESCE(NULLIF(em.art_format, ''), NULLIF(ea.art_format_hint, '')) as art_format, CASE WHEN mrs.read_at IS NOT NULL THEN 1 ELSE 0 END as is_read, CASE WHEN sm.id IS NOT NULL THEN 1 ELSE 0 END as is_shared, CASE WHEN sav.id IS NOT NULL THEN 1 ELSE 0 END as is_saved @@ -4007,6 +4013,7 @@ private function loadThreadChildren($rootMessages, $userId) em.subject, em.date_received, em.date_written, em.echoarea_id, em.message_id, em.reply_to_id, ea.tag as echoarea, ea.color as echoarea_color, ea.domain as echoarea_domain, + COALESCE(NULLIF(em.art_format, ''), NULLIF(ea.art_format_hint, '')) as art_format, CASE WHEN mrs.read_at IS NOT NULL THEN 1 ELSE 0 END as is_read, CASE WHEN sm.id IS NOT NULL THEN 1 ELSE 0 END as is_shared, CASE WHEN sav.id IS NOT NULL THEN 1 ELSE 0 END as is_saved @@ -4424,6 +4431,7 @@ private function getThreadContextForMessages($pageMessages, $userId, $echoareaId em.subject, em.date_received, em.date_written, em.echoarea_id, em.message_id, em.reply_to_id, ea.tag as echoarea, ea.color as echoarea_color, ea.domain as echoarea_domain, + COALESCE(NULLIF(em.art_format, ''), NULLIF(ea.art_format_hint, '')) as art_format, CASE WHEN mrs.read_at IS NOT NULL THEN 1 ELSE 0 END as is_read, CASE WHEN sm.id IS NOT NULL THEN 1 ELSE 0 END as is_shared, CASE WHEN sav.id IS NOT NULL THEN 1 ELSE 0 END as is_saved @@ -4464,6 +4472,7 @@ private function getThreadContextForMessages($pageMessages, $userId, $echoareaId em.subject, em.date_received, em.date_written, em.echoarea_id, em.message_id, em.reply_to_id, ea.tag as echoarea, ea.color as echoarea_color, ea.domain as echoarea_domain, + COALESCE(NULLIF(em.art_format, ''), NULLIF(ea.art_format_hint, '')) as art_format, CASE WHEN mrs.read_at IS NOT NULL THEN 1 ELSE 0 END as is_read, CASE WHEN sm.id IS NOT NULL THEN 1 ELSE 0 END as is_shared, CASE WHEN sav.id IS NOT NULL THEN 1 ELSE 0 END as is_saved From f0932eb9dc0d3ec5b93df23416999fea150787e0 Mon Sep 17 00:00:00 2001 From: awehttam Date: Fri, 13 Mar 2026 22:26:53 -0700 Subject: [PATCH 005/246] Add message artwork encoding editor for echomail/netmail Sysops can now edit art_format and message_charset on any echomail message directly from the message reader. Netmail senders/receivers can do the same for their own messages. Edit button (pencil icon) lives in the message header toolbar alongside prev/next navigation. Also adds a C64 badge in message lists for PETSCII-detected messages, fixes art_format missing from echomail list queries in MessageHandler, and updates i18n keys, API routes, and UPGRADING_1.8.7 docs. Co-Authored-By: Claude Sonnet 4.6 --- README.md | 1 + config/i18n/en/common.php | 12 ++++ config/i18n/en/errors.php | 5 ++ config/i18n/es/common.php | 12 ++++ config/i18n/es/errors.php | 5 ++ docs/UPGRADING_1.8.7.md | 31 +++++++++- public_html/js/echomail.js | 55 +++++++++++++++++ public_html/js/netmail.js | 51 ++++++++++++++++ public_html/sw.js | 2 +- routes/api-routes.php | 121 +++++++++++++++++++++++++++++++++++++ templates/echomail.twig | 80 ++++++++++++++++++++++++ templates/netmail.twig | 75 +++++++++++++++++++++++ 12 files changed, 448 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8a334343..79f2d9f0 100644 --- a/README.md +++ b/README.md @@ -579,6 +579,7 @@ Individual versions with specific upgrade documentation: | Version | Date | Highlights | |----------------------------------------|-------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| [1.8.7](docs/UPGRADING_1.8.7.md) | Mar 2026 | In-browser message artwork encoding editor (echomail for sysops, netmail for sender/receiver); fixed false-positive PETSCII detection on import; C64 badge in message lists | | [1.8.6](docs/UPGRADING_1.8.6.md) | Mar 2026 | i18n/localization, SSH daemon, file areas terminal, ZMODEM, telnet ANSI auto-detect, echomail/netmail reader keyboard shortcuts | | [1.8.5](docs/UPGRADING_1.8.5.md) | Mar 4 2026 | Native doors (PTY), StyleCodes rendering, LSC-001 Draft 2 MARKUP kludge, markup format composer selector, allow_markup uplink config key | | [1.8.4](docs/UPGRADING_1.8.4.md) | Mar 1 2026 | Username/real name cross-collision check, MRC room list fix, collapsible compose sidebar, echolist new-tab support | diff --git a/config/i18n/en/common.php b/config/i18n/en/common.php index a990fce0..67338377 100644 --- a/config/i18n/en/common.php +++ b/config/i18n/en/common.php @@ -2571,6 +2571,18 @@ 'ui.echomail.shortcuts.help' => 'Show / hide keyboard shortcuts', 'ui.echomail.shortcuts.close' => 'Close message', 'ui.echomail.shortcuts.dismiss' => 'Press ? or H to close this help', + 'ui.echomail.edit_message' => 'Edit Message', + 'ui.echomail.edit_message_saved' => 'Changes saved.', + 'ui.echomail.art_format' => 'Art Format', + 'ui.echomail.art_format_auto' => 'Auto-detect', + 'ui.echomail.art_format_plain' => 'Plain text', + 'ui.echomail.art_format_ansi' => 'ANSI', + 'ui.echomail.art_format_amiga_ansi' => 'Amiga ANSI', + 'ui.echomail.art_format_petscii' => 'PETSCII / C64', + 'ui.echomail.message_charset' => 'Art Encoding', + 'ui.echomail.message_charset_help' => 'Character encoding of the raw art bytes. Only affects rendering of ANSI/PETSCII art. Leave blank to clear.', + 'ui.common.db_id' => 'DB ID', + 'ui.common.message_id' => 'Message ID', // Admin subscriptions 'ui.admin_subscriptions.page_title' => 'Admin: Manage Subscriptions', diff --git a/config/i18n/en/errors.php b/config/i18n/en/errors.php index 12d66568..5b488965 100644 --- a/config/i18n/en/errors.php +++ b/config/i18n/en/errors.php @@ -55,6 +55,11 @@ 'errors.messages.echomail.bulk_delete.user_not_found' => 'User not found', 'errors.messages.echomail.stats.subscription_required' => 'Subscription required for this echo area', 'errors.messages.echomail.not_found' => 'Message not found', + 'errors.messages.echomail.edit.admin_required' => 'Admin privileges are required', + 'errors.messages.echomail.edit.invalid_art_format' => 'Invalid art format value', + 'errors.messages.echomail.edit.nothing_to_update' => 'No fields to update', + 'errors.messages.echomail.edit.save_failed' => 'Failed to save changes', + 'errors.messages.netmail.edit.forbidden' => 'You do not have permission to edit this message', 'errors.messages.netmail.attachment.no_file' => 'No attachment uploaded', 'errors.messages.netmail.attachment.upload_error' => 'Attachment upload failed', 'errors.messages.netmail.attachment.too_large' => 'Attachment exceeds maximum allowed size', diff --git a/config/i18n/es/common.php b/config/i18n/es/common.php index 77a97c8f..fdb83730 100644 --- a/config/i18n/es/common.php +++ b/config/i18n/es/common.php @@ -2571,6 +2571,18 @@ 'ui.echomail.shortcuts.help' => 'Mostrar / ocultar atajos de teclado', 'ui.echomail.shortcuts.close' => 'Cerrar mensaje', 'ui.echomail.shortcuts.dismiss' => 'Presione ? o H para cerrar esta ayuda', + 'ui.echomail.edit_message' => 'Editar mensaje', + 'ui.echomail.edit_message_saved' => 'Cambios guardados.', + 'ui.echomail.art_format' => 'Formato de arte', + 'ui.echomail.art_format_auto' => 'Deteccion automatica', + 'ui.echomail.art_format_plain' => 'Texto plano', + 'ui.echomail.art_format_ansi' => 'ANSI', + 'ui.echomail.art_format_amiga_ansi' => 'ANSI Amiga', + 'ui.echomail.art_format_petscii' => 'PETSCII / C64', + 'ui.echomail.message_charset' => 'Codificacion de arte', + 'ui.echomail.message_charset_help' => 'Codificacion de caracteres de los bytes de arte sin procesar. Solo afecta la representacion de arte ANSI/PETSCII. Dejar en blanco para borrar.', + 'ui.common.db_id' => 'ID de base de datos', + 'ui.common.message_id' => 'ID de mensaje', // Admin subscriptions 'ui.admin_subscriptions.page_title' => 'Admin: Gestionar suscripciones', diff --git a/config/i18n/es/errors.php b/config/i18n/es/errors.php index 20c8cf00..e64bf00f 100644 --- a/config/i18n/es/errors.php +++ b/config/i18n/es/errors.php @@ -55,6 +55,11 @@ 'errors.messages.echomail.bulk_delete.user_not_found' => 'Usuario no encontrado', 'errors.messages.echomail.stats.subscription_required' => 'Se requiere suscripcion para esta area de eco', 'errors.messages.echomail.not_found' => 'Mensaje no encontrado', + 'errors.messages.echomail.edit.admin_required' => 'Se requieren privilegios de administrador', + 'errors.messages.echomail.edit.invalid_art_format' => 'Formato de arte no valido', + 'errors.messages.echomail.edit.nothing_to_update' => 'No hay campos para actualizar', + 'errors.messages.echomail.edit.save_failed' => 'Error al guardar los cambios', + 'errors.messages.netmail.edit.forbidden' => 'No tienes permiso para editar este mensaje', 'errors.messages.netmail.attachment.no_file' => 'No se subio ningun archivo adjunto', 'errors.messages.netmail.attachment.upload_error' => 'La carga del archivo adjunto fallo', 'errors.messages.netmail.attachment.too_large' => 'El archivo adjunto excede el tamano maximo permitido', diff --git a/docs/UPGRADING_1.8.7.md b/docs/UPGRADING_1.8.7.md index 00e884c0..9b125d17 100644 --- a/docs/UPGRADING_1.8.7.md +++ b/docs/UPGRADING_1.8.7.md @@ -5,6 +5,7 @@ ## Table of Contents - [Summary of Changes](#summary-of-changes) +- [Message Artwork Encoding Editor](#message-artwork-encoding-editor) - [Echomail Art Format Detection](#echomail-art-format-detection) - [Existing Misdetected Messages](#existing-misdetected-messages) - [psql Instructions](#psql-instructions) @@ -15,7 +16,33 @@ ## Summary of Changes -1.8.7 is a maintenance release. +- Sysops can now edit artwork encoding metadata on any echomail message directly + from the message reader — no more manual SQL updates for misdetected art format + or encoding. +- Netmail senders and receivers can similarly correct artwork encoding on their + own messages. +- Fixed a false-positive PETSCII detection bug on import. + +## Message Artwork Encoding Editor + +The message reader now includes an **Edit** button (pencil icon) in the message +header toolbar. This lets you correct artwork rendering metadata that was +auto-detected incorrectly at import time, without touching the database manually. + +**Who can use it:** +- **Echomail** — sysops (admin users) only. +- **Netmail** — the sender or receiver of the message. + +**What you can change:** +- **Art Format** — override the detected artwork type (`Auto`, `Plain Text`, + `ANSI`, `Amiga ANSI`, or `PETSCII / C64`). Setting it to `Auto` clears the + stored override and lets the renderer decide. +- **Art Encoding** — the raw byte encoding used when rendering artwork + (e.g. `CP437`, `PETSCII`, `UTF-8`). Leave blank for the default. + +This is the **preferred way** to fix misdetected messages going forward. The SQL +approach below remains available for bulk corrections or when direct database +access is more convenient. ## Echomail Art Format Detection @@ -97,6 +124,8 @@ Then exit `psql`: - This release does not add a schema migration. - Resetting these columns only affects rendering hints stored in the database. - It does not alter the message body text itself. +- For individual messages the in-browser editor (see above) is easier and safer + than direct SQL. Use the SQL approach for bulk resets or scripted corrections. ## Upgrade Instructions diff --git a/public_html/js/echomail.js b/public_html/js/echomail.js index dc0a9b96..9bde7b33 100644 --- a/public_html/js/echomail.js +++ b/public_html/js/echomail.js @@ -1835,6 +1835,61 @@ function navigateMessage(direction) { } +// Edit message (admin) +function openEditMessage() { + if (!window.isAdmin || !currentMessageData) return; + const msg = currentMessageData; + + const dbId = currentMessageId || msg.id; + $('#editMessageModalTitle').html(`${uiT('ui.echomail.edit_message', 'Edit Message')} #${dbId}`); + $('#editMsgDbId').text(dbId); + $('#editMsgId').text(msg.message_id || ''); + $('#editMsgDate').text(formatFullDate(msg.date_written)); + $('#editMsgFrom').text((msg.from_name || '') + (msg.from_address ? ' <' + msg.from_address + '>' : '')); + $('#editMsgSubject').text(msg.subject || ''); + $('#editArtFormat').val(msg.art_format || ''); + $('#editCharset').val(msg.message_charset || ''); + $('#editMessageError').addClass('d-none'); + $('#editMessageSuccess').addClass('d-none'); + $('#saveEditMessageBtn').prop('disabled', false); + + $('#editMessageModal').modal('show'); +} + +function saveEditMessage() { + if (!window.isAdmin || !currentMessageData) return; + + const artFormat = $('#editArtFormat').val(); + const charset = $('#editCharset').val().trim(); + + $('#editMessageError').addClass('d-none'); + $('#editMessageSuccess').addClass('d-none'); + $('#saveEditMessageBtn').prop('disabled', true); + + $.ajax({ + url: `/api/messages/echomail/${currentMessageId}/edit`, + method: 'POST', + contentType: 'application/json', + data: JSON.stringify({ art_format: artFormat, message_charset: charset }), + }).done(function() { + // Update local cached data so the list badge reflects the change immediately + currentMessageData.art_format = artFormat || null; + currentMessageData.message_charset = charset || null; + const listMsg = currentMessages.find(m => m.id == currentMessageId); + if (listMsg) { + listMsg.art_format = artFormat || null; + } + // Refresh the list row + displayMessages(currentMessages, currentMessages.some(m => m.thread_level > 0)); + $('#editMessageSuccess').removeClass('d-none'); + $('#saveEditMessageBtn').prop('disabled', false); + }).fail(function(xhr) { + const payload = xhr.responseJSON || {}; + $('#editMessageError').text(window.getApiErrorMessage ? window.getApiErrorMessage(payload, uiT('errors.messages.echomail.edit.save_failed', 'Failed to save changes')) : (payload.error || uiT('errors.messages.echomail.edit.save_failed', 'Failed to save changes'))).removeClass('d-none'); + $('#saveEditMessageBtn').prop('disabled', false); + }); +} + // Sharing functionality function showShareDialog(messageId) { currentMessageId = messageId; diff --git a/public_html/js/netmail.js b/public_html/js/netmail.js index 306a0fb9..59f059dd 100644 --- a/public_html/js/netmail.js +++ b/public_html/js/netmail.js @@ -695,8 +695,59 @@ function renderMessageContent(message, parsedMessage, isSent, isInAddressBook) { $('#deleteButton').show().off('click').on('click', function() { deleteMessage(currentMessageId); }); + + // Edit button is always shown — getMessage already enforces sender/receiver access +} + +function openEditMessage() { + if (!currentMessageData) return; + const msg = currentMessageData; + + $('#editMessageModalTitle').html(`${uiT('ui.echomail.edit_message', 'Edit Message')} #${currentMessageId}`); + $('#editMsgDbId').text(currentMessageId); + $('#editMsgId').text(msg.message_id || ''); + $('#editMsgDate').text(formatFullDate(msg.date_written)); + $('#editMsgFrom').text((msg.from_name || '') + (msg.from_address ? ' <' + msg.from_address + '>' : '')); + $('#editMsgSubject').text(msg.subject || ''); + $('#editArtFormat').val(msg.art_format || ''); + $('#editCharset').val(msg.message_charset || ''); + $('#editMessageError').addClass('d-none'); + $('#editMessageSuccess').addClass('d-none'); + $('#saveEditMessageBtn').prop('disabled', false); + + $('#editMessageModal').modal('show'); } +function saveEditMessage() { + if (!currentMessageData) return; + + const artFormat = $('#editArtFormat').val(); + const charset = $('#editCharset').val().trim(); + + $('#editMessageError').addClass('d-none'); + $('#editMessageSuccess').addClass('d-none'); + $('#saveEditMessageBtn').prop('disabled', true); + + $.ajax({ + url: `/api/messages/netmail/${currentMessageId}/edit`, + method: 'POST', + contentType: 'application/json', + data: JSON.stringify({ art_format: artFormat, message_charset: charset }), + }).done(function() { + currentMessageData.art_format = artFormat || null; + currentMessageData.message_charset = charset || null; + const listMsg = currentMessages.find(m => m.id == currentMessageId); + if (listMsg) { + listMsg.art_format = artFormat || null; + } + $('#editMessageSuccess').removeClass('d-none'); + $('#saveEditMessageBtn').prop('disabled', false); + }).fail(function(xhr) { + const payload = xhr.responseJSON || {}; + $('#editMessageError').text(window.getApiErrorMessage ? window.getApiErrorMessage(payload, uiT('errors.messages.echomail.edit.save_failed', 'Failed to save changes')) : (payload.error || uiT('errors.messages.echomail.edit.save_failed', 'Failed to save changes'))).removeClass('d-none'); + $('#saveEditMessageBtn').prop('disabled', false); + }); +} function composeMessage(type, replyToId = null) { window.location.href = `/compose/netmail${replyToId ? '?reply=' + replyToId : ''}`; diff --git a/public_html/sw.js b/public_html/sw.js index 8e9284e5..5b0fd5f4 100644 --- a/public_html/sw.js +++ b/public_html/sw.js @@ -1,4 +1,4 @@ -const CACHE_NAME = 'binkcache-v221'; +const CACHE_NAME = 'binkcache-v223'; // Static assets to precache const staticAssets = [ diff --git a/routes/api-routes.php b/routes/api-routes.php index b5f1beda..fd38f98a 100644 --- a/routes/api-routes.php +++ b/routes/api-routes.php @@ -2884,6 +2884,7 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array $message['attachments'] = []; } + $message['can_edit'] = ((int)($message['user_id'] ?? 0) === (int)$userId); echo json_encode($message); } else { http_response_code(404); @@ -2960,6 +2961,69 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array exit; })->where(['id' => '[0-9]+']); + // Netmail message meta edit endpoint (sender or receiver only) + SimpleRouter::post('/messages/netmail/{id}/edit', function($id) { + $user = RouteHelper::requireAuth(); + + header('Content-Type: application/json'); + + $userId = $user['user_id'] ?? $user['id'] ?? null; + $db = Database::getInstance()->getPdo(); + + // Verify the message exists and belongs to the current user + $stmt = $db->prepare('SELECT user_id FROM netmail WHERE id = ?'); + $stmt->execute([(int)$id]); + $row = $stmt->fetch(\PDO::FETCH_ASSOC); + + if (!$row) { + http_response_code(404); + apiError('errors.messages.netmail.not_found', apiLocalizedText('errors.messages.netmail.not_found', 'Message not found', $user)); + return; + } + + if ((int)$row['user_id'] !== (int)$userId && empty($user['is_admin'])) { + http_response_code(403); + apiError('errors.messages.netmail.edit.forbidden', apiLocalizedText('errors.messages.netmail.edit.forbidden', 'You do not have permission to edit this message', $user)); + return; + } + + $input = json_decode(file_get_contents('php://input'), true) ?? []; + + $validArtFormats = ['', 'ansi', 'amiga_ansi', 'petscii', 'plain']; + $artFormat = isset($input['art_format']) ? strtolower(trim((string)$input['art_format'])) : null; + $charset = isset($input['message_charset']) ? strtoupper(trim((string)$input['message_charset'])) : null; + + if ($artFormat !== null && !in_array($artFormat, $validArtFormats, true)) { + http_response_code(400); + apiError('errors.messages.echomail.edit.invalid_art_format', apiLocalizedText('errors.messages.echomail.edit.invalid_art_format', 'Invalid art format', $user)); + return; + } + + $setClauses = []; + $params = []; + + if ($artFormat !== null) { + $setClauses[] = 'art_format = ?'; + $params[] = $artFormat === '' ? null : $artFormat; + } + if ($charset !== null) { + $setClauses[] = 'message_charset = ?'; + $params[] = $charset === '' ? null : $charset; + } + + if (empty($setClauses)) { + http_response_code(400); + apiError('errors.messages.echomail.edit.nothing_to_update', apiLocalizedText('errors.messages.echomail.edit.nothing_to_update', 'No fields to update', $user)); + return; + } + + $params[] = (int)$id; + $stmt = $db->prepare('UPDATE netmail SET ' . implode(', ', $setClauses) . ' WHERE id = ?'); + $stmt->execute($params); + + echo json_encode(['success' => true]); + })->where(['id' => '[0-9]+']); + SimpleRouter::post('/messages/netmail/bulk-delete', function() { $user = RouteHelper::requireAuth(); @@ -3430,6 +3494,63 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array echo $content; })->where(['id' => '[0-9]+']); + // Echomail message meta edit endpoint (admin only) + SimpleRouter::post('/messages/echomail/{id}/edit', function($id) { + $user = RouteHelper::requireAuth(); + + header('Content-Type: application/json'); + + if (empty($user['is_admin'])) { + http_response_code(403); + apiError('errors.messages.echomail.edit.admin_required', apiLocalizedText('errors.messages.echomail.edit.admin_required', 'Admin access required', $user)); + return; + } + + $db = Database::getInstance()->getPdo(); + $input = json_decode(file_get_contents('php://input'), true) ?? []; + + $validArtFormats = ['', 'ansi', 'amiga_ansi', 'petscii', 'plain']; + $artFormat = isset($input['art_format']) ? strtolower(trim((string)$input['art_format'])) : null; + $charset = isset($input['message_charset']) ? strtoupper(trim((string)$input['message_charset'])) : null; + + if ($artFormat !== null && !in_array($artFormat, $validArtFormats, true)) { + http_response_code(400); + apiError('errors.messages.echomail.edit.invalid_art_format', apiLocalizedText('errors.messages.echomail.edit.invalid_art_format', 'Invalid art format', $user)); + return; + } + + // Build update + $setClauses = []; + $params = []; + + if ($artFormat !== null) { + $setClauses[] = 'art_format = ?'; + $params[] = $artFormat === '' ? null : $artFormat; + } + if ($charset !== null) { + $setClauses[] = 'message_charset = ?'; + $params[] = $charset === '' ? null : $charset; + } + + if (empty($setClauses)) { + http_response_code(400); + apiError('errors.messages.echomail.edit.nothing_to_update', apiLocalizedText('errors.messages.echomail.edit.nothing_to_update', 'No fields to update', $user)); + return; + } + + $params[] = (int)$id; + $stmt = $db->prepare('UPDATE echomail SET ' . implode(', ', $setClauses) . ' WHERE id = ?'); + $stmt->execute($params); + + if ($stmt->rowCount() === 0) { + http_response_code(404); + apiError('errors.messages.echomail.not_found', apiLocalizedText('errors.messages.echomail.not_found', 'Message not found', $user)); + return; + } + + echo json_encode(['success' => true]); + })->where(['id' => '[0-9]+']); + SimpleRouter::get('/messages/echomail/{echoarea}', function($echoarea) { $user = RouteHelper::requireAuth(); diff --git a/templates/echomail.twig b/templates/echomail.twig index 759d4f56..065180e1 100644 --- a/templates/echomail.twig +++ b/templates/echomail.twig @@ -274,6 +274,11 @@ + {% if current_user.is_admin %} + + {% endif %} + +
+ + + + + + + + + + + + + + + + + + + + + + + +
{{ t('ui.common.db_id', {}, locale, ['common']) }}
{{ t('ui.common.message_id', {}, locale, ['common']) }}
{{ t('ui.common.date_label', {}, locale, ['common']) }}
{{ t('ui.common.from_label', {}, locale, ['common']) }}
{{ t('ui.common.subject_label', {}, locale, ['common']) }}
+
+
+ + +
+
+ + + + +
{{ t('ui.echomail.message_charset_help', {}, locale, ['common']) }}
+
+
+
+ {{ t('ui.echomail.edit_message_saved', {}, locale, ['common']) }} +
+
+
+ + +
+ + + +{% endif %} {% endblock %} {% block styles %} diff --git a/templates/netmail.twig b/templates/netmail.twig index 23b79a6c..545bdae7 100644 --- a/templates/netmail.twig +++ b/templates/netmail.twig @@ -153,6 +153,9 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
{{ t('ui.common.db_id', {}, locale, ['common']) }}
{{ t('ui.common.message_id', {}, locale, ['common']) }}
{{ t('ui.common.date_label', {}, locale, ['common']) }}
{{ t('ui.common.from_label', {}, locale, ['common']) }}
{{ t('ui.common.subject_label', {}, locale, ['common']) }}
+
+
+ + +
+
+ + + + +
{{ t('ui.echomail.message_charset_help', {}, locale, ['common']) }}
+
+
+
+ {{ t('ui.echomail.edit_message_saved', {}, locale, ['common']) }} +
+
+
+ + +
+ + + {% endblock %} {% block scripts %} From f4d7f9a0e43e9d4e88fdfbb1b3d701695e8e0027 Mon Sep 17 00:00:00 2001 From: awehttam Date: Sat, 14 Mar 2026 09:10:09 -0700 Subject: [PATCH 006/246] Add advanced message search with date range and trigram indexes - Advanced Search modal on echomail and netmail with per-field filters (poster name, subject, body) and date range picker; fields ANDed together - Simple search bar unchanged - Backend: field-specific ILIKE conditions built separately from general q= search; date range computed in PHP to avoid PDO/pgsql ::cast issues - Performance: derive echoarea and filter counts from already-fetched results instead of running two additional full-table ILIKE scans - Add trigram GIN indexes (pg_trgm) on echomail/netmail subject and message_text for fast substring search - Add index on echomail(date_received) for date range filtering - Fix search returning blank response caused by bytea raw_message_bytes column being included in SELECT em.* and returned as unserializable PHP resource - Fix stale message list showing after search failure (fail handler now clears the container) - Update UPGRADING_1.8.7.md with search and reindex notes Co-Authored-By: Claude Sonnet 4.6 --- config/i18n/en/common.php | 13 + config/i18n/es/common.php | 13 + ...1.11.0.11_echomail_date_received_index.sql | 5 + .../v1.11.0.12_trigram_search_indexes.sql | 11 + docs/UPGRADING_1.8.7.md | 28 ++ public_html/js/echomail.js | 93 ++++++- public_html/js/netmail.js | 67 ++++- public_html/sw.js | 2 +- routes/api-routes.php | 76 +++++- src/MessageHandler.php | 246 +++++++++++++++--- templates/echomail.twig | 55 +++- templates/netmail.twig | 55 +++- 12 files changed, 616 insertions(+), 48 deletions(-) create mode 100644 database/migrations/v1.11.0.11_echomail_date_received_index.sql create mode 100644 database/migrations/v1.11.0.12_trigram_search_indexes.sql diff --git a/config/i18n/en/common.php b/config/i18n/en/common.php index 67338377..18406030 100644 --- a/config/i18n/en/common.php +++ b/config/i18n/en/common.php @@ -32,6 +32,19 @@ 'ui.common.import' => 'Import', 'ui.common.search_placeholder' => 'Search...', 'ui.common.search_messages_placeholder' => 'Search messages...', + 'ui.common.advanced_search' => 'Advanced Search', + 'ui.common.advanced_search.title' => 'Advanced Search', + 'ui.common.advanced_search.from_name' => 'From / Poster Name', + 'ui.common.advanced_search.from_name_placeholder' => 'Search by poster...', + 'ui.common.advanced_search.subject' => 'Subject', + 'ui.common.advanced_search.subject_placeholder' => 'Search by subject...', + 'ui.common.advanced_search.body' => 'Message Body', + 'ui.common.advanced_search.body_placeholder' => 'Search in message body...', + 'ui.common.advanced_search.help' => 'Fill in one or more fields. Fields are combined with AND logic.', + 'ui.common.advanced_search.date_from' => 'Date From', + 'ui.common.advanced_search.date_to' => 'Date To', + 'ui.common.advanced_search.date_range' => 'Date Range', + 'ui.common.advanced_search.fill_one_field' => 'Please fill in at least one field (minimum 2 characters for text fields).', 'ui.common.all' => 'All', 'ui.common.all_messages' => 'All Messages', 'ui.common.unread' => 'Unread', diff --git a/config/i18n/es/common.php b/config/i18n/es/common.php index fdb83730..f5f17585 100644 --- a/config/i18n/es/common.php +++ b/config/i18n/es/common.php @@ -32,6 +32,19 @@ 'ui.common.import' => 'Importar', 'ui.common.search_placeholder' => 'Buscar...', 'ui.common.search_messages_placeholder' => 'Buscar mensajes...', + 'ui.common.advanced_search' => 'Búsqueda avanzada', + 'ui.common.advanced_search.title' => 'Búsqueda avanzada', + 'ui.common.advanced_search.from_name' => 'De / Nombre del autor', + 'ui.common.advanced_search.from_name_placeholder' => 'Buscar por autor...', + 'ui.common.advanced_search.subject' => 'Asunto', + 'ui.common.advanced_search.subject_placeholder' => 'Buscar por asunto...', + 'ui.common.advanced_search.body' => 'Cuerpo del mensaje', + 'ui.common.advanced_search.body_placeholder' => 'Buscar en el cuerpo del mensaje...', + 'ui.common.advanced_search.help' => 'Complete uno o más campos. Los campos se combinan con lógica AND.', + 'ui.common.advanced_search.date_from' => 'Fecha desde', + 'ui.common.advanced_search.date_to' => 'Fecha hasta', + 'ui.common.advanced_search.date_range' => 'Rango de fechas', + 'ui.common.advanced_search.fill_one_field' => 'Por favor complete al menos un campo (mínimo 2 caracteres para campos de texto).', 'ui.common.all' => 'Todos', 'ui.common.all_messages' => 'Todos los mensajes', 'ui.common.unread' => 'No leidos', diff --git a/database/migrations/v1.11.0.11_echomail_date_received_index.sql b/database/migrations/v1.11.0.11_echomail_date_received_index.sql new file mode 100644 index 00000000..cfc1ee96 --- /dev/null +++ b/database/migrations/v1.11.0.11_echomail_date_received_index.sql @@ -0,0 +1,5 @@ +-- v1.11.0.11 - Add index on echomail(date_received) for date range search performance +-- date_written already has an index; date_received did not, causing full table scans +-- when ECHOMAIL_ORDER_DATE is set to 'received' (the default). + +CREATE INDEX IF NOT EXISTS idx_echomail_date_received ON echomail(date_received); diff --git a/database/migrations/v1.11.0.12_trigram_search_indexes.sql b/database/migrations/v1.11.0.12_trigram_search_indexes.sql new file mode 100644 index 00000000..504c0787 --- /dev/null +++ b/database/migrations/v1.11.0.12_trigram_search_indexes.sql @@ -0,0 +1,11 @@ +-- v1.11.0.12 - Add trigram GIN indexes for fast ILIKE search on message text and subject +-- Without these, ILIKE '%term%' does a full sequential table scan. +-- pg_trgm lets PostgreSQL use a GIN index for arbitrary substring/ILIKE queries. +-- Initial index build may take a moment on large tables. + +CREATE EXTENSION IF NOT EXISTS pg_trgm; + +CREATE INDEX IF NOT EXISTS idx_echomail_subject_trgm ON echomail USING GIN (subject gin_trgm_ops); +CREATE INDEX IF NOT EXISTS idx_echomail_body_trgm ON echomail USING GIN (message_text gin_trgm_ops); +CREATE INDEX IF NOT EXISTS idx_netmail_subject_trgm ON netmail USING GIN (subject gin_trgm_ops); +CREATE INDEX IF NOT EXISTS idx_netmail_body_trgm ON netmail USING GIN (message_text gin_trgm_ops); diff --git a/docs/UPGRADING_1.8.7.md b/docs/UPGRADING_1.8.7.md index 9b125d17..77eeb647 100644 --- a/docs/UPGRADING_1.8.7.md +++ b/docs/UPGRADING_1.8.7.md @@ -5,6 +5,8 @@ ## Table of Contents - [Summary of Changes](#summary-of-changes) +- [Enhanced Message Search](#enhanced-message-search) + - [Search Reindexing](#search-reindexing) - [Message Artwork Encoding Editor](#message-artwork-encoding-editor) - [Echomail Art Format Detection](#echomail-art-format-detection) - [Existing Misdetected Messages](#existing-misdetected-messages) @@ -16,6 +18,10 @@ ## Summary of Changes +- Added advanced message search with per-field filtering (poster name, subject, + message body) and date range support for both echomail and netmail. +- Search performance significantly improved via trigram GIN indexes on subject + and message body columns. - Sysops can now edit artwork encoding metadata on any echomail message directly from the message reader — no more manual SQL updates for misdetected art format or encoding. @@ -23,6 +29,28 @@ own messages. - Fixed a false-positive PETSCII detection bug on import. +## Enhanced Message Search + +The search sidebar now includes an **Advanced Search** button (sliders icon) +that opens a modal with individual fields for poster name, subject, message body, +and a date range picker. Fields are combined with AND logic — fill in only the +ones you need. + +The simple search bar continues to work as before (searches across all fields at +once). + +### Search Reindexing + +This release adds trigram GIN indexes (`pg_trgm`) on the `subject` and +`message_text` columns of both `echomail` and `netmail`. These indexes make +`ILIKE '%term%'` searches fast regardless of table size. + +**`setup.php` will build these indexes automatically, but on large message +databases the process may take a few minutes.** The upgrade will appear to pause +at the migration step — this is normal. Do not interrupt it. + +A date range index on `echomail(date_received)` is also added in this release. + ## Message Artwork Encoding Editor The message reader now includes an **Edit** button (pencil icon) in the message diff --git a/public_html/js/echomail.js b/public_html/js/echomail.js index 9bde7b33..ac2857af 100644 --- a/public_html/js/echomail.js +++ b/public_html/js/echomail.js @@ -1074,7 +1074,8 @@ function searchMessages() { $('#mobileSearchCollapse').collapse('hide'); }) .fail(function() { - showError(uiT('ui.echomail.search.failed', 'Search failed')); + $('#messagesContainer').html('
' + uiT('ui.echomail.search.failed', 'Search failed') + '
'); + $('#pagination').empty(); }); } @@ -1085,6 +1086,96 @@ function searchMessagesFromMobile() { searchMessages(); } +function openAdvancedSearch() { + $('#advSearchFromName').val(''); + $('#advSearchSubject').val(''); + $('#advSearchBody').val(''); + $('#advSearchDateFrom').val(''); + $('#advSearchDateTo').val(''); + $('#advSearchError').addClass('d-none').text(''); + $('#advancedSearchModal').modal('show'); +} + +function runAdvancedSearch() { + const fromName = $('#advSearchFromName').val().trim(); + const subject = $('#advSearchSubject').val().trim(); + const body = $('#advSearchBody').val().trim(); + const dateFrom = $('#advSearchDateFrom').val(); + const dateTo = $('#advSearchDateTo').val(); + + const textFields = [fromName, subject, body].filter(v => v.length > 0); + const hasDate = dateFrom || dateTo; + + // Validate: at least one field filled, and text fields must be 2+ chars each + if (textFields.length === 0 && !hasDate) { + $('#advSearchError') + .removeClass('d-none') + .text(window.t('ui.common.advanced_search.fill_one_field', {}, 'Please fill in at least one field (minimum 2 characters for text fields).')); + return; + } + if (textFields.some(v => v.length < 2)) { + $('#advSearchError') + .removeClass('d-none') + .text(window.t('ui.common.advanced_search.fill_one_field', {}, 'Please fill in at least one field (minimum 2 characters for text fields).')); + return; + } + + $('#advSearchError').addClass('d-none'); + $('#advancedSearchModal').modal('hide'); + showLoading('#messagesContainer'); + + // Collect text search terms for highlighting + currentSearchTerms = [fromName, subject, body] + .filter(v => v.length > 0) + .join(' ') + .toLowerCase() + .split(/\s+/) + .filter(term => term.length > 1); + + const params = new URLSearchParams({ type: 'echomail' }); + if (fromName) params.set('from_name', fromName); + if (subject) params.set('subject', subject); + if (body) params.set('body', body); + if (dateFrom) params.set('date_from', dateFrom); + if (dateTo) params.set('date_to', dateTo); + if (currentEchoarea) params.set('echoarea', currentEchoarea); + + $.get('/api/messages/search?' + params.toString()) + .done(function(data) { + displayMessages(data.messages); + $('#pagination').empty(); + + if (!originalFilterCounts) { + originalFilterCounts = { + all: parseInt($('#allCount').text()) || 0, + unread: parseInt($('#unreadCount').text()) || 0, + read: parseInt($('#readCount').text()) || 0, + tome: parseInt($('#toMeCount').text()) || 0, + saved: parseInt($('#savedCount').text()) || 0, + drafts: parseInt($('#draftsCount').text()) || 0 + }; + } + + if (data.echoarea_counts) { + searchResultCounts = data.echoarea_counts; + isSearchActive = true; + updateEchoareaCountsWithSearchResults(); + showClearSearchButton(); + } + + if (data.filter_counts) { + searchFilterCounts = data.filter_counts; + updateFilterCounts(data.filter_counts); + } + + $('#mobileSearchCollapse').collapse('hide'); + }) + .fail(function() { + $('#messagesContainer').html('
' + uiT('ui.echomail.search.failed', 'Search failed') + '
'); + $('#pagination').empty(); + }); +} + function updateEchoareaCountsWithSearchResults() { if (!searchResultCounts) return; diff --git a/public_html/js/netmail.js b/public_html/js/netmail.js index 59f059dd..c2cfd569 100644 --- a/public_html/js/netmail.js +++ b/public_html/js/netmail.js @@ -788,7 +788,72 @@ function searchMessages() { $('#pagination').empty(); }) .fail(function() { - showError(uiT('ui.netmail.search.failed', 'Search failed')); + $('#messagesContainer').html('
' + uiT('ui.netmail.search.failed', 'Search failed') + '
'); + $('#pagination').empty(); + }); +} + +function openAdvancedSearch() { + $('#advSearchFromName').val(''); + $('#advSearchSubject').val(''); + $('#advSearchBody').val(''); + $('#advSearchDateFrom').val(''); + $('#advSearchDateTo').val(''); + $('#advSearchError').addClass('d-none').text(''); + $('#advancedSearchModal').modal('show'); +} + +function runAdvancedSearch() { + const fromName = $('#advSearchFromName').val().trim(); + const subject = $('#advSearchSubject').val().trim(); + const body = $('#advSearchBody').val().trim(); + const dateFrom = $('#advSearchDateFrom').val(); + const dateTo = $('#advSearchDateTo').val(); + + const textFields = [fromName, subject, body].filter(v => v.length > 0); + const hasDate = dateFrom || dateTo; + + // Validate: at least one field filled, and text fields must be 2+ chars each + if (textFields.length === 0 && !hasDate) { + $('#advSearchError') + .removeClass('d-none') + .text(window.t('ui.common.advanced_search.fill_one_field', {}, 'Please fill in at least one field (minimum 2 characters for text fields).')); + return; + } + if (textFields.some(v => v.length < 2)) { + $('#advSearchError') + .removeClass('d-none') + .text(window.t('ui.common.advanced_search.fill_one_field', {}, 'Please fill in at least one field (minimum 2 characters for text fields).')); + return; + } + + $('#advSearchError').addClass('d-none'); + $('#advancedSearchModal').modal('hide'); + showLoading('#messagesContainer'); + + // Collect text search terms for highlighting + currentSearchTerms = [fromName, subject, body] + .filter(v => v.length > 0) + .join(' ') + .toLowerCase() + .split(/\s+/) + .filter(term => term.length > 1); + + const params = new URLSearchParams({ type: 'netmail' }); + if (fromName) params.set('from_name', fromName); + if (subject) params.set('subject', subject); + if (body) params.set('body', body); + if (dateFrom) params.set('date_from', dateFrom); + if (dateTo) params.set('date_to', dateTo); + + $.get('/api/messages/search?' + params.toString()) + .done(function(data) { + displayMessages(data.messages); + $('#pagination').empty(); + }) + .fail(function() { + $('#messagesContainer').html('
' + uiT('ui.netmail.search.failed', 'Search failed') + '
'); + $('#pagination').empty(); }); } diff --git a/public_html/sw.js b/public_html/sw.js index 5b0fd5f4..b5941353 100644 --- a/public_html/sw.js +++ b/public_html/sw.js @@ -1,4 +1,4 @@ -const CACHE_NAME = 'binkcache-v223'; +const CACHE_NAME = 'binkcache-v226'; // Static assets to precache const staticAssets = [ diff --git a/routes/api-routes.php b/routes/api-routes.php index fd38f98a..85ecdd70 100644 --- a/routes/api-routes.php +++ b/routes/api-routes.php @@ -4053,6 +4053,8 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array header('Content-Type: application/json'); + try { + $query = $_GET['q'] ?? ''; $type = $_GET['type'] ?? null; $echoarea = $_GET['echoarea'] ?? null; @@ -4062,7 +4064,41 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array $echoarea = urldecode($echoarea); } - if (strlen($query) < 2) { + // Collect field-specific search params + $searchParams = []; + if (!empty($_GET['from_name'])) { + $searchParams['from_name'] = $_GET['from_name']; + } + if (!empty($_GET['subject'])) { + $searchParams['subject'] = $_GET['subject']; + } + if (!empty($_GET['body'])) { + $searchParams['body'] = $_GET['body']; + } + // Date range params — validate YYYY-MM-DD format + foreach (['date_from', 'date_to'] as $dateKey) { + if (!empty($_GET[$dateKey])) { + $val = $_GET[$dateKey]; + if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $val)) { + $searchParams[$dateKey] = $val; + } + } + } + + $hasTextParams = !empty($searchParams['from_name']) || !empty($searchParams['subject']) || !empty($searchParams['body']); + $hasDateParams = !empty($searchParams['date_from']) || !empty($searchParams['date_to']); + $hasAdvancedParams = $hasTextParams || $hasDateParams; + + // Validate: need a general query of 2+ chars, or at least one valid text/date field + if ($hasTextParams) { + foreach (['from_name', 'subject', 'body'] as $textKey) { + if (isset($searchParams[$textKey]) && strlen($searchParams[$textKey]) < 2) { + http_response_code(400); + apiError('errors.messages.search.query_too_short', apiLocalizedText('errors.messages.search.query_too_short', 'Search query must be at least 2 characters', $user)); + return; + } + } + } elseif (!$hasDateParams && strlen($query) < 2) { http_response_code(400); apiError('errors.messages.search.query_too_short', apiLocalizedText('errors.messages.search.query_too_short', 'Search query must be at least 2 characters', $user)); return; @@ -4073,21 +4109,47 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array // Handle both 'user_id' and 'id' field names for compatibility $userId = $user['user_id'] ?? $user['id'] ?? null; - $messages = $handler->searchMessages($query, $type, $echoarea, $userId); + $messages = $handler->searchMessages($query, $type, $echoarea, $userId, $searchParams); - // For echomail searches, also get per-echo-area counts and filter counts + // For echomail searches, derive per-echo-area counts from already-fetched results + // and compute filter counts by PK lookup — avoids re-running the expensive search query. $echoareaCounts = []; $filterCounts = []; if ($type === 'echomail' || $type === null) { - $echoareaCounts = $handler->getSearchResultCounts($query, $echoarea, $userId); - $filterCounts = $handler->getSearchFilterCounts($query, $echoarea, $userId); + $countMap = []; + foreach ($messages as $msg) { + $tag = $msg['echoarea'] ?? ''; + $domain = $msg['echoarea_domain'] ?? ''; + $key = "{$tag}@{$domain}"; + if (!isset($countMap[$key])) { + $countMap[$key] = ['tag' => $tag, 'domain' => $domain, 'message_count' => 0]; + } + $countMap[$key]['message_count']++; + } + $echoareaCounts = array_values($countMap); + + $messageIds = array_column($messages, 'id'); + $filterCounts = $handler->getSearchFilterCountsByIds($messageIds, $userId); } - echo json_encode([ + $json = json_encode([ 'messages' => $messages, 'echoarea_counts' => $echoareaCounts, 'filter_counts' => $filterCounts - ]); + ], JSON_INVALID_UTF8_SUBSTITUTE); + + if ($json === false) { + http_response_code(500); + echo json_encode(['error' => 'Failed to encode results: ' . json_last_error_msg()]); + return; + } + + echo $json; + + } catch (\Throwable $e) { + http_response_code(500); + echo json_encode(['error' => $e->getMessage(), 'trace' => $e->getFile() . ':' . $e->getLine()]); + } }); // Mark message as read diff --git a/src/MessageHandler.php b/src/MessageHandler.php index 887bfa21..6bab4139 100644 --- a/src/MessageHandler.php +++ b/src/MessageHandler.php @@ -1267,26 +1267,117 @@ public function getEchoareas($userId = null, $subscribedOnly = false) return $stmt->fetchAll(); } - public function searchMessages($query, $type = null, $echoarea = null, $userId = null) + /** + * Build a SQL WHERE fragment for text-based message searches. + * Returns [null, []] when no text search terms are present (date-only searches). + * + * @param string $query General search query used when $searchParams has no text fields + * @param array $searchParams Field-specific params: keys 'from_name', 'subject', 'body', 'date_from', 'date_to' + * @param string $tableAlias Table alias prefix, e.g. 'em.' or '' + * @return array [string|null $whereFragment, array $bindParams] + */ + private function buildSearchWhereFragment($query, $searchParams, $tableAlias = '') + { + $conditions = []; + $params = []; + + $hasFieldSearch = !empty($searchParams['from_name']) || !empty($searchParams['subject']) || !empty($searchParams['body']); + + if ($hasFieldSearch) { + if (!empty($searchParams['from_name'])) { + $conditions[] = $tableAlias . 'from_name ILIKE ?'; + $params[] = '%' . $searchParams['from_name'] . '%'; + } + if (!empty($searchParams['subject'])) { + $conditions[] = $tableAlias . 'subject ILIKE ?'; + $params[] = '%' . $searchParams['subject'] . '%'; + } + if (!empty($searchParams['body'])) { + $conditions[] = $tableAlias . 'message_text ILIKE ?'; + $params[] = '%' . $searchParams['body'] . '%'; + } + return ['(' . implode(' AND ', $conditions) . ')', $params]; + } + + if ($query !== '') { + $searchTerm = '%' . $query . '%'; + return [ + '(' . $tableAlias . 'subject ILIKE ? OR ' . $tableAlias . 'message_text ILIKE ? OR ' . $tableAlias . 'from_name ILIKE ?)', + [$searchTerm, $searchTerm, $searchTerm] + ]; + } + + // No text search terms — caller handles date-only searches + return [null, []]; + } + + /** + * Build SQL conditions for date range filtering. + * Date arithmetic is done in PHP to avoid PDO/pgsql issues with ?::cast syntax. + * + * @param array $searchParams Keys 'date_from' and/or 'date_to' (YYYY-MM-DD strings) + * @param string $dateColumn Fully-qualified column name, e.g. 'em.date_received' + * @return array [array $conditions, array $bindParams] + */ + private function buildDateRangeConditions($searchParams, $dateColumn) { - $searchTerm = '%' . $query . '%'; + $conditions = []; + $params = []; + + if (!empty($searchParams['date_from'])) { + $conditions[] = "{$dateColumn} >= ?"; + $params[] = $searchParams['date_from'] . ' 00:00:00'; + } + if (!empty($searchParams['date_to'])) { + // Advance by one day so the range is inclusive of the end date + $dateTo = new \DateTime($searchParams['date_to']); + $dateTo->modify('+1 day'); + $conditions[] = "{$dateColumn} < ?"; + $params[] = $dateTo->format('Y-m-d') . ' 00:00:00'; + } + return [$conditions, $params]; + } + + /** + * Search messages by query or field-specific parameters. + * + * @param string $query General search query (used when $searchParams is empty) + * @param string|null $type 'echomail' or 'netmail' + * @param string|null $echoarea Echo area tag to restrict search + * @param int|null $userId User ID for permission checking + * @param array $searchParams Field-specific search: keys 'from_name', 'subject', 'body', 'date_from', 'date_to' + * @return array + */ + public function searchMessages($query, $type = null, $echoarea = null, $userId = null, $searchParams = []) + { if ($type === 'netmail') { if ($userId === null) { // If no user ID provided, return empty results for privacy return []; } - $stmt = $this->db->prepare(" - SELECT * FROM netmail - WHERE (subject ILIKE ? OR message_text ILIKE ? OR from_name ILIKE ?) - AND user_id = ? - ORDER BY CASE - WHEN date_received > NOW() THEN 0 - ELSE 1 - END, date_received DESC - LIMIT 50 - "); - $stmt->execute([$searchTerm, $searchTerm, $searchTerm, $userId]); + [$whereFragment, $searchBindParams] = $this->buildSearchWhereFragment($query, $searchParams, ''); + [$dateConditions, $dateParams] = $this->buildDateRangeConditions($searchParams, 'date_received'); + + $sql = "SELECT id, from_name, from_address, to_name, to_address, + subject, date_received, date_written, message_id, reply_to_id, + art_format, message_charset, user_id, + deleted_by_sender, deleted_by_recipient + FROM netmail WHERE user_id = ?"; + $params = [$userId]; + + if ($whereFragment !== null) { + $sql .= " AND {$whereFragment}"; + $params = array_merge($params, $searchBindParams); + } + foreach ($dateConditions as $cond) { + $sql .= " AND {$cond}"; + } + $params = array_merge($params, $dateParams); + + $sql .= " ORDER BY CASE WHEN date_received > NOW() THEN 0 ELSE 1 END, date_received DESC LIMIT 50"; + $stmt = $this->db->prepare($sql); + $stmt->execute($params); } else { $dateField = $this->getEchomailDateField(); $isAdmin = false; @@ -1294,14 +1385,30 @@ public function searchMessages($query, $type = null, $echoarea = null, $userId = $user = $this->getUserById($userId); $isAdmin = $user && !empty($user['is_admin']); } + [$whereFragment, $searchBindParams] = $this->buildSearchWhereFragment($query, $searchParams, 'em.'); + [$dateConditions, $dateParams] = $this->buildDateRangeConditions($searchParams, "em.{$dateField}"); + $sql = " - SELECT em.*, ea.tag as echoarea, ea.color as echoarea_color, ea.domain as echoarea_domain + SELECT em.id, em.from_name, em.from_address, em.to_name, + em.subject, em.date_received, em.date_written, em.echoarea_id, + em.message_id, em.reply_to_id, + COALESCE(NULLIF(em.art_format, ''), NULLIF(ea.art_format_hint, '')) as art_format, + ea.tag as echoarea, ea.color as echoarea_color, ea.domain as echoarea_domain FROM echomail em JOIN echoareas ea ON em.echoarea_id = ea.id - WHERE (em.subject ILIKE ? OR em.message_text ILIKE ? OR em.from_name ILIKE ?) + WHERE 1=1 "; + $params = []; + + if ($whereFragment !== null) { + $sql .= " AND {$whereFragment}"; + $params = array_merge($params, $searchBindParams); + } + foreach ($dateConditions as $cond) { + $sql .= " AND {$cond}"; + } + $params = array_merge($params, $dateParams); - $params = [$searchTerm, $searchTerm, $searchTerm]; if (!$isAdmin) { $sql .= " AND COALESCE(ea.is_sysop_only, FALSE) = FALSE"; } @@ -1311,7 +1418,7 @@ public function searchMessages($query, $type = null, $echoarea = null, $userId = $params[] = $echoarea; } - $sql .= " ORDER BY CASE WHEN em.{$dateField} > NOW() THEN 0 ELSE 1 END, em.{$dateField} DESC"; + $sql .= " ORDER BY CASE WHEN em.{$dateField} > NOW() THEN 0 ELSE 1 END, em.{$dateField} DESC LIMIT 200"; $stmt = $this->db->prepare($sql); $stmt->execute($params); @@ -1326,12 +1433,11 @@ public function searchMessages($query, $type = null, $echoarea = null, $userId = * @param string $query The search query * @param string|null $echoarea Optional specific echo area to search within * @param int|null $userId User ID for permission checking + * @param array $searchParams Field-specific search: keys 'from_name', 'subject', 'body', 'date_from', 'date_to' * @return array Array with filter counts */ - public function getSearchFilterCounts($query, $echoarea = null, $userId = null) + public function getSearchFilterCounts($query, $echoarea = null, $userId = null, $searchParams = []) { - $searchTerm = '%' . $query . '%'; - $isAdmin = false; $userRealName = null; if ($userId) { @@ -1340,6 +1446,10 @@ public function getSearchFilterCounts($query, $echoarea = null, $userId = null) $userRealName = $user['real_name'] ?? null; } + $dateField = $this->getEchomailDateField(); + [$whereFragment, $searchBindParams] = $this->buildSearchWhereFragment($query, $searchParams, 'em.'); + [$dateConditions, $dateParams] = $this->buildDateRangeConditions($searchParams, "em.{$dateField}"); + $sql = " SELECT COUNT(*) as all_count, @@ -1355,11 +1465,19 @@ public function getSearchFilterCounts($query, $echoarea = null, $userId = null) LEFT JOIN saved_messages sm ON sm.message_id = em.id AND sm.message_type = 'echomail' AND sm.user_id = ? - WHERE (em.subject ILIKE ? OR em.message_text ILIKE ? OR em.from_name ILIKE ?) - AND ea.is_active = TRUE + WHERE ea.is_active = TRUE "; - $params = [$userRealName, $userId, $userId, $searchTerm, $searchTerm, $searchTerm]; + $params = [$userRealName, $userId, $userId]; + + if ($whereFragment !== null) { + $sql .= " AND {$whereFragment}"; + $params = array_merge($params, $searchBindParams); + } + foreach ($dateConditions as $cond) { + $sql .= " AND {$cond}"; + } + $params = array_merge($params, $dateParams); if (!$isAdmin) { $sql .= " AND COALESCE(ea.is_sysop_only, FALSE) = FALSE"; @@ -1391,18 +1509,35 @@ public function getSearchFilterCounts($query, $echoarea = null, $userId = null) * @param string $query The search query * @param string|null $echoarea Optional specific echo area to search within * @param int|null $userId User ID for permission checking + * @param array $searchParams Field-specific search: keys 'from_name', 'subject', 'body', 'date_from', 'date_to' * @return array Array of echo areas with their search result counts */ - public function getSearchResultCounts($query, $echoarea = null, $userId = null) + public function getSearchResultCounts($query, $echoarea = null, $userId = null, $searchParams = []) { - $searchTerm = '%' . $query . '%'; - $isAdmin = false; if ($userId) { $user = $this->getUserById($userId); $isAdmin = $user && !empty($user['is_admin']); } + $dateField = $this->getEchomailDateField(); + [$whereFragment, $searchBindParams] = $this->buildSearchWhereFragment($query, $searchParams, 'em.'); + [$dateConditions, $dateParams] = $this->buildDateRangeConditions($searchParams, "em.{$dateField}"); + + // Build the ON clause for the LEFT JOIN + $joinConditions = ['em.echoarea_id = ea.id']; + $params = []; + if ($whereFragment !== null) { + $joinConditions[] = $whereFragment; + $params = array_merge($params, $searchBindParams); + } + foreach ($dateConditions as $cond) { + $joinConditions[] = $cond; + } + $params = array_merge($params, $dateParams); + + $joinClause = implode(' AND ', $joinConditions); + $sql = " SELECT ea.id, @@ -1410,13 +1545,10 @@ public function getSearchResultCounts($query, $echoarea = null, $userId = null) ea.domain, COUNT(em.id) as message_count FROM echoareas ea - LEFT JOIN echomail em ON em.echoarea_id = ea.id - AND (em.subject ILIKE ? OR em.message_text ILIKE ? OR em.from_name ILIKE ?) + LEFT JOIN echomail em ON {$joinClause} WHERE ea.is_active = TRUE "; - $params = [$searchTerm, $searchTerm, $searchTerm]; - if (!$isAdmin) { $sql .= " AND COALESCE(ea.is_sysop_only, FALSE) = FALSE"; } @@ -1434,6 +1566,60 @@ public function getSearchResultCounts($query, $echoarea = null, $userId = null) return $stmt->fetchAll(); } + /** + * Get filter counts (all, unread, read, tome, saved) for a specific set of message IDs. + * Much faster than re-running the full search query — used after searchMessages() returns results. + * + * @param array $messageIds Array of echomail IDs already fetched by searchMessages() + * @param int|null $userId + * @return array + */ + public function getSearchFilterCountsByIds($messageIds, $userId) + { + if (empty($messageIds)) { + return ['all' => 0, 'unread' => 0, 'read' => 0, 'tome' => 0, 'saved' => 0, 'drafts' => 0]; + } + + $userRealName = null; + if ($userId) { + $user = $this->getUserById($userId); + $userRealName = $user['real_name'] ?? null; + } + + $placeholders = implode(',', array_fill(0, count($messageIds), '?')); + + $sql = " + SELECT + COUNT(*) as all_count, + COUNT(*) FILTER (WHERE mr.id IS NULL) as unread_count, + COUNT(*) FILTER (WHERE mr.id IS NOT NULL) as read_count, + COUNT(*) FILTER (WHERE em.to_name = ?) as tome_count, + COUNT(*) FILTER (WHERE sm.message_id IS NOT NULL) as saved_count + FROM echomail em + LEFT JOIN message_read_status mr ON mr.message_id = em.id + AND mr.message_type = 'echomail' + AND mr.user_id = ? + LEFT JOIN saved_messages sm ON sm.message_id = em.id + AND sm.message_type = 'echomail' + AND sm.user_id = ? + WHERE em.id IN ({$placeholders}) + "; + + $params = array_merge([$userRealName, $userId, $userId], $messageIds); + $stmt = $this->db->prepare($sql); + $stmt->execute($params); + $result = $stmt->fetch(); + + return [ + 'all' => (int)$result['all_count'], + 'unread' => (int)$result['unread_count'], + 'read' => (int)$result['read_count'], + 'tome' => (int)$result['tome_count'], + 'saved' => (int)$result['saved_count'], + 'drafts' => 0 + ]; + } + private function getUserById($userId) { $stmt = $this->db->prepare("SELECT * FROM users WHERE id = ?"); diff --git a/templates/echomail.twig b/templates/echomail.twig index 065180e1..ada9ad9f 100644 --- a/templates/echomail.twig +++ b/templates/echomail.twig @@ -224,10 +224,15 @@
- +
+ + +
@@ -441,6 +446,48 @@ + + + {% if current_user.is_admin %} @@ -224,6 +229,48 @@ + + + +
+
+
+ {{ t('ui.admin.dashboard.db_size', {}, locale, ['common']) }} +
+
+ {{ db_summary.db_size ?? 'N/A' }} + {{ t('ui.admin.dashboard.db_stats_link', {}, locale, ['common']) }} → +
+
@@ -194,17 +204,43 @@
{{ t('ui.admin.dashboard.service_status', {}, locale, ['common']) }}
- {% set services = { + {% set coreServices = { 'admin_daemon': t('ui.admin.dashboard.service.admin_daemon', {}, locale, ['common']), 'binkp_scheduler': t('ui.admin.dashboard.service.binkp_scheduler', {}, locale, ['common']), - 'binkp_server': t('ui.admin.dashboard.service.binkp_server', {}, locale, ['common']), - 'telnetd': t('ui.admin.dashboard.service.telnetd', {}, locale, ['common']) + 'binkp_server': t('ui.admin.dashboard.service.binkp_server', {}, locale, ['common']) } %} - {% for key, label in services %} + {% set optionalServices = { + 'telnetd': t('ui.admin.dashboard.service.telnetd', {}, locale, ['common']), + 'ssh_daemon': t('ui.admin.dashboard.service.ssh_daemon', {}, locale, ['common']), + 'gemini_daemon': t('ui.admin.dashboard.service.gemini_daemon', {}, locale, ['common']), + 'mrc_daemon': t('ui.admin.dashboard.service.mrc_daemon', {}, locale, ['common']), + 'multiplexing_server': t('ui.admin.dashboard.service.multiplexing_server', {}, locale, ['common']) + } %} + {% for key, label in coreServices %} + {% set info = daemon_status[key] ?? null %} +
+
+ {{ label }}: +
+
+ {% if info and info.running %} + {{ t('ui.admin.dashboard.running', {}, locale, ['common']) }} + {% else %} + {{ t('ui.admin.dashboard.stopped', {}, locale, ['common']) }} + {% endif %} + {% if info and info.pid %} + {{ t('ui.admin.dashboard.pid', {}, locale, ['common']) }} {{ info.pid }} + {% endif %} +
+
+
+ {% endfor %} + {% for key, label in optionalServices %} {% set info = daemon_status[key] ?? null %}
{{ label }}: + ({{ t('ui.common.optional', {}, locale, ['common']) }})
{% if info and info.running %} diff --git a/templates/admin/database_stats.twig b/templates/admin/database_stats.twig new file mode 100644 index 00000000..8ef3603c --- /dev/null +++ b/templates/admin/database_stats.twig @@ -0,0 +1,649 @@ +{% extends "base.twig" %} + +{% block title %}{{ t('ui.admin.db_stats.page_title', {}, locale, ['common']) }}{% endblock %} + +{% block content %} +
+
+

{{ t('ui.admin.db_stats.heading', {}, locale, ['common']) }}

+
+ + {{ t('ui.common.refresh', {}, locale, ['common']) }} + + + {{ t('ui.common.back', {}, locale, ['common']) }} + +
+
+ + + + +
+ + +
+ +
+
+
+
+
+ {{ t('ui.admin.db_stats.db_total_size', {}, locale, ['common']) }} +
+
{{ size.db_size ?? 'N/A' }}
+
+
+
+
+ +
+
+
+
+
{{ t('ui.admin.db_stats.table_sizes', {}, locale, ['common']) }}
+
+
+ {% if size.table_sizes|length > 0 %} +
+ + + + + + + + + + + {% for row in size.table_sizes %} + + + + + + + {% endfor %} + +
{{ t('ui.admin.db_stats.col.table', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.total_size', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.table_size', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.index_size', {}, locale, ['common']) }}
{{ row.table_name }}{{ row.total_size }}{{ row.table_size }}{{ row.index_size }}
+
+ {% else %} +

{{ t('ui.admin.db_stats.no_data', {}, locale, ['common']) }}

+ {% endif %} +
+
+
+ +
+
+
+
{{ t('ui.admin.db_stats.index_sizes', {}, locale, ['common']) }}
+
+
+ {% if size.index_sizes|length > 0 %} +
+ + + + + + + + + + {% for row in size.index_sizes %} + + + + + + {% endfor %} + +
{{ t('ui.admin.db_stats.col.index', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.table', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.size', {}, locale, ['common']) }}
{{ row.indexname }}{{ row.tablename }}{{ row.index_size }}
+
+ {% else %} +

{{ t('ui.admin.db_stats.no_data', {}, locale, ['common']) }}

+ {% endif %} +
+
+ +
+
+
{{ t('ui.admin.db_stats.bloat', {}, locale, ['common']) }}
+
+
+ {% if size.bloat|length > 0 %} +
+ + + + + + + + + + {% for row in size.bloat %} + + + + + + {% endfor %} + +
{{ t('ui.admin.db_stats.col.table', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.dead_tuples', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.dead_pct', {}, locale, ['common']) }}
{{ row.table_name }}{{ row.dead_tuples|number_format }}{{ row.dead_pct }}%
+
+ {% else %} +

{{ t('ui.admin.db_stats.no_bloat', {}, locale, ['common']) }}

+ {% endif %} +
+
+
+
+
+ + +
+ +
+ {% if activity.connections_current is not null %} +
+
+
+
+ {{ t('ui.admin.db_stats.connections', {}, locale, ['common']) }} +
+
+ {{ activity.connections_current }} / {{ activity.connections_max }} +
+
+
+
+ {{ activity.connections_pct }}% {{ t('ui.admin.db_stats.used', {}, locale, ['common']) }} +
+
+
+ {% endif %} + + {% if activity.cache_hit_ratio is not null %} +
+
+
+
+ {{ t('ui.admin.db_stats.cache_hit_ratio', {}, locale, ['common']) }} +
+
{{ activity.cache_hit_ratio }}%
+ {% if activity.cache_hit_ratio < 99 %} + {{ t('ui.admin.db_stats.cache_hit_warning', {}, locale, ['common']) }} + {% endif %} +
+
+
+ {% endif %} + + {% if activity.xact_commit is not null %} +
+
+
+
+ {{ t('ui.admin.db_stats.transactions', {}, locale, ['common']) }} +
+
+ {{ activity.xact_commit|number_format }} {{ t('ui.admin.db_stats.committed', {}, locale, ['common']) }} +
+ {{ activity.xact_rollback|number_format }} {{ t('ui.admin.db_stats.rolled_back', {}, locale, ['common']) }} +
+
+
+ {% endif %} + + {% if activity.tup_inserted is not null %} +
+
+
+
+ {{ t('ui.admin.db_stats.tuples', {}, locale, ['common']) }} +
+
+ {{ t('ui.admin.db_stats.inserted', {}, locale, ['common']) }}: {{ activity.tup_inserted|number_format }}
+ {{ t('ui.admin.db_stats.updated', {}, locale, ['common']) }}: {{ activity.tup_updated|number_format }}
+ {{ t('ui.admin.db_stats.deleted', {}, locale, ['common']) }}: {{ activity.tup_deleted|number_format }} +
+
+
+
+ {% endif %} +
+ + {% if activity.connection_states|length > 0 %} +
+
+
{{ t('ui.admin.db_stats.connection_states', {}, locale, ['common']) }}
+
+
+
+ + + + + + + {% for row in activity.connection_states %} + + + + + {% endfor %} + +
{{ t('ui.admin.db_stats.col.state', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.count', {}, locale, ['common']) }}
{{ row.state }}{{ row.cnt }}
+
+
+
+ {% endif %} + +
+ + +
+ + {% if not queries.pg_stat_statements_available %} +
+ {{ t('ui.admin.db_stats.pg_stat_statements_unavailable', {}, locale, ['common']) }} +
+ {% endif %} + +
+
+
+
+
+ {{ t('ui.admin.db_stats.lock_waits', {}, locale, ['common']) }} +
+
{{ queries.lock_waits ?? 'N/A' }}
+
+
+
+
+
+
+
+ {{ t('ui.admin.db_stats.deadlocks', {}, locale, ['common']) }} +
+
{{ queries.deadlocks ?? 'N/A' }}
+
+
+
+
+ + {% if queries.long_running|length > 0 %} +
+
+
{{ t('ui.admin.db_stats.long_running', {}, locale, ['common']) }}
+
+
+
+ + + + + + + + + {% for row in queries.long_running %} + + + + + + + {% endfor %} + +
{{ t('ui.admin.db_stats.col.pid', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.user', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.duration', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.query', {}, locale, ['common']) }}
{{ row.pid }}{{ row.usename }}{{ row.duration_sec }}s{{ row.query }}
+
+
+
+ {% endif %} + + {% if queries.slowest_queries|length > 0 %} +
+
+
{{ t('ui.admin.db_stats.slow_queries', {}, locale, ['common']) }}
+
+
+
+ + + + + + + + + {% for row in queries.slowest_queries %} + + + + + + + {% endfor %} + +
{{ t('ui.admin.db_stats.col.mean_ms', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.total_ms', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.calls', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.query', {}, locale, ['common']) }}
{{ row.mean_ms }} ms{{ row.total_ms }} ms{{ row.calls|number_format }}{{ row.query }}
+
+
+
+ {% endif %} + + {% if queries.most_called|length > 0 %} +
+
+
{{ t('ui.admin.db_stats.frequent_queries', {}, locale, ['common']) }}
+
+
+
+ + + + + + + + {% for row in queries.most_called %} + + + + + + {% endfor %} + +
{{ t('ui.admin.db_stats.col.calls', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.mean_ms', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.query', {}, locale, ['common']) }}
{{ row.calls|number_format }}{{ row.mean_ms }} ms{{ row.query }}
+
+
+
+ {% endif %} + + {% if not queries.pg_stat_statements_available and queries.long_running|length == 0 %} +

{{ t('ui.admin.db_stats.no_data', {}, locale, ['common']) }}

+ {% endif %} + +
+ + +
+ + {% if replication.senders|length == 0 and replication.receiver is null %} +
+ {{ t('ui.admin.db_stats.no_replication', {}, locale, ['common']) }} +
+ {% else %} + + {% if replication.senders|length > 0 %} +
+
+
{{ t('ui.admin.db_stats.replication_senders', {}, locale, ['common']) }}
+
+
+
+ + + + + + + + {% for row in replication.senders %} + + + + + + {% endfor %} + +
{{ t('ui.admin.db_stats.col.client', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.state', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.lag_bytes', {}, locale, ['common']) }}
{{ row.client_addr }}{{ row.state }} + {{ row.lag_bytes|number_format }} +
+
+
+
+ {% endif %} + + {% if replication.receiver %} +
+
+
{{ t('ui.admin.db_stats.wal_receiver', {}, locale, ['common']) }}
+
+
+
+
{{ t('ui.admin.db_stats.col.status', {}, locale, ['common']) }}
+
{{ replication.receiver.status ?? 'N/A' }}
+
{{ t('ui.admin.db_stats.col.sender', {}, locale, ['common']) }}
+
{{ replication.receiver.sender_host ?? 'N/A' }}:{{ replication.receiver.sender_port ?? '' }}
+
+
+
+ {% endif %} + + {% endif %} +
+ + +
+ + {% if maintenance.needs_vacuum|length > 0 %} +
+ + {{ t('ui.admin.db_stats.vacuum_needed', {'count': maintenance.needs_vacuum|length}, locale, ['common']) }} +
+ {% endif %} + + {% if maintenance.autovacuum_workers|length > 0 %} +
+
+
{{ t('ui.admin.db_stats.autovacuum_active', {}, locale, ['common']) }}
+
+
+
+ + + + + + + + {% for row in maintenance.autovacuum_workers %} + + + + + + {% endfor %} + +
{{ t('ui.admin.db_stats.col.pid', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.duration', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.query', {}, locale, ['common']) }}
{{ row.pid }}{{ row.duration_sec }}s{{ row.query }}
+
+
+
+ {% endif %} + +
+
+
{{ t('ui.admin.db_stats.maintenance_health', {}, locale, ['common']) }}
+
+
+ {% if maintenance.tables|length > 0 %} +
+ + + + + + + + + + {% for row in maintenance.tables %} + + + + + + + + {% endfor %} + +
{{ t('ui.admin.db_stats.col.table', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.last_vacuum', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.last_analyze', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.dead_tuples', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.dead_pct', {}, locale, ['common']) }}
{{ row.table_name }} + {{ row.last_autovacuum ?? row.last_vacuum ?? t('ui.admin.db_stats.never', {}, locale, ['common']) }} + + {{ row.last_autoanalyze ?? row.last_analyze ?? t('ui.admin.db_stats.never', {}, locale, ['common']) }} + {{ row.dead_tuples|number_format }}{{ row.dead_pct }}%
+
+ {% else %} +

{{ t('ui.admin.db_stats.no_data', {}, locale, ['common']) }}

+ {% endif %} +
+
+ +
+ + +
+ + {% if indexes.unused|length > 0 %} +
+
+
+ {{ t('ui.admin.db_stats.unused_indexes', {}, locale, ['common']) }} + {{ indexes.unused|length }} +
+
+
+
+ + + + + + + + {% for row in indexes.unused %} + + + + + + {% endfor %} + +
{{ t('ui.admin.db_stats.col.index', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.table', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.size', {}, locale, ['common']) }}
{{ row.indexname }}{{ row.tablename }}{{ row.index_size }}
+
+
+
+ {% else %} +
+ {{ t('ui.admin.db_stats.no_unused_indexes', {}, locale, ['common']) }} +
+ {% endif %} + + {% if indexes.duplicates|length > 0 %} +
+
+
{{ t('ui.admin.db_stats.duplicate_indexes', {}, locale, ['common']) }}
+
+
+
+ + + + + + + + {% for row in indexes.duplicates %} + + + + + + {% endfor %} + +
{{ t('ui.admin.db_stats.col.table', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.index', {}, locale, ['common']) }} 1{{ t('ui.admin.db_stats.col.index', {}, locale, ['common']) }} 2
{{ row.table_name }}{{ row.index1 }}{{ row.index2 }}
+
+
+
+ {% endif %} + +
+
+
{{ t('ui.admin.db_stats.scan_ratios', {}, locale, ['common']) }}
+
+
+ {% if indexes.scan_ratios|length > 0 %} +
+ + + + + + + + + {% for row in indexes.scan_ratios %} + + + + + + + {% endfor %} + +
{{ t('ui.admin.db_stats.col.table', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.seq_scans', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.idx_scans', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.col.idx_pct', {}, locale, ['common']) }}
{{ row.table_name }}{{ row.seq_scan|number_format }}{{ row.idx_scan|number_format }} + {% if row.idx_scan_pct is not null %} + {{ row.idx_scan_pct }}% + {% else %} + — + {% endif %} +
+
+ {% else %} +

{{ t('ui.admin.db_stats.no_data', {}, locale, ['common']) }}

+ {% endif %} +
+
+ +
+
+ +
+{% endblock %} From e6f0f4dd84f692202cdb598369e12e7775c92cbc Mon Sep 17 00:00:00 2001 From: awehttam Date: Sat, 14 Mar 2026 10:16:48 -0700 Subject: [PATCH 008/246] Add i18n catalog stats tab to database statistics page - New tab on /admin/database-stats showing per-locale, per-file key counts, file sizes, and serialized memory footprint of i18n catalogs - Summary cards give a quick overview per locale; detail table groups files under each locale with totals row - Fix back button using correct ui.common.go_back key - i18n keys added for en, es, fr Co-Authored-By: Claude Sonnet 4.6 --- config/i18n/en/common.php | 10 ++++ config/i18n/es/common.php | 10 ++++ config/i18n/fr/common.php | 10 ++++ routes/admin-routes.php | 1 + src/DatabaseStats.php | 63 +++++++++++++++++++++++ templates/admin/database_stats.twig | 79 ++++++++++++++++++++++++++++- 6 files changed, 172 insertions(+), 1 deletion(-) diff --git a/config/i18n/en/common.php b/config/i18n/en/common.php index 20fa65d7..006be5c9 100644 --- a/config/i18n/en/common.php +++ b/config/i18n/en/common.php @@ -674,6 +674,16 @@ 'ui.admin.db_stats.col.seq_scans' => 'Seq Scans', 'ui.admin.db_stats.col.idx_scans' => 'Idx Scans', 'ui.admin.db_stats.col.idx_pct' => 'Idx %', + 'ui.admin.db_stats.tab.i18n_catalogs' => 'i18n Catalogs', + 'ui.admin.db_stats.i18n.keys' => 'keys', + 'ui.admin.db_stats.i18n.memory' => 'memory', + 'ui.admin.db_stats.i18n.detail' => 'Catalog Detail', + 'ui.admin.db_stats.i18n.total' => 'Total', + 'ui.admin.db_stats.i18n.col.locale' => 'Locale', + 'ui.admin.db_stats.i18n.col.file' => 'File', + 'ui.admin.db_stats.i18n.col.keys' => 'Keys', + 'ui.admin.db_stats.i18n.col.file_size' => 'File Size', + 'ui.admin.db_stats.i18n.col.memory' => 'Memory', // Admin Users (legacy users page) 'ui.admin.users.load_failed' => 'Error loading users', diff --git a/config/i18n/es/common.php b/config/i18n/es/common.php index 879edd49..22bb46a3 100644 --- a/config/i18n/es/common.php +++ b/config/i18n/es/common.php @@ -674,6 +674,16 @@ 'ui.admin.db_stats.col.seq_scans' => 'Escaneos sec.', 'ui.admin.db_stats.col.idx_scans' => 'Escaneos idx.', 'ui.admin.db_stats.col.idx_pct' => 'Idx %', + 'ui.admin.db_stats.tab.i18n_catalogs' => 'Catálogos i18n', + 'ui.admin.db_stats.i18n.keys' => 'claves', + 'ui.admin.db_stats.i18n.memory' => 'memoria', + 'ui.admin.db_stats.i18n.detail' => 'Detalle de catálogos', + 'ui.admin.db_stats.i18n.total' => 'Total', + 'ui.admin.db_stats.i18n.col.locale' => 'Idioma', + 'ui.admin.db_stats.i18n.col.file' => 'Archivo', + 'ui.admin.db_stats.i18n.col.keys' => 'Claves', + 'ui.admin.db_stats.i18n.col.file_size' => 'Tamaño', + 'ui.admin.db_stats.i18n.col.memory' => 'Memoria', // Admin Users (legacy users page) 'ui.admin.users.load_failed' => 'Error al cargar usuarios', diff --git a/config/i18n/fr/common.php b/config/i18n/fr/common.php index 72900026..ad7ae13d 100644 --- a/config/i18n/fr/common.php +++ b/config/i18n/fr/common.php @@ -641,6 +641,16 @@ 'ui.admin.db_stats.col.seq_scans' => 'Scans séq.', 'ui.admin.db_stats.col.idx_scans' => 'Scans idx.', 'ui.admin.db_stats.col.idx_pct' => 'Idx %', + 'ui.admin.db_stats.tab.i18n_catalogs' => 'Catalogues i18n', + 'ui.admin.db_stats.i18n.keys' => 'clés', + 'ui.admin.db_stats.i18n.memory' => 'mémoire', + 'ui.admin.db_stats.i18n.detail' => 'Détail des catalogues', + 'ui.admin.db_stats.i18n.total' => 'Total', + 'ui.admin.db_stats.i18n.col.locale' => 'Langue', + 'ui.admin.db_stats.i18n.col.file' => 'Fichier', + 'ui.admin.db_stats.i18n.col.keys' => 'Clés', + 'ui.admin.db_stats.i18n.col.file_size' => 'Taille', + 'ui.admin.db_stats.i18n.col.memory' => 'Mémoire', 'ui.admin.users.load_failed' => 'Erreur lors du chargement des utilisateurs', 'ui.admin.users.load_details_failed' => 'Erreur lors du chargement des détails de l\'utilisateur', 'ui.admin.users.updated_success' => 'Utilisateur mis à jour avec succès', diff --git a/routes/admin-routes.php b/routes/admin-routes.php index d9e71dd5..271350cd 100644 --- a/routes/admin-routes.php +++ b/routes/admin-routes.php @@ -109,6 +109,7 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array 'replication' => $dbStats->getReplication(), 'maintenance' => $dbStats->getMaintenanceHealth(), 'indexes' => $dbStats->getIndexHealth(), + 'i18n_catalogs' => $dbStats->getI18nCatalogStats(), ]); }); diff --git a/src/DatabaseStats.php b/src/DatabaseStats.php index 142b80af..734c5e18 100644 --- a/src/DatabaseStats.php +++ b/src/DatabaseStats.php @@ -449,6 +449,69 @@ public function getIndexHealth(): array return $result; } + /** + * i18n catalog stats: file sizes, key counts, and serialized memory footprint + * for each locale and namespace file under config/i18n/. + * + * @return array List of per-locale entries, each with a 'files' sub-array. + */ + public function getI18nCatalogStats(): array + { + $i18nDir = dirname(__DIR__) . '/config/i18n'; + $locales = []; + + if (!is_dir($i18nDir)) { + return $locales; + } + + foreach (scandir($i18nDir) as $entry) { + if ($entry === '.' || $entry === '..') { + continue; + } + $localeDir = $i18nDir . '/' . $entry; + if (!is_dir($localeDir)) { + continue; + } + + $files = []; + $totalKeys = 0; + $totalBytes = 0; + $totalMemory = 0; + + foreach (glob($localeDir . '/*.php') as $filePath) { + $fileBytes = (int)filesize($filePath); + $catalog = include $filePath; + $keyCount = is_array($catalog) ? count($catalog) : 0; + $memBytes = strlen(serialize($catalog)); + + $files[] = [ + 'filename' => basename($filePath), + 'file_bytes' => $fileBytes, + 'key_count' => $keyCount, + 'memory_bytes' => $memBytes, + ]; + + $totalKeys += $keyCount; + $totalBytes += $fileBytes; + $totalMemory += $memBytes; + } + + usort($files, fn($a, $b) => strcmp($a['filename'], $b['filename'])); + + $locales[] = [ + 'locale' => $entry, + 'files' => $files, + 'total_keys' => $totalKeys, + 'total_bytes' => $totalBytes, + 'total_memory' => $totalMemory, + ]; + } + + usort($locales, fn($a, $b) => strcmp($a['locale'], $b['locale'])); + + return $locales; + } + /** * Returns the PostgreSQL server version number (e.g. 140005). */ diff --git a/templates/admin/database_stats.twig b/templates/admin/database_stats.twig index 8ef3603c..0e1f73d5 100644 --- a/templates/admin/database_stats.twig +++ b/templates/admin/database_stats.twig @@ -11,7 +11,7 @@ {{ t('ui.common.refresh', {}, locale, ['common']) }} - {{ t('ui.common.back', {}, locale, ['common']) }} + {{ t('ui.common.go_back', {}, locale, ['common']) }}
@@ -48,6 +48,11 @@ {{ t('ui.admin.db_stats.tab.index_health', {}, locale, ['common']) }} +
@@ -643,6 +648,78 @@
+ +
+ + {% if i18n_catalogs|length == 0 %} +

{{ t('ui.admin.db_stats.no_data', {}, locale, ['common']) }}

+ {% else %} + + {# Summary row — one card per locale #} +
+ {% for loc in i18n_catalogs %} +
+
+
+
+ {{ loc.locale }} +
+
{{ loc.total_keys|number_format }}
+ {{ t('ui.admin.db_stats.i18n.keys', {}, locale, ['common']) }}
+ {{ (loc.total_memory / 1024)|round(1) }} KB {{ t('ui.admin.db_stats.i18n.memory', {}, locale, ['common']) }} +
+
+
+ {% endfor %} +
+ + {# Detail table #} +
+
+
{{ t('ui.admin.db_stats.i18n.detail', {}, locale, ['common']) }}
+
+
+
+ + + + + + + + + + + + {% for loc in i18n_catalogs %} + {% for file in loc.files %} + + {% if loop.first %} + + {% endif %} + + + + + + {% endfor %} + + + + + + + + {% endfor %} + +
{{ t('ui.admin.db_stats.i18n.col.locale', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.i18n.col.file', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.i18n.col.keys', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.i18n.col.file_size', {}, locale, ['common']) }}{{ t('ui.admin.db_stats.i18n.col.memory', {}, locale, ['common']) }}
{{ loc.locale }}{{ file.filename }}{{ file.key_count|number_format }}{{ (file.file_bytes / 1024)|round(1) }} KB{{ (file.memory_bytes / 1024)|round(1) }} KB
{{ t('ui.admin.db_stats.i18n.total', {}, locale, ['common']) }}{{ loc.total_keys|number_format }}{{ (loc.total_bytes / 1024)|round(1) }} KB{{ (loc.total_memory / 1024)|round(1) }} KB
+
+
+
+ + {% endif %} +
+ From 2bfe7a505047e53449673532d44b1b354949132f Mon Sep 17 00:00:00 2001 From: awehttam Date: Sat, 14 Mar 2026 10:25:26 -0700 Subject: [PATCH 009/246] Add 118 missing French translation keys Fills gaps in fr/common.php relative to en/common.php: - ui.common.advanced_search.* (advanced search modal) - ui.common.db_id, ui.common.message_id - ui.base.admin.bbs_directory, echomail_robots, bbs_lists - ui.admin.bbs_directory.* (full admin BBS directory UI) - ui.admin.echomail_robots.* - ui.admin.bbs_settings.features.enable_bbs_directory / bbs_directory_help - ui.bbs_directory.* (public directory page) - ui.echomail.art_format*, edit_message*, message_charset* - ui.files.edit, edit_file, move_to_area, scan_status_*, short_description, virus_name_placeholder Co-Authored-By: Claude Sonnet 4.6 --- config/i18n/fr/common.php | 118 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/config/i18n/fr/common.php b/config/i18n/fr/common.php index ad7ae13d..92fcf6e9 100644 --- a/config/i18n/fr/common.php +++ b/config/i18n/fr/common.php @@ -143,6 +143,21 @@ 'ui.common.time.24_hours' => '24 heures', 'ui.common.time.1_week' => '1 semaine', 'ui.common.time.30_days' => '30 jours', + 'ui.common.advanced_search' => 'Recherche avancée', + 'ui.common.advanced_search.title' => 'Recherche avancée', + 'ui.common.advanced_search.from_name' => 'De / Nom de l\'auteur', + 'ui.common.advanced_search.from_name_placeholder' => 'Rechercher par auteur...', + 'ui.common.advanced_search.subject' => 'Sujet', + 'ui.common.advanced_search.subject_placeholder' => 'Rechercher par sujet...', + 'ui.common.advanced_search.body' => 'Corps du message', + 'ui.common.advanced_search.body_placeholder' => 'Rechercher dans le corps du message...', + 'ui.common.advanced_search.help' => 'Remplissez un ou plusieurs champs. Les champs sont combinés avec la logique AND.', + 'ui.common.advanced_search.fill_one_field' => 'Veuillez remplir au moins un champ (minimum 2 caractères pour les champs texte).', + 'ui.common.advanced_search.date_from' => 'Date de début', + 'ui.common.advanced_search.date_to' => 'Date de fin', + 'ui.common.advanced_search.date_range' => 'Plage de dates', + 'ui.common.db_id' => 'ID DB', + 'ui.common.message_id' => 'ID Message', 'ui.about.title' => 'À propos', 'ui.about.about_system' => 'À propos de {system_name}', 'ui.about.system_name' => 'Nom du système', @@ -225,6 +240,10 @@ 'ui.base.admin.upgrade_notes' => 'Notes de mise à jour v{version}', 'ui.base.admin.claudes_bbs' => 'BBS de Claude', 'ui.base.admin.report_issue' => 'Signaler un problème', + 'ui.base.admin.bbs_directory' => 'Répertoire BBS', + 'ui.base.admin.echomail_robots' => 'Robots Echomail', + 'ui.base.bbs_directory' => 'Répertoire BBS', + 'ui.base.bbs_lists' => 'Listes BBS', 'ui.admin_users.pending_users_error' => 'Erreur utilisateurs en attente :', 'ui.admin_users.pending_users_load_failed_prefix' => 'Échec du chargement des utilisateurs en attente : ', 'ui.admin_users.all_users_error' => 'Erreur tous les utilisateurs :', @@ -1088,6 +1107,8 @@ 'ui.admin.bbs_settings.features.max_cross_post_areas' => 'Nombre max de zones de cross-post', 'ui.admin.bbs_settings.features.max_cross_post_help' => 'Nombre maximum de zones supplémentaires vers lesquelles un utilisateur peut faire un cross-post (2-20).', 'ui.admin.bbs_settings.features.save' => 'Enregistrer les paramètres', + 'ui.admin.bbs_settings.features.enable_bbs_directory' => 'Activer le répertoire BBS', + 'ui.admin.bbs_settings.features.bbs_directory_help' => 'Affiche la page publique /bbs-directory et le menu de navigation Listes BBS. Lorsqu\'il est désactivé, la page renvoie une erreur 404.', 'ui.admin.bbs_settings.credits.title' => 'Configuration du système de crédits', 'ui.admin.bbs_settings.credits.enabled' => 'Système de crédits activé', 'ui.admin.bbs_settings.credits.currency_symbol' => 'Symbole monétaire', @@ -1834,6 +1855,14 @@ 'ui.files.share_revoked' => 'Lien de partage révoqué', 'ui.files.share_link_copied_clipboard' => 'Lien de partage copié dans le presse-papiers', 'ui.files.share_link_copied' => 'Lien de partage copié', + 'ui.files.edit' => 'Modifier', + 'ui.files.edit_file' => 'Modifier le fichier', + 'ui.files.edit_success' => 'Fichier mis à jour avec succès', + 'ui.files.move_to_area' => 'Déplacer vers une zone', + 'ui.files.scan_status_save_failed' => 'Échec de la mise à jour du statut de scan', + 'ui.files.scan_status_saved' => 'Statut de scan mis à jour', + 'ui.files.short_description' => 'Description courte', + 'ui.files.virus_name_placeholder' => 'Nom du virus (optionnel)', 'ui.polls.title' => 'Sondages', 'ui.polls.create' => 'Créer un sondage', 'ui.polls.loading' => 'Chargement du sondage...', @@ -2525,6 +2554,16 @@ 'ui.echomail.shortcuts.help' => 'Afficher / masquer les raccourcis clavier', 'ui.echomail.shortcuts.close' => 'Fermer le message', 'ui.echomail.shortcuts.dismiss' => 'Appuyez sur ? ou H pour fermer cette aide', + 'ui.echomail.art_format' => 'Format d\'art', + 'ui.echomail.art_format_auto' => 'Détection automatique', + 'ui.echomail.art_format_plain' => 'Texte brut', + 'ui.echomail.art_format_ansi' => 'ANSI', + 'ui.echomail.art_format_amiga_ansi' => 'ANSI Amiga', + 'ui.echomail.art_format_petscii' => 'PETSCII / C64', + 'ui.echomail.edit_message' => 'Modifier le message', + 'ui.echomail.edit_message_saved' => 'Modifications enregistrées.', + 'ui.echomail.message_charset' => 'Encodage d\'art', + 'ui.echomail.message_charset_help' => 'Encodage des octets d\'art brut. Affecte uniquement le rendu de l\'art ANSI/PETSCII. Laissez vide pour effacer.', 'ui.admin_subscriptions.page_title' => 'Admin : Gérer les abonnements', 'ui.admin_subscriptions.heading' => 'Gestion des abonnements', 'ui.admin_subscriptions.breadcrumb_aria' => 'fil d\'Ariane', @@ -2642,10 +2681,89 @@ 'ui.api.door.session_resumed' => 'Reprise de la session existante', 'ui.files.previous_file' => 'Fichier précédent', 'ui.files.next_file' => 'Fichier suivant', + 'ui.bbs_directory.heading' => 'Répertoire BBS', + 'ui.bbs_directory.page_title' => 'Répertoire BBS', + 'ui.bbs_directory.description' => 'Une liste des systèmes BBS connus de ce BBS, découverts automatiquement via diverses sources et complétés par des entrées gérées manuellement.', + 'ui.bbs_directory.col_name' => 'Nom du BBS', + 'ui.bbs_directory.col_sysop' => 'Sysop', + 'ui.bbs_directory.col_location' => 'Emplacement', + 'ui.bbs_directory.col_telnet' => 'Telnet', + 'ui.bbs_directory.col_telnet_port' => 'Port', + 'ui.bbs_directory.col_website' => 'Site web', + 'ui.bbs_directory.col_os' => 'OS', + 'ui.bbs_directory.col_notes' => 'Notes', + 'ui.bbs_directory.col_last_seen' => 'Vu la dernière fois', + 'ui.bbs_directory.connect' => 'Connecter', + 'ui.bbs_directory.no_entries' => 'Aucune entrée BBS pour l\'instant.', + 'ui.bbs_directory.no_results' => 'Aucune entrée ne correspond à votre recherche.', + 'ui.bbs_directory.search_placeholder' => 'Rechercher par nom, sysop, emplacement...', + 'ui.bbs_directory.source_auto' => 'Auto', + 'ui.bbs_directory.source_manual' => 'Manuel', + 'ui.bbs_directory.status_pending' => 'En attente', + 'ui.bbs_directory.status_rejected' => 'Rejeté', + 'ui.bbs_directory.add_listing' => 'Ajouter votre BBS', + 'ui.bbs_directory.submit_title' => 'Soumettre votre BBS', + 'ui.bbs_directory.submit_description' => 'Soumettez votre BBS au répertoire. Les nouvelles inscriptions sont examinées par le sysop avant d\'apparaître publiquement.', + 'ui.bbs_directory.submit_btn' => 'Soumettre l\'inscription', + 'ui.bbs_directory.submit_success' => 'Votre inscription a été soumise et est en attente de validation. Merci !', 'ui.bbs_directory.tab_list' => 'Liste du répertoire', 'ui.bbs_directory.tab_map' => 'Carte des systèmes BBS', 'ui.bbs_directory.map_no_coordinates' => 'Aucun système BBS ne dispose encore de coordonnées cartographiques.', 'ui.bbs_directory.map_partial_notice' => '{count} systèmes BBS ne sont pas affichés sur la carte car leurs emplacements n\'ont pas encore pu être géocodés.', + 'ui.admin.bbs_directory.heading' => 'Répertoire BBS', + 'ui.admin.bbs_directory.page_title' => 'Répertoire BBS', + 'ui.admin.bbs_directory.tab_entries' => 'Entrées du répertoire', + 'ui.admin.bbs_directory.tab_all' => 'Toutes les entrées', + 'ui.admin.bbs_directory.tab_pending' => 'En attente de validation', + 'ui.admin.bbs_directory.tab_robots' => 'Règles des robots', + 'ui.admin.bbs_directory.col_name' => 'Nom', + 'ui.admin.bbs_directory.col_sysop' => 'Sysop', + 'ui.admin.bbs_directory.col_location' => 'Emplacement', + 'ui.admin.bbs_directory.col_telnet' => 'Telnet', + 'ui.admin.bbs_directory.col_last_seen' => 'Vu la dernière fois', + 'ui.admin.bbs_directory.col_source' => 'Source', + 'ui.admin.bbs_directory.col_enabled' => 'Activé', + 'ui.admin.bbs_directory.col_submitted_by' => 'Soumis par', + 'ui.admin.bbs_directory.col_actions' => 'Actions', + 'ui.admin.bbs_directory.col_echo_area' => 'Zone echo', + 'ui.admin.bbs_directory.col_subject_pattern' => 'Modèle de sujet', + 'ui.admin.bbs_directory.col_processor' => 'Processeur', + 'ui.admin.bbs_directory.col_last_run' => 'Dernier déclenchement', + 'ui.admin.bbs_directory.col_messages_processed' => 'Msg traités', + 'ui.admin.bbs_directory.no_entries' => 'Aucune entrée pour l\'instant.', + 'ui.admin.bbs_directory.no_pending' => 'Aucune inscription en attente.', + 'ui.admin.bbs_directory.no_robots' => 'Aucune règle de robot configurée.', + 'ui.admin.bbs_directory.never' => 'Jamais', + 'ui.admin.bbs_directory.approve' => 'Approuver', + 'ui.admin.bbs_directory.reject' => 'Rejeter', + 'ui.admin.bbs_directory.approved' => 'Entrée approuvée', + 'ui.admin.bbs_directory.rejected' => 'Entrée rejetée', + 'ui.admin.bbs_directory.entry_saved' => 'Entrée enregistrée avec succès', + 'ui.admin.bbs_directory.entry_deleted' => 'Entrée supprimée avec succès', + 'ui.admin.bbs_directory.add_entry' => 'Ajouter une entrée', + 'ui.admin.bbs_directory.add_robot' => 'Ajouter un robot', + 'ui.admin.bbs_directory.run_now' => 'Exécuter maintenant', + 'ui.admin.bbs_directory.run_complete' => 'Exécution du robot terminée : examiné {examined}, traité {processed}', + 'ui.admin.bbs_directory.robot_saved' => 'Règle de robot enregistrée avec succès', + 'ui.admin.bbs_directory.robot_deleted' => 'Règle de robot supprimée avec succès', + 'ui.admin.bbs_directory.is_local_label' => 'Notre BBS (protégé)', + 'ui.admin.bbs_directory.is_local_help' => 'Les imports automatiques et les robots ne modifieront pas cette entrée.', + 'ui.admin.bbs_directory.merge' => 'Fusionner le doublon', + 'ui.admin.bbs_directory.merge_title' => 'Fusionner l\'entrée en doublon', + 'ui.admin.bbs_directory.merge_keep_label' => 'Conserver :', + 'ui.admin.bbs_directory.merge_discard_label' => 'Supprimer (sera effacé) :', + 'ui.admin.bbs_directory.merge_search_placeholder' => 'Rechercher le doublon...', + 'ui.admin.bbs_directory.merge_help' => 'L\'entrée conservée sera complétée par les champs manquants de l\'entrée supprimée. L\'entrée supprimée sera effacée.', + 'ui.admin.bbs_directory.merge_will_delete' => 'Sera supprimé :', + 'ui.admin.bbs_directory.merge_confirm' => 'Fusionner et supprimer le doublon', + 'ui.admin.bbs_directory.merge_success' => 'Entrées fusionnées avec succès', + 'ui.admin.echomail_robots.heading' => 'Robots Echomail', + 'ui.admin.echomail_robots.page_title' => 'Robots Echomail', + 'ui.admin.echomail_robots.about_title' => 'À propos des robots', + 'ui.admin.echomail_robots.about_text' => 'Les règles de robot surveillent les zones echo à la recherche de messages correspondants et les traitent automatiquement. Les résultats sont stockés dans le répertoire BBS ou d\'autres cibles selon le processeur.', + 'ui.admin.echomail_robots.processor_config_label' => 'Config du processeur (JSON)', + 'ui.admin.echomail_robots.cron_hint' => 'Exécuter périodiquement via cron :', + 'ui.admin.echomail_robots.run_output_title' => 'Sortie du robot', 'ui.admin.appearance.message_reader.email_link_url' => 'URL du lien E-mail', 'ui.admin.appearance.message_reader.email_link_url_placeholder' => 'https://mail.example.com/', 'ui.admin.appearance.message_reader.email_link_url_help' => 'Lien optionnel affiche dans le menu Messagerie juste sous Echomail.', From 3b32e96cf24b17ec362c3ac76f24e89535e66cae Mon Sep 17 00:00:00 2001 From: awehttam Date: Sat, 14 Mar 2026 10:31:37 -0700 Subject: [PATCH 010/246] Fix table-warning/danger/secondary contrast on dark themes Bootstrap's contextual table classes use bright solid backgrounds that make text unreadable on dark themes. Override them in cyberpunk, dark, greenterm, and amber to use low-opacity tinted backgrounds that preserve the semantic colour signal without drowning out foreground text. Co-Authored-By: Claude Sonnet 4.6 --- public_html/css/amber.css | 20 ++++++++++++++++++++ public_html/css/cyberpunk.css | 20 ++++++++++++++++++++ public_html/css/dark.css | 20 ++++++++++++++++++++ public_html/css/greenterm.css | 20 ++++++++++++++++++++ public_html/sw.js | 2 +- 5 files changed, 81 insertions(+), 1 deletion(-) diff --git a/public_html/css/amber.css b/public_html/css/amber.css index 208c1a7f..44b11494 100644 --- a/public_html/css/amber.css +++ b/public_html/css/amber.css @@ -1463,3 +1463,23 @@ tbody, td, tfoot, th, thead, tr { .sc-inverse { filter: invert(1); } + +/* Bootstrap contextual table rows — override bright backgrounds for dark theme */ +.table-warning, .table-warning > td, .table-warning > th { + --bs-table-bg: rgba(255, 176, 0, 0.15); + --bs-table-color: var(--text-color); + background-color: rgba(255, 176, 0, 0.15) !important; + color: var(--text-color) !important; +} +.table-danger, .table-danger > td, .table-danger > th { + --bs-table-bg: rgba(255, 51, 51, 0.15); + --bs-table-color: var(--text-color); + background-color: rgba(255, 51, 51, 0.15) !important; + color: var(--text-color) !important; +} +.table-secondary, .table-secondary > td, .table-secondary > th { + --bs-table-bg: rgba(255, 176, 0, 0.08); + --bs-table-color: var(--text-color); + background-color: rgba(255, 176, 0, 0.08) !important; + color: var(--text-color) !important; +} diff --git a/public_html/css/cyberpunk.css b/public_html/css/cyberpunk.css index 19ab30ed..08530ece 100644 --- a/public_html/css/cyberpunk.css +++ b/public_html/css/cyberpunk.css @@ -1558,3 +1558,23 @@ tbody, td, tfoot, th, thead, tr { .sc-inverse { filter: invert(1); } + +/* Bootstrap contextual table rows — override bright backgrounds for dark theme */ +.table-warning, .table-warning > td, .table-warning > th { + --bs-table-bg: rgba(249, 240, 2, 0.12); + --bs-table-color: var(--text-color); + background-color: rgba(249, 240, 2, 0.12) !important; + color: var(--text-color) !important; +} +.table-danger, .table-danger > td, .table-danger > th { + --bs-table-bg: rgba(255, 42, 109, 0.15); + --bs-table-color: var(--text-color); + background-color: rgba(255, 42, 109, 0.15) !important; + color: var(--text-color) !important; +} +.table-secondary, .table-secondary > td, .table-secondary > th { + --bs-table-bg: rgba(157, 78, 221, 0.15); + --bs-table-color: var(--text-color); + background-color: rgba(157, 78, 221, 0.15) !important; + color: var(--text-color) !important; +} diff --git a/public_html/css/dark.css b/public_html/css/dark.css index 6c94cd27..742dae43 100644 --- a/public_html/css/dark.css +++ b/public_html/css/dark.css @@ -1091,3 +1091,23 @@ a:hover { .sc-inverse { filter: invert(1); } + +/* Bootstrap contextual table rows — override bright backgrounds for dark theme */ +.table-warning, .table-warning > td, .table-warning > th { + --bs-table-bg: rgba(255, 193, 7, 0.15); + --bs-table-color: var(--text-color); + background-color: rgba(255, 193, 7, 0.15) !important; + color: var(--text-color) !important; +} +.table-danger, .table-danger > td, .table-danger > th { + --bs-table-bg: rgba(255, 77, 77, 0.15); + --bs-table-color: var(--text-color); + background-color: rgba(255, 77, 77, 0.15) !important; + color: var(--text-color) !important; +} +.table-secondary, .table-secondary > td, .table-secondary > th { + --bs-table-bg: rgba(255, 255, 255, 0.07); + --bs-table-color: var(--text-color); + background-color: rgba(255, 255, 255, 0.07) !important; + color: var(--text-color) !important; +} diff --git a/public_html/css/greenterm.css b/public_html/css/greenterm.css index 15b078ee..ac47153e 100644 --- a/public_html/css/greenterm.css +++ b/public_html/css/greenterm.css @@ -1463,3 +1463,23 @@ tbody, td, tfoot, th, thead, tr { .sc-inverse { filter: invert(1); } + +/* Bootstrap contextual table rows — override bright backgrounds for dark theme */ +.table-warning, .table-warning > td, .table-warning > th { + --bs-table-bg: rgba(255, 170, 0, 0.15); + --bs-table-color: var(--text-color); + background-color: rgba(255, 170, 0, 0.15) !important; + color: var(--text-color) !important; +} +.table-danger, .table-danger > td, .table-danger > th { + --bs-table-bg: rgba(255, 51, 51, 0.15); + --bs-table-color: var(--text-color); + background-color: rgba(255, 51, 51, 0.15) !important; + color: var(--text-color) !important; +} +.table-secondary, .table-secondary > td, .table-secondary > th { + --bs-table-bg: rgba(51, 255, 51, 0.08); + --bs-table-color: var(--text-color); + background-color: rgba(51, 255, 51, 0.08) !important; + color: var(--text-color) !important; +} diff --git a/public_html/sw.js b/public_html/sw.js index a5dc6807..f75bd33f 100644 --- a/public_html/sw.js +++ b/public_html/sw.js @@ -1,4 +1,4 @@ -const CACHE_NAME = 'binkcache-v227'; +const CACHE_NAME = 'binkcache-v228'; // Static assets to precache const staticAssets = [ From 627837d05339e839cef584aa3606a5794a1e70c1 Mon Sep 17 00:00:00 2001 From: awehttam Date: Sat, 14 Mar 2026 10:35:10 -0700 Subject: [PATCH 011/246] Fix striped table-warning rows on dark themes The previous fix only set --bs-table-bg but not --bs-table-striped-bg, so table-warning rows alternated between the tinted dark colour (odd/striped rows) and Bootstrap's bright #fff3cd (even rows). Add all Bootstrap table CSS variable overrides (striped, active, hover variants) so every row in a contextual table class renders consistently dark across all four themes. Co-Authored-By: Claude Sonnet 4.6 --- public_html/css/amber.css | 18 +++++++++++++++--- public_html/css/cyberpunk.css | 18 +++++++++++++++--- public_html/css/dark.css | 18 +++++++++++++++--- public_html/css/greenterm.css | 18 +++++++++++++++--- public_html/sw.js | 2 +- 5 files changed, 61 insertions(+), 13 deletions(-) diff --git a/public_html/css/amber.css b/public_html/css/amber.css index 44b11494..b921dbbd 100644 --- a/public_html/css/amber.css +++ b/public_html/css/amber.css @@ -1466,20 +1466,32 @@ tbody, td, tfoot, th, thead, tr { /* Bootstrap contextual table rows — override bright backgrounds for dark theme */ .table-warning, .table-warning > td, .table-warning > th { - --bs-table-bg: rgba(255, 176, 0, 0.15); --bs-table-color: var(--text-color); + --bs-table-bg: rgba(255, 176, 0, 0.15); + --bs-table-striped-bg: rgba(255, 176, 0, 0.22); + --bs-table-striped-color: var(--text-color); + --bs-table-active-bg: rgba(255, 176, 0, 0.25); + --bs-table-hover-bg: rgba(255, 176, 0, 0.25); background-color: rgba(255, 176, 0, 0.15) !important; color: var(--text-color) !important; } .table-danger, .table-danger > td, .table-danger > th { - --bs-table-bg: rgba(255, 51, 51, 0.15); --bs-table-color: var(--text-color); + --bs-table-bg: rgba(255, 51, 51, 0.15); + --bs-table-striped-bg: rgba(255, 51, 51, 0.22); + --bs-table-striped-color: var(--text-color); + --bs-table-active-bg: rgba(255, 51, 51, 0.25); + --bs-table-hover-bg: rgba(255, 51, 51, 0.25); background-color: rgba(255, 51, 51, 0.15) !important; color: var(--text-color) !important; } .table-secondary, .table-secondary > td, .table-secondary > th { - --bs-table-bg: rgba(255, 176, 0, 0.08); --bs-table-color: var(--text-color); + --bs-table-bg: rgba(255, 176, 0, 0.08); + --bs-table-striped-bg: rgba(255, 176, 0, 0.13); + --bs-table-striped-color: var(--text-color); + --bs-table-active-bg: rgba(255, 176, 0, 0.13); + --bs-table-hover-bg: rgba(255, 176, 0, 0.13); background-color: rgba(255, 176, 0, 0.08) !important; color: var(--text-color) !important; } diff --git a/public_html/css/cyberpunk.css b/public_html/css/cyberpunk.css index 08530ece..a48826e4 100644 --- a/public_html/css/cyberpunk.css +++ b/public_html/css/cyberpunk.css @@ -1561,20 +1561,32 @@ tbody, td, tfoot, th, thead, tr { /* Bootstrap contextual table rows — override bright backgrounds for dark theme */ .table-warning, .table-warning > td, .table-warning > th { - --bs-table-bg: rgba(249, 240, 2, 0.12); --bs-table-color: var(--text-color); + --bs-table-bg: rgba(249, 240, 2, 0.12); + --bs-table-striped-bg: rgba(249, 240, 2, 0.18); + --bs-table-striped-color: var(--text-color); + --bs-table-active-bg: rgba(249, 240, 2, 0.20); + --bs-table-hover-bg: rgba(249, 240, 2, 0.20); background-color: rgba(249, 240, 2, 0.12) !important; color: var(--text-color) !important; } .table-danger, .table-danger > td, .table-danger > th { - --bs-table-bg: rgba(255, 42, 109, 0.15); --bs-table-color: var(--text-color); + --bs-table-bg: rgba(255, 42, 109, 0.15); + --bs-table-striped-bg: rgba(255, 42, 109, 0.22); + --bs-table-striped-color: var(--text-color); + --bs-table-active-bg: rgba(255, 42, 109, 0.25); + --bs-table-hover-bg: rgba(255, 42, 109, 0.25); background-color: rgba(255, 42, 109, 0.15) !important; color: var(--text-color) !important; } .table-secondary, .table-secondary > td, .table-secondary > th { - --bs-table-bg: rgba(157, 78, 221, 0.15); --bs-table-color: var(--text-color); + --bs-table-bg: rgba(157, 78, 221, 0.15); + --bs-table-striped-bg: rgba(157, 78, 221, 0.22); + --bs-table-striped-color: var(--text-color); + --bs-table-active-bg: rgba(157, 78, 221, 0.22); + --bs-table-hover-bg: rgba(157, 78, 221, 0.22); background-color: rgba(157, 78, 221, 0.15) !important; color: var(--text-color) !important; } diff --git a/public_html/css/dark.css b/public_html/css/dark.css index 742dae43..3f6d7efe 100644 --- a/public_html/css/dark.css +++ b/public_html/css/dark.css @@ -1094,20 +1094,32 @@ a:hover { /* Bootstrap contextual table rows — override bright backgrounds for dark theme */ .table-warning, .table-warning > td, .table-warning > th { - --bs-table-bg: rgba(255, 193, 7, 0.15); --bs-table-color: var(--text-color); + --bs-table-bg: rgba(255, 193, 7, 0.15); + --bs-table-striped-bg: rgba(255, 193, 7, 0.22); + --bs-table-striped-color: var(--text-color); + --bs-table-active-bg: rgba(255, 193, 7, 0.25); + --bs-table-hover-bg: rgba(255, 193, 7, 0.25); background-color: rgba(255, 193, 7, 0.15) !important; color: var(--text-color) !important; } .table-danger, .table-danger > td, .table-danger > th { - --bs-table-bg: rgba(255, 77, 77, 0.15); --bs-table-color: var(--text-color); + --bs-table-bg: rgba(255, 77, 77, 0.15); + --bs-table-striped-bg: rgba(255, 77, 77, 0.22); + --bs-table-striped-color: var(--text-color); + --bs-table-active-bg: rgba(255, 77, 77, 0.25); + --bs-table-hover-bg: rgba(255, 77, 77, 0.25); background-color: rgba(255, 77, 77, 0.15) !important; color: var(--text-color) !important; } .table-secondary, .table-secondary > td, .table-secondary > th { - --bs-table-bg: rgba(255, 255, 255, 0.07); --bs-table-color: var(--text-color); + --bs-table-bg: rgba(255, 255, 255, 0.07); + --bs-table-striped-bg: rgba(255, 255, 255, 0.11); + --bs-table-striped-color: var(--text-color); + --bs-table-active-bg: rgba(255, 255, 255, 0.11); + --bs-table-hover-bg: rgba(255, 255, 255, 0.11); background-color: rgba(255, 255, 255, 0.07) !important; color: var(--text-color) !important; } diff --git a/public_html/css/greenterm.css b/public_html/css/greenterm.css index ac47153e..19d99dd2 100644 --- a/public_html/css/greenterm.css +++ b/public_html/css/greenterm.css @@ -1466,20 +1466,32 @@ tbody, td, tfoot, th, thead, tr { /* Bootstrap contextual table rows — override bright backgrounds for dark theme */ .table-warning, .table-warning > td, .table-warning > th { - --bs-table-bg: rgba(255, 170, 0, 0.15); --bs-table-color: var(--text-color); + --bs-table-bg: rgba(255, 170, 0, 0.15); + --bs-table-striped-bg: rgba(255, 170, 0, 0.22); + --bs-table-striped-color: var(--text-color); + --bs-table-active-bg: rgba(255, 170, 0, 0.25); + --bs-table-hover-bg: rgba(255, 170, 0, 0.25); background-color: rgba(255, 170, 0, 0.15) !important; color: var(--text-color) !important; } .table-danger, .table-danger > td, .table-danger > th { - --bs-table-bg: rgba(255, 51, 51, 0.15); --bs-table-color: var(--text-color); + --bs-table-bg: rgba(255, 51, 51, 0.15); + --bs-table-striped-bg: rgba(255, 51, 51, 0.22); + --bs-table-striped-color: var(--text-color); + --bs-table-active-bg: rgba(255, 51, 51, 0.25); + --bs-table-hover-bg: rgba(255, 51, 51, 0.25); background-color: rgba(255, 51, 51, 0.15) !important; color: var(--text-color) !important; } .table-secondary, .table-secondary > td, .table-secondary > th { - --bs-table-bg: rgba(51, 255, 51, 0.08); --bs-table-color: var(--text-color); + --bs-table-bg: rgba(51, 255, 51, 0.08); + --bs-table-striped-bg: rgba(51, 255, 51, 0.13); + --bs-table-striped-color: var(--text-color); + --bs-table-active-bg: rgba(51, 255, 51, 0.13); + --bs-table-hover-bg: rgba(51, 255, 51, 0.13); background-color: rgba(51, 255, 51, 0.08) !important; color: var(--text-color) !important; } diff --git a/public_html/sw.js b/public_html/sw.js index f75bd33f..cbd1181d 100644 --- a/public_html/sw.js +++ b/public_html/sw.js @@ -1,4 +1,4 @@ -const CACHE_NAME = 'binkcache-v228'; +const CACHE_NAME = 'binkcache-v229'; // Static assets to precache const staticAssets = [ From c5c74895fd7e83d2feeb4f3859aceb6a3271bfd3 Mon Sep 17 00:00:00 2001 From: awehttam Date: Sat, 14 Mar 2026 10:46:45 -0700 Subject: [PATCH 012/246] Add FAQ entry explaining sequential scan behaviour in database stats Co-Authored-By: Claude Sonnet 4.6 --- FAQ.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/FAQ.md b/FAQ.md index 2e3efd69..9fef2603 100644 --- a/FAQ.md +++ b/FAQ.md @@ -436,6 +436,31 @@ Public nodes can also poll as a fallback, though the hub will deliver mail direc --- +## Database + +### Q: The database stats page shows high sequential scan counts on some tables. Is this a problem? +**A:** Not necessarily. PostgreSQL uses sequential scans when they are more efficient than index scans, which is often the case for small tables or queries where a large fraction of rows would be returned. Here are the common cases you may see in BinktermPHP: + +**Small tables (users_meta, user_settings, mrc_state)** +For tables with only a few hundred or thousand rows, PostgreSQL's query planner will almost always prefer a sequential scan — the overhead of walking an index is greater than simply reading the table directly. High seq scan counts here are expected and correct behaviour, not an indexing gap. + +**High-frequency daemon tables (mrc_outbound, mrc_state)** +The MRC daemon polls these tables continuously (multiple times per second). Because these tables are very small, every poll results in a sequential scan. The counts look alarming but reflect normal operation. + +**OR-condition queries (chat_messages, shared_messages)** +Queries that filter on `col_a = ? OR col_b = ?` cannot use a single B-tree index to satisfy both conditions simultaneously. PostgreSQL must either do a seq scan or merge two separate index scans (bitmap OR). For moderate table sizes or if the planner estimates a large result set, it will choose a seq scan even when indexes exist on both columns individually. This is a structural query pattern — adding more indexes will not change the planner's decision. + +**When to investigate further** +A high seq scan ratio is worth investigating when: +- The table is large (tens of thousands of rows or more) +- The query is selecting a small, specific subset of rows (highly selective filter) +- You can see a long-running or slow query in the Query Performance tab that targets that table +- `pg_stat_user_tables.seq_tup_read` is very large relative to `idx_tup_fetch` + +In those cases, review the actual queries and consider adding a targeted index. For the tables listed above, no additional indexing is needed. + +--- + ## WebDoors ### Q: How do I add a connection to my text-based BBS? From f49baf520fd2e092d80117eeb45aff9c6a28ee41 Mon Sep 17 00:00:00 2001 From: awehttam Date: Sat, 14 Mar 2026 11:34:23 -0700 Subject: [PATCH 013/246] Add configurable file upload/download credits --- README.md | 2 +- config/bbs.json.example | 4 + config/i18n/en/common.php | 12 +++ config/i18n/en/errors.php | 2 + config/i18n/es/common.php | 12 +++ config/i18n/es/errors.php | 2 + config/i18n/fr/common.php | 12 +++ config/i18n/fr/errors.php | 2 + docs/CreditSystem.md | 10 +- docs/UPGRADING_1.8.7.md | 27 ++++++ public_html/sw.js | 2 +- routes/admin-routes.php | 16 ++++ routes/api-routes.php | 77 ++++++++++++++- scripts/database_maintenance.php | 154 ++++++++++++++++-------------- src/UserCredit.php | 8 ++ templates/admin/bbs_settings.twig | 56 +++++++++++ 16 files changed, 321 insertions(+), 77 deletions(-) diff --git a/README.md b/README.md index 79f2d9f0..74dd41d6 100644 --- a/README.md +++ b/README.md @@ -211,7 +211,7 @@ See **[docs/SSHServer.md](docs/SSHServer.md)** for daemon setup, configuration, ## Credits System -BinktermPHP includes an integrated credits economy that rewards user participation and allows charging for certain actions. Credits can be used to encourage quality content, manage resource usage, and gamify the BBS experience. Configuration is done in `config/bbs.json` under the `credits` section, or via **Admin → BBS Settings → Credits System Configuration**. +BinktermPHP includes an integrated credits economy that rewards user participation and allows charging for certain actions. Credits can be used to encourage quality content, manage resource usage, and gamify the BBS experience. Configuration is done in `config/bbs.json` under the `credits` section, or via **Admin → BBS Settings → Credits System Configuration**. Current built-in actions include login bonuses, message costs/rewards, poll creation cost, and configurable file upload/download costs and rewards. See **[docs/CreditSystem.md](docs/CreditSystem.md)** for default values, configuration options, transaction types, and the developer API. diff --git a/config/bbs.json.example b/config/bbs.json.example index 09fdebcd..15feb69d 100644 --- a/config/bbs.json.example +++ b/config/bbs.json.example @@ -21,6 +21,10 @@ "echomail_reward": 3, "crashmail_cost": 20, "poll_creation_cost": 15, + "file_upload_cost": 0, + "file_upload_reward": 0, + "file_download_cost": 0, + "file_download_reward": 0, "return_14days": 50, "transfer_fee_percent": 0.05, "referral_enabled": false, diff --git a/config/i18n/en/common.php b/config/i18n/en/common.php index 006be5c9..f9d04e29 100644 --- a/config/i18n/en/common.php +++ b/config/i18n/en/common.php @@ -1171,6 +1171,14 @@ 'ui.admin.bbs_settings.credits.crashmail_cost_help' => 'Credits charged when sending direct/crashmail delivery.', 'ui.admin.bbs_settings.credits.poll_creation_cost' => 'Poll Creation Cost', 'ui.admin.bbs_settings.credits.poll_creation_cost_help' => 'Credits charged when creating a new poll.', + 'ui.admin.bbs_settings.credits.file_upload_cost' => 'File Upload Cost', + 'ui.admin.bbs_settings.credits.file_upload_cost_help' => 'Credits charged to the acting user when uploading a file.', + 'ui.admin.bbs_settings.credits.file_upload_reward' => 'File Upload Reward', + 'ui.admin.bbs_settings.credits.file_upload_reward_help' => 'Credits awarded to the acting user after a successful file upload.', + 'ui.admin.bbs_settings.credits.file_download_cost' => 'File Download Cost', + 'ui.admin.bbs_settings.credits.file_download_cost_help' => 'Credits charged to the acting user when downloading a file.', + 'ui.admin.bbs_settings.credits.file_download_reward' => 'File Download Reward', + 'ui.admin.bbs_settings.credits.file_download_reward_help' => 'Credits awarded to the acting user after a successful file download.', 'ui.admin.bbs_settings.credits.transfer_fee_percentage' => 'Transfer Fee Percentage', 'ui.admin.bbs_settings.credits.transfer_fee_help' => 'Percentage of credit transfers taken as fee (0.05 = 5%). Distributed to sysops.', 'ui.admin.bbs_settings.credits.referral_system' => 'Referral System', @@ -1192,6 +1200,10 @@ 'ui.admin.bbs_settings.validation.echomail_reward_non_negative' => 'Echomail reward must be a non-negative integer.', 'ui.admin.bbs_settings.validation.crashmail_cost_non_negative' => 'Crashmail cost must be a non-negative integer.', 'ui.admin.bbs_settings.validation.poll_creation_cost_non_negative' => 'Poll creation cost must be a non-negative integer.', + 'ui.admin.bbs_settings.validation.file_upload_cost_non_negative' => 'File upload cost must be a non-negative integer.', + 'ui.admin.bbs_settings.validation.file_upload_reward_non_negative' => 'File upload reward must be a non-negative integer.', + 'ui.admin.bbs_settings.validation.file_download_cost_non_negative' => 'File download cost must be a non-negative integer.', + 'ui.admin.bbs_settings.validation.file_download_reward_non_negative' => 'File download reward must be a non-negative integer.', 'ui.admin.bbs_settings.validation.return_14_days_non_negative' => '14-day return bonus must be a non-negative integer.', 'ui.admin.bbs_settings.validation.transfer_fee_range' => 'Transfer fee must be between 0 and 1 (0% to 100%).', 'ui.admin.bbs_settings.validation.referral_bonus_non_negative' => 'Referral bonus must be a non-negative integer.', diff --git a/config/i18n/en/errors.php b/config/i18n/en/errors.php index 5b488965..0615b9f0 100644 --- a/config/i18n/en/errors.php +++ b/config/i18n/en/errors.php @@ -153,7 +153,9 @@ 'errors.files.upload.read_only' => 'This file area is read-only', 'errors.files.upload.admin_only' => 'Only administrators can upload files to this area', 'errors.files.upload.virus_detected' => 'File rejected: virus detected', + 'errors.files.upload.insufficient_credits' => 'Insufficient credits to upload this file', 'errors.files.upload.failed' => 'Failed to upload file', + 'errors.files.download.insufficient_credits' => 'Insufficient credits to download this file', // Admin Users 'errors.admin.users.not_found' => 'User not found', diff --git a/config/i18n/es/common.php b/config/i18n/es/common.php index 22bb46a3..13e07d00 100644 --- a/config/i18n/es/common.php +++ b/config/i18n/es/common.php @@ -1171,6 +1171,14 @@ 'ui.admin.bbs_settings.credits.crashmail_cost_help' => 'Creditos cobrados al enviar entrega directa/crashmail.', 'ui.admin.bbs_settings.credits.poll_creation_cost' => 'Costo de creacion de encuesta', 'ui.admin.bbs_settings.credits.poll_creation_cost_help' => 'Creditos cobrados al crear una nueva encuesta.', + 'ui.admin.bbs_settings.credits.file_upload_cost' => 'Costo de subida de archivos', + 'ui.admin.bbs_settings.credits.file_upload_cost_help' => 'Creditos cobrados al usuario que realiza la subida de un archivo.', + 'ui.admin.bbs_settings.credits.file_upload_reward' => 'Recompensa por subida de archivos', + 'ui.admin.bbs_settings.credits.file_upload_reward_help' => 'Creditos otorgados al usuario que realiza la subida despues de una carga exitosa.', + 'ui.admin.bbs_settings.credits.file_download_cost' => 'Costo de descarga de archivos', + 'ui.admin.bbs_settings.credits.file_download_cost_help' => 'Creditos cobrados al usuario que realiza la descarga de un archivo.', + 'ui.admin.bbs_settings.credits.file_download_reward' => 'Recompensa por descarga de archivos', + 'ui.admin.bbs_settings.credits.file_download_reward_help' => 'Creditos otorgados al usuario que realiza la descarga despues de una descarga exitosa.', 'ui.admin.bbs_settings.credits.transfer_fee_percentage' => 'Porcentaje de tarifa por transferencia', 'ui.admin.bbs_settings.credits.transfer_fee_help' => 'Porcentaje de transferencias de credito tomado como tarifa (0.05 = 5%). Distribuido a sysops.', 'ui.admin.bbs_settings.credits.referral_system' => 'Sistema de referidos', @@ -1192,6 +1200,10 @@ 'ui.admin.bbs_settings.validation.echomail_reward_non_negative' => 'La recompensa de echomail debe ser un entero no negativo.', 'ui.admin.bbs_settings.validation.crashmail_cost_non_negative' => 'El costo de crashmail debe ser un entero no negativo.', 'ui.admin.bbs_settings.validation.poll_creation_cost_non_negative' => 'El costo de creacion de encuesta debe ser un entero no negativo.', + 'ui.admin.bbs_settings.validation.file_upload_cost_non_negative' => 'El costo de subida de archivos debe ser un entero no negativo.', + 'ui.admin.bbs_settings.validation.file_upload_reward_non_negative' => 'La recompensa por subida de archivos debe ser un entero no negativo.', + 'ui.admin.bbs_settings.validation.file_download_cost_non_negative' => 'El costo de descarga de archivos debe ser un entero no negativo.', + 'ui.admin.bbs_settings.validation.file_download_reward_non_negative' => 'La recompensa por descarga de archivos debe ser un entero no negativo.', 'ui.admin.bbs_settings.validation.return_14_days_non_negative' => 'El bono de retorno de 14 dias debe ser un entero no negativo.', 'ui.admin.bbs_settings.validation.transfer_fee_range' => 'La tarifa de transferencia debe estar entre 0 y 1 (0% a 100%).', 'ui.admin.bbs_settings.validation.referral_bonus_non_negative' => 'El bono de referido debe ser un entero no negativo.', diff --git a/config/i18n/es/errors.php b/config/i18n/es/errors.php index e64bf00f..b2cf03a2 100644 --- a/config/i18n/es/errors.php +++ b/config/i18n/es/errors.php @@ -153,7 +153,9 @@ 'errors.files.upload.read_only' => 'Esta area de archivos es de solo lectura', 'errors.files.upload.admin_only' => 'Solo los administradores pueden subir archivos a esta area', 'errors.files.upload.virus_detected' => 'Archivo rechazado: virus detectado', + 'errors.files.upload.insufficient_credits' => 'No tiene creditos suficientes para subir este archivo', 'errors.files.upload.failed' => 'No se pudo subir el archivo', + 'errors.files.download.insufficient_credits' => 'No tiene creditos suficientes para descargar este archivo', // Admin Users 'errors.admin.users.not_found' => 'Usuario no encontrado', diff --git a/config/i18n/fr/common.php b/config/i18n/fr/common.php index 92fcf6e9..a6ae8e0e 100644 --- a/config/i18n/fr/common.php +++ b/config/i18n/fr/common.php @@ -1129,6 +1129,14 @@ 'ui.admin.bbs_settings.credits.crashmail_cost_help' => 'Crédits débités lors d\'un envoi direct/crashmail.', 'ui.admin.bbs_settings.credits.poll_creation_cost' => 'Coût de création de sondage', 'ui.admin.bbs_settings.credits.poll_creation_cost_help' => 'Crédits débités lors de la création d\'un nouveau sondage.', + 'ui.admin.bbs_settings.credits.file_upload_cost' => 'Coût de téléversement de fichier', + 'ui.admin.bbs_settings.credits.file_upload_cost_help' => 'Crédits débités à l\'utilisateur effectuant le téléversement d\'un fichier.', + 'ui.admin.bbs_settings.credits.file_upload_reward' => 'Récompense de téléversement de fichier', + 'ui.admin.bbs_settings.credits.file_upload_reward_help' => 'Crédits attribués à l\'utilisateur après un téléversement réussi.', + 'ui.admin.bbs_settings.credits.file_download_cost' => 'Coût de téléchargement de fichier', + 'ui.admin.bbs_settings.credits.file_download_cost_help' => 'Crédits débités à l\'utilisateur effectuant le téléchargement d\'un fichier.', + 'ui.admin.bbs_settings.credits.file_download_reward' => 'Récompense de téléchargement de fichier', + 'ui.admin.bbs_settings.credits.file_download_reward_help' => 'Crédits attribués à l\'utilisateur après un téléchargement réussi.', 'ui.admin.bbs_settings.credits.transfer_fee_percentage' => 'Pourcentage de frais de transfert', 'ui.admin.bbs_settings.credits.transfer_fee_help' => 'Pourcentage des transferts de crédits prélevé en frais (0,05 = 5%). Distribué aux sysops.', 'ui.admin.bbs_settings.credits.referral_system' => 'Système de parrainage', @@ -1150,6 +1158,10 @@ 'ui.admin.bbs_settings.validation.echomail_reward_non_negative' => 'La récompense echomail doit être un entier non négatif.', 'ui.admin.bbs_settings.validation.crashmail_cost_non_negative' => 'Le coût du crashmail doit être un entier non négatif.', 'ui.admin.bbs_settings.validation.poll_creation_cost_non_negative' => 'Le coût de création de sondage doit être un entier non négatif.', + 'ui.admin.bbs_settings.validation.file_upload_cost_non_negative' => 'Le coût de téléversement de fichier doit être un entier non négatif.', + 'ui.admin.bbs_settings.validation.file_upload_reward_non_negative' => 'La récompense de téléversement de fichier doit être un entier non négatif.', + 'ui.admin.bbs_settings.validation.file_download_cost_non_negative' => 'Le coût de téléchargement de fichier doit être un entier non négatif.', + 'ui.admin.bbs_settings.validation.file_download_reward_non_negative' => 'La récompense de téléchargement de fichier doit être un entier non négatif.', 'ui.admin.bbs_settings.validation.return_14_days_non_negative' => 'Le bonus de retour à 14 jours doit être un entier non négatif.', 'ui.admin.bbs_settings.validation.transfer_fee_range' => 'Les frais de transfert doivent être compris entre 0 et 1 (0% à 100%).', 'ui.admin.bbs_settings.validation.referral_bonus_non_negative' => 'Le bonus de parrainage doit être un entier non négatif.', diff --git a/config/i18n/fr/errors.php b/config/i18n/fr/errors.php index 13c04d7c..d1cefb8d 100644 --- a/config/i18n/fr/errors.php +++ b/config/i18n/fr/errors.php @@ -116,7 +116,9 @@ 'errors.files.upload.read_only' => 'Cette zone de fichiers est en lecture seule', 'errors.files.upload.admin_only' => 'Seuls les administrateurs peuvent téléverser des fichiers dans cette zone', 'errors.files.upload.virus_detected' => 'Fichier rejeté : virus détecté', + 'errors.files.upload.insufficient_credits' => 'Crédits insuffisants pour téléverser ce fichier', 'errors.files.upload.failed' => 'Échec du téléversement du fichier', + 'errors.files.download.insufficient_credits' => 'Crédits insuffisants pour télécharger ce fichier', 'errors.admin.users.not_found' => 'Utilisateur introuvable', 'errors.admin.users.create_failed' => 'Échec de la création de l\'utilisateur', 'errors.admin.users.update_failed' => 'Échec de la mise à jour de l\'utilisateur', diff --git a/docs/CreditSystem.md b/docs/CreditSystem.md index ea32aaf8..7645249d 100644 --- a/docs/CreditSystem.md +++ b/docs/CreditSystem.md @@ -21,6 +21,10 @@ BinktermPHP includes an integrated credits economy that rewards user participati | Echomail Posted (approx. 2 paragraphs) | +6 | Bonus | 2× reward for substantial posts (2+ paragraphs) | | Crashmail Sent | -10 | Cost | Direct delivery bypassing uplink | | Poll Creation | -15 | Cost | Creating a new poll in voting booth | +| File Upload | 0 | Cost | Optional charge applied before a file upload | +| File Upload | 0 | Reward | Optional reward applied after a successful upload | +| File Download | 0 | Cost | Optional charge applied before a file download | +| File Download | 0 | Reward | Optional reward applied after a successful download | ## Configuration @@ -37,7 +41,11 @@ Credits are configured in `config/bbs.json` under the `credits` section. All val "netmail_cost": 1, "echomail_reward": 5, "crashmail_cost": 10, - "poll_creation_cost": 15 + "poll_creation_cost": 15, + "file_upload_cost": 0, + "file_upload_reward": 0, + "file_download_cost": 0, + "file_download_reward": 0 } } ``` diff --git a/docs/UPGRADING_1.8.7.md b/docs/UPGRADING_1.8.7.md index de07edbf..82afa471 100644 --- a/docs/UPGRADING_1.8.7.md +++ b/docs/UPGRADING_1.8.7.md @@ -13,6 +13,7 @@ - [psql Instructions](#psql-instructions) - [Notes](#notes) - [Database Statistics Page](#database-statistics-page) +- [Credits System Updates](#credits-system-updates) - [Upgrade Instructions](#upgrade-instructions) - [From Git](#from-git) - [Using the Installer](#using-the-installer) @@ -32,6 +33,8 @@ - New admin **Database Statistics** page (`/admin/database-stats`) showing size and growth, activity metrics, query performance, replication status, maintenance health, and index health. +- Added configurable file upload and file download credit costs/rewards in the + **Credits System Configuration** page. ## Enhanced Message Search @@ -189,6 +192,30 @@ Then add it to `shared_preload_libraries` in `postgresql.conf` and restart PostgreSQL. The statistics page works without it but the slow/frequent query tabs will be empty. +## Credits System Updates + +This release adds four new optional credits settings: + +- `file_upload_cost` +- `file_upload_reward` +- `file_download_cost` +- `file_download_reward` + +These settings are available in **Admin -> BBS Settings -> Credits System Configuration**. + +No database migration is required for these options. They are configuration-only +settings and default to `0` if not present in an older `config/bbs.json`. + +If you manage `config/bbs.json` manually, you can add them under the `credits` +section: + +```json +"file_upload_cost": 0, +"file_upload_reward": 0, +"file_download_cost": 0, +"file_download_reward": 0 +``` + ## Upgrade Instructions ### From Git diff --git a/public_html/sw.js b/public_html/sw.js index cbd1181d..974053df 100644 --- a/public_html/sw.js +++ b/public_html/sw.js @@ -1,4 +1,4 @@ -const CACHE_NAME = 'binkcache-v229'; +const CACHE_NAME = 'binkcache-v230'; // Static assets to precache const staticAssets = [ diff --git a/routes/admin-routes.php b/routes/admin-routes.php index 271350cd..6d79f91a 100644 --- a/routes/admin-routes.php +++ b/routes/admin-routes.php @@ -842,6 +842,18 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array if (!is_numeric($credits['poll_creation_cost'] ?? null) || (int)$credits['poll_creation_cost'] < 0) { throw new Exception('Poll creation cost must be a non-negative integer'); } + if (!is_numeric($credits['file_upload_cost'] ?? 0) || (int)($credits['file_upload_cost'] ?? 0) < 0) { + throw new Exception('File upload cost must be a non-negative integer'); + } + if (!is_numeric($credits['file_upload_reward'] ?? 0) || (int)($credits['file_upload_reward'] ?? 0) < 0) { + throw new Exception('File upload reward must be a non-negative integer'); + } + if (!is_numeric($credits['file_download_cost'] ?? 0) || (int)($credits['file_download_cost'] ?? 0) < 0) { + throw new Exception('File download cost must be a non-negative integer'); + } + if (!is_numeric($credits['file_download_reward'] ?? 0) || (int)($credits['file_download_reward'] ?? 0) < 0) { + throw new Exception('File download reward must be a non-negative integer'); + } if (!is_numeric($credits['return_14days'] ?? null) || (int)$credits['return_14days'] < 0) { throw new Exception('14-day return bonus must be a non-negative integer'); } @@ -861,6 +873,10 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array 'echomail_reward' => (int)$credits['echomail_reward'], 'crashmail_cost' => (int)$credits['crashmail_cost'], 'poll_creation_cost' => (int)$credits['poll_creation_cost'], + 'file_upload_cost' => (int)($credits['file_upload_cost'] ?? 0), + 'file_upload_reward' => (int)($credits['file_upload_reward'] ?? 0), + 'file_download_cost' => (int)($credits['file_download_cost'] ?? 0), + 'file_download_reward' => (int)($credits['file_download_reward'] ?? 0), 'return_14days' => (int)$credits['return_14days'], 'transfer_fee_percent' => (float)$credits['transfer_fee_percent'], 'referral_enabled' => !empty($credits['referral_enabled']), diff --git a/routes/api-routes.php b/routes/api-routes.php index 85ecdd70..6455b62c 100644 --- a/routes/api-routes.php +++ b/routes/api-routes.php @@ -2280,6 +2280,36 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array // Properly encode filename for Content-Disposition header (RFC 6266 & RFC 5987) $filename = basename($file['filename']); $encodedFilename = rawurlencode($filename); + $downloadCost = UserCredit::isEnabled() ? UserCredit::getCreditCost('file_download', 0) : 0; + $downloadReward = UserCredit::isEnabled() ? UserCredit::getRewardAmount('file_download', 0) : 0; + + if ($downloadCost > 0) { + $debitSuccess = UserCredit::debit( + (int)$userId, + $downloadCost, + "Downloaded file: {$filename}", + null, + UserCredit::TYPE_PAYMENT + ); + if (!$debitSuccess) { + http_response_code(402); + echo apiLocalizedText('errors.files.download.insufficient_credits', 'Insufficient credits to download this file', $user); + return; + } + } + + if ($downloadReward > 0) { + $creditSuccess = UserCredit::credit( + (int)$userId, + $downloadReward, + "Download reward: {$filename}", + null, + UserCredit::TYPE_SYSTEM_REWARD + ); + if (!$creditSuccess) { + error_log("Failed to award file download credits for user {$userId} and file {$id}"); + } + } ActivityTracker::track($userId, ActivityTracker::TYPE_FILE_DOWNLOAD, (int)$id, $filename); @@ -2438,6 +2468,10 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array header('Content-Type: application/json'); + $ownerId = (int)($user['user_id'] ?? $user['id'] ?? 0); + $uploadCostCharged = false; + $uploadCost = 0; + try { if (!isset($_FILES['file'])) { throw new \Exception('No file uploaded'); @@ -2475,7 +2509,23 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array // Get user's FidoNet address or username $uploadedBy = $user['username'] ?? 'Unknown'; - $ownerId = $user['user_id'] ?? $user['id'] ?? null; + $ownerId = (int)($user['user_id'] ?? $user['id'] ?? 0); + $uploadCost = UserCredit::isEnabled() ? UserCredit::getCreditCost('file_upload', 0) : 0; + $uploadReward = UserCredit::isEnabled() ? UserCredit::getRewardAmount('file_upload', 0) : 0; + + if ($uploadCost > 0) { + $uploadCostCharged = UserCredit::debit( + $ownerId, + $uploadCost, + "Uploaded file cost: " . ($_FILES['file']['name'] ?? 'unknown'), + null, + UserCredit::TYPE_PAYMENT + ); + if (!$uploadCostCharged) { + throw new \Exception('Insufficient credits for file upload'); + } + } + $fileId = $manager->uploadFile( $fileAreaId, $_FILES['file'], @@ -2485,6 +2535,19 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array $ownerId ); + if ($uploadReward > 0) { + $creditSuccess = UserCredit::credit( + $ownerId, + $uploadReward, + "Upload reward: " . ($_FILES['file']['name'] ?? 'unknown'), + null, + UserCredit::TYPE_SYSTEM_REWARD + ); + if (!$creditSuccess) { + error_log("Failed to award file upload credits for user {$ownerId} and file {$fileId}"); + } + } + ActivityTracker::track($ownerId, ActivityTracker::TYPE_FILE_UPLOAD, (int)$fileId, $_FILES['file']['name'] ?? null, ['file_area_id' => $fileAreaId]); echo json_encode([ @@ -2494,6 +2557,16 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array ]); } catch (\Exception $e) { + if ($uploadCostCharged && $uploadCost > 0) { + UserCredit::credit( + $ownerId, + $uploadCost, + 'Refund: File upload failed', + null, + UserCredit::TYPE_REFUND + ); + } + http_response_code(400); $message = $e->getMessage(); if ($message === 'No file uploaded') { @@ -2508,6 +2581,8 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array apiError('errors.files.upload.read_only', apiLocalizedText('errors.files.upload.read_only', 'This file area is read-only', $user)); } elseif ($message === 'Only administrators can upload files to this area.') { apiError('errors.files.upload.admin_only', apiLocalizedText('errors.files.upload.admin_only', 'Only administrators can upload files to this area', $user)); + } elseif ($message === 'Insufficient credits for file upload') { + apiError('errors.files.upload.insufficient_credits', apiLocalizedText('errors.files.upload.insufficient_credits', 'Insufficient credits to upload this file', $user), 402); } elseif ($message === 'File rejected: virus detected.') { \BinktermPHP\Admin\AdminDaemonClient::log('WARNING', 'Infected file upload rejected', [ 'username' => $user['username'] ?? 'unknown', diff --git a/scripts/database_maintenance.php b/scripts/database_maintenance.php index fddf9df9..9daff11d 100644 --- a/scripts/database_maintenance.php +++ b/scripts/database_maintenance.php @@ -7,16 +7,18 @@ * Performs routine cleanup and maintenance on various database tables. * Run this script periodically (e.g., daily via cron) to keep the database clean. * - * Usage: php scripts/database_maintenance.php [--verbose] [--dry-run] + * Usage: php scripts/database_maintenance.php [--verbose] [--dry-run] [-r|--registration-attempts] */ require_once __DIR__ . '/../vendor/autoload.php'; +require_once __DIR__ . '/../src/functions.php'; use BinktermPHP\Database; // Parse command line arguments $verbose = in_array('--verbose', $argv) || in_array('-v', $argv); $dryRun = in_array('--dry-run', $argv); +$cleanRegistrationAttempts = in_array('--registration-attempts', $argv) || in_array('-r', $argv); if ($dryRun) { echo "DRY RUN MODE - No changes will be made\n"; @@ -37,35 +39,39 @@ // ======================================================================== echo "[1] Cleaning old registration attempts...\n"; - // Check if table exists first - $tableCheck = $db->query(" - SELECT EXISTS ( - SELECT FROM information_schema.tables - WHERE table_name = 'registration_attempts' - ) - "); + if (!$cleanRegistrationAttempts) { + echo " Skipping by default; pass -r or --registration-attempts to enable\n"; + } else { + // Check if table exists first + $tableCheck = $db->query(" + SELECT EXISTS ( + SELECT FROM information_schema.tables + WHERE table_name = 'registration_attempts' + ) + "); - if ($tableCheck->fetchColumn()) { - if ($dryRun) { - $stmt = $db->query(" - SELECT COUNT(*) as count - FROM registration_attempts - WHERE attempt_time < NOW() - INTERVAL '30 days' - "); - $result = $stmt->fetch(); - echo " Would delete {$result['count']} registration attempts older than 30 days\n"; + if ($tableCheck->fetchColumn()) { + if ($dryRun) { + $stmt = $db->query(" + SELECT COUNT(*) as count + FROM registration_attempts + WHERE attempt_time < NOW() - INTERVAL '30 days' + "); + $result = $stmt->fetch(); + echo " Would delete {$result['count']} registration attempts older than 30 days\n"; + } else { + $stmt = $db->prepare(" + DELETE FROM registration_attempts + WHERE attempt_time < NOW() - INTERVAL '30 days' + "); + $stmt->execute(); + $deleted = $stmt->rowCount(); + $totalCleaned += $deleted; + echo " Deleted $deleted old registration attempts\n"; + } } else { - $stmt = $db->prepare(" - DELETE FROM registration_attempts - WHERE attempt_time < NOW() - INTERVAL '30 days' - "); - $stmt->execute(); - $deleted = $stmt->rowCount(); - $totalCleaned += $deleted; - echo " Deleted $deleted old registration attempts\n"; + echo " Table 'registration_attempts' does not exist, skipping\n"; } - } else { - echo " Table 'registration_attempts' does not exist, skipping\n"; } // ======================================================================== @@ -153,15 +159,15 @@ } // ======================================================================== - // 5. Clean up expired webshare links + // 5. Clean up expired shared message links // ======================================================================== - echo "\n[5] Cleaning expired webshare links...\n"; + echo "\n[5] Cleaning expired shared message links...\n"; // Check if table exists first $tableCheck = $db->query(" SELECT EXISTS ( SELECT FROM information_schema.tables - WHERE table_name = 'webshare' + WHERE table_name = 'shared_messages' ) "); @@ -169,31 +175,69 @@ if ($dryRun) { $stmt = $db->query(" SELECT COUNT(*) as count - FROM webshare + FROM shared_messages WHERE expires_at IS NOT NULL AND expires_at < NOW() "); $result = $stmt->fetch(); - echo " Would delete {$result['count']} expired webshare links\n"; + echo " Would delete {$result['count']} expired shared message links\n"; } else { $stmt = $db->prepare(" - DELETE FROM webshare + DELETE FROM shared_messages WHERE expires_at IS NOT NULL AND expires_at < NOW() "); $stmt->execute(); $deleted = $stmt->rowCount(); $totalCleaned += $deleted; - echo " Deleted $deleted expired webshare links\n"; + echo " Deleted $deleted expired shared message links\n"; } } else { - echo " Table 'webshare' does not exist, skipping\n"; + echo " Table 'shared_messages' does not exist, skipping\n"; + } + + // ======================================================================== + // 6. Clean up expired shared file links + // ======================================================================== + echo "\n[6] Cleaning expired shared file links...\n"; + + $tableCheck = $db->query(" + SELECT EXISTS ( + SELECT FROM information_schema.tables + WHERE table_name = 'shared_files' + ) + "); + + if ($tableCheck->fetchColumn()) { + if ($dryRun) { + $stmt = $db->query(" + SELECT COUNT(*) as count + FROM shared_files + WHERE expires_at IS NOT NULL AND expires_at < NOW() + "); + $result = $stmt->fetch(); + echo " Would deactivate {$result['count']} expired shared file links\n"; + } else { + $stmt = $db->prepare(" + UPDATE shared_files + SET is_active = FALSE + WHERE is_active = TRUE + AND expires_at IS NOT NULL + AND expires_at < NOW() + "); + $stmt->execute(); + $deactivated = $stmt->rowCount(); + $totalCleaned += $deactivated; + echo " Deactivated $deactivated expired shared file links\n"; + } + } else { + echo " Table 'shared_files' does not exist, skipping\n"; } // ======================================================================== - // 6. Clean up old rejected pending users (older than 90 days) + // 7. Clean up old rejected pending users (older than 90 days) // ======================================================================== if(0) { // TODO: Check if .env variable is set and use for number of days - echo "\n[6] Cleaning old rejected pending users...\n"; + echo "\n[7] Cleaning old rejected pending users...\n"; if ($dryRun) { $stmt = $db->query(" @@ -216,42 +260,6 @@ echo " Deleted $deleted old rejected pending users\n"; } } - // ======================================================================== - // 7. Clean up old login attempts (older than 30 days) - // ======================================================================== - echo "\n[7] Cleaning old login attempts...\n"; - - // Check if table exists first - $tableCheck = $db->query(" - SELECT EXISTS ( - SELECT FROM information_schema.tables - WHERE table_name = 'login_attempts' - ) - "); - - if ($tableCheck->fetchColumn()) { - if ($dryRun) { - $stmt = $db->query(" - SELECT COUNT(*) as count - FROM login_attempts - WHERE attempt_time < NOW() - INTERVAL '30 days' - "); - $result = $stmt->fetch(); - echo " Would delete {$result['count']} old login attempts\n"; - } else { - $stmt = $db->prepare(" - DELETE FROM login_attempts - WHERE attempt_time < NOW() - INTERVAL '30 days' - "); - $stmt->execute(); - $deleted = $stmt->rowCount(); - $totalCleaned += $deleted; - echo " Deleted $deleted old login attempts\n"; - } - } else { - echo " Table 'login_attempts' does not exist, skipping\n"; - } - // ======================================================================== // 8. PostgreSQL VACUUM and ANALYZE (if not dry run) // ======================================================================== diff --git a/src/UserCredit.php b/src/UserCredit.php index 3f009e65..bbc71ec5 100644 --- a/src/UserCredit.php +++ b/src/UserCredit.php @@ -350,6 +350,10 @@ public static function getCreditsConfig(): array 'echomail_reward' => 3, 'crashmail_cost' => 10, 'poll_creation_cost' => 15, + 'file_upload_cost' => 0, + 'file_upload_reward' => 0, + 'file_download_cost' => 0, + 'file_download_reward' => 0, 'return_14days' => 50, 'transfer_fee_percent' => 0.05, 'referral_enabled' => false, @@ -370,6 +374,10 @@ public static function getCreditsConfig(): array $merged['echomail_reward'] = max(0, (int)$merged['echomail_reward']); $merged['crashmail_cost'] = max(0, (int)$merged['crashmail_cost']); $merged['poll_creation_cost'] = max(0, (int)$merged['poll_creation_cost']); + $merged['file_upload_cost'] = max(0, (int)$merged['file_upload_cost']); + $merged['file_upload_reward'] = max(0, (int)$merged['file_upload_reward']); + $merged['file_download_cost'] = max(0, (int)$merged['file_download_cost']); + $merged['file_download_reward'] = max(0, (int)$merged['file_download_reward']); $merged['return_14days'] = max(0, (int)$merged['return_14days']); $merged['transfer_fee_percent'] = max(0, min(1, (float)$merged['transfer_fee_percent'])); $merged['referral_enabled'] = !empty($merged['referral_enabled']); diff --git a/templates/admin/bbs_settings.twig b/templates/admin/bbs_settings.twig index b5572db9..a25e9819 100644 --- a/templates/admin/bbs_settings.twig +++ b/templates/admin/bbs_settings.twig @@ -178,6 +178,26 @@ {{ t('ui.admin.bbs_settings.credits.poll_creation_cost_help', {}, locale, ['common']) }} +
+ + + {{ t('ui.admin.bbs_settings.credits.file_upload_cost_help', {}, locale, ['common']) }} +
+
+ + + {{ t('ui.admin.bbs_settings.credits.file_upload_reward_help', {}, locale, ['common']) }} +
+
+ + + {{ t('ui.admin.bbs_settings.credits.file_download_cost_help', {}, locale, ['common']) }} +
+
+ + + {{ t('ui.admin.bbs_settings.credits.file_download_reward_help', {}, locale, ['common']) }} +
@@ -268,6 +288,10 @@ function loadBbsSettings() { const echomailRewardValue = parseInt(credits.echomail_reward, 10); const crashmailCostValue = parseInt(credits.crashmail_cost, 10); const pollCreationCostValue = parseInt(credits.poll_creation_cost, 10); + const fileUploadCostValue = parseInt(credits.file_upload_cost, 10); + const fileUploadRewardValue = parseInt(credits.file_upload_reward, 10); + const fileDownloadCostValue = parseInt(credits.file_download_cost, 10); + const fileDownloadRewardValue = parseInt(credits.file_download_reward, 10); const new14DaysValue = parseInt(credits.return_14days, 10); const transferFeeValue = parseFloat(credits.transfer_fee_percent); document.getElementById('bbsCreditsDailyAmount').value = Number.isNaN(dailyAmountValue) ? 25 : dailyAmountValue; @@ -277,6 +301,10 @@ function loadBbsSettings() { document.getElementById('bbsCreditsEchomailReward').value = Number.isNaN(echomailRewardValue) ? 3 : echomailRewardValue; document.getElementById('bbsCreditsCrashmailCost').value = Number.isNaN(crashmailCostValue) ? 10 : crashmailCostValue; document.getElementById('bbsCreditsPollCreationCost').value = Number.isNaN(pollCreationCostValue) ? 15 : pollCreationCostValue; + document.getElementById('bbsCreditsFileUploadCost').value = Number.isNaN(fileUploadCostValue) ? 0 : fileUploadCostValue; + document.getElementById('bbsCreditsFileUploadReward').value = Number.isNaN(fileUploadRewardValue) ? 0 : fileUploadRewardValue; + document.getElementById('bbsCreditsFileDownloadCost').value = Number.isNaN(fileDownloadCostValue) ? 0 : fileDownloadCostValue; + document.getElementById('bbsCreditsFileDownloadReward').value = Number.isNaN(fileDownloadRewardValue) ? 0 : fileDownloadRewardValue; document.getElementById('bbsCreditsNew14Days').value = Number.isNaN(new14DaysValue) ? 50 : new14DaysValue; document.getElementById('bbsCreditsTransferFee').value = Number.isNaN(transferFeeValue) ? 0.05 : transferFeeValue; @@ -439,6 +467,30 @@ function saveBbsCredits() { return; } + const fileUploadCost = parseInt(document.getElementById('bbsCreditsFileUploadCost').value, 10); + if (Number.isNaN(fileUploadCost) || fileUploadCost < 0) { + showBbsCreditsAlert(uiT('ui.admin.bbs_settings.validation.file_upload_cost_non_negative', 'File upload cost must be a non-negative integer.'), 'danger'); + return; + } + + const fileUploadReward = parseInt(document.getElementById('bbsCreditsFileUploadReward').value, 10); + if (Number.isNaN(fileUploadReward) || fileUploadReward < 0) { + showBbsCreditsAlert(uiT('ui.admin.bbs_settings.validation.file_upload_reward_non_negative', 'File upload reward must be a non-negative integer.'), 'danger'); + return; + } + + const fileDownloadCost = parseInt(document.getElementById('bbsCreditsFileDownloadCost').value, 10); + if (Number.isNaN(fileDownloadCost) || fileDownloadCost < 0) { + showBbsCreditsAlert(uiT('ui.admin.bbs_settings.validation.file_download_cost_non_negative', 'File download cost must be a non-negative integer.'), 'danger'); + return; + } + + const fileDownloadReward = parseInt(document.getElementById('bbsCreditsFileDownloadReward').value, 10); + if (Number.isNaN(fileDownloadReward) || fileDownloadReward < 0) { + showBbsCreditsAlert(uiT('ui.admin.bbs_settings.validation.file_download_reward_non_negative', 'File download reward must be a non-negative integer.'), 'danger'); + return; + } + const new14Days = parseInt(document.getElementById('bbsCreditsNew14Days').value, 10); if (Number.isNaN(new14Days) || new14Days < 0) { showBbsCreditsAlert(uiT('ui.admin.bbs_settings.validation.return_14_days_non_negative', '14-day return bonus must be a non-negative integer.'), 'danger'); @@ -475,6 +527,10 @@ function saveBbsCredits() { echomail_reward: echomailReward, crashmail_cost: crashmailCost, poll_creation_cost: pollCreationCost, + file_upload_cost: fileUploadCost, + file_upload_reward: fileUploadReward, + file_download_cost: fileDownloadCost, + file_download_reward: fileDownloadReward, return_14days: new14Days, transfer_fee_percent: transferFee, referral_enabled: document.getElementById('bbsCreditsReferralEnabled').checked, From 0180d5cc2c63caa1b3e435d11e7759f6504b1feb Mon Sep 17 00:00:00 2001 From: awehttam Date: Sat, 14 Mar 2026 11:48:32 -0700 Subject: [PATCH 014/246] Fix partial binkp frame writes --- src/Binkp/Protocol/BinkpFrame.php | 49 ++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/src/Binkp/Protocol/BinkpFrame.php b/src/Binkp/Protocol/BinkpFrame.php index a8a519be..3e0bb72e 100644 --- a/src/Binkp/Protocol/BinkpFrame.php +++ b/src/Binkp/Protocol/BinkpFrame.php @@ -181,31 +181,46 @@ public function writeToSocket($socket) if ($this->isCommand) { $lengthAndFlags |= self::COMMAND_FRAME; } - - $header = pack('n', $lengthAndFlags); - $written = @fwrite($socket, $header); - if ($written === false) { - return; + + $buffer = pack('n', $lengthAndFlags); + + if ($this->isCommand) { + $buffer .= chr($this->command); } - - if ($this->isCommand && $this->length > 0) { - if (@fwrite($socket, chr($this->command)) === false) { - return; - } - if (strlen($this->data) > 0) { - if (@fwrite($socket, $this->data) === false) { - return; - } - } - } elseif (!$this->isCommand && $this->length > 0) { - @fwrite($socket, $this->data); + + if ($this->length > 0 && $this->data !== '') { + $buffer .= $this->data; } + + self::writeAll($socket, $buffer); // Force immediate transmission of frames if (is_resource($socket)) { fflush($socket); } } + + private static function writeAll($socket, string $buffer): void + { + $offset = 0; + $length = strlen($buffer); + + while ($offset < $length) { + $written = @fwrite($socket, substr($buffer, $offset)); + if ($written === false || $written === 0) { + $meta = stream_get_meta_data($socket); + $timedOut = !empty($meta['timed_out']); + $eof = !empty($meta['eof']); + throw new \Exception( + 'Failed to write complete frame' + . ' (written=' . $offset . '/' . $length + . ', timed_out=' . ($timedOut ? 'yes' : 'no') + . ', eof=' . ($eof ? 'yes' : 'no') . ')' + ); + } + $offset += $written; + } + } public function isCommand() { From 5393c48e89a62b0f8d5cacb0a0cffa34de460232 Mon Sep 17 00:00:00 2001 From: awehttam Date: Sat, 14 Mar 2026 11:58:26 -0700 Subject: [PATCH 015/246] Improve binkp handshake diagnostics and socket tuning --- .env.example | 5 ++++ src/Binkp/Protocol/BinkpClient.php | 14 +++++++++++ src/Binkp/Protocol/BinkpFrame.php | 39 ++++++++++++++++++++++++----- src/Binkp/Protocol/BinkpServer.php | 14 +++++++++++ src/Binkp/Protocol/BinkpSession.php | 35 ++++++++++++++++++++++++-- 5 files changed, 99 insertions(+), 8 deletions(-) diff --git a/.env.example b/.env.example index fe80c386..d15319be 100644 --- a/.env.example +++ b/.env.example @@ -89,6 +89,11 @@ PERF_LOG_SLOW_MS=500 # Use {archive} and {dest} placeholders. # ARCMAIL_EXTRACTORS=["7z x -y -o{dest} {archive}","unzip -o {archive} -d {dest}"] +# BinkP socket tuning +# Disable Nagle's algorithm by default to reduce latency for small handshake/control frames. +# Set to false only if you need to troubleshoot interoperability with a specific peer/network stack. +# BINKP_TCP_NODELAY=true + # PID File locations (defaults to data/run) # ADMIN_DAEMON_PID_FILE=data/run/admin_daemon.pid diff --git a/src/Binkp/Protocol/BinkpClient.php b/src/Binkp/Protocol/BinkpClient.php index 41c42ab3..8679db3d 100644 --- a/src/Binkp/Protocol/BinkpClient.php +++ b/src/Binkp/Protocol/BinkpClient.php @@ -17,6 +17,7 @@ namespace BinktermPHP\Binkp\Protocol; use BinktermPHP\Binkp\Config\BinkpConfig; +use BinktermPHP\Config; class BinkpClient { @@ -67,6 +68,7 @@ public function connect($address, $hostname = null, $port = null, $password = nu socket_set_option($socket, SOL_SOCKET, SO_RCVTIMEO, ['sec' => $this->config->getBinkpTimeout(), 'usec' => 0]); socket_set_option($socket, SOL_SOCKET, SO_SNDTIMEO, ['sec' => $this->config->getBinkpTimeout(), 'usec' => 0]); + $this->configureTcpNoDelay($socket); $result = socket_connect($socket, $hostname, $port); if ($result === false) { @@ -185,6 +187,7 @@ public function testConnection($hostname, $port = 24554, $timeout = 30) socket_set_option($socket, SOL_SOCKET, SO_RCVTIMEO, ['sec' => $timeout, 'usec' => 0]); socket_set_option($socket, SOL_SOCKET, SO_SNDTIMEO, ['sec' => $timeout, 'usec' => 0]); + $this->configureTcpNoDelay($socket); $startTime = microtime(true); $result = socket_connect($socket, $hostname, $port); @@ -229,6 +232,17 @@ private function socketToStream($socket) return $socketResource; } + + private function configureTcpNoDelay($socket): void + { + if (!defined('TCP_NODELAY')) { + return; + } + + $raw = strtolower(trim((string)Config::env('BINKP_TCP_NODELAY', 'true'))); + $enabled = !in_array($raw, ['0', 'false', 'no', 'off'], true); + @socket_set_option($socket, SOL_TCP, TCP_NODELAY, $enabled ? 1 : 0); + } public function sendFile($address, $filePath) { diff --git a/src/Binkp/Protocol/BinkpFrame.php b/src/Binkp/Protocol/BinkpFrame.php index 3e0bb72e..15c39cb4 100644 --- a/src/Binkp/Protocol/BinkpFrame.php +++ b/src/Binkp/Protocol/BinkpFrame.php @@ -38,6 +38,7 @@ class BinkpFrame private $isCommand; private $command; private $data; + private static $lastReadDiagnostics = null; public function __construct($length = 0, $isCommand = false, $command = 0, $data = '') { @@ -61,6 +62,8 @@ public static function createData($data) public static function parseFromSocket($socket, $nonBlocking = false) { + self::$lastReadDiagnostics = null; + if ($nonBlocking) { // Check if data is available before attempting to read $read = [$socket]; @@ -73,7 +76,7 @@ public static function parseFromSocket($socket, $nonBlocking = false) } } - $header = self::readExactly($socket, 2); + $header = self::readExactly($socket, 2, 'header'); if (strlen($header) < 2) { return null; } @@ -89,7 +92,7 @@ public static function parseFromSocket($socket, $nonBlocking = false) $payload = ''; if ($length > 0) { if ($isCommand) { - $commandByte = self::readExactly($socket, 1); + $commandByte = self::readExactly($socket, 1, 'command'); if (strlen($commandByte) < 1) { return null; } @@ -97,7 +100,7 @@ public static function parseFromSocket($socket, $nonBlocking = false) $length--; if ($length > 0) { - $payload = self::readExactly($socket, $length); + $payload = self::readExactly($socket, $length, 'payload'); if (strlen($payload) < $length) { return null; } @@ -105,7 +108,7 @@ public static function parseFromSocket($socket, $nonBlocking = false) return new self($length + 1, true, $command, $payload); } else { - $payload = self::readExactly($socket, $length); + $payload = self::readExactly($socket, $length, 'payload'); if (strlen($payload) < $length) { return null; } @@ -114,7 +117,7 @@ public static function parseFromSocket($socket, $nonBlocking = false) } if ($isCommand) { - $commandByte = self::readExactly($socket, 1); + $commandByte = self::readExactly($socket, 1, 'command'); if (strlen($commandByte) < 1) { return null; } @@ -124,7 +127,7 @@ public static function parseFromSocket($socket, $nonBlocking = false) return new self($length, $isCommand, 0, ''); } - private static function readExactly($socket, $length) + private static function readExactly($socket, $length, string $phase = 'read') { $data = ''; $remaining = $length; @@ -137,6 +140,7 @@ private static function readExactly($socket, $length) // Check for stream errors or EOF if ($chunk === false) { // Actual error occurred + self::$lastReadDiagnostics = self::buildReadDiagnostics($socket, $phase, $length, strlen($data), 'read_error'); break; } @@ -146,16 +150,19 @@ private static function readExactly($socket, $length) $meta = stream_get_meta_data($socket); if ($meta['timed_out']) { // Stream timed out - this is a real timeout + self::$lastReadDiagnostics = self::buildReadDiagnostics($socket, $phase, $length, strlen($data), 'timeout'); break; } if ($meta['eof']) { // Connection closed + self::$lastReadDiagnostics = self::buildReadDiagnostics($socket, $phase, $length, strlen($data), 'eof'); break; } // Temporary empty read - retry a few times $retries++; if ($retries >= $maxRetries) { + self::$lastReadDiagnostics = self::buildReadDiagnostics($socket, $phase, $length, strlen($data), 'empty_read_retries_exhausted'); break; } usleep(10000); // 10ms delay before retry @@ -170,6 +177,26 @@ private static function readExactly($socket, $length) return $data; } + + private static function buildReadDiagnostics($socket, string $phase, int $requested, int $received, string $reason): array + { + $meta = is_resource($socket) ? stream_get_meta_data($socket) : []; + + return [ + 'phase' => $phase, + 'requested' => $requested, + 'received' => $received, + 'reason' => $reason, + 'timed_out' => !empty($meta['timed_out']), + 'eof' => !empty($meta['eof']), + 'blocked' => !empty($meta['blocked']), + ]; + } + + public static function getLastReadDiagnostics(): ?array + { + return self::$lastReadDiagnostics; + } public function writeToSocket($socket) { diff --git a/src/Binkp/Protocol/BinkpServer.php b/src/Binkp/Protocol/BinkpServer.php index 0ba4ae7f..5eef9f4c 100644 --- a/src/Binkp/Protocol/BinkpServer.php +++ b/src/Binkp/Protocol/BinkpServer.php @@ -18,6 +18,7 @@ use BinktermPHP\Binkp\Config\BinkpConfig; use BinktermPHP\Admin\AdminDaemonClient; +use BinktermPHP\Config; class BinkpServer { @@ -129,6 +130,8 @@ private function acceptConnection() return; } + $this->configureTcpNoDelay($clientSocket); + // Check max connections (count active child processes) $this->reapChildren(); if (count($this->childPids) >= $this->config->getMaxConnections()) { @@ -261,6 +264,17 @@ private function socketToStream($socket) return $socketResource; } + + private function configureTcpNoDelay($socket): void + { + if (!defined('TCP_NODELAY')) { + return; + } + + $raw = strtolower(trim((string)Config::env('BINKP_TCP_NODELAY', 'true'))); + $enabled = !in_array($raw, ['0', 'false', 'no', 'off'], true); + @socket_set_option($socket, SOL_TCP, TCP_NODELAY, $enabled ? 1 : 0); + } public function stop() { diff --git a/src/Binkp/Protocol/BinkpSession.php b/src/Binkp/Protocol/BinkpSession.php index c61fdd7a..cc82cfbb 100644 --- a/src/Binkp/Protocol/BinkpSession.php +++ b/src/Binkp/Protocol/BinkpSession.php @@ -148,7 +148,11 @@ public function handshake() } catch (\Exception $e) { $this->log("Handshake failed: " . $e->getMessage(), 'ERROR'); - $this->sendError($e->getMessage()); + if ($this->shouldSendHandshakeError()) { + $this->sendError($e->getMessage()); + } else { + $this->log("Skipping handshake M_ERR because remote side already closed the connection", 'DEBUG'); + } // Re-throw with the actual error message so caller can see it throw new \Exception('Handshake failed: ' . $e->getMessage(), 0, $e); } @@ -189,8 +193,9 @@ private function buildHandshakeSocketDiagnostics(): string $eof = !empty($meta['eof']) ? 'yes' : 'no'; $blocked = !empty($meta['blocked']) ? 'yes' : 'no'; $preview = $this->getHandshakeSocketPreview(); + $read = $this->formatLastReadDiagnostics(); - return "(timed_out={$timedOut}, eof={$eof}, blocked={$blocked}, {$preview})"; + return "(timed_out={$timedOut}, eof={$eof}, blocked={$blocked}, {$preview}, {$read})"; } private function getHandshakeSocketPreview(int $maxBytes = 24): string @@ -211,6 +216,32 @@ private function getHandshakeSocketPreview(int $maxBytes = 24): string return 'preview_hex=' . $hex . ', preview_ascii="' . $ascii . '"'; } + private function formatLastReadDiagnostics(): string + { + $diag = BinkpFrame::getLastReadDiagnostics(); + if (!is_array($diag)) { + return 'read_diag=none'; + } + + return sprintf( + 'read_diag_phase=%s, read_diag_reason=%s, read_diag_received=%d/%d', + $diag['phase'] ?? 'unknown', + $diag['reason'] ?? 'unknown', + (int)($diag['received'] ?? 0), + (int)($diag['requested'] ?? 0) + ); + } + + private function shouldSendHandshakeError(): bool + { + if (!is_resource($this->socket)) { + return false; + } + + $meta = stream_get_meta_data($this->socket); + return empty($meta['eof']); + } + public function processSession() { try { From 0f7c7c9d0dea1a24a68c842b3e87c9fcfc854532 Mon Sep 17 00:00:00 2001 From: awehttam Date: Sat, 14 Mar 2026 13:12:45 -0700 Subject: [PATCH 016/246] Fix index sizes query using wrong pg_stat_user_indexes column names Co-Authored-By: Claude Sonnet 4.6 --- src/DatabaseStats.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DatabaseStats.php b/src/DatabaseStats.php index 734c5e18..8db1bc4a 100644 --- a/src/DatabaseStats.php +++ b/src/DatabaseStats.php @@ -93,7 +93,7 @@ public function getSizeAndGrowth(): array // Index sizes try { $stmt = $this->db->query( - "SELECT indexname, tablename, + "SELECT indexrelname AS indexname, relname AS tablename, pg_size_pretty(pg_relation_size(indexrelid)) AS index_size, pg_relation_size(indexrelid) AS size_bytes FROM pg_stat_user_indexes From 4c01702132f859b50992b28d47e5e7110de19362 Mon Sep 17 00:00:00 2001 From: awehttam Date: Sat, 14 Mar 2026 13:14:58 -0700 Subject: [PATCH 017/246] Truncate long index/table names in db stats with tooltip for full name Co-Authored-By: Claude Sonnet 4.6 --- templates/admin/database_stats.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/admin/database_stats.twig b/templates/admin/database_stats.twig index 0e1f73d5..104761cc 100644 --- a/templates/admin/database_stats.twig +++ b/templates/admin/database_stats.twig @@ -129,8 +129,8 @@ {% for row in size.index_sizes %} - {{ row.indexname }} - {{ row.tablename }} + 30 %} title="{{ row.indexname }}"{% endif %}>{{ row.indexname|length > 30 ? row.indexname|slice(0, 30) ~ '…' : row.indexname }} + 20 %} title="{{ row.tablename }}"{% endif %}>{{ row.tablename|length > 20 ? row.tablename|slice(0, 20) ~ '…' : row.tablename }} {{ row.index_size }} {% endfor %} From f96d5ff4e37b83902dbec7094cb9615b1d10b602 Mon Sep 17 00:00:00 2001 From: awehttam Date: Sat, 14 Mar 2026 13:18:25 -0700 Subject: [PATCH 018/246] Add partial index on mrc_outbound to eliminate seq scans The daemon polls every 100ms accumulating millions of seq scans. The old index (sent_at, priority) didn't match ORDER BY priority DESC, created_at ASC so PostgreSQL chose seq scans. The new partial index covers only unsent rows with the exact sort order, enabling efficient index scans. Co-Authored-By: Claude Sonnet 4.6 --- .../v1.11.0.14_mrc_outbound_partial_index.sql | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 database/migrations/v1.11.0.14_mrc_outbound_partial_index.sql diff --git a/database/migrations/v1.11.0.14_mrc_outbound_partial_index.sql b/database/migrations/v1.11.0.14_mrc_outbound_partial_index.sql new file mode 100644 index 00000000..9a33230f --- /dev/null +++ b/database/migrations/v1.11.0.14_mrc_outbound_partial_index.sql @@ -0,0 +1,15 @@ +-- Migration: v1.11.0.14 - Replace mrc_outbound pending index with a partial index +-- +-- The daemon polls mrc_outbound every 100ms with: +-- WHERE sent_at IS NULL ORDER BY priority DESC, created_at ASC LIMIT 10 +-- +-- The old index (sent_at, priority) didn't match the ORDER BY, so PostgreSQL +-- fell back to a seq scan on the (usually tiny) table, accumulating millions +-- of seq scans over time. A partial index covering only unsent rows with the +-- exact sort order allows PostgreSQL to use an index scan with no extra sort. + +DROP INDEX IF EXISTS idx_mrc_outbound_pending; + +CREATE INDEX IF NOT EXISTS idx_mrc_outbound_unsent + ON mrc_outbound (priority DESC, created_at ASC) + WHERE sent_at IS NULL; From 36ddd8dbbdb1761d126e69a35157d14fa8232ad2 Mon Sep 17 00:00:00 2001 From: awehttam Date: Sat, 14 Mar 2026 13:34:50 -0700 Subject: [PATCH 019/246] Fix seq scans on users, shared_messages, saved_messages, and chat_messages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit users: add UNIQUE LOWER(username) index — covers login queries and OR-based name-matching in mail delivery that were forcing seq scans on every auth request. shared_messages: replace (message_id, message_type) index with composite (message_id, message_type, shared_by_user_id) WHERE is_active = TRUE to cover the LEFT JOIN on every echomail listing page load. saved_messages: replace (message_id, message_type) index with composite (message_id, message_type, user_id) matching the echomail-driven LEFT JOIN. chat_messages: replace total-count polling with incremental max-ID approach. The old query counted ALL messages on every 30s poll (full table scan with OR across three columns). New approach queries only rows newer than the last seen message ID, using the PK index. Stores last_chat_max_id in user meta; JS passes chat_max_id from stats response to markSeen. Co-Authored-By: Claude Sonnet 4.6 --- .../v1.11.0.15_users_lower_username_index.sql | 16 ++++++ ...1.0.16_shared_messages_composite_index.sql | 19 +++++++ ..._saved_messages_message_id_first_index.sql | 17 +++++++ public_html/js/chat-notify.js | 2 +- public_html/sw.js | 2 +- routes/api-routes.php | 51 ++++++++++++------- 6 files changed, 88 insertions(+), 19 deletions(-) create mode 100644 database/migrations/v1.11.0.15_users_lower_username_index.sql create mode 100644 database/migrations/v1.11.0.16_shared_messages_composite_index.sql create mode 100644 database/migrations/v1.11.0.17_saved_messages_message_id_first_index.sql diff --git a/database/migrations/v1.11.0.15_users_lower_username_index.sql b/database/migrations/v1.11.0.15_users_lower_username_index.sql new file mode 100644 index 00000000..0672a6c2 --- /dev/null +++ b/database/migrations/v1.11.0.15_users_lower_username_index.sql @@ -0,0 +1,16 @@ +-- Migration: v1.11.0.15 - Add case-insensitive functional index on users.username +-- +-- Several hot-path queries use LOWER(username) comparisons but no functional +-- index existed, forcing PostgreSQL to seq scan the users table: +-- +-- 1. Auth::login() WHERE LOWER(username) = LOWER(?) AND is_active = TRUE +-- 2. BinkdProcessor WHERE LOWER(real_name) = LOWER(?) OR LOWER(username) = LOWER(?) +-- 3. MessageHandler WHERE LOWER(real_name) = LOWER(?) OR LOWER(username) = LOWER(?) +-- 4. Collision trigger WHERE LOWER(username) = LOWER(NEW.real_name) OR ... +-- +-- A UNIQUE index on LOWER(username) covers all of the above: plain lookups use +-- it directly, and OR conditions with the existing users_real_name_lower_idx +-- allow PostgreSQL to use a bitmap OR index scan instead of a seq scan. +-- UNIQUE also enforces case-insensitive username uniqueness at the DB level. + +CREATE UNIQUE INDEX IF NOT EXISTS idx_users_lower_username ON users (LOWER(username)); diff --git a/database/migrations/v1.11.0.16_shared_messages_composite_index.sql b/database/migrations/v1.11.0.16_shared_messages_composite_index.sql new file mode 100644 index 00000000..a0994ecf --- /dev/null +++ b/database/migrations/v1.11.0.16_shared_messages_composite_index.sql @@ -0,0 +1,19 @@ +-- Migration: v1.11.0.16 - Composite index on shared_messages for echomail listing joins +-- +-- The LEFT JOIN in every echomail list query filters on: +-- message_id = ? AND message_type = ? AND shared_by_user_id = ? AND is_active = TRUE +-- +-- The existing idx_shared_messages_message only covers (message_id, message_type), +-- leaving shared_by_user_id as a post-index filter and causing ~450k seq scans. +-- The new partial index covers all three equality conditions for active rows only, +-- which is the only subset that matters for share lookups. +-- +-- idx_shared_messages_active is also dropped — a standalone boolean partial index +-- with no other columns is not useful for any actual query pattern. + +DROP INDEX IF EXISTS idx_shared_messages_message; +DROP INDEX IF EXISTS idx_shared_messages_active; + +CREATE INDEX IF NOT EXISTS idx_shared_messages_lookup + ON shared_messages (message_id, message_type, shared_by_user_id) + WHERE is_active = TRUE; diff --git a/database/migrations/v1.11.0.17_saved_messages_message_id_first_index.sql b/database/migrations/v1.11.0.17_saved_messages_message_id_first_index.sql new file mode 100644 index 00000000..c737c82c --- /dev/null +++ b/database/migrations/v1.11.0.17_saved_messages_message_id_first_index.sql @@ -0,0 +1,17 @@ +-- Migration: v1.11.0.17 - Add (message_id, message_type, user_id) index on saved_messages +-- +-- Every echomail listing LEFT JOINs saved_messages from the echomail side: +-- ON (sav.message_id = em.id AND sav.message_type = 'echomail' AND sav.user_id = ?) +-- +-- The existing UNIQUE index is (user_id, message_id, message_type) — wrong column +-- order for a join driven from message_id. PostgreSQL cannot efficiently seek into +-- it by message_id alone. The new index puts message_id first so nested-loop joins +-- from echomail can probe it directly per row. +-- +-- The existing idx_saved_messages_message on (message_id, message_type) is +-- superseded by the new index (which adds user_id), so it is dropped. + +DROP INDEX IF EXISTS idx_saved_messages_message; + +CREATE INDEX IF NOT EXISTS idx_saved_messages_msg_user + ON saved_messages (message_id, message_type, user_id); diff --git a/public_html/js/chat-notify.js b/public_html/js/chat-notify.js index b408fe0b..70cb1d92 100644 --- a/public_html/js/chat-notify.js +++ b/public_html/js/chat-notify.js @@ -130,7 +130,7 @@ if (isPathMatch('/chat')) { chatUnread = false; updateChatIcons(); - await markSeen('chat', stats.total_chat); + await markSeen('chat', stats.chat_max_id ?? 0); } if (isPathMatch('/netmail')) { await markSeen('netmail', stats.total_netmail); diff --git a/public_html/sw.js b/public_html/sw.js index 974053df..7aa77d1c 100644 --- a/public_html/sw.js +++ b/public_html/sw.js @@ -1,4 +1,4 @@ -const CACHE_NAME = 'binkcache-v230'; +const CACHE_NAME = 'binkcache-v231'; // Static assets to precache const staticAssets = [ diff --git a/routes/api-routes.php b/routes/api-routes.php index 6455b62c..14b07c01 100644 --- a/routes/api-routes.php +++ b/routes/api-routes.php @@ -645,8 +645,12 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array $meta = new UserMeta(); $currentCount = (int)($input['current_count'] ?? 0); - // Store the current count - badge will only show if count increases - $meta->setValue((int)$userId, 'last_' . $target . '_count', (string)$currentCount); + // Chat uses max message ID for efficient incremental polling; others use counts + if ($target === 'chat') { + $meta->setValue((int)$userId, 'last_chat_max_id', (string)$currentCount); + } else { + $meta->setValue((int)$userId, 'last_' . $target . '_count', (string)$currentCount); + } echo json_encode(['success' => true, 'target' => $target, 'count' => $currentCount]); }); @@ -664,7 +668,7 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array // Get last seen counts (not timestamps - we compare counts, not dates) $lastNetmailCount = (int)($meta->getValue((int)$userId, 'last_netmail_count') ?? 0); $lastEchomailCount = (int)($meta->getValue((int)$userId, 'last_echomail_count') ?? 0); - $lastChatCount = (int)($meta->getValue((int)$userId, 'last_chat_count') ?? 0); + $lastChatMaxId = $meta->getValue((int)$userId, 'last_chat_max_id'); // Get address list for netmail queries try { @@ -715,22 +719,35 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array $unreadEchomailStmt->execute([$userId, $userId]); $unreadEchomail = $unreadEchomailStmt->fetch()['count'] ?? 0; - // Total chat count - $chatTotalStmt = $db->prepare(" - SELECT COUNT(*) as count - FROM chat_messages m - LEFT JOIN chat_rooms r ON m.room_id = r.id - WHERE (m.room_id IS NOT NULL AND r.is_active = TRUE) - OR m.to_user_id = ? - OR m.from_user_id = ? - "); - $chatTotalStmt->execute([$userId, $userId]); - $chatTotal = $chatTotalStmt->fetch()['count'] ?? 0; + // New chat messages since last seen max ID (avoids full table scan) + if ($lastChatMaxId === null) { + // Not yet initialized — baseline to current max so no false badge on first load + $maxStmt = $db->query("SELECT COALESCE(MAX(id), 0) as max_id FROM chat_messages"); + $chatMaxId = (int)($maxStmt->fetch()['max_id'] ?? 0); + $meta->setValue((int)$userId, 'last_chat_max_id', (string)$chatMaxId); + $chatBadge = 0; + } else { + $lastChatMaxId = (int)$lastChatMaxId; + $chatStmt = $db->prepare(" + SELECT COUNT(*) as new_count, COALESCE(MAX(m.id), ?) as max_id + FROM chat_messages m + LEFT JOIN chat_rooms r ON m.room_id = r.id + WHERE m.id > ? + AND ( + (m.room_id IS NOT NULL AND r.is_active = TRUE) + OR m.to_user_id = ? + OR m.from_user_id = ? + ) + "); + $chatStmt->execute([$lastChatMaxId, $lastChatMaxId, $userId, $userId]); + $chatRow = $chatStmt->fetch(); + $chatBadge = (int)$chatRow['new_count']; + $chatMaxId = (int)$chatRow['max_id']; + } // Notification badge shows ONLY if count increased $netmailBadge = $unreadNetmail > $lastNetmailCount ? $unreadNetmail : 0; $echomailBadge = $unreadEchomail > $lastEchomailCount ? $unreadEchomail : 0; - $chatBadge = $chatTotal > $lastChatCount ? $chatTotal : 0; // Get user's credit balance $creditBalance = 0; @@ -745,10 +762,10 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array echo json_encode([ 'unread_netmail' => $netmailBadge, 'new_echomail' => $echomailBadge, - 'chat_total' => (int)$chatBadge, + 'chat_total' => $chatBadge, 'total_netmail' => $unreadNetmail, 'total_echomail' => $unreadEchomail, - 'total_chat' => $chatTotal, + 'chat_max_id' => $chatMaxId, 'credit_balance' => $creditBalance ]); }); From 48d4beb182a45da66e85788ebc04270bb78208d0 Mon Sep 17 00:00:00 2001 From: awehttam Date: Sat, 14 Mar 2026 13:38:35 -0700 Subject: [PATCH 020/246] Update UPGRADING_1.8.7 with database performance improvements section Co-Authored-By: Claude Sonnet 4.6 --- docs/UPGRADING_1.8.7.md | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/docs/UPGRADING_1.8.7.md b/docs/UPGRADING_1.8.7.md index 82afa471..cf37c7f4 100644 --- a/docs/UPGRADING_1.8.7.md +++ b/docs/UPGRADING_1.8.7.md @@ -14,6 +14,7 @@ - [Notes](#notes) - [Database Statistics Page](#database-statistics-page) - [Credits System Updates](#credits-system-updates) +- [Database Performance Improvements](#database-performance-improvements) - [Upgrade Instructions](#upgrade-instructions) - [From Git](#from-git) - [Using the Installer](#using-the-installer) @@ -35,6 +36,10 @@ health, and index health. - Added configurable file upload and file download credit costs/rewards in the **Credits System Configuration** page. +- Database performance improvements: new indexes on `mrc_outbound`, `users`, + `shared_messages`, and `saved_messages` eliminate millions of unnecessary + sequential scans. Chat notification polling rewritten to use primary key + index instead of full table count. ## Enhanced Message Search @@ -216,6 +221,37 @@ section: "file_download_reward": 0 ``` +## Database Performance Improvements + +Several tables that were generating excessive sequential scans have been +addressed with new indexes and one query change. These are applied automatically +by `setup.php` via five new migrations (v1.11.0.13 – v1.11.0.17). + +**Index changes:** + +- `mrc_outbound` — replaced `(sent_at, priority)` with a partial index + `(priority DESC, created_at ASC) WHERE sent_at IS NULL`. The MRC daemon polls + this table every 100 ms; the old index did not match the query's `ORDER BY` + so the planner seq-scanned a near-empty table millions of times. +- `users` — added `UNIQUE INDEX ON users(LOWER(username))`. Login queries and + name-matching in mail delivery used `LOWER(username)` comparisons with no + supporting index, causing a seq scan on every authentication request. +- `shared_messages` — replaced `(message_id, message_type)` with a partial + composite index `(message_id, message_type, shared_by_user_id) WHERE is_active = TRUE`, + matching the LEFT JOIN condition used in every echomail listing page load. +- `saved_messages` — replaced `(message_id, message_type)` with + `(message_id, message_type, user_id)`. The previous index had the wrong column + order for joins driven from the echomail side. + +**Query change — chat notification polling:** + +The `/api/dashboard/stats` endpoint previously counted all chat messages on +every 30-second poll using a query with an un-indexable OR condition across +three columns. It now queries only messages newer than the last seen message ID +(`WHERE m.id > ?`), using the primary key index. The last seen position is +stored as `last_chat_max_id` in user meta. Existing users will have this +initialized silently on first poll with no false notification badge. + ## Upgrade Instructions ### From Git From 883124a510adee9698cb99c40eb6bdefcdd24d63 Mon Sep 17 00:00:00 2001 From: awehttam Date: Sat, 14 Mar 2026 14:06:37 -0700 Subject: [PATCH 021/246] Add nodelist map with grouped markers, zone colour coding, and geocoder script Map features: - Nodes grouped by system_name into a single marker per BBS; popup lists all network addresses the system appears in across different nodelists - Colour-coded markers by zone (blue=Z1, green=Z2, amber=Z3, red=Z4, purple=Z5, teal=Z6, gold=multi-zone, grey=unknown) - Map legend in bottom-right corner - Lazy-loads via /api/nodelist/map-data on first tab click - Leaflet MarkerCluster for dense areas Geocoder: - scripts/geocode_nodelist.php: geocode nodelist location strings using the shared bbs_directory_geocode_cache; supports --limit, --force, --dry-run - Migration v1.11.0.18: latitude/longitude columns on nodelist table - BbsDirectoryGeocoder: removed 32-day TTL; cache is now permanent To populate coordinates after upgrading: php scripts/setup.php php scripts/geocode_nodelist.php Co-Authored-By: Claude Sonnet 4.6 --- config/i18n/en/common.php | 6 + config/i18n/es/common.php | 6 + .../v1.11.0.18_nodelist_coordinates.sql | 9 + routes/nodelist-routes.php | 5 + scripts/geocode_nodelist.php | 159 ++++++++ src/BbsDirectoryGeocoder.php | 9 +- src/Web/NodelistController.php | 85 +++- templates/nodelist/index.twig | 385 +++++++++++++++--- 8 files changed, 593 insertions(+), 71 deletions(-) create mode 100644 database/migrations/v1.11.0.18_nodelist_coordinates.sql create mode 100755 scripts/geocode_nodelist.php diff --git a/config/i18n/en/common.php b/config/i18n/en/common.php index f9d04e29..f85959d3 100644 --- a/config/i18n/en/common.php +++ b/config/i18n/en/common.php @@ -2256,6 +2256,12 @@ 'ui.nodelist.import.guideline_note' => 'For ARC, ARJ, LZH, RAR files, use the command-line import script', 'ui.nodelist.import.importing' => 'Importing...', 'ui.nodelist.import.success' => 'Successfully imported {count} nodes from {filename} (Day {day}) for domain @{domain}', + 'ui.nodelist.tab_list' => 'List', + 'ui.nodelist.tab_map' => 'Map', + 'ui.nodelist.map_loading' => 'Loading map data…', + 'ui.nodelist.map_no_coordinates' => 'No geocoded nodes available. Run the geocode_nodelist script to populate coordinates.', + 'ui.nodelist.map_node_count' => '{count} geocoded nodes', + 'ui.nodelist.map_send_netmail' => 'Send Netmail', 'ui.dosdoor_player.page_title' => 'DOS Door Player', 'ui.dosdoor_player.document_title_suffix' => 'DOS Door', 'ui.dosdoor_player.status_prefix' => 'Status:', diff --git a/config/i18n/es/common.php b/config/i18n/es/common.php index 13e07d00..21655e91 100644 --- a/config/i18n/es/common.php +++ b/config/i18n/es/common.php @@ -2256,6 +2256,12 @@ 'ui.nodelist.import.guideline_note' => 'Para archivos ARC, ARJ, LZH, RAR, use el script de importacion por linea de comandos', 'ui.nodelist.import.importing' => 'Importando...', 'ui.nodelist.import.success' => 'Se importaron correctamente {count} nodos desde {filename} (Dia {day}) para el dominio @{domain}', + 'ui.nodelist.tab_list' => 'Lista', + 'ui.nodelist.tab_map' => 'Mapa', + 'ui.nodelist.map_loading' => 'Cargando datos del mapa…', + 'ui.nodelist.map_no_coordinates' => 'No hay nodos geocodificados disponibles. Ejecuta el script geocode_nodelist para poblar las coordenadas.', + 'ui.nodelist.map_node_count' => '{count} nodos geocodificados', + 'ui.nodelist.map_send_netmail' => 'Enviar Netmail', 'ui.dosdoor_player.page_title' => 'Reproductor de puerta DOS', 'ui.dosdoor_player.document_title_suffix' => 'Puerta DOS', 'ui.dosdoor_player.status_prefix' => 'Estado:', diff --git a/database/migrations/v1.11.0.18_nodelist_coordinates.sql b/database/migrations/v1.11.0.18_nodelist_coordinates.sql new file mode 100644 index 00000000..bb7552cf --- /dev/null +++ b/database/migrations/v1.11.0.18_nodelist_coordinates.sql @@ -0,0 +1,9 @@ +-- Migration: v1.11.0.18 - Add geocoding coordinates to nodelist table + +ALTER TABLE nodelist + ADD COLUMN IF NOT EXISTS latitude DECIMAL(10,6) NULL, + ADD COLUMN IF NOT EXISTS longitude DECIMAL(10,6) NULL; + +CREATE INDEX IF NOT EXISTS idx_nodelist_coordinates + ON nodelist (latitude, longitude) + WHERE latitude IS NOT NULL AND longitude IS NOT NULL; diff --git a/routes/nodelist-routes.php b/routes/nodelist-routes.php index 83f179d9..491b729b 100644 --- a/routes/nodelist-routes.php +++ b/routes/nodelist-routes.php @@ -64,4 +64,9 @@ $controller = new BinktermPHP\Web\NodelistController(); $controller->api('stats'); }); + + SimpleRouter::get('/map-data', function() { + $controller = new BinktermPHP\Web\NodelistController(); + $controller->api('map-data'); + }); }); diff --git a/scripts/geocode_nodelist.php b/scripts/geocode_nodelist.php new file mode 100755 index 00000000..46c6955f --- /dev/null +++ b/scripts/geocode_nodelist.php @@ -0,0 +1,159 @@ +#!/usr/bin/env php +getPdo(); + $geocoder = new BbsDirectoryGeocoder(); + + if (!$geocoder->isEnabled()) { + fwrite(STDERR, "Geocoding is disabled (BBS_DIRECTORY_GEOCODING_ENABLED=false).\n"); + exit(1); + } + + // Fetch nodes with a location that need geocoding + $whereClause = $force + ? "WHERE location IS NOT NULL AND location != '' AND location != '-Unpublished-'" + : "WHERE location IS NOT NULL AND location != '' AND location != '-Unpublished-' + AND (latitude IS NULL OR longitude IS NULL)"; + + $limitClause = $limit !== null ? "LIMIT $limit" : ''; + + $stmt = $db->query(" + SELECT id, zone, net, node, point, system_name, location, latitude, longitude + FROM nodelist + $whereClause + ORDER BY id ASC + $limitClause + "); + $nodes = $stmt->fetchAll(PDO::FETCH_ASSOC); + + $total = count($nodes); + $geocoded = 0; + $cached = 0; + $skipped = 0; + $failed = 0; + + echo "Nodes to process: $total\n\n"; + + if ($total === 0) { + echo "Nothing to do.\n"; + exit(0); + } + + $updateStmt = $dryRun ? null : $db->prepare(" + UPDATE nodelist SET latitude = ?, longitude = ? WHERE id = ? + "); + + foreach ($nodes as $row) { + $address = "{$row['zone']}:{$row['net']}/{$row['node']}.{$row['point']}"; + $location = trim((string)$row['location']); + + $coords = $geocoder->geocodeLocation($location); + + if ($coords === null) { + $failed++; + printf("[FAIL] %s | %s -> no result\n", $address, $location); + continue; + } + + if ($coords['latitude'] === null || $coords['longitude'] === null) { + $skipped++; + printf("[SKIP] %s | %s -> not geocodable\n", $address, $location); + continue; + } + + $lat = $coords['latitude']; + $lon = $coords['longitude']; + + // Detect whether this came from cache (geocoder handles it internally; + // we just note it was fast if the existing DB value already matches) + $fromCache = ($row['latitude'] !== null && + abs((float)$row['latitude'] - $lat) < 0.000001 && + abs((float)$row['longitude'] - $lon) < 0.000001); + + if ($fromCache) { + $cached++; + } else { + $geocoded++; + } + + printf("[%s] %s | %s -> %.6f, %.6f\n", + $fromCache ? 'CACHE' : 'OK ', + $address, + $location, + $lat, + $lon + ); + + if (!$dryRun && $updateStmt) { + $updateStmt->execute([$lat, $lon, (int)$row['id']]); + } + } + + echo "\n"; + echo "Total processed: $total\n"; + echo "Geocoded (API): $geocoded\n"; + echo "Resolved (cache): $cached\n"; + echo "Skipped (no coords): $skipped\n"; + echo "Failed: $failed\n"; + + if ($dryRun) { + echo "\nNo database changes were made (dry run).\n"; + } + + exit(0); + +} catch (\Throwable $e) { + fwrite(STDERR, "ERROR: " . $e->getMessage() . "\n"); + exit(1); +} diff --git a/src/BbsDirectoryGeocoder.php b/src/BbsDirectoryGeocoder.php index 2483dca2..1c3bc662 100644 --- a/src/BbsDirectoryGeocoder.php +++ b/src/BbsDirectoryGeocoder.php @@ -7,8 +7,6 @@ class BbsDirectoryGeocoder private const DEFAULT_ENDPOINT = 'https://nominatim.openstreetmap.org/search'; private const REQUEST_INTERVAL_US = 1000000; private const TIMEOUT_SECONDS = 10; - private const CACHE_TTL_SECONDS = 2764800; // 32 days - private static float $lastRequestAt = 0.0; public function isEnabled(): bool @@ -69,7 +67,7 @@ private function getCachedResult(string $cacheKey): ?array try { $db = Database::getInstance()->getPdo(); $stmt = $db->prepare(" - SELECT latitude, longitude, cached_at + SELECT latitude, longitude FROM bbs_directory_geocode_cache WHERE location_key = ? LIMIT 1 @@ -80,11 +78,6 @@ private function getCachedResult(string $cacheKey): ?array return null; } - $cachedAt = strtotime((string)($row['cached_at'] ?? '')); - if ($cachedAt === false || (time() - $cachedAt) > self::CACHE_TTL_SECONDS) { - return null; - } - if ($row['latitude'] === null || $row['longitude'] === null) { return ['latitude' => null, 'longitude' => null]; } diff --git a/src/Web/NodelistController.php b/src/Web/NodelistController.php index 9250a699..680247d1 100644 --- a/src/Web/NodelistController.php +++ b/src/Web/NodelistController.php @@ -230,6 +230,8 @@ public function api($action = '') return $this->apiNets(); case 'stats': return $this->apiStats(); + case 'map-data': + return $this->apiMapData(); default: $this->respondApiError('errors.nodelist.api.endpoint_not_found', 'API endpoint not found', 404); } @@ -331,12 +333,93 @@ private function apiStats() { $stats = $this->nodelistManager->getNodelistStats(); $activeNodelist = $this->nodelistManager->getActiveNodelist(); - + echo json_encode([ 'stats' => $stats, 'active_nodelist' => $activeNodelist ]); } + + /** + * Return all geocoded nodelist entries for the map view. + * Only nodes with coordinates are included. + */ + private function apiMapData() + { + $filterZone = $_GET['zone'] ?? ''; + + $params = []; + $where = ['n.latitude IS NOT NULL', 'n.longitude IS NOT NULL']; + + if ($filterZone !== '') { + $where[] = 'n.zone = ?'; + $params[] = (int)$filterZone; + } + + $whereClause = 'WHERE ' . implode(' AND ', $where); + + $stmt = $this->db->prepare(" + SELECT n.zone, n.net, n.node, n.point, n.keyword_type, + n.system_name, n.sysop_name, n.location, n.phone, n.flags, + n.latitude, n.longitude + FROM nodelist n + $whereClause + ORDER BY n.system_name, n.zone, n.net, n.node + "); + $stmt->execute($params); + $rows = $stmt->fetchAll(\PDO::FETCH_ASSOC); + + // Group by system_name (case-insensitive). Each group becomes one map marker. + // The first row in a group provides coordinates and primary sysop/location. + $groups = []; + foreach ($rows as $row) { + $flags = []; + if (!empty($row['flags'])) { + $decoded = json_decode($row['flags'], true); + if (is_array($decoded)) { + $flags = $decoded; + } + } + + $address = "{$row['zone']}:{$row['net']}/{$row['node']}"; + if ((int)$row['point'] > 0) { + $address .= ".{$row['point']}"; + } + + $inetHost = $flags['INA'] ?? ($flags['IBN'] ?? null); + + $groupKey = mb_strtolower(trim((string)$row['system_name'])); + if ($groupKey === '') { + $groupKey = $address; // fallback: unnamed nodes each get their own pin + } + + if (!isset($groups[$groupKey])) { + $groups[$groupKey] = [ + 'system_name' => $row['system_name'], + 'sysop_name' => $row['sysop_name'], + 'location' => $row['location'], + 'latitude' => (float)$row['latitude'], + 'longitude' => (float)$row['longitude'], + 'networks' => [], + 'zones' => [], + ]; + } + + $groups[$groupKey]['networks'][] = [ + 'address' => $address, + 'zone' => (int)$row['zone'], + 'keyword_type' => $row['keyword_type'], + 'inet_host' => $inetHost, + ]; + + if (!in_array((int)$row['zone'], $groups[$groupKey]['zones'], true)) { + $groups[$groupKey]['zones'][] = (int)$row['zone']; + } + } + + $nodes = array_values($groups); + echo json_encode(['nodes' => $nodes, 'total' => count($nodes)]); + } private function validateNodelistFile($filepath) { diff --git a/templates/nodelist/index.twig b/templates/nodelist/index.twig index b23f8c58..f5d4de80 100644 --- a/templates/nodelist/index.twig +++ b/templates/nodelist/index.twig @@ -2,6 +2,48 @@ {% block title %}{{ t('ui.nodelist.index.heading', {}, locale, ['common']) }} - {{ system_name }}{% endblock %} +{% block head %} + + + + +{% endblock %} + {% block content %}
@@ -41,6 +83,25 @@
{% endif %} + + + +
+
+
@@ -163,47 +224,25 @@ {% endif %}
{% endif %} + +
{# end list pane #} + + +
+
+
+
+
+
+
+
+
+ +
{# end tab-content #}
- - +{% endblock %} - + function makeIcon(colour) { + const svg = '' + + '' + + ''; + return L.divIcon({ + className: '', + html: svg, + iconSize: [14, 14], + iconAnchor: [7, 7], + popupAnchor: [0, -9] + }); + } + function escapeHtml(v) { + return String(v || '').replace(/[&<>"']/g, function(ch) { + return ({ '&': '&', '<': '<', '>': '>', '"': '"', "'": ''' })[ch]; + }); + } + + function addFullscreenControl() { + const FS = L.Control.extend({ + options: { position: 'topleft' }, + onAdd: function() { + const c = L.DomUtil.create('div', 'leaflet-bar'); + const a = L.DomUtil.create('a', '', c); + a.href = '#'; a.title = 'Toggle fullscreen'; + a.innerHTML = ''; + L.DomEvent.disableClickPropagation(c); + L.DomEvent.on(a, 'click', function(e) { + L.DomEvent.stop(e); + if (!document.fullscreenElement) { + mapShell && mapShell.requestFullscreen && mapShell.requestFullscreen(); + } else { + document.exitFullscreen && document.exitFullscreen(); + } + }); + return c; + } + }); + nodelistMap.addControl(new FS()); + } + + function addLegend() { + const Legend = L.Control.extend({ + options: { position: 'bottomright' }, + onAdd: function() { + const div = L.DomUtil.create('div'); + div.style.cssText = 'background:var(--bs-body-bg,#fff);padding:6px 9px;border-radius:4px;' + + 'border:1px solid var(--bs-border-color,#ccc);font-size:12px;line-height:1.7;' + + 'color:var(--bs-body-color,#212529)'; + const entries = [ + [ZONE_COLOURS[1], 'Zone 1 — North America'], + [ZONE_COLOURS[2], 'Zone 2 — Europe'], + [ZONE_COLOURS[3], 'Zone 3 — Australasia'], + [ZONE_COLOURS[4], 'Zone 4 — Latin America'], + [ZONE_COLOURS[5], 'Zone 5 — Africa'], + [ZONE_COLOURS[6], 'Zone 6 — Asia/Pacific'], + [COLOUR_MULTI, 'Multiple networks'], + [COLOUR_UNKNOWN, 'Unknown zone'], + ]; + div.innerHTML = entries.map(function(e) { + return '' + + escapeHtml(e[1]); + }).join('
'); + return div; + } + }); + nodelistMap.addControl(new Legend()); + } + + function initMap(nodes) { + if (nodelistMap) { + nodelistMap.invalidateSize(); + return; + } + + if (nodes.length === 0) { + mapNotice.textContent = {{ t('ui.nodelist.map_no_coordinates', {}, locale, ['common'])|json_encode|raw }}; + mapNotice.classList.remove('d-none'); + document.getElementById('nodelistMap').style.display = 'none'; + return; + } + + nodelistMap = L.map('nodelistMap', { scrollWheelZoom: true }); + addFullscreenControl(); + addLegend(); + + L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { + maxZoom: 19, + attribution: '© OpenStreetMap contributors' + }).addTo(nodelistMap); + + const cluster = L.markerClusterGroup({ + showCoverageOnHover: false, + spiderfyOnMaxZoom: true, + maxClusterRadius: 40 + }); + + const bounds = []; + const sendNetmailLabel = {{ t('ui.nodelist.map_send_netmail', {}, locale, ['common'])|json_encode|raw }}; + const userLoggedIn = {{ user ? 'true' : 'false' }}; + + nodes.forEach(function(node) { + const lat = Number(node.latitude); + const lon = Number(node.longitude); + if (!isFinite(lat) || !isFinite(lon)) return; + + const colour = zoneColour(node.zones); + const parts = ['
']; + + parts.push('' + escapeHtml(node.system_name || '(unnamed)') + ''); + if (node.sysop_name) parts.push('
' + escapeHtml(node.sysop_name) + '
'); + if (node.location) parts.push('
' + escapeHtml(node.location) + '
'); + + // One row per network entry + parts.push('
'); + (node.networks || []).forEach(function(net) { + const dot = ''; + let row = dot + '' + escapeHtml(net.address) + ''; + if (net.inet_host) { + row += ' ' + + escapeHtml(net.inet_host) + ''; + } + if (userLoggedIn) { + row += ' ✉'; + } + parts.push('
' + row + '
'); + }); + + parts.push('
'); + + cluster.addLayer( + L.marker([lat, lon], { icon: makeIcon(colour) }).bindPopup(parts.join('')) + ); + bounds.push([lat, lon]); + }); + + nodelistMap.addLayer(cluster); + + if (bounds.length === 1) { + nodelistMap.setView(bounds[0], 6); + } else if (bounds.length > 1) { + nodelistMap.fitBounds(bounds, { padding: [30, 30] }); + } + + const countTpl = {{ t('ui.nodelist.map_node_count', {}, locale, ['common'])|json_encode|raw }}; + if (mapStatus) { + mapStatus.textContent = countTpl.replace('{count}', nodes.length); + } + } + + function loadMapData() { + if (mapLoaded) { + nodelistMap && nodelistMap.invalidateSize(); + return; + } + mapLoaded = true; + + if (mapNotice) { + mapNotice.textContent = {{ t('ui.nodelist.map_loading', {}, locale, ['common'])|json_encode|raw }}; + mapNotice.classList.remove('d-none'); + } + + fetch('/api/nodelist/map-data') + .then(function(r) { return r.json(); }) + .then(function(data) { + if (mapNotice) mapNotice.classList.add('d-none'); + initMap(data.nodes || []); + }) + .catch(function() { + if (mapNotice) { + mapNotice.textContent = 'Failed to load map data.'; + mapNotice.classList.remove('d-none'); + } + }); + } + + if (mapTab) { + mapTab.addEventListener('shown.bs.tab', function() { + loadMapData(); + }); + } +})(); + + +{% endblock %} diff --git a/templates/fileareas.twig b/templates/fileareas.twig index 2270ab33..e2cf88b0 100644 --- a/templates/fileareas.twig +++ b/templates/fileareas.twig @@ -172,6 +172,19 @@
{{ t('ui.fileareas.gemini_public_help', {}, 'List and serve files in this area via the Gemini capsule server') }}
+
+ + +
{{ t('ui.fileareas.freq_enabled_help', {}, 'Allow any FidoNet node to request files from this area via FREQ') }}
+
+ +
+ +
{{ t('ui.files.freq_accessible_help', {}, 'Also allow this file to be requested via FidoNet FREQ') }}
+
-
+
-
+
+
+ + +
@@ -222,7 +248,7 @@ {% else %}
- {% if search or selectedZone or selectedNet %} + {% if search or selectedZone or selectedNet or selectedFlags|length > 0 %} {{ t('ui.nodelist.index.no_nodes_found_search', {}, locale, ['common']) }} {% else %} {{ t('ui.nodelist.index.use_search_form', {}, locale, ['common']) }} @@ -504,6 +530,18 @@ function uiT(key, fallback, params = {}) { return fallback; } document.addEventListener('DOMContentLoaded', function() { + const flagAnyLabel = {{ t('ui.nodelist.index.flag_filter_any', {}, locale, ['common'])|json_encode|raw }}; + const flagLabel = document.getElementById('flagPickerLabel'); + + function updateFlagLabel() { + const checked = Array.from(document.querySelectorAll('.flag-cb:checked')).map(cb => cb.value); + flagLabel.textContent = checked.length > 0 ? checked.join(', ') : flagAnyLabel; + } + + document.querySelectorAll('.flag-cb').forEach(function(cb) { + cb.addEventListener('change', updateFlagLabel); + }); + const zoneSelect = document.getElementById('zone'); const netSelect = document.getElementById('net'); if (zoneSelect) { diff --git a/templates/nodelist/view.twig b/templates/nodelist/view.twig index c0c214cd..994a0e65 100644 --- a/templates/nodelist/view.twig +++ b/templates/nodelist/view.twig @@ -128,10 +128,10 @@ {{ t('ui.nodelist.login_to_send_netmail') }} {% endif %} - {% if node.flags and node.flags['FREQ'] is defined %} - + {% if user %} + {% endif %}
@@ -198,6 +198,38 @@
+ + + {% endif %} +
+ + + +
@@ -311,13 +323,29 @@ document.addEventListener('DOMContentLoaded', function() { // ALLFILES FREQ functions window.showAllfilesModal = function() { + document.getElementById('allfilesToName').value = 'FileFix'; + document.getElementById('allfilesToNameOther').value = ''; + document.getElementById('allfilesToNameOther').classList.add('d-none'); document.getElementById('allfilesPassword').value = ''; document.getElementById('allfilesError').classList.add('d-none'); document.getElementById('allfilesSendBtn').disabled = false; new bootstrap.Modal(document.getElementById('allfilesModal')).show(); }; + window.toggleAllfilesToNameOther = function() { + const sel = document.getElementById('allfilesToName'); + const other = document.getElementById('allfilesToNameOther'); + if (sel.value === '') { + other.classList.remove('d-none'); + other.focus(); + } else { + other.classList.add('d-none'); + } + }; + window.sendAllfilesFreq = function() { + const sel = document.getElementById('allfilesToName'); + const toName = (sel.value === '' ? document.getElementById('allfilesToNameOther').value.trim() : sel.value) || 'FileFix'; const password = document.getElementById('allfilesPassword').value.trim(); const btn = document.getElementById('allfilesSendBtn'); const errorBox = document.getElementById('allfilesError'); @@ -333,7 +361,7 @@ document.addEventListener('DOMContentLoaded', function() { body: JSON.stringify({ type: 'netmail', to_address: '{{ node.full_address|e('js') }}', - to_name: 'FileFix', + to_name: toName, subject: subject, message_text: '', is_freq: true From c068869400f53e1f5c7efd259810d7bae5e4b6c8 Mon Sep 17 00:00:00 2001 From: awehttam Date: Sat, 14 Mar 2026 23:39:55 -0700 Subject: [PATCH 045/246] Add filename picker to FREQ modal with common names and free-text option Dropdown offers ALLFILES, FILES, FILELIST, NODELIST, NODEDIFF, and an Other option that reveals a text input for arbitrary filenames. The subject line is built from the chosen filename (+ password if set), so the modal can now send any FREQ request, not just ALLFILES. Co-Authored-By: Claude Sonnet 4.6 --- config/i18n/en/common.php | 2 ++ config/i18n/es/common.php | 2 ++ public_html/sw.js | 2 +- templates/nodelist/view.twig | 34 +++++++++++++++++++++++++++++++--- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/config/i18n/en/common.php b/config/i18n/en/common.php index 99283621..b33685bd 100644 --- a/config/i18n/en/common.php +++ b/config/i18n/en/common.php @@ -2281,6 +2281,8 @@ 'ui.nodelist.freq_not_advertised' => 'This node does not advertise the FREQ flag. A request will still be sent, but the node may not support file requests.', 'ui.nodelist.request_allfiles_title' => 'Request File List from {node}', 'ui.nodelist.request_allfiles_body' => 'Sends an ALLFILES FREQ to this node. They will include their file listing on the next binkp session with you.', + 'ui.nodelist.request_allfiles_filename' => 'File to request', + 'ui.nodelist.request_allfiles_filename_placeholder' => 'e.g. README.TXT', 'ui.nodelist.request_allfiles_to' => 'Send to', 'ui.nodelist.request_allfiles_to_other' => 'Other...', 'ui.nodelist.request_allfiles_to_other_placeholder' => 'Enter service name', diff --git a/config/i18n/es/common.php b/config/i18n/es/common.php index 213f3942..f68323e3 100644 --- a/config/i18n/es/common.php +++ b/config/i18n/es/common.php @@ -2281,6 +2281,8 @@ 'ui.nodelist.freq_not_advertised' => 'Este nodo no anuncia el indicador FREQ. Se enviará la solicitud igualmente, pero es posible que el nodo no admita solicitudes de archivos.', 'ui.nodelist.request_allfiles_title' => 'Solicitar lista de archivos de {node}', 'ui.nodelist.request_allfiles_body' => 'Envía un FREQ ALLFILES a este nodo. Incluirán su listado de archivos en la próxima sesión binkp contigo.', + 'ui.nodelist.request_allfiles_filename' => 'Archivo a solicitar', + 'ui.nodelist.request_allfiles_filename_placeholder' => 'p.ej. README.TXT', 'ui.nodelist.request_allfiles_to' => 'Enviar a', 'ui.nodelist.request_allfiles_to_other' => 'Otro...', 'ui.nodelist.request_allfiles_to_other_placeholder' => 'Ingrese nombre del servicio', diff --git a/public_html/sw.js b/public_html/sw.js index 0a800ff6..f9ced3bd 100644 --- a/public_html/sw.js +++ b/public_html/sw.js @@ -1,4 +1,4 @@ -const CACHE_NAME = 'binkcache-v239'; +const CACHE_NAME = 'binkcache-v240'; // Static assets to precache const staticAssets = [ diff --git a/templates/nodelist/view.twig b/templates/nodelist/view.twig index dd6cc1bf..8401ea54 100644 --- a/templates/nodelist/view.twig +++ b/templates/nodelist/view.twig @@ -213,6 +213,18 @@ {{ t('ui.nodelist.freq_not_advertised') }}
{% endif %} +
+ + + +
+ {% endif %}
diff --git a/templates/nodelist/view.twig b/templates/nodelist/view.twig index 8d345d2e..8ff410e9 100644 --- a/templates/nodelist/view.twig +++ b/templates/nodelist/view.twig @@ -159,11 +159,11 @@ {{ t('ui.nodelist.login_to_send_netmail') }} {% endif %} - {# {% if user and user.is_admin %} + {% if freq_experimental_enabled and user and user.is_admin %} - {% endif %} #} + {% endif %}
@@ -277,6 +277,7 @@ {% endif %} +{% if freq_experimental_enabled and user and user.is_admin %} +{% endif %} +
+
+ + +
+
{{ t('ui.nodelist.request_allfiles_crashmail_help') }}
+
@@ -423,6 +432,7 @@ document.addEventListener('DOMContentLoaded', function() { document.getElementById('allfilesToNameOther').value = ''; document.getElementById('allfilesToNameOther').classList.add('d-none'); document.getElementById('allfilesPassword').value = ''; + document.getElementById('allfilesCrashmail').checked = true; document.getElementById('allfilesError').classList.add('d-none'); document.getElementById('allfilesSendBtn').disabled = false; new bootstrap.Modal(document.getElementById('allfilesModal')).show(); @@ -456,6 +466,7 @@ document.addEventListener('DOMContentLoaded', function() { const toNameSel = document.getElementById('allfilesToName'); const toName = (toNameSel.value === '' ? document.getElementById('allfilesToNameOther').value.trim() : toNameSel.value) || 'FileFix'; const password = document.getElementById('allfilesPassword').value.trim(); + const crashmail = document.getElementById('allfilesCrashmail').checked; const btn = document.getElementById('allfilesSendBtn'); const errorBox = document.getElementById('allfilesError'); @@ -473,7 +484,8 @@ document.addEventListener('DOMContentLoaded', function() { to_name: toName, subject: subject, message_text: '', - is_freq: true + is_freq: true, + crashmail: crashmail }) }) .then(r => r.json()) From e43f49e88a463d86cb6a2e7d8b63fa5dfe418e90 Mon Sep 17 00:00:00 2001 From: awehttam Date: Sun, 15 Mar 2026 12:12:07 -0700 Subject: [PATCH 061/246] Add tooltip descriptions to nodelist flags on node view page Hovering a flag badge now shows a human-readable description (e.g. IBN, INA, CM, FREQ, HOLD, DOWN, modem flags). Uses Bootstrap tooltips initialised on DOMContentLoaded. Co-Authored-By: Claude Sonnet 4.6 --- templates/nodelist/view.twig | 65 +++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/templates/nodelist/view.twig b/templates/nodelist/view.twig index 3e7e8fda..a4127621 100644 --- a/templates/nodelist/view.twig +++ b/templates/nodelist/view.twig @@ -127,10 +127,68 @@ {% if node.flags and node.flags|length > 0 %}
{{ t('ui.nodelist.capabilities_flags') }}
+ {% set flagDescriptions = { + 'IBN': 'Internet BinkP Node — accepts binkp connections', + 'INA': 'Internet Address — hostname or IP for internet connections', + 'ITN': 'Internet Telnet Node — accepts telnet connections', + 'IFC': 'Internet File/Conference — internet file sharing', + 'IFT': 'Internet FTP — accepts FTP connections', + 'IVM': 'Internet VoIP/Messaging', + 'IMI': 'Internet MIME email', + 'ISE': 'Internet SMTP/Email', + 'IEM': 'Internet Email', + 'IP': 'Internet IP address (legacy)', + 'BINKP': 'BinkP capable', + 'CM': 'Continuous Mail — accepts mail 24 hours a day', + 'MO': 'Mail Only — does not accept human callers', + 'LO': 'Listed Only — only accepts calls from listed nodes', + 'MN': 'Mail and News', + 'FREQ': 'File Request — will serve files on request', + 'PING': 'Responds to ping requests', + 'HOLD': 'Mail on hold — not currently accepting connections', + 'DOWN': 'System down — temporarily unavailable', + 'PVT': 'Private node — address not published', + 'HUB': 'Hub node', + 'HOST': 'Net host node', + 'REGION': 'Regional coordinator', + 'ZONE': 'Zone coordinator', + 'NEC': 'No EchoMail', + 'V21': 'V.21 modem (300 baud)', + 'V22': 'V.22 modem (1200 baud)', + 'V29': 'V.29 modem (9600 baud)', + 'V32': 'V.32 modem (9600 baud)', + 'V32B': 'V.32bis modem (14400 baud)', + 'V34': 'V.34 modem (28800 baud)', + 'V42': 'V.42 error correction', + 'V42B': 'V.42bis compression', + 'V90C': 'V.90 modem — client mode (56k download)', + 'V90S': 'V.90 modem — server mode (56k upload)', + 'H96': 'HST 9600', + 'H14': 'HST 14400', + 'H16': 'HST 16800', + 'MAX': 'MaxLink protocol', + 'PEP': 'PEP high-speed protocol', + 'ZYX': 'ZyXEL proprietary protocol', + 'XA': 'Xmodem/ASCII transfer', + 'XB': 'Xmodem/CRC transfer', + 'XC': 'Xmodem/1K transfer', + 'XP': 'Xmodem/1K-G transfer', + 'ZMO': 'ZModem (original)', + 'ZMB': 'ZModem with crash recovery', + 'ISDN': 'ISDN connection', + 'ISDNA': 'ISDN async', + 'X25': 'X.25 packet network', + 'POINTS24': 'Points file available 24 hours', + 'ANUS': 'Allow Null User Session — accepts anonymous/insecure sessions' + } %}
{% for flag_name, flag_value in node.flags %}
- {{ flag_name }} + {{ flag_name }} {% if flag_value != true and flag_value != '1' %} {{ flag_value }} {% endif %} @@ -385,6 +443,11 @@ {% endblock %} diff --git a/templates/files.twig b/templates/files.twig index f689978f..3f42b474 100644 --- a/templates/files.twig +++ b/templates/files.twig @@ -473,26 +473,54 @@ function displayRecentFiles(files) { - - - + - - + + `; + // Track which ISO subfolders have already been rendered so each subfolder + // appears only once in the recent-uploads list (avoids duplicate folder rows + // caused by multiple files sharing the same parent directory). + const seenIsoSubfolders = new Set(); + files.forEach(function(file) { const shortDesc = escapeHtml(file.short_description || ''); const fileSize = formatBytes(file.filesize); const uploadDate = formatDate(file.created_at); const canDelete = isAdmin || (currentUserId !== null && file.owner_id !== null && file.owner_id === currentUserId); - let areaLabel = escapeHtml(file.area_tag || ''); - if (!file.is_local && file.domain) { - areaLabel += '@' + escapeHtml(file.domain) + ''; + const isIsoDir = file.source_type === 'iso_import' && !!file.subfolder; + + if (isIsoDir) { + // Use "areaId:subfolder" as the dedup key so the same subfolder path + // in different areas is treated as distinct entries. + const subfolderKey = `${file.file_area_id}:${file.subfolder}`; + if (seenIsoSubfolders.has(subfolderKey)) { + return; // already rendered a row for this subfolder + } + seenIsoSubfolders.add(subfolderKey); + + // Show the actual directory name (last path component) as the label + // so "TEXT/DIR9" appears as "DIR9", not as an unrelated file description. + const subfolderName = escapeHtml(file.subfolder.split('/').pop() || file.subfolder); + const onclick = `selectFileArea(${file.file_area_id}, '${escapeHtml(file.subfolder)}'); return false;`; + + html += ` + + + + + + + `; + return; } let scanIcon = ''; @@ -516,8 +544,6 @@ function displayRecentFiles(files) { ${scanIcon} ${escapeHtml(file.filename)}${shareIcon} - - - + + + + @@ -891,8 +942,11 @@ function displayFiles(files, subfolders, subfolder) { $('#filesContainer').html(html); } -function buildBreadcrumb(subfolder) { +function buildBreadcrumb(subfolder, label) { const areaLabel = uiT('ui.files.title', 'Files'); + // Use the server-resolved label (short_description or dir name) when available, + // otherwise fall back to the local lookup map then the raw path. + const displayLabel = label || subfolderLabel(subfolder); return ` @@ -1326,9 +1380,26 @@ function saveScanStatus() { }); } +/** + * Load an iso_subdir record by ID then open the standard edit dialog, + * which already disables the filename field and hides move-area for ISO types. + */ +function openSubdirEdit(subdirId) { + $.get(`/api/files/${subdirId}`) + .done(function(data) { + currentFile = data.file; + currentFileId = subdirId; + showEditDialog(); + }) + .fail(function() { + showError(uiT('ui.files.load_files_failed', 'Failed to load file details')); + }); +} + function showEditDialog() { const currentFilename = currentFile ? currentFile.filename : $('#detailFilename').text(); - $('#renameFilenameInput').val(currentFilename); + const isIso = currentFile && (currentFile.source_type === 'iso_import' || currentFile.source_type === 'iso_subdir'); + $('#renameFilenameInput').val(currentFilename).prop('disabled', isIso); $('#editShortDescInput').val(currentFile ? (currentFile.short_description || '') : ''); $('#editLongDescInput').val(currentFile ? (currentFile.long_description || '') : ''); $('#renameErrorMsg').hide(); @@ -1343,12 +1414,12 @@ function showEditDialog() { options += ``; }); $('#editMoveAreaSelect').html(options); - $('#editMoveAreaGroup').show(); + $('#editMoveAreaGroup').toggle(!isIso); } else { $('#editMoveAreaGroup').hide(); } - bootstrap.Modal.getInstance('#fileDetailsModal').hide(); + bootstrap.Modal.getInstance('#fileDetailsModal')?.hide(); new bootstrap.Modal('#fileRenameModal').show(); $('#fileRenameModal').on('shown.bs.modal', function() { const input = $('#renameFilenameInput')[0]; @@ -1364,7 +1435,7 @@ function submitEdit() { const shortDesc = $('#editShortDescInput').val().trim(); const longDesc = $('#editLongDescInput').val().trim(); - if (!newFilename) { + if (!newFilename && !$('#renameFilenameInput').prop('disabled')) { $('#renameErrorMsg').text(uiT('errors.files.rename_filename_required', 'New filename is required')); $('#renameErrorMsg').show(); return; @@ -1444,6 +1515,33 @@ function deleteFile(fileId) { }); } +function confirmDeleteSubfolder(areaId, subfolder) { + const msg = uiT('ui.files.delete_subfolder_confirm', `Are you sure you want to delete the subfolder "${subfolder}" and all its files? This cannot be undone.`, { subfolder }); + if (confirm(msg)) { + deleteSubfolder(areaId, subfolder); + } +} + +function deleteSubfolder(areaId, subfolder) { + $.ajax({ + url: `/api/fileareas/${areaId}/subfolder`, + method: 'DELETE', + contentType: 'application/json', + data: JSON.stringify({ subfolder }), + success: function() { + showSuccess(uiT('ui.files.subfolder_deleted', 'Subfolder deleted')); + loadFiles(areaId); + loadStats(); + }, + error: function(xhr) { + const error = window.getApiErrorMessage + ? window.getApiErrorMessage(xhr.responseJSON, uiT('errors.files.delete_failed', 'Failed to delete subfolder')) + : uiT('errors.files.delete_failed', 'Failed to delete subfolder'); + showError(error); + } + }); +} + // ------------------------------------------------------------------------- // File share functions // ------------------------------------------------------------------------- From dc66fc0ff94d17c00c19497cd275ac3aa497a35d Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 08:33:47 -0700 Subject: [PATCH 081/246] Fix fuseiso fd inheritance and stale mount handling - Fork before exec'ing fuseiso so the child closes all inherited file descriptors (admin daemon's listening socket) before mounting. Previously fuseiso's daemonized child kept the socket bound after the daemon was killed. - Use fusermount -u instead of fuseiso -u for unmounting (correct FUSE tool, works on broken/stale mounts where fuseiso -u does not) - Always attempt fusermount -u before mounting to clear any stale FUSE state, replacing the broken scandir() check which fails on broken mounts - Use absolute paths for mount point (derived from __DIR__) and realpath() on the ISO file path so fuseiso always receives absolute paths after daemonizing Co-Authored-By: Claude Sonnet 4.6 --- src/Admin/AdminDaemonServer.php | 54 +++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/src/Admin/AdminDaemonServer.php b/src/Admin/AdminDaemonServer.php index c7c07cdf..15c87f40 100644 --- a/src/Admin/AdminDaemonServer.php +++ b/src/Admin/AdminDaemonServer.php @@ -705,24 +705,54 @@ private function mountIsoArea(int $areaId): array return ['ok' => false, 'error' => 'iso_file_not_found']; } - // Create mount point directory - $baseDir = \BinktermPHP\Config::env('ISO_MOUNT_BASE', 'data/iso_mounts'); + // Create mount point directory (always use absolute path) + $baseDir = \BinktermPHP\Config::env('ISO_MOUNT_BASE', __DIR__ . '/../../data/iso_mounts'); + if (!str_starts_with($baseDir, '/')) { + $baseDir = __DIR__ . '/../../' . $baseDir; + } $mountPoint = rtrim($baseDir, '/') . '/' . $areaId; if (!is_dir($mountPoint)) { mkdir($mountPoint, 0755, true); } - // Unmount first if already mounted (cleanup stale mounts) - if (is_dir($mountPoint) && count(scandir($mountPoint)) > 2) { - @shell_exec('fuseiso -u ' . escapeshellarg($mountPoint) . ' 2>/dev/null'); + // Always attempt to unmount first to clear any stale FUSE mount. + // Use fusermount -u (standard FUSE unmount tool) rather than fuseiso -u, + // and suppress errors since the mount may not exist yet. + @shell_exec('fusermount -u ' . escapeshellarg($mountPoint) . ' 2>/dev/null'); + + $absIso = realpath($isoPath) ?: $isoPath; + $output = []; + $returnCode = 1; + + // Fork before exec'ing fuseiso so the child can close all inherited + // file descriptors (e.g. the admin daemon's listening socket) before + // mounting. Without this, fuseiso's daemonized child inherits the + // socket and keeps it bound even after the admin daemon is killed. + if (function_exists('pcntl_fork')) { + $pid = pcntl_fork(); + if ($pid === -1) { + $manager->updateIsoMountStatus($areaId, 'error', 'pcntl_fork failed'); + return ['ok' => false, 'error' => 'pcntl_fork failed']; + } + if ($pid === 0) { + // Child: close all fds above stderr, then exec fuseiso. + // Use bash to enumerate /proc/self/fd so we don't miss any. + $script = 'for fd in $(ls /proc/self/fd 2>/dev/null); do ' + . '[ "$fd" -gt 2 ] 2>/dev/null && eval "exec ${fd}>&-" 2>/dev/null; ' + . 'done; ' + . 'exec fuseiso "$@"'; + pcntl_exec('/bin/bash', ['-c', $script, '--', $absIso, $mountPoint]); + exit(1); // pcntl_exec only returns on failure + } + // Parent: wait for fuseiso's setup phase to complete. + // fuseiso daemonizes internally — its parent exits with 0 on success. + pcntl_waitpid($pid, $status); + $returnCode = (pcntl_wifexited($status) ? pcntl_wexitstatus($status) : 1); + } else { + // Fallback (no pcntl): fd inheritance issue may occur but mounting will work. + exec('fuseiso ' . escapeshellarg($absIso) . ' ' . escapeshellarg($mountPoint) . ' 2>&1', $output, $returnCode); } - $escapedIso = escapeshellarg($isoPath); - $escapedMount = escapeshellarg($mountPoint); - $output = []; - $returnCode = 0; - exec("fuseiso {$escapedIso} {$escapedMount} 2>&1", $output, $returnCode); - if ($returnCode !== 0) { $errMsg = implode(' ', $output); $manager->updateIsoMountStatus($areaId, 'error', $errMsg); @@ -754,7 +784,7 @@ private function unmountIsoArea(int $areaId): array if (!empty($mountPoint) && is_dir($mountPoint)) { $output = []; $returnCode = 0; - exec('fuseiso -u ' . escapeshellarg($mountPoint) . ' 2>&1', $output, $returnCode); + exec('fusermount -u ' . escapeshellarg($mountPoint) . ' 2>&1', $output, $returnCode); if ($returnCode !== 0) { $errMsg = implode(' ', $output); // Leave status as 'mounted' — the ISO is still mounted and serving files. From c321163d65d641e1bf62c45b94ecc088e15ebaff Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 08:35:15 -0700 Subject: [PATCH 082/246] Resolve iso_mounts base path to remove ../ components Co-Authored-By: Claude Sonnet 4.6 --- src/Admin/AdminDaemonServer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Admin/AdminDaemonServer.php b/src/Admin/AdminDaemonServer.php index 15c87f40..1c88073c 100644 --- a/src/Admin/AdminDaemonServer.php +++ b/src/Admin/AdminDaemonServer.php @@ -710,7 +710,8 @@ private function mountIsoArea(int $areaId): array if (!str_starts_with($baseDir, '/')) { $baseDir = __DIR__ . '/../../' . $baseDir; } - $mountPoint = rtrim($baseDir, '/') . '/' . $areaId; + $baseDir = realpath($baseDir) ?: $baseDir; + $mountPoint = $baseDir . '/' . $areaId; if (!is_dir($mountPoint)) { mkdir($mountPoint, 0755, true); } From 1faf196ec208ebff186c0d4da4e5da666a9561cf Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 08:41:23 -0700 Subject: [PATCH 083/246] Resolve ISO file path to absolute before mounting Relative ISO paths (e.g. bare filenames) break fuseiso after it daemonizes because it changes working directory. Resolve to absolute path upfront and fail early with a clear error if realpath() cannot resolve the path. Co-Authored-By: Claude Sonnet 4.6 --- src/Admin/AdminDaemonServer.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Admin/AdminDaemonServer.php b/src/Admin/AdminDaemonServer.php index 1c88073c..7c67cd06 100644 --- a/src/Admin/AdminDaemonServer.php +++ b/src/Admin/AdminDaemonServer.php @@ -704,6 +704,12 @@ private function mountIsoArea(int $areaId): array $manager->updateIsoMountStatus($areaId, 'error', 'ISO file not found: ' . $isoPath); return ['ok' => false, 'error' => 'iso_file_not_found']; } + // Resolve to absolute path — relative paths break fuseiso after it daemonizes + $isoPath = realpath($isoPath); + if ($isoPath === false) { + $manager->updateIsoMountStatus($areaId, 'error', 'Could not resolve absolute path for ISO file'); + return ['ok' => false, 'error' => 'iso_path_not_resolvable']; + } // Create mount point directory (always use absolute path) $baseDir = \BinktermPHP\Config::env('ISO_MOUNT_BASE', __DIR__ . '/../../data/iso_mounts'); @@ -721,7 +727,7 @@ private function mountIsoArea(int $areaId): array // and suppress errors since the mount may not exist yet. @shell_exec('fusermount -u ' . escapeshellarg($mountPoint) . ' 2>/dev/null'); - $absIso = realpath($isoPath) ?: $isoPath; + $absIso = $isoPath; // already resolved to absolute path above $output = []; $returnCode = 1; From 595d6ccfb9cda4f88d554ffc661d358425c7d065 Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 09:05:28 -0700 Subject: [PATCH 084/246] Fix undefined \$storage in sendLocalSysopMessage prepareLocalMessageStorage() was never called before the INSERT, leaving \$storage undefined. Mirrors the pattern used in sendNetmail and sendEchomail. Co-Authored-By: Claude Sonnet 4.6 --- src/MessageHandler.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/MessageHandler.php b/src/MessageHandler.php index b3d83ae8..87b01ec2 100644 --- a/src/MessageHandler.php +++ b/src/MessageHandler.php @@ -1025,6 +1025,9 @@ private function sendLocalSysopMessage($fromUserId, $subject, $messageText, $fro $senderUser = $this->getUserById($fromUserId); $senderName = $fromName ?: ($senderUser['real_name'] ?: $senderUser['username']); + $finalMessageText = $this->applyUserSignatureAndTagline($messageText, $fromUserId, $tagline); + $storage = $this->prepareLocalMessageStorage($finalMessageText); + // Generate kludges for this local netmail $kludgeLines = $this->generateNetmailKludges($systemAddress, $systemAddress, $senderName, $sysopName, $subject, $replyToId, null, $markupType); From 28dcb8485659b780dbb933986f228661140ce81f Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 09:29:54 -0700 Subject: [PATCH 085/246] Remove ISO auto-mount; sysop configures mount point manually Drops the fuseiso-based auto-mount system from admin_daemon. ISO areas now require the sysop to mount the ISO by any suitable method and enter the resulting path in the Mount Point field. The UI shows an Accessible/ Not accessible badge based on a live is_dir+is_readable check. Removes iso_file_path, iso_mount_status, and iso_mount_error columns via migration v1.11.0.26. Updates FileAreas.md and UPGRADING_1.8.7.md. Co-Authored-By: Claude Sonnet 4.6 --- config/i18n/en/common.php | 11 +- config/i18n/en/errors.php | 2 - config/i18n/es/common.php | 11 +- config/i18n/es/errors.php | 2 - .../v1.11.0.26_drop_iso_mount_status.sql | 6 + docs/FileAreas.md | 96 +++++----- docs/UPGRADING_1.8.7.md | 46 ++--- public_html/sw.js | 2 +- routes/api-routes.php | 51 ++---- src/Admin/AdminDaemonClient.php | 22 --- src/Admin/AdminDaemonServer.php | 166 ------------------ src/FileAreaManager.php | 73 ++------ templates/fileareas.twig | 73 +------- 13 files changed, 108 insertions(+), 453 deletions(-) create mode 100644 database/migrations/v1.11.0.26_drop_iso_mount_status.sql diff --git a/config/i18n/en/common.php b/config/i18n/en/common.php index c069dbed..879b7c4c 100644 --- a/config/i18n/en/common.php +++ b/config/i18n/en/common.php @@ -2977,16 +2977,11 @@ 'ui.fileareas.area_type' => 'Area Type', 'ui.fileareas.area_type_normal' => 'Normal', 'ui.fileareas.area_type_iso' => 'ISO-backed', - 'ui.fileareas.iso_file_path' => 'ISO File Path', - 'ui.fileareas.iso_file_path_help' => 'Absolute path to the .iso file on the server', 'ui.fileareas.iso_mount_point' => 'Mount Point', - 'ui.fileareas.iso_mount_point_help' => 'Where the ISO is mounted. On Linux leave blank to let the daemon manage this automatically. On Windows enter the drive letter or path where you have mounted the ISO manually (e.g. D:\\).', + 'ui.fileareas.iso_mount_point_help' => 'Path where the ISO is mounted on the server. Mount the ISO manually before using this area (e.g. sudo mount -o loop image.iso /mnt/point). On Windows enter the drive letter or path (e.g. D:\\).', 'ui.fileareas.iso_mount_status' => 'Mount Status', - 'ui.fileareas.mount' => 'Mount', - 'ui.fileareas.unmount' => 'Unmount', - 'ui.fileareas.mounted' => 'Mounted', - 'ui.fileareas.unmounted' => 'Unmounted', - 'ui.fileareas.mount_error' => 'Error', + 'ui.fileareas.accessible' => 'Accessible', + 'ui.fileareas.not_accessible' => 'Not accessible', 'ui.fileareas.reindex' => 'Re-index ISO', 'ui.fileareas.reindexing' => 'Indexing…', 'ui.fileareas.reindex_started' => 'Re-index started in background', diff --git a/config/i18n/en/errors.php b/config/i18n/en/errors.php index 24ae1413..6ec69b7a 100644 --- a/config/i18n/en/errors.php +++ b/config/i18n/en/errors.php @@ -481,7 +481,5 @@ 'errors.admin.echomail_robots.invalid_config_json' => 'Processor config is not valid JSON', 'errors.files.iso_not_mounted' => 'File area is not mounted', 'errors.files.iso_readonly' => 'ISO-backed files cannot be modified', - 'errors.fileareas.mount_failed' => 'Failed to mount ISO area', - 'errors.fileareas.unmount_failed' => 'Failed to unmount ISO area', 'errors.fileareas.reindex_failed' => 'Failed to start ISO re-index', ]; diff --git a/config/i18n/es/common.php b/config/i18n/es/common.php index 6267787c..d0f397d9 100644 --- a/config/i18n/es/common.php +++ b/config/i18n/es/common.php @@ -2977,16 +2977,11 @@ 'ui.fileareas.area_type' => 'Tipo de área', 'ui.fileareas.area_type_normal' => 'Normal', 'ui.fileareas.area_type_iso' => 'Respaldada por ISO', - 'ui.fileareas.iso_file_path' => 'Ruta del archivo ISO', - 'ui.fileareas.iso_file_path_help' => 'Ruta absoluta al archivo .iso en el servidor', 'ui.fileareas.iso_mount_point' => 'Punto de montaje', - 'ui.fileareas.iso_mount_point_help' => 'Donde está montado el ISO. En Linux déjelo en blanco para que el daemon lo gestione automáticamente. En Windows ingrese la letra de unidad o ruta donde montó el ISO manualmente (p. ej. D:\\).', + 'ui.fileareas.iso_mount_point_help' => 'Ruta donde el ISO está montado en el servidor. Monte el ISO manualmente antes de usar esta área (p. ej. sudo mount -o loop imagen.iso /mnt/punto). En Windows ingrese la letra de unidad o ruta (p. ej. D:\\).', 'ui.fileareas.iso_mount_status' => 'Estado de montaje', - 'ui.fileareas.mount' => 'Montar', - 'ui.fileareas.unmount' => 'Desmontar', - 'ui.fileareas.mounted' => 'Montado', - 'ui.fileareas.unmounted' => 'Desmontado', - 'ui.fileareas.mount_error' => 'Error', + 'ui.fileareas.accessible' => 'Accesible', + 'ui.fileareas.not_accessible' => 'No accesible', 'ui.fileareas.reindex' => 'Re-indexar ISO', 'ui.fileareas.reindexing' => 'Indexando…', 'ui.fileareas.reindex_started' => 'Re-indexación iniciada en segundo plano', diff --git a/config/i18n/es/errors.php b/config/i18n/es/errors.php index fa57f64d..b7b91238 100644 --- a/config/i18n/es/errors.php +++ b/config/i18n/es/errors.php @@ -481,8 +481,6 @@ 'errors.admin.echomail_robots.invalid_config_json' => 'La configuracion del procesador no es JSON valido', 'errors.files.iso_not_mounted' => 'El área de archivos no está montada', 'errors.files.iso_readonly' => 'Los archivos ISO no se pueden modificar', - 'errors.fileareas.mount_failed' => 'No se pudo montar el área ISO', - 'errors.fileareas.unmount_failed' => 'No se pudo desmontar el área ISO', 'errors.fileareas.reindex_failed' => 'No se pudo iniciar la re-indexación ISO', ]; diff --git a/database/migrations/v1.11.0.26_drop_iso_mount_status.sql b/database/migrations/v1.11.0.26_drop_iso_mount_status.sql new file mode 100644 index 00000000..88b52490 --- /dev/null +++ b/database/migrations/v1.11.0.26_drop_iso_mount_status.sql @@ -0,0 +1,6 @@ +-- Migration: 1.11.0.26 - Drop ISO auto-mount columns +-- ISO mounting is now handled manually by the sysop; these columns are no longer used. + +ALTER TABLE file_areas DROP COLUMN IF EXISTS iso_mount_status; +ALTER TABLE file_areas DROP COLUMN IF EXISTS iso_mount_error; +ALTER TABLE file_areas DROP COLUMN IF EXISTS iso_file_path; diff --git a/docs/FileAreas.md b/docs/FileAreas.md index 57a85f40..d1345fc6 100644 --- a/docs/FileAreas.md +++ b/docs/FileAreas.md @@ -416,56 +416,58 @@ permitted. ### How It Works -1. The sysop creates an ISO-backed file area and configures the ISO path and mount - point in the admin UI. -2. On Linux, the admin daemon can mount the ISO automatically via `fuseiso`. On - Windows, the sysop mounts the ISO manually in Windows and enters the resulting - drive letter in the **Mount Point** field. -3. The sysop triggers a re-index from the admin UI or CLI. The importer walks the - ISO directory tree, reads any description catalogues it finds, and writes file - records to the database. Each record stores a path relative to the mount point - (`iso_rel_path`). +1. The sysop mounts the ISO on the server using any suitable method and notes + the resulting mount point path. +2. The sysop creates an ISO-backed file area and enters the mount point path + in the **Mount Point** field. The admin UI shows a green **Accessible** + badge when the path exists and is readable. +3. The sysop triggers a re-index from the admin UI or CLI. The importer walks + the ISO directory tree, reads any description catalogues it finds, and writes + file records to the database. Each record stores a path relative to the mount + point (`iso_rel_path`). 4. At download or preview time the server reconstructs the absolute path from - the current mount point and the stored relative path. If the ISO is not mounted - the server returns HTTP 503. + the current mount point and the stored relative path. If the path is not + accessible the server returns HTTP 503. --- ### Linux Setup -#### Prerequisites +#### Mounting the ISO -Install `fuseiso` (user-space FUSE mounting — no root required): +Mount the ISO to a directory of your choice. Using a loop device requires root +(or a sudoers rule): ```bash -apt install fuseiso # Debian/Ubuntu -dnf install fuseiso # Fedora/RHEL +sudo mkdir -p /srv/iso_mounts/simtel +sudo mount -o loop,ro /srv/isos/simtel.iso /srv/iso_mounts/simtel ``` -#### Creating the area +To remount automatically on reboot, add an entry to `/etc/fstab`: + +``` +/srv/isos/simtel.iso /srv/iso_mounts/simtel iso9660 loop,ro 0 0 +``` -1. Go to **Admin → Area Management → File Areas** and click **Add File Area**. -2. Set **Area Type** to **ISO-backed**. -3. Enter the absolute path to the `.iso` file (e.g. `/srv/isos/simtel.iso`). -4. Leave **Mount Point** blank — the daemon will populate it automatically. -5. Save, then re-open the area to edit it. -6. Click **Mount** to mount the ISO. The daemon calls `fuseiso` and stores the - mount point under `data/iso_mounts//`. -7. Once mounted, click **Re-index ISO** to import the file catalogue. +Alternatively, any method that produces a readable directory — FUSE tools, +udisksctl, or a loop device managed by your init system — works equally well. +The BBS only requires a readable directory path; it does not care how it was +mounted. -`admin_daemon` re-mounts all active ISO areas automatically on startup, so ISOs -survive server reboots without manual intervention. Mount points are created under -`data/iso_mounts/` by default; override with the `ISO_MOUNT_BASE` environment -variable in `.env`. +#### Creating the area + +1. Mount the ISO as described above. +2. Go to **Admin → Area Management → File Areas** and click **Add File Area**. +3. Set **Area Type** to **ISO-backed**. +4. Enter the mount point path in **Mount Point** (e.g. `/srv/iso_mounts/simtel`). +5. Save. The status badge should show **Accessible**. +6. Click **Re-index ISO** to import the file catalogue. --- ### Windows Setup Windows 10 and 11 can mount ISO files natively without third-party software. -Because `fuseiso` is not available on Windows, the **Mount** and **Unmount** -buttons in the admin UI will not function. The sysop must mount the ISO in -Windows and enter the resulting path in the file area properties. #### Creating the area @@ -479,15 +481,11 @@ Windows and enter the resulting path in the file area properties. Get-DiskImage -ImagePath "C:\isos\simtel.iso" | Get-Volume ``` -2. Go to **Admin → Area Management** and click **Add File Area**. +2. Go to **Admin → Area Management → File Areas** and click **Add File Area**. 3. Set **Area Type** to **ISO-backed**. -4. Enter the path to the `.iso` file in **ISO File Path** - (e.g. `C:\isos\simtel.iso`). -5. Enter the mounted drive letter or path in **Mount Point** (e.g. `D:\`). The - system will treat this as the mount root and mark the area as mounted when you - save. -6. Save the area. -7. Click **Re-index ISO** to import the file catalogue. +4. Enter the mounted drive letter or path in **Mount Point** (e.g. `D:\`). +5. Save. The status badge should show **Accessible**. +6. Click **Re-index ISO** to import the file catalogue. #### Re-mounting after a reboot @@ -501,16 +499,16 @@ present. After remounting: No re-index is needed unless the ISO itself changed — the existing file records remain valid and path resolution uses the updated mount point immediately. -#### Unmounting +#### Dismounting -1. Edit the file area in the admin UI and clear the **Mount Point** field, then - save. This prevents the system from attempting to serve files while the ISO is - not accessible. -2. Dismount the ISO in Windows: +Clear the **Mount Point** field in the admin UI before dismounting, then: - ```powershell - Dismount-DiskImage -ImagePath "C:\isos\simtel.iso" - ``` +```powershell +Dismount-DiskImage -ImagePath "C:\isos\simtel.iso" +``` + +Clearing the mount point prevents the system from attempting to serve files +while the ISO is not accessible. --- @@ -683,12 +681,12 @@ preview panel with CP437→UTF-8 conversion applied. No extraction to disk occur | Item | Notes | |---|---| -| Auto-mount | Linux only (`fuseiso`). On Windows, enter the mount point manually in the file area properties. | +| Mounting | The sysop is responsible for mounting the ISO and keeping it mounted. BinktermPHP does not manage mount lifecycle. | | ARJ/LZH `FILE_ID.DIZ` | Not extracted — PHP has no built-in ARJ reader. Shown as download prompt instead. | | Uploads | Blocked. ISO areas are permanently read-only. | | File deletion | Admin-only. Removes the database record; no disk change. Re-index with `--update` to refresh descriptions if the ISO changes. | | Move / rename | Filename and area moves are blocked. Description edits are allowed. | -| ISO format | ISO 9660 and Joliet extensions are supported by `fuseiso`. Rock Ridge is also supported. UDF (DVD-Video) discs may require `udftools` (`udisksctl mount`) instead of `fuseiso`. | +| ISO format | ISO 9660, Joliet, and Rock Ridge extensions are supported by the Linux kernel ISO driver. UDF discs can be mounted with `mount -t udf`. | --- diff --git a/docs/UPGRADING_1.8.7.md b/docs/UPGRADING_1.8.7.md index 8009f81e..392b10be 100644 --- a/docs/UPGRADING_1.8.7.md +++ b/docs/UPGRADING_1.8.7.md @@ -31,7 +31,6 @@ upgrade will appear to pause — this is normal. Do not interrupt it. - [File Area Subfolder Navigation](#file-area-subfolder-navigation) - [File Preview](#file-preview) - [ISO-Backed File Areas](#iso-backed-file-areas) - - [Prerequisites (Linux)](#prerequisites-linux) - [Creating an ISO area](#creating-an-iso-area) - [Import preview](#import-preview) - [Subfolder navigation](#subfolder-navigation) @@ -102,13 +101,14 @@ upgrade will appear to pause — this is normal. Do not interrupt it. - File areas can now be published to the Gemini capsule server. Gemini clients can browse area listings and download files directly over the Gemini protocol. - **ISO-backed file areas** — a file area can now be backed by a CD/DVD ISO - image (or any plain directory). The admin sets the ISO path; `admin_daemon` - mounts it automatically via `fuseiso` on Linux. Files are imported from the - ISO's directory tree using `FILES.BBS` / `DESCRIPT.ION` catalogues. ISO areas - are read-only; description edits are stored in the database. The directory - tree is exposed as browsable subfolders with editable labels. A preview modal - lets sysops review and customise the import before committing. ZIP files - inside the ISO show `FILE_ID.DIZ` in the preview modal. + image (or any readable directory). The sysop mounts the ISO using any + suitable method and enters the mount point path in the file area properties. + Files are imported from the ISO's directory tree using `FILES.BBS` / + `DESCRIPT.ION` catalogues. ISO areas are read-only; description edits are + stored in the database. The directory tree is exposed as browsable subfolders + with editable labels. A preview modal lets sysops review and customise the + import before committing. ZIP files inside the ISO show `FILE_ID.DIZ` in the + preview modal. **Nodelist** @@ -641,24 +641,16 @@ sysops to expose large shareware CD collections (Simtel, Walnut Creek, etc.) without copying files to local storage. Plain directories work too — the system only requires a readable path in the **Mount Point** field. -### Prerequisites (Linux) - -Install `fuseiso` on the server (user-space FUSE mounting, no root required): - -```bash -apt install fuseiso # Debian/Ubuntu -dnf install fuseiso # Fedora/RHEL -``` - ### Creating an ISO area -1. In **Admin → Area Management → File Areas**, click **Add File Area**. -2. Set **Area Type** to **ISO-backed**. -3. Enter the absolute path to the `.iso` file (e.g. `/srv/isos/simtel.iso`). -4. Save the area. -5. In the edit modal, click **Mount** to mount the ISO (handled automatically - by `admin_daemon` on Linux; on Windows, mount manually and enter the drive - letter in the **Mount Point** field). +1. Mount the ISO using any suitable method and note the resulting path. + On Linux: `sudo mount -o loop,ro /srv/isos/simtel.iso /srv/iso_mounts/simtel` + On Windows: right-click the `.iso` → **Mount**, note the drive letter. +2. In **Admin → Area Management → File Areas**, click **Add File Area**. +3. Set **Area Type** to **ISO-backed**. +4. Enter the mount point path in **Mount Point** + (e.g. `/srv/iso_mounts/simtel` or `D:\`). +5. Save. The status badge shows **Accessible** when the path is reachable. 6. Click **Re-index ISO** to open the import preview. ### Import preview @@ -710,10 +702,8 @@ directory. If no catalogue is present, the filename is used as the description. deletion removes the database record only (no disk change). - Description edits (short/long description) are stored in the database and are always permitted. -- `admin_daemon` re-mounts all active ISO areas on startup. -- If an unmount fails (e.g. the directory is busy), the mount status remains - `mounted` — the area continues to serve files normally. -- If the ISO is not mounted when a file is requested, the server returns 503. +- If the mount point is not accessible when a file is requested, the server + returns 503. - ZIP files inside the ISO display `FILE_ID.DIZ` in the preview modal. ### Migration diff --git a/public_html/sw.js b/public_html/sw.js index b44615d2..68546fa7 100644 --- a/public_html/sw.js +++ b/public_html/sw.js @@ -1,4 +1,4 @@ -const CACHE_NAME = 'binkcache-v262'; +const CACHE_NAME = 'binkcache-v263'; // Static assets to precache const staticAssets = [ diff --git a/routes/api-routes.php b/routes/api-routes.php index 51243c66..c4ce8910 100644 --- a/routes/api-routes.php +++ b/routes/api-routes.php @@ -2073,6 +2073,13 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array $userId = $user['user_id'] ?? $user['id'] ?? null; $isAdmin = !empty($user['is_admin']); $fileareas = $manager->getFileAreas($filter, $userId, $isAdmin); + foreach ($fileareas as &$fa) { + if (($fa['area_type'] ?? '') === 'iso') { + $mp = $fa['iso_mount_point'] ?? ''; + $fa['iso_accessible'] = !empty($mp) && is_dir($mp) && is_readable($mp); + } + } + unset($fa); $privateArea = $userId ? $manager->getPrivateFileArea((int)$userId) : null; if ($privateArea) { @@ -2091,6 +2098,10 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array $filearea = $manager->getFileAreaById((int)$id); if ($filearea) { + if (($filearea['area_type'] ?? '') === 'iso') { + $mp = $filearea['iso_mount_point'] ?? ''; + $filearea['iso_accessible'] = !empty($mp) && is_dir($mp) && is_readable($mp); + } echo json_encode(['filearea' => $filearea]); } else { http_response_code(404); @@ -2173,46 +2184,6 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array echo json_encode($stats); }); - /** - * POST /api/fileareas/{id}/mount-iso - * Request admin_daemon to mount an ISO file area. Admin only. - */ - SimpleRouter::post('/fileareas/{id}/mount-iso', function($id) { - $user = RouteHelper::requireAdmin(); - header('Content-Type: application/json'); - - $daemonClient = new \BinktermPHP\Admin\AdminDaemonClient(); - try { - $daemonClient->mountIso((int)$id); - $daemonClient->close(); - } catch (\Exception $e) { - http_response_code(500); - apiError('errors.fileareas.mount_failed', apiLocalizedText('errors.fileareas.mount_failed', 'Failed to mount ISO area', $user)); - return; - } - echo json_encode(['success' => true]); - })->where(['id' => '[0-9]+']); - - /** - * POST /api/fileareas/{id}/unmount-iso - * Request admin_daemon to unmount an ISO file area. Admin only. - */ - SimpleRouter::post('/fileareas/{id}/unmount-iso', function($id) { - $user = RouteHelper::requireAdmin(); - header('Content-Type: application/json'); - - $daemonClient = new \BinktermPHP\Admin\AdminDaemonClient(); - try { - $daemonClient->unmountIso((int)$id); - $daemonClient->close(); - } catch (\Exception $e) { - http_response_code(500); - apiError('errors.fileareas.unmount_failed', apiLocalizedText('errors.fileareas.unmount_failed', 'Failed to unmount ISO area', $user)); - return; - } - echo json_encode(['success' => true]); - })->where(['id' => '[0-9]+']); - /** * GET /api/fileareas/{id}/preview-iso * Dry-run ISO scan returning directory entries with descriptions and status. Admin only. diff --git a/src/Admin/AdminDaemonClient.php b/src/Admin/AdminDaemonClient.php index 2d9c20d9..2ef0dfc8 100644 --- a/src/Admin/AdminDaemonClient.php +++ b/src/Admin/AdminDaemonClient.php @@ -351,28 +351,6 @@ public function runEchomailRobot(int $robotId): array return $this->sendCommand('run_echomail_robot', ['robot_id' => $robotId]); } - /** - * Mount an ISO-backed file area. - * - * @param int $areaId File area ID - * @return array Daemon response - */ - public function mountIso(int $areaId): array - { - return $this->sendCommand('mount_iso', ['area_id' => $areaId]); - } - - /** - * Unmount an ISO-backed file area. - * - * @param int $areaId File area ID - * @return array Daemon response - */ - public function unmountIso(int $areaId): array - { - return $this->sendCommand('unmount_iso', ['area_id' => $areaId]); - } - /** * Trigger a re-index of an ISO-backed file area. * diff --git a/src/Admin/AdminDaemonServer.php b/src/Admin/AdminDaemonServer.php index 7c67cd06..b1c3a9bd 100644 --- a/src/Admin/AdminDaemonServer.php +++ b/src/Admin/AdminDaemonServer.php @@ -52,9 +52,6 @@ public function run(): void $this->logger->info('Admin daemon started', ['socket' => $this->socketTarget]); - // Re-mount all active ISO file areas on startup - $this->remountAllIsoAreas(); - $canFork = function_exists('pcntl_fork') && function_exists('posix_getppid') && function_exists('posix_kill'); @@ -647,24 +644,6 @@ private function handleCommand($client, array $payload): void $this->logCommandResult('run_echomail_robot', $result); $this->writeResponse($client, ['ok' => true, 'result' => $result]); break; - case 'mount_iso': - $areaId = (int)($data['area_id'] ?? 0); - if ($areaId <= 0) { - $this->writeResponse($client, ['ok' => false, 'error' => 'missing_area_id']); - break; - } - $mountResult = $this->mountIsoArea($areaId); - $this->writeResponse($client, ['ok' => $mountResult['ok'], 'result' => $mountResult]); - break; - case 'unmount_iso': - $areaId = (int)($data['area_id'] ?? 0); - if ($areaId <= 0) { - $this->writeResponse($client, ['ok' => false, 'error' => 'missing_area_id']); - break; - } - $unmountResult = $this->unmountIsoArea($areaId); - $this->writeResponse($client, ['ok' => $unmountResult['ok'], 'result' => $unmountResult]); - break; case 'reindex_iso': $areaId = (int)($data['area_id'] ?? 0); if ($areaId <= 0) { @@ -684,151 +663,6 @@ private function handleCommand($client, array $payload): void } } - /** - * Mount a single ISO-backed file area using fuseiso. - * - * @param int $areaId - * @return array {ok: bool, error?: string} - */ - private function mountIsoArea(int $areaId): array - { - $manager = new \BinktermPHP\FileAreaManager(); - $area = $manager->getFileAreaById($areaId); - - if (!$area || ($area['area_type'] ?? 'normal') !== 'iso') { - return ['ok' => false, 'error' => 'not_an_iso_area']; - } - - $isoPath = $area['iso_file_path'] ?? ''; - if (empty($isoPath) || !file_exists($isoPath)) { - $manager->updateIsoMountStatus($areaId, 'error', 'ISO file not found: ' . $isoPath); - return ['ok' => false, 'error' => 'iso_file_not_found']; - } - // Resolve to absolute path — relative paths break fuseiso after it daemonizes - $isoPath = realpath($isoPath); - if ($isoPath === false) { - $manager->updateIsoMountStatus($areaId, 'error', 'Could not resolve absolute path for ISO file'); - return ['ok' => false, 'error' => 'iso_path_not_resolvable']; - } - - // Create mount point directory (always use absolute path) - $baseDir = \BinktermPHP\Config::env('ISO_MOUNT_BASE', __DIR__ . '/../../data/iso_mounts'); - if (!str_starts_with($baseDir, '/')) { - $baseDir = __DIR__ . '/../../' . $baseDir; - } - $baseDir = realpath($baseDir) ?: $baseDir; - $mountPoint = $baseDir . '/' . $areaId; - if (!is_dir($mountPoint)) { - mkdir($mountPoint, 0755, true); - } - - // Always attempt to unmount first to clear any stale FUSE mount. - // Use fusermount -u (standard FUSE unmount tool) rather than fuseiso -u, - // and suppress errors since the mount may not exist yet. - @shell_exec('fusermount -u ' . escapeshellarg($mountPoint) . ' 2>/dev/null'); - - $absIso = $isoPath; // already resolved to absolute path above - $output = []; - $returnCode = 1; - - // Fork before exec'ing fuseiso so the child can close all inherited - // file descriptors (e.g. the admin daemon's listening socket) before - // mounting. Without this, fuseiso's daemonized child inherits the - // socket and keeps it bound even after the admin daemon is killed. - if (function_exists('pcntl_fork')) { - $pid = pcntl_fork(); - if ($pid === -1) { - $manager->updateIsoMountStatus($areaId, 'error', 'pcntl_fork failed'); - return ['ok' => false, 'error' => 'pcntl_fork failed']; - } - if ($pid === 0) { - // Child: close all fds above stderr, then exec fuseiso. - // Use bash to enumerate /proc/self/fd so we don't miss any. - $script = 'for fd in $(ls /proc/self/fd 2>/dev/null); do ' - . '[ "$fd" -gt 2 ] 2>/dev/null && eval "exec ${fd}>&-" 2>/dev/null; ' - . 'done; ' - . 'exec fuseiso "$@"'; - pcntl_exec('/bin/bash', ['-c', $script, '--', $absIso, $mountPoint]); - exit(1); // pcntl_exec only returns on failure - } - // Parent: wait for fuseiso's setup phase to complete. - // fuseiso daemonizes internally — its parent exits with 0 on success. - pcntl_waitpid($pid, $status); - $returnCode = (pcntl_wifexited($status) ? pcntl_wexitstatus($status) : 1); - } else { - // Fallback (no pcntl): fd inheritance issue may occur but mounting will work. - exec('fuseiso ' . escapeshellarg($absIso) . ' ' . escapeshellarg($mountPoint) . ' 2>&1', $output, $returnCode); - } - - if ($returnCode !== 0) { - $errMsg = implode(' ', $output); - $manager->updateIsoMountStatus($areaId, 'error', $errMsg); - $this->logger->error('ISO mount failed', ['area_id' => $areaId, 'error' => $errMsg]); - return ['ok' => false, 'error' => $errMsg]; - } - - $manager->updateIsoMountStatus($areaId, 'mounted', null, realpath($mountPoint) ?: $mountPoint); - $this->logger->info('ISO area mounted', ['area_id' => $areaId, 'mount_point' => $mountPoint]); - return ['ok' => true]; - } - - /** - * Unmount a single ISO-backed file area. - * - * @param int $areaId - * @return array {ok: bool, error?: string} - */ - private function unmountIsoArea(int $areaId): array - { - $manager = new \BinktermPHP\FileAreaManager(); - $area = $manager->getFileAreaById($areaId); - - if (!$area || ($area['area_type'] ?? 'normal') !== 'iso') { - return ['ok' => false, 'error' => 'not_an_iso_area']; - } - - $mountPoint = $area['iso_mount_point'] ?? ''; - if (!empty($mountPoint) && is_dir($mountPoint)) { - $output = []; - $returnCode = 0; - exec('fusermount -u ' . escapeshellarg($mountPoint) . ' 2>&1', $output, $returnCode); - if ($returnCode !== 0) { - $errMsg = implode(' ', $output); - // Leave status as 'mounted' — the ISO is still mounted and serving files. - // Only update the error message so the UI can surface the reason. - $manager->updateIsoMountStatus($areaId, 'mounted', $errMsg); - $this->logger->error('ISO unmount failed', ['area_id' => $areaId, 'error' => $errMsg]); - return ['ok' => false, 'error' => $errMsg]; - } - } - - $manager->updateIsoMountStatus($areaId, 'unmounted'); - $this->logger->info('ISO area unmounted', ['area_id' => $areaId]); - return ['ok' => true]; - } - - /** - * Re-mount all active ISO areas on daemon startup. - */ - private function remountAllIsoAreas(): void - { - try { - $manager = new \BinktermPHP\FileAreaManager(); - $areas = $manager->getActiveIsoAreas(); - foreach ($areas as $area) { - $result = $this->mountIsoArea((int)$area['id']); - if (!$result['ok']) { - $this->logger->warning('Startup ISO re-mount failed', [ - 'area_id' => $area['id'], - 'error' => $result['error'] ?? 'unknown', - ]); - } - } - } catch (\Throwable $e) { - $this->logger->error('ISO startup re-mount error', ['error' => $e->getMessage()]); - } - } - private function runCommand(array $command): array { $descriptorSpec = [ diff --git a/src/FileAreaManager.php b/src/FileAreaManager.php index 2af10c30..54edef43 100644 --- a/src/FileAreaManager.php +++ b/src/FileAreaManager.php @@ -208,29 +208,6 @@ public function resolveFilePath(array $file): string return $file['storage_path']; } - /** - * Update the ISO mount status for a file area. - * - * @param int $id File area ID - * @param string $status 'mounted', 'unmounted', or 'error' - * @param string|null $error Error message (e.g. fuseiso output on failure); stored in iso_mount_error - * @param string|null $mountPoint Absolute mount point path (set on successful mount) - */ - public function updateIsoMountStatus(int $id, string $status, ?string $error = null, ?string $mountPoint = null): void - { - $sets = ['iso_mount_status = ?', 'iso_mount_error = ?', 'updated_at = NOW()']; - $params = [$status, $error]; - - if ($mountPoint !== null) { - $sets[] = 'iso_mount_point = ?'; - $params[] = $mountPoint; - } - - $params[] = $id; - $sql = 'UPDATE file_areas SET ' . implode(', ', $sets) . ' WHERE id = ?'; - $this->db->prepare($sql)->execute($params); - } - /** * Update the ISO last-indexed timestamp for a file area. * @@ -669,21 +646,6 @@ private function parseDescriptIon(string $content): array return $entries; } - /** - * Get all active ISO-backed file areas (for daemon startup re-mount). - * - * @return array - */ - public function getActiveIsoAreas(): array - { - $stmt = $this->db->prepare(" - SELECT * FROM file_areas - WHERE area_type = 'iso' AND is_active = TRUE AND iso_file_path IS NOT NULL - "); - $stmt->execute(); - return $stmt->fetchAll(); - } - /** * Create a new file area * @@ -709,8 +671,7 @@ public function createFileArea(array $data): int $password = $password === '' ? null : $password; // ISO fields - $areaType = in_array($data['area_type'] ?? 'normal', ['normal', 'iso']) ? ($data['area_type'] ?? 'normal') : 'normal'; - $isoFilePath = $areaType === 'iso' ? (trim($data['iso_file_path'] ?? '') ?: null) : null; + $areaType = in_array($data['area_type'] ?? 'normal', ['normal', 'iso']) ? ($data['area_type'] ?? 'normal') : 'normal'; $isoMountPoint = $areaType === 'iso' ? (trim($data['iso_mount_point'] ?? '') ?: null) : null; // Force read-only for ISO areas if ($areaType === 'iso') { @@ -736,17 +697,15 @@ public function createFileArea(array $data): int $freqPassword = null; } - $mountStatus = $isoMountPoint !== null ? 'mounted' : null; - $stmt = $this->db->prepare(" INSERT INTO file_areas ( tag, description, domain, is_local, is_active, max_file_size, allowed_extensions, blocked_extensions, replace_existing, allow_duplicate_hash, password, upload_permission, scan_virus, gemini_public, freq_enabled, freq_password, - area_type, iso_file_path, iso_mount_point, iso_mount_status, + area_type, iso_mount_point, created_at, updated_at - ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW(), NOW()) + ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW(), NOW()) RETURNING id "); @@ -756,7 +715,7 @@ public function createFileArea(array $data): int $allowDuplicateHash ? 1 : 0, $password, $uploadPermission, $scanVirus ? 1 : 0, $geminiPublic ? 'true' : 'false', $freqEnabled ? 'true' : 'false', $freqPassword, - $areaType, $isoFilePath, $isoMountPoint, $mountStatus + $areaType, $isoMountPoint ]); $result = $stmt->fetch(); @@ -800,14 +759,7 @@ public function updateFileArea(int $id, array $data): bool $areaType = in_array($data['area_type'] ?? $currentArea['area_type'] ?? 'normal', ['normal', 'iso']) ? ($data['area_type'] ?? $currentArea['area_type'] ?? 'normal') : 'normal'; - $isoFilePath = $areaType === 'iso' - ? (array_key_exists('iso_file_path', $data) ? (trim($data['iso_file_path']) ?: null) : $currentArea['iso_file_path']) - : null; - - // Manual mount point: sysop can specify directly (required on Windows; - // optional on Linux where the daemon manages it via fuseiso). - // When a non-empty mount point is supplied we treat the area as mounted. - // When cleared we leave the existing mount point alone (daemon manages it). + $manualMountPoint = $areaType === 'iso' && array_key_exists('iso_mount_point', $data) ? (trim($data['iso_mount_point'] ?? '') ?: null) : null; // null = not supplied, don't touch existing value @@ -828,16 +780,15 @@ public function updateFileArea(int $id, array $data): bool $freqPassword = $freqPassword === '' ? null : $freqPassword; } - // Build the SET clause — only touch iso_mount_point/status when the sysop - // explicitly provided a value in the form (manual mount override). + // Only touch iso_mount_point when the sysop explicitly provided a value. $mountCols = ''; $mountParams = []; if ($manualMountPoint !== null) { - $mountCols = ', iso_mount_point = ?, iso_mount_status = ?, iso_mount_error = NULL'; - $mountParams = [$manualMountPoint, 'mounted']; + $mountCols = ', iso_mount_point = ?'; + $mountParams = [$manualMountPoint]; } elseif ($areaType === 'normal' && ($currentArea['area_type'] ?? 'normal') === 'iso') { - // Area type changed from iso → normal: clear mount fields - $mountCols = ', iso_mount_point = NULL, iso_mount_status = NULL, iso_mount_error = NULL'; + // Area type changed from iso → normal: clear mount point + $mountCols = ', iso_mount_point = NULL'; } $sql = " @@ -847,7 +798,7 @@ public function updateFileArea(int $id, array $data): bool replace_existing = ?, allow_duplicate_hash = ?, password = ?, upload_permission = ?, scan_virus = ?, gemini_public = ?, freq_enabled = ?, freq_password = ?, - area_type = ?, iso_file_path = ? + area_type = ? {$mountCols}, updated_at = NOW() WHERE id = ? @@ -859,7 +810,7 @@ public function updateFileArea(int $id, array $data): bool $allowDuplicateHash ? 1 : 0, $password, $uploadPermission, $scanVirus ? 1 : 0, $geminiPublic ? 'true' : 'false', $freqEnabled ? 'true' : 'false', $freqPassword, - $areaType, $isoFilePath, + $areaType, ...$mountParams, $id ]; diff --git a/templates/fileareas.twig b/templates/fileareas.twig index 669c6f4e..1bf18d8a 100644 --- a/templates/fileareas.twig +++ b/templates/fileareas.twig @@ -203,11 +203,6 @@ @@ -435,11 +423,9 @@ function displayFileareas(fileareas) { let isoBadge = ''; if (area.area_type === 'iso') { - const mountDot = area.iso_mount_status === 'mounted' - ? '●' - : area.iso_mount_status === 'error' - ? '●' - : '●'; + const mountDot = area.iso_accessible + ? '●' + : '●'; isoBadge = `ISO${mountDot}`; } @@ -527,24 +513,16 @@ function updateIsoFieldsVisibility() { function updateIsoMountStatusUI(area) { if (!area || area.area_type !== 'iso') return; $('#isoMountControls').show(); - const status = area.iso_mount_status || 'unmounted'; - let badgeClass = 'bg-secondary'; - let badgeText = uiT('ui.fileareas.unmounted', 'Unmounted'); - if (status === 'mounted') { badgeClass = 'bg-success'; badgeText = uiT('ui.fileareas.mounted', 'Mounted'); } - if (status === 'error') { badgeClass = 'bg-danger'; badgeText = uiT('ui.fileareas.mount_error', 'Error'); } + const accessible = !!area.iso_accessible; + const badgeClass = accessible ? 'bg-success' : 'bg-secondary'; + const badgeText = accessible ? uiT('ui.fileareas.accessible', 'Accessible') : uiT('ui.fileareas.not_accessible', 'Not accessible'); $('#isoMountStatusBadge').attr('class', 'badge ' + badgeClass).text(badgeText); - if (area.iso_mount_error) { - $('#isoMountError').text(area.iso_mount_error).show(); - } else { - $('#isoMountError').hide(); - } if (area.iso_last_indexed) { $('#isoLastIndexed').text(uiT('ui.fileareas.last_indexed', 'Last indexed') + ': ' + area.iso_last_indexed); } else { $('#isoLastIndexed').text(''); } - // Enable reindex only when mounted - $('#isoReindexBtn').prop('disabled', status !== 'mounted'); + $('#isoReindexBtn').prop('disabled', !accessible); } function showAddFileareaModal() { @@ -556,7 +534,6 @@ function showAddFileareaModal() { $('#fileareaPassword').val(''); $('#fileareaMaxSize').val(10); $('#areaTypeNormal').prop('checked', true); - $('#fileareaIsoFilePath').val(''); $('#fileareaIsoMountPoint').val(''); $('#isoFieldsGroup').hide(); $('#isoMountControls').hide(); @@ -598,7 +575,6 @@ function editFilearea(id) { // ISO fields const isIso = area.area_type === 'iso'; $(`input[name="area_type"][value="${isIso ? 'iso' : 'normal'}"]`).prop('checked', true); - $('#fileareaIsoFilePath').val(area.iso_file_path || ''); $('#fileareaIsoMountPoint').val(area.iso_mount_point || ''); updateIsoFieldsVisibility(); updateIsoMountStatusUI(area); @@ -633,7 +609,6 @@ function saveFilearea() { scan_virus: $('#fileareaScanVirus').is(':checked'), is_active: $('#fileareaIsActive').is(':checked'), area_type: areaType, - iso_file_path: areaType === 'iso' ? $('#fileareaIsoFilePath').val().trim() : null, iso_mount_point: areaType === 'iso' ? ($('#fileareaIsoMountPoint').val().trim() || null) : null }; @@ -722,42 +697,8 @@ $(document).on('change', '#fileareaFreqEnabled', function() { $(document).on('change', 'input[name="area_type"]', function() { updateIsoFieldsVisibility(); - if ($(this).val() !== 'iso') { - $('#isoMountControls').hide(); - } }); -function isoMount() { - if (!currentFileareaId) return; - $('#isoMountBtn').prop('disabled', true); - $.post(`/api/fileareas/${currentFileareaId}/mount-iso`) - .done(function() { - // Reload area to get fresh mount status - $.get(`/api/fileareas/${currentFileareaId}`) - .done(function(data) { updateIsoMountStatusUI(data.filearea); }) - .always(function() { $('#isoMountBtn').prop('disabled', false); loadFileareas(); }); - }) - .fail(function(xhr) { - $('#isoMountBtn').prop('disabled', false); - showError(apiError(xhr.responseJSON, uiT('errors.fileareas.mount_failed', 'Failed to mount ISO area'))); - }); -} - -function isoUnmount() { - if (!currentFileareaId) return; - $('#isoUnmountBtn').prop('disabled', true); - $.post(`/api/fileareas/${currentFileareaId}/unmount-iso`) - .done(function() { - $.get(`/api/fileareas/${currentFileareaId}`) - .done(function(data) { updateIsoMountStatusUI(data.filearea); }) - .always(function() { $('#isoUnmountBtn').prop('disabled', false); loadFileareas(); }); - }) - .fail(function(xhr) { - $('#isoUnmountBtn').prop('disabled', false); - showError(apiError(xhr.responseJSON, uiT('errors.fileareas.unmount_failed', 'Failed to unmount ISO area'))); - }); -} - function openIsoPreview() { if (!currentFileareaId) return; const flat = $('#isoPreviewFlat').is(':checked'); From 29b4bf56888c2b99591d2480919801ff615fc2d2 Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 09:44:13 -0700 Subject: [PATCH 086/246] Show subfolder short_description in Recent Uploads list ISO subfolder rows in the Recent Uploads view were always showing the raw directory name (e.g. 044a) because the getRecentFiles query did not join with iso_subdir records. Added subfolder_label to the iso_subdirs CTE and use it in the folder row label when set. Co-Authored-By: Claude Sonnet 4.6 --- src/FileAreaManager.php | 10 ++++++++-- templates/files.twig | 7 ++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/FileAreaManager.php b/src/FileAreaManager.php index 54edef43..71705e28 100644 --- a/src/FileAreaManager.php +++ b/src/FileAreaManager.php @@ -907,7 +907,8 @@ public function getRecentFiles(int $limit = 25): array $stmt = $this->db->prepare(" WITH regular AS ( SELECT f.*, fa.tag AS area_tag, fa.domain, fa.is_local, - CASE WHEN sf.id IS NOT NULL THEN TRUE ELSE FALSE END AS is_shared + CASE WHEN sf.id IS NOT NULL THEN TRUE ELSE FALSE END AS is_shared, + NULL::text AS subfolder_label FROM files f JOIN file_areas fa ON f.file_area_id = fa.id {$sharedJoin} @@ -919,10 +920,15 @@ public function getRecentFiles(int $limit = 25): array iso_subdirs AS ( SELECT DISTINCT ON (f.file_area_id, f.subfolder) f.*, fa.tag AS area_tag, fa.domain, fa.is_local, - CASE WHEN sf.id IS NOT NULL THEN TRUE ELSE FALSE END AS is_shared + CASE WHEN sf.id IS NOT NULL THEN TRUE ELSE FALSE END AS is_shared, + m.short_description AS subfolder_label FROM files f JOIN file_areas fa ON f.file_area_id = fa.id {$sharedJoin} + LEFT JOIN files m ON m.file_area_id = f.file_area_id + AND m.source_type = 'iso_subdir' + AND m.iso_rel_path = f.subfolder + AND m.status = 'approved' WHERE f.status = 'approved' {$areaFilter} AND f.source_type = 'iso_import' diff --git a/templates/files.twig b/templates/files.twig index 3f42b474..ba6f5ff8 100644 --- a/templates/files.twig +++ b/templates/files.twig @@ -504,9 +504,10 @@ function displayRecentFiles(files) { } seenIsoSubfolders.add(subfolderKey); - // Show the actual directory name (last path component) as the label - // so "TEXT/DIR9" appears as "DIR9", not as an unrelated file description. - const subfolderName = escapeHtml(file.subfolder.split('/').pop() || file.subfolder); + // Use the subfolder's short_description if set, otherwise the last path component. + const dirName = file.subfolder.split('/').pop() || file.subfolder; + const sfLabel = file.subfolder_label && file.subfolder_label !== dirName ? file.subfolder_label : dirName; + const subfolderName = escapeHtml(sfLabel); const onclick = `selectFileArea(${file.file_area_id}, '${escapeHtml(file.subfolder)}'); return false;`; html += ` From 72e12539ab3a6847018cb2ec67146ea2380ae66f Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 09:53:11 -0700 Subject: [PATCH 087/246] Fix ISO subfolder navigation for multi-level directory trees getSubfolders() now accepts a parentPath and returns only immediate children of that path, so deep ISOs (e.g. msdos/util/sub) navigate correctly one level at a time instead of dumping all depths at root. Breadcrumb updated to render each path segment as a clickable link. Co-Authored-By: Claude Sonnet 4.6 --- routes/api-routes.php | 2 +- src/FileAreaManager.php | 24 +++++++++++++++++----- templates/files.twig | 44 ++++++++++++++++++++++++++++++----------- 3 files changed, 52 insertions(+), 18 deletions(-) diff --git a/routes/api-routes.php b/routes/api-routes.php index c4ce8910..6713c41f 100644 --- a/routes/api-routes.php +++ b/routes/api-routes.php @@ -2304,7 +2304,7 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array // Treat empty string as null (root) $subfolder = ($subfolderParam !== null && $subfolderParam !== '') ? $subfolderParam : null; - $subfolders = $manager->getSubfolders((int)$areaId); + $subfolders = $manager->getSubfolders((int)$areaId, $subfolder); $files = $manager->getFiles((int)$areaId, $subfolder); // When inside a subfolder, resolve its display label from the iso_subdir record. diff --git a/src/FileAreaManager.php b/src/FileAreaManager.php index 71705e28..6dc89137 100644 --- a/src/FileAreaManager.php +++ b/src/FileAreaManager.php @@ -1043,14 +1043,27 @@ public function getSubfolderLabel(int $areaId, string $subfolder): string } /** - * Get distinct subfolders that exist within a file area, with optional descriptions - * sourced from iso_subdir records. + * Get immediate child subfolders at the given parent path within a file area. * - * @param int $areaId File area ID + * At root ($parentPath = null) returns only top-level folders (no '/' in path). + * When $parentPath is set returns only direct children of that path, so + * 'msdos' returns 'msdos/util' but not 'msdos/util/sub'. + * + * @param int $areaId File area ID + * @param string|null $parentPath Current directory path, or null for root * @return array[] Array of ['subfolder' => string, 'description' => string|null, 'subdir_id' => int|null] */ - public function getSubfolders(int $areaId): array + public function getSubfolders(int $areaId, ?string $parentPath = null): array { + if ($parentPath === null) { + $whereParent = "AND f.subfolder NOT LIKE '%/%'"; + $params = [$areaId]; + } else { + $prefix = $parentPath . '/'; + $whereParent = "AND f.subfolder LIKE ? AND f.subfolder NOT LIKE ?"; + $params = [$areaId, $prefix . '%', $prefix . '%/%']; + } + $stmt = $this->db->prepare(" SELECT DISTINCT f.subfolder, m.short_description AS description, @@ -1065,9 +1078,10 @@ public function getSubfolders(int $areaId): array AND f.status = 'approved' AND f.subfolder IS NOT NULL AND (f.source_type IS DISTINCT FROM 'iso_subdir') + {$whereParent} ORDER BY f.subfolder "); - $stmt->execute([$areaId]); + $stmt->execute($params); return $stmt->fetchAll(\PDO::FETCH_ASSOC); } diff --git a/templates/files.twig b/templates/files.twig index ba6f5ff8..3c517f9c 100644 --- a/templates/files.twig +++ b/templates/files.twig @@ -945,21 +945,41 @@ function displayFiles(files, subfolders, subfolder, subfolderDisplayLabel) { function buildBreadcrumb(subfolder, label) { const areaLabel = uiT('ui.files.title', 'Files'); - // Use the server-resolved label (short_description or dir name) when available, - // otherwise fall back to the local lookup map then the raw path. - const displayLabel = label || subfolderLabel(subfolder); - return ` -
${uiT('ui.files.filename', 'Filename')}${uiT('ui.files.area', 'Area')}${uiT('ui.common.description', 'Description')}${uiT('ui.files.filename', 'Filename')} ${uiT('ui.files.size', 'Size')}${uiT('ui.files.uploaded', 'Uploaded')}${uiT('ui.files.actions', 'Actions')}${uiT('ui.files.uploaded', 'Uploaded')}${uiT('ui.files.actions', 'Actions')}
+ + ${subfolderName} + —${uploadDate}
${areaLabel}${shortDesc} ${fileSize} ${uploadDate} @@ -680,70 +706,71 @@ function renderFileAreaList(areas) { loadRecentFiles(); } -function selectFileArea(areaId) { +function selectFileArea(areaId, subfolder) { currentAreaId = areaId; - currentSubfolder = null; + currentSubfolder = subfolder !== undefined ? subfolder : null; const area = allFileAreas.find(a => a.id === areaId); - if (!area) return; - - const isLocal = !!area.is_local; - const domain = area.domain || ''; - const uploadPermission = area.upload_permission !== undefined ? area.upload_permission : 1; - - // Display domain for non-local areas; use friendly label for private area - let displayTag; - if (privateFileArea && area.id === privateFileArea.id) { - displayTag = privateFileArea._username - ? `${escapeHtml(privateFileArea._username)}'s private file area` - : uiT('ui.files.my_files', 'My Files'); - } else { - displayTag = escapeHtml(area.tag); - if (!isLocal && domain) { - displayTag += '@' + escapeHtml(domain) + ''; - } - } - $('#currentAreaTitle').html(` ${displayTag}`); - $('#searchFiles').val(''); + if (area) { + const isLocal = !!area.is_local; + const domain = area.domain || ''; + const uploadPermission = area.upload_permission !== undefined ? area.upload_permission : 1; - // Build description + capability icons under the area name - let icons = ''; - if (area.gemini_public) { - icons += ` Gemini`; - } - if (area.freq_enabled) { - icons += ` FREQ`; - } + // Display domain for non-local areas; use friendly label for private area + let displayTag; + if (privateFileArea && area.id === privateFileArea.id) { + displayTag = privateFileArea._username + ? `${escapeHtml(privateFileArea._username)}'s private file area` + : uiT('ui.files.my_files', 'My Files'); + } else { + displayTag = escapeHtml(area.tag); + if (!isLocal && domain) { + displayTag += '@' + escapeHtml(domain) + ''; + } + } - const desc = area.description ? escapeHtml(area.description) : ''; - if (desc || icons) { - $('#currentAreaMeta').html(`${icons}${desc}`).show(); - } else { - $('#currentAreaMeta').hide(); - } + $('#currentAreaTitle').html(` ${displayTag}`); + $('#searchFiles').val(''); - // Control upload button visibility based on upload permission - // 0 = UPLOAD_ADMIN_ONLY, 1 = UPLOAD_USERS_ALLOWED, 2 = UPLOAD_READ_ONLY - const UPLOAD_ADMIN_ONLY = 0; - const UPLOAD_READ_ONLY = 2; + // Build description + capability icons under the area name + let icons = ''; + if (area.gemini_public) { + icons += ` Gemini`; + } + if (area.freq_enabled) { + icons += ` FREQ`; + } - if (uploadPermission === UPLOAD_READ_ONLY) { - $('#uploadFileBtn').hide(); - } else if (uploadPermission === UPLOAD_ADMIN_ONLY) { - if (isAdmin) { - $('#uploadFileBtn').show(); + const desc = area.description ? escapeHtml(area.description) : ''; + if (desc || icons) { + $('#currentAreaMeta').html(`${icons}${desc}`).show(); } else { + $('#currentAreaMeta').hide(); + } + + // Control upload button visibility based on upload permission + // 0 = UPLOAD_ADMIN_ONLY, 1 = UPLOAD_USERS_ALLOWED, 2 = UPLOAD_READ_ONLY + const UPLOAD_ADMIN_ONLY = 0; + const UPLOAD_READ_ONLY = 2; + + if (uploadPermission === UPLOAD_READ_ONLY) { $('#uploadFileBtn').hide(); + } else if (uploadPermission === UPLOAD_ADMIN_ONLY) { + if (isAdmin) { + $('#uploadFileBtn').show(); + } else { + $('#uploadFileBtn').hide(); + } + } else { + $('#uploadFileBtn').show(); } - } else { - $('#uploadFileBtn').show(); - } - // Highlight selected area - $('#fileAreasList .list-group-item').removeClass('active'); - $(`#fileAreasList .list-group-item[data-area-id="${areaId}"]`).addClass('active'); + // Highlight selected area + $('#fileAreasList .list-group-item').removeClass('active'); + $(`#fileAreasList .list-group-item[data-area-id="${areaId}"]`).addClass('active'); + } - loadFiles(areaId); + loadFiles(areaId, currentSubfolder); } function loadFiles(areaId, subfolder) { @@ -761,7 +788,7 @@ function loadFiles(areaId, subfolder) { .done(function(data) { allFiles = data.files; const subfolders = (subfolder === null) ? (data.subfolders || []) : []; - displayFiles(allFiles, subfolders, subfolder); + displayFiles(allFiles, subfolders, subfolder, data.subfolder_label || null); }) .fail(function() { $('#filesContainer').html(`
${uiT('ui.files.load_files_failed', 'Failed to load files')}
`); @@ -787,15 +814,16 @@ function subfolderLabel(name) { return subfolderLabels[name] || name; } -function displayFiles(files, subfolders, subfolder) { - subfolders = subfolders || []; - subfolder = subfolder !== undefined ? subfolder : currentSubfolder; +function displayFiles(files, subfolders, subfolder, subfolderDisplayLabel) { + subfolders = subfolders || []; + subfolder = subfolder !== undefined ? subfolder : currentSubfolder; + subfolderDisplayLabel = subfolderDisplayLabel !== undefined ? subfolderDisplayLabel : null; displayedFiles = files; if (files.length === 0 && subfolders.length === 0) { let emptyHtml = ''; if (subfolder !== null) { - emptyHtml = buildBreadcrumb(subfolder); + emptyHtml = buildBreadcrumb(subfolder, subfolderDisplayLabel); } emptyHtml += `
${uiT('ui.files.no_files_in_area', 'No files in this area')}
`; $('#filesContainer').html(emptyHtml); @@ -806,7 +834,7 @@ function displayFiles(files, subfolders, subfolder) { // Breadcrumb when inside a subfolder if (subfolder !== null) { - html += buildBreadcrumb(subfolder); + html += buildBreadcrumb(subfolder, subfolderDisplayLabel); } html += ` @@ -825,14 +853,37 @@ function displayFiles(files, subfolders, subfolder) { `; // Subfolder rows (only shown at root level) + // Each folder is {subfolder, description, subdir_id} subfolders.forEach(function(folder) { + const sf = folder.subfolder; + const dirName = subfolderLabel(sf); + // Show short_description as the folder label if it's set and differs from the directory name + const shortDesc = folder.description || ''; + const label = escapeHtml(shortDesc && shortDesc !== sf ? shortDesc : dirName); + const desc = escapeHtml(folder.long_description || ''); + const editBtn = isAdmin && folder.subdir_id + ? `` + : ''; + const deleteBtn = isAdmin + ? `` + : ''; html += ` -
+
- ${escapeHtml(subfolderLabel(folder))} + ${label} ${desc}—— + ${editBtn}${deleteBtn}
+ + + + + + + + + + + + `; + + results.forEach(function(file) { + const filename = escapeHtml(file.filename); + const desc = escapeHtml(file.short_description || ''); + const areaTag = escapeHtml(file.area_tag || ''); + const size = formatBytes(file.filesize || 0); + const uploaded = formatDate(file.created_at); + const subfolder = file.subfolder ? escapeHtml(file.subfolder) : null; + const areaOnclick = subfolder + ? `selectFileArea(${file.area_id}, '${subfolder}'); clearFileSearch();` + : `selectFileArea(${file.area_id}, null); clearFileSearch();`; + + html += ` + + + + + + + + + `; + }); + + html += '
${uiT('ui.files.filename', 'Filename')}${uiT('ui.files.area', 'Area')}${uiT('ui.common.description', 'Description')}${uiT('ui.files.size', 'Size')}${uiT('ui.files.uploaded', 'Uploaded')}${uiT('ui.files.actions', 'Actions')}
+ ${filename} + + ${areaTag} + ${desc}${size}${uploaded} + + + + +
'; + $('#filesContainer').html(html); +} {% endblock %} From 520e12e98aa84436fe02eeb437e4ffd251ebcce4 Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 11:05:31 -0700 Subject: [PATCH 097/246] Update UPGRADING_1.8.7 for ISO catalogue formats and file search Co-Authored-By: Claude Sonnet 4.6 --- docs/UPGRADING_1.8.7.md | 59 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 4 deletions(-) diff --git a/docs/UPGRADING_1.8.7.md b/docs/UPGRADING_1.8.7.md index 392b10be..b1d4e788 100644 --- a/docs/UPGRADING_1.8.7.md +++ b/docs/UPGRADING_1.8.7.md @@ -33,10 +33,12 @@ upgrade will appear to pause — this is normal. Do not interrupt it. - [ISO-Backed File Areas](#iso-backed-file-areas) - [Creating an ISO area](#creating-an-iso-area) - [Import preview](#import-preview) + - [Catalogue formats](#catalogue-formats) - [Subfolder navigation](#subfolder-navigation) - [Importing files (CLI)](#importing-files-cli) - [Behaviour](#behaviour) - [Migration](#migration) +- [Global File Search](#global-file-search) - [Netmail Attachment Improvements](#netmail-attachment-improvements) - [BinkP Inbound File Collision Handling](#binkp-inbound-file-collision-handling) - [Bug Fixes](#bug-fixes) @@ -103,12 +105,19 @@ upgrade will appear to pause — this is normal. Do not interrupt it. - **ISO-backed file areas** — a file area can now be backed by a CD/DVD ISO image (or any readable directory). The sysop mounts the ISO using any suitable method and enters the mount point path in the file area properties. - Files are imported from the ISO's directory tree using `FILES.BBS` / - `DESCRIPT.ION` catalogues. ISO areas are read-only; description edits are + Files are imported from the ISO's directory tree using `FILES.BBS`, + `DESCRIPT.ION`, `00INDEX.TXT`, `00_INDEX.TXT` (Simtel block format), or + `INDEX.TXT` catalogues. ISO areas are read-only; description edits are stored in the database. The directory tree is exposed as browsable subfolders with editable labels. A preview modal lets sysops review and customise the import before committing. ZIP files inside the ISO show `FILE_ID.DIZ` in the - preview modal. + preview modal. Partial imports (selecting child directories without their + parent) are supported; ancestor directories are created automatically so + navigation remains intact. +- **Global file search** — a search box in the file browser sidebar searches + filename and description across all accessible file areas. Results include + file size, upload date, a file-info button, and a direct link to the area + containing each result. **Nodelist** @@ -671,6 +680,24 @@ Click **Apply Import** to commit. Import options in the modal header: | **Flat import** | All files imported to the area root, directory structure ignored. | | **Catalogue only** | Only import files listed in `FILES.BBS` / `DESCRIPT.ION`. Unlisted files are skipped. If no catalogue exists in a directory, all files there are imported. | +### Catalogue formats + +The importer recognises the following description files, tried in priority +order. If a higher-priority file is found but yields no entries, the next +format is tried automatically. + +| File | Format | +|---|---| +| `FILES.BBS` | One filename per line followed by two or more spaces and a description. Continuation lines are indented. | +| `DESCRIPT.ION` | `filename "description"` per line (JPSOFT 4DOS / Midnight Commander format). | +| `FILE_LIST.BBS` | Same parser as `FILES.BBS`. | +| `00INDEX.TXT` | Same parser as `FILES.BBS`. | +| `00_INDEX.TXT` | Simtel block format: `Directory:` headers group entries; each `File:` block is followed by an indented multi-line description. | +| `INDEX.TXT` | Same parser as `FILES.BBS`. | + +Comparisons are case-insensitive so `files.bbs`, `FILES.BBS`, and `Files.Bbs` +are all recognised. + ### Subfolder navigation The ISO directory tree is exposed as browsable subfolders in the file browser. @@ -708,9 +735,33 @@ directory. If no catalogue is present, the filename is used as the description. ### Migration -This feature requires a database migration. Run `php scripts/setup.php` as +This feature requires database migrations. Run `php scripts/setup.php` as part of the standard upgrade procedure. +## Global File Search + +A **Search Files** card now appears in the file browser sidebar, between the +File Areas list and the Status panel. Typing two or more characters triggers a +server-side search across filename and short description for all accessible file +areas. + +**Results table columns:** Filename (opens preview), Area (click to navigate +to that area), Description, Size, Uploaded date, Info button, Download button. + +Results are limited to 100 entries ordered by area tag then filename. +Password-protected areas are excluded unless the session has them unlocked. + +### Search indexes + +Migration `v1.11.0.27` enables the `pg_trgm` PostgreSQL extension and creates +GIN trigram indexes on `files.filename` and `files.short_description`. These +indexes make `ILIKE '%term%'` queries fast regardless of how many files are in +the database. + +**On large file databases the index build may take a minute or two.** The +upgrade will appear to pause at this migration step — this is normal. Do not +interrupt it. + ## Netmail Attachment Improvements ### Sender Copy From db3b4a4531a84d966f72901254838577c762a5b5 Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 11:48:28 -0700 Subject: [PATCH 098/246] Remember last-visited page per echo area and netmail inbox Echomail and netmail now persist the last-visited page to the database (users_meta keys web_echomail_positions / web_netmail_page) via a new /api/user/web-mail-state endpoint. The page is restored on next visit, including the All Messages view (__all__ key). Saves fire immediately after each successful loadMessages() to avoid loss on page navigation. Co-Authored-By: Claude Sonnet 4.6 --- docs/UPGRADING_1.8.7.md | 19 +++++++++ public_html/js/echomail.js | 54 +++++++++++++++++++++---- public_html/js/netmail.js | 39 ++++++++++++++---- public_html/sw.js | 2 +- routes/api-routes.php | 82 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 180 insertions(+), 16 deletions(-) diff --git a/docs/UPGRADING_1.8.7.md b/docs/UPGRADING_1.8.7.md index b1d4e788..7c9ba9fa 100644 --- a/docs/UPGRADING_1.8.7.md +++ b/docs/UPGRADING_1.8.7.md @@ -39,6 +39,7 @@ upgrade will appear to pause — this is normal. Do not interrupt it. - [Behaviour](#behaviour) - [Migration](#migration) - [Global File Search](#global-file-search) +- [Page Position Memory](#page-position-memory) - [Netmail Attachment Improvements](#netmail-attachment-improvements) - [BinkP Inbound File Collision Handling](#binkp-inbound-file-collision-handling) - [Bug Fixes](#bug-fixes) @@ -71,6 +72,10 @@ upgrade will appear to pause — this is normal. Do not interrupt it. current page, and last page with ellipsis gaps, so the total page count is always visible. +**Echomail / Netmail** +- Last-visited page is remembered per echo area (including All Messages) and + for the netmail inbox, and restored automatically on return. + **Echomail** - Advanced message search with per-field filtering (poster name, subject, body) and date range support. @@ -762,6 +767,20 @@ the database. upgrade will appear to pause at this migration step — this is normal. Do not interrupt it. +## Page Position Memory + +The echomail and netmail readers now remember the last page you were viewing +and restore it automatically when you return. + +- **Echomail** — the last-visited page is remembered per echo area, including + the **All Messages** view. Navigating to a different echo area and back + restores the correct page for each. +- **Netmail** — the last-visited page of your inbox is remembered. + +Positions are stored per-user in the database (`users_meta` table under the +keys `web_echomail_positions` and `web_netmail_page`) and persist across browser +sessions and devices. No migration is required. + ## Netmail Attachment Improvements ### Sender Copy diff --git a/public_html/js/echomail.js b/public_html/js/echomail.js index 79a0c1a4..4cd0e51f 100644 --- a/public_html/js/echomail.js +++ b/public_html/js/echomail.js @@ -1,5 +1,7 @@ let currentPage = 1; let currentSort = 'date_desc'; +// Per-area page memory, keyed by area tag. Loaded from and saved to DB via web-mail-state API. +let echoPageMemory = {}; let currentMessageId = null; let currentFilter = 'all'; let modalClosedByBackButton = false; @@ -55,6 +57,11 @@ $(document).ready(function() { $('#mobileSearchInput').val(searchQuery); searchMessages(); } else { + // Restore last visited page for the current area + const memKey = currentEchoarea || '__all__'; + if (echoPageMemory[memKey]) { + currentPage = echoPageMemory[memKey]; + } loadMessages(); } }); @@ -284,7 +291,8 @@ function displayMobileEchoareas(echoareas) { function selectEchoarea(tag) { currentEchoarea = tag; - currentPage = 1; + const memKey = tag || '__all__'; + currentPage = echoPageMemory[memKey] ? echoPageMemory[memKey] : 1; // Update URL without page reload const url = tag ? `/echomail/${encodeURIComponent(tag)}` : '/echomail'; @@ -352,6 +360,9 @@ function loadMessages(callback) { displayMessages(data.messages, data.threaded || false); updatePagination(data.pagination); updateUnreadCount(data.unreadCount || 0); + // Remember the current page for this area (null = All Messages, stored as '__all__') + echoPageMemory[currentEchoarea || '__all__'] = currentPage; + saveEchoPositions(); // Refresh stats to get updated filter counts loadStats(); if (typeof callback === 'function') { @@ -2480,8 +2491,8 @@ function saveToAddressBook(fromName, fromAddress, originalFromName, originalFrom // User settings functions - apply echomail-specific settings after loading function loadEchomailSettings() { - if (typeof window.loadUserSettings === 'function') { - return window.loadUserSettings().then(function() { + const settingsPromise = typeof window.loadUserSettings === 'function' + ? window.loadUserSettings().then(function() { // Apply echomail-specific settings userSettings = window.userSettings; @@ -2498,11 +2509,38 @@ function loadEchomailSettings() { if (userSettings.default_sort) { currentSort = userSettings.default_sort; } - }); - } else { - // Fallback if global function not available - return Promise.resolve(); - } + }) + : Promise.resolve(); + + // Load per-area page positions from DB + const positionsPromise = $.get('/api/user/web-mail-state') + .then(function(data) { + if (data && data.settings && data.settings.web_echomail_positions) { + try { + const parsed = typeof data.settings.web_echomail_positions === 'string' + ? JSON.parse(data.settings.web_echomail_positions) + : data.settings.web_echomail_positions; + if (parsed && typeof parsed === 'object') { + echoPageMemory = parsed; + } + } catch (e) {} + } + }) + .catch(function() {}); + + return Promise.all([settingsPromise, positionsPromise]); +} + +/** + * Persist the current echoPageMemory to the DB (fire-and-forget). + */ +function saveEchoPositions() { + $.ajax({ + url: '/api/user/web-mail-state', + method: 'POST', + data: JSON.stringify({ web_echomail_positions: echoPageMemory }), + contentType: 'application/json' + }); } // Use global settings functions directly - no local wrappers needed diff --git a/public_html/js/netmail.js b/public_html/js/netmail.js index d610ada9..eccd390b 100644 --- a/public_html/js/netmail.js +++ b/public_html/js/netmail.js @@ -169,6 +169,8 @@ function loadMessages(callback) { .done(function(data) { displayMessages(data.messages, data.threaded || false); updatePagination(data.pagination); + // Remember the current netmail page + saveNetmailPage(); if (typeof callback === 'function') callback(data); }) .fail(function() { @@ -998,8 +1000,8 @@ function toggleThreading() { // User settings functions - apply netmail-specific settings after loading function loadNetmailSettings() { - if (typeof window.loadUserSettings === 'function') { - return window.loadUserSettings().then(function() { + const settingsPromise = typeof window.loadUserSettings === 'function' + ? window.loadUserSettings().then(function() { // Apply netmail-specific settings userSettings = window.userSettings; @@ -1016,11 +1018,34 @@ function loadNetmailSettings() { if (userSettings.default_sort) { currentSort = userSettings.default_sort; } - }); - } else { - // Fallback if global function not available - return Promise.resolve(); - } + }) + : Promise.resolve(); + + // Load last visited netmail page from DB + const pagePromise = $.get('/api/user/web-mail-state') + .then(function(data) { + if (data && data.settings && data.settings.web_netmail_page) { + const page = parseInt(data.settings.web_netmail_page, 10); + if (page >= 1) { + currentPage = page; + } + } + }) + .catch(function() {}); + + return Promise.all([settingsPromise, pagePromise]); +} + +/** + * Persist the current netmail page to the DB (fire-and-forget). + */ +function saveNetmailPage() { + $.ajax({ + url: '/api/user/web-mail-state', + method: 'POST', + data: JSON.stringify({ web_netmail_page: currentPage }), + contentType: 'application/json' + }); } // Use global settings functions directly - no local wrappers needed diff --git a/public_html/sw.js b/public_html/sw.js index 8330f351..d26755b5 100644 --- a/public_html/sw.js +++ b/public_html/sw.js @@ -1,4 +1,4 @@ -const CACHE_NAME = 'binkcache-v267'; +const CACHE_NAME = 'binkcache-v269'; // Static assets to precache const staticAssets = [ diff --git a/routes/api-routes.php b/routes/api-routes.php index 536efd25..fe7ca1fd 100644 --- a/routes/api-routes.php +++ b/routes/api-routes.php @@ -6076,6 +6076,88 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array echo json_encode(['success' => true]); }); + // Web mail state API endpoints (web-specific page positions, separate from telnet) + SimpleRouter::get('/user/web-mail-state', function() { + $user = RouteHelper::requireAuth(); + header('Content-Type: application/json'); + + $userId = $user['user_id'] ?? $user['id'] ?? null; + $meta = new \BinktermPHP\UserMeta(); + + $settings = [ + 'web_netmail_page' => $meta->getValue((int)$userId, 'web_netmail_page'), + 'web_echomail_positions' => $meta->getValue((int)$userId, 'web_echomail_positions'), + ]; + + echo json_encode(['success' => true, 'settings' => $settings]); + }); + + SimpleRouter::post('/user/web-mail-state', function() { + $user = RouteHelper::requireAuth(); + header('Content-Type: application/json'); + + $userId = $user['user_id'] ?? $user['id'] ?? null; + $body = json_decode(file_get_contents('php://input'), true) ?? []; + $settings = $body['settings'] ?? $body; + $meta = new \BinktermPHP\UserMeta(); + + // web_netmail_page — positive integer + if (array_key_exists('web_netmail_page', $settings)) { + $value = $settings['web_netmail_page']; + if ($value === null || $value === '') { + $meta->setValue((int)$userId, 'web_netmail_page', null); + } elseif (!is_numeric($value) || (int)$value < 1) { + http_response_code(400); + echo json_encode(['success' => false, 'error' => 'Invalid value for web_netmail_page']); + return; + } else { + $meta->setValue((int)$userId, 'web_netmail_page', (string)((int)$value)); + } + } + + // web_echomail_positions — JSON object mapping area tag to {page: N} + if (array_key_exists('web_echomail_positions', $settings)) { + $positions = $settings['web_echomail_positions']; + if (is_string($positions)) { + $decoded = json_decode($positions, true); + if (!is_array($decoded)) { + http_response_code(400); + echo json_encode(['success' => false, 'error' => 'Invalid value for web_echomail_positions']); + return; + } + $positions = $decoded; + } + + if (!is_array($positions)) { + http_response_code(400); + echo json_encode(['success' => false, 'error' => 'Invalid value for web_echomail_positions']); + return; + } + + $clean = []; + foreach ($positions as $area => $page) { + if (!is_string($area) || trim($area) === '' || strlen($area) > 128) { + continue; + } + $pageInt = (int)$page; + if ($pageInt < 1) { + $pageInt = 1; + } + $clean[$area] = $pageInt; + } + + $encoded = json_encode($clean); + if ($encoded === false || strlen($encoded) > 64000) { + http_response_code(400); + echo json_encode(['success' => false, 'error' => 'Invalid value for web_echomail_positions']); + return; + } + $meta->setValue((int)$userId, 'web_echomail_positions', $encoded); + } + + echo json_encode(['success' => true]); + }); + // Admin API endpoints for user management SimpleRouter::get('/admin/pending-users', function() { $user = RouteHelper::requireAuth(); From bf7be35273af01850b3247ae51029e6472ce52cc Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 12:08:14 -0700 Subject: [PATCH 099/246] Fix netmail sort options being ignored MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The /api/messages/netmail route was not reading the sort parameter from the query string, and getNetmail() had no sort parameter — the query always used date_received DESC. Added $sort to getNetmail() and getThreadedNetmail(), built ORDER BY from it using the same match() pattern as echomail, and wired the validated sort value through from the API route. Co-Authored-By: Claude Sonnet 4.6 --- routes/api-routes.php | 4 +++- src/MessageHandler.php | 34 ++++++++++++++++++++++------------ 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/routes/api-routes.php b/routes/api-routes.php index fe7ca1fd..80c76d1b 100644 --- a/routes/api-routes.php +++ b/routes/api-routes.php @@ -3260,7 +3260,9 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array $page = intval($_GET['page'] ?? 1); $filter = $_GET['filter'] ?? 'all'; $threaded = isset($_GET['threaded']) && $_GET['threaded'] === 'true'; - $result = $handler->getNetmail($user['user_id'], $page, null, $filter, $threaded); + $validSorts = ['date_desc', 'date_asc', 'subject', 'author']; + $sort = in_array($_GET['sort'] ?? '', $validSorts, true) ? $_GET['sort'] : 'date_desc'; + $result = $handler->getNetmail($user['user_id'], $page, null, $filter, $threaded, $sort); $result = apiLocalizeErrorPayload($result, $user); echo json_encode($result); }); diff --git a/src/MessageHandler.php b/src/MessageHandler.php index 87b01ec2..52af834c 100644 --- a/src/MessageHandler.php +++ b/src/MessageHandler.php @@ -42,7 +42,7 @@ private function getEchomailDateField(): string return self::ECHOMAIL_DATE_FIELD_DEFAULT; } - public function getNetmail($userId, $page = 1, $limit = null, $filter = 'all', $threaded = false) + public function getNetmail($userId, $page = 1, $limit = null, $filter = 'all', $threaded = false, $sort = 'date_desc') { $user = $this->getUserById($userId); if (!$user) { @@ -57,7 +57,7 @@ public function getNetmail($userId, $page = 1, $limit = null, $filter = 'all', $ // If threaded view is requested, use the threading method if ($threaded) { - return $this->getThreadedNetmail($userId, $page, $limit, $filter); + return $this->getThreadedNetmail($userId, $page, $limit, $filter, $sort); } // Get system's configured FidoNet addresses @@ -119,6 +119,14 @@ public function getNetmail($userId, $page = 1, $limit = null, $filter = 'all', $ $params[] = $user['username']; $params[] = $user['real_name']; + // Build ORDER BY clause based on sort parameter + $orderBy = match($sort) { + 'date_asc' => "n.date_received ASC", + 'subject' => "n.subject ASC", + 'author' => "n.from_name ASC", + default => "CASE WHEN n.date_received > NOW() THEN 0 ELSE 1 END, n.date_received DESC", + }; + $stmt = $this->db->prepare(" SELECT n.id, n.from_name, n.from_address, n.to_name, n.to_address, n.subject, n.date_received, n.user_id, n.date_written, @@ -128,10 +136,7 @@ public function getNetmail($userId, $page = 1, $limit = null, $filter = 'all', $ FROM netmail n LEFT JOIN message_read_status mrs ON (mrs.message_id = n.id AND mrs.message_type = 'netmail' AND mrs.user_id = ?) $whereClause - ORDER BY CASE - WHEN n.date_received > NOW() THEN 0 - ELSE 1 - END, n.date_received DESC + ORDER BY {$orderBy} LIMIT ? OFFSET ? "); @@ -4665,7 +4670,7 @@ private function countRepliesInThread($thread) /** * Get threaded netmail messages using MSGID/REPLY relationships */ - public function getThreadedNetmail($userId, $page = 1, $limit = null, $filter = 'all') + public function getThreadedNetmail($userId, $page = 1, $limit = null, $filter = 'all', $sort = 'date_desc') { $user = $this->getUserById($userId); if (!$user) { @@ -4760,11 +4765,16 @@ public function getThreadedNetmail($userId, $page = 1, $limit = null, $filter = // Build threading relationships $threads = $this->buildMessageThreads($allMessages); - // Sort threads by most recent message in each thread - usort($threads, function($a, $b) { - $aLatest = $this->getLatestMessageInThread($a); - $bLatest = $this->getLatestMessageInThread($b); - return strtotime($bLatest['date_received']) - strtotime($aLatest['date_received']); + // Sort threads according to the requested sort order + usort($threads, function($a, $b) use ($sort) { + $aRoot = $a['message']; + $bRoot = $b['message']; + return match($sort) { + 'date_asc' => $this->getThreadSortTimestamp($a) - $this->getThreadSortTimestamp($b), + 'subject' => strcasecmp($aRoot['subject'] ?? '', $bRoot['subject'] ?? ''), + 'author' => strcasecmp($aRoot['from_name'] ?? '', $bRoot['from_name'] ?? ''), + default => $this->getThreadSortTimestamp($b) - $this->getThreadSortTimestamp($a), + }; }); // Apply pagination to threads From da36815861ff6d225e1873a26c67f7ab5ca983b3 Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 12:13:55 -0700 Subject: [PATCH 100/246] Show arrow beside active sort option in echomail and netmail dropdowns Added data-sort attributes to sort dropdown items and an updateSortIndicator() function in each JS file that prepends a small arrow icon to the currently active sort item. Called on sort change and after user settings are loaded. Co-Authored-By: Claude Sonnet 4.6 --- public_html/js/echomail.js | 12 ++++++++++++ public_html/js/netmail.js | 12 ++++++++++++ public_html/sw.js | 2 +- templates/echomail.twig | 8 ++++---- templates/netmail.twig | 8 ++++---- 5 files changed, 33 insertions(+), 9 deletions(-) diff --git a/public_html/js/echomail.js b/public_html/js/echomail.js index 4cd0e51f..d615a986 100644 --- a/public_html/js/echomail.js +++ b/public_html/js/echomail.js @@ -593,6 +593,7 @@ function changePage(page) { function sortMessages(sortBy) { currentSort = sortBy; currentPage = 1; + updateSortIndicator(); // Save sort preference window.saveUserSetting('default_sort', sortBy); @@ -600,6 +601,16 @@ function sortMessages(sortBy) { loadMessages(); } +function updateSortIndicator() { + $('.sort-option').each(function() { + const $el = $(this); + $el.find('.sort-active-indicator').remove(); + if ($el.data('sort') === currentSort) { + $el.prepend(''); + } + }); +} + function refreshMessages() { loadMessages(); showSuccess(uiT('ui.echomail.messages_refreshed', 'Messages refreshed')); @@ -2509,6 +2520,7 @@ function loadEchomailSettings() { if (userSettings.default_sort) { currentSort = userSettings.default_sort; } + updateSortIndicator(); }) : Promise.resolve(); diff --git a/public_html/js/netmail.js b/public_html/js/netmail.js index eccd390b..4361e74d 100644 --- a/public_html/js/netmail.js +++ b/public_html/js/netmail.js @@ -973,6 +973,7 @@ function markMessageAsRead(messageId) { function sortMessages(sortBy) { currentSort = sortBy; currentPage = 1; + updateSortIndicator(); // Save sort preference window.saveUserSetting('default_sort', sortBy); @@ -980,6 +981,16 @@ function sortMessages(sortBy) { loadMessages(); } +function updateSortIndicator() { + $('.sort-option').each(function() { + const $el = $(this); + $el.find('.sort-active-indicator').remove(); + if ($el.data('sort') === currentSort) { + $el.prepend(''); + } + }); +} + function toggleThreading() { threadedView = !threadedView; currentPage = 1; // Reset to first page when toggling @@ -1018,6 +1029,7 @@ function loadNetmailSettings() { if (userSettings.default_sort) { currentSort = userSettings.default_sort; } + updateSortIndicator(); }) : Promise.resolve(); diff --git a/public_html/sw.js b/public_html/sw.js index d26755b5..2ddfd7d3 100644 --- a/public_html/sw.js +++ b/public_html/sw.js @@ -1,4 +1,4 @@ -const CACHE_NAME = 'binkcache-v269'; +const CACHE_NAME = 'binkcache-v270'; // Static assets to precache const staticAssets = [ diff --git a/templates/echomail.twig b/templates/echomail.twig index 0487e014..83787e2d 100644 --- a/templates/echomail.twig +++ b/templates/echomail.twig @@ -119,10 +119,10 @@
From 6d967380f3d8669459bb34f977df82773cedd3d8 Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 14:16:14 -0700 Subject: [PATCH 103/246] Fix ZIP file preview not showing FILE_ID.DIZ content The frontend getFileType() returned 'download' for .zip files so the preview endpoint was never called. Add a ZIP-specific branch that calls the preview endpoint and renders the FILE_ID.DIZ content in retro mono style, falling back to the download prompt when no .diz is present. Co-Authored-By: Claude Sonnet 4.6 --- public_html/sw.js | 2 +- templates/files.twig | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/public_html/sw.js b/public_html/sw.js index 74910e49..3f2c3c5d 100644 --- a/public_html/sw.js +++ b/public_html/sw.js @@ -1,4 +1,4 @@ -const CACHE_NAME = 'binkcache-v271'; +const CACHE_NAME = 'binkcache-v272'; // Static assets to precache const staticAssets = [ diff --git a/templates/files.twig b/templates/files.twig index eca489b3..0c5a8492 100644 --- a/templates/files.twig +++ b/templates/files.twig @@ -1210,6 +1210,36 @@ function renderPreviewContent(fileId, filename) { body.html(`
${uiT('ui.files.preview_failed', 'Failed to load preview')}
`); }); + } else if (filename.toLowerCase().endsWith('.zip')) { + // ZIP files: try to show FILE_ID.DIZ from the preview endpoint + const retroStyle = 'background:#0a0a0a;color:#c8c8c8;font-family:"Courier New",Courier,monospace;'; + body.css('background', '').html( + `
` + ); + fetch(previewUrl, {credentials: 'same-origin'}) + .then(function(r) { + if (!r.ok) throw new Error('HTTP ' + r.status); + const ct = r.headers.get('Content-Type') || ''; + if (!ct.includes('text/')) throw new Error('no-diz'); + return r.text(); + }) + .then(function(text) { + body.html(`
${escapeHtml(text)}
`); + }) + .catch(function(err) { + // No FILE_ID.DIZ or error — fall back to download prompt + body.css('background', '').html(` +
+ +

${escapeHtml(filename)}

+

${uiT('ui.files.no_preview', 'No preview available for this file type')}

+ + ${uiT('ui.files.download', 'Download')} + +
+ `); + }); + } else { // Unknown type — show download prompt body.css('background', '').html(` From 7365bc203aab87f9581bb7263ba73be33d462fe7 Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 14:17:00 -0700 Subject: [PATCH 104/246] Add download button to ZIP FILE_ID.DIZ preview Co-Authored-By: Claude Sonnet 4.6 --- templates/files.twig | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/templates/files.twig b/templates/files.twig index 0c5a8492..68f865c9 100644 --- a/templates/files.twig +++ b/templates/files.twig @@ -1224,7 +1224,14 @@ function renderPreviewContent(fileId, filename) { return r.text(); }) .then(function(text) { - body.html(`
${escapeHtml(text)}
`); + body.html(` + 
${escapeHtml(text)}
+
+ + ${uiT('ui.files.download', 'Download')} + +
+ `); }) .catch(function(err) { // No FILE_ID.DIZ or error — fall back to download prompt From 9c0fb43384478a6a362f26dc88531cfa5ca734c4 Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 14:22:31 -0700 Subject: [PATCH 105/246] Add post_file.php CLI script to upload files to a file area Accepts a file path, area tag, and description. Runs the standard FileAreaManager::uploadFileFromPath() path including validation and deduplication, then triggers TicFileGenerator::createTicFilesForUplinks() for outbound distribution. TIC generation is automatically skipped for local/private areas and areas with no configured uplinks. Co-Authored-By: Claude Sonnet 4.6 --- scripts/post_file.php | 171 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) create mode 100755 scripts/post_file.php diff --git a/scripts/post_file.php b/scripts/post_file.php new file mode 100755 index 00000000..f3dfd918 --- /dev/null +++ b/scripts/post_file.php @@ -0,0 +1,171 @@ +#!/usr/bin/env php + [--domain=DOMAIN] [--long-desc=TEXT] [--user=USERNAME] + * + * Arguments: + * file Path to the file to upload + * area-tag Tag of the destination file area (e.g. NEWFILES) + * description Short description (displayed in file listings) + * + * Options: + * --domain= Domain of the file area (default: fidonet) + * --long-desc= Long description (multi-line text appended to listing) + * --user= Username to record as uploader (default: sysop) + */ + +require_once __DIR__ . '/../vendor/autoload.php'; +require_once __DIR__ . '/../src/functions.php'; + +use BinktermPHP\Database; +use BinktermPHP\FileAreaManager; +use BinktermPHP\TicFileGenerator; + +// --------------------------------------------------------------------------- +// Argument parsing +// --------------------------------------------------------------------------- + +/** + * Print usage and exit. + */ +function printUsage(): void +{ + echo "Usage: php post_file.php [--domain=DOMAIN] [--long-desc=TEXT] [--user=USERNAME]\n"; + echo "\n"; + echo "Arguments:\n"; + echo " file Path to the file to upload\n"; + echo " area-tag Tag of the destination file area (e.g. NEWFILES)\n"; + echo " description Short description\n"; + echo "\n"; + echo "Options:\n"; + echo " --domain= Domain of the file area (default: fidonet)\n"; + echo " --long-desc= Long description\n"; + echo " --user= Username to record as uploader (default: sysop)\n"; +} + +/** + * Parse argv into a structured args array. + * + * @param array $argv + * @return array + */ +function parseArgs(array $argv): array +{ + $args = [ + 'file' => null, + 'area_tag' => null, + 'description' => null, + 'domain' => 'fidonet', + 'long_desc' => '', + 'user' => 'sysop', + ]; + + $positional = []; + + foreach (array_slice($argv, 1) as $arg) { + if (str_starts_with($arg, '--domain=')) { + $args['domain'] = substr($arg, strlen('--domain=')); + } elseif (str_starts_with($arg, '--long-desc=')) { + $args['long_desc'] = substr($arg, strlen('--long-desc=')); + } elseif (str_starts_with($arg, '--user=')) { + $args['user'] = substr($arg, strlen('--user=')); + } elseif (!str_starts_with($arg, '--')) { + $positional[] = $arg; + } + } + + $args['file'] = $positional[0] ?? null; + $args['area_tag'] = isset($positional[1]) ? strtoupper($positional[1]) : null; + $args['description'] = $positional[2] ?? null; + + return $args; +} + +// --------------------------------------------------------------------------- +// Main +// --------------------------------------------------------------------------- + +$args = parseArgs($argv); + +if (!$args['file'] || !$args['area_tag'] || !$args['description']) { + printUsage(); + exit(1); +} + +$filePath = realpath($args['file']); +if ($filePath === false || !is_file($filePath)) { + echo "Error: File not found: {$args['file']}\n"; + exit(1); +} + +$db = Database::getInstance()->getPdo(); +$manager = new FileAreaManager(); + +// Look up the file area +$fileArea = $manager->getFileAreaByTag($args['area_tag'], $args['domain']); +if (!$fileArea) { + echo "Error: File area '{$args['area_tag']}' not found for domain '{$args['domain']}'\n"; + exit(1); +} + +if (!$fileArea['is_active']) { + echo "Error: File area '{$args['area_tag']}' is inactive\n"; + exit(1); +} + +// Copy the source to a temp path so uploadFileFromPath can move it safely +// (the method moves — not copies — the source into area storage) +$tmpPath = sys_get_temp_dir() . '/' . basename($filePath); +if (!copy($filePath, $tmpPath)) { + echo "Error: Failed to copy file to temp location\n"; + exit(1); +} + +try { + $fileId = $manager->uploadFileFromPath( + (int)$fileArea['id'], + $tmpPath, + $args['description'], + $args['long_desc'], + $args['user'] + ); + + echo "File added: ID {$fileId}, area {$args['area_tag']}\n"; + + // Trigger TIC distribution — createTicFilesForUplinks skips automatically + // for local, private, and areas with no configured uplinks. + if (empty($fileArea['is_local']) && empty($fileArea['is_private'])) { + $fileRecord = $manager->getFileById($fileId); + if ($fileRecord) { + $ticGenerator = new TicFileGenerator(); + $createdTics = $ticGenerator->createTicFilesForUplinks($fileRecord, $fileArea); + + if (count($createdTics) > 0) { + echo "TIC distribution: " . count($createdTics) . " TIC file(s) queued for outbound\n"; + foreach ($createdTics as $ticPath) { + echo " " . basename($ticPath) . "\n"; + } + } else { + echo "TIC distribution: skipped (no uplinks configured for domain '{$fileArea['domain']}')\n"; + } + } + } else { + echo "TIC distribution: skipped (area is local or private)\n"; + } + + exit(0); +} catch (\Throwable $e) { + // Clean up temp file if move never happened + if (file_exists($tmpPath)) { + @unlink($tmpPath); + } + echo "Error: " . $e->getMessage() . "\n"; + exit(1); +} From 29d63127231355df3005c6dc3dbd4d79ead357f0 Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 14:25:44 -0700 Subject: [PATCH 106/246] Document post_file.php in CLI.md Co-Authored-By: Claude Sonnet 4.6 --- docs/CLI.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/docs/CLI.md b/docs/CLI.md index dfdc3ddb..e8332743 100644 --- a/docs/CLI.md +++ b/docs/CLI.md @@ -27,6 +27,7 @@ BinktermPHP includes a full suite of CLI tools for managing your system from the - [Generate Ad](#generate-ad) - [Log Rotate](#log-rotate) - [Post Ad](#post-ad) +- [Post File to File Area](#post-file-to-file-area) - [Restart Daemons](#restart-daemons) - [Who](#who) @@ -687,6 +688,42 @@ php scripts/post_ad.php --echoarea=BBS_ADS --domain=fidonet php scripts/post_ad.php --echoarea=BBS_ADS --domain=fidonet --ad=claudes1.ans --subject="BBS Advertisement" ``` +## Post File to File Area + +Posts a file into a file area from the command line, following the same path as a web upload: validation, deduplication, storage, and TIC distribution to configured uplinks. TIC generation is skipped automatically for local areas, private areas, and areas with no uplinks configured for their domain. + +```bash +# Basic upload +php scripts/post_file.php /path/to/file.zip NEWFILES "Cool new utility" + +# Specify domain (default: fidonet) +php scripts/post_file.php /path/to/NODELIST.Z30 NODELIST "Weekly nodelist" --domain=fidonet + +# With long description and custom uploader name +php scripts/post_file.php /tmp/tool.zip UTILS "Useful tool" \ + --long-desc="A multi-line description of what this tool does." \ + --user=sysop +``` + +Arguments: +- `file` — Path to the file to upload +- `area-tag` — Tag of the destination file area (e.g. `NEWFILES`) +- `description` — Short description shown in file listings + +Options: +- `--domain=` — Domain of the file area (default: `fidonet`) +- `--long-desc=` — Long description appended to the listing +- `--user=` — Username recorded as the uploader (default: `sysop`) + +Output indicates how many TIC files were queued for outbound, or why distribution was skipped: + +``` +File added: ID 42, area NEWFILES +TIC distribution: 2 TIC file(s) queued for outbound + a3f1c2b0.tic + d4e9f7a1.tic +``` + ## Restart Daemons Stops and restarts BinktermPHP daemons (admin daemon, scheduler, BinkP server, telnet, SSH, MRC, DOS bridge, Gemini). Uses PID files in `data/run/` to manage processes. From c5acad1fb60ed24dab1d44a9bed3d0b262cf2df2 Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 14:45:21 -0700 Subject: [PATCH 107/246] Allow getFileAreaByTag and post_file.php to work without a domain Empty domain performs a tag-only lookup, suitable for local file areas with no network domain. post_file.php no longer defaults to 'fidonet' when --domain is omitted, and getFileAreaByTag() default changed to empty string accordingly. Co-Authored-By: Claude Sonnet 4.6 --- docs/CLI.md | 4 ++-- scripts/post_file.php | 6 +++--- src/FileAreaManager.php | 11 ++++++++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/docs/CLI.md b/docs/CLI.md index e8332743..51d66a3b 100644 --- a/docs/CLI.md +++ b/docs/CLI.md @@ -696,7 +696,7 @@ Posts a file into a file area from the command line, following the same path as # Basic upload php scripts/post_file.php /path/to/file.zip NEWFILES "Cool new utility" -# Specify domain (default: fidonet) +# Specify domain for a networked area php scripts/post_file.php /path/to/NODELIST.Z30 NODELIST "Weekly nodelist" --domain=fidonet # With long description and custom uploader name @@ -711,7 +711,7 @@ Arguments: - `description` — Short description shown in file listings Options: -- `--domain=` — Domain of the file area (default: `fidonet`) +- `--domain=` — Domain of the file area. When omitted, the area is looked up by tag only (use this for local areas). - `--long-desc=` — Long description appended to the listing - `--user=` — Username recorded as the uploader (default: `sysop`) diff --git a/scripts/post_file.php b/scripts/post_file.php index f3dfd918..85de766c 100755 --- a/scripts/post_file.php +++ b/scripts/post_file.php @@ -16,7 +16,7 @@ * description Short description (displayed in file listings) * * Options: - * --domain= Domain of the file area (default: fidonet) + * --domain= Domain of the file area. When omitted, lookup is by tag only. * --long-desc= Long description (multi-line text appended to listing) * --user= Username to record as uploader (default: sysop) */ @@ -45,7 +45,7 @@ function printUsage(): void echo " description Short description\n"; echo "\n"; echo "Options:\n"; - echo " --domain= Domain of the file area (default: fidonet)\n"; + echo " --domain= Domain of the file area (omit for local areas)\n"; echo " --long-desc= Long description\n"; echo " --user= Username to record as uploader (default: sysop)\n"; } @@ -62,7 +62,7 @@ function parseArgs(array $argv): array 'file' => null, 'area_tag' => null, 'description' => null, - 'domain' => 'fidonet', + 'domain' => '', 'long_desc' => '', 'user' => 'sysop', ]; diff --git a/src/FileAreaManager.php b/src/FileAreaManager.php index a9558049..c1c90616 100644 --- a/src/FileAreaManager.php +++ b/src/FileAreaManager.php @@ -164,10 +164,15 @@ public function canAccessFileArea(int $areaId, ?int $userId, bool $isAdmin = fal * @param string $domain Domain (default: 'fidonet') * @return array|null File area record or null if not found */ - public function getFileAreaByTag(string $tag, string $domain = 'fidonet'): ?array + public function getFileAreaByTag(string $tag, string $domain = ''): ?array { - $stmt = $this->db->prepare("SELECT * FROM file_areas WHERE tag = ? AND domain = ?"); - $stmt->execute([$tag, $domain]); + if ($domain === '') { + $stmt = $this->db->prepare("SELECT * FROM file_areas WHERE tag = ? LIMIT 1"); + $stmt->execute([$tag]); + } else { + $stmt = $this->db->prepare("SELECT * FROM file_areas WHERE tag = ? AND domain = ?"); + $stmt->execute([$tag, $domain]); + } $result = $stmt->fetch(); return $result ?: null; } From 7e0804a8bffdef536c4682fac1879e49fc0d4b55 Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 14:57:52 -0700 Subject: [PATCH 108/246] Fix FILE_ID.DIZ lookup to find root-level entry and respect existing UTF-8 encoding - Search for FILE_ID.DIZ only at the archive root; if no files exist at the true root (single top-level directory archives like GitHub zipballs), look one level deep inside that directory instead of searching the whole archive - Skip CP437->UTF-8 conversion when content is already valid UTF-8 to prevent double-encoding of box-drawing characters Co-Authored-By: Claude Sonnet 4.6 --- routes/api-routes.php | 57 +++++++++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/routes/api-routes.php b/routes/api-routes.php index 80c76d1b..d246e761 100644 --- a/routes/api-routes.php +++ b/routes/api-routes.php @@ -2607,27 +2607,54 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array if ($ext === 'zip') { $zip = new ZipArchive(); if ($zip->open($storagePath) === true) { + // Determine search prefix: if no files exist at the true root + // (e.g. GitHub-style archives with a single top-level directory), + // look one level deep inside that directory instead. + $hasRootFiles = false; + $topDirs = []; for ($i = 0; $i < $zip->numFiles; $i++) { - $entryName = $zip->getNameIndex($i); - if (strtolower(basename($entryName)) === 'file_id.diz') { + $n = $zip->getNameIndex($i); + if (str_ends_with($n, '/')) { + continue; // directory entry + } + $parts = explode('/', $n); + if (count($parts) === 1) { + $hasRootFiles = true; + break; + } + $topDirs[$parts[0]] = true; + } + + $prefix = ''; + if (!$hasRootFiles && count($topDirs) === 1) { + $prefix = array_key_first($topDirs) . '/'; + } + + $dizContent = null; + for ($i = 0; $i < $zip->numFiles; $i++) { + $entryName = $zip->getNameIndex($i); + $entryLower = strtolower($entryName); + if ($entryLower === strtolower($prefix) . 'file_id.diz') { $dizContent = $zip->getFromIndex($i); - $zip->close(); - if ($dizContent !== false) { - $converted = @iconv('CP437', 'UTF-8//IGNORE', $dizContent); - if ($converted !== false && strlen($converted) > 0) { - $dizContent = $converted; - } - header('Content-Type: text/plain; charset=utf-8'); - header('Content-Disposition: inline; filename="FILE_ID.DIZ"'); - header('X-Content-Type-Options: nosniff'); - header('Cache-Control: private, max-age=3600'); - echo $dizContent; - exit; - } break; } } $zip->close(); + + if ($dizContent !== false && $dizContent !== null) { + if (!mb_check_encoding($dizContent, 'UTF-8')) { + $converted = @iconv('CP437', 'UTF-8//IGNORE', $dizContent); + if ($converted !== false && strlen($converted) > 0) { + $dizContent = $converted; + } + } + header('Content-Type: text/plain; charset=utf-8'); + header('Content-Disposition: inline; filename="FILE_ID.DIZ"'); + header('X-Content-Type-Options: nosniff'); + header('Cache-Control: private, max-age=3600'); + echo $dizContent; + exit; + } } // Fall through to octet-stream download if no FILE_ID.DIZ found } From 2c15eb3055241370a0c2a174cf91b3887e090de5 Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 15:29:23 -0700 Subject: [PATCH 109/246] Add access control roles and permission flags proposal Co-Authored-By: Claude Sonnet 4.6 --- docs/proposals/AccessControl_Proposal.md | 432 +++++++++++++++++++++++ 1 file changed, 432 insertions(+) create mode 100644 docs/proposals/AccessControl_Proposal.md diff --git a/docs/proposals/AccessControl_Proposal.md b/docs/proposals/AccessControl_Proposal.md new file mode 100644 index 00000000..2ea25e6b --- /dev/null +++ b/docs/proposals/AccessControl_Proposal.md @@ -0,0 +1,432 @@ +# Access Control: Roles and Permission Flags + +> **Draft Notice**: This proposal is a draft generated by AI and may not have been reviewed for accuracy. It is intended as a starting point for discussion and implementation planning. + +## Table of Contents + +1. [Overview](#overview) +2. [Current State](#current-state) +3. [Goals](#goals) +4. [Design](#design) + - [Permission Flags](#permission-flags) + - [Roles](#roles) + - [Role Settings (Non-boolean Values)](#role-settings-non-boolean-values) + - [User-Role Assignment](#user-role-assignment) +5. [Database Schema](#database-schema) +6. [Built-in Roles](#built-in-roles) +7. [Example Custom Roles](#example-custom-roles) +8. [Code Changes](#code-changes) + - [New AccessControl Class](#new-accesscontrol-class) + - [Auth Integration](#auth-integration) + - [Route Guard Updates](#route-guard-updates) + - [Admin Interface](#admin-interface) +9. [Backward Compatibility](#backward-compatibility) +10. [Migration Plan](#migration-plan) +11. [Future Extensions](#future-extensions) + +--- + +## Overview + +BinktermPHP currently has a binary privilege model: a user is either a regular user or a sysop (`is_admin = TRUE`). This proposal introduces a roles-and-flags permission system that allows the sysop to define custom roles with fine-grained capabilities. A role is a named collection of permission flags and optional settings. Users can be assigned one or more roles, and their effective permissions are the union of all flags from all their assigned roles. + +--- + +## Current State + +- The `users` table has a single `is_admin` boolean column. +- All admin panel access and privileged API operations check `$user['is_admin']` directly. +- There is no middle ground between an ordinary user and a full sysop. +- Per-user capability restrictions (time limits, premium features) are not currently implemented. + +--- + +## Goals + +- Allow the sysop to define custom roles with specific permission flags. +- Support built-in system roles (`user`, `sysop`) that cannot be deleted. +- Allow users to have multiple roles simultaneously (additive permissions). +- Support both boolean permission flags and scalar settings (e.g., time limit in minutes). +- Make it possible to implement common delegation scenarios: + - **File Admin**: can manage uploaded files, but not define or delete file areas. + - **Co-Sysop**: can manage file areas, echo areas, and users, but not doors or system config. + - **Premium User**: access to premium taglines, time limit exemption, and possible credit perks. +- Preserve backward compatibility with existing `is_admin` checks during a transition period. + +--- + +## Design + +### Permission Flags + +Permission flags are string keys organized into namespaces. A role can have any combination of these flags. The presence of a flag in a role grants that capability; absence denies it. + +#### Admin Flags (`admin.*`) + +| Flag | Description | +|------|-------------| +| `admin.access` | May enter the admin panel at all | +| `admin.manage_files` | Upload, delete, rename, and edit file descriptions | +| `admin.manage_file_areas` | Create, edit, and delete file areas; set area permissions | +| `admin.manage_echo_areas` | Create, edit, and delete echo areas | +| `admin.manage_users` | View, create, edit, and deactivate user accounts | +| `admin.manage_doors` | Enable/disable WebDoors, edit door settings | +| `admin.manage_uplinks` | Add, edit, and remove uplink nodes and network configs | +| `admin.manage_nodelist` | Import and manage nodelists | +| `admin.view_logs` | View packet logs, error logs, and admin action logs | +| `admin.manage_system` | Edit system-wide settings (binkp config, BBS config, API keys) | + +#### User Privilege Flags (`user.*`) + +| Flag | Description | +|------|-------------| +| `user.premium_taglines` | Access to the premium/extended tagline pool | +| `user.time_limit_exempt` | Not subject to session time limits | +| `user.sysop_areas` | May read and post in sysop-only echo areas and access restricted file areas | +| `user.no_post_throttle` | Not subject to per-hour post rate limits | +| `user.no_credit_cost` | Bypass credit costs for actions that would normally deduct credits | + +### Roles + +A role is a named set of permission flags plus optional scalar settings. Roles are stored in the database and managed via the admin interface. + +- **System roles** (`is_system = TRUE`) cannot be deleted or renamed. The only system role is `user`. +- **Custom roles** are created by the sysop and can be freely modified. +- A user's effective permissions are the **union** of all flags across all their assigned roles. +- **`is_admin` is the authoritative superuser flag.** A user with `is_admin = TRUE` bypasses all permission checks entirely, regardless of their assigned roles. This is intentional — it provides a reliable "break glass" mechanism if roles are misconfigured. The `AccessControl` class reads `is_admin` directly from the user record and short-circuits on it; routes never inspect `is_admin` themselves. + +### Role Settings (Non-boolean Values) + +Some access controls are not boolean. These are stored in a `role_settings` table as key-value pairs on a role. + +| Setting Key | Type | Description | +|-------------|------|-------------| +| `time_limit_minutes` | integer | Maximum session time in minutes per day; `0` = unlimited | +| `max_downloads_per_day` | integer | Download cap per day; `0` = unlimited | +| `credit_multiplier` | float | Multiplier applied to credit rewards (e.g., `1.5` for 50% bonus) | + +When a user has multiple roles, the **most permissive** value applies (highest `time_limit_minutes`, etc.). A value of `0` is treated as unlimited and overrides everything. + +### User-Role Assignment + +A user may be assigned any number of roles. Assignments can optionally carry an expiration date (e.g., a temporary premium subscription). Assignments record who granted them and when, creating an audit trail. + +--- + +## Database Schema + +Migration file: `database/migrations/vX.Y.Z_access_control_roles.sql` + +```sql +-- Roles table +CREATE TABLE IF NOT EXISTS roles ( + id SERIAL PRIMARY KEY, + name VARCHAR(64) NOT NULL, + description TEXT, + is_system BOOLEAN NOT NULL DEFAULT FALSE, + created_at TIMESTAMP NOT NULL DEFAULT NOW(), + UNIQUE(name) +); + +-- Per-role boolean permission flags +CREATE TABLE IF NOT EXISTS role_permissions ( + role_id INTEGER NOT NULL REFERENCES roles(id) ON DELETE CASCADE, + permission VARCHAR(64) NOT NULL, + PRIMARY KEY (role_id, permission) +); + +-- Per-role scalar settings (time limits, multipliers, etc.) +CREATE TABLE IF NOT EXISTS role_settings ( + role_id INTEGER NOT NULL REFERENCES roles(id) ON DELETE CASCADE, + setting_key VARCHAR(64) NOT NULL, + value TEXT NOT NULL, + PRIMARY KEY (role_id, setting_key) +); + +-- Assignments of roles to users +CREATE TABLE IF NOT EXISTS user_role_assignments ( + id SERIAL PRIMARY KEY, + user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE, + role_id INTEGER NOT NULL REFERENCES roles(id) ON DELETE CASCADE, + granted_by INTEGER REFERENCES users(id) ON DELETE SET NULL, + granted_at TIMESTAMP NOT NULL DEFAULT NOW(), + expires_at TIMESTAMP, + UNIQUE(user_id, role_id) +); + +CREATE INDEX IF NOT EXISTS idx_user_role_assignments_user ON user_role_assignments(user_id); +CREATE INDEX IF NOT EXISTS idx_user_role_assignments_expires ON user_role_assignments(expires_at) + WHERE expires_at IS NOT NULL; + +-- Seed built-in system role +INSERT INTO roles (name, description, is_system) VALUES + ('user', 'Default role assigned to all registered users', TRUE) +ON CONFLICT (name) DO NOTHING; + +-- Assign the user role to all existing users +INSERT INTO user_role_assignments (user_id, role_id, granted_by, granted_at) +SELECT u.id, r.id, NULL, NOW() +FROM users u +CROSS JOIN roles r +WHERE r.name = 'user' +ON CONFLICT DO NOTHING; +``` + +--- + +## Built-in Roles + +| Role | System | Flags | Notes | +|------|--------|-------|-------| +| `user` | Yes | _(none by default)_ | Assigned to every registered user automatically on creation | + +Superuser access is not a role. It is conferred by `is_admin = TRUE` on the user record and is handled transparently by `AccessControl`. Custom roles named "sysop" or similar can be created for organizational clarity, but they carry no special treatment in code. + +--- + +## Example Custom Roles + +These are examples the sysop could create via the admin interface. They are not seeded automatically. + +### File Admin + +| Flag | Granted | +|------|---------| +| `admin.access` | ✓ | +| `admin.manage_files` | ✓ | +| `admin.manage_file_areas` | ✗ | +| All others | ✗ | + +### Co-Sysop + +| Flag | Granted | +|------|---------| +| `admin.access` | ✓ | +| `admin.manage_files` | ✓ | +| `admin.manage_file_areas` | ✓ | +| `admin.manage_echo_areas` | ✓ | +| `admin.manage_users` | ✓ | +| `admin.view_logs` | ✓ | +| `admin.manage_doors` | ✗ | +| `admin.manage_uplinks` | ✗ | +| `admin.manage_system` | ✗ | + +### Premium User + +| Flag / Setting | Value | +|----------------|-------| +| `user.premium_taglines` | ✓ | +| `user.time_limit_exempt` | ✓ | +| `credit_multiplier` | `1.5` | + +--- + +## Code Changes + +### New AccessControl Class + +A new `src/AccessControl.php` class centralizes all permission queries. It is instantiated with a user ID (or the user array from `Auth`) and caches the resolved permission set. + +```php +namespace BinktermPHP; + +class AccessControl +{ + private array $permissions = []; + private array $settings = []; + private bool $isSysop = false; + + public function __construct(private int $userId) { + $this->load(); + } + + /** + * Create from the user array returned by Auth::getCurrentUser(). + * Reads is_admin directly so the superuser bypass is always authoritative. + */ + public static function forUser(array $user): self { + $instance = new self((int)($user['user_id'] ?? $user['id'])); + // is_admin short-circuits all permission checks — no role lookup needed + if (!empty($user['is_admin'])) { + $instance->isSysop = true; + } + return $instance; + } + + /** + * Check whether the user has a specific permission flag. + */ + public function can(string $permission): bool { + return $this->isSysop || in_array($permission, $this->permissions, true); + } + + /** + * Require a permission or abort with 403. + */ + public function require(string $permission): void { + if (!$this->can($permission)) { + http_response_code(403); + header('Content-Type: application/json'); + echo json_encode(['success' => false, 'error' => 'Forbidden']); + exit; + } + } + + /** + * Return the effective scalar setting value across all roles. + * Returns the most permissive (highest) value, with 0 = unlimited. + */ + public function getSetting(string $key, mixed $default = null): mixed { + return $this->settings[$key] ?? $default; + } + + private function load(): void { + $db = Database::getInstance()->getPdo(); + + // Collect flags and settings from all active role assignments. + // is_admin superuser bypass is handled in forUser() before load() runs. + $stmt = $db->prepare(" + SELECT rp.permission, rs.setting_key, rs.value + FROM user_role_assignments ura + JOIN roles r ON ura.role_id = r.id + LEFT JOIN role_permissions rp ON rp.role_id = r.id + LEFT JOIN role_settings rs ON rs.role_id = r.id + WHERE ura.user_id = ? + AND (ura.expires_at IS NULL OR ura.expires_at > NOW()) + "); + $stmt->execute([$this->userId]); + $rows = $stmt->fetchAll(\PDO::FETCH_ASSOC); + + foreach ($rows as $row) { + if ($row['permission'] !== null) { + $this->permissions[] = $row['permission']; + } + if ($row['setting_key'] !== null) { + $this->mergeSetting($row['setting_key'], $row['value']); + } + } + + $this->permissions = array_unique($this->permissions); + } + + private function mergeSetting(string $key, string $raw): void { + $value = is_numeric($raw) ? ($raw + 0) : $raw; + + // 0 = unlimited — overrides everything + if (!isset($this->settings[$key])) { + $this->settings[$key] = $value; + return; + } + + $existing = $this->settings[$key]; + if ($existing === 0 || $value === 0) { + $this->settings[$key] = 0; + } else { + // Most permissive: highest numeric value wins + $this->settings[$key] = max($existing, $value); + } + } +} +``` + +### Auth Integration + +`Auth::validateSession()` already returns `is_admin`. No changes are required to `Auth.php`. Callers that need fine-grained checks instantiate `AccessControl::forUser($user)`, passing the full user array. `AccessControl` reads `is_admin` from that array and sets the internal `$isSysop` flag before doing any role lookups — so a superuser never needs a role assignment to pass any permission check. + +For convenience, a helper method `Auth::requirePermission(string $permission)` can be added that calls `requireAuth()` and then checks the permission in one step. + +### Route Guard Updates + +Existing guards like `if (!$user['is_admin']) { ... }` in routes are replaced progressively: + +```php +// Before +if (!$user['is_admin']) { + return apiError('errors.auth.forbidden', 'Forbidden', 403); +} + +// After +$acl = AccessControl::forUser($user); +$acl->require('admin.manage_file_areas'); +``` + +Admin panel page guards in `web-routes.php` check `admin.access` rather than `is_admin`: + +```php +$acl = AccessControl::forUser($user); +if (!$acl->can('admin.access')) { + return redirect('/'); +} +``` + +### Admin Interface + +A new admin section **Roles & Permissions** is added at `/admin/roles` with the following pages: + +#### Role List (`/admin/roles`) +- Table of all roles with name, description, user count, system/custom badge. +- Buttons: Create Role, Edit, Delete (disabled for system roles). + +#### Role Editor (`/admin/roles/edit/{id}`) +- Name and description fields (disabled for system roles). +- Checkbox grid for all known permission flags, grouped by namespace (`admin.*`, `user.*`). +- Settings fields for scalar values (time limit, download cap, credit multiplier). +- Save and Cancel buttons. + +#### User Role Management (on existing User Edit page) +- Multi-select (or add/remove) list of roles assigned to a user. +- Each assignment shows granted date, expiration (if any), and who granted it. +- Sysop can set an expiration date when assigning (for temporary roles like premium subscriptions). + +--- + +## Backward Compatibility + +1. **`is_admin` is permanent, not transitional.** It is the authoritative superuser flag and will not be removed. It replaces the need for a `sysop` role in code. +2. **Migration seeds the `user` role** for all existing users. No other seeding is needed for existing admins — their `is_admin` flag already grants unrestricted access through `AccessControl`. +3. **Gradual route migration**: Routes can be migrated one at a time. Unmigrated routes continue to check `is_admin` directly. Migrated routes use `AccessControl::forUser($user)->can(...)` or `->require(...)` instead. +4. **`AdminController::requireAdmin()`**: During the transition, this can check `is_admin` OR `admin.access` so delegated admins can reach the panel while the full migration is in progress. + +--- + +## Migration Plan + +### Phase 1 — Schema and Seed (single migration) +- Create `roles`, `role_permissions`, `role_settings`, `user_role_assignments` tables. +- Seed the `user` system role. +- Assign the `user` role to all existing users. +- No action needed for existing `is_admin` users — their flag is already the superuser bypass. + +### Phase 2 — New `AccessControl` Class +- Implement `src/AccessControl.php`. +- Add helper to `Auth` for convenience. +- Write unit tests for permission resolution and setting merging. + +### Phase 3 — Admin Interface +- Add Roles & Permissions admin page. +- Add role assignment UI to user edit page. +- Ensure new user creation automatically assigns the `user` role. + +### Phase 4 — Route Migration +- Migrate each `is_admin` check in routes to the appropriate `AccessControl` flag. +- Prioritize the admin panel routes and file/echoarea management routes first. +- Migrate WebDoor and system settings routes. + +### Phase 5 — Enforce Role Scalar Settings +- Hook `time_limit_minutes` into session activity tracking. +- Hook `credit_multiplier` into `UserCredit` reward calculations. +- Hook `max_downloads_per_day` into file download tracking. + +### Phase 6 — Cleanup (future release) +- Remove remaining direct `is_admin` checks from routes (they will all go through `AccessControl` at this point). +- `is_admin` itself stays on the `users` table permanently as the superuser flag. + +--- + +## Future Extensions + +- **Per-area overrides**: A role could grant or deny access to specific echo areas or file areas beyond the global `user.sysop_areas` flag. +- **Automatic role assignment rules**: Auto-assign a premium role when a user subscribes, or promote users based on post count. +- **Role inheritance / parent roles**: Allow a co-sysop role to extend the base user role without repeating flags. +- **Telnet BBS integration**: The same role system applies to telnet sessions; `DoorDropFile` security levels can be derived from roles. +- **API key scoping**: Future API keys issued to bots or external services could carry a role limiting what the key can do. From cc41d5a4932b807ca5adf4f3e70f6e8ff1c67d24 Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 15:31:28 -0700 Subject: [PATCH 110/246] Set autofocus on username field on login page Co-Authored-By: Claude Sonnet 4.6 --- templates/login.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/login.twig b/templates/login.twig index 2ba689e5..1be173bc 100644 --- a/templates/login.twig +++ b/templates/login.twig @@ -28,7 +28,7 @@
- +
From 32c1bd34ebda56ec519384b844988b4d7051104a Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 15:39:15 -0700 Subject: [PATCH 111/246] Fix crashmail AKA selection for multi-network uplinks Crashmail delivery was presenting the primary AKA to all remote hosts regardless of network, causing "Bad password" rejections from nodes that are uplinks for one network but not for the zone of the primary address. Now mirrors the existing BinkpClient logic by calling setCurrentUplink() with the routed uplink before handshake. Co-Authored-By: Claude Sonnet 4.6 --- docs/UPGRADING_1.8.7.md | 16 ++++++++++++++++ src/Crashmail/CrashmailService.php | 12 ++++++++++++ 2 files changed, 28 insertions(+) diff --git a/docs/UPGRADING_1.8.7.md b/docs/UPGRADING_1.8.7.md index 7c9ba9fa..0d171478 100644 --- a/docs/UPGRADING_1.8.7.md +++ b/docs/UPGRADING_1.8.7.md @@ -43,6 +43,7 @@ upgrade will appear to pause — this is normal. Do not interrupt it. - [Netmail Attachment Improvements](#netmail-attachment-improvements) - [BinkP Inbound File Collision Handling](#binkp-inbound-file-collision-handling) - [Bug Fixes](#bug-fixes) + - [Crashmail AKA Selection](#crashmail-aka-selection) - [Maximized Message Reader Gap](#maximized-message-reader-gap) - [Upgrade Instructions](#upgrade-instructions) - [From Git](#from-git) @@ -507,6 +508,12 @@ selects the uplink whose network covers the destination address and advertises that uplink's `me` address in `M_ADR`. This ensures the remote system identifies you by the correct AKA rather than your primary zone address. +This fix now applies to **crashmail delivery** as well. Previously, crashmail +sessions created a raw BinkP session without an uplink context, causing the +primary AKA to be advertised to all remote hosts regardless of network. This +resulted in "Bad password" rejections when delivering to nodes that are uplinks +for one network but not for the zone associated with your primary address. + ## Nodelist Enhancements ### Flag Filter @@ -827,6 +834,15 @@ warning. ## Bug Fixes +### Crashmail AKA Selection + +Crashmail delivery was presenting the primary (zone 1) AKA to all remote hosts, +even when the destination node is only an uplink for a different network. The +remote system would reject the session with "Bad password" because it had no +password configured for that address. Fixed — crashmail sessions now select the +correct AKA for the destination's network, matching the behaviour already in +place for other outbound BinkP connections. + ### Crashmail FILE_ATTACH Filename Crashmail delivery of FILE_ATTACH netmails was sending the attachment using the diff --git a/src/Crashmail/CrashmailService.php b/src/Crashmail/CrashmailService.php index a971ec35..3c96270e 100644 --- a/src/Crashmail/CrashmailService.php +++ b/src/Crashmail/CrashmailService.php @@ -497,6 +497,18 @@ private function performCrashDelivery($socket, string $packetPath, string $destA $session->setSessionType('crash_outbound'); $session->setUplinkPassword($password); + // Set the uplink context so the session advertises only the AKA that + // belongs to the network handling this destination, rather than all AKAs. + // Without this, the primary (e.g. zone 1 FidoNet) address is presented to + // hosts that are only uplinks for other networks, causing "Bad password". + $routedUplink = $this->config->getUplinkForDestination($destAddress); + if ($routedUplink) { + // Disable CRAM-MD5 for non-uplink crash delivery — password is empty + // for nodelist/binkp_zone resolved destinations. + $routedUplink['crypt'] = false; + $session->setCurrentUplink($routedUplink); + } + // Perform handshake $session->handshake(); $this->logger->info("Handshake completed with {$destAddress}"); From 5b22312b26dce5456ee322357fa06458d67de621 Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 16:53:40 -0700 Subject: [PATCH 112/246] Echomail info bar, subscription toggle, theme accordion/list-group fixes - Add echo area info bar (all screen sizes) showing tag@domain, description, subscribe/unsubscribe button, and post message button; remove old h2 header - Fix subscription toggle: add Content-Type header to SubscriptionController and dataType:'json' to $.ajax call so data.success is correctly parsed - Fix info bar subscribe button not updating: call renderEchoInfoBar immediately on API success rather than waiting for sidebar reload chain - Fix /ECHOTAG text bleeding into mobile accordion headers by removing stale $('h2').append() call that targeted accordion h2 elements after page h2 removal - Switch subscribe/unsubscribe icons from bookmark to star (fa-star/far fa-star) - Move Post Message button into info bar; add to mobile accordion; remove from top header - Add Full Echo List and Manage Subscriptions i18n keys (en/es); update mobile accordion labels - Add accordion dark theme styles to dark.css, greenterm.css, cyberpunk.css - Add .list-group-item-action:hover/focus overrides to all dark themes to prevent Bootstrap white hover flash in echo area list - Bump service worker cache to v277 - Update UPGRADING_1.8.7.md with info bar, subscription bug fix, and various documentation corrections Co-Authored-By: Claude Sonnet 4.6 --- config/i18n/en/common.php | 4 + config/i18n/es/common.php | 4 + docs/UPGRADING_1.8.7.md | 77 +++++++----- public_html/css/amber.css | 5 +- public_html/css/cyberpunk.css | 36 +++++- public_html/css/dark.css | 56 ++++++++- public_html/css/greenterm.css | 36 +++++- public_html/js/echomail.js | 127 +++++++++++++++++-- public_html/sw.js | 2 +- src/SubscriptionController.php | 3 +- templates/echomail.twig | 30 ++--- templates/user_subscriptions.twig | 198 +++++++++++++----------------- 12 files changed, 406 insertions(+), 172 deletions(-) diff --git a/config/i18n/en/common.php b/config/i18n/en/common.php index b2661d00..9cab966b 100644 --- a/config/i18n/en/common.php +++ b/config/i18n/en/common.php @@ -1862,6 +1862,8 @@ 'ui.echomail.viewing_prefix' => 'Viewing:', 'ui.echomail.viewing_all' => 'Viewing: All Messages', 'ui.echomail.echo_list' => 'Echo List', + 'ui.echomail.full_echo_list' => 'Full Echo List', + 'ui.echomail.manage_subscriptions' => 'Manage Subscriptions', 'ui.echomail.search_areas_placeholder' => 'Search areas...', 'ui.echomail.loading_areas' => 'Loading areas...', 'ui.echomail.recent_messages' => 'Recent Messages', @@ -2757,6 +2759,8 @@ 'ui.echomail.end_of_echo_go' => 'Go to {echo}', 'ui.echomail.end_of_echo_no_next' => 'You have no more unread messages.', 'ui.echomail.end_of_echo_next_btn_title' => 'End of echo', + 'ui.echomail.subscribe' => 'Subscribe', + 'ui.echomail.unsubscribe' => 'Unsubscribe', 'ui.common.db_id' => 'DB ID', 'ui.common.message_id' => 'Message ID', diff --git a/config/i18n/es/common.php b/config/i18n/es/common.php index a5298daa..4ea79f6a 100644 --- a/config/i18n/es/common.php +++ b/config/i18n/es/common.php @@ -1862,6 +1862,8 @@ 'ui.echomail.viewing_prefix' => 'Viendo:', 'ui.echomail.viewing_all' => 'Viendo: Todos los mensajes', 'ui.echomail.echo_list' => 'Lista de ecos', + 'ui.echomail.full_echo_list' => 'Lista completa de ecos', + 'ui.echomail.manage_subscriptions' => 'Gestionar suscripciones', 'ui.echomail.search_areas_placeholder' => 'Buscar areas...', 'ui.echomail.loading_areas' => 'Cargando areas...', 'ui.echomail.recent_messages' => 'Mensajes recientes', @@ -2757,6 +2759,8 @@ 'ui.echomail.end_of_echo_go' => 'Ir a {echo}', 'ui.echomail.end_of_echo_no_next' => 'No tienes mas mensajes sin leer.', 'ui.echomail.end_of_echo_next_btn_title' => 'Fin del eco', + 'ui.echomail.subscribe' => 'Suscribirse', + 'ui.echomail.unsubscribe' => 'Cancelar suscripción', 'ui.common.db_id' => 'ID de base de datos', 'ui.common.message_id' => 'ID de mensaje', diff --git a/docs/UPGRADING_1.8.7.md b/docs/UPGRADING_1.8.7.md index 0d171478..88923206 100644 --- a/docs/UPGRADING_1.8.7.md +++ b/docs/UPGRADING_1.8.7.md @@ -22,6 +22,7 @@ upgrade will appear to pause — this is normal. Do not interrupt it. - [Nodelist Map](#nodelist-map) - [Message Reader Improvements](#message-reader-improvements) - [Echomail Reader Navigation](#echomail-reader-navigation) +- [Echomail Info Bar](#echomail-info-bar) - [Gemini File Areas](#gemini-file-areas) - [FREQ Enhancements](#freq-enhancements) - [Nodelist Enhancements](#nodelist-enhancements) @@ -31,12 +32,12 @@ upgrade will appear to pause — this is normal. Do not interrupt it. - [File Area Subfolder Navigation](#file-area-subfolder-navigation) - [File Preview](#file-preview) - [ISO-Backed File Areas](#iso-backed-file-areas) + - [Behaviour](#behaviour) - [Creating an ISO area](#creating-an-iso-area) - [Import preview](#import-preview) - [Catalogue formats](#catalogue-formats) - [Subfolder navigation](#subfolder-navigation) - [Importing files (CLI)](#importing-files-cli) - - [Behaviour](#behaviour) - [Migration](#migration) - [Global File Search](#global-file-search) - [Page Position Memory](#page-position-memory) @@ -45,6 +46,7 @@ upgrade will appear to pause — this is normal. Do not interrupt it. - [Bug Fixes](#bug-fixes) - [Crashmail AKA Selection](#crashmail-aka-selection) - [Maximized Message Reader Gap](#maximized-message-reader-gap) + - [Subscription Toggle in Echomail Reader](#subscription-toggle-in-echomail-reader) - [Upgrade Instructions](#upgrade-instructions) - [From Git](#from-git) - [Using the Installer](#using-the-installer) @@ -78,6 +80,10 @@ upgrade will appear to pause — this is normal. Do not interrupt it. for the netmail inbox, and restored automatically on return. **Echomail** +- An info bar now appears above the message list when an echo area is selected, + showing the area tag, domain, and description alongside Subscribe/Unsubscribe + and Post Message buttons. +- The echomail page title header has been replaced by the info bar. - Advanced message search with per-field filtering (poster name, subject, body) and date range support. - Search performance significantly improved via trigram GIN indexes. @@ -109,12 +115,13 @@ upgrade will appear to pause — this is normal. Do not interrupt it. - File areas can now be published to the Gemini capsule server. Gemini clients can browse area listings and download files directly over the Gemini protocol. - **ISO-backed file areas** — a file area can now be backed by a CD/DVD ISO - image (or any readable directory). The sysop mounts the ISO using any - suitable method and enters the mount point path in the file area properties. + image, a physical CD/DVD drive, or any readable directory. The sysop enters + the mount point path in the file area properties. Files are imported from the ISO's directory tree using `FILES.BBS`, `DESCRIPT.ION`, `00INDEX.TXT`, `00_INDEX.TXT` (Simtel block format), or - `INDEX.TXT` catalogues. ISO areas are read-only; description edits are - stored in the database. The directory tree is exposed as browsable subfolders + `INDEX.TXT` catalogues. ISO areas are read-only — uploads, renames, and + moves are blocked; only descriptive information (short/long description, + subfolder labels) can be edited, and those edits are stored in the database. The directory tree is exposed as browsable subfolders with editable labels. A preview modal lets sysops review and customise the import before committing. ZIP files inside the ISO show `FILE_ID.DIZ` in the preview modal. Partial imports (selecting child directories without their @@ -127,7 +134,7 @@ upgrade will appear to pause — this is normal. Do not interrupt it. **Nodelist** -- New interactive map tab powered by Leaflet, with zone colour coding and marker +- New interactive map tab powered by Leaflet, with network colour coding and marker clustering. Nodes are geocoded from their location field. - Node view page shows an interactive dark map when the node has geocoded coordinates. @@ -375,9 +382,9 @@ dense areas readable. - Nodes with the same system name (across multiple networks) are grouped into a single marker. The popup shows all networks the system belongs to, including the FTN address and a "Send Netmail" link. -- Markers are colour coded by zone (Z1 = blue, Z2 = green, Z3 = amber, - Z4 = red, Z5 = purple, Z6 = teal). Systems on multiple zones use gold. - A legend is displayed in the bottom-right corner of the map. +- Markers are colour coded by the network the node belongs to. Systems on + multiple networks use a distinct colour. A legend is displayed in the + bottom-right corner of the map. - Map data loads lazily — only fetched when the Map tab is first opened. **Geocoding:** @@ -389,7 +396,7 @@ php scripts/geocode_nodelist.php ``` Options: -- `--limit=N` — process at most N nodes (default: 100 per run) +- `--limit=N` — process at most N nodes (default: all pending) - `--force` — re-geocode nodes that already have coordinates - `--dry-run` — show what would be geocoded without making any changes @@ -401,7 +408,7 @@ Run it once after upgrading to seed initial coordinates, then add it to cron to pick up newly imported nodes: ``` -0 3 * * * php /path/to/scripts/geocode_nodelist.php --limit=200 +0 1 * * 6 php /path/to/scripts/geocode_nodelist.php ``` Geocoding requires the `BBS_DIRECTORY_GEOCODING_ENABLED` environment variable @@ -624,7 +631,6 @@ without navigating the full area list. - **`incoming`** — displayed as *FREQ Responses*. Files received in response to outbound FREQ requests (`freq_getfile.php`) land here. -Subfolders are a view-only concept — no physical subdirectories are created. The `subfolder` column on the `files` table stores the virtual path for each file record. @@ -659,8 +665,25 @@ No configuration or migration is required for this feature. A file area can now be backed by a CD/DVD ISO image on the server, allowing sysops to expose large shareware CD collections (Simtel, Walnut Creek, etc.) -without copying files to local storage. Plain directories work too — the -system only requires a readable path in the **Mount Point** field. +without copying files to local storage. Physical CD/DVD drives also work — +anything the OS can mount and expose as a directory path is supported. Plain +directories work too — the system only requires a readable path in the +**Mount Point** field. + +> **Note:** CD/DVD jukeboxes and changers are not supported. The mount point +> must be a single, consistently accessible path. Media that changes or goes +> offline will cause file requests to return 503 until the path is accessible +> again. + +### Behaviour + +- ISO areas are **read-only** — uploads, renames, and moves are blocked. + Admin file deletion removes the database record only; no disk change is made. +- Descriptive information (short/long description, subfolder labels) can always + be edited and is stored in the database. +- If the mount point is not accessible when a file is requested, the server + returns 503. +- ZIP files inside the ISO display `FILE_ID.DIZ` in the preview modal. ### Creating an ISO area @@ -735,16 +758,6 @@ php scripts/import_iso.php --area= [--update] [--dry-run] [--verbose] Files are imported from `FILES.BBS` / `DESCRIPT.ION` catalogues found in each directory. If no catalogue is present, the filename is used as the description. -### Behaviour - -- ISO areas are **read-only** — uploads and moves are blocked; admin file - deletion removes the database record only (no disk change). -- Description edits (short/long description) are stored in the database and - are always permitted. -- If the mount point is not accessible when a file is requested, the server - returns 503. -- ZIP files inside the ISO display `FILE_ID.DIZ` in the preview modal. - ### Migration This feature requires database migrations. Run `php scripts/setup.php` as @@ -761,7 +774,7 @@ areas. to that area), Description, Size, Uploaded date, Info button, Download button. Results are limited to 100 entries ordered by area tag then filename. -Password-protected areas are excluded unless the session has them unlocked. +Private areas belonging to other users are excluded. ### Search indexes @@ -770,10 +783,6 @@ GIN trigram indexes on `files.filename` and `files.short_description`. These indexes make `ILIKE '%term%'` queries fast regardless of how many files are in the database. -**On large file databases the index build may take a minute or two.** The -upgrade will appear to pause at this migration step — this is normal. Do not -interrupt it. - ## Page Position Memory The echomail and netmail readers now remember the last page you were viewing @@ -876,6 +885,16 @@ existing file were rejected by the duplicate hash check before the replacement logic could run. Fixed — when replacing a file by name, a hash match for that same filename is now allowed through so the replacement proceeds. +### Subscription Toggle in Echomail Reader + +The subscribe/unsubscribe button in the echomail info bar was not updating after +being clicked. `SubscriptionController` was not setting a `Content-Type: +application/json` response header, causing jQuery to treat the response body as +plain text rather than JSON. As a result `data.success` was always `undefined` +and the success branch never ran. Fixed by adding the missing header in +`SubscriptionController::handleUserSubscriptions()` and adding `dataType: 'json'` +to the `$.ajax` call in `echomail.js`. + ## Upgrade Instructions ### From Git diff --git a/public_html/css/amber.css b/public_html/css/amber.css index 66f81380..80fb2b7a 100644 --- a/public_html/css/amber.css +++ b/public_html/css/amber.css @@ -997,8 +997,11 @@ a:hover { color: var(--term-amber); } -.list-group-item:hover { +.list-group-item:hover, +.list-group-item-action:hover, +.list-group-item-action:focus { background-color: var(--term-black-light); + color: var(--term-amber); } .list-group-item.active { diff --git a/public_html/css/cyberpunk.css b/public_html/css/cyberpunk.css index 2bd1c247..506d3666 100644 --- a/public_html/css/cyberpunk.css +++ b/public_html/css/cyberpunk.css @@ -1074,8 +1074,11 @@ a:hover { border-radius: 0; } -.list-group-item:hover { +.list-group-item:hover, +.list-group-item-action:hover, +.list-group-item-action:focus { background-color: var(--cyber-dark-light); + color: var(--text-color); } .list-group-item.active { @@ -1597,3 +1600,34 @@ tbody, td, tfoot, th, thead, tr { background-color: rgba(157, 78, 221, 0.15) !important; color: var(--text-color) !important; } + +/* Accordion */ +.accordion-item { + background-color: var(--cyber-dark-light); + border-color: var(--cyber-purple); +} + +.accordion-button { + background-color: var(--cyber-dark); + color: var(--cyber-cyan); +} + +.accordion-button:not(.collapsed) { + background-color: var(--cyber-dark-light); + color: var(--cyber-cyan-bright); + box-shadow: none; +} + +.accordion-button:focus { + box-shadow: 0 0 0 0.25rem rgba(157, 78, 221, 0.25); + border-color: var(--cyber-purple); +} + +.accordion-button::after { + filter: invert(1) sepia(1) saturate(3) hue-rotate(200deg); +} + +.accordion-body { + background-color: var(--cyber-dark); + color: var(--text-color); +} diff --git a/public_html/css/dark.css b/public_html/css/dark.css index 9f87a9ca..503a1a6d 100644 --- a/public_html/css/dark.css +++ b/public_html/css/dark.css @@ -857,8 +857,31 @@ footer.bg-light a { color: var(--text-color); } -.list-group-item:hover { +.list-group-item:hover, +.list-group-item-action:hover, +.list-group-item-action:focus { background-color: var(--bg-secondary); + color: var(--text-color); +} + +#echoareasList .list-group-item, +#mobileEchoareasList .list-group-item { + background-color: var(--bg-card); + border-color: var(--border-color); + color: var(--text-color); +} + +#echoareasList .list-group-item:hover, +#mobileEchoareasList .list-group-item:hover { + background-color: var(--bg-secondary); + color: var(--text-color); +} + +#echoareasList .list-group-item.active, +#mobileEchoareasList .list-group-item.active { + background-color: var(--fidonet-blue); + border-color: var(--fidonet-blue); + color: #fff; } /* Pagination */ @@ -1147,3 +1170,34 @@ a:hover { .breadcrumb-item + .breadcrumb-item::before { color: var(--text-color-muted); } + +/* Accordion */ +.accordion-item { + background-color: var(--bg-card); + border-color: var(--border-color); +} + +.accordion-button { + background-color: var(--bg-secondary); + color: var(--text-color); +} + +.accordion-button:not(.collapsed) { + background-color: var(--bg-card); + color: var(--text-color); + box-shadow: none; +} + +.accordion-button:focus { + box-shadow: 0 0 0 0.25rem rgba(77, 166, 255, 0.25); + border-color: var(--border-color); +} + +.accordion-button::after { + filter: invert(1) brightness(0.8); +} + +.accordion-body { + background-color: var(--bg-card); + color: var(--text-color); +} diff --git a/public_html/css/greenterm.css b/public_html/css/greenterm.css index 2df196d1..b7a377b2 100644 --- a/public_html/css/greenterm.css +++ b/public_html/css/greenterm.css @@ -997,8 +997,11 @@ a:hover { color: var(--term-green); } -.list-group-item:hover { +.list-group-item:hover, +.list-group-item-action:hover, +.list-group-item-action:focus { background-color: var(--term-black-light); + color: var(--term-green); } .list-group-item.active { @@ -1501,3 +1504,34 @@ tbody, td, tfoot, th, thead, tr { background-color: rgba(51, 255, 51, 0.08) !important; color: var(--text-color) !important; } + +/* Accordion */ +.accordion-item { + background-color: var(--term-black); + border-color: var(--term-green-dark); +} + +.accordion-button { + background-color: var(--term-black-light); + color: var(--term-green); +} + +.accordion-button:not(.collapsed) { + background-color: var(--term-black-lighter); + color: var(--term-green-bright); + box-shadow: none; +} + +.accordion-button:focus { + box-shadow: 0 0 0 0.25rem rgba(51, 255, 51, 0.25); + border-color: var(--term-green); +} + +.accordion-button::after { + filter: invert(1) sepia(1) saturate(5) hue-rotate(90deg); +} + +.accordion-body { + background-color: var(--term-black); + color: var(--term-green); +} diff --git a/public_html/js/echomail.js b/public_html/js/echomail.js index e0440cfb..2ace53f1 100644 --- a/public_html/js/echomail.js +++ b/public_html/js/echomail.js @@ -16,6 +16,8 @@ let currentRenderMode = 'auto'; let keyboardHelpVisible = false; let allEchoareas = []; let echoareaSearchQuery = ''; +let currentEchoareaData = null; // area object for the currently viewed echo +let allEchoareasCache = null; // lazy full-list cache for unsubscribed area lookups let searchResultCounts = null; let searchFilterCounts = null; let originalFilterCounts = null; @@ -156,6 +158,7 @@ function loadEchoareas() { .done(function(data) { allEchoareas = data.echoareas; applyEchoareaFilter(); + updateEchoInfoBar(); }) .fail(function() { $('#echoareasList').html(`
${uiT('ui.echoareas.load_failed', 'Failed to load echo areas')}
`); @@ -163,6 +166,121 @@ function loadEchoareas() { }); } +/** + * Update the echo info bar (description + subscribe button) for the current echo. + * If no echo is selected the bar is hidden. + */ +function updateEchoInfoBar() { + if (!currentEchoarea) { + $('#echoInfoBar').addClass('d-none'); + currentEchoareaData = null; + return; + } + + // Look for the area in the already-loaded subscribed list + currentEchoareaData = null; + if (allEchoareas) { + for (const area of allEchoareas) { + const fullTag = area.domain ? `${area.tag}@${area.domain}` : area.tag; + if (fullTag === currentEchoarea) { + currentEchoareaData = area; + break; + } + } + } + + if (currentEchoareaData) { + renderEchoInfoBar(currentEchoareaData, true); + } else { + // Area not in subscribed list — lazy-fetch all areas to get description + ID + if (allEchoareasCache) { + const found = allEchoareasCache[currentEchoarea] || null; + currentEchoareaData = found; + renderEchoInfoBar(found, false); + } else { + // Show bar immediately with spinner while fetching + $('#echoDescription').text(''); + $('#echoSubscribeBtn').prop('disabled', true).text('...'); + $('#echoInfoBar').removeClass('d-none'); + + $.get('/api/echoareas').done(function(data) { + allEchoareasCache = {}; + (data.echoareas || []).forEach(function(area) { + const fullTag = area.domain ? `${area.tag}@${area.domain}` : area.tag; + allEchoareasCache[fullTag] = area; + }); + const found = allEchoareasCache[currentEchoarea] || null; + currentEchoareaData = found; + renderEchoInfoBar(found, false); + }).fail(function() { + renderEchoInfoBar(null, false); + }); + } + } +} + +/** + * Render the info bar contents given an area object and subscription state. + * @param {object|null} area Area data (may be null for unknown areas) + * @param {boolean} subscribed + */ +function renderEchoInfoBar(area, subscribed) { + const title = area ? (area.domain ? `${area.tag}@${area.domain}` : (area.tag || '')) : ''; + const description = area ? (area.description || '') : ''; + const areaId = area ? area.id : null; + + $('#echoTitle').text(title); + $('#echoDescription').text(description); + + const btn = $('#echoSubscribeBtn'); + btn.prop('disabled', false).attr('data-area-id', areaId || '').attr('data-subscribed', subscribed ? '1' : '0'); + + if (subscribed) { + btn.removeClass('btn-outline-success').addClass('btn-outline-secondary') + .html(`${uiT('ui.echomail.unsubscribe', 'Unsubscribe')}`); + } else { + btn.removeClass('btn-outline-secondary').addClass('btn-outline-success') + .html(`${uiT('ui.echomail.subscribe', 'Subscribe')}`); + } + + $('#echoInfoBar').removeClass('d-none'); +} + +/** + * Toggle subscription for the currently viewed echo area. + */ +function toggleSubscription() { + const btn = $('#echoSubscribeBtn'); + const areaId = parseInt(btn.attr('data-area-id')); + const subscribed = btn.attr('data-subscribed') === '1'; + + if (!areaId) return; + + const action = subscribed ? 'unsubscribe' : 'subscribe'; + btn.prop('disabled', true); + + $.ajax({ + url: '/api/subscriptions/user', + method: 'POST', + contentType: 'application/json', + dataType: 'json', + data: JSON.stringify({ action: action, echoarea_id: areaId }), + success: function(data) { + if (data.success) { + // Update button immediately, then reload sidebar in background + renderEchoInfoBar(currentEchoareaData, !subscribed); + allEchoareasCache = null; + loadEchoareas(); + } else { + btn.prop('disabled', false); + } + }, + error: function() { + btn.prop('disabled', false); + } + }); +} + function searchEchoareas(query) { echoareaSearchQuery = query.toLowerCase(); applyEchoareaFilter(); @@ -291,6 +409,7 @@ function displayMobileEchoareas(echoareas) { function selectEchoarea(tag) { currentEchoarea = tag; + updateEchoInfoBar(); const memKey = tag || '__all__'; currentPage = echoPageMemory[memKey] ? echoPageMemory[memKey] : 1; @@ -298,14 +417,6 @@ function selectEchoarea(tag) { const url = tag ? `/echomail/${encodeURIComponent(tag)}` : '/echomail'; history.pushState({echoarea: tag}, '', url); - // Update title - strip domain for display - const displayTag = tag && tag.includes('@') ? tag.split('@')[0] : tag; - const title = displayTag ? `Echomail - ${displayTag}` : 'Echomail'; - $('h2 small').remove(); - if (displayTag) { - $('h2').append(`/ ${displayTag}`); - } - // Update mobile accordion text updateMobileAccordionText(tag); diff --git a/public_html/sw.js b/public_html/sw.js index 3f2c3c5d..c21e3538 100644 --- a/public_html/sw.js +++ b/public_html/sw.js @@ -1,4 +1,4 @@ -const CACHE_NAME = 'binkcache-v272'; +const CACHE_NAME = 'binkcache-v277'; // Static assets to precache const staticAssets = [ diff --git a/src/SubscriptionController.php b/src/SubscriptionController.php index 756c177e..66da3cb5 100644 --- a/src/SubscriptionController.php +++ b/src/SubscriptionController.php @@ -41,7 +41,8 @@ public function handleUserSubscriptions() $userId = $user['user_id'] ?? $user['id']; $method = $_SERVER['REQUEST_METHOD']; - + header('Content-Type: application/json'); + if ($method === 'GET') { // Get user's subscription status for all echoareas $echoareas = $this->subscriptionManager->getAllEchoareasWithSubscriptionStatus($userId); diff --git a/templates/echomail.twig b/templates/echomail.twig index 83787e2d..bb7def8d 100644 --- a/templates/echomail.twig +++ b/templates/echomail.twig @@ -3,18 +3,20 @@ {% block title %}{{ t('ui.echomail.title', {}, locale, ['common']) }}{% if echoarea %} - {{ echoarea }}{% endif %} - {{ parent() }}{% endblock %} {% block content %} -
-

- - {{ t('ui.echomail.title', {}, locale, ['common']) }} - {% if echoarea %} - / {{ echoarea }} - {% endif %} -

- + +
+
+
+ + +
+
+ + +
+
@@ -38,10 +40,10 @@
- {{ t('ui.echomail.echo_list', {}, locale, ['common']) }} + {{ t('ui.echomail.full_echo_list', {}, locale, ['common']) }} - {{ t('ui.common.manage', {}, locale, ['common']) }} + {{ t('ui.echomail.manage_subscriptions', {}, locale, ['common']) }}
{{ t('ui.user_subscriptions.heading_help', {}, locale, ['common']) }}
-
-
- - -
- + {% set subscribed_count = echoareas|filter(e => e.subscribed)|length %} + {% set total_count = echoareas|length %} +
+ +
+ {{ t('ui.user_subscriptions.subscribed_label', {}, locale, ['common']) }} {{ subscribed_count }} / {{ total_count }} +
+
- -
- {% for echoarea in echoareas %} -
-
-
-
-
- -
-
-
-
- - {{ echoarea.tag }} - {% if echoarea.domain %} - {{ echoarea.domain }} - {% endif %} - {% if echoarea.is_default_subscription %} - - {% endif %} -
-
-
-

{{ echoarea.description }}

- - {{ t('ui.user_subscriptions.message_count', {'count': echoarea.message_count}, locale, ['common']) }} - {% if echoarea.subscribed %} - {{ t('ui.user_subscriptions.dot_subscribed', {}, locale, ['common']) }} - {% if echoarea.subscription_type == 'auto' %} - {{ t('ui.user_subscriptions.automatic', {}, locale, ['common']) }} - {% else %} - ({{ echoarea.subscribed_at|date('M j, Y') }}) - {% endif %} - {% endif %} - -
-
- - - {{ t('ui.user_subscriptions.view_messages', {}, locale, ['common']) }} - -
+
+
+ +
+ {% for echoarea in echoareas %} +
+
+
+
+
+
-
- {% endfor %} -
-
- -
-
-
-
- - {{ t('ui.user_subscriptions.subscription_info', {}, locale, ['common']) }} -
-
-
-
- {% set subscribed_count = echoareas|filter(e => e.subscribed)|length %} - {% set total_count = echoareas|length %} - -
-
- {{ t('ui.user_subscriptions.subscribed_label', {}, locale, ['common']) }} - {{ subscribed_count }} / {{ total_count }} -
-
-
-
-
+
+
+ +
{{ echoarea.tag }}
+
+ {% if echoarea.domain or echoarea.is_default_subscription %} +
+ {% if echoarea.domain %} + {{ echoarea.domain }} + {% endif %} + {% if echoarea.is_default_subscription %} + + {% endif %}
+ {% endif %} +
+
+

{{ echoarea.description }}

+ + {{ t('ui.user_subscriptions.message_count', {'count': echoarea.message_count}, locale, ['common']) }} + {% if echoarea.subscribed and echoarea.subscription_type == 'auto' %} + {{ t('ui.user_subscriptions.dot_subscribed', {}, locale, ['common']) }} + {{ t('ui.user_subscriptions.automatic', {}, locale, ['common']) }} + {% endif %} + +
+
+ + + {{ t('ui.user_subscriptions.view_messages', {}, locale, ['common']) }} +
- -
- -
{{ t('ui.user_subscriptions.how_subscriptions_work', {}, locale, ['common']) }}
-
    -
  • {{ t('ui.user_subscriptions.how_new_users', {}, locale, ['common']) }}
    • -
  • {{ t('ui.user_subscriptions.how_subscribe_unsubscribe', {}, locale, ['common']) }}
    • -
  • {{ t('ui.user_subscriptions.how_only_subscribed', {}, locale, ['common']) }}
    • -
  • {{ t('ui.user_subscriptions.how_star_means_default', {}, locale, ['common']) }}
    • -
+ {% endfor %}
@@ -125,6 +88,16 @@
+ +
+ +
+ From c126b35dca1ea39d20ef943e2a6671fd724b11e1 Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 18:24:57 -0700 Subject: [PATCH 113/246] Add sortable columns and subscriber count to echo area management table - Make ID, Tag, Description, Msgs, Subs, and Uplink columns sortable with click-to-sort and visual sort indicators (fa-sort, fa-sort-up, fa-sort-down) - Active sort column highlighted in primary color; defaults to ID ascending - Add subscriber count (Subs) column backed by a LEFT JOIN on user_echoarea_subscriptions - Rename Messages header to Msgs; adjust Subs (9%) and Uplink (13%) widths Co-Authored-By: Claude Sonnet 4.6 --- routes/api-routes.php | 9 +++++- templates/echoareas.twig | 68 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 71 insertions(+), 6 deletions(-) diff --git a/routes/api-routes.php b/routes/api-routes.php index d246e761..b294aaee 100644 --- a/routes/api-routes.php +++ b/routes/api-routes.php @@ -1676,6 +1676,7 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array e.is_sysop_only, COALESCE(total_counts.message_count, 0) as message_count, COALESCE(unread_counts.unread_count, 0) as unread_count, + COALESCE(sub_counts.subscriber_count, 0) as subscriber_count, last_posts.last_subject, last_posts.last_author, last_posts.last_date @@ -1711,7 +1712,13 @@ function apiLocalizeErrorPayload(array $payload, ?array $user = null): array date_received as last_date FROM echomail ORDER BY echoarea_id, date_received DESC - ) last_posts ON e.id = last_posts.echoarea_id"; + ) last_posts ON e.id = last_posts.echoarea_id + LEFT JOIN ( + SELECT echoarea_id, COUNT(*) as subscriber_count + FROM user_echoarea_subscriptions + WHERE is_active = TRUE + GROUP BY echoarea_id + ) sub_counts ON e.id = sub_counts.echoarea_id"; if ($subscribedOnly === 'true') { // For subscribed only, we already have the JOIN, just need to add WHERE conditions diff --git a/templates/echoareas.twig b/templates/echoareas.twig index 1f8d9ee9..ef2701f3 100644 --- a/templates/echoareas.twig +++ b/templates/echoareas.twig @@ -307,12 +307,24 @@ border-color: #000; box-shadow: 0 0 0 1px #fff, 0 0 0 3px #000; } + +.sortable-col { + cursor: pointer; + user-select: none; + white-space: nowrap; +} + +.sortable-col:hover { + background-color: rgba(0, 0, 0, 0.05); +} +{% endblock %} diff --git a/templates/base.twig b/templates/base.twig index 60724100..6dd4be77 100644 --- a/templates/base.twig +++ b/templates/base.twig @@ -238,6 +238,7 @@
  • {{ t('ui.base.admin.binkp_configuration', {}, 'common') }}
  • {{ t('ui.base.admin.template_editor', {}, 'common') }}
  • {{ t('ui.base.admin.i18n_overrides', {}, 'common') }}
    • +
  • {{ t('ui.base.admin.licensing', {}, 'common') }}
    • @@ -329,6 +330,12 @@
    + {% if license_valid and license_system_name and appearance.branding.show_registration_badge != false %} + + {{ t('ui.footer.registered_to', {'name': license_system_name}, 'common') }} + +
    + {% endif %} {{ t('ui.footer.powered_by', {}, 'common') }} BinktermPHP {{ app_version }} | {{ t('ui.about.house_rules', {}, 'common') }} diff --git a/templates/shells/bbs-menu/base.twig b/templates/shells/bbs-menu/base.twig index 6bf41d6f..2ab97025 100644 --- a/templates/shells/bbs-menu/base.twig +++ b/templates/shells/bbs-menu/base.twig @@ -235,7 +235,7 @@ {{ system_name }} - Node {{ fidonet_origin }} - Sysop: {{ sysop_name }} {% endif %} | {{ t('ui.about.house_rules', {}, 'common') }} - | {{ t('ui.footer.powered_by', {}, 'common') }} BinktermPHP {{ app_version }} + {% if license_valid and license_system_name and appearance.branding.show_registration_badge != false %}| {{ t('ui.footer.registered_to', {'name': license_system_name}, 'common') }} {% endif %}| {{ t('ui.footer.powered_by', {}, 'common') }} BinktermPHP {{ app_version }}
    diff --git a/templates/shells/web/base.twig b/templates/shells/web/base.twig index 137dc17c..d3b605c3 100644 --- a/templates/shells/web/base.twig +++ b/templates/shells/web/base.twig @@ -286,6 +286,7 @@
  • {{ t('ui.base.admin.binkp_configuration', {}, 'common') }}
  • {{ t('ui.base.admin.template_editor', {}, 'common') }}
  • {{ t('ui.base.admin.i18n_overrides', {}, 'common') }}
    • +
  • {{ t('ui.base.admin.licensing', {}, 'common') }}
    • @@ -400,6 +401,7 @@
    + {% if license_valid and license_system_name and appearance.branding.show_registration_badge != false %}{{ t('ui.footer.registered_to', {'name': license_system_name}, 'common') }} |{% endif %} {{ t('ui.footer.powered_by', {}, 'common') }} BinktermPHP {{ app_version }} | {{ t('ui.about.house_rules', {}, 'common') }} {% if appearance.seo.about_page_enabled %} From c45fede46f7532d11249b07b1805429b23cb0078 Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 19:17:31 -0700 Subject: [PATCH 115/246] Move registered badge inline with Powered by line in footer Remove the icon and fold the "Registered to SYSTEM_NAME" text directly onto the Powered by BinktermPHP line, separated by " - ", across all three base templates. Co-Authored-By: Claude Sonnet 4.6 --- templates/base.twig | 8 +------- templates/shells/bbs-menu/base.twig | 2 +- templates/shells/web/base.twig | 3 +-- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/templates/base.twig b/templates/base.twig index 6dd4be77..5e59fef7 100644 --- a/templates/base.twig +++ b/templates/base.twig @@ -330,14 +330,8 @@
    - {% if license_valid and license_system_name and appearance.branding.show_registration_badge != false %} - {{ t('ui.footer.registered_to', {'name': license_system_name}, 'common') }} - -
    - {% endif %} - - {{ t('ui.footer.powered_by', {}, 'common') }} BinktermPHP {{ app_version }} | + {{ t('ui.footer.powered_by', {}, 'common') }} BinktermPHP {{ app_version }}{% if license_valid and license_system_name and appearance.branding.show_registration_badge != false %} - {{ t('ui.footer.registered_to', {'name': license_system_name}, 'common') }}{% endif %} | {{ t('ui.about.house_rules', {}, 'common') }}
    diff --git a/templates/shells/bbs-menu/base.twig b/templates/shells/bbs-menu/base.twig index 2ab97025..049b989f 100644 --- a/templates/shells/bbs-menu/base.twig +++ b/templates/shells/bbs-menu/base.twig @@ -235,7 +235,7 @@ {{ system_name }} - Node {{ fidonet_origin }} - Sysop: {{ sysop_name }} {% endif %} | {{ t('ui.about.house_rules', {}, 'common') }} - {% if license_valid and license_system_name and appearance.branding.show_registration_badge != false %}| {{ t('ui.footer.registered_to', {'name': license_system_name}, 'common') }} {% endif %}| {{ t('ui.footer.powered_by', {}, 'common') }} BinktermPHP {{ app_version }} + | {{ t('ui.footer.powered_by', {}, 'common') }} BinktermPHP {{ app_version }}{% if license_valid and license_system_name and appearance.branding.show_registration_badge != false %} - {{ t('ui.footer.registered_to', {'name': license_system_name}, 'common') }}{% endif %}
    diff --git a/templates/shells/web/base.twig b/templates/shells/web/base.twig index d3b605c3..489e113c 100644 --- a/templates/shells/web/base.twig +++ b/templates/shells/web/base.twig @@ -401,8 +401,7 @@
    - {% if license_valid and license_system_name and appearance.branding.show_registration_badge != false %}{{ t('ui.footer.registered_to', {'name': license_system_name}, 'common') }} |{% endif %} - {{ t('ui.footer.powered_by', {}, 'common') }} BinktermPHP {{ app_version }} | + {{ t('ui.footer.powered_by', {}, 'common') }} BinktermPHP {{ app_version }}{% if license_valid and license_system_name and appearance.branding.show_registration_badge != false %} - {{ t('ui.footer.registered_to', {'name': license_system_name}, 'common') }}{% endif %} | {{ t('ui.about.house_rules', {}, 'common') }} {% if appearance.seo.about_page_enabled %} | {{ t('ui.about.title', {}, 'common') }} From 76f44a77c06bb719ec91b97a6f6eccafd16f4fcf Mon Sep 17 00:00:00 2001 From: awehttam Date: Mon, 16 Mar 2026 21:45:08 -0700 Subject: [PATCH 116/246] Add ANSI/PRG file preview, shared file preview, and C64 rendering accuracy fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add ANSI art rendering in file preview modal (.ans files via ArtAnsiDecoder) - Add PETSCII/PRG rendering using C64 screen RAM decoder with canvas output; multi-PRG ZIP bundles show a gallery with prev/next navigation - Fix C64 glyph accuracy: use Pet Me 64 Private Use Area (U+E000+petscii) for authentic ROM glyphs in both ArtScreenRamDecoder and ArtPetsciiDecoder - Render PRG canvas at 8px/char scaled 2x via CSS image-rendering:pixelated to avoid fractional-pixel blur from 16px font metrics - Extract shared preview logic to public_html/js/file-preview.js for reuse - Add file preview to shared file link pages (/shared/file/…) using the same renderer; works for all supported types without requiring login - Add /api/files/{id}/prgs endpoint for PRG extraction from .prg and ZIP files - Add FILE_ID.DIZ download button in ZIP preview modal - Update UPGRADING_1.8.7.md with ANSI/PRG rendering and shared file preview - Bump service worker cache to binkcache-v288 Co-Authored-By: Claude Sonnet 4.6 --- docs/UPGRADING_1.8.7.md | 78 +++++++ public_html/css/ansisys.css | 19 ++ public_html/js/ansisys.js | 365 ++++++++++++++++++++++++++------- public_html/js/app.js | 7 +- public_html/js/echomail.js | 2 +- public_html/js/file-preview.js | 270 ++++++++++++++++++++++++ public_html/js/netmail.js | 4 +- public_html/sw.js | 3 +- routes/api-routes.php | 104 ++++++++++ src/MessageHandler.php | 39 ++++ templates/files.twig | 131 +----------- templates/shared_file.twig | 17 ++ templates/shared_message.twig | 2 +- 13 files changed, 829 insertions(+), 212 deletions(-) create mode 100644 public_html/js/file-preview.js diff --git a/docs/UPGRADING_1.8.7.md b/docs/UPGRADING_1.8.7.md index 6ad13a08..887fcde6 100644 --- a/docs/UPGRADING_1.8.7.md +++ b/docs/UPGRADING_1.8.7.md @@ -31,6 +31,9 @@ upgrade will appear to pause — this is normal. Do not interrupt it. - [Crashmail Logging and Packet Preservation](#crashmail-logging-and-packet-preservation) - [File Area Subfolder Navigation](#file-area-subfolder-navigation) - [File Preview](#file-preview) + - [ANSI Art Rendering](#ansi-art-rendering) + - [PETSCII / PRG Rendering](#petscii--prg-rendering) + - [Shared File Preview](#shared-file-preview) - [ISO-Backed File Areas](#iso-backed-file-areas) - [Behaviour](#behaviour) - [Creating an ISO area](#creating-an-iso-area) @@ -48,6 +51,7 @@ upgrade will appear to pause — this is normal. Do not interrupt it. - [Crashmail AKA Selection](#crashmail-aka-selection) - [Maximized Message Reader Gap](#maximized-message-reader-gap) - [Subscription Toggle in Echomail Reader](#subscription-toggle-in-echomail-reader) +- [Footer Registration Display](#footer-registration-display) - [Upgrade Instructions](#upgrade-instructions) - [From Git](#from-git) - [Using the Installer](#using-the-installer) @@ -108,6 +112,13 @@ upgrade will appear to pause — this is normal. Do not interrupt it. text and NFO files (including CP437-encoded ANSI art) render in a scrollable panel. Unknown file types prompt a download. Navigation arrows and keyboard shortcuts cycle through files without closing the modal. +- `.ans` files render inline in the preview modal using the ANSI decoder. +- `.prg` files and ZIP bundles containing `.prg` files render using the C64 + screen RAM decoder with the exact C64 16-colour palette. Multi-file bundles + show a gallery with previous/next navigation arrows. +- Shared file link pages (`/shared/file/…`) now display the same inline preview + as the file browser, so recipients can view images, read text/NFO files, and + see ANSI or PETSCII art without logging in. - Netmail attachment delivery now stores a copy in the sender's private area as well as the recipient's. - Fixed: TIC file import with **Replace Existing Files** enabled was blocked by @@ -151,6 +162,11 @@ upgrade will appear to pause — this is normal. Do not interrupt it. respects the **preserve sent packets** setting. - Experimental FREQ support (see [FREQ Enhancements](#freq-enhancements)). +**User Interface** +- The "Registered to" line in the page footer is now displayed inline with the + "Powered by BinktermPHP" line (e.g. *Powered by BinktermPHP 1.8.7 - Registered + to My BBS*) and no longer shows a separate badge icon. + **Admin** - New **Database Statistics** page (`/admin/database-stats`) showing size and growth, activity metrics, query performance, replication status, maintenance @@ -653,6 +669,8 @@ going straight to a download. | Video | mp4, webm, mov, ogv, m4v | Plays in a `