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

.mokogitea/workflows/issue-branch.yml

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

CHANGELOG.md

@@ -2,42 +2,6 @@
 
 ## [Unreleased]
 
-### Added
-- **Full-screen backup screen** (`view=runbackup`) for both pre-update and manual backups, modelled on Akeeba's Backup-on-Update — replaces the earlier popup-modal approach. Clicking Joomla's **Install the update** now redirects (server-side, Akeeba-style) to a dedicated full-page backup screen that runs the stepped backup with a real progress bar and then **automatically continues the update** via a validated `returnurl` (flagged `is_backed_up=1` so the backup isn't repeated). Crucially, **no backup runs synchronously inside the update request** — which is what white-screened large sites. The dashboard **Backup Now** now opens the same full-screen screen instead of an inline modal. (#196)
-- Retention now prunes **remote** copies too: when a backup is pruned by age/count, its archive is deleted from every enabled remote destination (SFTP / FTP / S3 / Google Drive), not just the local copy. Each uploader gained an idempotent `delete()` method (already-absent file = success), and removal is best-effort — a failing destination is logged but never blocks local pruning. The shared standalone `restore.php` is intentionally left in place (every backup overwrites it, so newer backups still depend on it). (#229)
-
-### Changed
-- Consolidated backup plumbing into shared helpers (#230):
-  - New `RemoteUploaderFactory` replaces the `createUploaderFromParams()` copy that was duplicated in `BackupEngine` and `SteppedBackupEngine`.
-  - `RetentionManager` is now the single retention authority — it takes the global `max_age_days`/`max_backups` fallback and gained `pruneOrphans()`; the system plugin's hourly cleanup delegates to it and its duplicate `deleteBackupRecord()` logic is removed.
-  - The backend controller, Web Services API controller, and legacy `cli/mokosuitebackup.php` now run backups through the shared `BackupRunner` (gaining the normalized complete/warning/fail status) instead of instantiating `BackupEngine` directly.
-
-### Fixed
-- Pre-update/uninstall backup no longer **white-screens** the update on large sites. The synchronous backup that runs inside the extension update/uninstall request now raises `max_execution_time`/`memory_limit` (and `ignore_user_abort`) like the web-cron path, so it can't exhaust the request's default limits mid-backup. (Core Joomla updates additionally get a full-screen backup screen — see below.)
-- Archive names for **CLI/console-triggered backups** no longer come out as `joomla.invalid_…`. The `[HOST]` placeholder took `$_SERVER['HTTP_HOST']` verbatim, but Joomla's console fills that with the reserved sentinel host `joomla.invalid`; the resolver now treats that (like empty/`localhost`) as unusable and falls back to the configured `live_site` host, then the system hostname. (Set the site's *live_site* to get the exact domain in CLI-built names.)
-- Standalone restore script generation no longer aborts backups with `str_replace() expects at least 3 arguments, 2 given`. `MokoRestore::generateStandaloneScript()` had a `str_replace()` call (the "Backup Archive" pre-check rewrite) that was missing its `$php` subject argument, so **every** standalone-mode backup fatally errored while "Generating standalone restore.php…" — the archive still finalized and uploaded, but no `restore.php` was ever produced (the true root cause behind #226). (#226)
-- Remote upload: the standalone restore script upload is no longer silent — its result is now checked and logged, and a failed restore-script upload marks the backup as `warning` (previously the result was discarded, so a missing restore script on the remote went unreported while the archive still showed success). (#226)
-
-## [02.58.00] --- 2026-07-06
-
-### Added
-- SFTP destinations: **upload an SSH private key file** in the Add/Edit Destination modal instead of pasting it (reads the file into the key field client-side; pasting still works).
-
-### Changed
-- Add/Edit Destination modal: wrap the content in a Bootstrap `.container-fluid` and give it a 1rem padding frame via the WAM stylesheet (Bootstrap's `.modal-content` has no padding of its own).
-
-### Fixed
-- Pre-update backup now shows an admin notification on **every** outcome (success / warning / failure) — previously a *successful* pre-update backup fired nothing, so it looked like the notification wasn't working. (#192)
-
-### Changed
-- Component admin CSS now loads via the Joomla **Web Asset Manager** (`media/com_mokosuitebackup/` + `joomla.asset.json`) instead of an inline `<style>` block.
-- "Keep local copy" is configured **per remote destination** (in the Add/Edit Destination modal); the redundant profile-level field and its "Remote" tab are removed.
-- Add/Edit Destination modal: cleaned up the cramped padding/margins.
-
-### Fixed
-- Admin menu / duplicate-component fallout: (a) the orphaned `com_component-mokosuitebackup` is now removed in **preflight** too, so its "Backup" menu no longer collides on install ("The alias backup is already being used"); (b) `ensureSubmenuItems()` **recreates the top-level "Backup" menu** if it was deleted, instead of giving up — so Backup no longer disappears from the admin menu (and the cPanel module / MokoSuiteClient can find it again); (c) the component menu label now uses the short constant `COM_MOKOJOOMBACKUP_SHORT`. (#213 fallout)
-- Installer no longer aborts on MySQL 8 with "This command is not supported in the prepared statement protocol yet" (error 1295). The legacy remote-column purge migration (`02.56.01.sql`) used `PREPARE`/`EXECUTE`/`DEALLOCATE`, which Joomla's installer rejects; the drop now runs in the package installer script via an INFORMATION_SCHEMA-gated plain `ALTER` (portable across MariaDB and MySQL 8). (#213 update path)
-
 ## [02.57.00] --- 2026-07-05
 
 ### Added

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: 02.58.14
+VERSION: 02.57.03
 BRIEF: Security vulnerability reporting and handling policy
 -->
 

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

@@ -13,7 +13,7 @@ namespace Joomla\Component\MokoSuiteBackup\Api\Controller;
 defined('_JEXEC') or die;
 
 use Joomla\CMS\MVC\Controller\ApiController;
-use Joomla\Component\MokoSuiteBackup\Administrator\Service\BackupRunner;
+use Joomla\Component\MokoSuiteBackup\Administrator\Engine\BackupEngine;
 
 class BackupsController extends ApiController
 {
@@ -38,7 +38,8 @@ class BackupsController extends ApiController
 		$profileId   = (int) ($data['profile'] ?? 1);
 		$description = $data['description'] ?? 'API backup ' . date('Y-m-d H:i:s');
 
-		$result = (new BackupRunner())->run($profileId, $description, 'api');
+		$engine = new BackupEngine();
+		$result = $engine->run($profileId, $description, 'api');
 
 		if ($result['success']) {
 			$this->app->setHeader('status', 200);

source/packages/com_mokosuitebackup/cli/mokosuitebackup.php

@@ -30,7 +30,7 @@ if (!defined('JPATH_BASE')) {
 require_once JPATH_BASE . '/includes/framework.php';
 
 use Joomla\CMS\Factory;
-use Joomla\Component\MokoSuiteBackup\Administrator\Service\BackupRunner;
+use Joomla\Component\MokoSuiteBackup\Administrator\Engine\BackupEngine;
 
 // Parse CLI arguments
 $profileId   = 1;
@@ -56,7 +56,8 @@ echo "Profile: {$profileId}\n";
 echo "Description: {$description}\n";
 echo "Starting backup...\n\n";
 
-$result = (new BackupRunner())->run($profileId, $description, 'cli');
+$engine = new BackupEngine();
+$result = $engine->run($profileId, $description, 'cli');
 
 if ($result['success']) {
 	echo "SUCCESS: " . $result['message'] . "\n";

source/packages/com_mokosuitebackup/forms/profile.xml

@@ -205,9 +205,19 @@
 		/>
 	</fieldset>
 
-	<!-- The "Keep local copy" setting is now configured per remote destination
-	     (in the Add/Edit Destination modal), so the profile-level field and its
-	     "Remote" tab have been removed. -->
+	<fieldset name="remote" label="COM_MOKOJOOMBACKUP_FIELDSET_REMOTE">
+		<field
+			name="remote_keep_local"
+			type="radio"
+			label="COM_MOKOJOOMBACKUP_FIELD_KEEP_LOCAL"
+			description="COM_MOKOJOOMBACKUP_FIELD_KEEP_LOCAL_DESC"
+			default="1"
+			class="btn-group"
+		>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+	</fieldset>
 
 	<fieldset name="retention" label="COM_MOKOJOOMBACKUP_FIELDSET_RETENTION">
 		<field

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

@@ -331,24 +331,9 @@ COM_MOKOJOOMBACKUP_CONFIG_SHOW_UPDATE_NOTICE_DESC="Display the update site confi
 COM_MOKOJOOMBACKUP_CONFIG_PREACTION="Pre-action Backups"
 COM_MOKOJOOMBACKUP_CONFIG_BACKUP_BEFORE_UPDATE="Backup Before Extension Update"
 COM_MOKOJOOMBACKUP_CONFIG_BACKUP_BEFORE_UPDATE_DESC="Automatically run a full backup before any extension is updated. Uses the default profile. Throttled to once per 10 minutes to prevent duplicate backups during batch updates."
-COM_MOKOJOOMBACKUP_CONFIG_PREUPDATE_AUTO_INTERCEPT="Auto-run on Update click"
-COM_MOKOJOOMBACKUP_CONFIG_PREUPDATE_AUTO_INTERCEPT_DESC="When enabled, clicking the Update button on the Joomla Update or Extensions update page first pops the backup progress modal, runs the pre-update backup, then automatically continues the update. When disabled, a notice with a manual 'Back up now' button is shown instead."
 COM_MOKOJOOMBACKUP_CONFIG_BACKUP_BEFORE_UNINSTALL="Backup Before Extension Uninstall"
 COM_MOKOJOOMBACKUP_CONFIG_BACKUP_BEFORE_UNINSTALL_DESC="Automatically run a full backup before any extension is uninstalled. Uses the default profile. Throttled to once per 10 minutes."
 
-; Full-screen backup progress view (runbackup)
-COM_MOKOJOOMBACKUP_RUNBACKUP_TITLE="Backing Up"
-COM_MOKOJOOMBACKUP_RUNBACKUP_PROFILE="Profile: %s"
-COM_MOKOJOOMBACKUP_RUNBACKUP_STARTING="Starting backup…"
-COM_MOKOJOOMBACKUP_RUNBACKUP_RUNNING="Backing up…"
-COM_MOKOJOOMBACKUP_RUNBACKUP_COMPLETE="Backup complete"
-COM_MOKOJOOMBACKUP_RUNBACKUP_CONTINUING="Backup complete — continuing…"
-COM_MOKOJOOMBACKUP_RUNBACKUP_FAILED="Backup failed"
-COM_MOKOJOOMBACKUP_RUNBACKUP_RETRY="Retry backup"
-COM_MOKOJOOMBACKUP_RUNBACKUP_CONTINUE_ANYWAY="Continue without backup"
-COM_MOKOJOOMBACKUP_RUNBACKUP_BACK_TO_DASHBOARD="Back to dashboard"
-COM_MOKOJOOMBACKUP_RUNBACKUP_LEAVE_WARNING="A backup is in progress. Leaving now will cancel it."
-
 COM_MOKOJOOMBACKUP_CONFIG_CLEANUP="Cleanup Defaults"
 COM_MOKOJOOMBACKUP_CONFIG_MAX_AGE="Max Backup Age (days)"
 COM_MOKOJOOMBACKUP_CONFIG_MAX_AGE_DESC="Default maximum age for backup records. Used by the system plugin and CLI cleanup command."
@@ -397,8 +382,6 @@ COM_MOKOJOOMBACKUP_FIELD_NOTIFY_USER_GROUPS_DESC="Select Joomla user groups whos
 ; Dashboard warnings
 COM_MOKOJOOMBACKUP_DASHBOARD_DEFAULT_DIR_WARNING_TITLE="Backup directory is inside the web root"
 COM_MOKOJOOMBACKUP_DASHBOARD_DEFAULT_DIR_WARNING="One or more profiles store backups in the default directory inside the web root. This may expose backup archives if .htaccess is not supported. Move backups to a directory outside the web root for better security."
-COM_MOKOJOOMBACKUP_DASHBOARD_LIVESITE_WARNING_TITLE="Site URL (live_site) is not set"
-COM_MOKOJOOMBACKUP_DASHBOARD_LIVESITE_WARNING="Your Global Configuration has no Site URL (live_site). CLI and scheduled backups can't reliably determine the site's domain (archive names fall back to the server hostname), and some URLs may be generated incorrectly. Set Site URL in System → Global Configuration to your full site address including https://."
 
 COM_MOKOJOOMBACKUP_WEB_ACCESSIBLE_WARNING="This backup is stored inside the web root and may be directly downloadable if .htaccess is not supported."
 

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

@@ -53,24 +53,9 @@ COM_MOKOJOOMBACKUP_CONFIG_SHOW_UPDATE_NOTICE_DESC="Display the update site confi
 COM_MOKOJOOMBACKUP_CONFIG_PREACTION="Pre-action Backups"
 COM_MOKOJOOMBACKUP_CONFIG_BACKUP_BEFORE_UPDATE="Backup Before Extension Update"
 COM_MOKOJOOMBACKUP_CONFIG_BACKUP_BEFORE_UPDATE_DESC="Automatically run a full backup before any extension is updated. Uses the default profile. Throttled to once per 10 minutes to prevent duplicate backups during batch updates."
-COM_MOKOJOOMBACKUP_CONFIG_PREUPDATE_AUTO_INTERCEPT="Auto-run on Update click"
-COM_MOKOJOOMBACKUP_CONFIG_PREUPDATE_AUTO_INTERCEPT_DESC="When enabled, clicking the Update button on the Joomla Update or Extensions update page first pops the backup progress modal, runs the pre-update backup, then automatically continues the update. When disabled, a notice with a manual 'Back up now' button is shown instead."
 COM_MOKOJOOMBACKUP_CONFIG_BACKUP_BEFORE_UNINSTALL="Backup Before Extension Uninstall"
 COM_MOKOJOOMBACKUP_CONFIG_BACKUP_BEFORE_UNINSTALL_DESC="Automatically run a full backup before any extension is uninstalled. Uses the default profile. Throttled to once per 10 minutes."
 
-; Full-screen backup progress view (runbackup)
-COM_MOKOJOOMBACKUP_RUNBACKUP_TITLE="Backing Up"
-COM_MOKOJOOMBACKUP_RUNBACKUP_PROFILE="Profile: %s"
-COM_MOKOJOOMBACKUP_RUNBACKUP_STARTING="Starting backup…"
-COM_MOKOJOOMBACKUP_RUNBACKUP_RUNNING="Backing up…"
-COM_MOKOJOOMBACKUP_RUNBACKUP_COMPLETE="Backup complete"
-COM_MOKOJOOMBACKUP_RUNBACKUP_CONTINUING="Backup complete — continuing…"
-COM_MOKOJOOMBACKUP_RUNBACKUP_FAILED="Backup failed"
-COM_MOKOJOOMBACKUP_RUNBACKUP_RETRY="Retry backup"
-COM_MOKOJOOMBACKUP_RUNBACKUP_CONTINUE_ANYWAY="Continue without backup"
-COM_MOKOJOOMBACKUP_RUNBACKUP_BACK_TO_DASHBOARD="Back to dashboard"
-COM_MOKOJOOMBACKUP_RUNBACKUP_LEAVE_WARNING="A backup is in progress. Leaving now will cancel it."
-
 COM_MOKOJOOMBACKUP_CONFIG_CLEANUP="Cleanup Defaults"
 COM_MOKOJOOMBACKUP_CONFIG_MAX_AGE="Max Backup Age (days)"
 COM_MOKOJOOMBACKUP_CONFIG_MAX_AGE_DESC="Default maximum age for backup records. Used by the system plugin and CLI cleanup command."
@@ -88,8 +73,6 @@ COM_MOKOJOOMBACKUP_FOLDER_NOT_FOUND="Directory not found"
 COM_MOKOJOOMBACKUP_BACKUP_DIR_DEFAULT="Default (inside web root)"
 COM_MOKOJOOMBACKUP_DASHBOARD_DEFAULT_DIR_WARNING_TITLE="Backup directory is inside the web root"
 COM_MOKOJOOMBACKUP_DASHBOARD_DEFAULT_DIR_WARNING="One or more profiles store backups in the default directory inside the web root. This may expose backup archives if .htaccess is not supported. Move backups to a directory outside the web root for better security."
-COM_MOKOJOOMBACKUP_DASHBOARD_LIVESITE_WARNING_TITLE="Site URL (live_site) is not set"
-COM_MOKOJOOMBACKUP_DASHBOARD_LIVESITE_WARNING="Your Global Configuration has no Site URL (live_site). CLI and scheduled backups can't reliably determine the site's domain (archive names fall back to the server hostname), and some URLs may be generated incorrectly. Set Site URL in System → Global Configuration to your full site address including https://."
 COM_MOKOJOOMBACKUP_WEB_ACCESSIBLE_WARNING="This backup is stored inside the web root and may be directly downloadable if .htaccess is not supported."
 COM_MOKOJOOMBACKUP_FOLDER_EXISTS="Directory exists"
 COM_MOKOJOOMBACKUP_FOLDER_NOT_FOUND="Directory not found"

source/packages/com_mokosuitebackup/media/css/admin.css

@@ -1,33 +0,0 @@
-/**
- * MokoSuiteBackup — admin styles (loaded via the Joomla Web Asset Manager).
- */
-
-/* Add/Edit Destination modal.
- * The modal content is wrapped in a Bootstrap .container-fluid because
- * Bootstrap's .modal-content has no padding of its own. Give that container a
- * single, comfortable 1rem frame and drop the inner sections' horizontal padding
- * so it isn't doubled. */
-#remoteModal .modal-content > .container-fluid {
-	padding: 1rem;
-}
-
-#remoteModal .modal-header,
-#remoteModal .modal-body,
-#remoteModal .modal-footer {
-	padding-left: 0;
-	padding-right: 0;
-}
-
-#remoteModal .modal-body .row + .row,
-#remoteModal .remote-type-fields {
-	margin-top: 0.25rem;
-}
-
-#remoteModal hr {
-	margin: 1rem 0;
-	opacity: 0.12;
-}
-
-#remoteModal .form-label {
-	margin-bottom: 0.35rem;
-}

source/packages/com_mokosuitebackup/media/joomla.asset.json

@@ -1,14 +0,0 @@
-{
-	"$schema": "https://developer.joomla.org/schemas/json-schema/web_assets.json",
-	"name": "com_mokosuitebackup",
-	"version": "1.0.0",
-	"description": "MokoSuiteBackup web assets",
-	"license": "GPL-3.0-or-later",
-	"assets": [
-		{
-			"name": "com_mokosuitebackup.admin",
-			"type": "style",
-			"uri": "com_mokosuitebackup/css/admin.css"
-		}
-	]
-}

source/packages/com_mokosuitebackup/mokosuitebackup.xml

@@ -17,7 +17,7 @@
 		display label there.
 	-->
 	<name>MokoSuiteBackup</name>
-	<version>02.58.14</version>
+	<version>02.57.03</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -47,7 +47,7 @@
 	</update>
 
 	<administration>
-		<menu img="class:archive">COM_MOKOJOOMBACKUP_SHORT</menu>
+		<menu img="class:archive">Backup</menu>
 		<submenu>
 			<menu link="option=com_mokosuitebackup&amp;view=dashboard"
 				  img="class:home"
@@ -78,11 +78,6 @@
 		</languages>
 	</administration>
 
-	<media destination="com_mokosuitebackup" folder="media">
-		<folder>css</folder>
-		<filename>joomla.asset.json</filename>
-	</media>
-
 	<api>
 		<files folder="api">
 			<folder>src</folder>

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

@@ -1,13 +1,32 @@
--- Legacy single-remote storage columns are now purged by the package installer
--- script (Pkg_MokoSuiteBackupInstallerScript::dropLegacyRemoteColumns()), NOT here.
+-- Purge legacy single-remote storage columns from installs where they are still present.
 --
--- The 26 legacy remote_storage/ftp_*/sftp_*/gdrive_*/s3_* columns must be removed
--- portably across MariaDB and MySQL 8. `DROP COLUMN IF EXISTS` is MariaDB-only
--- (errors on MySQL 8); plain `DROP COLUMN` errors when a column is absent. The
--- previous version gated the ALTER on INFORMATION_SCHEMA and ran it via
--- PREPARE/EXECUTE/DEALLOCATE — but those statements are rejected by Joomla's
--- installer SQL path (MySQL error 1295: "This command is not supported in the
--- prepared statement protocol yet"), which ABORTED the whole component install.
+-- Background: 02.52.25.sql originally used `DROP COLUMN IF EXISTS`, which is a
+-- MariaDB-only extension and errors on Oracle MySQL 8.x. On MySQL 8 installs the
+-- migration failed but Joomla still recorded the schema as applied, leaving all 26
+-- legacy remote_storage/ftp_*/sftp_*/gdrive_*/s3_* columns stranded on the profiles
+-- table. This migration removes them portably.
 --
--- The drop is now done in PHP (INFORMATION_SCHEMA gate + a plain ALTER for only the
--- columns that still exist), so this migration is intentionally a no-op.
+-- It must be safe on BOTH engines AND on installs where the columns are already gone
+-- (MariaDB, or anyone who ran the corrected 02.52.25). Plain `DROP COLUMN` errors when
+-- a column is absent, and `DROP COLUMN IF EXISTS` errors on MySQL 8 — so neither works
+-- unconditionally. We gate the drop on INFORMATION_SCHEMA and build the ALTER via a
+-- prepared statement, which runs on MySQL 8 and MariaDB alike. All 26 columns were
+-- created and dropped together, so the presence of `remote_storage` gates the whole set.
+-- When the columns are absent this is a no-op (`DO 0`).
+
+SET @moko_has_legacy_remote := (
+    SELECT COUNT(*)
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = '#__mokosuitebackup_profiles'
+      AND COLUMN_NAME = 'remote_storage'
+);
+
+SET @moko_drop_legacy_remote := IF(@moko_has_legacy_remote > 0,
+    'ALTER TABLE `#__mokosuitebackup_profiles` DROP COLUMN `remote_storage`, DROP COLUMN `ftp_host`, DROP COLUMN `ftp_port`, DROP COLUMN `ftp_username`, DROP COLUMN `ftp_password`, DROP COLUMN `ftp_path`, DROP COLUMN `ftp_passive`, DROP COLUMN `ftp_ssl`, DROP COLUMN `sftp_host`, DROP COLUMN `sftp_port`, DROP COLUMN `sftp_username`, DROP COLUMN `sftp_auth_type`, DROP COLUMN `sftp_password`, DROP COLUMN `sftp_key_data`, DROP COLUMN `sftp_passphrase`, DROP COLUMN `sftp_path`, DROP COLUMN `gdrive_client_id`, DROP COLUMN `gdrive_client_secret`, DROP COLUMN `gdrive_refresh_token`, DROP COLUMN `gdrive_folder_id`, DROP COLUMN `s3_endpoint`, DROP COLUMN `s3_region`, DROP COLUMN `s3_access_key`, DROP COLUMN `s3_secret_key`, DROP COLUMN `s3_bucket`, DROP COLUMN `s3_path`',
+    'DO 0'
+);
+
+PREPARE moko_stmt FROM @moko_drop_legacy_remote;
+EXECUTE moko_stmt;
+DEALLOCATE PREPARE moko_stmt;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -84,35 +84,6 @@ class AjaxController extends BaseController
 		$this->sendJson($result);
 	}
 
-	/**
-	 * Mark the pre-update backup as satisfied for this session.
-	 *
-	 * Called by the update-page modal after a successful on-demand backup so the
-	 * imminent server-side onExtensionBeforeUpdate backup is skipped — it sets
-	 * the same 10-minute throttle key the system plugin checks, preventing a
-	 * duplicate backup when the admin then clicks Joomla's Update button.
-	 * POST: task=ajax.preupdateAck
-	 */
-	public function preupdateAck(): void
-	{
-		if (!Session::checkToken('get') && !Session::checkToken('post')) {
-			$this->sendJson(['error' => true, 'message' => 'Invalid token'], 403);
-
-			return;
-		}
-
-		if (!$this->app->getIdentity()->authorise('mokosuitebackup.backup.run', 'com_mokosuitebackup')) {
-			$this->sendJson(['error' => true, 'message' => 'Access denied'], 403);
-
-			return;
-		}
-
-		// Same key + semantics as plg_system_mokosuitebackup::runPreActionBackup().
-		Factory::getSession()->set('mokosuitebackup.preaction_backup_before_update', time());
-
-		$this->sendJson(['error' => false, 'message' => 'Pre-update backup acknowledged']);
-	}
-
 	/**
 	 * Cancel a backup record stuck in "running" status.
 	 * POST: task=ajax.cancelBackup&id=123

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

@@ -16,8 +16,8 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
+use Joomla\Component\MokoSuiteBackup\Administrator\Engine\BackupEngine;
 use Joomla\Component\MokoSuiteBackup\Administrator\Engine\RestoreEngine;
-use Joomla\Component\MokoSuiteBackup\Administrator\Service\BackupRunner;
 
 class BackupsController extends AdminController
 {
@@ -54,7 +54,8 @@ class BackupsController extends AdminController
 		$profileId   = $this->input->getInt('profile_id', 1);
 		$description = $this->input->getString('description', '');
 
-		$result = (new BackupRunner())->run($profileId, $description, 'backend');
+		$engine = new BackupEngine();
+		$result = $engine->run($profileId, $description, 'backend');
 
 		// Surface preflight warnings as Joomla messages
 		if (!empty($result['warnings'])) {

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

@@ -304,18 +304,7 @@ class BackupEngine
 							$this->log('  Upload complete: ' . $result['message']);
 
 							if (!empty($restoreScriptPath) && is_file($restoreScriptPath)) {
-								$scriptName = basename($restoreScriptPath);
-								$this->log('  Uploading restore script: ' . $scriptName . '...');
-								$scriptResult = $uploader->upload($restoreScriptPath, $scriptName);
-
-								if (!empty($scriptResult['success'])) {
-									$this->log('  Restore script uploaded: ' . ($scriptResult['message'] ?? $scriptName));
-								} else {
-									/* Never silent: a missing restore script makes the archive
-									   much harder to restore, so surface it as a warning. */
-									$uploadFailed = true;
-									$this->log('  WARNING: Restore script upload failed: ' . ($scriptResult['message'] ?? 'unknown error'));
-								}
+								$uploader->upload($restoreScriptPath, basename($restoreScriptPath));
 							}
 						} else {
 							$uploadFailed = true;
@@ -511,7 +500,24 @@ class BackupEngine
 	 */
 	private function createUploaderFromParams(string $type, array $params): RemoteUploaderInterface
 	{
-		return RemoteUploaderFactory::create($type, $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),
+			'sftp'         => new SftpUploader($fake),
+			'google_drive' => new GoogleDriveUploader($fake),
+			's3'           => new S3Uploader($fake),
+			default        => throw new \InvalidArgumentException('Unknown remote storage type: ' . $type),
+		};
 	}
 
 	/**

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

@@ -89,52 +89,6 @@ class FtpUploader implements RemoteUploaderInterface
 		}
 	}
 
-	public function delete(string $remoteName): array
-	{
-		if (!extension_loaded('ftp')) {
-			return ['success' => false, 'message' => 'PHP ext-ftp is required for FTP deletes. Enable it in php.ini.'];
-		}
-
-		if (empty($this->host)) {
-			return ['success' => false, 'message' => 'FTP host is not configured'];
-		}
-
-		$conn = $this->connect();
-
-		if (!$conn) {
-			return ['success' => false, 'message' => 'Failed to connect to FTP server ' . $this->host . ':' . $this->port];
-		}
-
-		try {
-			if (!@ftp_login($conn, $this->username, $this->password)) {
-				throw new \RuntimeException('FTP login failed for user: ' . $this->username);
-			}
-
-			if ($this->passive) {
-				ftp_pasv($conn, true);
-			}
-
-			$remoteFile = $this->remotePath . '/' . $remoteName;
-
-			/* Already-absent files: ftp_delete returns false, but if the file
-			   isn't there the retention goal is already met, so probe size to
-			   decide. ftp_size returns -1 when the file does not exist. */
-			if (@ftp_size($conn, $remoteFile) < 0) {
-				return ['success' => true, 'message' => 'FTP: nothing to delete (' . $remoteFile . ')'];
-			}
-
-			if (!@ftp_delete($conn, $remoteFile)) {
-				throw new \RuntimeException('ftp_delete failed for: ' . $remoteFile);
-			}
-
-			return ['success' => true, 'message' => 'Deleted from FTP: ' . $remoteFile];
-		} catch (\Throwable $e) {
-			return ['success' => false, 'message' => 'FTP delete failed: ' . $e->getMessage()];
-		} finally {
-			@ftp_close($conn);
-		}
-	}
-
 	public function testConnection(): array
 	{
 		if (empty($this->host)) {

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

@@ -81,59 +81,6 @@ class GoogleDriveUploader implements RemoteUploaderInterface
 		}
 	}
 
