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

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.

.mokogitea/workflows/auto-release.yml

@@ -7,7 +7,7 @@
 # INGROUP: mokocli.Release
 # REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/mokocli
 # PATH: /templates/workflows/universal/auto-release.yml.template
-# VERSION: 05.00.00
+# VERSION: 05.01.00
 # BRIEF: Universal build & release � detects platform from manifest.xml
 #
 # +=======================================================================+
@@ -64,10 +64,14 @@ jobs:
   promote-rc:
     name: Promote to RC
     runs-on: release
+    # Skip on template repos (Template-*) — they scaffold other repos and do not release.
     if: >-
-      (github.event.action == 'opened' && github.event.pull_request.merged != true) ||
-      (github.event.action == 'synchronize' && github.event.pull_request.merged != true) ||
-      (github.event_name == 'workflow_dispatch' && inputs.action == 'promote-rc')
+      !startsWith(github.event.repository.name, 'Template-') &&
+      (
+        (github.event.action == 'opened' && github.event.pull_request.merged != true) ||
+        (github.event.action == 'synchronize' && github.event.pull_request.merged != true) ||
+        (github.event_name == 'workflow_dispatch' && inputs.action == 'promote-rc')
+      )
 
     steps:
       - name: Checkout repository
@@ -75,6 +79,7 @@ jobs:
         with:
           token: ${{ secrets.MOKOGITEA_TOKEN }}
           fetch-depth: 1
+          submodules: recursive
 
       - name: Setup mokocli tools
         env:
@@ -163,9 +168,13 @@ jobs:
   release:
     name: Build & Release Pipeline
     runs-on: release
+    # Skip on template repos (Template-*) — they scaffold other repos and do not release.
     if: >-
-      github.event.pull_request.merged == true ||
-      (github.event_name == 'workflow_dispatch' && inputs.action != 'promote-rc')
+      !startsWith(github.event.repository.name, 'Template-') &&
+      (
+        github.event.pull_request.merged == true ||
+        (github.event_name == 'workflow_dispatch' && inputs.action != 'promote-rc')
+      )
 
     steps:
       - name: Checkout repository
@@ -173,6 +182,7 @@ jobs:
         with:
           token: ${{ secrets.MOKOGITEA_TOKEN }}
           fetch-depth: 0
+          submodules: recursive
 
       - name: Configure git for bot pushes
         run: |

.mokogitea/workflows/branch-cleanup.yml

@@ -33,7 +33,8 @@ jobs:
         run: |
           BRANCH="${{ github.event.pull_request.head.ref }}"
           API="${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}/api/v1/repos/${{ github.repository }}/branches"
-          ENCODED=$(php -r "echo rawurlencode('${BRANCH}');")
+          # URL-encode the branch name's slashes (no PHP dependency on the runner)
+          ENCODED=$(printf '%s' "${BRANCH}" | sed 's|/|%2F|g')
 
           STATUS=$(curl -sf -o /dev/null -w "%{http_code}" -X DELETE \
             -H "Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}" \

.mokogitea/workflows/ci-generic.yml

@@ -6,7 +6,7 @@
 # DEFGROUP: Gitea.Workflow
 # INGROUP: MokoStandards.CI
 # REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
-# PATH: /.gitea/workflows/ci-generic.yml
+# PATH: /.mokogitea/workflows/ci-generic.yml
 # VERSION: 01.00.00
 # BRIEF: CI pipeline — lint, validate, and test for generic projects (PHP + Node.js)
 
@@ -32,6 +32,8 @@ jobs:
   lint:
     name: Lint & Validate
     runs-on: ubuntu-latest
+    # Skip on template repos (Template-*) — they hold placeholder scaffolding, not buildable source.
+    if: ${{ !startsWith(github.event.repository.name, 'Template-') }}
 
     steps:
       - name: Checkout
@@ -130,6 +132,9 @@ jobs:
     name: Tests
     runs-on: ubuntu-latest
     needs: lint
+    # Run only when lint succeeded; always() forces evaluation so a skipped
+    # lint (e.g. template repos) skips this job cleanly instead of hanging.
+    if: ${{ always() && needs.lint.result == 'success' }}
 
     steps:
       - name: Checkout

.mokogitea/workflows/cleanup.yml

@@ -6,7 +6,7 @@
 # DEFGROUP: Gitea.Workflow
 # INGROUP: MokoStandards.Maintenance
 # REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards
-# PATH: /.gitea/workflows/cleanup.yml
+# PATH: /.mokogitea/workflows/cleanup.yml
 # VERSION: 01.00.00
 # BRIEF: Scheduled cleanup — delete merged branches and old workflow runs
 

.mokogitea/workflows/deploy-manual.yml

@@ -1,126 +0,0 @@
-# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
-# INGROUP: MokoStandards.Deploy
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards-API
-# PATH: /templates/workflows/joomla/deploy-manual.yml.template
-# VERSION: 04.07.00
-# BRIEF: Manual SFTP deploy to dev server for Joomla repos
-
-name: "Universal: Deploy to Dev (Manual)"
-
-on:
-  workflow_dispatch:
-    inputs:
-      clear_remote:
-        description: 'Delete all remote files before uploading'
-        required: false
-        default: 'false'
-        type: boolean
-
-env:
-  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
-
-permissions:
-  contents: read
-
-jobs:
-  deploy:
-    name: SFTP Deploy to Dev
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-
-      - name: Setup PHP
-        run: |
-          php -v && composer --version
-
-      - name: Setup MokoStandards tools
-        env:
-          MOKOGITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN || github.token }}
-          MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN || github.token }}
-          MOKO_CLONE_HOST: ${{ secrets.MOKOGITEA_TOKEN && 'git.mokoconsulting.tech/MokoConsulting' || 'github.com/mokoconsulting-tech' }}
-          COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.MOKOGITEA_TOKEN || github.token }}"}}'
-        run: |
-          git clone --depth 1 --branch main --quiet \
-            "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/MokoStandards-API.git" \
-            /tmp/mokostandards-api 2>/dev/null || true
-          if [ -d "/tmp/mokostandards-api" ] && [ -f "/tmp/mokostandards-api/composer.json" ]; then
-            cd /tmp/mokostandards-api && composer install --no-dev --no-interaction --quiet 2>/dev/null || true
-          fi
-
-      - name: Check FTP configuration
-        id: check
-        env:
-          HOST: ${{ vars.DEV_FTP_HOST }}
-          PATH_VAR: ${{ vars.DEV_FTP_PATH }}
-          PORT: ${{ vars.DEV_FTP_PORT }}
-        run: |
-          if [ -z "$HOST" ] || [ -z "$PATH_VAR" ]; then
-            echo "DEV_FTP_HOST or DEV_FTP_PATH not configured -- cannot deploy"
-            echo "skip=true" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-          echo "skip=false" >> "$GITHUB_OUTPUT"
-          echo "host=$HOST" >> "$GITHUB_OUTPUT"
-
-          REMOTE="${PATH_VAR%/}"
-          echo "remote=$REMOTE" >> "$GITHUB_OUTPUT"
-
-          [ -z "$PORT" ] && PORT="22"
-          echo "port=$PORT" >> "$GITHUB_OUTPUT"
-
-      - name: Deploy via SFTP
-        if: steps.check.outputs.skip != 'true'
-        env:
-          SFTP_KEY: ${{ secrets.DEV_FTP_KEY }}
-          SFTP_PASS: ${{ secrets.DEV_FTP_PASSWORD }}
-          SFTP_USER: ${{ vars.DEV_FTP_USERNAME }}
-        run: |
-          SOURCE_DIR="src"
-          [ ! -d "$SOURCE_DIR" ] && SOURCE_DIR="htdocs"
-          [ ! -d "$SOURCE_DIR" ] && { echo "No src/ or htdocs/ -- nothing to deploy"; exit 0; }
-
-          printf '{"host":"%s","port":%s,"username":"%s","remotePath":"%s"' \
-            "${{ steps.check.outputs.host }}" "${{ steps.check.outputs.port }}" "$SFTP_USER" "${{ steps.check.outputs.remote }}" \
-            > /tmp/sftp-config.json
-
-          if [ -n "$SFTP_KEY" ]; then
-            echo "$SFTP_KEY" > /tmp/deploy_key
-            chmod 600 /tmp/deploy_key
-            printf ',"privateKeyPath":"/tmp/deploy_key"}' >> /tmp/sftp-config.json
-          else
-            printf ',"password":"%s"}' "$SFTP_PASS" >> /tmp/sftp-config.json
-          fi
-
-          DEPLOY_ARGS=(--path . --src-dir "$SOURCE_DIR" --config /tmp/sftp-config.json)
-          [ "${{ inputs.clear_remote }}" = "true" ] && DEPLOY_ARGS+=(--clear-remote)
-
-          PLATFORM=$(php /tmp/mokostandards-api/cli/platform_detect.php --path . 2>/dev/null || true)
-          if [ "$PLATFORM" = "waas-component" ] && [ -f "/tmp/mokostandards-api/deploy/deploy-joomla.php" ]; then
-            php /tmp/mokostandards-api/deploy/deploy-joomla.php "${DEPLOY_ARGS[@]}"
-          else
-            php /tmp/mokostandards-api/deploy/deploy-sftp.php "${DEPLOY_ARGS[@]}"
-          fi
-
-          rm -f /tmp/deploy_key /tmp/sftp-config.json
-
-      - name: Summary
-        if: always()
-        run: |
-          if [ "${{ steps.check.outputs.skip }}" = "true" ]; then
-            echo "### Deploy Skipped -- FTP not configured" >> $GITHUB_STEP_SUMMARY
-          else
-            echo "### Manual Dev Deploy Complete" >> $GITHUB_STEP_SUMMARY
-            echo "" >> $GITHUB_STEP_SUMMARY
-            echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY
-            echo "|-------|-------|" >> $GITHUB_STEP_SUMMARY
-            echo "| Host | \`${{ steps.check.outputs.host }}\` |" >> $GITHUB_STEP_SUMMARY
-            echo "| Remote | \`${{ steps.check.outputs.remote }}\` |" >> $GITHUB_STEP_SUMMARY
-            echo "| Clear | ${{ inputs.clear_remote }} |" >> $GITHUB_STEP_SUMMARY
-          fi

.mokogitea/workflows/issue-branch.yml

@@ -5,7 +5,7 @@
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
 # INGROUP: mokocli.Automation
-# VERSION: 01.45.05
+# VERSION: 02.54.01
 # BRIEF: Auto-create feature branch when an issue is opened
 
 name: "Universal: Issue Branch"

.mokogitea/workflows/notify.yml

@@ -6,7 +6,7 @@
 # DEFGROUP: Gitea.Workflow
 # INGROUP: MokoStandards.Notifications
 # REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards
-# PATH: /.gitea/workflows/notify.yml
+# PATH: /.mokogitea/workflows/notify.yml
 # VERSION: 01.00.00
 # BRIEF: Push notifications via ntfy on release success or workflow failure
 

.mokogitea/workflows/pr-check.yml

@@ -4,8 +4,8 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.CI
-# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform
+# INGROUP: mokocli.CI
+# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/mokocli
 # PATH: /templates/workflows/universal/pr-check.yml.template
 # VERSION: 09.23.00
 # BRIEF: PR gate — branch policy + code validation before merge
@@ -126,6 +126,8 @@ jobs:
   validate:
     name: Validate PR
     runs-on: ubuntu-latest
+    # Skip on template repos (Template-*) — no real manifest/source/changelog to validate.
+    if: ${{ !startsWith(github.event.repository.name, 'Template-') }}
 
     steps:
       - name: Checkout
@@ -492,6 +494,9 @@ jobs:
     name: Build RC Package
     runs-on: ubuntu-latest
     needs: [branch-policy, validate]
+    # Run only when both gates succeeded; always() forces evaluation so a skipped
+    # validate (e.g. template repos) skips this job cleanly instead of hanging.
+    if: ${{ always() && needs.branch-policy.result == 'success' && needs.validate.result == 'success' }}
 
     steps:
       - name: Trigger RC pre-release

.mokogitea/workflows/pre-release.yml

@@ -48,9 +48,13 @@ jobs:
   build:
     name: "Build Pre-Release (${{ inputs.stability || github.ref_name }})"
     runs-on: release
+    # Skip on template repos (Template-*) — they scaffold other repos and do not release.
     if: >-
-      github.event_name == 'workflow_dispatch' ||
-      github.event_name == 'push'
+      !startsWith(github.event.repository.name, 'Template-') &&
+      (
+        github.event_name == 'workflow_dispatch' ||
+        github.event_name == 'push'
+      )
 
     steps:
       - name: Checkout

