chore: sync dev with main #141

Closed

jmiller wants to merge 0 commits from main into dev

pull from: main

merge into: :dev

:main

:fix/ssh-key-indicator

:dev

:fix/ui-cleanup-restore-name

:fix/mokorestore-improvements

:fix/bootstrap-modals

:version/01.43.00

:version/01.42.00

:version/01.41.00

:version/01.40.00

:version/01.39.01

:version/01.39.00

:version/01.38.05

:version/01.38.04

:version/01.38.03

:version/01.38.02

:version/01.38.01

:version/01.38.00

:version/01.37.00

:version/01.36.00

:version/01.35.04

:version/01.35.03

:version/01.35.01

:version/01.35.00

:version/01.34.00

:version/01.33.00

:version/01.32.00

:version/01.31.00

:version/01.30.00

:rc

:version/01.27.03

:version/01.27.00

:version/01.26.00

:feature/47-backup-status-helper

:feature/47-feat-expose-backup-status-for-mokosuitec

Conversation 0 Commits - Files Changed -

+9808 -472

jmiller commented 2026-06-23 23:01:38 +00:00

Owner

Copy Link

Copy Source

Merge all changes from main back to dev to keep branches in sync.

Merge all changes from main back to dev to keep branches in sync.

jmiller added 172 commits 2026-06-23 23:01:39 +00:00

