Sync dev with main (02.55.00) #206

Merged

jmiller merged 84 commits from sync/main-into-dev into dev 2026-07-04 21:26:26 +00:00

Conversation 0 Commits 84 Files Changed 71

+906 -1465

jmiller commented 2026-07-04 21:26:11 +00:00

Owner

Copy Link

Copy Source

Summary

dev had diverged far from main — stuck on the old 01.45.x-dev line, 83 commits behind and 13 unique (mostly superseded) commits ahead. This merges all of main (02.55.00) into dev so it's current again.

Conflicts were resolved in main's favor, then all shared files were forced to main's exact content. The result: dev's tree equals main's, except for 7 inert historical SQL migration stubs unique to dev (e.g. /* 01.45.05 — no schema changes */), which are kept to preserve migration history.

Why this is safe (investigated beforehand)

None of dev's 13 unique commits held anything missing from main:

• Update-server URL → MokoGitea: already on main (pkg manifest points to git.mokoconsulting.tech/.../updates.xml).
• #163 Bootstrap modals: superseded — main uses the modern getOrCreateInstance modal API throughout.
• #162 / button + MokoRestore tweaks: covered by main's since-rewritten engine.
• 10× version bumps (01.44.x–01.45.07-dev): superseded by main's 02.55.00.

dev's unique commits remain in history as merge ancestors; nothing is discarded.

Docs/sync only — no new code.

## Summary `dev` had diverged far from `main` — stuck on the old `01.45.x-dev` line, **83 commits behind** and 13 unique (mostly superseded) commits ahead. This merges all of `main` (`02.55.00`) into `dev` so it's current again. Conflicts were resolved in **main's favor**, then all shared files were forced to main's exact content. The result: `dev`'s tree equals `main`'s, except for 7 inert historical SQL migration stubs unique to dev (e.g. `/* 01.45.05 — no schema changes */`), which are kept to preserve migration history. ### Why this is safe (investigated beforehand) None of dev's 13 unique commits held anything missing from main: - **Update-server URL → MokoGitea**: already on main (`pkg` manifest points to `git.mokoconsulting.tech/.../updates.xml`). - **#163 Bootstrap modals**: superseded — main uses the modern `getOrCreateInstance` modal API throughout. - **#162 / button + MokoRestore tweaks**: covered by main's since-rewritten engine. - **10× version bumps** (`01.44.x`–`01.45.07-dev`): superseded by main's `02.55.00`. dev's unique commits remain in history as merge ancestors; nothing is discarded. Docs/sync only — no new code.

jmiller added 84 commits 2026-07-04 21:26:12 +00:00