.mokogitea/workflows/sync-on-merge.yml

@@ -0,0 +1,31 @@
+name: Sync Workflows to Repos
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - '.mokogitea/workflows/**'
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout mokocli
+        uses: actions/checkout@v4
+        with:
+          repository: MokoConsulting/mokocli
+          token: ${{ secrets.MOKOGITEA_TOKEN }}
+
+      - name: Setup PHP
+        uses: https://git.mokoconsulting.tech/MokoConsulting/.mokogitea/raw/branch/main/actions/setup-php@v1
+        with:
+          php-version: '8.1'
+
+      - name: Install dependencies
+        run: composer install --no-dev --no-interaction
+
+      - name: Sync workflows to generic repos
+        run: php automation/bulk_sync.php --platform generic --org MokoConsulting --workflows-only --auto-merge --token "${{ secrets.MOKOGITEA_TOKEN }}"
+        env:
+          MOKOGITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}

CHANGELOG.md

@@ -1,158 +1,13 @@
 # Changelog
-
 ## [Unreleased]
 
-### Added
-- Customizable restore script filename per backup profile (reduces discoverability on remote servers)
-- MokoRestore standalone mode: multi-ZIP selector when multiple backup archives are present
-- MokoRestore preflight: Joomla installation detection warning before overwriting an existing site
-- MokoRestore error handling: try/catch on fetch calls, HTTP status checks, JSON parse recovery
-- Download button on individual backup record detail toolbar
-- Profile column in backup records list links to the profile edit view
+## [02.54.00] --- 2026-07-04
 
-### Changed
-- Moved download, browse archive, and view log actions from backup list rows into the individual backup record view
-- Removed "Run Backup" / "Backup Now" buttons from profiles list, profile edit toolbar, and backup records view (backups are triggered from the dashboard only)
-- Removed ordering field from profiles; default sort is now by ID ascending
-- MokoRestore cleanup and security messages now reference the actual script filename instead of hardcoded "restore.php"
+## [02.53.00] --- 2026-07-04
 
-### Fixed
-- Bootstrap 5 modal conversion for snapshots view (data-bs-dismiss, modal-footer, getOrCreateInstance)
-- ntfy default URL changed from ntfy.sh to ntfy.mokoconsulting.tech
-- Untranslated JFIELD_ORDERING_ASC / JFIELD_ORDERING_LABEL language keys replaced with component-specific keys
-- Options page title now shows "MokoSuiteBackup Options" instead of raw language key
-- Profile dropdown IDs in backup records and dashboard show "#ID — Title (type)" format
-- MokoRestore stalling: unhandled promise rejections from network errors or non-JSON responses left UI in loading state
+## [02.53.00] --- 2026-07-04
 
-## [01.43.00] --- 2026-06-24
+## [02.52.24] --- 2026-06-30
 
 
-## [01.43.00] --- 2026-06-24
-
-## [01.42.00] --- 2026-06-23
-
-
-## [01.42.00] --- 2026-06-23
-
-## [01.41.00] — 2026-06-23
-
-### Added — Multi-Remote Storage
-- New `#__mokosuitebackup_remotes` table for multiple destinations per profile
-- Remote destinations UI: AJAX-driven add/edit/delete/toggle modal on profile edit
-- Engine uploads to ALL enabled destinations (BackupEngine + SteppedBackupEngine)
-- Migration auto-converts existing SFTP/S3/GDrive/FTP profile columns to new table
-- Backward compatibility: falls back to legacy single-remote columns if table empty
-- Secrets masked in API responses, merged from DB on save
-
-### Added — Content Snapshots
-- Lightweight JSON snapshots of articles, categories, and modules
-- Includes tags, custom fields, workflow associations, field values
-- Restore modes: Replace (clean slate), Merge (upsert), Selective (per-article)
-- Snapshot retention: max count + max age with automatic cleanup
-- Scheduled snapshot task via com_scheduler
-- CLI: `mokosuitebackup:snapshot create|restore|list|delete`
-- REST API: create, list, restore, delete, download snapshots
-- Tabbed browse modal: Articles / Categories / Modules with item counts
-
-### Added — SFTP Remote Storage
-- SFTP support with SSH key file authentication (key stored base64 in database)
-- Auth type dropdown: Password / Key File / Key File + Passphrase
-- SshKeyField: file upload via FileReader, key never exposed in HTML
-- SFTP remote directory browser for path selection
-- `__KEEP_EXISTING__` sentinel preserves key on profile re-save
-
-### Added — MokoRestore Wizard (9 steps)
-- Per-table conflict resolution: Replace / Skip / Merge / Data Only
-- Preset buttons: "All Replace", "All Skip", "Everything except users"
-- Post-restore actions: reset passwords, hits, versions, sessions, cache
-- Auto-detect sanitized passwords and prompt for reset (random temp password)
-- Standalone mode: restore.php scans directory for ZIP files
-- Wrapped mode: restore.php bundled inside backup ZIP
-- Security gate with filesystem verification + path traversal protection
-
-### Added — Data Sanitization
-- Sanitize user passwords: replace hashes with invalid sentinel
-- Sanitize user emails: replace with dummy values
-- Clear session data: exclude `#__session` table
-- Preserve super admin credentials (optional)
-- GDPR-friendly backup sharing for demos and staging sites
-
-### Added — Backup Engine
-- Pre-flight validation: directory, disk space, extensions, credentials, running backups
-- Auto-verify archive integrity after creation (ZIP, tar.gz, 7z)
-- 7z archive format via system 7za/7z CLI binary with native encryption
-- Streaming database dump to temp file (prevents OOM on large sites)
-- S3 streaming upload via CURLOPT_PUT (prevents OOM)
-- Graceful remote degradation: local backup preserved if upload fails
-- DatabaseDumper::dumpToFile() for memory-efficient operation
-
-### Added — Admin UI
-- Dashboard: snapshot widget, 30-day backup trend chart, per-profile storage breakdown
-- CPanel admin dashboard module (mod_mokosuitebackup_cpanel) with quick actions
-- Backup type filter dropdown in backups list
-- Backup comparison: select two backups for side-by-side diff
-- Archive browser: view files inside backup without extracting
-- Manual purge: delete backups older than a date with count preview
-- Backup count badges on profile list
-- "Do not navigate away" warning in backup/restore progress modals
-- Clickable placeholder pills for backup directory and archive name fields
-- Comprehensive help modal with absolute/relative/placeholder path documentation
-- Placeholder resolution display with EXAMPLE prefix
-- All placeholders UPPERCASE: [HOST], [SITE_NAME], [DATE], [DATETIME], etc.
-
-### Added — CLI & API
-- `mokosuitebackup:restore` with --files-only, --db-only, --password options
-- `mokosuitebackup:snapshot` with create, restore, list, delete actions
-- REST API for snapshots: create, list, restore, delete, download
-- Profile credentials masked in API responses
-
-### Added — Notifications & Logging
-- Email/ntfy notifications for site restore, snapshot create/restore
-- Joomla Action Logs for restore, snapshot, and snapshot restore events
-- Global ntfy server/topic/token settings (fallback for profiles)
-
-### Added — Security & Configuration
-- Webcron secret field with CSPRNG generator + strength meter
-- IP whitelist field with current IP detection + one-click "Add my IP"
-- 10 ACL permissions with full enforcement audit across all controllers
-- Config defaults: archive format, MokoRestore mode, sanitization settings
-- Path traversal protection on all archive extraction (ZIP, tar.gz, JPA)
-
-### Fixed
-- CLI RestoreCommand passed wrong arguments (filepath instead of record ID)
-- JPA path traversal: reject `../` in archive entry paths
-- S3Uploader OOM: streaming upload instead of file_get_contents
-- DatabaseDumper OOM: streaming to file instead of in-memory string
-- AkeebaImporter: removed unserialize() (PHP object injection risk)
-- BackupTable: delete DB row before file (prevents data loss)
-- RestoreEngine: staging path sanitized with preg_replace
-- API profiles: sensitive fields masked with `***`
-- Webcron: missing return after sendJsonResponse on auth failure
-- loadFormData(): cast array to object (PHP 8.x TypeError fix)
-- MokoRestore data-only mode: uses REPLACE INTO for existing rows
-- Plaintext archive deleted on encryption failure
-- TarGzArchiver: intermediate .tar cleaned in finally block
-- Install script: single-line comments converted to block comments
-- Orphaned root-level webservices plugin files removed
-- include_mokorestore column: TINYINT changed to VARCHAR(20)
-- Snapshot fields_values: scoped dump and restore to com_content.article (previously destroyed values for contacts, users, etc.)
-- Run Backup button: accept CSRF token from GET (fixes "token did not match" on profile edit)
-- SFTP fields: moved into remote fieldset for showon visibility; removed required attr that blocked non-SFTP saves
-- Script.php merge conflict markers resolved
-
-## [01.24.00] — 2026-06-02
-
-### Added
-- Initial release: full-site backup and restore for Joomla 6
-- Database, files, and configuration backup
-- ZIP and tar.gz archive formats with AES-256 encryption
-- Differential backups based on file manifests
-- FTP/FTPS, S3, Google Drive remote storage
-- MokoRestore standalone restore wizard
-- CLI backup and restore commands
-- REST API for remote management
-- Scheduled tasks via com_scheduler
-- Email and ntfy push notifications
-- Per-profile retention, exclusions, and notifications
-- Akeeba Backup migration tool
-- Admin dashboard with system health checks
+## [02.52.24] --- 2026-06-30

SECURITY.md

@@ -23,7 +23,7 @@ DEFGROUP: Template-Joomla
 INGROUP: Template-Joomla.Documentation
 REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Joomla
 PATH: /SECURITY.md
-VERSION: 01.45.05
+VERSION: 02.54.01
 BRIEF: Security vulnerability reporting and handling policy
 -->
 

source/packages/com_mokosuitebackup/access.xml

@@ -15,5 +15,6 @@
 		<action name="mokosuitebackup.backup.purge" title="COM_MOKOSUITEBACKUP_ACTION_BACKUP_PURGE" />
 		<action name="mokosuitebackup.backup.compare" title="COM_MOKOSUITEBACKUP_ACTION_BACKUP_COMPARE" />
 		<action name="mokosuitebackup.backup.browse" title="COM_MOKOSUITEBACKUP_ACTION_BACKUP_BROWSE" />
+		<action name="mokosuitebackup.backup.cancel" title="COM_MOKOSUITEBACKUP_ACTION_BACKUP_CANCEL" />
 	</section>
 </access>

source/packages/com_mokosuitebackup/forms/filter_backups.xml

@@ -15,6 +15,7 @@
 		>
 			<option value="">COM_MOKOJOOMBACKUP_FILTER_STATUS_ALL</option>
 			<option value="complete">COM_MOKOJOOMBACKUP_STATUS_COMPLETE</option>
+			<option value="warning">COM_MOKOJOOMBACKUP_STATUS_WARNING</option>
 			<option value="running">COM_MOKOJOOMBACKUP_STATUS_RUNNING</option>
 			<option value="fail">COM_MOKOJOOMBACKUP_STATUS_FAIL</option>
 			<option value="pending">COM_MOKOJOOMBACKUP_STATUS_PENDING</option>

source/packages/com_mokosuitebackup/language/en-GB/com_mokosuitebackup.ini

@@ -5,6 +5,7 @@
 ; @license     GPL-3.0-or-later
 
 COM_MOKOJOOMBACKUP="MokoSuiteBackup"
+COM_MOKOJOOMBACKUP_SHORT="Backup"
 COM_MOKOJOOMBACKUP_CONFIGURATION="MokoSuiteBackup Options"
 COM_MOKOJOOMBACKUP_DESCRIPTION="Full-site backup and restore for Joomla"
 
@@ -22,7 +23,7 @@ COM_MOKOSUITEBACKUP_ACTION_BACKUP_RESTORE="Restore Backup"
 COM_MOKOSUITEBACKUP_ACTION_BACKUP_RESTORE_DESC="Allows users in this group to restore the site from a backup archive. This is a destructive operation that overwrites the current site."
 
 ; Dashboard view
-COM_MOKOJOOMBACKUP_DASHBOARD_TITLE="MokoSuiteBackup Dashboard"
+COM_MOKOJOOMBACKUP_DASHBOARD_TITLE="Dashboard"
 COM_MOKOJOOMBACKUP_DASHBOARD_LAST_BACKUP="Last Backup"
 COM_MOKOJOOMBACKUP_DASHBOARD_NO_BACKUPS="No backups yet"
 COM_MOKOJOOMBACKUP_DASHBOARD_NEXT_SCHEDULED="Next Scheduled"