-	public function delete(string $remoteName): array
-	{
-		if (!extension_loaded('curl')) {
-			return ['success' => false, 'message' => 'PHP ext-curl is required for Google Drive deletes. Enable it in php.ini.'];
-		}
-
-		if (empty($this->clientId) || empty($this->refreshToken)) {
-			return ['success' => false, 'message' => 'Google Drive credentials not configured'];
-		}
-
-		try {
-			$accessToken = $this->getAccessToken();
-
-			/* Drive has no path addressing — resolve the file id(s) by name
-			   within the configured folder, then delete each match. */
-			$q = "name = '" . str_replace("'", "\\'", $remoteName) . "' and trashed = false";
-
-			if (!empty($this->folderId)) {
-				$q .= " and '" . $this->folderId . "' in parents";
-			}
-
-			$listUrl  = self::API_URL . '/files?q=' . rawurlencode($q) . '&fields=' . rawurlencode('files(id,name)') . '&pageSize=25';
-			$response = $this->curlRequest('GET', $listUrl, null, [
-				'Authorization: Bearer ' . $accessToken,
-			]);
-
-			if ($response['code'] !== 200) {
-				throw new \RuntimeException('Drive file lookup failed (HTTP ' . $response['code'] . ')');
-			}
-
-			$files = json_decode($response['body'], true)['files'] ?? [];
-
-			if (empty($files)) {
-				return ['success' => true, 'message' => 'Google Drive: nothing to delete (' . $remoteName . ')'];
-			}
-
-			foreach ($files as $file) {
-				$del = $this->curlRequest('DELETE', self::API_URL . '/files/' . rawurlencode($file['id']), null, [
-					'Authorization: Bearer ' . $accessToken,
-				]);
-
-				/* 204 = deleted, 404 = already gone — both acceptable. */
-				if ($del['code'] !== 204 && $del['code'] !== 200 && $del['code'] !== 404) {
-					return ['success' => false, 'message' => 'Google Drive delete failed for ' . $remoteName . ' (HTTP ' . $del['code'] . ')'];
-				}
-			}
-
-			return ['success' => true, 'message' => 'Deleted from Google Drive: ' . $remoteName];
-		} catch (\Throwable $e) {
-			return ['success' => false, 'message' => 'Google Drive delete failed: ' . $e->getMessage()];
-		}
-	}
-
 	public function testConnection(): array
 	{
 		if (empty($this->clientId) || empty($this->refreshToken)) {

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

@@ -204,8 +204,7 @@ ORIG,
         'ok'    => $backupCount > 0,
         'hint'  => 'Place one or more backup ZIP files in the same directory as ' . basename($_SERVER['SCRIPT_NAME']),
     ];
-REPL,
-			$php
+REPL
 		);
 
 		/* Modify remaining pre-checks to use getSelectedBackupFile() */

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