feat: snapshot retention and automatic cleanup (#63) ... 974b971340

Add retention settings for content snapshots (max count, max age days)
in component options. System plugin runs cleanupOldSnapshots() alongside
existing backup cleanup, deleting JSON files and DB records.

Closes #63

feat: extend snapshots to include custom fields and tags (#57) ... eb7f48d3a2

When articles are included in a snapshot, now also captures:
- #__tags (tag definitions)
- #__fields (custom field definitions for com_content.article)
- #__fields_values (custom field values)
- #__fields_categories (field-to-category mappings)

Restore correctly scopes deletes to avoid touching non-content fields.

Closes #57

fix: graceful degradation when remote upload fails (#66) ... 8b6e260b28

Remote upload failure (S3/FTP/GDrive) no longer marks the entire
backup as failed. The local archive is preserved with status
'complete' and the upload failure is logged as a warning. Applies
to both BackupEngine and SteppedBackupEngine.

Closes #66

fix: scope #__fields_values dump and restore to com_content.article ... ad1c0cf349

The fields_values table is shared across all Joomla extensions.
Previously, dump captured ALL field values and restore deleted ALL
field values, destroying data for contacts, users, and other
extensions. Now scoped via subquery on field_id WHERE context =
'com_content.article'.

Merge pull request 'feat: Snapshot retention, extended snapshots, graceful remote degradation (#63, #57, #66)' (#89) from feat/batch-63-57-66 into main 5815a65a39

chore(release): build 01.30.00 [skip ci] f5e8d0fe03

chore: promote changelog [Unreleased] → [01.30.00] b3d955e1a8

chore: sync auto-bump.yml from Template-Generic [skip ci] b0629f9f30

chore: sync auto-release.yml from Template-Generic [skip ci] db2beef189

chore: sync issue-branch.yml from Template-Generic [skip ci] b882e8ba90

chore: sync pr-check.yml from Template-Generic [skip ci] 3547667158

chore: sync repo-health.yml from Template-Generic [skip ci] fc0c1b05a6

feat: CLI command for content snapshots (#55) ... 0638c2cef6

Add `mokosuitebackup:snapshot` command with four actions:
- create: --types=articles,categories,modules --description="text"
- restore: --id=N --mode=replace|merge --types=articles
- list: displays table of all snapshots
- delete: --id=N removes file + DB record

Closes #55

feat: auto-verify backup integrity after creation (#65) ... 5dcba6d8cb

After archive is created and checksum computed, automatically verify:
- Archive opens without error
- Contains at least one entry
- database.sql present when backup type includes database
- First entry is readable (spot-check)

Applied to both BackupEngine and SteppedBackupEngine. Throws
RuntimeException on verification failure (backup marked as failed).

Closes #65

feat: REST API endpoints for content snapshots (#54) ... c72e950a25

Add five endpoints matching the existing backup API pattern:
- GET /snapshots — list with pagination
- POST /snapshot — create (content_types, description)
- POST /snapshot/:id/restore — restore (mode, content_types)
- DELETE /snapshot/:id — delete record + file
- GET /snapshot/:id/download — stream JSON file

ACL: mokosuitebackup.snapshot.manage for write ops, core.manage for read.
Routes registered in webservices plugin alongside backup routes.

Closes #54

Merge pull request 'feat: CLI snapshots, auto-verify integrity, snapshot REST API (#55, #65, #54)' (#90) from feat/batch-55-65-54 into main 35b7e2a0b8

chore(release): build 01.31.00 [skip ci] 01335ac70f

chore: promote changelog [Unreleased] → [01.31.00] a7e94467ee

chore: sync auto-bump.yml from Template-Generic [skip ci] a919d52cf7

chore: sync issue-branch.yml from Template-Generic [skip ci] 7bf42f1a89

chore: sync pr-check.yml from Template-Generic [skip ci] 5f0f958aca

chore: sync repo-health.yml from Template-Generic [skip ci] ed799217bf

feat: scheduled task for automated content snapshots (#56) ... 5a672454ad

Add mokosuitebackup.snapshot task type for com_scheduler with params
for content_types and description_format ([date]/[datetime] placeholders).

Closes #56

feat: email/ntfy notifications for restore operations (#60) ... 391047d8e5

Send notifications when site restores and snapshot create/restore
complete. Uses sendRestoreNotification() with type-specific subjects.
All calls wrapped in try-catch to never break the actual operation.

Closes #60

feat: AJAX stepped restore engine for large sites (#62) ... 01bed8942c

Break restore into phases (extract, files, database, config, cleanup)
executed via AJAX steps to avoid PHP timeout on shared hosting.

- SteppedRestoreEngine with session persistence
- AjaxController restoreInit/restoreStep endpoints
- Restore modal uses AJAX progress instead of synchronous submit
- Files copied in batches of 200, SQL in batches of 500

Closes #62

Merge pull request 'feat: Scheduled snapshots, restore notifications, stepped restore (#56, #60, #62)' (#91) from feat/batch-56-60-62 into main 6d47b70aaf

chore(release): build 01.32.00 [skip ci] 29c7e974b5

chore: promote changelog [Unreleased] → [01.32.00] d562e0dc10

fix: convert single-line comments to block comments in script.php ... 8ea09ee0d1

The build pipeline strips newlines from PHP files during packaging.
Single-line comments (//) then eat everything after them on the
concatenated line, causing a FatalError on install. Block comments
(/* */) survive minification.

feat: selective article restore from snapshot (#58) ... 8a4ebe1bde

Browse articles inside a snapshot and restore individual items:
- SnapshotRestoreEngine::restoreSelectedArticles() merges by ID
- AjaxController::browseSnapshot() returns article list as JSON
- SnapshotsController::restoreSelected() handles selective restore
- Browse modal with checkboxes + Restore Selected button

Closes #58

feat: backup archive browser — view files without extracting (#59) ... 4213def0ad

AJAX-powered file browser in backups list and detail views:
- AjaxController::browseArchive() reads ZIP/tar.gz entries
- Browse button on each backup row + detail view
- Modal shows file list with names and sizes (first 500 entries)

Closes #59

feat: backup comparison — diff two backup records (#64) ... 8c66fd3260

Select two backups and compare side-by-side:
- AjaxController::compareBackups() returns metadata + deltas
- Compare toolbar button (requires 2 checkboxes)
- Modal shows size, files, tables, duration differences

Closes #64

Merge pull request 'feat: Selective restore, archive browser, backup comparison + install fix (#58, #59, #64)' (#92) from feat/batch-58-59-64 into main e4de103a00

chore(release): build 01.33.00 [skip ci] 50c016d707

chore: promote changelog [Unreleased] → [01.33.00] 5c0ff72d27

feat: dashboard snapshot widget, backup trend chart, storage breakdown (#61) ... ee21f7a373

Add three new dashboard widgets:
- Snapshot widget: latest snapshot info, type badges, item counts,
  link to snapshots view, total count
- Backup trend: CSS bar chart showing daily backup sizes over 30 days,
  red bars for days with failures, tooltips with details
- Storage breakdown: horizontal bars showing space used per profile
  with color coding and backup counts

Closes #61

Merge pull request 'feat: Dashboard snapshot widget, backup trend, storage breakdown (#61)' (#93) from feat/61-dashboard-widgets into main a7c30ad67c

chore(release): build 01.34.00 [skip ci] a27ec0f0b9

chore: promote changelog [Unreleased] → [01.34.00] 54c3a6e2e9

chore: sync auto-bump.yml from Template-Generic [skip ci] 4a2520a43b

chore: sync issue-branch.yml from Template-Generic [skip ci] d0fe641d5c

chore: sync pr-check.yml from Template-Generic [skip ci] 0f2c4fc238

chore: sync repo-health.yml from Template-Generic [skip ci] be8b1f73bf

feat: SFTP remote storage with key file auth + CLI restore options ... f66100f74f

SFTP support:
- SftpUploader uses system scp/ssh binaries with key file auth
- Private key stored as MEDIUMTEXT in profile table (sftp_key_data)
- Key written to temp file (0600) at upload time, deleted after
- Profile form: host, port, username, password, key textarea,
  passphrase, remote path — all with showon="remote_storage:sftp"
- SQL migration for 7 new SFTP columns
- Wired into BackupEngine, SteppedBackupEngine, PreflightCheck
- API credential masking includes SFTP fields

CLI restore options:
- --files-only: restore files without touching database
- --db-only: restore database without touching files
- --no-preserve-config: overwrite configuration.php
- --password: decryption password for encrypted archives

Merge pull request 'feat: SFTP remote storage with key file auth + CLI restore options' (#94) from feat/sftp-keyfile into main bc3085f74b

chore(release): build 01.35.00 [skip ci] eb748323f7

chore: promote changelog [Unreleased] → [01.35.00] 17e4625448

fix: move SFTP fields into remote fieldset for showon to work ... 3ac0318ba3

Joomla's showon JS only finds the controlling field (remote_storage)
within the same rendered fieldset/tab. SFTP fields were in a separate
fieldset so they were never shown. Moved into the remote fieldset
alongside the dropdown.

chore(version): pre-release bump to 01.35.01-dev [skip ci] e465dfa6ee

Merge remote-tracking branch 'origin/main' into fix/sftp-showon ... 27dded6c62

# Conflicts:
#	.mokogitea/workflows/issue-branch.yml
#	README.md
#	source/packages/com_mokosuitebackup/mokosuitebackup.xml
#	source/packages/plg_actionlog_mokosuitebackup/mokosuitebackup.xml
#	source/packages/plg_console_mokosuitebackup/mokosuitebackup.xml
#	source/packages/plg_content_mokosuitebackup/mokosuitebackup.xml
#	source/packages/plg_quickicon_mokosuitebackup/mokosuitebackup.xml
#	source/packages/plg_system_mokosuitebackup/mokosuitebackup.xml
#	source/packages/plg_task_mokosuitebackup/mokosuitebackup.xml
#	source/packages/plg_webservices_mokosuitebackup/mokosuitebackup.xml
#	source/pkg_mokosuitebackup.xml

Merge pull request 'fix: SFTP fields not showing when SFTP selected' (#95) from fix/sftp-showon into main 8be0500913

chore(release): build 01.35.01 [skip ci] 33d852bacf

chore: promote changelog [Unreleased] → [01.35.01] 80c97620a5

feat: SFTP key file upload, auth type dropdown, security hardening ... d6b3e8cff0

SFTP UX improvements:
- SshKeyField: file upload button (FileReader → base64 → hidden field),
  key never displayed as readable text, __KEEP_EXISTING__ sentinel
  preserves DB value on re-save without re-uploading
- Auth type dropdown: password / key file / key file + passphrase
  with conditional field visibility via showon
- Required field markers on host, username, path, password
- Remove insecure FTP option from remote storage dropdown

Security:
- Private key stored base64-encoded in database
- SftpUploader decodes base64 before writing temp file
- ProfileTable::store() handles sentinel to prevent key leakage
- Key content never rendered in HTML form output

chore(version): pre-release bump to 01.35.03-dev [skip ci] e329dbd99b

Merge pull request 'feat: SFTP key file upload, auth type dropdown, security hardening' (#96) from fix/sftp-key-upload into main 7826c315b1

chore(release): build 01.35.03 [skip ci] 18127454b5

chore: promote changelog [Unreleased] → [01.35.03] fe76f81b47

chore: sync auto-bump.yml from Template-Generic [skip ci] fd517c16f3

chore: sync issue-branch.yml from Template-Generic [skip ci] 11ccdbfde4

chore: sync pr-check.yml from Template-Generic [skip ci] 0be459fe34

chore: sync repo-health.yml from Template-Generic [skip ci] 7515274712

fix: remove required attr from SFTP showon fields — blocks save when not SFTP ... 1e9c8d54f4

Joomla validates required fields server-side regardless of showon
visibility. SFTP fields with required="true" block saving when
remote_storage is set to None or S3/GDrive because the hidden
fields submit empty values. Validation should be done in
ProfileTable::check() conditionally instead.

chore(version): pre-release bump to 01.35.04-dev [skip ci] 5785e9fd1e

Merge remote-tracking branch 'origin/main' into fix/sftp-key-upload 5b9351e5f0

chore: normalize workflows e327f9cf5c

Merge branch 'fix/sftp-key-upload' of https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteBackup into fix/sftp-key-upload ... bda4b0a23d

# Conflicts:
#	.mokogitea/workflows/issue-branch.yml
#	README.md
#	source/packages/com_mokosuitebackup/mokosuitebackup.xml
#	source/packages/plg_actionlog_mokosuitebackup/mokosuitebackup.xml
#	source/packages/plg_console_mokosuitebackup/mokosuitebackup.xml
#	source/packages/plg_content_mokosuitebackup/mokosuitebackup.xml
#	source/packages/plg_quickicon_mokosuitebackup/mokosuitebackup.xml
#	source/packages/plg_system_mokosuitebackup/mokosuitebackup.xml
#	source/packages/plg_task_mokosuitebackup/mokosuitebackup.xml
#	source/packages/plg_webservices_mokosuitebackup/mokosuitebackup.xml
#	source/pkg_mokosuitebackup.xml

Merge pull request 'fix: SFTP fields not showing when SFTP selected' (#99) from fix/sftp-key-upload into main bc06657317

chore(release): build 01.35.04 [skip ci] 00e7963988

chore: promote changelog [Unreleased] → [01.35.04] 6d5ef50727

feat: clickable placeholder pills for backup dir and archive name fields ... 456e744d81

Both Backup Directory and Archive Name Format fields now show clickable
placeholder tags below the input. Clicking a tag inserts the placeholder
at the current cursor position using selectionStart/End.

- FolderPickerField: pills for [HOME], [DEFAULT_DIR], [host], [site_name],
  [date], [profile_id], [profile_name], [type]
- PlaceholderTextField: new custom field type used by archive_name_format,
  configurable placeholders via XML attribute
- Cursor position preserved after insert, input event dispatched for
  live status updates

Merge pull request 'feat: Clickable placeholder pills for backup dir and archive name' (#102) from feat/clickable-placeholders into main 7427cbb043

chore(release): build 01.36.00 [skip ci] 089ec69595

chore: promote changelog [Unreleased] → [01.36.00] d9557489d5

chore: sync auto-bump.yml from Template-Generic [skip ci] 8348d23fe4

chore: sync issue-branch.yml from Template-Generic [skip ci] bde20e82ad

chore: sync pr-check.yml from Template-Generic [skip ci] b1833825e7

chore: sync repo-health.yml from Template-Generic [skip ci] 83e91c6fa6

feat: profiles UI, snapshot detail, progress warning, action logs (#100, #104, #108, #110) ... 64ffbb9d61

#100: Run Backup button on profiles list (per-row) and edit toolbar,
backup count badge linking to filtered backups view, View Backups
toolbar button on profile edit.

#101: Profile → filtered backup list link (included in #100).

#104: Snapshot browse modal now shows tabbed view (Articles,
Categories, Modules) with item counts. AjaxController returns
all content types. Categories show indented hierarchy.

#108: "Do not navigate away or close this window" warning banner
added to both backup and restore progress modals.

#110: Joomla Action Logs integration — RestoreEngine, SnapshotEngine,
and SnapshotRestoreEngine now dispatch events that the actionlog
plugin logs to #__action_logs.

Closes #100, closes #101, closes #104, closes #108, closes #110

Merge pull request 'feat: Profiles UI, snapshot detail, progress warning, action logs' (#120) from feat/batch-ui-fixes into main 4841f24eab

chore(release): build 01.37.00 [skip ci] 13c251196b

chore: promote changelog [Unreleased] → [01.37.00] 70d7da34b3

chore: sync issue-branch.yml from Template-Generic [skip ci] 0619825f38

feat: standalone restore script — separate file that scans for ZIPs (#107) ... e62dba8f40

New MokoRestore mode: 'standalone' generates restore.php as a separate
file that scans its directory for ZIP backup archives and lets the user
choose which one to restore. Unlike 'wrapped' mode which bundles
restore.php inside the backup ZIP, standalone mode keeps both files
separate — ideal for remote servers where you SCP the backup.

Changes:
- MokoRestore::generateStandalone() — writes restore.php with ZIP scanner
- Profile form: include_mokorestore now a dropdown (none/wrapped/standalone)
- BackupEngine: standalone mode writes restore.php + uploads to remote
- Restore script uses safe DOM methods (no innerHTML with user data)

Closes #107

Merge pull request 'feat: Standalone restore script — separate file that scans for ZIPs (#107)' (#123) from feat/standalone-restore-script into main f55b032cc9

chore(release): build 01.38.00 [skip ci] 18b65d30ac

chore: promote changelog [Unreleased] → [01.38.00] d5bbab7e72

chore: sync auto-bump.yml from Template-Generic [skip ci] 65d30613b2

chore: sync issue-branch.yml from Template-Generic [skip ci] 5b4717bf6f

chore: sync pr-check.yml from Template-Generic [skip ci] df7c07bec4

chore: sync repo-health.yml from Template-Generic [skip ci] 6d9d96d7cd

fix: change include_mokorestore column from TINYINT to VARCHAR(20) ... cd31617e21

The column was TINYINT(1) which can only store 0/1. The new
'standalone' mode value causes MySQL to truncate the string to 0,
breaking profile save. Changed to VARCHAR(20) to support all three
modes: '0' (none), '1' (wrapped), 'standalone'.

chore(version): pre-release bump to 01.38.01-dev [skip ci] e8d7d1d421

Merge pull request 'fix: include_mokorestore column type — TINYINT cannot store 'standalone'' (#124) from fix/mokorestore-column-type into main 6f6a6c705b

chore(release): build 01.38.01 [skip ci] 6a1f4a8797

chore: promote changelog [Unreleased] → [01.38.01] 1aa35dd041

fix: placeholder resolution display + CSRF token on Run Backup button ... fc41e1801a

FolderPickerField: shows resolved placeholder values below input as
badges (e.g. [HOME]=/home/user, [host]=example.com), plus full
resolved path. Updates live as user types.

BackupsController::start(): accept CSRF token from both GET and POST
so the "Run Backup Now" link button on profile edit works without
triggering "security token did not match" error.

chore(version): pre-release bump to 01.38.02-dev [skip ci] e7f165ac96

Merge pull request 'fix: Placeholder resolution display + CSRF token on Run Backup button' (#125) from fix/placeholder-resolution-display into main 044e57adf3

chore(release): build 01.38.02 [skip ci] 9f5c8c0b5e

chore: promote changelog [Unreleased] → [01.38.02] e3e422d29e

chore: sync auto-bump.yml from Template-Generic [skip ci] efc5754bef

chore: sync issue-branch.yml from Template-Generic [skip ci] 30e8d7baa9

chore: sync pr-check.yml from Template-Generic [skip ci] 297f27c807

chore: sync repo-health.yml from Template-Generic [skip ci] d184ed9de0

fix: resolve [site_name] and other placeholders in checkDir AJAX ... e415e701cd

BackupDirectory::resolve() only handles [HOME] and [DEFAULT_DIR].
The checkDir AJAX endpoint now uses PlaceholderResolver to also
resolve [site_name], [host], [profile_id], [date], etc. before
checking if the directory exists. This makes the "Resolves to"
display accurate for all placeholder types.

chore(version): pre-release bump to 01.38.03-dev [skip ci] cbff40d04c

Merge pull request 'fix: Resolve [site_name] and all placeholders in checkDir AJAX' (#126) from fix/site-name-resolution into main 747b68c179

chore(release): build 01.38.03 [skip ci] c2ff3b272a

chore: promote changelog [Unreleased] → [01.38.03] 53ff99148c

feat: uppercase all placeholders + EXAMPLE prefix in resolution display ... de632e9c5c

All placeholders changed from lowercase to UPPERCASE:
[host] → [HOST], [site_name] → [SITE_NAME], [date] → [DATE],
[datetime] → [DATETIME], [profile_id] → [PROFILE_ID], etc.

[HOME] and [DEFAULT_DIR] were already uppercase — now consistent.

SQL migration 01.39.01 updates existing profile data in the database.
Resolution display prefixed with "EXAMPLE:" to clarify these are
example values resolved at backup time.

13 files updated across engines, fields, forms, templates, and SQL.

chore(version): pre-release bump to 01.38.04-dev [skip ci] fb99afbeba

Merge pull request 'feat: Uppercase all placeholders + EXAMPLE prefix in display' (#127) from fix/uppercase-placeholders into main 4191f44c1b

chore(release): build 01.38.04 [skip ci] 0f914c3061

chore: promote changelog [Unreleased] → [01.38.04] 65c8820db4

feat: comprehensive help modal for backup directory field ... 12c832d7fe

Expanded the help modal with:
- Absolute paths: starts with / or drive letter, used as-is
- Relative paths: ./backups, ../backups, ../../backups with table
  showing URL-style conventions and resolved examples
- Placeholder paths: detailed descriptions of each placeholder
  with current server values
- Recommended configurations table: single site, multi-site,
  date-organized, per-profile, shared hosting
- Security warnings for web-root-accessible paths
- Help button uses JS click handler with Bootstrap 5 fallback
  (fixes non-working tooltip icon)

chore(version): pre-release bump to 01.38.05-dev [skip ci] 5a0cd51df6

Merge pull request 'feat: Comprehensive help modal for backup directory + fix help button' (#128) from fix/folder-picker-tooltip into main 02a6e30db1

chore(release): build 01.38.05 [skip ci] 61023821e6

chore: promote changelog [Unreleased] → [01.38.05] aaf189b87a

feat: data sanitization — passwords, emails, sessions (#129) ... 5698c074da

New "Data Sanitization" fieldset on profile form with four options:
- Sanitize User Passwords: replaces all bcrypt hashes with invalid sentinel
- Preserve Super Admin: keeps Super Users group passwords intact
- Sanitize User Emails: replaces with user123@sanitized.example.com
- Clear Session Data: excludes #__session table data (default: on)

DatabaseDumper sanitizes rows inline during dump — both in-memory
and file-streaming paths. Super admin detection uses group_id=8
from #__user_usergroup_map with static caching.

Use cases: sharing backups, creating demo/staging sites, GDPR compliance.

Partial #129 (Part 2 — restore script password reset — tracked separately)

Merge pull request 'feat: Data sanitization — passwords, emails, sessions (#129)' (#130) from feat/sanitize-user-passwords into main f830dc2ddf

chore(release): build 01.39.00 [skip ci] 09bac755a9

chore: promote changelog [Unreleased] → [01.39.00] 29da9776cd

chore: sync auto-bump.yml from Template-Generic [skip ci] 5a6ad02b53

chore: sync issue-branch.yml from Template-Generic [skip ci] c17349277d

chore: sync pr-check.yml from Template-Generic [skip ci] 48f132ecf9

chore: sync repo-health.yml from Template-Generic [skip ci] 1def73df19

feat: MokoRestore post-restore resets + per-table conflict resolution (#131, #132) ... 0dc0eb1bef

#131: Post-restore actions step in MokoRestore wizard:
- Reset all passwords to temporary "changeme" with requireReset flag
- Reset article hit counters to zero
- Clear content versions (#__history)
- Clear sessions (#__session)
- Clear cache tables and filesystem cache
- Auto-detect sanitized password hashes and prompt for reset

#132: Per-table conflict resolution during database import:
- New "Tables" step shows all tables from database.sql
- Per-table dropdown: Replace / Skip / Merge / Data Only
- Preset buttons: All Replace, All Skip, Everything except users
- Skip mode skips all statements for that table
- Merge mode uses INSERT IGNORE instead of INSERT INTO
- Data Only skips DROP/CREATE, inserts data only

Wizard now has 9 steps: Pre-check → Extract → Tables → Database →
Config → Admin → Post-Restore → Provisioning → Complete

Closes #131, closes #132

Merge remote-tracking branch 'origin/main' into feat/mokorestore-enhancements da52a9d2f9

chore: remove deprecated .mokogitea/workflows/deploy-manual.yml [skip ci] 8aefc1d702

chore: remove deprecated .mokogitea/workflows/composer-publish.yml [skip ci] 3d6c0974fa

chore: merge main, resolve conflicts, remove stale files 114995242d

Merge pull request 'feat: MokoRestore post-restore resets + per-table conflict resolution' (#133) from feat/mokorestore-enhancements into main 6638577cf5

fix: MokoRestore review findings + update README ... 7e404b0246

Review fixes:
- data-only mode uses REPLACE INTO (was INSERT INTO, broke on dupes)
- temporary password is random 16-char hex (was hardcoded "changeme")

README rewritten with all features: snapshots, SFTP, MokoRestore
wizard, sanitization, dashboard, CLI, API.

chore(version): pre-release bump to 01.39.01-dev [skip ci] 9319abec41

Merge pull request 'fix: MokoRestore review findings + README rewrite' (#134) from fix/mokorestore-review-findings into main 997924a107

chore: sync auto-bump.yml from Template-Generic [skip ci] 10b31fea84

chore: sync deploy-manual.yml from Template-Generic [skip ci] d96f3e7760

chore: sync issue-branch.yml from Template-Generic [skip ci] 7ea30aa146

chore: sync pr-check.yml from Template-Generic [skip ci] 13f1c1db5e

chore: sync repo-health.yml from Template-Generic [skip ci] 7970597fb8

feat: purge, CPanel module, 7z format, SFTP browser (#119, #105, #122, #98) ... 899a33bc58

#119: Manual purge — toolbar button opens modal with date picker,
AJAX count preview, confirmation before bulk delete.

#105: CPanel admin dashboard module (mod_mokosuitebackup_cpanel) —
backup status, quick action buttons per profile, next scheduled,
stats, and quick links. Registered in package manifest.

#122: 7z archive format via system 7za/7z CLI binary with optional
password encryption. New SevenZipArchiver engine class.

#98: SFTP remote file browser — custom SftpPathField with "Browse
Remote" button, modal directory listing via SSH ls, click to navigate,
double-click to select.

Also: CHANGELOG updated, wiki Home updated, #121 verified (encryption
field already visible in Archive Settings tab).

Closes #119, closes #105, closes #122, closes #98, closes #121

Merge pull request 'feat: Purge, CPanel module, 7z format, SFTP browser (#119, #105, #122, #98)' (#135) from feat/final-batch into main 84511b08d2

chore: remove security-audit.yml -- handled by MokoGitea 8cea58d1f6

fix: resolve merge conflict markers in script.php ... 0fbcc861d9

12 conflict markers from a stale stash pop were accidentally
committed to main in PR #135. Resolved all by keeping the
"Updated upstream" blocks which include both error_log() and
user-facing enqueueMessage() calls.

Merge pull request 'fix: Resolve merge conflict markers in script.php' (#136) from fix/script-merge-conflicts into main 4e6369094b

chore(release): build 01.39.01 [skip ci] cb5ff2843d

chore: promote changelog [Unreleased] → [01.39.01] 95317fb707

feat: complete config.xml and access.xml (#137) ... 1f7def05c1

config.xml:
- Defaults fieldset: archive format, MokoRestore mode, sanitization
  defaults (passwords, emails, sessions), log retention days
- Global ntfy fieldset: server, topic, token (fallback for profiles)

access.xml:
- mokosuitebackup.backup.purge — bulk delete old backups
- mokosuitebackup.backup.compare — compare two backups
- mokosuitebackup.backup.browse — browse archive file listings

30+ new language strings for all fields and ACL actions.

Partial #137 (ACL enforcement audit in separate commit)

fix: enforce correct ACL permissions across all controllers (#137) ... 8e5913d706

13 ACL fixes across 5 files:
- BackupsController: purge() uses backup.purge (was core.delete)
- SnapshotsController: delete() uses snapshot.manage (was core.delete)
- AjaxController: restoreInit/Step use backup.restore (was backup.run),
  browseArchive uses backup.browse (was core.manage),
  countPurge uses backup.purge (was core.delete),
  compareBackups uses backup.compare (was core.manage)
- API SnapshotsController: displayList/download use snapshot.manage
  (was core.manage)
- HtmlView: verify gated by core.manage, compare by backup.compare,
  purge separated from delete with backup.purge

Closes #137

Merge pull request 'feat: Complete config.xml, access.xml + ACL enforcement audit (#137)' (#138) from feat/config-acl-audit into main 1b93d2ac21

chore(release): build 01.40.00 [skip ci] b4fb674566

chore: promote changelog [Unreleased] → [01.40.00] 50a879155d

chore: sync auto-bump.yml from Template-Generic [skip ci] 78b68d2647

chore: sync issue-branch.yml from Template-Generic [skip ci] 26d765b74e

chore: sync pr-check.yml from Template-Generic [skip ci] dcd772018e

chore: sync repo-health.yml from Template-Generic [skip ci] 8e70bfb723

feat: multi-remote storage — multiple destinations per profile (#97) ... dae30161ae

New #__mokosuitebackup_remotes table stores remote destinations with
JSON params per type (SFTP/S3/GDrive/FTP). Each profile can have
multiple enabled destinations — the engine uploads to all of them.

Database:
- New table with profile_id FK, type, enabled, params JSON, ordering
- Migration auto-converts existing profile remote columns to new table
- RemoteTable, RemoteModel, RemotesModel classes

Engine:
- BackupEngine: loadRemoteDestinations() + createUploaderFromParams()
  iterates all enabled remotes, falls back to legacy columns
- SteppedBackupEngine: one upload step per remote destination, persisted
  via session.remoteDestinations + remoteIndex
- Local copy only deleted when ALL uploads succeed

UI:
- Profile edit: "Remote Destinations" linked table with AJAX CRUD
- Add/edit modal with type selector showing dynamic fields
- Toggle enabled/disabled, delete with confirmation
- Legacy fields hidden when remotes configured, shown as fallback
- Secrets masked in responses, merged from DB on save

Closes #97

Merge pull request 'feat: Multi-remote storage — multiple destinations per profile (#97)' (#139) from feat/multi-remote-storage into main ef17873448

chore(release): build 01.41.00 [skip ci] 3c32bd93e9

chore: promote changelog [Unreleased] → [01.41.00] 4bafaa519a

docs: comprehensive CHANGELOG consolidation for v01.41.00 ... 1da2fdb856

Consolidated all fragmented changelog entries from the session into
a single clean v01.41.00 release entry organized by feature area.
Covers: multi-remote, snapshots, SFTP, MokoRestore, sanitization,
engine improvements, admin UI, CLI/API, notifications, security.

chore(version): pre-release bump to 01.41.01-dev [skip ci] 0f95cb6e9f

fix: clean up wordy field descriptions — shorter, punchier text ... 6c47838b30

Backup dir, archive name, MokoRestore, SFTP key, sanitization,
encryption descriptions all shortened. Removed redundant placeholder
lists (now handled by clickable pills and help modal).

chore(version): pre-release bump to 01.41.02-dev [skip ci] 0b2b885163

fix: review findings — key desc, missing changelog, [HOST] domain resolution ... ff7418721d

- Language: "encrypted" → "base64-encoded" for SSH key description
- CHANGELOG: added 3 missing bug fix entries (fields_values scope, CSRF
  token on Run Backup, SFTP showon/required)
- [HOST] placeholder: resolve domain from Joomla live_site config when
  HTTP_HOST is unavailable (CLI), instead of falling back to system
  hostname (joomla.invalid). Applied to both PlaceholderResolver and
  FolderPickerField.

chore(version): pre-release bump to 01.41.03-dev [skip ci] e633d0cc0a

chore: sync auto-release.yml from Template-Generic [skip ci] 898520d1db

Merge pull request 'docs: Comprehensive CHANGELOG consolidation + wiki update + testing parameters' (#140) from chore/changelog-wiki-testing into main 358a7eb68a

chore(release): build 01.42.00 [skip ci] c88b163de0

chore: promote changelog [Unreleased] → [01.42.00] af2a1a2dae

jmiller closed this pull request 2026-06-23 23:03:54 +00:00

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

component: admin

Admin UI and views

component: api

REST API

component: engine

Backup/restore engine

component: remote

Remote storage (FTP/GDrive)

component: scheduler

Scheduled tasks

No labels

Priority -

Type -

Milestone

No items

No Milestone

Assignees

Clear assignees

jmiller (Jonathan Miller)

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: MokoConsulting/MokoSuiteBackup#141