@@ -44,14 +45,14 @@ COM_MOKOJOOMBACKUP_DASHBOARD_BACKUP_TREND="Backup Trend (30 days)"
 ; Backups view
 COM_MOKOJOOMBACKUP_BACKUPS_N_ITEMS_DELETED="%d backup records deleted."
 COM_MOKOJOOMBACKUP_BACKUPS_N_ITEMS_DELETED_1="%d backup record deleted."
-COM_MOKOJOOMBACKUP_BACKUPS_TITLE="Backup Records"
+COM_MOKOJOOMBACKUP_BACKUPS_TITLE="Records"
 COM_MOKOJOOMBACKUP_BACKUPS_TABLE_CAPTION="Table of backup records"
 COM_MOKOJOOMBACKUP_NO_BACKUPS="No backups found. Click 'Backup Now' to create your first backup."
 COM_MOKOJOOMBACKUP_TOOLBAR_BACKUP_NOW="Backup Now"
 COM_MOKOJOOMBACKUP_DOWNLOAD="Download"
 
 ; Backup detail view
-COM_MOKOJOOMBACKUP_BACKUP_DETAIL="Backup Detail"
+COM_MOKOJOOMBACKUP_BACKUP_DETAIL="Detail"
 COM_MOKOJOOMBACKUP_VIEW_LOG="Backup Log"
 COM_MOKOJOOMBACKUP_BROWSE_ARCHIVE="Browse Archive Contents"
 COM_MOKOJOOMBACKUP_BROWSE_COL_NAME="Name"
@@ -75,7 +76,7 @@ COM_MOKOJOOMBACKUP_FIELD_DB_SIZE="DB Size"
 COM_MOKOJOOMBACKUP_FIELD_REMOTE="Remote Path"
 
 ; Profiles view
-COM_MOKOJOOMBACKUP_PROFILES_TITLE="Backup Profiles"
+COM_MOKOJOOMBACKUP_PROFILES_TITLE="Profiles"
 COM_MOKOJOOMBACKUP_PROFILES_TABLE_CAPTION="Table of backup profiles"
 COM_MOKOJOOMBACKUP_NO_PROFILES="No backup profiles found."
 COM_MOKOJOOMBACKUP_PROFILE_NEW="New Profile"
@@ -207,6 +208,7 @@ COM_MOKOJOOMBACKUP_TYPE_DIFFERENTIAL="Differential (changed files + full DB)"
 
 ; Status labels
 COM_MOKOJOOMBACKUP_STATUS_COMPLETE="Complete"
+COM_MOKOJOOMBACKUP_STATUS_WARNING="Warning"
 COM_MOKOJOOMBACKUP_STATUS_RUNNING="Running"
 COM_MOKOJOOMBACKUP_STATUS_FAIL="Failed"
 COM_MOKOJOOMBACKUP_STATUS_PENDING="Pending"
@@ -249,9 +251,9 @@ COM_MOKOJOOMBACKUP_FIELD_NOTIFY_FAILURE_DESC="Send an email when a backup fails.
 ; Retention
 COM_MOKOJOOMBACKUP_FIELDSET_RETENTION="Retention"
 COM_MOKOJOOMBACKUP_FIELD_RETENTION_DAYS="Keep Backups (days)"
-COM_MOKOJOOMBACKUP_FIELD_RETENTION_DAYS_DESC="Delete completed backups from this profile older than this many days. Set to 0 to use the global default from component options."
+COM_MOKOJOOMBACKUP_FIELD_RETENTION_DAYS_DESC="Delete completed backups from this profile older than this many days. Set to 0 for unlimited (keep by age disabled)."
 COM_MOKOJOOMBACKUP_FIELD_RETENTION_COUNT="Keep Backups (count)"
-COM_MOKOJOOMBACKUP_FIELD_RETENTION_COUNT_DESC="Maximum number of completed backups to keep for this profile. Oldest are removed first. Set to 0 to use the global default from component options."
+COM_MOKOJOOMBACKUP_FIELD_RETENTION_COUNT_DESC="Maximum number of completed backups to keep for this profile. Oldest are removed first. Set to 0 for unlimited (keep by count disabled)."
 
 COM_MOKOJOOMBACKUP_FIELD_NTFY_SPACER_DESC="<strong>Push Notifications (ntfy)</strong> — Send instant push notifications to your phone or desktop via <a href='https://ntfy.sh' target='_blank'>ntfy.sh</a> or a self-hosted ntfy server."
 COM_MOKOJOOMBACKUP_FIELD_NTFY_TOPIC="ntfy Topic"
@@ -450,6 +452,8 @@ COM_MOKOSUITEBACKUP_ACTION_BACKUP_COMPARE="Compare Backups"
 COM_MOKOSUITEBACKUP_ACTION_BACKUP_COMPARE_DESC="Allows users to compare two backup records side-by-side."
 COM_MOKOSUITEBACKUP_ACTION_BACKUP_BROWSE="Browse Archives"
 COM_MOKOSUITEBACKUP_ACTION_BACKUP_BROWSE_DESC="Allows users to view file listings inside backup archives without extracting."
+COM_MOKOSUITEBACKUP_ACTION_BACKUP_CANCEL="Cancel Stalled Backup"
+COM_MOKOSUITEBACKUP_ACTION_BACKUP_CANCEL_DESC="Allows users to cancel backup records stuck in running status and clean up partial archive files."
 
 ; Snapshot ACL
 COM_MOKOSUITEBACKUP_ACTION_SNAPSHOT_MANAGE="Manage Snapshots"
@@ -500,6 +504,12 @@ COM_MOKOJOOMBACKUP_PURGE_INVALID_DATE="Invalid date. Please select a valid date.
 COM_MOKOJOOMBACKUP_PURGE_SUCCESS="%d backup(s) purged successfully."
 COM_MOKOJOOMBACKUP_PURGE_PARTIAL="%d backup(s) purged, but %d could not be deleted."
 
+; Cancel Stalled Backup
+COM_MOKOJOOMBACKUP_TOOLBAR_CANCEL_STALLED="Cancel Stalled"
+COM_MOKOJOOMBACKUP_CANCEL_NONE_SELECTED="No backup records selected."
+COM_MOKOJOOMBACKUP_CANCEL_NONE_RUNNING="None of the selected backups are in running status."
+COM_MOKOJOOMBACKUP_CANCEL_SUCCESS="%d stalled backup(s) cancelled."
+
 ; Remote Destinations (multi-remote)
 COM_MOKOJOOMBACKUP_REMOTE_DESTINATIONS="Remote Destinations"
 COM_MOKOJOOMBACKUP_REMOTE_ADD="Add Destination"

source/packages/com_mokosuitebackup/language/en-GB/com_mokosuitebackup.sys.ini

@@ -5,6 +5,7 @@
 ; @license     GPL-3.0-or-later
 
 COM_MOKOJOOMBACKUP="MokoSuiteBackup"
+COM_MOKOJOOMBACKUP_SHORT="Backup"
 COM_MOKOJOOMBACKUP_DESCRIPTION="Full-site backup and restore for Joomla — database, files, and configuration."
 COM_MOKOJOOMBACKUP_SUBMENU_DASHBOARD="Dashboard"
 COM_MOKOJOOMBACKUP_SUBMENU_BACKUPS="Backup Records"

source/packages/com_mokosuitebackup/language/en-US/com_mokosuitebackup.ini

@@ -5,6 +5,7 @@
 ; @license     GPL-3.0-or-later
 
 COM_MOKOJOOMBACKUP="MokoSuiteBackup"
+COM_MOKOJOOMBACKUP_SHORT="Backup"
 COM_MOKOJOOMBACKUP_DESCRIPTION="Full-site backup and restore for Joomla"
 COM_MOKOJOOMBACKUP_SUBMENU_DASHBOARD="Dashboard"
 COM_MOKOJOOMBACKUP_SUBMENU_BACKUPS="Backup Records"
@@ -18,7 +19,7 @@ COM_MOKOSUITEBACKUP_ACTION_BACKUP_DOWNLOAD_DESC="Allows users in this group to d
 COM_MOKOSUITEBACKUP_ACTION_BACKUP_RESTORE="Restore Backup"
 COM_MOKOSUITEBACKUP_ACTION_BACKUP_RESTORE_DESC="Allows users in this group to restore the site from a backup archive. This is a destructive operation that overwrites the current site."
 
-COM_MOKOJOOMBACKUP_DASHBOARD_TITLE="MokoSuiteBackup Dashboard"
+COM_MOKOJOOMBACKUP_DASHBOARD_TITLE="Dashboard"
 COM_MOKOJOOMBACKUP_DASHBOARD_LAST_BACKUP="Last Backup"
 COM_MOKOJOOMBACKUP_DASHBOARD_NO_BACKUPS="No backups yet"
 COM_MOKOJOOMBACKUP_DASHBOARD_NEXT_SCHEDULED="Next Scheduled"
@@ -30,8 +31,8 @@ COM_MOKOJOOMBACKUP_DASHBOARD_QUICK_ACTIONS="Quick Actions"
 COM_MOKOJOOMBACKUP_DASHBOARD_SCHEDULED_TASKS="Scheduled Tasks"
 COM_MOKOJOOMBACKUP_DASHBOARD_UPDATE_SITE="Update Site"
 COM_MOKOJOOMBACKUP_DASHBOARD_SYSTEM_HEALTH="System Health"
-COM_MOKOJOOMBACKUP_BACKUPS_TITLE="Backup Records"
-COM_MOKOJOOMBACKUP_PROFILES_TITLE="Backup Profiles"
+COM_MOKOJOOMBACKUP_BACKUPS_TITLE="Records"
+COM_MOKOJOOMBACKUP_PROFILES_TITLE="Profiles"
 COM_MOKOJOOMBACKUP_TOOLBAR_BACKUP_NOW="Backup Now"
 COM_MOKOJOOMBACKUP_NO_BACKUPS="No backups found. Click 'Backup Now' to create your first backup."
 COM_MOKOJOOMBACKUP_NO_PROFILES="No backup profiles found."
@@ -116,3 +117,23 @@ COM_MOKOJOOMBACKUP_PURGE_NONE_FOUND="No completed backups found before the selec
 COM_MOKOJOOMBACKUP_PURGE_INVALID_DATE="Invalid date. Please select a valid date."
 COM_MOKOJOOMBACKUP_PURGE_SUCCESS="%d backup(s) purged successfully."
 COM_MOKOJOOMBACKUP_PURGE_PARTIAL="%d backup(s) purged, but %d could not be deleted."
+
+; Cancel Stalled Backup
+COM_MOKOJOOMBACKUP_TOOLBAR_CANCEL_STALLED="Cancel Stalled"
+COM_MOKOJOOMBACKUP_CANCEL_NONE_SELECTED="No backup records selected."
+COM_MOKOJOOMBACKUP_CANCEL_NONE_RUNNING="None of the selected backups are in running status."
+COM_MOKOJOOMBACKUP_CANCEL_SUCCESS="%d stalled backup(s) cancelled."
+
+; Backup status
+COM_MOKOJOOMBACKUP_STATUS_WARNING="Warning"
+
+; ACL - Cancel
+COM_MOKOSUITEBACKUP_ACTION_BACKUP_CANCEL="Cancel Stalled Backup"
+COM_MOKOSUITEBACKUP_ACTION_BACKUP_CANCEL_DESC="Allows users to cancel backup records stuck in running status and clean up partial archive files."
+
+; Retention (per-profile)
+COM_MOKOJOOMBACKUP_FIELDSET_RETENTION="Retention"
+COM_MOKOJOOMBACKUP_FIELD_RETENTION_DAYS="Keep Backups (days)"
+COM_MOKOJOOMBACKUP_FIELD_RETENTION_DAYS_DESC="Delete completed backups from this profile older than this many days. Set to 0 for unlimited (keep by age disabled)."
+COM_MOKOJOOMBACKUP_FIELD_RETENTION_COUNT="Keep Backups (count)"
+COM_MOKOJOOMBACKUP_FIELD_RETENTION_COUNT_DESC="Maximum number of completed backups to keep for this profile. Oldest are removed first. Set to 0 for unlimited (keep by count disabled)."

source/packages/com_mokosuitebackup/language/en-US/com_mokosuitebackup.sys.ini

@@ -5,6 +5,7 @@
 ; @license     GPL-3.0-or-later
 
 COM_MOKOJOOMBACKUP="MokoSuiteBackup"
+COM_MOKOJOOMBACKUP_SHORT="Backup"
 COM_MOKOJOOMBACKUP_DESCRIPTION="Full-site backup and restore for Joomla — database, files, and configuration."
 COM_MOKOJOOMBACKUP_SUBMENU_DASHBOARD="Dashboard"
 COM_MOKOJOOMBACKUP_SUBMENU_BACKUPS="Backup Records"