@@ -52,25 +52,15 @@ class PlaceholderResolver
 	{
 		$now      = new \DateTimeImmutable('now');
 
-		/* Resolve hostname: prefer the real request host (web), then the
-		   configured live_site (CLI), then the system hostname. Joomla's console
-		   fills the request host with the placeholder 'joomla.invalid' (an
-		   RFC 6761 reserved TLD used as a CLI sentinel), so treat that — along
-		   with empty/localhost — as unusable and fall through; otherwise every
-		   CLI-triggered backup would be named 'joomla.invalid_…'. */
-		$unusable = static function (string $h): bool {
-			$h = strtolower(trim($h));
+		/* Resolve hostname: prefer HTTP_HOST (web), then try Joomla config (CLI), then system hostname */
+		$rawHost = $_SERVER['HTTP_HOST'] ?? $_SERVER['SERVER_NAME'] ?? '';
 
-			return $h === '' || $h === 'localhost' || $h === 'joomla.invalid';
-		};
-
-		$rawHost = (string) ($_SERVER['HTTP_HOST'] ?? $_SERVER['SERVER_NAME'] ?? '');
-
-		if ($unusable($rawHost)) {
+		if (empty($rawHost) || $rawHost === 'localhost') {
 			try {
-				$liveSite = (string) Factory::getApplication()->get('live_site', '');
+				$app = Factory::getApplication();
+				$liveSite = $app->get('live_site', '');
 
-				if ($liveSite !== '') {
+				if (!empty($liveSite)) {
 					$parsed = parse_url($liveSite, PHP_URL_HOST);
 
 					if (!empty($parsed)) {
@@ -78,13 +68,12 @@ class PlaceholderResolver
 					}
 				}
 			} catch (\Throwable $e) {
-				/* fall through to system hostname */
+				/* fallback */
 			}
 		}
 
-		if ($unusable($rawHost)) {
-			$sysHost = php_uname('n');
-			$rawHost = $sysHost !== '' ? $sysHost : 'site';
+		if (empty($rawHost)) {
+			$rawHost = php_uname('n');
 		}
 
 		$hostname = preg_replace('/[^a-zA-Z0-9._-]/', '', $rawHost);

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

@@ -1,69 +0,0 @@
-<?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;
-
-/**
- * Builds a remote uploader from a `#__mokosuitebackup_remotes` row.
- *
- * This was previously a private method duplicated in both BackupEngine and
- * SteppedBackupEngine (and needed a third time by RetentionManager for remote
- * deletion). It is centralised here so the type→class map and the param
- * key-prefixing convention live in exactly one place.
- *
- * The remotes table stores per-type settings as a flat JSON object with
- * un-prefixed keys (e.g. `{"host":"…","path":"/backups"}`). The concrete
- * uploaders, however, read prefixed keys off a profile-shaped object
- * (e.g. `sftp_host`, `s3_bucket`). This factory bridges the two.
- */
-final class RemoteUploaderFactory
-{
-	/**
-	 * Map of remote type → the key prefix its uploader expects.
-	 */
-	private const PREFIX_MAP = [
-		'ftp'          => 'ftp_',
-		'sftp'         => 'sftp_',
-		's3'           => 's3_',
-		'google_drive' => 'gdrive_',
-	];
-
-	/**
-	 * Create an uploader for the given remote type from decoded JSON params.
-	 *
-	 * @param   string  $type    Remote type: ftp, sftp, s3, google_drive
-	 * @param   array   $params  Key-value params decoded from the remote's JSON
-	 *
-	 * @return  RemoteUploaderInterface
-	 *
-	 * @throws  \InvalidArgumentException  On an unknown remote type
-	 */
-	public static function create(string $type, array $params): RemoteUploaderInterface
-	{
-		$prefix   = self::PREFIX_MAP[$type] ?? '';
-		$prefixed = [];
-
-		foreach ($params as $key => $value) {
-			$prefixed[$prefix . $key] = $value;
-		}
-
-		$fake = (object) $prefixed;
-
-		return match ($type) {
-			'ftp'          => new FtpUploader($fake),
-			'sftp'         => new SftpUploader($fake),
-			'google_drive' => new GoogleDriveUploader($fake),
-			's3'           => new S3Uploader($fake),
-			default        => throw new \InvalidArgumentException('Unknown remote storage type: ' . $type),
-		};
-	}
-}

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

@@ -24,21 +24,6 @@ interface RemoteUploaderInterface
 	 */
 	public function upload(string $localPath, string $remoteName): array;
 
-	/**
-	 * Delete a previously-uploaded file from remote storage.
-	 *
-	 * Used by retention pruning so that expiring a local backup also removes
-	 * its archive from every remote destination. Implementations should treat
-	 * an already-absent remote file as success (idempotent delete), so a
-	 * partially-cleaned destination never blocks pruning.
-	 *
-	 * @param   string  $remoteName  Filename on the remote end (the same
-	 *                               $remoteName that was passed to upload())
-	 *
-	 * @return  array{success: bool, message: string}
-	 */
-	public function delete(string $remoteName): array;
-
 	/**
 	 * Test the connection / credentials without uploading.
 	 *

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

@@ -15,54 +15,32 @@ defined('_JEXEC') or die;
 use Joomla\Component\MokoSuiteBackup\Administrator\Utility\BackupDirectory;
 
 /**
- * Enforces per-profile backup retention — the single retention authority.
+ * Enforces per-profile backup retention.
  *
  * A profile may cap retained backups by age (retention_days) and/or by
- * number of copies (retention_count). When a profile leaves a rule at 0 the
- * caller-supplied global default is used instead. A backup is pruned when
- * EITHER rule matches: it is older than the effective days OR it falls outside
- * the newest effective count of copies.
- *
- * Pruning a record removes, in this order:
- *   1. the DB row (#__mokosuitebackup_records),
- *   2. the local archive + its .log file, and
- *   3. the archive copy on every enabled remote destination for the profile.
- *
- * The standalone restore script (restore.php) is intentionally NOT deleted
- * from remotes: it is a single, fixed-name file that every backup overwrites,
- * so newer backups still depend on it — removing it while pruning an old
- * archive would break restore for the copies that remain.
- *
- * Because records do not store which destinations they were uploaded to,
- * remote deletion targets the profile's *currently enabled* remotes. Remote
- * deletes are idempotent (an already-absent file counts as success) and
- * best-effort: a failing remote is logged but never blocks local pruning.
+ * 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 and from the periodic admin-side cleanup.
-	 * Only 'complete' and 'warning' records are considered — pending/running/
-	 * failed records are never pruned here.
+	 * 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)
-	 * @param   int     $globalDays   Fallback max age (days) when the profile's is 0
-	 * @param   int     $globalCount  Fallback max copies when the profile's is 0
+	 * @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 $globalDays = 0, int $globalCount = 0): int
+	public static function prune(object $db, object $profile): int
 	{
 		$days  = (int) ($profile->retention_days ?? 0);
 		$count = (int) ($profile->retention_count ?? 0);
 
-		// A profile value of 0 means "use the global default".
-		$days  = $days > 0 ? $days : $globalDays;
-		$count = $count > 0 ? $count : $globalCount;
-
 		// No retention configured — nothing to do.
 		if ($days <= 0 && $count <= 0) {
 			return 0;
@@ -70,7 +48,7 @@ final class RetentionManager
 
 		// Newest first, so the index is the copy's position from the top.
 		$query = $db->getQuery(true)
-			->select($db->quoteName(['id', 'archivename', 'absolute_path', 'backupstart']))
+			->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'])) . ')')
@@ -83,7 +61,6 @@ final class RetentionManager
 		}
 
 		$cutoffTs = $days > 0 ? (time() - ($days * 86400)) : null;
-		$remotes  = self::loadEnabledRemotes($db, (int) $profile->id);
 		$deleted  = 0;
 
 		foreach ($records as $index => $record) {
@@ -95,7 +72,7 @@ final class RetentionManager
 				continue;
 			}
 
-			if (self::deleteRecord($db, $record, $remotes)) {
+			if (self::deleteRecord($db, $record)) {
 				$deleted++;
 			}
 		}
@@ -104,54 +81,12 @@ final class RetentionManager
 	}
 
 	/**
-	 * Delete backup records whose profile no longer exists.
+	 * Delete a single backup record and its on-disk archive + log file.
 	 *
-	 * Orphans have no owning profile and therefore no remote destinations to
-	 * reconcile, so only the local archive/log and DB row are removed.
-	 *
-	 * @param   object  $db  Database driver
-	 *
-	 * @return  int  Number of orphaned records deleted
-	 */
-	public static function pruneOrphans(object $db): int
-	{
-		$query = $db->getQuery(true)
-			->select($db->quoteName(['r.id', 'r.archivename', 'r.absolute_path'], ['id', 'archivename', 'absolute_path']))
-			->from($db->quoteName('#__mokosuitebackup_records', 'r'))
-			->join(
-				'LEFT',
-				$db->quoteName('#__mokosuitebackup_profiles', 'p')
-				. ' ON ' . $db->quoteName('p.id') . ' = ' . $db->quoteName('r.profile_id')
-			)
-			->where($db->quoteName('p.id') . ' IS NULL')
-			->where($db->quoteName('r.status') . ' IN (' . implode(',', array_map([$db, 'quote'], ['complete', 'warning'])) . ')');
-		$db->setQuery($query);
-		$orphans = $db->loadObjectList() ?: [];
-
-		$deleted = 0;
-
-		foreach ($orphans as $record) {
-			if (self::deleteRecord($db, $record, [])) {
-				$deleted++;
-			}
-		}
-
-		return $deleted;
-	}
-
-	/**
-	 * Delete a single backup record, its on-disk archive + log file, and the
-	 * archive copy on each enabled remote destination.
-	 *
-	 * The DB row is removed first; the local files are only unlinked if that
+	 * 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.
-	 * Remote deletion is best-effort and runs regardless.
-	 *
-	 * @param   object    $db       Database driver
-	 * @param   object    $record   Record row (needs id, archivename, absolute_path)
-	 * @param   object[]  $remotes  Enabled remote rows (type, params) for the profile
 	 */
-	private static function deleteRecord(object $db, object $record, array $remotes): bool
+	private static function deleteRecord(object $db, object $record): bool
 	{
 		$query = $db->getQuery(true)
 			->delete($db->quoteName('#__mokosuitebackup_records'))
@@ -178,69 +113,6 @@ final class RetentionManager
 			}
 		}
 
-		self::deleteFromRemotes($record, $remotes);
-
 		return true;
 	}
-
-	/**
-	 * Remove the record's archive from every enabled remote destination.
-	 *
-	 * Best-effort: each remote is tried independently and failures are logged,
-	 * never thrown, so one unreachable destination can't stall retention.
-	 *
-	 * @param   object    $record   Record row (needs archivename)
-	 * @param   object[]  $remotes  Enabled remote rows (type, params)
-	 */
-	private static function deleteFromRemotes(object $record, array $remotes): void
-	{
-		$archiveName = (string) ($record->archivename ?? '');
-
-		if ($archiveName === '' || empty($remotes)) {
-			return;
-		}
-
-		foreach ($remotes as $remote) {
-			try {
-				$params   = json_decode((string) ($remote->params ?? ''), true) ?: [];
-				$uploader = RemoteUploaderFactory::create((string) $remote->type, $params);
-				$result   = $uploader->delete($archiveName);
-
-				if (empty($result['success'])) {
-					error_log(
-						'MokoSuiteBackup: retention could not delete ' . $archiveName
-						. ' from ' . $remote->type . ' remote: ' . ($result['message'] ?? 'unknown error')
-					);
-				}
-			} catch (\Throwable $e) {
-				error_log(
-					'MokoSuiteBackup: retention remote-delete error for ' . $archiveName
-					. ' (' . ($remote->type ?? '?') . '): ' . $e->getMessage()
-				);
-			}
-		}
-	}
-
-	/**
-	 * Load the profile's enabled remote destinations (type + params only).
-	 *
-	 * Returns an empty array if the remotes table is missing (very old installs)
-	 * or the profile has none, so callers can iterate unconditionally.
-	 */
-	private static function loadEnabledRemotes(object $db, int $profileId): array
-	{
-		try {
-			$query = $db->getQuery(true)
-				->select($db->quoteName(['type', 'params']))
-				->from($db->quoteName('#__mokosuitebackup_remotes'))
-				->where($db->quoteName('profile_id') . ' = ' . $profileId)
-				->where($db->quoteName('enabled') . ' = 1')
-				->order($db->quoteName('ordering') . ' ASC');
-			$db->setQuery($query);
-
-			return $db->loadObjectList() ?: [];
-		} catch (\Throwable $e) {
-			return [];
-		}
-	}
 }

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

@@ -75,54 +75,6 @@ class S3Uploader implements RemoteUploaderInterface
 		}
 	}
 