Merge pull request 'release: promote dev to main (v01.43.37)' (#159) from dev into main 720f008050

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

ci: add submodules: recursive to checkout (fixes MokoSuiteClient packaging) 57c9ea600b

ci: add submodules: recursive to checkout (fixes MokoSuiteClient packaging) babdb9e390

chore(release): build 01.45.00 [skip ci] 13a526d6be

chore: promote changelog [Unreleased] → [01.45.00] 1a4bb32c6c

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

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

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

fix: remote upload prefix mismatch and restore security file visibility ... 3a6bb1c783

Remote uploaders (SFTP, FTP, S3, Google Drive) expect type-prefixed
property names (sftp_host, ftp_port, etc.) but createUploaderFromParams
passes unprefixed keys from the remotes table params JSON. Add prefix
mapping in createUploaderFromParams to bridge the naming gap.

Rename .mokorestore-security.php to mokorestore-security.php (no leading
dot) so the file is visible in file managers and not blocked by web
server dotfile rules. Also clean it up in actionCleanup.

Closes #13

Claude-Session: https://claude.ai/code/session_01MbEjBtsSjPuTWhqqrMS2wG

chore(version): pre-release bump to 02.52.16-dev [skip ci] f2f424a565

fix: recreate security file if missing while verification is pending ... 20ce945e73

The security file was only written inside the code-generation block
(first page load). If the file was deleted or failed to write, it
was never recreated because the session already held the code. Now
file writing is a separate check that runs whenever verification is
pending and the file is missing.

Claude-Session: https://claude.ai/code/session_01MbEjBtsSjPuTWhqqrMS2wG

chore(version): pre-release bump to 02.52.17-dev [skip ci] 236609341f

fix: add verbose error_log throughout restore script ... 4093267984

Every action handler now logs entry, key parameters, outcomes, and
failures to PHP error_log. Security file creation logs directory
permissions, PHP user, and the specific error when file_put_contents
fails. Database import logs SQL file size, statement counts, and
individual errors. Cleanup logs each file removal success/failure.

Claude-Session: https://claude.ai/code/session_01MbEjBtsSjPuTWhqqrMS2wG

chore(version): pre-release bump to 02.52.18-dev [skip ci] 3d9c48f40f

fix: remove orphaned deploy-manual workflow [skip ci] a4df3a651d

Merge pull request 'fix: remote upload prefix mismatch and restore security file' (#193) from fix/sftp-upload-and-restore-security into main 2d3a697f22

chore(release): build 02.52.18 [skip ci] 25cf65f4cf

chore: promote changelog [Unreleased] → [02.52.18] 983ec77dbd

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

Merge pull request 'fix: remove orphaned deploy-manual workflow' (#195) from fix/remove-deploy-manual into main ... eea1a40265

fix: remove orphaned deploy-manual workflow [skip ci]

fix: add cancel stalled backup action with ACL permission ... 1eb1c18bdf

Backups stuck in "running" status block all future backups for the same
profile via the preflight check. Previously the only fix was a manual
DB update.

Adds a toolbar button and AJAX endpoint to cancel stalled backups:
- New ACL permission: mokosuitebackup.backup.cancel
- BackupsController::cancelStalled() for toolbar (multi-select)
- AjaxController::cancelBackup() for AJAX/API use
- Sets status to "fail", cleans up partial archive files
- Updated preflight error message to mention the cancel action
- Language keys for en-GB and en-US

Claude-Session: https://claude.ai/code/session_01MbEjBtsSjPuTWhqqrMS2wG

chore(version): pre-release bump to 02.52.20-dev [skip ci] a56f72b186

fix: auto-cancel stalled backups after 30 min timeout ... b26a21820b

PreflightCheck now auto-cancels "running" backup records that have
exceeded 30 minutes, treating them as stalled. Partial archive files
are cleaned up. The auto-cancelled records are surfaced as warnings
so the user knows what happened.

Records younger than 30 minutes are assumed to be legitimately running
and still block new backups for the same profile.

Claude-Session: https://claude.ai/code/session_01MbEjBtsSjPuTWhqqrMS2wG

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

docs: update changelog with cancel stalled and pre-update modal ... 4560ffb84b

Claude-Session: https://claude.ai/code/session_01MbEjBtsSjPuTWhqqrMS2wG

chore(version): pre-release bump to 02.52.22-dev [skip ci] 8dac5a7448

Merge pull request 'fix: cancel stalled backups with ACL + auto-timeout failsafe' (#197) from fix/cancel-stalled-backup into main 1db4015003

chore(release): build 02.52.22 [skip ci] 007036301d

chore: promote changelog [Unreleased] → [02.52.22] 765e6feea6

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

fix: use warning status when backup succeeds but remote upload fails ... aefa46e0c4

Previously a successful backup with a failed remote upload was marked
as "complete", hiding the upload failure. Now these records get a
"warning" status with a yellow badge so operators can see at a glance
which backups didn't reach their remote destination.

Warning-status records are treated as usable backups throughout:
- Downloadable, browsable, and restorable (the archive is intact)
- Counted in dashboard stats, storage totals, and success streaks
- Included in purge operations and differential base lookups
- Shown with yellow "warning" badge in list, detail, and cpanel module
- Filterable via the status dropdown on Backup Records

Claude-Session: https://claude.ai/code/session_01MbEjBtsSjPuTWhqqrMS2wG

chore(version): pre-release bump to 02.52.23-dev [skip ci] 1daa6869cc

docs: add warning status changes to changelog ... 9c0c6eae15

Claude-Session: https://claude.ai/code/session_01MbEjBtsSjPuTWhqqrMS2wG

chore(version): pre-release bump to 02.52.24-dev [skip ci] 9820d75212

Merge pull request 'fix: use warning status when backup succeeds but upload fails' (#199) from fix/upload-fail-warning-status into main 7b38e238f5

chore(release): build 02.52.24 [skip ci] 202a26847b

chore: promote changelog [Unreleased] → [02.52.24] 481e395624

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

refactor(remote): remove legacy single-remote storage in favor of remotes table ... 68605ffc05

Drops the per-profile remote_storage column and all legacy FTP/SFTP/S3/
Google Drive credential columns. Remote destinations are now sourced
exclusively from #__mokosuitebackup_remotes (multi-remote), which is
created at install time — so the backward-compat fallback branches in
BackupEngine, SteppedBackupEngine and loadRemoteDestinations are removed.

- sql: drop 26 legacy columns (install.mysql.sql + 02.52.25.sql migration)
- forms/profile.xml: remove legacy remote fields and ftp/gdrive/s3 fieldsets
- tmpl/profile/edit.php: drop legacy UI, add save-first prompt, use
  getOrCreateInstance for the modal, read item.params (was item.config)
- PreflightCheck: validate credentials from the remotes table; curl
  warning now applies to ntfy only
- SteppedSession: drop remoteStorage property
- language: add backup-record delete-count strings
- script.php: simplify postflight license-key prompt

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

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

chore: sync ci-generic.yml from Template-Generic [skip ci] 318b1469e3

chore: sync cleanup.yml from Template-Generic [skip ci] 6792688740

chore: sync notify.yml from Template-Generic [skip ci] caaedfdff5

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

chore: sync pre-release.yml from Template-Generic [skip ci] 77d93602d6

chore: sync sync-on-merge.yml from Template-Generic [skip ci] 406b666486

feat: add COM_MOKOJOOMBACKUP_SHORT and apply short name to views and admin menu ... a808789acb

- Add COM_MOKOJOOMBACKUP_SHORT="Backup" to the component .ini and .sys.ini
  (en-GB + en-US) so both view titles and the admin sidebar menu resolve it.
- Prefix every admin view's toolbar title with the short brand via the
  constant (e.g. "Backup: Dashboard", "Backup: Records"), and tighten the
  view title strings that redundantly led with "Backup"/"MokoSuiteBackup".
- Admin sidebar top-level menu now shows the short name. Hardcoded as
  "Backup" in the manifest per the package-xml convention (no language
  strings in package XML).

chore(version): pre-release bump to 02.52.27-dev [skip ci] 1be16af5a4

chore: sync branch-cleanup.yml from Template-Generic [skip ci] 1ee5e6ba9b

chore: sync ci-generic.yml from Template-Generic [skip ci] 6cf34ea2ed

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

fix(remote-cleanup): resolve dropped-column references found in review ... 46daabc34f

Follow-up to the legacy remote-storage removal — three consumers still
referenced columns this branch drops:

- 02.52.25.sql: use plain DROP COLUMN instead of DROP COLUMN IF EXISTS.
  IF EXISTS on DROP COLUMN is a MariaDB-only extension and errors on
  Oracle MySQL 8.x (which Joomla also supports); the columns always exist
  here, so the guard is unnecessary and the migration is now portable.
- AkeebaImporter::mapToMokoProfile(): stop inserting the 19 dropped
  remote_storage/ftp_*/gdrive_*/s3_* columns (would fatal with "Unknown
  column" on Akeeba import). Remote settings now live in the remotes
  table and are re-added on the profile Remote tab after import.
- AjaxController::browseSftpDir() + SftpPathField: remove. These were the
  legacy single-SFTP path picker, orphaned when the SftpPath form field
  was removed; they read now-dropped sftp_* columns.

Claude-Session: https://claude.ai/code/session_01WbGBN9VyRK61zczYWcCQ2i

chore(version): pre-release bump to 02.52.30-dev [skip ci] d3e3fd25e7

Merge pull request 'Add COM_MOKOJOOMBACKUP_SHORT and apply short name to views and admin menu' (#200) from chore/short-name-branding into main 23360f4cbc

chore(release): build 02.53.00 [skip ci] c492d30b1c

chore: promote changelog [Unreleased] → [02.53.00] 6ff350fb1c

chore: sync ci-generic.yml from Template-Generic [skip ci] 84f37a8b51

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

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

chore(manifests): hardcode names/descriptions and enforce Type - Name convention ... d155958be3

Per the package-XML convention, manifests must not use language strings for
titles/descriptions, and <name> must follow "Type - Name".

- Component <name> "MokoSuiteBackup" → "Component - MokoSuiteBackup"
- Module <name> "mod_mokosuitebackup_cpanel" → "Module - MokoSuiteBackup - cPanel"
- Hardcode every <description> (pkg, com, mod, all 7 plugins) with the literal
  text previously stored in the *_DESCRIPTION language constants
- Hardcode the component admin submenu titles (Dashboard, Backup Records,
  Content Snapshots, Backup Profiles)

Plugin <name> values already followed the Group - Name format and are
unchanged. All manifests validated as well-formed XML.

Merge pull request 'Hardcode manifest names/descriptions and enforce Type - Name convention' (#201) from chore/manifest-naming-convention into main bdbbe74021

chore(release): build 02.54.00 [skip ci] 2e5b57fe5d

chore: promote changelog [Unreleased] → [02.54.00] 4b2bb8b655

fix: enforce per-profile retention and repair Purge Old Backups button ... 10248b284a

Two related backup-management fixes.

Retention (records/days to keep):
- The retention fieldset was defined in profile.xml but never rendered
  in the profile editor, so retention_days/retention_count were invisible.
  Render the retention fieldset on the Archive tab.
- retention_days/retention_count were read by nothing, so they pruned no
  backups. Add RetentionManager::prune(), called from completeRecord() in
  both BackupEngine and SteppedBackupEngine after a backup finishes.
  Policy: delete a completed/warning backup when EITHER it is older than
  retention_days OR it falls outside the newest retention_count copies
  (0 = unlimited for that rule). Deleting a record also removes its
  archive and log file.
- Correct misleading language/schema text ("use global default" — no such
  global backup-retention setting exists) to "0 = unlimited".

Purge Old Backups button:
- The modal only opened via a fragile selector match on the toolbar
  button's inline onclick, which Joomla 6's Atum toolbar does not render,
  so the button did nothing. Wrap Joomla.submitbutton to open the modal
  for the backups.purgeModal task, keeping the selector as a fallback.

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

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

Merge pull request 'Enforce per-profile retention and repair Purge Old Backups button' (#203) from fix/backup-retention-purge into main 2de2c5f917

fix(installer): apply standard licensing + install-completion script pattern ... 1758694893

Adopts the Template-Joomla package-script pattern for download-key handling
and post-install messaging, while preserving all MokoSuiteBackup-specific
postflight steps (plugins, webcron secret, scheduled task, submenus,
client_id fix, icon sync, backup_dir migration).

- preflight (update): backupDownloadKey() caches the bare dlid value
- postflight (update): restoreDownloadKey() re-writes extra_query as dlid=<key>
- postflight (install): installSuccessful() + warnMissingLicenseKey()
- postflight (update): installSuccessful()
- License nag now runs on install only (a fresh install never has a key),
  removing the previous always-run "is a key present?" guard
- Licensing methods log via Joomla\CMS\Log\Log instead of error_log

chore(release): build 02.54.00 [skip ci] 772f2b75a1

Merge pull request 'Apply standard licensing + install-completion installer script pattern' (#202) from chore/installer-script-template into main 23fa4884bd

chore(release): build 02.55.00 [skip ci] 4dc8bc6912

chore: promote changelog [Unreleased] → [02.55.00] 5615468042

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

Merge remote-tracking branch 'origin/main' into fix/remote-storage-cleanup ... 6cef8fa9f7

# Conflicts:
#	SECURITY.md
#	source/packages/MokoSuiteClient
#	source/packages/com_mokosuitebackup/mokosuitebackup.xml
#	source/packages/mod_mokosuitebackup_cpanel/mod_mokosuitebackup_cpanel.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
#	source/script.php

Merge CI version bump (superseded by main's 02.55.00) 6f7dc6766d

Merge pull request 'Remove legacy single-remote storage in favor of remotes table' (#204) from fix/remote-storage-cleanup into main f0fa645e51

chore(release): build 02.55.00 [skip ci] eecb8c8c72

chore: promote changelog [Unreleased] → [02.55.00] 0578f2deed

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

docs(changelog): document 02.53.00–02.55.00 and pending remote-storage removal [skip ci] ... 0c9d9a6336

Populate the empty CI-generated version sections and dedupe headers:
- 02.53.00: short-name branding
- 02.54.00: per-profile retention enforcement, Purge button fix, manifest naming convention
- 02.55.00: installer licensing + install-completion pattern
- Unreleased: legacy single-remote storage removal (#204)

Claude-Session: https://claude.ai/code/session_01WbGBN9VyRK61zczYWcCQ2i

Merge pull request 'docs(changelog): document 02.53.00–02.55.00 releases' (#205) from docs/changelog-update into main ee11ec8ef7

Merge remote-tracking branch 'origin/main' into sync/main-into-dev 3bd286f0e3

jmiller merged commit f5e536fb95 into dev 2026-07-04 21:26:26 +00:00

jmiller deleted branch sync/main-into-dev 2026-07-04 21:26:28 +00:00

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

bug

Something is not working

duplicate

This issue or pull request already exists

enhancement

New feature

help wanted

Need some help

invalid

Something is wrong

question

More information is needed

wontfix

This won't be fixed

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#206