source/packages/com_mokosuitebackup/mokosuitebackup.xml

@@ -6,15 +6,15 @@
  * @license     GNU General Public License version 3 or later; see LICENSE
  -->
 <extension type="component" method="upgrade">
-	<name>MokoSuiteBackup</name>
-	<version>01.45.05</version>
+	<name>Component - MokoSuiteBackup</name>
+	<version>02.54.01</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<copyright>Copyright (C) 2026 Moko Consulting. All rights reserved.</copyright>
 	<license>GPL-3.0-or-later</license>
-	<description>COM_MOKOJOOMBACKUP_DESCRIPTION</description>
+	<description>Full-site backup and restore for Joomla — database, files, and configuration.</description>
 
 	<namespace path="src">Joomla\Component\MokoSuiteBackup</namespace>
 
@@ -37,20 +37,20 @@
 	</update>
 
 	<administration>
-		<menu img="class:archive">COM_MOKOJOOMBACKUP</menu>
+		<menu img="class:archive">Backup</menu>
 		<submenu>
 			<menu link="option=com_mokosuitebackup&amp;view=dashboard"
 				  img="class:home"
-				  alt="Dashboard">COM_MOKOJOOMBACKUP_SUBMENU_DASHBOARD</menu>
+				  alt="Dashboard">Dashboard</menu>
 			<menu link="option=com_mokosuitebackup&amp;view=backups"
 				  img="class:database"
-				  alt="Backups">COM_MOKOJOOMBACKUP_SUBMENU_BACKUPS</menu>
+				  alt="Backups">Backup Records</menu>
 			<menu link="option=com_mokosuitebackup&amp;view=snapshots"
 				  img="class:camera"
-				  alt="Snapshots">COM_MOKOJOOMBACKUP_SUBMENU_SNAPSHOTS</menu>
+				  alt="Snapshots">Content Snapshots</menu>
 			<menu link="option=com_mokosuitebackup&amp;view=profiles"
 				  img="class:cog"
-				  alt="Profiles">COM_MOKOJOOMBACKUP_SUBMENU_PROFILES</menu>
+				  alt="Profiles">Backup Profiles</menu>
 		</submenu>
 		<files folder=".">
 			<filename>access.xml</filename>

source/packages/com_mokosuitebackup/sql/install.mysql.sql