-	public function delete(string $remoteName): array
-	{
-		if (!extension_loaded('curl')) {
-			return ['success' => false, 'message' => 'PHP ext-curl is required for S3 deletes. Enable it in php.ini.'];
-		}
-
-		if (empty($this->accessKey) || empty($this->secretKey) || empty($this->bucket)) {
-			return ['success' => false, 'message' => 'S3 credentials or bucket not configured'];
-		}
-
-		try {
-			$objectKey = ($this->path ? $this->path . '/' : '') . $remoteName;
-			$url       = $this->getObjectUrl($objectKey);
-			$headers   = $this->signRequest('DELETE', $url, hash('sha256', ''));
-
-			$ch = curl_init();
-			curl_setopt_array($ch, [
-				CURLOPT_URL            => $url,
-				CURLOPT_CUSTOMREQUEST  => 'DELETE',
-				CURLOPT_RETURNTRANSFER => true,
-				CURLOPT_HTTPHEADER     => $headers,
-				CURLOPT_TIMEOUT        => 60,
-			]);
-
-			$response = curl_exec($ch);
-			$code     = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-
-			if (curl_errno($ch)) {
-				$error = curl_error($ch);
-				curl_close($ch);
-
-				throw new \RuntimeException('cURL error: ' . $error);
-			}
-
-			curl_close($ch);
-
-			/* S3 DELETE returns 204 on success and — by design — also 204 when
-			   the key never existed. 404 is treated as already-gone too. */
-			if ($code === 204 || $code === 200 || $code === 404) {
-				return ['success' => true, 'message' => 'Deleted from S3: s3://' . $this->bucket . '/' . $objectKey];
-			}
-
-			return ['success' => false, 'message' => 'S3 DELETE failed (HTTP ' . $code . '): ' . substr((string) $response, 0, 300)];
-		} catch (\Throwable $e) {
-			return ['success' => false, 'message' => 'S3 delete failed: ' . $e->getMessage()];
-		}
-	}
-
 	public function testConnection(): array
 	{
 		if (empty($this->accessKey) || empty($this->secretKey) || empty($this->bucket)) {

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

@@ -100,40 +100,6 @@ class SftpUploader implements RemoteUploaderInterface
 		}
 	}
 
