Compare commits

..

11 Commits

Author SHA1 Message Date
gitea-actions[bot] 4a3826314f chore(version): pre-release bump to 01.45.04-dev [skip ci] 2026-06-29 14:35:43 +00:00
jmiller 1f387039a0 fix: mark backup as warning when remote upload fails, show failure reason
Universal: Pre-Release / Build Pre-Release (${{ inputs.stability || github.ref_name }}) (push) Successful in 34s
- Add 'warning' status for backups where the archive was created
  successfully but remote upload failed (SFTP, FTP, S3, GDrive)
- Add status_message column to records table storing the specific
  failure reason without needing to read the full log
- Display warning badge (yellow) with failure details in backup list
  and detail views
- Include warning-status backups in dashboard stats, retention
  cleanup, and archive browser/download actions
- Add filter option for warning status in backups list
- Add uploadErrors tracking to SteppedSession for multi-step backups

Claude-Session: https://claude.ai/code/session_01MbEjBtsSjPuTWhqqrMS2wG
2026-06-29 09:34:53 -05:00
jmiller 785ffd85a3 chore: sync auto-release.yml from Template-Generic [skip ci] 2026-06-28 20:10:19 +00:00
jmiller 71da4af64b chore: sync issue-branch.yml from Template-Generic [skip ci] 2026-06-28 19:39:25 +00:00
jmiller 4d5711c304 chore: sync auto-release.yml from Template-Generic [skip ci] 2026-06-28 19:39:22 +00:00
gitea-actions[bot] 1a4bb32c6c chore: promote changelog [Unreleased] → [01.45.00] 2026-06-28 19:31:25 +00:00
gitea-actions[bot] 13a526d6be chore(release): build 01.45.00 [skip ci] 2026-06-28 19:31:21 +00:00
jmiller babdb9e390 ci: add submodules: recursive to checkout (fixes MokoSuiteClient packaging) 2026-06-28 19:30:15 +00:00
jmiller 57c9ea600b ci: add submodules: recursive to checkout (fixes MokoSuiteClient packaging) 2026-06-28 19:25:18 +00:00
jmiller afffef78bd chore: sync issue-branch.yml from Template-Generic [skip ci] 2026-06-28 19:12:12 +00:00
jmiller 720f008050 Merge pull request 'release: promote dev to main (v01.43.37)' (#159) from dev into main 2026-06-28 19:03:51 +00:00
35 changed files with 121 additions and 176 deletions
+3 -1
View File
@@ -7,7 +7,7 @@
# INGROUP: mokocli.Release # INGROUP: mokocli.Release
# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/mokocli # REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/mokocli
# PATH: /templates/workflows/universal/auto-release.yml.template # PATH: /templates/workflows/universal/auto-release.yml.template
# VERSION: 05.00.00 # VERSION: 05.01.00
# BRIEF: Universal build & release detects platform from manifest.xml # BRIEF: Universal build & release detects platform from manifest.xml
# #
# +=======================================================================+ # +=======================================================================+
@@ -75,6 +75,7 @@ jobs:
with: with:
token: ${{ secrets.MOKOGITEA_TOKEN }} token: ${{ secrets.MOKOGITEA_TOKEN }}
fetch-depth: 1 fetch-depth: 1
submodules: recursive
- name: Setup mokocli tools - name: Setup mokocli tools
env: env:
@@ -173,6 +174,7 @@ jobs:
with: with:
token: ${{ secrets.MOKOGITEA_TOKEN }} token: ${{ secrets.MOKOGITEA_TOKEN }}
fetch-depth: 0 fetch-depth: 0
submodules: recursive
- name: Configure git for bot pushes - name: Configure git for bot pushes
run: | run: |
+1 -1
View File
@@ -5,7 +5,7 @@
# FILE INFORMATION # FILE INFORMATION
# DEFGROUP: Gitea.Workflow # DEFGROUP: Gitea.Workflow
# INGROUP: mokocli.Automation # INGROUP: mokocli.Automation
# VERSION: 01.45.07 # VERSION: 01.45.04
# BRIEF: Auto-create feature branch when an issue is opened # BRIEF: Auto-create feature branch when an issue is opened
name: "Universal: Issue Branch" name: "Universal: Issue Branch"
+8 -127
View File
@@ -1,7 +1,13 @@
# Changelog # Changelog
## [Unreleased] ## [Unreleased]
## [01.45.00] --- 2026-06-28
## [01.45.00] --- 2026-06-28
## [01.43.35] --- 2026-06-28
### Added ### Added
- Customizable restore script filename per backup profile (reduces discoverability on remote servers) - Customizable restore script filename per backup profile (reduces discoverability on remote servers)
- MokoRestore standalone mode: multi-ZIP selector when multiple backup archives are present - MokoRestore standalone mode: multi-ZIP selector when multiple backup archives are present
@@ -17,6 +23,7 @@
- MokoRestore cleanup and security messages now reference the actual script filename instead of hardcoded "restore.php" - MokoRestore cleanup and security messages now reference the actual script filename instead of hardcoded "restore.php"
### Fixed ### Fixed
- SSH key indicator detection and missing delete language key
- Bootstrap 5 modal conversion for snapshots view (data-bs-dismiss, modal-footer, getOrCreateInstance) - Bootstrap 5 modal conversion for snapshots view (data-bs-dismiss, modal-footer, getOrCreateInstance)
- ntfy default URL changed from ntfy.sh to ntfy.mokoconsulting.tech - ntfy default URL changed from ntfy.sh to ntfy.mokoconsulting.tech
- Untranslated JFIELD_ORDERING_ASC / JFIELD_ORDERING_LABEL language keys replaced with component-specific keys - Untranslated JFIELD_ORDERING_ASC / JFIELD_ORDERING_LABEL language keys replaced with component-specific keys
@@ -24,135 +31,9 @@
- Profile dropdown IDs in backup records and dashboard show "#ID — Title (type)" format - Profile dropdown IDs in backup records and dashboard show "#ID — Title (type)" format
- MokoRestore stalling: unhandled promise rejections from network errors or non-JSON responses left UI in loading state - MokoRestore stalling: unhandled promise rejections from network errors or non-JSON responses left UI in loading state
## [01.43.00] --- 2026-06-24
## [01.43.00] --- 2026-06-24 ## [01.43.00] --- 2026-06-24
## [01.42.00] --- 2026-06-23 ## [01.42.00] --- 2026-06-23
## [01.42.00] --- 2026-06-23 ## [01.42.00] --- 2026-06-23
## [01.41.00] — 2026-06-23
### Added — Multi-Remote Storage
- New `#__mokosuitebackup_remotes` table for multiple destinations per profile
- Remote destinations UI: AJAX-driven add/edit/delete/toggle modal on profile edit
- Engine uploads to ALL enabled destinations (BackupEngine + SteppedBackupEngine)
- Migration auto-converts existing SFTP/S3/GDrive/FTP profile columns to new table
- Backward compatibility: falls back to legacy single-remote columns if table empty
- Secrets masked in API responses, merged from DB on save
### Added — Content Snapshots
- Lightweight JSON snapshots of articles, categories, and modules
- Includes tags, custom fields, workflow associations, field values
- Restore modes: Replace (clean slate), Merge (upsert), Selective (per-article)
- Snapshot retention: max count + max age with automatic cleanup
- Scheduled snapshot task via com_scheduler
- CLI: `mokosuitebackup:snapshot create|restore|list|delete`
- REST API: create, list, restore, delete, download snapshots
- Tabbed browse modal: Articles / Categories / Modules with item counts
### Added — SFTP Remote Storage
- SFTP support with SSH key file authentication (key stored base64 in database)
- Auth type dropdown: Password / Key File / Key File + Passphrase
- SshKeyField: file upload via FileReader, key never exposed in HTML
- SFTP remote directory browser for path selection
- `__KEEP_EXISTING__` sentinel preserves key on profile re-save
### Added — MokoRestore Wizard (9 steps)
- Per-table conflict resolution: Replace / Skip / Merge / Data Only
- Preset buttons: "All Replace", "All Skip", "Everything except users"
- Post-restore actions: reset passwords, hits, versions, sessions, cache
- Auto-detect sanitized passwords and prompt for reset (random temp password)
- Standalone mode: restore.php scans directory for ZIP files
- Wrapped mode: restore.php bundled inside backup ZIP
- Security gate with filesystem verification + path traversal protection
### Added — Data Sanitization
- Sanitize user passwords: replace hashes with invalid sentinel
- Sanitize user emails: replace with dummy values
- Clear session data: exclude `#__session` table
- Preserve super admin credentials (optional)
- GDPR-friendly backup sharing for demos and staging sites
### Added — Backup Engine
- Pre-flight validation: directory, disk space, extensions, credentials, running backups
- Auto-verify archive integrity after creation (ZIP, tar.gz, 7z)
- 7z archive format via system 7za/7z CLI binary with native encryption
- Streaming database dump to temp file (prevents OOM on large sites)
- S3 streaming upload via CURLOPT_PUT (prevents OOM)
- Graceful remote degradation: local backup preserved if upload fails
- DatabaseDumper::dumpToFile() for memory-efficient operation
### Added — Admin UI
- Dashboard: snapshot widget, 30-day backup trend chart, per-profile storage breakdown
- CPanel admin dashboard module (mod_mokosuitebackup_cpanel) with quick actions
- Backup type filter dropdown in backups list
- Backup comparison: select two backups for side-by-side diff
- Archive browser: view files inside backup without extracting
- Manual purge: delete backups older than a date with count preview
- Backup count badges on profile list
- "Do not navigate away" warning in backup/restore progress modals
- Clickable placeholder pills for backup directory and archive name fields
- Comprehensive help modal with absolute/relative/placeholder path documentation
- Placeholder resolution display with EXAMPLE prefix
- All placeholders UPPERCASE: [HOST], [SITE_NAME], [DATE], [DATETIME], etc.
### Added — CLI & API
- `mokosuitebackup:restore` with --files-only, --db-only, --password options
- `mokosuitebackup:snapshot` with create, restore, list, delete actions
- REST API for snapshots: create, list, restore, delete, download
- Profile credentials masked in API responses
### Added — Notifications & Logging
- Email/ntfy notifications for site restore, snapshot create/restore
- Joomla Action Logs for restore, snapshot, and snapshot restore events
- Global ntfy server/topic/token settings (fallback for profiles)
### Added — Security & Configuration
- Webcron secret field with CSPRNG generator + strength meter
- IP whitelist field with current IP detection + one-click "Add my IP"
- 10 ACL permissions with full enforcement audit across all controllers
- Config defaults: archive format, MokoRestore mode, sanitization settings
- Path traversal protection on all archive extraction (ZIP, tar.gz, JPA)
### Fixed
- CLI RestoreCommand passed wrong arguments (filepath instead of record ID)
- JPA path traversal: reject `../` in archive entry paths
- S3Uploader OOM: streaming upload instead of file_get_contents
- DatabaseDumper OOM: streaming to file instead of in-memory string
- AkeebaImporter: removed unserialize() (PHP object injection risk)
- BackupTable: delete DB row before file (prevents data loss)
- RestoreEngine: staging path sanitized with preg_replace
- API profiles: sensitive fields masked with `***`
- Webcron: missing return after sendJsonResponse on auth failure
- loadFormData(): cast array to object (PHP 8.x TypeError fix)
- MokoRestore data-only mode: uses REPLACE INTO for existing rows
- Plaintext archive deleted on encryption failure
- TarGzArchiver: intermediate .tar cleaned in finally block
- Install script: single-line comments converted to block comments
- Orphaned root-level webservices plugin files removed
- include_mokorestore column: TINYINT changed to VARCHAR(20)
- Snapshot fields_values: scoped dump and restore to com_content.article (previously destroyed values for contacts, users, etc.)
- Run Backup button: accept CSRF token from GET (fixes "token did not match" on profile edit)
- SFTP fields: moved into remote fieldset for showon visibility; removed required attr that blocked non-SFTP saves
- Script.php merge conflict markers resolved
## [01.24.00] — 2026-06-02
### Added
- Initial release: full-site backup and restore for Joomla 6
- Database, files, and configuration backup
- ZIP and tar.gz archive formats with AES-256 encryption
- Differential backups based on file manifests
- FTP/FTPS, S3, Google Drive remote storage
- MokoRestore standalone restore wizard
- CLI backup and restore commands
- REST API for remote management
- Scheduled tasks via com_scheduler
- Email and ntfy push notifications
- Per-profile retention, exclusions, and notifications
- Akeeba Backup migration tool
- Admin dashboard with system health checks
+1 -1
View File
@@ -23,7 +23,7 @@ DEFGROUP: Template-Joomla
INGROUP: Template-Joomla.Documentation INGROUP: Template-Joomla.Documentation
REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Joomla REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Joomla
PATH: /SECURITY.md PATH: /SECURITY.md
VERSION: 01.45.07 VERSION: 01.45.04
BRIEF: Security vulnerability reporting and handling policy BRIEF: Security vulnerability reporting and handling policy
--> -->
@@ -15,6 +15,7 @@
> >
<option value="">COM_MOKOJOOMBACKUP_FILTER_STATUS_ALL</option> <option value="">COM_MOKOJOOMBACKUP_FILTER_STATUS_ALL</option>
<option value="complete">COM_MOKOJOOMBACKUP_STATUS_COMPLETE</option> <option value="complete">COM_MOKOJOOMBACKUP_STATUS_COMPLETE</option>
<option value="warning">COM_MOKOJOOMBACKUP_STATUS_WARNING</option>
<option value="running">COM_MOKOJOOMBACKUP_STATUS_RUNNING</option> <option value="running">COM_MOKOJOOMBACKUP_STATUS_RUNNING</option>
<option value="fail">COM_MOKOJOOMBACKUP_STATUS_FAIL</option> <option value="fail">COM_MOKOJOOMBACKUP_STATUS_FAIL</option>
<option value="pending">COM_MOKOJOOMBACKUP_STATUS_PENDING</option> <option value="pending">COM_MOKOJOOMBACKUP_STATUS_PENDING</option>
@@ -207,6 +207,7 @@ COM_MOKOJOOMBACKUP_TYPE_DIFFERENTIAL="Differential (changed files + full DB)"
; Status labels ; Status labels
COM_MOKOJOOMBACKUP_STATUS_COMPLETE="Complete" COM_MOKOJOOMBACKUP_STATUS_COMPLETE="Complete"
COM_MOKOJOOMBACKUP_STATUS_WARNING="Warning"
COM_MOKOJOOMBACKUP_STATUS_RUNNING="Running" COM_MOKOJOOMBACKUP_STATUS_RUNNING="Running"
COM_MOKOJOOMBACKUP_STATUS_FAIL="Failed" COM_MOKOJOOMBACKUP_STATUS_FAIL="Failed"
COM_MOKOJOOMBACKUP_STATUS_PENDING="Pending" COM_MOKOJOOMBACKUP_STATUS_PENDING="Pending"
@@ -7,7 +7,7 @@
--> -->
<extension type="component" method="upgrade"> <extension type="component" method="upgrade">
<name>MokoSuiteBackup</name> <name>MokoSuiteBackup</name>
<version>01.45.07</version> <version>01.45.04</version>
<creationDate>2026-06-02</creationDate> <creationDate>2026-06-02</creationDate>
<author>Moko Consulting</author> <author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail> <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -65,7 +65,7 @@ CREATE TABLE IF NOT EXISTS `#__mokosuitebackup_records` (
`id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, `id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
`profile_id` INT(11) UNSIGNED NOT NULL DEFAULT 1, `profile_id` INT(11) UNSIGNED NOT NULL DEFAULT 1,
`description` VARCHAR(255) NOT NULL DEFAULT '', `description` VARCHAR(255) NOT NULL DEFAULT '',
`status` VARCHAR(20) NOT NULL DEFAULT 'pending' COMMENT 'pending, running, complete, fail', `status` VARCHAR(20) NOT NULL DEFAULT 'pending' COMMENT 'pending, running, complete, warning, fail',
`origin` VARCHAR(20) NOT NULL DEFAULT 'backend' COMMENT 'backend, cli, api, scheduled', `origin` VARCHAR(20) NOT NULL DEFAULT 'backend' COMMENT 'backend, cli, api, scheduled',
`backup_type` VARCHAR(20) NOT NULL DEFAULT 'full' COMMENT 'full, database, files', `backup_type` VARCHAR(20) NOT NULL DEFAULT 'full' COMMENT 'full, database, files',
`archivename` VARCHAR(512) NOT NULL DEFAULT '', `archivename` VARCHAR(512) NOT NULL DEFAULT '',
@@ -83,6 +83,7 @@ CREATE TABLE IF NOT EXISTS `#__mokosuitebackup_records` (
`checksum` VARCHAR(64) NOT NULL DEFAULT '' COMMENT 'SHA-256 hash of archive', `checksum` VARCHAR(64) NOT NULL DEFAULT '' COMMENT 'SHA-256 hash of archive',
`base_record_id` INT(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Base full backup ID for differential', `base_record_id` INT(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Base full backup ID for differential',
`manifest` LONGTEXT DEFAULT NULL COMMENT 'JSON file manifest for differential comparison', `manifest` LONGTEXT DEFAULT NULL COMMENT 'JSON file manifest for differential comparison',
`status_message` VARCHAR(512) NOT NULL DEFAULT '' COMMENT 'Short user-facing status detail (e.g. upload failure reason)',
`log` MEDIUMTEXT DEFAULT NULL COMMENT 'Step-by-step backup log', `log` MEDIUMTEXT DEFAULT NULL COMMENT 'Step-by-step backup log',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
KEY `idx_profile` (`profile_id`), KEY `idx_profile` (`profile_id`),
@@ -1 +0,0 @@
/* 01.44.02 — no schema changes */
@@ -1 +0,0 @@
/* 01.44.03 — no schema changes */
@@ -0,0 +1 @@
/* 01.45.00 — no schema changes */
@@ -0,0 +1 @@
ALTER TABLE `#__mokosuitebackup_records` ADD COLUMN `status_message` VARCHAR(512) NOT NULL DEFAULT '' COMMENT 'Short user-facing status detail (e.g. upload failure reason)' AFTER `log`;
@@ -1 +0,0 @@
/* 01.45.02 — no schema changes */
@@ -1 +0,0 @@
/* 01.45.03 — no schema changes */
@@ -0,0 +1 @@
/* 01.45.04 — no schema changes */
@@ -1 +0,0 @@
/* 01.45.05 — no schema changes */
@@ -1 +0,0 @@
/* 01.45.06 — no schema changes */
@@ -1 +0,0 @@
/* 01.45.07 — no schema changes */
@@ -285,8 +285,9 @@ class BackupEngine
$this->log('Standalone ' . $restoreScriptName . ' generated (' . number_format(filesize($restoreScriptPath)) . ' bytes)'); $this->log('Standalone ' . $restoreScriptName . ' generated (' . number_format(filesize($restoreScriptPath)) . ' bytes)');
} }
$remoteFilename = ''; $remoteFilename = '';
$uploadFailed = false; $uploadFailed = false;
$uploadErrors = [];
/* Step 3: Remote upload — iterate all enabled destinations */ /* Step 3: Remote upload — iterate all enabled destinations */
$remotes = $this->loadRemoteDestinations($db, $profileId); $remotes = $this->loadRemoteDestinations($db, $profileId);
@@ -308,10 +309,12 @@ class BackupEngine
} }
} else { } else {
$uploadFailed = true; $uploadFailed = true;
$uploadErrors[] = ($remote->title ?? $remote->type) . ': ' . $result['message'];
$this->log(' WARNING: Upload failed: ' . $result['message']); $this->log(' WARNING: Upload failed: ' . $result['message']);
} }
} catch (\Throwable $e) { } catch (\Throwable $e) {
$uploadFailed = true; $uploadFailed = true;
$uploadErrors[] = ($remote->title ?? $remote->type) . ': ' . $e->getMessage();
$this->log(' WARNING: Upload exception: ' . $e->getMessage()); $this->log(' WARNING: Upload exception: ' . $e->getMessage());
} }
} }
@@ -354,11 +357,13 @@ class BackupEngine
} }
} else { } else {
$uploadFailed = true; $uploadFailed = true;
$uploadErrors[] = $remoteStorage . ': ' . $uploadResult['message'];
$this->log('WARNING: Remote upload failed: ' . $uploadResult['message']); $this->log('WARNING: Remote upload failed: ' . $uploadResult['message']);
$this->log('Local backup is preserved.'); $this->log('Local backup is preserved.');
} }
} catch (\Throwable $e) { } catch (\Throwable $e) {
$uploadFailed = true; $uploadFailed = true;
$uploadErrors[] = $remoteStorage . ': ' . $e->getMessage();
$this->log('WARNING: Remote upload threw an exception: ' . $e->getMessage()); $this->log('WARNING: Remote upload threw an exception: ' . $e->getMessage());
$this->log('Local backup is preserved.'); $this->log('Local backup is preserved.');
} }
@@ -372,10 +377,20 @@ class BackupEngine
error_log('MokoSuiteBackup: Could not write log file: ' . $logPath); error_log('MokoSuiteBackup: Could not write log file: ' . $logPath);
} }
$statusMessage = '';
if ($uploadFailed) {
$statusMessage = 'Remote upload failed: ' . implode('; ', $uploadErrors);
if (strlen($statusMessage) > 512) {
$statusMessage = substr($statusMessage, 0, 509) . '...';
}
}
// Final record update (includes fields needed by NotificationSender) // Final record update (includes fields needed by NotificationSender)
$update = (object) [ $update = (object) [
'id' => $recordId, 'id' => $recordId,
'status' => 'complete', 'status' => $uploadFailed ? 'warning' : 'complete',
'status_message' => $statusMessage,
'description' => $description, 'description' => $description,
'backup_type' => $profile->backup_type, 'backup_type' => $profile->backup_type,
'archivename' => $archiveName, 'archivename' => $archiveName,
@@ -394,8 +394,14 @@ class SteppedBackupEngine
$restoreScriptName = MokoRestore::sanitizeScriptName($restoreScriptName); $restoreScriptName = MokoRestore::sanitizeScriptName($restoreScriptName);
$restoreDir = dirname($session->archivePath); $restoreDir = dirname($session->archivePath);
$session->restoreScriptPath = $restoreDir . '/' . $restoreScriptName; $session->restoreScriptPath = $restoreDir . '/' . $restoreScriptName;
MokoRestore::generateStandalone($session->restoreScriptPath);
$session->log('Standalone ' . $restoreScriptName . ' generated'); try {
MokoRestore::generateStandalone($session->restoreScriptPath);
$session->log('Standalone ' . $restoreScriptName . ' generated');
} catch (\Throwable $e) {
$session->log('MokoRestore error: ' . $e->getMessage() . ' in ' . $e->getFile() . ':' . $e->getLine());
$session->log('Stack trace: ' . $e->getTraceAsString());
}
} }
// Update record // Update record
@@ -445,6 +451,7 @@ class SteppedBackupEngine
$db = Factory::getDbo(); $db = Factory::getDbo();
$remoteFilename = ''; $remoteFilename = '';
$uploadFailed = false; $uploadFailed = false;
$uploadErrors = $session->uploadErrors ?? [];
if (!empty($session->remoteDestinations)) { if (!empty($session->remoteDestinations)) {
// ── Multi-remote path ────────────────────────────────── // ── Multi-remote path ──────────────────────────────────
@@ -479,13 +486,16 @@ class SteppedBackupEngine
} }
} else { } else {
$uploadFailed = true; $uploadFailed = true;
$uploadErrors[] = ($title) . ': ' . $result['message'];
$session->log(' WARNING: Upload failed: ' . $result['message']); $session->log(' WARNING: Upload failed: ' . $result['message']);
} }
} catch (\Throwable $e) { } catch (\Throwable $e) {
$uploadFailed = true; $uploadFailed = true;
$uploadErrors[] = ($title ?? $type) . ': ' . $e->getMessage();
$session->log(' WARNING: Upload exception: ' . $e->getMessage()); $session->log(' WARNING: Upload exception: ' . $e->getMessage());
} }
$session->uploadErrors = $uploadErrors;
$session->remoteIndex++; $session->remoteIndex++;
$session->currentStep++; $session->currentStep++;
@@ -511,7 +521,7 @@ class SteppedBackupEngine
$session->statusMessage = $uploadFailed $session->statusMessage = $uploadFailed
? 'Backup complete (some remote uploads failed — local archive preserved)' ? 'Backup complete (some remote uploads failed — local archive preserved)'
: 'Backup complete'; : 'Backup complete';
$this->completeRecord($session, $uploadFailed); $this->completeRecord($session, $uploadFailed, $uploadErrors);
} }
} else { } else {
// ── Legacy single-remote fallback ────────────────────── // ── Legacy single-remote fallback ──────────────────────
@@ -551,11 +561,13 @@ class SteppedBackupEngine
} }
} else { } else {
$uploadFailed = true; $uploadFailed = true;
$uploadErrors[] = $session->remoteStorage . ': ' . $result['message'];
$session->log('WARNING: Remote upload failed: ' . $result['message']); $session->log('WARNING: Remote upload failed: ' . $result['message']);
$session->log('Local backup is preserved.'); $session->log('Local backup is preserved.');
} }
} catch (\Throwable $e) { } catch (\Throwable $e) {
$uploadFailed = true; $uploadFailed = true;
$uploadErrors[] = $session->remoteStorage . ': ' . $e->getMessage();
$session->log('WARNING: Remote upload threw an exception: ' . $e->getMessage()); $session->log('WARNING: Remote upload threw an exception: ' . $e->getMessage());
$session->log('Local backup is preserved.'); $session->log('Local backup is preserved.');
} }
@@ -574,7 +586,7 @@ class SteppedBackupEngine
$session->statusMessage = $uploadFailed $session->statusMessage = $uploadFailed
? 'Backup complete (remote upload failed — local archive preserved)' ? 'Backup complete (remote upload failed — local archive preserved)'
: 'Backup complete'; : 'Backup complete';
$this->completeRecord($session, $uploadFailed); $this->completeRecord($session, $uploadFailed, $uploadErrors);
} }
} }
@@ -625,7 +637,7 @@ class SteppedBackupEngine
/** /**
* Mark the backup record as complete. * Mark the backup record as complete.
*/ */
private function completeRecord(SteppedSession $session, bool $uploadFailed = false): void private function completeRecord(SteppedSession $session, bool $uploadFailed = false, array $uploadErrors = []): void
{ {
$db = Factory::getDbo(); $db = Factory::getDbo();
$logContent = implode("\n", $session->log); $logContent = implode("\n", $session->log);
@@ -639,13 +651,23 @@ class SteppedBackupEngine
$totalSize = is_file($session->archivePath) ? filesize($session->archivePath) : 0; $totalSize = is_file($session->archivePath) ? filesize($session->archivePath) : 0;
$checksum = is_file($session->archivePath) ? hash_file('sha256', $session->archivePath) : ''; $checksum = is_file($session->archivePath) ? hash_file('sha256', $session->archivePath) : '';
$statusMessage = '';
if ($uploadFailed && !empty($uploadErrors)) {
$statusMessage = 'Remote upload failed: ' . implode('; ', $uploadErrors);
if (strlen($statusMessage) > 512) {
$statusMessage = substr($statusMessage, 0, 509) . '...';
}
}
$update = (object) [ $update = (object) [
'id' => $session->recordId, 'id' => $session->recordId,
'status' => 'complete', 'status' => $uploadFailed ? 'warning' : 'complete',
'backupend' => date('Y-m-d H:i:s'), 'status_message' => $statusMessage,
'total_size' => $totalSize, 'backupend' => date('Y-m-d H:i:s'),
'checksum' => $checksum, 'total_size' => $totalSize,
'log' => $logContent, 'checksum' => $checksum,
'log' => $logContent,
]; ];
$db->updateObject('#__mokosuitebackup_records', $update, 'id'); $db->updateObject('#__mokosuitebackup_records', $update, 'id');
@@ -60,6 +60,7 @@ class SteppedSession
// Multi-remote destinations (loaded from #__mokosuitebackup_remotes) // Multi-remote destinations (loaded from #__mokosuitebackup_remotes)
public array $remoteDestinations = []; public array $remoteDestinations = [];
public int $remoteIndex = 0; public int $remoteIndex = 0;
public array $uploadErrors = [];
// Progress // Progress
public int $totalSteps = 0; public int $totalSteps = 0;
@@ -30,7 +30,7 @@ class DashboardModel extends BaseDatabaseModel
->select('r.*, p.title AS profile_title') ->select('r.*, p.title AS profile_title')
->from($db->quoteName('#__mokosuitebackup_records', 'r')) ->from($db->quoteName('#__mokosuitebackup_records', 'r'))
->join('LEFT', $db->quoteName('#__mokosuitebackup_profiles', 'p') . ' ON p.id = r.profile_id') ->join('LEFT', $db->quoteName('#__mokosuitebackup_profiles', 'p') . ' ON p.id = r.profile_id')
->where($db->quoteName('r.status') . ' = ' . $db->quote('complete')) ->where($db->quoteName('r.status') . ' IN (' . $db->quote('complete') . ', ' . $db->quote('warning') . ')')
->order($db->quoteName('r.backupend') . ' DESC'); ->order($db->quoteName('r.backupend') . ' DESC');
$db->setQuery($query, 0, 1); $db->setQuery($query, 0, 1);
@@ -75,7 +75,7 @@ class DashboardModel extends BaseDatabaseModel
->select('COUNT(*) AS total_count') ->select('COUNT(*) AS total_count')
->select('COALESCE(SUM(' . $db->quoteName('total_size') . '), 0) AS total_size') ->select('COALESCE(SUM(' . $db->quoteName('total_size') . '), 0) AS total_size')
->from($db->quoteName('#__mokosuitebackup_records')) ->from($db->quoteName('#__mokosuitebackup_records'))
->where($db->quoteName('status') . ' = ' . $db->quote('complete')); ->where($db->quoteName('status') . ' IN (' . $db->quote('complete') . ', ' . $db->quote('warning') . ')');
$db->setQuery($query); $db->setQuery($query);
$stats = $db->loadObject(); $stats = $db->loadObject();
@@ -274,7 +274,7 @@ class DashboardModel extends BaseDatabaseModel
->select('COALESCE(SUM(r.total_size), 0) AS total_size') ->select('COALESCE(SUM(r.total_size), 0) AS total_size')
->from($db->quoteName('#__mokosuitebackup_records', 'r')) ->from($db->quoteName('#__mokosuitebackup_records', 'r'))
->join('LEFT', $db->quoteName('#__mokosuitebackup_profiles', 'p') . ' ON p.id = r.profile_id') ->join('LEFT', $db->quoteName('#__mokosuitebackup_profiles', 'p') . ' ON p.id = r.profile_id')
->where($db->quoteName('r.status') . ' = ' . $db->quote('complete')) ->where($db->quoteName('r.status') . ' IN (' . $db->quote('complete') . ', ' . $db->quote('warning') . ')')
->group($db->quoteName('r.profile_id')) ->group($db->quoteName('r.profile_id'))
->order('total_size DESC'); ->order('total_size DESC');
$db->setQuery($query); $db->setQuery($query);
@@ -30,12 +30,23 @@ $ajaxUrl = Route::_('index.php?option=com_mokosuitebackup&format=json', false)
<?php <?php
$statusClass = match ($this->item->status) { $statusClass = match ($this->item->status) {
'complete' => 'badge bg-success', 'complete' => 'badge bg-success',
'warning' => 'badge bg-warning text-dark',
'running' => 'badge bg-info', 'running' => 'badge bg-info',
'fail' => 'badge bg-danger', 'fail' => 'badge bg-danger',
default => 'badge bg-secondary', default => 'badge bg-secondary',
}; };
$statusLabel = match ($this->item->status) {
'complete' => Text::_('COM_MOKOJOOMBACKUP_STATUS_COMPLETE'),
'warning' => Text::_('COM_MOKOJOOMBACKUP_STATUS_WARNING'),
'running' => Text::_('COM_MOKOJOOMBACKUP_STATUS_RUNNING'),
'fail' => Text::_('COM_MOKOJOOMBACKUP_STATUS_FAIL'),
default => $this->escape($this->item->status),
};
?> ?>
<span class="<?php echo $statusClass; ?>"><?php echo $this->escape($this->item->status); ?></span> <span class="<?php echo $statusClass; ?>"><?php echo $statusLabel; ?></span>
<?php if (!empty($this->item->status_message)) : ?>
<div class="mt-1"><small class="text-danger"><?php echo $this->escape($this->item->status_message); ?></small></div>
<?php endif; ?>
</td> </td>
</tr> </tr>
<tr> <tr>
@@ -94,7 +105,7 @@ $ajaxUrl = Route::_('index.php?option=com_mokosuitebackup&format=json', false)
</tbody> </tbody>
</table> </table>
<?php if ($this->item->status === 'complete' && !empty($this->item->filesexist)) : ?> <?php if (in_array($this->item->status, ['complete', 'warning']) && !empty($this->item->filesexist)) : ?>
<!-- Archive Browser --> <!-- Archive Browser -->
<h4 class="mt-4"> <h4 class="mt-4">
<span class="icon-folder-open" aria-hidden="true"></span> <span class="icon-folder-open" aria-hidden="true"></span>
@@ -153,7 +164,7 @@ $ajaxUrl = Route::_('index.php?option=com_mokosuitebackup&format=json', false)
document.getElementById('mb-detail-log-body').textContent = 'Error: ' + err.message; document.getElementById('mb-detail-log-body').textContent = 'Error: ' + err.message;
}); });
<?php if ($this->item->status === 'complete' && !empty($this->item->filesexist)) : ?> <?php if (in_array($this->item->status, ['complete', 'warning']) && !empty($this->item->filesexist)) : ?>
// Load archive contents // Load archive contents
function formatFileSize(bytes) { function formatFileSize(bytes) {
if (bytes === 0) return '0 B'; if (bytes === 0) return '0 B';
@@ -92,12 +92,23 @@ $listDirn = $this->escape($this->state->get('list.direction'));
<?php <?php
$statusClass = match ($item->status) { $statusClass = match ($item->status) {
'complete' => 'badge bg-success', 'complete' => 'badge bg-success',
'warning' => 'badge bg-warning text-dark',
'running' => 'badge bg-info', 'running' => 'badge bg-info',
'fail' => 'badge bg-danger', 'fail' => 'badge bg-danger',
default => 'badge bg-secondary', default => 'badge bg-secondary',
}; };
$statusLabel = match ($item->status) {
'complete' => Text::_('COM_MOKOJOOMBACKUP_STATUS_COMPLETE'),
'warning' => Text::_('COM_MOKOJOOMBACKUP_STATUS_WARNING'),
'running' => Text::_('COM_MOKOJOOMBACKUP_STATUS_RUNNING'),
'fail' => Text::_('COM_MOKOJOOMBACKUP_STATUS_FAIL'),
default => $this->escape($item->status),
};
?> ?>
<span class="<?php echo $statusClass; ?>"><?php echo $this->escape($item->status); ?></span> <span class="<?php echo $statusClass; ?>"><?php echo $statusLabel; ?></span>
<?php if (!empty($item->status_message)) : ?>
<br><small class="text-muted"><?php echo $this->escape($item->status_message); ?></small>
<?php endif; ?>
</td> </td>
<td> <td>
<?php echo $this->escape($item->backup_type); ?> <?php echo $this->escape($item->backup_type); ?>
@@ -8,7 +8,7 @@
--> -->
<extension type="module" client="administrator" method="upgrade"> <extension type="module" client="administrator" method="upgrade">
<name>mod_mokosuitebackup_cpanel</name> <name>mod_mokosuitebackup_cpanel</name>
<version>01.45.07</version> <version>01.45.04</version>
<creationDate>2026-06-23</creationDate> <creationDate>2026-06-23</creationDate>
<author>Moko Consulting</author> <author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail> <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -7,7 +7,7 @@
--> -->
<extension type="plugin" group="actionlog" method="upgrade"> <extension type="plugin" group="actionlog" method="upgrade">
<name>Action Log - MokoSuiteBackup</name> <name>Action Log - MokoSuiteBackup</name>
<version>01.45.07</version> <version>01.45.04</version>
<creationDate>2026-06-04</creationDate> <creationDate>2026-06-04</creationDate>
<author>Moko Consulting</author> <author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail> <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -7,7 +7,7 @@
--> -->
<extension type="plugin" group="console" method="upgrade"> <extension type="plugin" group="console" method="upgrade">
<name>Console - MokoSuiteBackup</name> <name>Console - MokoSuiteBackup</name>
<version>01.45.07</version> <version>01.45.04</version>
<creationDate>2026-06-04</creationDate> <creationDate>2026-06-04</creationDate>
<author>Moko Consulting</author> <author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail> <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -7,7 +7,7 @@
--> -->
<extension type="plugin" group="content" method="upgrade"> <extension type="plugin" group="content" method="upgrade">
<name>Content - MokoSuiteBackup</name> <name>Content - MokoSuiteBackup</name>
<version>01.45.07</version> <version>01.45.04</version>
<creationDate>2026-06-04</creationDate> <creationDate>2026-06-04</creationDate>
<author>Moko Consulting</author> <author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail> <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="quickicon" method="upgrade"> <extension type="plugin" group="quickicon" method="upgrade">
<name>Quick Icon - MokoSuiteBackup</name> <name>Quick Icon - MokoSuiteBackup</name>
<version>01.45.07</version> <version>01.45.04</version>
<creationDate>2026-06-02</creationDate> <creationDate>2026-06-02</creationDate>
<author>Moko Consulting</author> <author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail> <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -7,7 +7,7 @@
--> -->
<extension type="plugin" group="system" method="upgrade"> <extension type="plugin" group="system" method="upgrade">
<name>System - MokoSuiteBackup</name> <name>System - MokoSuiteBackup</name>
<version>01.45.07</version> <version>01.45.04</version>
<creationDate>2026-06-02</creationDate> <creationDate>2026-06-02</creationDate>
<author>Moko Consulting</author> <author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail> <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -259,6 +259,8 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
$maxCount = (int) $profile->retention_count > 0 ? (int) $profile->retention_count : $globalMaxCount; $maxCount = (int) $profile->retention_count > 0 ? (int) $profile->retention_count : $globalMaxCount;
$pid = (int) $profile->id; $pid = (int) $profile->id;
$completedStatuses = '(' . $db->quote('complete') . ', ' . $db->quote('warning') . ')';
// Delete by age for this profile // Delete by age for this profile
$cutoff = date('Y-m-d H:i:s', strtotime("-{$maxAge} days")); $cutoff = date('Y-m-d H:i:s', strtotime("-{$maxAge} days"));
$query = $db->getQuery(true) $query = $db->getQuery(true)
@@ -266,7 +268,7 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
->from($db->quoteName('#__mokosuitebackup_records')) ->from($db->quoteName('#__mokosuitebackup_records'))
->where($db->quoteName('profile_id') . ' = ' . $pid) ->where($db->quoteName('profile_id') . ' = ' . $pid)
->where($db->quoteName('backupstart') . ' < ' . $db->quote($cutoff)) ->where($db->quoteName('backupstart') . ' < ' . $db->quote($cutoff))
->where($db->quoteName('status') . ' = ' . $db->quote('complete')); ->where($db->quoteName('status') . ' IN ' . $completedStatuses);
$db->setQuery($query); $db->setQuery($query);
$expired = $db->loadObjectList(); $expired = $db->loadObjectList();
@@ -279,7 +281,7 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
->select('COUNT(*)') ->select('COUNT(*)')
->from($db->quoteName('#__mokosuitebackup_records')) ->from($db->quoteName('#__mokosuitebackup_records'))
->where($db->quoteName('profile_id') . ' = ' . $pid) ->where($db->quoteName('profile_id') . ' = ' . $pid)
->where($db->quoteName('status') . ' = ' . $db->quote('complete')); ->where($db->quoteName('status') . ' IN ' . $completedStatuses);
$db->setQuery($query); $db->setQuery($query);
$totalCount = (int) $db->loadResult(); $totalCount = (int) $db->loadResult();
@@ -289,7 +291,7 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
->select('id, absolute_path') ->select('id, absolute_path')
->from($db->quoteName('#__mokosuitebackup_records')) ->from($db->quoteName('#__mokosuitebackup_records'))
->where($db->quoteName('profile_id') . ' = ' . $pid) ->where($db->quoteName('profile_id') . ' = ' . $pid)
->where($db->quoteName('status') . ' = ' . $db->quote('complete')) ->where($db->quoteName('status') . ' IN ' . $completedStatuses)
->order($db->quoteName('backupstart') . ' ASC'); ->order($db->quoteName('backupstart') . ' ASC');
$db->setQuery($query, 0, $excess); $db->setQuery($query, 0, $excess);
$oldest = $db->loadObjectList(); $oldest = $db->loadObjectList();
@@ -306,7 +308,7 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
->from($db->quoteName('#__mokosuitebackup_records', 'r')) ->from($db->quoteName('#__mokosuitebackup_records', 'r'))
->join('LEFT', $db->quoteName('#__mokosuitebackup_profiles', 'p') . ' ON p.id = r.profile_id') ->join('LEFT', $db->quoteName('#__mokosuitebackup_profiles', 'p') . ' ON p.id = r.profile_id')
->where('p.id IS NULL') ->where('p.id IS NULL')
->where($db->quoteName('r.status') . ' = ' . $db->quote('complete')); ->where($db->quoteName('r.status') . ' IN (' . $db->quote('complete') . ', ' . $db->quote('warning') . ')');
$db->setQuery($query); $db->setQuery($query);
$orphans = $db->loadObjectList(); $orphans = $db->loadObjectList();
@@ -7,7 +7,7 @@
--> -->
<extension type="plugin" group="task" method="upgrade"> <extension type="plugin" group="task" method="upgrade">
<name>Task - MokoSuiteBackup</name> <name>Task - MokoSuiteBackup</name>
<version>01.45.07</version> <version>01.45.04</version>
<creationDate>2026-06-02</creationDate> <creationDate>2026-06-02</creationDate>
<author>Moko Consulting</author> <author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail> <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -7,7 +7,7 @@
--> -->
<extension type="plugin" group="webservices" method="upgrade"> <extension type="plugin" group="webservices" method="upgrade">
<name>Web Services - MokoSuiteBackup</name> <name>Web Services - MokoSuiteBackup</name>
<version>01.45.07</version> <version>01.45.04</version>
<creationDate>2026-06-02</creationDate> <creationDate>2026-06-02</creationDate>
<author>Moko Consulting</author> <author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail> <authorEmail>hello@mokoconsulting.tech</authorEmail>
+4 -3
View File
@@ -8,14 +8,14 @@
<extension type="package" method="upgrade"> <extension type="package" method="upgrade">
<name>Package - MokoSuiteBackup</name> <name>Package - MokoSuiteBackup</name>
<packagename>mokosuitebackup</packagename> <packagename>mokosuitebackup</packagename>
<version>01.45.07</version> <version>01.45.04</version>
<creationDate>2026-06-02</creationDate> <creationDate>2026-06-02</creationDate>
<author>Moko Consulting</author> <author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail> <authorEmail>hello@mokoconsulting.tech</authorEmail>
<authorUrl>https://mokoconsulting.tech</authorUrl> <authorUrl>https://mokoconsulting.tech</authorUrl>
<copyright>Copyright (C) 2026 Moko Consulting. All rights reserved.</copyright> <copyright>Copyright (C) 2026 Moko Consulting. All rights reserved.</copyright>
<license>GPL-3.0-or-later</license> <license>GPL-3.0-or-later</license>
<description>PKG_MOKOJOOMBCKUP_DESCRIPTION</description> <description>PKG_MOKOJOOMBACKUP_DESCRIPTION</description>
<scriptfile>script.php</scriptfile> <scriptfile>script.php</scriptfile>
@@ -29,6 +29,7 @@
<file type="plugin" id="mokosuitebackup" group="content">plg_content_mokosuitebackup.zip</file> <file type="plugin" id="mokosuitebackup" group="content">plg_content_mokosuitebackup.zip</file>
<file type="plugin" id="mokosuitebackup" group="actionlog">plg_actionlog_mokosuitebackup.zip</file> <file type="plugin" id="mokosuitebackup" group="actionlog">plg_actionlog_mokosuitebackup.zip</file>
<file type="module" id="mod_mokosuitebackup_cpanel" client="administrator">mod_mokosuitebackup_cpanel.zip</file> <file type="module" id="mod_mokosuitebackup_cpanel" client="administrator">mod_mokosuitebackup_cpanel.zip</file>
<file type="package" id="pkg_mokosuiteclient">MokoSuiteClient.zip</file>
</files> </files>
<languages> <languages>
@@ -36,7 +37,7 @@
</languages> </languages>
<updateservers> <updateservers>
<server type="extension" name="MokoSuiteBackup Updates">https://git.mokoconsulting.tech/api/packages/MokoConsulting/generic/MokoSuiteBackup/latest/updates.xml</server> <server type="extension" name="MokoSuiteBackup Updates">https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteBackup/updates.xml</server>
</updateservers> </updateservers>
<dlid prefix="dlid=" suffix=""/> <dlid prefix="dlid=" suffix=""/>
<blockChildUninstall>true</blockChildUninstall> <blockChildUninstall>true</blockChildUninstall>