@@ -49,8 +49,8 @@ CREATE TABLE IF NOT EXISTS `#__mokosuitebackup_profiles` (
 	`notify_user_groups`   VARCHAR(255) NOT NULL DEFAULT '' COMMENT 'Comma-separated Joomla user group IDs',
 	`notify_on_success`    TINYINT(1) NOT NULL DEFAULT 0,
 	`notify_on_failure`    TINYINT(1) NOT NULL DEFAULT 1,
-	`retention_days`       INT(11) NOT NULL DEFAULT 0 COMMENT '0 = use global default',
-	`retention_count`      INT(11) NOT NULL DEFAULT 0 COMMENT '0 = use global default',
+	`retention_days`       INT(11) NOT NULL DEFAULT 0 COMMENT 'Delete backups older than N days; 0 = unlimited',
+	`retention_count`      INT(11) NOT NULL DEFAULT 0 COMMENT 'Keep newest N backups; 0 = unlimited',
 	`ntfy_topic`           VARCHAR(255) NOT NULL DEFAULT '' COMMENT 'ntfy topic name',
 	`ntfy_server`          VARCHAR(512) NOT NULL DEFAULT 'https://ntfy.sh' COMMENT 'ntfy server URL',
 	`ntfy_token`           VARCHAR(255) NOT NULL DEFAULT '' COMMENT 'ntfy access token (optional)',
@@ -65,7 +65,7 @@ CREATE TABLE IF NOT EXISTS `#__mokosuitebackup_records` (
 	`id`              INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
 	`profile_id`      INT(11) UNSIGNED NOT NULL DEFAULT 1,
 	`description`     VARCHAR(255) NOT NULL DEFAULT '',
-	`status`          VARCHAR(20) NOT NULL DEFAULT 'pending' COMMENT 'pending, running, complete, fail',
+	`status`          VARCHAR(20) NOT NULL DEFAULT 'pending' COMMENT 'pending, running, complete, warning, fail',
 	`origin`          VARCHAR(20) NOT NULL DEFAULT 'backend' COMMENT 'backend, cli, api, scheduled',
 	`backup_type`     VARCHAR(20) NOT NULL DEFAULT 'full' COMMENT 'full, database, files',
 	`archivename`     VARCHAR(512) NOT NULL DEFAULT '',

source/packages/com_mokosuitebackup/sql/updates/mysql/01.44.02.sql

@@ -1 +0,0 @@
-/* 01.44.02 — no schema changes */

source/packages/com_mokosuitebackup/sql/updates/mysql/01.44.03.sql

@@ -1 +0,0 @@
-/* 01.44.03 — no schema changes */

source/packages/com_mokosuitebackup/sql/updates/mysql/01.45.00.sql

@@ -0,0 +1 @@
+/* 01.45.00 — no schema changes */

source/packages/com_mokosuitebackup/sql/updates/mysql/01.45.02.sql

@@ -1 +0,0 @@
-/* 01.45.02 — no schema changes */

source/packages/com_mokosuitebackup/sql/updates/mysql/01.45.03.sql

@@ -1 +0,0 @@
-/* 01.45.03 — no schema changes */

source/packages/com_mokosuitebackup/sql/updates/mysql/01.45.05.sql

@@ -1 +0,0 @@
-/* 01.45.05 — no schema changes */

source/packages/com_mokosuitebackup/sql/updates/mysql/02.52.16.sql

@@ -0,0 +1 @@
+/* 02.52.16 — no schema changes */

source/packages/com_mokosuitebackup/sql/updates/mysql/02.52.17.sql

@@ -0,0 +1 @@
+/* 02.52.17 — no schema changes */

source/packages/com_mokosuitebackup/sql/updates/mysql/02.52.18.sql

@@ -0,0 +1 @@
+/* 02.52.18 — no schema changes */

source/packages/com_mokosuitebackup/sql/updates/mysql/02.52.20.sql

@@ -0,0 +1 @@
+/* 02.52.20 — no schema changes */

source/packages/com_mokosuitebackup/sql/updates/mysql/02.52.21.sql

@@ -0,0 +1 @@
+/* 02.52.21 — no schema changes */

source/packages/com_mokosuitebackup/sql/updates/mysql/02.52.22.sql

@@ -0,0 +1 @@
+/* 02.52.22 — no schema changes */

source/packages/com_mokosuitebackup/sql/updates/mysql/02.52.23.sql

@@ -0,0 +1 @@
+/* 02.52.23 — no schema changes */

source/packages/com_mokosuitebackup/sql/updates/mysql/02.52.24.sql

@@ -0,0 +1 @@
+/* 02.52.24 — no schema changes */

source/packages/com_mokosuitebackup/sql/updates/mysql/02.52.27.sql

@@ -0,0 +1 @@
+/* 02.52.27 — no schema changes */

source/packages/com_mokosuitebackup/sql/updates/mysql/02.53.00.sql

@@ -0,0 +1 @@
+/* 02.53.00 — no schema changes */

source/packages/com_mokosuitebackup/sql/updates/mysql/02.54.00.sql

@@ -0,0 +1 @@
+/* 02.54.00 — no schema changes */

source/packages/com_mokosuitebackup/sql/updates/mysql/02.54.01.sql

@@ -0,0 +1 @@
+/* 02.54.01 — no schema changes */

source/packages/com_mokosuitebackup/src/Controller/AjaxController.php

@@ -84,6 +84,67 @@ class AjaxController extends BaseController
 		$this->sendJson($result);
 	}
 
+	/**
+	 * Cancel a backup record stuck in "running" status.
+	 * POST: task=ajax.cancelBackup&id=123
+	 */
+	public function cancelBackup(): void
+	{
+		if (!Session::checkToken('get') && !Session::checkToken('post')) {
+			$this->sendJson(['error' => true, 'message' => 'Invalid token'], 403);
+
+			return;
+		}
+
+		if (!$this->app->getIdentity()->authorise('mokosuitebackup.backup.cancel', 'com_mokosuitebackup')) {
+			$this->sendJson(['error' => true, 'message' => 'Access denied'], 403);
+
+			return;
+		}
+
+		$id = $this->input->getInt('id', 0);
+
+		if (!$id) {
+			$this->sendJson(['error' => true, 'message' => 'Missing record ID']);
+
+			return;
+		}
+
+		$db    = Factory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName(['id', 'status', 'absolute_path']))
+			->from($db->quoteName('#__mokosuitebackup_records'))
+			->where($db->quoteName('id') . ' = ' . $id);
+		$db->setQuery($query);
+		$record = $db->loadObject();
+
+		if (!$record) {
+			$this->sendJson(['error' => true, 'message' => 'Record not found'], 404);
+
+			return;
+		}
+
+		if ($record->status !== 'running') {
+			$this->sendJson(['error' => true, 'message' => 'Backup is not in running status']);
+
+			return;
+		}
+
+		$update = $db->getQuery(true)
+			->update($db->quoteName('#__mokosuitebackup_records'))
+			->set($db->quoteName('status') . ' = ' . $db->quote('fail'))
+			->set($db->quoteName('backupend') . ' = ' . $db->quote(date('Y-m-d H:i:s')))
+			->where($db->quoteName('id') . ' = ' . $id);
+		$db->setQuery($update);
+		$db->execute();
+
+		if (!empty($record->absolute_path) && is_file($record->absolute_path)) {
+			@unlink($record->absolute_path);
+		}
+
+		$this->sendJson(['error' => false, 'message' => 'Backup cancelled']);
+	}
+
 	/**
 	 * Browse server directories for the folder picker field.
 	 * POST: task=ajax.browseDir&path=/some/path
@@ -451,7 +512,7 @@ class AjaxController extends BaseController
 			return;
 		}
 
-		if ($record->status !== 'complete' || !$record->filesexist) {
+		if (!\in_array($record->status, ['complete', 'warning'], true) || !$record->filesexist) {
 			$this->sendJson(['error' => true, 'message' => 'Archive not available']);
 
 			return;
@@ -747,7 +808,7 @@ class AjaxController extends BaseController
 				->select('COUNT(*)')
 				->from($db->quoteName('#__mokosuitebackup_records'))
 				->where($db->quoteName('backupstart') . ' < ' . $db->quote($cutoff))
-				->where($db->quoteName('status') . ' = ' . $db->quote('complete'));
+				->where($db->quoteName('status') . ' IN (' . implode(',', array_map([$db, 'quote'], ['complete', 'warning'])) . ')');
 			$db->setQuery($query);
 			$count = (int) $db->loadResult();
 		} catch (\Exception $e) {

source/packages/com_mokosuitebackup/src/Controller/BackupsController.php

@@ -199,7 +199,7 @@ class BackupsController extends AdminController
 			->select($db->quoteName('id'))
 			->from($db->quoteName('#__mokosuitebackup_records'))
 			->where($db->quoteName('backupstart') . ' < ' . $db->quote($cutoff))
-			->where($db->quoteName('status') . ' = ' . $db->quote('complete'));
+			->where($db->quoteName('status') . ' IN (' . implode(',', array_map([$db, 'quote'], ['complete', 'warning'])) . ')');
 		$db->setQuery($query);
 		$ids = $db->loadColumn();
 
@@ -235,6 +235,76 @@ class BackupsController extends AdminController
 		$this->setRedirect(Route::_('index.php?option=com_mokosuitebackup&view=backups', false));
 	}
 
+	/**
+	 * Cancel selected backup records that are stuck in "running" status.
+	 *
+	 * Sets their status to "fail", cleans up partial archive files,
+	 * and destroys any associated stepped session.
+	 */
+	public function cancelStalled(): void
+	{
+		$this->checkToken();
+
+		if (!$this->app->getIdentity()->authorise('mokosuitebackup.backup.cancel', 'com_mokosuitebackup')) {
+			$this->setMessage(Text::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'), 'error');
+			$this->setRedirect(Route::_('index.php?option=com_mokosuitebackup&view=backups', false));
+
+			return;
+		}
+
+		$cid = $this->input->get('cid', [], 'array');
+
+		if (empty($cid)) {
+			$this->setMessage(Text::_('COM_MOKOJOOMBACKUP_CANCEL_NONE_SELECTED'), 'warning');
+			$this->setRedirect(Route::_('index.php?option=com_mokosuitebackup&view=backups', false));
+
+			return;
+		}
+
+		$db        = $this->app->getContainer()->get('DatabaseDriver');
+		$cancelled = 0;
+		$skipped   = 0;
+
+		foreach ($cid as $id) {
+			$id = (int) $id;
+
+			$query = $db->getQuery(true)
+				->select($db->quoteName(['id', 'status', 'absolute_path']))
+				->from($db->quoteName('#__mokosuitebackup_records'))
+				->where($db->quoteName('id') . ' = ' . $id);
+			$db->setQuery($query);
+			$record = $db->loadObject();
+
+			if (!$record || $record->status !== 'running') {
+				$skipped++;
+
+				continue;
+			}
+
+			$update = $db->getQuery(true)
+				->update($db->quoteName('#__mokosuitebackup_records'))
+				->set($db->quoteName('status') . ' = ' . $db->quote('fail'))
+				->set($db->quoteName('backupend') . ' = ' . $db->quote(date('Y-m-d H:i:s')))
+				->where($db->quoteName('id') . ' = ' . $id);
+			$db->setQuery($update);
+			$db->execute();
+
+			if (!empty($record->absolute_path) && is_file($record->absolute_path)) {
+				@unlink($record->absolute_path);
+			}
+
+			$cancelled++;
+		}
+
+		if ($cancelled > 0) {
+			$this->setMessage(Text::sprintf('COM_MOKOJOOMBACKUP_CANCEL_SUCCESS', $cancelled));
+		} elseif ($skipped > 0) {
+			$this->setMessage(Text::_('COM_MOKOJOOMBACKUP_CANCEL_NONE_RUNNING'), 'warning');
+		}
+
+		$this->setRedirect(Route::_('index.php?option=com_mokosuitebackup&view=backups', false));
+	}
+
 	/**
 	 * No-op target for the purge toolbar button.
 	 *

source/packages/com_mokosuitebackup/src/Engine/BackupEngine.php

@@ -375,7 +375,7 @@ class BackupEngine
 			// Final record update (includes fields needed by NotificationSender)
 			$update = (object) [
 				'id'              => $recordId,
-				'status'          => 'complete',
+				'status'          => $uploadFailed ? 'warning' : 'complete',
 				'description'     => $description,
 				'backup_type'     => $profile->backup_type,
 				'archivename'     => $archiveName,
@@ -403,6 +403,17 @@ class BackupEngine
 				NotificationSender::send($profile, $update, false, "Remote upload failed — see backup log for details.\n\n" . implode("\n", $this->log));
 			}
 
+			// Enforce per-profile retention (age and/or copy count).
+			try {
+				$pruned = RetentionManager::prune($db, $profile);
+
+				if ($pruned > 0) {
+					$this->log('Retention: pruned ' . $pruned . ' old backup(s)');
+				}
+			} catch (\Throwable $e) {
+				error_log('MokoSuiteBackup: retention pass failed: ' . $e->getMessage());
+			}
+
 			// Dispatch event for actionlog and other listeners
 			$this->dispatchAfterRun(true, $recordId, $description, $profileId, $origin);
 
@@ -547,7 +558,16 @@ class BackupEngine
 	 */
 	private function createUploaderFromParams(string $type, array $params): RemoteUploaderInterface
 	{
-		$fake = (object) $params;
+		$prefixMap = ['ftp' => 'ftp_', 'sftp' => 'sftp_', 's3' => 's3_', 'google_drive' => 'gdrive_'];
+		$prefix    = $prefixMap[$type] ?? '';
+
+		$prefixed = [];
+
+		foreach ($params as $key => $value) {
+			$prefixed[$prefix . $key] = $value;
+		}
+
+		$fake = (object) $prefixed;
 
 		return match ($type) {
 			'ftp'          => new FtpUploader($fake),
@@ -597,7 +617,7 @@ class BackupEngine
 			->select($db->quoteName('manifest'))
 			->from($db->quoteName('#__mokosuitebackup_records'))
 			->where($db->quoteName('profile_id') . ' = ' . $profileId)
-			->where($db->quoteName('status') . ' = ' . $db->quote('complete'))
+			->where($db->quoteName('status') . ' IN (' . implode(',', array_map([$db, 'quote'], ['complete', 'warning'])) . ')')
 			->where($db->quoteName('manifest') . ' != ' . $db->quote(''))
 			->where($db->quoteName('backup_type') . ' = ' . $db->quote('full'))
 			->order($db->quoteName('backupstart') . ' DESC');

source/packages/com_mokosuitebackup/src/Engine/MokoRestore.php

@@ -346,6 +346,9 @@ define('MOKOJOOMBACKUP_RESTORE', 1);
 define('RESTORE_DIR', __DIR__);
 define('BACKUP_FILE', RESTORE_DIR . '/site-backup.zip');
 
+error_log('MokoRestore: Script loaded — RESTORE_DIR=' . RESTORE_DIR);
+error_log('MokoRestore: PHP ' . PHP_VERSION . ', SAPI=' . php_sapi_name() . ', memory_limit=' . ini_get('memory_limit'));
+
 session_start();
 
 if (empty($_SESSION['restore_token'])) {
@@ -358,25 +361,37 @@ $token = $_SESSION['restore_token'];
 // Write a security file to the web root with a random code.
 // The user must read the code from the file and enter it in the browser
 // to prove they have filesystem access before any restore actions are allowed.
-$securityFile = RESTORE_DIR . '/.mokorestore-security.php';
+$securityFile = RESTORE_DIR . '/mokorestore-security.php';
 $securityCode = $_SESSION['security_code'] ?? '';
 
 if (empty($securityCode)) {
     $securityCode = strtoupper(substr(bin2hex(random_bytes(4)), 0, 8));
     $_SESSION['security_code'] = $securityCode;
     $_SESSION['security_verified'] = false;
+}
+
+// Write (or recreate) the security file whenever verification is still pending
+if (empty($_SESSION['security_verified']) && !is_file($securityFile)) {
+    error_log('MokoRestore: Writing security file: ' . $securityFile);
+    error_log('MokoRestore: Target directory: ' . RESTORE_DIR . ' (writable: ' . (is_writable(RESTORE_DIR) ? 'yes' : 'NO') . ')');
 
-    // Write security file with the code
     $securityContent = "<?php die('MokoRestore Security Code: " . $securityCode . "'); ?>\n"
         . "MokoRestore Security Verification\n"
         . "==================================\n"
         . "Code: " . $securityCode . "\n"
         . "Enter this code in the MokoRestore browser interface to proceed.\n"
         . "This file will be deleted automatically after verification.\n";
-    if (file_put_contents($securityFile, $securityContent) === false) {
-        // Cannot write security file — skip verification to avoid locking user out
+
+    $written = @file_put_contents($securityFile, $securityContent);
+
+    if ($written === false) {
+        $err = error_get_last();
+        error_log('MokoRestore: FAILED to write security file — ' . ($err['message'] ?? 'unknown error'));
+        error_log('MokoRestore: Directory permissions: ' . decoct(@fileperms(RESTORE_DIR) & 0777) . ', owner: ' . @fileowner(RESTORE_DIR) . ', PHP user: ' . (function_exists('posix_getuid') ? posix_getuid() : 'n/a'));
+        error_log('MokoRestore: Security verification SKIPPED — user will not be challenged');
         $_SESSION['security_verified'] = true;
-        error_log('MokoRestore: Cannot write security file — verification skipped (check directory permissions)');
+    } else {
+        error_log('MokoRestore: Security file created (' . $written . ' bytes)');
     }
 }
 
@@ -387,15 +402,17 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']) && $_POST['
 
     if ($inputCode === $securityCode) {
         $_SESSION['security_verified'] = true;
+        error_log('MokoRestore: Security code VERIFIED');
 
-        // Delete the security file
         if (is_file($securityFile)) {
             @unlink($securityFile);
+            error_log('MokoRestore: Security file deleted');
         }
 
         echo json_encode(['success' => true, 'message' => 'Security verified']);
     } else {
-        echo json_encode(['success' => false, 'message' => 'Incorrect security code. Check the file: .mokorestore-security.php']);
+        error_log('MokoRestore: Security code REJECTED (input=' . $inputCode . ')');
+        echo json_encode(['success' => false, 'message' => 'Incorrect security code. Check the file: mokorestore-security.php']);
     }
 
     exit;
@@ -414,7 +431,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action'])) {
     }
 
     if (!$securityVerified) {
-        echo json_encode(['success' => false, 'message' => 'Security verification required. Enter the code from .mokorestore-security.php']);
+        echo json_encode(['success' => false, 'message' => 'Security verification required. Enter the code from mokorestore-security.php']);
         exit;
     }
 
@@ -424,9 +441,12 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action'])) {
     @ignore_user_abort(true);
 
     try {
+        error_log('MokoRestore: Action dispatched — ' . $_POST['action']);
         $result = handleAction($_POST['action'], $_POST);
+        error_log('MokoRestore: Action ' . $_POST['action'] . ' completed — ' . ($result['success'] ? 'OK' : 'FAIL: ' . ($result['message'] ?? '')));
         echo json_encode($result);
     } catch (Throwable $e) {
+        error_log('MokoRestore: Action ' . $_POST['action'] . ' EXCEPTION — ' . $e->getMessage());
         echo json_encode(['success' => false, 'message' => $e->getMessage()]);
     }
 
@@ -551,10 +571,14 @@ function actionPreflight(): array
 
 function actionExtract(array $data): array
 {
+    error_log('MokoRestore: Extract — target=' . BACKUP_FILE . ', exists=' . (file_exists(BACKUP_FILE) ? 'yes' : 'no'));
+
     if (!file_exists(BACKUP_FILE)) {
         throw new RuntimeException('Backup file not found: site-backup.zip');
     }
 
+    error_log('MokoRestore: Extract — archive size=' . number_format(filesize(BACKUP_FILE) / 1048576, 2) . ' MB');
+
     $zip = new ZipArchive();
 
     if ($zip->open(BACKUP_FILE) !== true) {
@@ -591,6 +615,8 @@ function actionExtract(array $data): array
     $count = $zip->numFiles;
     $zip->close();
 
+    error_log('MokoRestore: Extract — ' . $count . ' files extracted to ' . RESTORE_DIR);
+
     // Pre-fill from configuration.php.bak (sanitized backup) or
     // configuration.php (legacy/unsanitized backup). Skip [SANITIZED:] values.
     $existingConfig = [];
@@ -719,6 +745,8 @@ function actionDatabase(array $data): array
     $user   = $data['db_user'] ?? '';
     $pass   = $data['db_pass'] ?? '';
 
+    error_log('MokoRestore: Database import — host=' . $host . ', db=' . $name . ', user=' . $user);
+
     if (empty($name) || empty($user)) {
         throw new RuntimeException('Database name and user are required');
     }
@@ -726,9 +754,12 @@ function actionDatabase(array $data): array
     $sqlFile = RESTORE_DIR . '/database.sql';
 
     if (!is_file($sqlFile)) {
+        error_log('MokoRestore: Database import — no database.sql found, skipping');
         return ['success' => true, 'message' => 'No database.sql found — skipped', 'statements' => 0, 'errors' => 0];
     }
 
+    error_log('MokoRestore: Database import — SQL file size=' . number_format(filesize($sqlFile) / 1048576, 2) . ' MB');
+
     $pdo = new PDO(
         "mysql:host={$host};dbname={$name};charset=utf8mb4",
         $user,
@@ -835,6 +866,14 @@ function actionDatabase(array $data): array
         $msg .= " ({$errors} warnings)";
     }
 
+    error_log('MokoRestore: Database import — ' . $msg);
+
+    if (!empty($errorList)) {
+        foreach ($errorList as $i => $err) {
+            error_log('MokoRestore: DB error ' . ($i + 1) . ': ' . $err);
+        }
+    }
+
     return [
         'success'    => ($statements > 0 || $errors === 0),
         'message'    => $msg,
@@ -847,6 +886,7 @@ function actionDatabase(array $data): array
 
 function actionConfig(array $data): array
 {
+    error_log('MokoRestore: Config rebuild started');
     $host     = $data['db_host'] ?? 'localhost';
     $dbName   = $data['db_name'] ?? '';
     $dbUser   = $data['db_user'] ?? '';
@@ -867,6 +907,7 @@ function actionConfig(array $data): array
     // debug, cache, SEF, editor, etc.). Fall back to existing config
     // for legacy/unsanitized backups, or build from scratch if neither exists.
     $basePath = is_file($bakPath) ? $bakPath : (is_file($configPath) ? $configPath : null);
+    error_log('MokoRestore: Config — base template: ' . ($basePath ?? 'none (building from scratch)'));
 
     if ($basePath !== null) {
         $config = file_get_contents($basePath);
@@ -919,9 +960,12 @@ function actionConfig(array $data): array
         }
 
         if (file_put_contents($configPath, $config) === false) {
+            error_log('MokoRestore: Config — FAILED to write ' . $configPath);
             return ['success' => false, 'message' => 'Failed to write Joomla config file — check directory permissions'];
         }
 
+        error_log('MokoRestore: Config — written to ' . $configPath . ' (' . filesize($configPath) . ' bytes)');
+
         // Remove .bak after successful rebuild
         if (is_file($bakPath)) {
             @unlink($bakPath);
@@ -1175,6 +1219,8 @@ function actionResetAdmin(array $data): array
     $userId   = (int) ($data['admin_id'] ?? 0);
     $password = $data['new_password'] ?? '';
 
+    error_log('MokoRestore: Admin password reset — user_id=' . $userId);
+
     if ($userId < 1 || strlen($password) < 8) {
         throw new RuntimeException('Select an admin and enter a password (8+ characters)');
     }
@@ -1188,6 +1234,7 @@ function actionResetAdmin(array $data): array
         throw new RuntimeException('User not found or password unchanged');
     }
 
+    error_log('MokoRestore: Admin password reset — success');
     return ['success' => true, 'message' => 'Admin password updated successfully'];
 }
 
@@ -1197,6 +1244,7 @@ function actionPostRestore(array $data): array
     $prefix  = getValidatedPrefix($data);
     $tasks   = json_decode($data['tasks'] ?? '[]', true) ?: [];
     $results = [];
+    error_log('MokoRestore: Post-restore — ' . count($tasks) . ' task(s): ' . implode(', ', $tasks));
 
     foreach ($tasks as $task) {
         try {
@@ -1319,6 +1367,7 @@ function actionProvision(array $data): array
     $prefix = getValidatedPrefix($data);
     $tasks  = json_decode($data['tasks'] ?? '[]', true) ?: [];
     $results = [];
+    error_log('MokoRestore: Provisioning — ' . count($tasks) . ' task(s): ' . implode(', ', $tasks));
 
     foreach ($tasks as $task) {
         try {
@@ -1395,16 +1444,24 @@ function actionProvision(array $data): array
 
 function actionCleanup(): array
 {
+    error_log('MokoRestore: Cleanup started');
     $removed = [];
 
-    foreach (['database.sql', 'site-backup.zip'] as $file) {
+    foreach (['database.sql', 'site-backup.zip', 'mokorestore-security.php'] as $file) {
         $path = RESTORE_DIR . '/' . $file;
 
-        if (is_file($path) && @unlink($path)) {
-            $removed[] = $file;
+        if (is_file($path)) {
+            if (@unlink($path)) {
+                $removed[] = $file;
+                error_log('MokoRestore: Cleanup — removed ' . $file);
+            } else {
+                error_log('MokoRestore: Cleanup — FAILED to remove ' . $file);
+            }
         }
     }
 
+    error_log('MokoRestore: Cleanup complete — removed ' . count($removed) . ' file(s)');
+
     return [
         'success' => true,
         'message' => 'Removed: ' . (empty($removed) ? '(none)' : implode(', ', $removed))
@@ -1570,14 +1627,14 @@ body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,'Helvetica N
     <!-- Step 0: Security Verification -->
     <div class="mr-panel <?php echo $securityVerified ? '' : 'visible'; ?>" id="panel0">
         <h2>Security Verification</h2>
-        <p class="mr-desc">To prevent unauthorized access, enter the security code from the file <code>.mokorestore-security.php</code> in your site root.</p>
+        <p class="mr-desc">To prevent unauthorized access, enter the security code from the file <code>mokorestore-security.php</code> in your site root.</p>
         <div style="border:1px solid #e2e8f0;border-radius:8px;padding:1.25rem;margin-bottom:1.25rem;background:#f8fafc">
             <div style="font-weight:600;font-size:0.9rem;color:#334155;margin-bottom:1rem;display:flex;align-items:center;gap:0.5rem">
                 <span style="font-size:1.1rem">&#128274;</span> How to find the code
             </div>
             <ol style="margin:0;padding-left:1.25rem;color:#475569;font-size:0.9rem;line-height:1.6">
                 <li>Connect to your server via FTP, SSH, or file manager</li>
-                <li>Open <code>.mokorestore-security.php</code> in the site root directory</li>
+                <li>Open <code>mokorestore-security.php</code> in the site root directory</li>
                 <li>Copy the 8-character code and enter it below</li>
             </ol>
         </div>

source/packages/com_mokosuitebackup/src/Engine/PreflightCheck.php

@@ -165,7 +165,7 @@ class PreflightCheck
 			->select($db->quoteName('total_size'))
 			->from($db->quoteName('#__mokosuitebackup_records'))
 			->where($db->quoteName('profile_id') . ' = ' . (int) $profile->id)
-			->where($db->quoteName('status') . ' = ' . $db->quote('complete'))
+			->where($db->quoteName('status') . ' IN (' . implode(',', array_map([$db, 'quote'], ['complete', 'warning'])) . ')')
 			->where($db->quoteName('total_size') . ' > 0')
 			->order($db->quoteName('backupstart') . ' DESC');
 		$db->setQuery($query, 0, 1);
@@ -194,22 +194,58 @@ class PreflightCheck
 		}
 	}
 
+	private const STALE_TIMEOUT_MINUTES = 30;
+
 	/**
 	 * Check if another backup is already running for this profile.
+	 *
+	 * Backups running longer than STALE_TIMEOUT_MINUTES are automatically
+	 * marked as failed so they don't permanently block future runs.
 	 */
 	private function checkRunningBackup(object $profile, object $db): void
 	{
 		$query = $db->getQuery(true)
-			->select('COUNT(*)')
+			->select($db->quoteName(['id', 'backupstart', 'absolute_path']))
 			->from($db->quoteName('#__mokosuitebackup_records'))
 			->where($db->quoteName('profile_id') . ' = ' . (int) $profile->id)
 			->where($db->quoteName('status') . ' = ' . $db->quote('running'));
 		$db->setQuery($query);
-		$running = (int) $db->loadResult();
+		$rows = $db->loadObjectList();
 
-		if ($running > 0) {
+		if (empty($rows)) {
+			return;
+		}
+
+		$cutoff     = time() - (self::STALE_TIMEOUT_MINUTES * 60);
+		$stillAlive = 0;
+
+		foreach ($rows as $row) {
+			$started = strtotime($row->backupstart);
+
+			if ($started !== false && $started < $cutoff) {
+				$update = $db->getQuery(true)
+					->update($db->quoteName('#__mokosuitebackup_records'))
+					->set($db->quoteName('status') . ' = ' . $db->quote('fail'))
+					->set($db->quoteName('backupend') . ' = ' . $db->quote(date('Y-m-d H:i:s')))
+					->where($db->quoteName('id') . ' = ' . (int) $row->id);
+				$db->setQuery($update);
+				$db->execute();
+
+				if (!empty($row->absolute_path) && is_file($row->absolute_path)) {
+					@unlink($row->absolute_path);
+				}
+
+				$this->warnings[] = 'Auto-cancelled stalled backup #' . $row->id
+					. ' (started ' . $row->backupstart . ', exceeded '
+					. self::STALE_TIMEOUT_MINUTES . ' min timeout)';
+			} else {
+				$stillAlive++;
+			}
+		}
+
+		if ($stillAlive > 0) {
 			$this->errors[] = 'Another backup is already running for profile: ' . $profile->title
-				. ' — wait for it to finish or delete the stale record';
+				. ' — wait for it to finish or use Cancel Stalled from the Backup Records toolbar';
 		}
 	}
 

source/packages/com_mokosuitebackup/src/Engine/RestoreEngine.php

@@ -67,7 +67,7 @@ class RestoreEngine
 			return ['success' => false, 'message' => 'Backup record not found: ' . $recordId];
 		}
 
-		if ($record->status !== 'complete') {
+		if ($record->status !== 'complete' && $record->status !== 'warning') {
 			return ['success' => false, 'message' => 'Cannot restore from incomplete backup (status: ' . $record->status . ')'];
 		}
 

source/packages/com_mokosuitebackup/src/Engine/RetentionManager.php

@@ -0,0 +1,118 @@
+<?php
+
+/**
+ * @package     MokoSuiteBackup
+ * @subpackage  com_mokosuitebackup
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ */
+
+namespace Joomla\Component\MokoSuiteBackup\Administrator\Engine;
+
+defined('_JEXEC') or die;
+
+use Joomla\Component\MokoSuiteBackup\Administrator\Utility\BackupDirectory;
+
+/**
+ * Enforces per-profile backup retention.
+ *
+ * A profile may cap retained backups by age (retention_days) and/or by
+ * number of copies (retention_count). A backup is pruned when EITHER rule
+ * matches: it is older than retention_days OR it falls outside the newest
+ * retention_count copies. Deleting a record also removes its archive and
+ * log file, mirroring the Backup table's delete().
+ */
+final class RetentionManager
+{
+	/**
+	 * Prune old backups for a profile according to its retention settings.
+	 *
+	 * Called after a backup completes. Only 'complete' and 'warning' records
+	 * are considered — pending/running/failed records are never pruned here.
+	 *
+	 * @param   object  $db       Database driver
+	 * @param   object  $profile  Profile row (needs id, retention_days, retention_count)
+	 *
+	 * @return  int  Number of backup records deleted
+	 */
+	public static function prune(object $db, object $profile): int
+	{
+		$days  = (int) ($profile->retention_days ?? 0);
+		$count = (int) ($profile->retention_count ?? 0);
+
+		// No retention configured — nothing to do.
+		if ($days <= 0 && $count <= 0) {
+			return 0;
+		}
+
+		// Newest first, so the index is the copy's position from the top.
+		$query = $db->getQuery(true)
+			->select($db->quoteName(['id', 'absolute_path', 'backupstart']))
+			->from($db->quoteName('#__mokosuitebackup_records'))
+			->where($db->quoteName('profile_id') . ' = ' . (int) $profile->id)
+			->where($db->quoteName('status') . ' IN (' . implode(',', array_map([$db, 'quote'], ['complete', 'warning'])) . ')')
+			->order($db->quoteName('backupstart') . ' DESC');
+		$db->setQuery($query);
+		$records = $db->loadObjectList() ?: [];
+
+		if (empty($records)) {
+			return 0;
+		}
+
+		$cutoffTs = $days > 0 ? (time() - ($days * 86400)) : null;
+		$deleted  = 0;
+
+		foreach ($records as $index => $record) {
+			$tooOld    = $cutoffTs !== null && strtotime((string) $record->backupstart) < $cutoffTs;
+			$overCount = $count > 0 && $index >= $count;
+
+			// Delete-if-either: prune when age OR count rule is exceeded.
+			if (!$tooOld && !$overCount) {
+				continue;
+			}
+
+			if (self::deleteRecord($db, $record)) {
+				$deleted++;
+			}
+		}
+
+		return $deleted;
+	}
+
+	/**
+	 * Delete a single backup record and its on-disk archive + log file.
+	 *
+	 * The DB row is removed first; the files are only unlinked if that
+	 * succeeds, so a failed delete never orphans the record from its files.
+	 */
+	private static function deleteRecord(object $db, object $record): bool
+	{
+		$query = $db->getQuery(true)
+			->delete($db->quoteName('#__mokosuitebackup_records'))
+			->where($db->quoteName('id') . ' = ' . (int) $record->id);
+		$db->setQuery($query);
+
+		try {
+			$db->execute();
+		} catch (\Throwable $e) {
+			error_log('MokoSuiteBackup: retention could not delete record ' . $record->id . ': ' . $e->getMessage());
+
+			return false;
+		}
+
+		$archivePath = (string) ($record->absolute_path ?? '');
+
+		if ($archivePath !== '' && is_file($archivePath)) {
+			@unlink($archivePath);
+
+			$logPath = BackupDirectory::logPathFromArchive($archivePath);
+
+			if (is_file($logPath)) {
+				@unlink($logPath);
+			}
+		}
+
+		return true;
+	}
+}

source/packages/com_mokosuitebackup/src/Engine/SteppedBackupEngine.php

@@ -394,8 +394,14 @@ class SteppedBackupEngine
 			$restoreScriptName = MokoRestore::sanitizeScriptName($restoreScriptName);
 			$restoreDir = dirname($session->archivePath);
 			$session->restoreScriptPath = $restoreDir . '/' . $restoreScriptName;
-			MokoRestore::generateStandalone($session->restoreScriptPath);
-			$session->log('Standalone ' . $restoreScriptName . ' generated');
+
+			try {
+				MokoRestore::generateStandalone($session->restoreScriptPath);
+				$session->log('Standalone ' . $restoreScriptName . ' generated');
+			} catch (\Throwable $e) {
+				$session->log('MokoRestore error: ' . $e->getMessage() . ' in ' . $e->getFile() . ':' . $e->getLine());
+				$session->log('Stack trace: ' . $e->getTraceAsString());
+			}
 		}
 
 		// Update record
@@ -641,7 +647,7 @@ class SteppedBackupEngine
 
 		$update = (object) [
 			'id'          => $session->recordId,
-			'status'      => 'complete',
+			'status'      => $uploadFailed ? 'warning' : 'complete',
 			'backupend'   => date('Y-m-d H:i:s'),
 			'total_size'  => $totalSize,
 			'checksum'    => $checksum,
@@ -680,6 +686,13 @@ class SteppedBackupEngine
 				if ($uploadFailed) {
 					NotificationSender::send($profile, $record, false, "Remote upload failed — see backup log for details.\n\n" . $logContent);
 				}
+
+				// Enforce per-profile retention (age and/or copy count).
+				$pruned = RetentionManager::prune($db, $profile);
+
+				if ($pruned > 0) {
+					$session->log('Retention: pruned ' . $pruned . ' old backup(s)');
+				}
 			}
 		} catch (\Throwable $e) {
 			error_log('MokoSuiteBackup: SteppedBackupEngine notification failed: ' . $e->getMessage());
@@ -883,7 +896,16 @@ class SteppedBackupEngine
 	 */
 	private function createUploaderFromParams(string $type, array $params): RemoteUploaderInterface
 	{
-		$fake = (object) $params;
+		$prefixMap = ['ftp' => 'ftp_', 'sftp' => 'sftp_', 's3' => 's3_', 'google_drive' => 'gdrive_'];
+		$prefix    = $prefixMap[$type] ?? '';
+
+		$prefixed = [];
+
+		foreach ($params as $key => $value) {
+			$prefixed[$prefix . $key] = $value;
+		}
+
+		$fake = (object) $prefixed;
 
 		return match ($type) {
 			'ftp'          => new FtpUploader($fake),

source/packages/com_mokosuitebackup/src/Engine/SteppedRestoreEngine.php

@@ -64,7 +64,7 @@ class SteppedRestoreEngine
 			return ['error' => true, 'message' => 'Backup record not found: ' . $recordId];
 		}
 
-		if ($record->status !== 'complete') {
+		if ($record->status !== 'complete' && $record->status !== 'warning') {
 			return ['error' => true, 'message' => 'Cannot restore from incomplete backup (status: ' . $record->status . ')'];
 		}
 

source/packages/com_mokosuitebackup/src/Helper/BackupStatusHelper.php

@@ -70,7 +70,7 @@ class BackupStatusHelper
             ])
             ->from($db->quoteName('#__mokosuitebackup_records', 'r'))
             ->join('LEFT', $db->quoteName('#__mokosuitebackup_profiles', 'p') . ' ON p.id = r.profile_id')
-            ->where($db->quoteName('r.status') . ' IN (' . implode(',', array_map([$db, 'quote'], ['complete', 'fail'])) . ')')
+            ->where($db->quoteName('r.status') . ' IN (' . implode(',', array_map([$db, 'quote'], ['complete', 'warning', 'fail'])) . ')')
             ->order($db->quoteName('r.backupstart') . ' DESC');
 
         if ($profileId !== null) {
@@ -148,7 +148,7 @@ class BackupStatusHelper
         $query = $db->getQuery(true)
             ->select($db->quoteName('status'))
             ->from($db->quoteName('#__mokosuitebackup_records'))
-            ->where($db->quoteName('status') . ' IN (' . implode(',', array_map([$db, 'quote'], ['complete', 'fail'])) . ')')
+            ->where($db->quoteName('status') . ' IN (' . implode(',', array_map([$db, 'quote'], ['complete', 'warning', 'fail'])) . ')')
             ->order($db->quoteName('backupstart') . ' DESC')
             ->setLimit(50);
 
@@ -156,7 +156,7 @@ class BackupStatusHelper
         $streak   = 0;
 
         foreach ($statuses as $s) {
-            if ($s === 'complete') {
+            if ($s === 'complete' || $s === 'warning') {
                 $streak++;
             } else {
                 break;

source/packages/com_mokosuitebackup/src/Model/DashboardModel.php

@@ -30,7 +30,7 @@ class DashboardModel extends BaseDatabaseModel
 			->select('r.*, p.title AS profile_title')
 			->from($db->quoteName('#__mokosuitebackup_records', 'r'))
 			->join('LEFT', $db->quoteName('#__mokosuitebackup_profiles', 'p') . ' ON p.id = r.profile_id')
-			->where($db->quoteName('r.status') . ' = ' . $db->quote('complete'))
+			->where($db->quoteName('r.status') . ' IN (' . implode(',', array_map([$db, 'quote'], ['complete', 'warning'])) . ')')
 			->order($db->quoteName('r.backupend') . ' DESC');
 		$db->setQuery($query, 0, 1);
 
@@ -75,7 +75,7 @@ class DashboardModel extends BaseDatabaseModel
 			->select('COUNT(*) AS total_count')
 			->select('COALESCE(SUM(' . $db->quoteName('total_size') . '), 0) AS total_size')
 			->from($db->quoteName('#__mokosuitebackup_records'))
-			->where($db->quoteName('status') . ' = ' . $db->quote('complete'));
+			->where($db->quoteName('status') . ' IN (' . implode(',', array_map([$db, 'quote'], ['complete', 'warning'])) . ')');
 		$db->setQuery($query);
 		$stats = $db->loadObject();
 
@@ -274,7 +274,7 @@ class DashboardModel extends BaseDatabaseModel
 			->select('COALESCE(SUM(r.total_size), 0) AS total_size')
 			->from($db->quoteName('#__mokosuitebackup_records', 'r'))
 			->join('LEFT', $db->quoteName('#__mokosuitebackup_profiles', 'p') . ' ON p.id = r.profile_id')
-			->where($db->quoteName('r.status') . ' = ' . $db->quote('complete'))
+			->where($db->quoteName('r.status') . ' IN (' . implode(',', array_map([$db, 'quote'], ['complete', 'warning'])) . ')')
 			->group($db->quoteName('r.profile_id'))
 			->order('total_size DESC');
 		$db->setQuery($query);

source/packages/com_mokosuitebackup/src/View/Backup/HtmlView.php

@@ -37,11 +37,11 @@ class HtmlView extends BaseHtmlView
 
 	protected function addToolbar(): void
 	{
-		ToolbarHelper::title(Text::_('COM_MOKOJOOMBACKUP_BACKUP_DETAIL'), 'database');
+		ToolbarHelper::title(Text::_('COM_MOKOJOOMBACKUP_SHORT') . ': ' . Text::_('COM_MOKOJOOMBACKUP_BACKUP_DETAIL'), 'database');
 
 		$user = Factory::getApplication()->getIdentity();
 
-		if ($this->item->status === 'complete'
+		if (\in_array($this->item->status, ['complete', 'warning'], true)
 			&& !empty($this->item->filesexist)
 			&& $user->authorise('mokosuitebackup.backup.download', 'com_mokosuitebackup')
 		) {

source/packages/com_mokosuitebackup/src/View/Backups/HtmlView.php

@@ -99,7 +99,7 @@ class HtmlView extends BaseHtmlView
 	{
 		$user = Factory::getApplication()->getIdentity();
 
-		ToolbarHelper::title(Text::_('COM_MOKOJOOMBACKUP_BACKUPS_TITLE'), 'database');
+		ToolbarHelper::title(Text::_('COM_MOKOJOOMBACKUP_SHORT') . ': ' . Text::_('COM_MOKOJOOMBACKUP_BACKUPS_TITLE'), 'database');
 
 		if ($user->authorise('mokosuitebackup.backup.restore', 'com_mokosuitebackup')) {
 			ToolbarHelper::custom('backups.restore', 'upload', '', 'COM_MOKOJOOMBACKUP_TOOLBAR_RESTORE', true);
@@ -113,6 +113,10 @@ class HtmlView extends BaseHtmlView
 			ToolbarHelper::custom('backups.compare', 'copy', '', 'COM_MOKOJOOMBACKUP_TOOLBAR_COMPARE', true);
 		}
 
+		if ($user->authorise('mokosuitebackup.backup.cancel', 'com_mokosuitebackup')) {
+			ToolbarHelper::custom('backups.cancelStalled', 'stop-circle', '', 'COM_MOKOJOOMBACKUP_TOOLBAR_CANCEL_STALLED', true);
+		}
+
 		if ($user->authorise('core.delete', 'com_mokosuitebackup')) {
 			ToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'backups.delete');
 		}

source/packages/com_mokosuitebackup/src/View/Dashboard/HtmlView.php

@@ -52,7 +52,7 @@ class HtmlView extends BaseHtmlView
 
 	protected function addToolbar(): void
 	{
-		ToolbarHelper::title(Text::_('COM_MOKOJOOMBACKUP_DASHBOARD_TITLE'), 'archive');
+		ToolbarHelper::title(Text::_('COM_MOKOJOOMBACKUP_SHORT') . ': ' . Text::_('COM_MOKOJOOMBACKUP_DASHBOARD_TITLE'), 'archive');
 		ToolbarHelper::preferences('com_mokosuitebackup');
 	}
 }

source/packages/com_mokosuitebackup/src/View/Profile/HtmlView.php

@@ -44,7 +44,7 @@ class HtmlView extends BaseHtmlView
 			? $user->authorise('core.create', 'com_mokosuitebackup')
 			: $user->authorise('core.edit', 'com_mokosuitebackup');
 
-		ToolbarHelper::title(Text::_($title), 'cog');
+		ToolbarHelper::title(Text::_('COM_MOKOJOOMBACKUP_SHORT') . ': ' . Text::_($title), 'cog');
 
 		if ($canSave) {
 			ToolbarHelper::apply('profile.apply');

source/packages/com_mokosuitebackup/src/View/Profiles/HtmlView.php

@@ -49,7 +49,7 @@ class HtmlView extends BaseHtmlView
 	{
 		$user = Factory::getApplication()->getIdentity();
 
-		ToolbarHelper::title(Text::_('COM_MOKOJOOMBACKUP_PROFILES_TITLE'), 'cog');
+		ToolbarHelper::title(Text::_('COM_MOKOJOOMBACKUP_SHORT') . ': ' . Text::_('COM_MOKOJOOMBACKUP_PROFILES_TITLE'), 'cog');
 
 		if ($user->authorise('core.create', 'com_mokosuitebackup')) {
 			ToolbarHelper::addNew('profile.add');

source/packages/com_mokosuitebackup/src/View/Snapshots/HtmlView.php

@@ -38,7 +38,7 @@ class HtmlView extends BaseHtmlView
 	{
 		$user = Factory::getApplication()->getIdentity();
 
-		ToolbarHelper::title(Text::_('COM_MOKOJOOMBACKUP_SNAPSHOTS_TITLE'), 'camera');
+		ToolbarHelper::title(Text::_('COM_MOKOJOOMBACKUP_SHORT') . ': ' . Text::_('COM_MOKOJOOMBACKUP_SNAPSHOTS_TITLE'), 'camera');
 
 		if ($user->authorise('mokosuitebackup.snapshot.manage', 'com_mokosuitebackup')) {
 			ToolbarHelper::custom('snapshots.create', 'plus', '', 'COM_MOKOJOOMBACKUP_SNAPSHOT_CREATE', false);

source/packages/com_mokosuitebackup/tmpl/backup/default.php

@@ -30,6 +30,7 @@ $ajaxUrl   = Route::_('index.php?option=com_mokosuitebackup&format=json', false)
 						<?php
 						$statusClass = match ($this->item->status) {
 							'complete' => 'badge bg-success',
+							'warning'  => 'badge bg-warning text-dark',
 							'running'  => 'badge bg-info',
 							'fail'     => 'badge bg-danger',
 							default    => 'badge bg-secondary',

source/packages/com_mokosuitebackup/tmpl/backups/default.php

@@ -92,6 +92,7 @@ $listDirn  = $this->escape($this->state->get('list.direction'));
 									<?php
 									$statusClass = match ($item->status) {
 										'complete' => 'badge bg-success',
+										'warning'  => 'badge bg-warning text-dark',
 										'running'  => 'badge bg-info',
 										'fail'     => 'badge bg-danger',
 										default    => 'badge bg-secondary',
@@ -683,19 +684,37 @@ $listDirn  = $this->escape($this->state->get('list.direction'));
 	var PURGE_TOKEN = <?php echo json_encode($ajaxToken); ?>;
 	var purgeCountTimer = null;
 
-	// Intercept Purge toolbar button to show the modal
+	// Reset modal state and show it.
+	function openPurgeModal() {
+		document.getElementById('mb-purge-date').value = '';
+		document.getElementById('mb-purge-count-wrapper').style.display = 'none';
+		document.getElementById('mb-purge-none-wrapper').style.display = 'none';
+		document.getElementById('mb-purge-submit').disabled = true;
+		bootstrap.Modal.getOrCreateInstance(document.getElementById('mb-purge-modal')).show();
+	}
+
+	// Primary: wrap Joomla.submitbutton so the Purge toolbar button opens the
+	// modal instead of submitting the no-op backups.purgeModal task. This is
+	// resilient to how the Atum toolbar renders the button markup.
+	if (window.Joomla && typeof Joomla.submitbutton === 'function') {
+		var origSubmitbutton = Joomla.submitbutton;
+		Joomla.submitbutton = function(task) {
+			if (task === 'backups.purgeModal') {
+				openPurgeModal();
+				return false;
+			}
+			return origSubmitbutton.apply(this, arguments);
+		};
+	}
+
 	document.addEventListener('DOMContentLoaded', function() {
+		// Fallback: if the button still exposes an inline onclick, bind directly.
 		var purgeBtn = document.querySelector('[onclick*="backups.purgeModal"], .button-trash');
 		if (purgeBtn) {
 			purgeBtn.addEventListener('click', function(e) {
 				e.preventDefault();
 				e.stopPropagation();
-				// Reset modal state
-				document.getElementById('mb-purge-date').value = '';
-				document.getElementById('mb-purge-count-wrapper').style.display = 'none';
-				document.getElementById('mb-purge-none-wrapper').style.display = 'none';
-				document.getElementById('mb-purge-submit').disabled = true;
-				bootstrap.Modal.getOrCreateInstance(document.getElementById('mb-purge-modal')).show();
+				openPurgeModal();
 				return false;
 			}, true);
 		}

source/packages/com_mokosuitebackup/tmpl/profile/edit.php

@@ -42,6 +42,7 @@ $token     = Session::getFormToken();
 		<div class="row">
 			<div class="col-lg-9">
 				<?php echo $this->form->renderFieldset('archive'); ?>
+				<?php echo $this->form->renderFieldset('retention'); ?>
 			</div>
 		</div>
 		<?php echo HTMLHelper::_('uitab.endTab'); ?>

source/packages/mod_mokosuitebackup_cpanel/language/en-GB/mod_mokosuitebackup_cpanel.ini

@@ -11,6 +11,7 @@ MOD_MOKOSUITEBACKUP_CPANEL_NOT_INSTALLED="MokoSuiteBackup is not installed or is
 
 MOD_MOKOSUITEBACKUP_CPANEL_LAST_BACKUP="Last Backup"
 MOD_MOKOSUITEBACKUP_CPANEL_STATUS_OK="Success"
+MOD_MOKOSUITEBACKUP_CPANEL_STATUS_WARNING="Warning"
 MOD_MOKOSUITEBACKUP_CPANEL_STATUS_FAIL="Failed"
 MOD_MOKOSUITEBACKUP_CPANEL_NO_BACKUPS="No backups yet."
 MOD_MOKOSUITEBACKUP_CPANEL_FILES_TABLES="%d files, %d tables"

source/packages/mod_mokosuitebackup_cpanel/mod_mokosuitebackup_cpanel.xml

@@ -7,15 +7,15 @@
  * @license     GNU General Public License version 3 or later; see LICENSE
  -->
 <extension type="module" client="administrator" method="upgrade">
-	<name>mod_mokosuitebackup_cpanel</name>
-	<version>01.45.05</version>
+	<name>Module - MokoSuiteBackup - cPanel</name>
+	<version>02.54.01</version>
 	<creationDate>2026-06-23</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<copyright>Copyright (C) 2026 Moko Consulting. All rights reserved.</copyright>
 	<license>GPL-3.0-or-later</license>
-	<description>MOD_MOKOSUITEBACKUP_CPANEL_DESCRIPTION</description>
+	<description>Displays backup status, Backup Now buttons, and quick links on the admin dashboard.</description>
 
 	<namespace path="src">Joomla\Module\MokoSuiteBackupCpanel</namespace>
 

source/packages/mod_mokosuitebackup_cpanel/tmpl/default.php

@@ -51,10 +51,20 @@ $moduleId = 'mod-msb-cpanel-' . $displayData['module']->id;
 		<?php if ($latest) : ?>
 			<div class="d-flex align-items-center justify-content-between">
 				<div>
-					<span class="badge <?php echo $latest['status'] === 'complete' ? 'bg-success' : 'bg-danger'; ?>">
-						<?php echo $latest['status'] === 'complete'
-							? Text::_('MOD_MOKOSUITEBACKUP_CPANEL_STATUS_OK')
-							: Text::_('MOD_MOKOSUITEBACKUP_CPANEL_STATUS_FAIL'); ?>
+					<?php
+					$cpanelBadge = match ($latest['status']) {
+						'complete' => 'bg-success',
+						'warning'  => 'bg-warning text-dark',
+						default    => 'bg-danger',
+					};
+					$cpanelLabel = match ($latest['status']) {
+						'complete' => Text::_('MOD_MOKOSUITEBACKUP_CPANEL_STATUS_OK'),
+						'warning'  => Text::_('MOD_MOKOSUITEBACKUP_CPANEL_STATUS_WARNING'),
+						default    => Text::_('MOD_MOKOSUITEBACKUP_CPANEL_STATUS_FAIL'),
+					};
+					?>
+					<span class="badge <?php echo $cpanelBadge; ?>">
+						<?php echo $cpanelLabel; ?>
 					</span>
 					<span class="ms-1 small text-muted">
 						<?php echo htmlspecialchars($latest['profile'] ?? ''); ?>

source/packages/plg_actionlog_mokosuitebackup/mokosuitebackup.xml

@@ -7,14 +7,14 @@
  -->
 <extension type="plugin" group="actionlog" method="upgrade">
 	<name>Action Log - MokoSuiteBackup</name>
-	<version>01.45.05</version>
+	<version>02.54.01</version>
 	<creationDate>2026-06-04</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<copyright>Copyright (C) 2026 Moko Consulting. All rights reserved.</copyright>
 	<license>GPL-3.0-or-later</license>
-	<description>PLG_ACTIONLOG_MOKOJOOMBACKUP_DESCRIPTION</description>
+	<description>Logs MokoSuiteBackup actions (backup, restore, profile changes) to User Action Logs.</description>
 
 	<namespace path="src">Joomla\Plugin\Actionlog\MokoSuiteBackup</namespace>
 

source/packages/plg_console_mokosuitebackup/mokosuitebackup.xml

@@ -7,14 +7,14 @@
  -->
 <extension type="plugin" group="console" method="upgrade">
 	<name>Console - MokoSuiteBackup</name>
-	<version>01.45.05</version>
+	<version>02.54.01</version>
 	<creationDate>2026-06-04</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<copyright>Copyright (C) 2026 Moko Consulting. All rights reserved.</copyright>
 	<license>GPL-3.0-or-later</license>
-	<description>PLG_CONSOLE_MOKOJOOMBACKUP_DESCRIPTION</description>
+	<description>CLI commands for MokoSuiteBackup: run, list, profiles, restore, cleanup.</description>
 
 	<namespace path="src">Joomla\Plugin\Console\MokoSuiteBackup</namespace>
 

source/packages/plg_content_mokosuitebackup/mokosuitebackup.xml

@@ -7,14 +7,14 @@
  -->
 <extension type="plugin" group="content" method="upgrade">
 	<name>Content - MokoSuiteBackup</name>
-	<version>01.45.05</version>
+	<version>02.54.01</version>
 	<creationDate>2026-06-04</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<copyright>Copyright (C) 2026 Moko Consulting. All rights reserved.</copyright>
 	<license>GPL-3.0-or-later</license>
-	<description>PLG_CONTENT_MOKOJOOMBACKUP_DESCRIPTION</description>
+	<description>Automatically triggers a backup before extension installs or updates.</description>
 
 	<namespace path="src">Joomla\Plugin\Content\MokoSuiteBackup</namespace>
 

source/packages/plg_quickicon_mokosuitebackup/mokosuitebackup.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="quickicon" method="upgrade">
 	<name>Quick Icon - MokoSuiteBackup</name>
-	<version>01.45.05</version>
+	<version>02.54.01</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<copyright>Copyright (C) 2026 Moko Consulting. All rights reserved.</copyright>
 	<license>GPL-3.0-or-later</license>
-	<description>PLG_QUICKICON_MOKOJOOMBACKUP_DESCRIPTION</description>
+	<description>Shows backup status on the administrator dashboard.</description>
 
 	<namespace path="src">Joomla\Plugin\Quickicon\MokoSuiteBackup</namespace>
 

source/packages/plg_system_mokosuitebackup/mokosuitebackup.xml

@@ -7,14 +7,14 @@
  -->
 <extension type="plugin" group="system" method="upgrade">
 	<name>System - MokoSuiteBackup</name>
-	<version>01.45.05</version>
+	<version>02.54.01</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<copyright>Copyright (C) 2026 Moko Consulting. All rights reserved.</copyright>
 	<license>GPL-3.0-or-later</license>
-	<description>PLG_SYSTEM_MOKOJOOMBACKUP_DESCRIPTION</description>
+	<description>Automatic cleanup of expired backup archives and scheduled backup triggers.</description>
 
 	<namespace path="src">Joomla\Plugin\System\MokoSuiteBackup</namespace>
 

source/packages/plg_task_mokosuitebackup/mokosuitebackup.xml

@@ -7,14 +7,14 @@
  -->
 <extension type="plugin" group="task" method="upgrade">
 	<name>Task - MokoSuiteBackup</name>
-	<version>01.45.05</version>
+	<version>02.54.01</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<copyright>Copyright (C) 2026 Moko Consulting. All rights reserved.</copyright>
 	<license>GPL-3.0-or-later</license>
-	<description>PLG_TASK_MOKOJOOMBACKUP_DESCRIPTION</description>
+	<description>Scheduled task plugin for MokoSuiteBackup. Run backup profiles on a schedule via Joomla's Scheduled Tasks.</description>
 
 	<namespace path="src">Joomla\Plugin\Task\MokoSuiteBackup</namespace>
 

source/packages/plg_webservices_mokosuitebackup/mokosuitebackup.xml

@@ -7,14 +7,14 @@
  -->
 <extension type="plugin" group="webservices" method="upgrade">
 	<name>Web Services - MokoSuiteBackup</name>
-	<version>01.45.05</version>
+	<version>02.54.01</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<copyright>Copyright (C) 2026 Moko Consulting. All rights reserved.</copyright>
 	<license>GPL-3.0-or-later</license>
-	<description>PLG_WEBSERVICES_MOKOJOOMBACKUP_DESCRIPTION</description>
+	<description>REST API for remote backup management.</description>
 
 	<namespace path="src">Joomla\Plugin\WebServices\MokoSuiteBackup</namespace>
 

source/pkg_mokosuitebackup.xml

@@ -8,14 +8,14 @@
 <extension type="package" method="upgrade">
 	<name>Package - MokoSuiteBackup</name>
 	<packagename>mokosuitebackup</packagename>
-	<version>01.45.05</version>
+	<version>02.54.01</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<copyright>Copyright (C) 2026 Moko Consulting. All rights reserved.</copyright>
 	<license>GPL-3.0-or-later</license>
-	<description>PKG_MOKOJOOMBCKUP_DESCRIPTION</description>
+	<description>Full-site backup and restore for Joomla — database, files, and configuration. Includes admin component, system plugin, and REST API.</description>
 
 	<scriptfile>script.php</scriptfile>
 
@@ -29,6 +29,7 @@
 		<file type="plugin" id="mokosuitebackup" group="content">plg_content_mokosuitebackup.zip</file>
 		<file type="plugin" id="mokosuitebackup" group="actionlog">plg_actionlog_mokosuitebackup.zip</file>
 		<file type="module" id="mod_mokosuitebackup_cpanel" client="administrator">mod_mokosuitebackup_cpanel.zip</file>
+		<file type="package" id="pkg_mokosuiteclient">MokoSuiteClient.zip</file>
 	</files>
 
 	<languages>
@@ -36,7 +37,7 @@
 	</languages>
 
 	<updateservers>
-		<server type="extension" name="MokoSuiteBackup Updates">https://git.mokoconsulting.tech/api/packages/MokoConsulting/generic/MokoSuiteBackup/latest/updates.xml</server>
+		<server type="extension" name="MokoSuiteBackup Updates">https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteBackup/updates.xml</server>
 	</updateservers>
 	<dlid prefix="dlid=" suffix=""/>
 	<blockChildUninstall>true</blockChildUninstall>