-	public function delete(string $remoteName): array
-	{
-		if (empty($this->host) || empty($this->username)) {
-			return ['success' => false, 'message' => 'SFTP is not configured'];
-		}
-
-		$keyFile = null;
-
-		try {
-			if (!empty($this->keyData)) {
-				$keyFile = $this->writeTempKey();
-			}
-
-			/* rm -f exits 0 even when the file is already gone, so an
-			   already-deleted remote archive is treated as success. */
-			$remoteFile = $this->remotePath . '/' . $remoteName;
-			$cmd = $this->buildSshCommand('rm -f ' . escapeshellarg($remoteFile), $keyFile);
-
-			$output   = [];
-			$exitCode = 0;
-			exec($cmd . ' 2>&1', $output, $exitCode);
-
-			if ($exitCode !== 0) {
-				return ['success' => false, 'message' => 'SFTP delete failed: ' . implode(' ', $output)];
-			}
-
-			return ['success' => true, 'message' => 'Deleted from SFTP: ' . $remoteFile];
-		} catch (\Throwable $e) {
-			return ['success' => false, 'message' => 'SFTP delete failed: ' . $e->getMessage()];
-		} finally {
-			$this->cleanupTempKey($keyFile);
-		}
-	}
-
 	public function testConnection(): array
 	{
 		if (empty($this->host)) {

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

@@ -806,7 +806,24 @@ class SteppedBackupEngine
 	 */
 	private function createUploaderFromParams(string $type, array $params): RemoteUploaderInterface
 	{
-		return RemoteUploaderFactory::create($type, $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),
+			'sftp'         => new SftpUploader($fake),
+			'google_drive' => new GoogleDriveUploader($fake),
+			's3'           => new S3Uploader($fake),
+			default        => throw new \InvalidArgumentException('Unknown remote storage type: ' . $type),
+		};
 	}
 
 }

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

@@ -1,89 +0,0 @@
-<?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\View\Runbackup;
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Toolbar\ToolbarHelper;
-
-/**
- * Full-screen "run a backup" progress view.
- *
- * Auto-starts the stepped backup (ajax.init → loop ajax.step) and shows a
- * full-page progress screen. Used both by the dashboard "Backup Now" action
- * and — via the system plugin's pre-update redirect — as the interstitial
- * between clicking Joomla's Update and the update actually running. When a
- * `returnurl` is supplied the page redirects there once the backup completes
- * (e.g. back to `com_joomlaupdate&task=update.install&is_backed_up=1`).
- */
-class HtmlView extends BaseHtmlView
-{
-	public int $profileId = 1;
-
-	public string $profileTitle = '';
-
-	public string $description = '';
-
-	/** Raw (possibly base64) return URL from the request; validated in the layout. */
-	public string $returnUrl = '';
-
-	public bool $autostart = true;
-
-	public function display($tpl = null): void
-	{
-		$input = Factory::getApplication()->getInput();
-
-		$this->profileId   = (int) $input->getInt('profile_id', $input->getInt('profileid', 1));
-		$this->description  = $input->getString('description', '');
-		$this->returnUrl    = $input->getRaw('returnurl', '');
-		$this->autostart    = (bool) $input->getInt('autostart', 1);
-
-		if ($this->profileId <= 0) {
-			$this->profileId = 1;
-		}
-
-		$this->profileTitle = $this->loadProfileTitle($this->profileId);
-
-		$this->addToolbar();
-
-		parent::display($tpl);
-	}
-
-	/**
-	 * Look up the target profile's title for display (best-effort).
-	 */
-	private function loadProfileTitle(int $profileId): string
-	{
-		try {
-			$db    = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
-			$query = $db->getQuery(true)
-				->select($db->quoteName('title'))
-				->from($db->quoteName('#__mokosuitebackup_profiles'))
-				->where($db->quoteName('id') . ' = ' . (int) $profileId);
-			$db->setQuery($query);
-
-			return (string) ($db->loadResult() ?? '');
-		} catch (\Throwable $e) {
-			return '';
-		}
-	}
-
-	protected function addToolbar(): void
-	{
-		ToolbarHelper::title(
-			Text::_('COM_MOKOJOOMBACKUP_SHORT') . ': ' . Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_TITLE'),
-			'archive'
-		);
-	}
-}

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

@@ -17,9 +17,6 @@ use Joomla\CMS\Session\Session;
 
 $ajaxToken = Session::getFormToken();
 $ajaxUrl   = Route::_('index.php?option=com_mokosuitebackup&format=json', false);
-
-$runbackupUrl = Route::_('index.php?option=com_mokosuitebackup&view=runbackup&autostart=1', false);
-$liveSite     = trim((string) \Joomla\CMS\Factory::getApplication()->get('live_site', ''));
 ?>
 <?php if ($this->defaultDirWarning) : ?>
 <div class="alert alert-warning d-flex align-items-center mb-3" role="alert">
