chore: promote changelog [Unreleased] → [02.52.24]

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

.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
 #
 # +=======================================================================+
@@ -75,6 +75,7 @@ jobs:
         with:
           token: ${{ secrets.MOKOGITEA_TOKEN }}
           fetch-depth: 1
+          submodules: recursive
 
       - name: Setup mokocli tools
         env:
@@ -173,6 +174,7 @@ jobs:
         with:
           token: ${{ secrets.MOKOGITEA_TOKEN }}
           fetch-depth: 0
+          submodules: recursive
 
       - name: Configure git for bot pushes
         run: |

.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.01
+# VERSION: 02.52.24
 # BRIEF: Auto-create feature branch when an issue is opened
 
 name: "Universal: Issue Branch"

CHANGELOG.md

@@ -1,7 +1,36 @@
 # Changelog
-
 ## [Unreleased]
 
+## [02.52.24] --- 2026-06-30
+
+
+## [02.52.24] --- 2026-06-30
+
+## [02.52.22] --- 2026-06-30
+
+### Added
+- Cancel Stalled toolbar button on Backup Records view to cancel backups stuck in "running" status
+- New ACL permission `mokosuitebackup.backup.cancel` for cancel stalled action
+- AJAX endpoint `ajax.cancelBackup` for programmatic/API cancel
+- Auto-timeout failsafe: preflight auto-cancels "running" backups older than 30 minutes
+- Pre-extension-update backup progress modal (Bootstrap 5 modal with stepped AJAX progress bar)
+- New `warning` backup status for records where archive succeeded but remote upload failed
+- Warning-status records are downloadable, browsable, restorable, and purgeable
+- Warning status filter option in Backup Records dropdown
+- Yellow "Warning" badge in backup list, detail view, and cpanel module
+
+### Fixed
+- Pre-update backup ran synchronously with no browser feedback — page hung until complete
+- Stalled backups permanently blocked future backups for the same profile
+- Preflight error message now directs users to Cancel Stalled action
+- Backups with failed remote uploads were marked as "complete", hiding the upload failure
+
+## [02.52.18] --- 2026-06-30
+
+## [01.45.00] --- 2026-06-28
+
+## [01.43.35] --- 2026-06-28
+
 ### 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
@@ -17,142 +46,10 @@
 - MokoRestore cleanup and security messages now reference the actual script filename instead of hardcoded "restore.php"
 
 ### Fixed
+- SSH key indicator detection and missing delete language key
 - 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
-
-## [01.43.00] --- 2026-06-24
-
-
-## [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

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.01
+VERSION: 02.52.24
 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

@@ -207,6 +207,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"
@@ -450,6 +451,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 +503,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-US/com_mokosuitebackup.ini

@@ -116,3 +116,16 @@ 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."

source/packages/com_mokosuitebackup/mokosuitebackup.xml

@@ -7,7 +7,7 @@
  -->
 <extension type="component" method="upgrade">
 	<name>MokoSuiteBackup</name>
-	<version>01.45.01</version>
+	<version>02.52.24</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>

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

@@ -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.01.sql

@@ -1 +0,0 @@
-/* 01.45.01 — 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/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,
@@ -547,7 +547,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 +606,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/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,
@@ -883,7 +889,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

@@ -41,7 +41,7 @@ class HtmlView extends BaseHtmlView
 
 		$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

@@ -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/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',

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

@@ -8,7 +8,7 @@
  -->
 <extension type="module" client="administrator" method="upgrade">
 	<name>mod_mokosuitebackup_cpanel</name>
-	<version>01.45.01</version>
+	<version>02.52.24</version>
 	<creationDate>2026-06-23</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>

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,7 +7,7 @@
  -->
 <extension type="plugin" group="actionlog" method="upgrade">
 	<name>Action Log - MokoSuiteBackup</name>
-	<version>01.45.01</version>
+	<version>02.52.24</version>
 	<creationDate>2026-06-04</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_console_mokosuitebackup/mokosuitebackup.xml

@@ -7,7 +7,7 @@
  -->
 <extension type="plugin" group="console" method="upgrade">
 	<name>Console - MokoSuiteBackup</name>
-	<version>01.45.01</version>
+	<version>02.52.24</version>
 	<creationDate>2026-06-04</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_content_mokosuitebackup/mokosuitebackup.xml

@@ -7,7 +7,7 @@
  -->
 <extension type="plugin" group="content" method="upgrade">
 	<name>Content - MokoSuiteBackup</name>
-	<version>01.45.01</version>
+	<version>02.52.24</version>
 	<creationDate>2026-06-04</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_quickicon_mokosuitebackup/mokosuitebackup.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="quickicon" method="upgrade">
 	<name>Quick Icon - MokoSuiteBackup</name>
-	<version>01.45.01</version>
+	<version>02.52.24</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_system_mokosuitebackup/mokosuitebackup.xml

@@ -7,7 +7,7 @@
  -->
 <extension type="plugin" group="system" method="upgrade">
 	<name>System - MokoSuiteBackup</name>
-	<version>01.45.01</version>
+	<version>02.52.24</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_task_mokosuitebackup/mokosuitebackup.xml

@@ -7,7 +7,7 @@
  -->
 <extension type="plugin" group="task" method="upgrade">
 	<name>Task - MokoSuiteBackup</name>
-	<version>01.45.01</version>
+	<version>02.52.24</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_webservices_mokosuitebackup/mokosuitebackup.xml

@@ -7,7 +7,7 @@
  -->
 <extension type="plugin" group="webservices" method="upgrade">
 	<name>Web Services - MokoSuiteBackup</name>
-	<version>01.45.01</version>
+	<version>02.52.24</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>

source/pkg_mokosuitebackup.xml

@@ -8,7 +8,7 @@
 <extension type="package" method="upgrade">
 	<name>Package - MokoSuiteBackup</name>
 	<packagename>mokosuitebackup</packagename>
-	<version>01.45.01</version>
+	<version>02.52.24</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -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>