@@ -34,16 +31,6 @@ $liveSite     = trim((string) \Joomla\CMS\Factory::getApplication()->get('live_s
 </div>
 <?php endif; ?>
 
-<?php if ($liveSite === '') : ?>
-<div class="alert alert-warning d-flex align-items-center mb-3" role="alert">
-	<span class="icon-warning-circle fs-4 me-3" aria-hidden="true"></span>
-	<div>
-		<strong><?php echo Text::_('COM_MOKOJOOMBACKUP_DASHBOARD_LIVESITE_WARNING_TITLE'); ?></strong><br>
-		<?php echo Text::_('COM_MOKOJOOMBACKUP_DASHBOARD_LIVESITE_WARNING'); ?>
-	</div>
-</div>
-<?php endif; ?>
-
 <div class="row">
 	<!-- Row 1: Status Cards (clickable) -->
 	<div class="col-md-3 mb-3">
@@ -257,7 +244,7 @@ document.querySelectorAll('.mb-tile').forEach(function(tile) {
 							</option>
 						<?php endforeach; ?>
 					</select>
-					<button type="button" class="btn btn-primary w-100" onclick="mokosuitebackupGo()">
+					<button type="button" class="btn btn-primary w-100" onclick="window.mokosuitebackupStart()">
 						<span class="icon-download" aria-hidden="true"></span>
 						<?php echo Text::_('COM_MOKOJOOMBACKUP_TOOLBAR_BACKUP_NOW'); ?>
 					</button>
@@ -315,18 +302,123 @@ document.querySelectorAll('.mb-tile').forEach(function(tile) {
 	</div>
 </div>
 
+<!-- Stepped Backup Modal (reused from backups view) -->
+<div id="mokosuitebackup-modal" style="display:none; position:fixed; top:0; left:0; width:100%; height:100%; background:rgba(0,0,0,0.6); z-index:10000;">
+	<div style="max-width:500px; margin:10% auto; background:#fff; border-radius:8px; padding:2rem; box-shadow:0 4px 20px rgba(0,0,0,0.3);">
+		<h3 id="mb-modal-title" style="margin:0 0 1rem;">Backup in Progress</h3>
+		<div class="alert alert-warning py-1 px-2 mb-2" style="font-size:0.85rem;">
+			<span class="icon-warning-circle" aria-hidden="true"></span>
+			<strong>Do not navigate away or close this window</strong> while the backup is running.
+		</div>
+		<div style="background:#e9ecef; border-radius:4px; overflow:hidden; height:24px; margin-bottom:0.5rem;">
+			<div id="mb-progress-bar" style="height:100%; background:#0d6efd; transition:width 0.3s; width:0%; display:flex; align-items:center; justify-content:center; color:#fff; font-size:0.8rem; font-weight:bold;">0%</div>
+		</div>
+		<p id="mb-status" style="color:#666; font-size:0.9rem; margin:0.5rem 0;">Initializing...</p>
+		<p id="mb-phase" style="color:#999; font-size:0.8rem; margin:0;">Phase: init</p>
+	</div>
+</div>
+
 <script>
-/* "Backup Now" navigates to the full-screen backup progress page (view=runbackup)
-   for the selected profile — the same screen used for the pre-update backup. */
-(function () {
-	'use strict';
+(function() {
+	const AJAX_URL = <?php echo json_encode($ajaxUrl); ?>;
+	const TOKEN_NAME = <?php echo json_encode($ajaxToken); ?>;
 
-	var RUNBACKUP_URL = <?php echo json_encode($runbackupUrl); ?>;
+	var backupRunning = false;
 
-	window.mokosuitebackupGo = function () {
-		var sel = document.getElementById('mb-profile-select');
-		var pid = sel ? sel.value : '1';
-		window.location.href = RUNBACKUP_URL + '&profile_id=' + encodeURIComponent(pid);
-	};
+	window.addEventListener('beforeunload', function(e) {
+		if (backupRunning) { e.preventDefault(); e.returnValue = ''; }
+	});
+
+	function showModal() {
+		backupRunning = true;
+		document.getElementById('mokosuitebackup-modal').style.display = 'block';
+	}
+
+	function hideModal() {
+		backupRunning = false;
+		document.getElementById('mokosuitebackup-modal').style.display = 'none';
+	}
+
+	function updateProgress(progress, message, phase) {
+		const bar = document.getElementById('mb-progress-bar');
+		bar.style.width = progress + '%';
+		bar.textContent = progress + '%';
+		document.getElementById('mb-status').textContent = message;
+		document.getElementById('mb-phase').textContent = 'Phase: ' + phase;
+	}
+
+	async function postAjax(params) {
+		const form = new URLSearchParams();
+		form.append(TOKEN_NAME, '1');
+		for (const [k, v] of Object.entries(params)) {
+			form.append(k, v);
+		}
+		const res = await fetch(AJAX_URL, {
+			method: 'POST',
+			body: form,
+			headers: { 'X-Requested-With': 'XMLHttpRequest' }
+		});
+		return res.json();
+	}
+
+	async function startSteppedBackup() {
+		const profileSelect = document.getElementById('mb-profile-select');
+		const profileId = profileSelect ? profileSelect.value : '1';
+
+		showModal();
+		updateProgress(0, 'Initializing backup...', 'init');
+
+		try {
+			const initResult = await postAjax({
+				task: 'ajax.init',
+				profile_id: profileId
+			});
+
+			if (initResult.error) {
+				updateProgress(0, 'ERROR: ' + initResult.message, 'failed');
+				setTimeout(hideModal, 5000);
+				return;
+			}
+
+			// Show preflight warnings if any
+			if (initResult.warnings && initResult.warnings.length > 0) {
+				var warningEl = document.getElementById('mb-phase');
+				warningEl.textContent = 'Warnings: ' + initResult.warnings.join('; ');
+				warningEl.style.color = '#856404';
+			}
+
+			const sessionId = initResult.session_id;
+			updateProgress(initResult.progress, initResult.message, initResult.phase);
+
+			let done = false;
+			while (!done) {
+				const stepResult = await postAjax({
+					task: 'ajax.step',
+					session_id: sessionId
+				});
+
+				if (stepResult.error) {
+					updateProgress(0, 'ERROR: ' + stepResult.message, 'failed');
+					setTimeout(hideModal, 5000);
+					return;
+				}
+
+				updateProgress(stepResult.progress, stepResult.message, stepResult.phase);
+				done = stepResult.done || false;
+			}
+
+			document.getElementById('mb-modal-title').textContent = 'Backup Complete';
+			setTimeout(function() {
+				hideModal();
+				location.reload();
+			}, 2000);
+
+		} catch (err) {
+			updateProgress(0, 'ERROR: ' + err.message, 'failed');
+			setTimeout(hideModal, 5000);
+		}
+	}
+
+	window.mokosuitebackupStart = startSteppedBackup;
 })();
 </script>

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

@@ -19,9 +19,6 @@ HTMLHelper::_('behavior.formvalidator');
 HTMLHelper::_('behavior.keepalive');
 HTMLHelper::_('bootstrap.modal');
 
-/* Component CSS via the Web Asset Manager (declared in media/joomla.asset.json) */
-$this->getDocument()->getWebAssetManager()->useStyle('com_mokosuitebackup.admin');
-
 $profileId = (int) $this->item->id;
 $token     = Session::getFormToken();
 ?>
@@ -124,7 +121,6 @@ $token     = Session::getFormToken();
 <div class="modal fade" id="remoteModal" tabindex="-1" aria-labelledby="remoteModalLabel" aria-hidden="true">
 	<div class="modal-dialog modal-lg">
 		<div class="modal-content">
-			<div class="container-fluid">
 			<div class="modal-header">
 				<h5 class="modal-title" id="remoteModalLabel"><?php echo Text::_('COM_MOKOJOOMBACKUP_REMOTE_ADD'); ?></h5>
 				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="<?php echo Text::_('JCLOSE'); ?>"></button>
@@ -194,9 +190,7 @@ $token     = Session::getFormToken();
 					</div>
 					<div class="mb-3" id="remoteSftpKeyWrap">
 						<label for="remoteCfg_sftp_key_data" class="form-label"><?php echo Text::_('COM_MOKOJOOMBACKUP_FIELD_SFTP_KEY'); ?></label>
-						<input type="file" class="form-control mb-2" id="remoteSftpKeyFile" accept=".pem,.key,.ppk,.openssh,.rsa,.ed25519,text/plain">
-						<textarea class="form-control" id="remoteCfg_sftp_key_data" rows="4" placeholder="Upload a key file above, or paste the SSH private key here (leave as-is to keep existing)"></textarea>
-						<div class="form-text" id="remoteSftpKeyFileMsg"></div>
+						<textarea class="form-control" id="remoteCfg_sftp_key_data" rows="4" placeholder="Paste SSH private key or leave as-is to keep existing"></textarea>
 					</div>
 					<div class="mb-3" id="remoteSftpPassphraseWrap">
 						<label for="remoteCfg_sftp_passphrase" class="form-label"><?php echo Text::_('COM_MOKOJOOMBACKUP_FIELD_SFTP_PASSPHRASE'); ?></label>
@@ -263,7 +257,6 @@ $token     = Session::getFormToken();
 					<?php echo Text::_('JAPPLY'); ?>
 				</button>
 			</div>
-			</div>
 		</div>
 	</div>
 </div>
@@ -459,29 +452,6 @@ document.addEventListener('DOMContentLoaded', function() {
 		}
 	});
 
-	// ---- Upload SSH key file (fills the key textarea; no paste required) ----
-	const keyFileInput = document.getElementById('remoteSftpKeyFile');
-	if (keyFileInput) {
-		keyFileInput.addEventListener('change', function() {
-			const msg  = document.getElementById('remoteSftpKeyFileMsg');
-			const file = this.files && this.files[0];
-
-			if (!file) {
-				return;
-			}
-
-			const reader = new FileReader();
-			reader.onload = function(ev) {
-				document.getElementById('remoteCfg_sftp_key_data').value = ev.target.result;
-				if (msg) { msg.textContent = 'Loaded "' + file.name + '".'; msg.className = 'form-text text-success'; }
-			};
-			reader.onerror = function() {
-				if (msg) { msg.textContent = 'Could not read that file.'; msg.className = 'form-text text-danger'; }
-			};
-			reader.readAsText(file);
-		});
-	}
-
 	// ---- Add button ----
 	document.getElementById('btnAddRemote').addEventListener('click', function() {
 		openEdit(0);

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

@@ -1,253 +0,0 @@
-<?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
- *
- * Full-screen backup progress screen. Reuses the stepped-backup AJAX
- * (ajax.init → loop ajax.step). On completion, redirects to a validated
- * return URL (pre-update flow) or shows a completion panel (Backup Now).
- */
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-
-$ajaxToken = Session::getFormToken();
-$ajaxUrl   = Route::_('index.php?option=com_mokosuitebackup&format=json', false);
-
-/* Validate the return URL to prevent an open redirect / javascript: XSS
-   (the value ends up in window.location.href). Accept ONLY:
-     - an absolute http(s) URL whose host matches this site, or
-     - a root-relative path starting with a single "/" (not "//").
-   This rejects javascript:, data:, vbscript: (empty host) and
-   protocol-relative //evil.com. Falls back to '' (no redirect). */
-$safeReturnUrl = '';
-
-if ($this->returnUrl !== '') {
-	$decoded = base64_decode($this->returnUrl, true);
-	$raw     = ($decoded !== false && $decoded !== '') ? $decoded : $this->returnUrl;
-
-	$isAbsoluteHttp = (bool) preg_match('#^https?://#i', $raw);
-	$isRootRelative = isset($raw[0]) && $raw[0] === '/' && (!isset($raw[1]) || $raw[1] !== '/');
-
-	if ($isAbsoluteHttp || $isRootRelative) {
-		try {
-			$rootHost = Uri::getInstance(Uri::root())->getHost();
-			$target   = new Uri($raw);
-			$scheme   = strtolower((string) $target->getScheme());
-
-			$schemeOk = $scheme === '' || $scheme === 'http' || $scheme === 'https';
-			$hostOk   = $target->getHost() === '' || strcasecmp($target->getHost(), $rootHost) === 0;
-
-			if ($schemeOk && $hostOk) {
-				$safeReturnUrl = $raw;
-			}
-		} catch (\Throwable $e) {
-			$safeReturnUrl = '';
-		}
-	}
-}
-
-$dashboardUrl = Route::_('index.php?option=com_mokosuitebackup&view=dashboard', false);
-
-$config = [
-	'ajaxUrl'      => $ajaxUrl,
-	'token'        => $ajaxToken,
-	'profileId'    => $this->profileId,
-	'description'  => $this->description,
-	'returnUrl'    => $safeReturnUrl,
-	'dashboardUrl' => $dashboardUrl,
-	'autostart'    => $this->autostart,
-	'labels'       => [
-		'starting'   => Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_STARTING'),
-		'running'    => Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_RUNNING'),
-		'complete'   => Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_COMPLETE'),
-		'continuing' => Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_CONTINUING'),
-		'failed'     => Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_FAILED'),
-		'retry'      => Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_RETRY'),
-		'continue'   => Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_CONTINUE_ANYWAY'),
-		'dashboard'  => Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_BACK_TO_DASHBOARD'),
-		'leaveWarn'  => Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_LEAVE_WARNING'),
-	],
-];
-?>
-<div class="msb-runbackup" style="max-width:640px;margin:3rem auto;padding:0 1rem;">
-	<div class="card shadow-sm">
-		<div class="card-body p-4">
-			<h1 class="h4 mb-1" id="msb-rb-title">
-				<span class="icon-archive" aria-hidden="true"></span>
-				<?php echo Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_TITLE'); ?>
-			</h1>
-			<p class="text-muted mb-4" id="msb-rb-subtitle">
-				<?php echo htmlspecialchars(
-					$this->profileTitle !== ''
-						? Text::sprintf('COM_MOKOJOOMBACKUP_RUNBACKUP_PROFILE', $this->profileTitle)
-						: Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_STARTING'),
-					ENT_QUOTES,
-					'UTF-8'
-				); ?>
-			</p>
-
-			<div class="progress mb-3" style="height:1.75rem;">
-				<div id="msb-rb-bar" class="progress-bar progress-bar-striped progress-bar-animated"
-					 role="progressbar" style="width:0;" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0">0%</div>
-			</div>
-
-			<div id="msb-rb-phase" class="fw-bold mb-1"></div>
-			<div id="msb-rb-status" class="text-muted small mb-3"><?php echo htmlspecialchars(Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_STARTING'), ENT_QUOTES, 'UTF-8'); ?></div>
-
-			<div id="msb-rb-actions" class="d-none">
-				<button type="button" id="msb-rb-retry" class="btn btn-primary d-none"></button>
-				<a href="#" id="msb-rb-continue" class="btn btn-warning d-none"></a>
-				<a href="<?php echo $dashboardUrl; ?>" id="msb-rb-dashboard" class="btn btn-secondary d-none"></a>
-			</div>
-		</div>
-	</div>
-</div>
-
-<script>
-(function () {
-	'use strict';
-
-	var CFG = <?php echo json_encode($config); ?>;
-	var L = CFG.labels || {};
-	var running = false;
-
-	var el = {
-		bar:       document.getElementById('msb-rb-bar'),
-		phase:     document.getElementById('msb-rb-phase'),
-		status:    document.getElementById('msb-rb-status'),
-		title:     document.getElementById('msb-rb-title'),
-		actions:   document.getElementById('msb-rb-actions'),
-		retry:     document.getElementById('msb-rb-retry'),
-		continue:  document.getElementById('msb-rb-continue'),
-		dashboard: document.getElementById('msb-rb-dashboard')
-	};
-
-	function setBar(pct, striped) {
-		pct = Math.max(0, Math.min(100, parseInt(pct, 10) || 0));
-		el.bar.style.width = pct + '%';
-		el.bar.textContent = pct + '%';
-		el.bar.setAttribute('aria-valuenow', pct);
-		if (!striped) {
-			el.bar.classList.remove('progress-bar-striped', 'progress-bar-animated');
-		}
-	}
-	function setPhase(t) { el.phase.textContent = t || ''; }
-	function setStatus(t) { if (t) { el.status.textContent = t; } }
-
-	function post(params) {
-		var body = new URLSearchParams();
-		body.append(CFG.token, '1');
-		Object.keys(params).forEach(function (k) { body.append(k, params[k]); });
-		return fetch(CFG.ajaxUrl, {
-			method: 'POST',
-			body: body,
-			headers: { 'X-Requested-With': 'XMLHttpRequest' }
-		}).then(function (r) { return r.json(); });
-	}
-
-	function showActions() { el.actions.classList.remove('d-none'); }
-	function showBtn(node, label, href) {
-		node.textContent = label;
-		if (href) { node.setAttribute('href', href); }
-		node.classList.remove('d-none');
-	}
-
-	function onComplete() {
-		el.bar.classList.remove('progress-bar-striped', 'progress-bar-animated');
-		el.bar.classList.add('bg-success');
-		setBar(100, false);
-		el.title.textContent = L.complete || 'Backup complete';
-
-		if (CFG.returnUrl) {
-			setStatus(L.continuing || 'Continuing…');
-			window.setTimeout(function () { window.location.href = CFG.returnUrl; }, 1200);
-		} else {
-			setStatus(L.complete || 'Backup complete');
-			showActions();
-			showBtn(el.dashboard, L.dashboard || 'Back to dashboard', CFG.dashboardUrl);
-		}
-	}
-
-	function onError(message) {
-		running = false;
-		el.bar.classList.remove('progress-bar-striped', 'progress-bar-animated');
-		el.bar.classList.add('bg-danger');
-		el.title.textContent = L.failed || 'Backup failed';
-		setStatus(message || 'Backup failed');
-		showActions();
-
-		el.retry.textContent = L.retry || 'Retry';
-		el.retry.classList.remove('d-none');
-		el.retry.onclick = function () {
-			el.retry.classList.add('d-none');
-			el.continue.classList.add('d-none');
-			el.bar.classList.remove('bg-danger');
-			el.bar.classList.add('progress-bar-striped', 'progress-bar-animated');
-			run();
-		};
-
-		if (CFG.returnUrl) {
-			showBtn(el.continue, L.continue || 'Continue without backup', CFG.returnUrl);
-		}
-		showBtn(el.dashboard, L.dashboard || 'Back to dashboard', CFG.dashboardUrl);
-	}
-
-	async function run() {
-		if (running) { return; }
-		running = true;
-		el.actions.classList.add('d-none');
-		setBar(0, true);
-		setPhase('');
-		setStatus(L.starting || 'Starting backup…');
-
-		try {
-			var init = await post({ task: 'ajax.init', profile_id: CFG.profileId, description: CFG.description });
-
-			if (!init || init.error || !init.session_id) {
-				throw new Error((init && init.message) || 'Could not start backup');
-			}
-
-			setBar(init.progress, true);
-			setPhase(init.phase || '');
-			setStatus(init.message || (L.running || 'Backing up…'));
-
-			var done = false;
-			while (!done) {
-				var step = await post({ task: 'ajax.step', session_id: init.session_id });
-
-				if (!step || step.error) {
-					throw new Error((step && step.message) || 'Backup step failed');
-				}
-
-				setBar(step.progress, true);
-				setPhase(step.phase || '');
-				setStatus(step.message || '');
-				done = step.done || false;
-			}
-
-			running = false;
-			onComplete();
-		} catch (err) {
-			onError(err && err.message ? err.message : String(err));
-		}
-	}
-
-	/* Warn before leaving while a backup is mid-flight. */
-	window.addEventListener('beforeunload', function (e) {
-		if (running) { e.preventDefault(); e.returnValue = L.leaveWarn || ''; }
-	});
-
-	if (CFG.autostart) {
-		document.addEventListener('DOMContentLoaded', run);
-	}
-})();
-</script>

source/packages/mod_mokosuitebackup_cpanel/mod_mokosuitebackup_cpanel.xml

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

source/packages/plg_actionlog_mokosuitebackup/mokosuitebackup.xml

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

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

@@ -7,10 +7,3 @@ PLG_SYSTEM_MOKOJOOMBACKUP_FIELD_MAX_AGE="Max Backup Age (days)"
 PLG_SYSTEM_MOKOJOOMBACKUP_FIELD_MAX_AGE_DESC="Delete backup records older than this many days."
 PLG_SYSTEM_MOKOJOOMBACKUP_FIELD_MAX_BACKUPS="Max Backup Count"
 PLG_SYSTEM_MOKOJOOMBACKUP_FIELD_MAX_BACKUPS_DESC="Keep at most this many completed backup records."
-PLG_SYSTEM_MOKOJOOMBACKUP_UPDATE_NOTICE="MokoSuiteBackup: a full-site backup is recommended before you update."
-PLG_SYSTEM_MOKOJOOMBACKUP_BACKUP_NOW="Back up now"
-PLG_SYSTEM_MOKOJOOMBACKUP_DISMISS="Dismiss"
-PLG_SYSTEM_MOKOJOOMBACKUP_BACKING_UP="Backing up…"
-PLG_SYSTEM_MOKOJOOMBACKUP_BACKUP_COMPLETE="Backup complete — safe to update."
-PLG_SYSTEM_MOKOJOOMBACKUP_BACKUP_FAILED="Backup failed"
-PLG_SYSTEM_MOKOJOOMBACKUP_BACKUP_STARTING="Starting backup…"

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

@@ -7,10 +7,3 @@ PLG_SYSTEM_MOKOJOOMBACKUP_FIELD_MAX_AGE="Max Backup Age (days)"
 PLG_SYSTEM_MOKOJOOMBACKUP_FIELD_MAX_AGE_DESC="Delete backup records older than this many days."
 PLG_SYSTEM_MOKOJOOMBACKUP_FIELD_MAX_BACKUPS="Max Backup Count"
 PLG_SYSTEM_MOKOJOOMBACKUP_FIELD_MAX_BACKUPS_DESC="Keep at most this many completed backup records."
-PLG_SYSTEM_MOKOJOOMBACKUP_UPDATE_NOTICE="MokoSuiteBackup: a full-site backup is recommended before you update."
-PLG_SYSTEM_MOKOJOOMBACKUP_BACKUP_NOW="Back up now"
-PLG_SYSTEM_MOKOJOOMBACKUP_DISMISS="Dismiss"
-PLG_SYSTEM_MOKOJOOMBACKUP_BACKING_UP="Backing up…"
-PLG_SYSTEM_MOKOJOOMBACKUP_BACKUP_COMPLETE="Backup complete — safe to update."
-PLG_SYSTEM_MOKOJOOMBACKUP_BACKUP_FAILED="Backup failed"
-PLG_SYSTEM_MOKOJOOMBACKUP_BACKUP_STARTING="Starting backup…"

source/packages/plg_system_mokosuitebackup/mokosuitebackup.xml

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

source/packages/plg_system_mokosuitebackup/src/Extension/MokoSuiteBackup.php

@@ -15,9 +15,6 @@ defined('_JEXEC') or die;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Uri\Uri;
-use Joomla\Component\MokoSuiteBackup\Administrator\Engine\RetentionManager;
 use Joomla\Component\MokoSuiteBackup\Administrator\Service\BackupRunner;
 use Joomla\Event\Event;
 use Joomla\Event\SubscriberInterface;
@@ -123,10 +120,6 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
 			return;
 		}
 
-		// Pre-update: send Joomla core-update installs through the full-screen
-		// backup page BEFORE the update runs (may not return from here).
-		$this->maybeRedirectForUpdate();
-
 		if (!(int) $this->params->get('auto_cleanup', 1)) {
 			return;
 		}
@@ -145,82 +138,6 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
 		$this->cleanupOldSnapshots();
 	}
 
-	/**
-	 * Send a Joomla core-update install through the full-screen backup page
-	 * BEFORE the update runs (Akeeba-style), so no backup runs synchronously
-	 * inside the update request (which is what white-screened large sites).
-	 *
-	 * Flow: user clicks "Install the update" (com_joomlaupdate&task=update.install)
-	 * → we redirect to com_mokosuitebackup&view=runbackup (full screen) with a
-	 * returnurl back to update.install&is_backed_up=1 → the backup runs on its
-	 * own page with real progress → on completion the browser returns to
-	 * update.install, we arm the throttle so onExtensionBeforeUpdate doesn't
-	 * duplicate the backup, and the update proceeds.
-	 */
-	private function maybeRedirectForUpdate(): void
-	{
-		$params = ComponentHelper::getParams('com_mokosuitebackup');
-
-		if (!(int) $params->get('backup_before_update', 0)) {
-			return;
-		}
-
-		$app   = $this->getApplication();
-		$input = $app->getInput();
-
-		if ($input->getCmd('option', '') !== 'com_joomlaupdate'
-			|| $input->getCmd('task', '') !== 'update.install') {
-			return;
-		}
-
-		$session = Factory::getSession();
-
-		// Returned from the backup screen: arm the throttle so the synchronous
-		// onExtensionBeforeUpdate backup doesn't run again, then let it proceed.
-		if ((int) $input->getInt('is_backed_up', 0) === 1) {
-			$session->set('mokosuitebackup.preaction_backup_before_update', time());
-
-			return;
-		}
-
-		// Backed up recently already — let the update proceed.
-		$lastRun = (int) $session->get('mokosuitebackup.preaction_backup_before_update', 0);
-
-		if ($lastRun > 0 && (time() - $lastRun) < 600) {
-			return;
-		}
-
-		// Super Users only.
-		$user = $app->getIdentity();
-
-		if (!$user || $user->guest || !$user->authorise('core.admin')) {
-			return;
-		}
-
-		$token     = Session::getFormToken();
-		$profileId = (int) $params->get('default_profile', 1);
-
-		// Where to send the browser after the backup: back to the update install.
-		$returnUri = new Uri(Uri::base() . 'index.php');
-		$returnUri->setVar('option', 'com_joomlaupdate');
-		$returnUri->setVar('task', 'update.install');
-		$returnUri->setVar('is_backed_up', '1');
-		$returnUri->setVar($token, '1');
-
-		// The full-screen backup page (chromeless via tmpl=component).
-		$redirect = new Uri(Uri::base() . 'index.php');
-		$redirect->setVar('option', 'com_mokosuitebackup');
-		$redirect->setVar('view', 'runbackup');
-		$redirect->setVar('tmpl', 'component');
-		$redirect->setVar('autostart', '1');
-		$redirect->setVar('profile_id', (string) $profileId);
-		$redirect->setVar('description', 'Pre-update backup');
-		$redirect->setVar('returnurl', base64_encode($returnUri->toString()));
-		$redirect->setVar($token, '1');
-
-		$app->redirect($redirect->toString());
-	}
-
 	/**
 	 * Remove backup records and files per profile retention settings.
 	 * Each profile can override the global max_age_days and max_backups.
@@ -324,28 +241,108 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
 
 	private function doCleanup(): void
 	{
-		$db             = Factory::getDbo();
-		$params         = ComponentHelper::getParams('com_mokosuitebackup');
-		$globalMaxAge   = (int) $params->get('max_age_days', 30);
-		$globalMaxCount = (int) $params->get('max_backups', 10);
+		$db              = Factory::getDbo();
+		$globalMaxAge    = (int) ComponentHelper::getParams('com_mokosuitebackup')->get('max_age_days', 30);
+		$globalMaxCount  = (int) ComponentHelper::getParams('com_mokosuitebackup')->get('max_backups', 10);
 
-		// Load all published profiles with their retention settings.
+		// Load all published profiles with their retention settings
 		$query = $db->getQuery(true)
-			->select($db->quoteName(['id', 'retention_days', 'retention_count']))
+			->select([$db->quoteName('id'), $db->quoteName('retention_days'), $db->quoteName('retention_count')])
 			->from($db->quoteName('#__mokosuitebackup_profiles'))
 			->where($db->quoteName('published') . ' = 1');
 		$db->setQuery($query);
-		$profiles = $db->loadObjectList() ?: [];
+		$profiles = $db->loadObjectList();
 
-		// Delegate to the single retention authority. RetentionManager prunes by
-		// age OR count (with these globals as the per-profile fallback) and also
-		// removes each pruned archive from the profile's remote destinations.
 		foreach ($profiles as $profile) {
-			RetentionManager::prune($db, $profile, $globalMaxAge, $globalMaxCount);
+			$maxAge   = (int) $profile->retention_days > 0 ? (int) $profile->retention_days : $globalMaxAge;
+			$maxCount = (int) $profile->retention_count > 0 ? (int) $profile->retention_count : $globalMaxCount;
+			$pid      = (int) $profile->id;
+
+			// Delete by age for this profile
+			$cutoff = date('Y-m-d H:i:s', strtotime("-{$maxAge} days"));
+			$query  = $db->getQuery(true)
+				->select('id, absolute_path')
+				->from($db->quoteName('#__mokosuitebackup_records'))
+				->where($db->quoteName('profile_id') . ' = ' . $pid)
+				->where($db->quoteName('backupstart') . ' < ' . $db->quote($cutoff))
+				->where($db->quoteName('status') . ' = ' . $db->quote('complete'));
+			$db->setQuery($query);
+			$expired = $db->loadObjectList();
+
+			foreach ($expired as $record) {
+				$this->deleteBackupRecord($db, $record);
+			}
+
+			// Enforce max count for this profile (keep newest)
+			$query = $db->getQuery(true)
+				->select('COUNT(*)')
+				->from($db->quoteName('#__mokosuitebackup_records'))
+				->where($db->quoteName('profile_id') . ' = ' . $pid)
+				->where($db->quoteName('status') . ' = ' . $db->quote('complete'));
+			$db->setQuery($query);
+			$totalCount = (int) $db->loadResult();
+
+			if ($totalCount > $maxCount) {
+				$excess = $totalCount - $maxCount;
+				$query  = $db->getQuery(true)
+					->select('id, absolute_path')
+					->from($db->quoteName('#__mokosuitebackup_records'))
+					->where($db->quoteName('profile_id') . ' = ' . $pid)
+					->where($db->quoteName('status') . ' = ' . $db->quote('complete'))
+					->order($db->quoteName('backupstart') . ' ASC');
+				$db->setQuery($query, 0, $excess);
+				$oldest = $db->loadObjectList();
+
+				foreach ($oldest as $record) {
+					$this->deleteBackupRecord($db, $record);
+				}
+			}
 		}
 
-		// Records whose profile was deleted (local files + DB row only).
-		RetentionManager::pruneOrphans($db);
+		// Also clean up orphaned records (profile deleted but records remain)
+		$query = $db->getQuery(true)
+			->select('r.id, r.absolute_path')
+			->from($db->quoteName('#__mokosuitebackup_records', 'r'))
+			->join('LEFT', $db->quoteName('#__mokosuitebackup_profiles', 'p') . ' ON p.id = r.profile_id')
+			->where('p.id IS NULL')
+			->where($db->quoteName('r.status') . ' = ' . $db->quote('complete'));
+		$db->setQuery($query);
+		$orphans = $db->loadObjectList();
+
+		foreach ($orphans as $record) {
+			$this->deleteBackupRecord($db, $record);
+		}
+	}
+
+	/**
+	 * Delete a backup record and its archive file.
+	 */
+	private function deleteBackupRecord(object $db, object $record): void
+	{
+		if (!empty($record->absolute_path) && is_file($record->absolute_path)) {
+			if (!@unlink($record->absolute_path)) {
+				error_log('MokoSuiteBackup: Could not delete backup file (id=' . $record->id . '): ' . $record->absolute_path);
+
+				return;
+			}
+
+			$logPath = preg_replace('/\.(zip|tar\.gz)$/i', '.log', $record->absolute_path);
+
+			if (is_file($logPath)) {
+				@unlink($logPath);
+			}
+		}
+
+		try {
+			$db->setQuery(
+				$db->getQuery(true)
+					->delete($db->quoteName('#__mokosuitebackup_records'))
+					->where($db->quoteName('id') . ' = ' . (int) $record->id)
+			);
+			$db->execute();
+		} catch (\Exception $e) {
+			error_log('MokoSuiteBackup: Could not delete backup record ' . $record->id . ': ' . $e->getMessage());
+		}
 	}
 
 	/**
@@ -391,40 +388,14 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
 
 		$profileId = (int) $params->get('default_profile', 1);
 
-		/* This backup runs synchronously inside the extension update/uninstall
-		   request. Without raising these limits a large site blows past
-		   max_execution_time / memory_limit mid-backup and the update page
-		   white-screens. Mirror the web-cron path. (Core Joomla updates are
-		   handled by the full-screen redirect instead — see onAfterRoute.) */
-		@set_time_limit(0);
-		@ini_set('max_execution_time', '0');
-		@ini_set('memory_limit', '512M');
-		@ignore_user_abort(true);
-
 		try {
 			$result = (new BackupRunner())->run($profileId, $description, 'preaction');
-			$app    = Factory::getApplication();
-			$status = $result['status'] ?? (!empty($result['success']) ? 'complete' : 'fail');
 
-			/* Always surface the outcome so the pre-update backup is visible in the
-			   admin — previously only failures produced a message, so a successful
-			   pre-update backup fired no notification at all. */
-			if ($status === 'warning') {
-				$app->enqueueMessage(
-					'MokoSuiteBackup: ' . $description . ' completed with warnings — '
-					. ($result['message'] ?: 'the local archive was created but a remote upload failed; see the backup log.'),
+			if (!$result['success']) {
+				Factory::getApplication()->enqueueMessage(
+					'MokoSuiteBackup: ' . $description . ' failed — ' . $result['message'],
 					'warning'
 				);
-			} elseif ($status === 'fail' || empty($result['success'])) {
-				$app->enqueueMessage(
-					'MokoSuiteBackup: ' . $description . ' failed — ' . ($result['message'] ?: 'unknown error'),
-					'error'
-				);
-			} else {
-				$app->enqueueMessage(
-					'MokoSuiteBackup: ' . $description . ' completed successfully.',
-					'message'
-				);
 			}
 		} catch (\Throwable $e) {
 			error_log('MokoSuiteBackup: ' . $description . ' failed: ' . $e->getMessage());

source/packages/plg_task_mokosuitebackup/mokosuitebackup.xml

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

source/script.php

@@ -77,13 +77,6 @@ class Pkg_MokoSuiteBackupInstallerScript
 			$this->backupDownloadKey();
 		}
 
-		/* Remove any orphaned mis-registered component BEFORE the component install
-		   recreates its admin menu. The orphan (element com_component-mokosuitebackup)
-		   owns a "Backup" menu with alias "backup"; if it survives, the real
-		   component's menu creation collides ("The alias backup is already being used")
-		   and the whole install aborts. */
-		$this->removeOrphanedComponent();
-
 		return true;
 	}
 
@@ -184,10 +177,6 @@ class Pkg_MokoSuiteBackupInstallerScript
 		   briefly used the "Type - Name" convention. Self-healing on every update. */
 		$this->removeOrphanedComponent();
 
-		/* Drop legacy single-remote storage columns portably (replaces the old
-		   PREPARE/EXECUTE migration that MySQL 8 rejected in Joomla's installer). */
-		$this->dropLegacyRemoteColumns();
-
 		/* Install completion notice (install and update) */
 		$this->installSuccessful();
 
@@ -284,54 +273,6 @@ class Pkg_MokoSuiteBackupInstallerScript
 		}
 	}
 
-	/**
-	 * Drop the 26 legacy single-remote storage columns from the profiles table if
-	 * they are still present. Replaces sql/updates/mysql/02.56.01.sql, whose
-	 * PREPARE/EXECUTE/DEALLOCATE approach is rejected by Joomla's installer on
-	 * MySQL 8 (error 1295) and aborted the whole install. Done here in PHP: gate on
-	 * INFORMATION_SCHEMA, then issue a plain ALTER for only the columns that exist —
-	 * portable across MariaDB and MySQL 8. Idempotent and non-fatal.
-	 *
-	 * @return  void
-	 */
-	private function dropLegacyRemoteColumns(): void
-	{
-		try {
-			$db    = Factory::getDbo();
-			$table = $db->getPrefix() . 'mokosuitebackup_profiles';
-
-			$columns = [
-				'remote_storage',
-				'ftp_host', 'ftp_port', 'ftp_username', 'ftp_password', 'ftp_path', 'ftp_passive', 'ftp_ssl',
-				'sftp_host', 'sftp_port', 'sftp_username', 'sftp_auth_type', 'sftp_password', 'sftp_key_data', 'sftp_passphrase', 'sftp_path',
-				'gdrive_client_id', 'gdrive_client_secret', 'gdrive_refresh_token', 'gdrive_folder_id',
-				's3_endpoint', 's3_region', 's3_access_key', 's3_secret_key', 's3_bucket', 's3_path',
-			];
-
-			// Which legacy columns still exist on this install?
-			$db->setQuery(
-				$db->getQuery(true)
-					->select($db->quoteName('COLUMN_NAME'))
-					->from($db->quoteName('INFORMATION_SCHEMA.COLUMNS'))
-					->where($db->quoteName('TABLE_SCHEMA') . ' = DATABASE()')
-					->where($db->quoteName('TABLE_NAME') . ' = ' . $db->quote($table))
-					->where($db->quoteName('COLUMN_NAME') . ' IN (' . implode(',', array_map([$db, 'quote'], $columns)) . ')')
-			);
-			$present = $db->loadColumn();
-
-			if (empty($present)) {
-				return;
-			}
-
-			$drops = array_map(fn($c) => 'DROP COLUMN ' . $db->quoteName($c), $present);
-			$db->setQuery('ALTER TABLE ' . $db->quoteName($table) . ' ' . implode(', ', $drops));
-			$db->execute();
-		} catch (\Throwable $e) {
-			/* Best-effort — a leftover column is harmless and must never abort the install */
-			Log::add('MokoSuiteBackup legacy-remote-column drop failed: ' . $e->getMessage(), Log::WARNING, 'jerror');
-		}
-	}
-
 	/**
 	 * Recursively delete a directory (version-independent, no Folder dependency).
 	 *
@@ -629,7 +570,23 @@ class Pkg_MokoSuiteBackupInstallerScript
 		try {
 			$db = Factory::getDbo();
 
-			/* Component extension_id first — needed to (re)create the parent menu. */
+			/* Find the parent menu item for our component */
+			$query = $db->getQuery(true)
+				->select([$db->quoteName('id'), $db->quoteName('menutype')])
+				->from($db->quoteName('#__menu'))
+				->where($db->quoteName('client_id') . ' = 1')
+				->where($db->quoteName('level') . ' = 1')
+				->where($db->quoteName('link') . ' LIKE ' . $db->quote('index.php?option=com_mokosuitebackup%'))
+				->setLimit(1);
+			$db->setQuery($query);
+			$parent = $db->loadObject();
+
+			if (!$parent) {
+				error_log('MokoSuiteBackup: ensureSubmenuItems() — parent menu item not found');
+				return;
+			}
+
+			/* Get the component extension_id */
 			$query = $db->getQuery(true)
 				->select($db->quoteName('extension_id'))
 				->from($db->quoteName('#__extensions'))
@@ -644,41 +601,6 @@ class Pkg_MokoSuiteBackupInstallerScript
 				return;
 			}
 
-			/* Find the top-level "Backup" parent menu item for our component */
-			$query = $db->getQuery(true)
-				->select([$db->quoteName('id'), $db->quoteName('menutype')])
-				->from($db->quoteName('#__menu'))
-				->where($db->quoteName('client_id') . ' = 1')
-				->where($db->quoteName('level') . ' = 1')
-				->where($db->quoteName('link') . ' LIKE ' . $db->quote('index.php?option=com_mokosuitebackup%'))
-				->setLimit(1);
-			$db->setQuery($query);
-			$parent = $db->loadObject();
-
-			/* Self-heal: if the top-level menu was deleted (e.g. by a failed install
-			   after the duplicate-component mess), recreate it — otherwise the whole
-			   Backup menu stays gone and dependents (cPanel module, MokoSuiteClient)
-			   can't locate the component. */
-			if (!$parent) {
-				$parent = $this->createTopMenu($componentId);
-
-				if (!$parent) {
-					error_log('MokoSuiteBackup: ensureSubmenuItems() — parent menu missing and could not be created');
-					return;
-				}
-			}
-
-			/* Keep the top-level menu label on the short constant and owned by the
-			   real component. */
-			$db->setQuery(
-				$db->getQuery(true)
-					->update($db->quoteName('#__menu'))
-					->set($db->quoteName('title') . ' = ' . $db->quote('COM_MOKOJOOMBACKUP_SHORT'))
-					->set($db->quoteName('component_id') . ' = ' . (int) $componentId)
-					->where($db->quoteName('id') . ' = ' . (int) $parent->id)
-			);
-			$db->execute();
-
 			foreach ($submenus as $submenu) {
 				/* Check if this submenu item already exists */
 				$query = $db->getQuery(true)
@@ -744,59 +666,6 @@ class Pkg_MokoSuiteBackupInstallerScript
 		}
 	}
 
-	/**
-	 * Create the top-level "Backup" admin menu item for the component when it is
-	 * missing (deleted by a failed install / the duplicate-component fallout).
-	 * Label uses the short constant. Returns a lightweight {id, menutype} object,
-	 * or null on failure.
-	 *
-	 * @param   int  $componentId  Extension id of com_mokosuitebackup
-	 *
-	 * @return  object|null
-	 */
-	private function createTopMenu(int $componentId): ?object
-	{
-		try {
-			$table = Factory::getApplication()
-				->bootComponent('com_menus')
-				->getMVCFactory()
-				->createTable('Menu', 'Administrator');
-
-			$table->menutype     = 'main';
-			$table->title        = 'COM_MOKOJOOMBACKUP_SHORT';
-			$table->alias        = 'backup';
-			$table->link         = 'index.php?option=com_mokosuitebackup';
-			$table->type         = 'component';
-			$table->published    = 1;
-			$table->parent_id    = 1;
-			$table->level        = 1;
-			$table->component_id = $componentId;
-			$table->client_id    = 1;
-			$table->img          = 'class:archive';
-			$table->params       = '{}';
-			$table->language     = '*';
-			$table->access       = 1;
-
-			$table->setLocation(1, 'last-child');
-
-			if (!$table->check() || !$table->store()) {
-				error_log('MokoSuiteBackup: createTopMenu() failed: ' . $table->getError());
-
-				return null;
-			}
-
-			$obj           = new \stdClass();
-			$obj->id       = (int) $table->id;
-			$obj->menutype = 'main';
-
-			return $obj;
-		} catch (\Throwable $e) {
-			error_log('MokoSuiteBackup: createTopMenu() exception: ' . $e->getMessage());
-
-			return null;
-		}
-	}
-
 	private function fixPackageClientId(): void
 	{
 		try {