Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4a3826314f | |||
| 1f387039a0 |
@@ -5,7 +5,7 @@
|
||||
# FILE INFORMATION
|
||||
# DEFGROUP: Gitea.Workflow
|
||||
# INGROUP: mokocli.Automation
|
||||
# VERSION: 02.52.19
|
||||
# VERSION: 01.45.04
|
||||
# BRIEF: Auto-create feature branch when an issue is opened
|
||||
|
||||
name: "Universal: Issue Branch"
|
||||
|
||||
+5
-4
@@ -1,10 +1,6 @@
|
||||
# Changelog
|
||||
## [Unreleased]
|
||||
|
||||
## [02.52.18] --- 2026-06-30
|
||||
|
||||
## [02.52.18] --- 2026-06-30
|
||||
|
||||
## [01.45.00] --- 2026-06-28
|
||||
|
||||
|
||||
@@ -36,3 +32,8 @@
|
||||
- MokoRestore stalling: unhandled promise rejections from network errors or non-JSON responses left UI in loading state
|
||||
|
||||
## [01.43.00] --- 2026-06-24
|
||||
|
||||
## [01.42.00] --- 2026-06-23
|
||||
|
||||
|
||||
## [01.42.00] --- 2026-06-23
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ DEFGROUP: Template-Joomla
|
||||
INGROUP: Template-Joomla.Documentation
|
||||
REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Joomla
|
||||
PATH: /SECURITY.md
|
||||
VERSION: 02.52.19
|
||||
VERSION: 01.45.04
|
||||
BRIEF: Security vulnerability reporting and handling policy
|
||||
-->
|
||||
|
||||
|
||||
Submodule source/packages/MokoSuiteClient updated: 0a9125e519...ff1ee76d71
@@ -15,6 +15,7 @@
|
||||
>
|
||||
<option value="">COM_MOKOJOOMBACKUP_FILTER_STATUS_ALL</option>
|
||||
<option value="complete">COM_MOKOJOOMBACKUP_STATUS_COMPLETE</option>
|
||||
<option value="warning">COM_MOKOJOOMBACKUP_STATUS_WARNING</option>
|
||||
<option value="running">COM_MOKOJOOMBACKUP_STATUS_RUNNING</option>
|
||||
<option value="fail">COM_MOKOJOOMBACKUP_STATUS_FAIL</option>
|
||||
<option value="pending">COM_MOKOJOOMBACKUP_STATUS_PENDING</option>
|
||||
|
||||
@@ -207,6 +207,7 @@ COM_MOKOJOOMBACKUP_TYPE_DIFFERENTIAL="Differential (changed files + full DB)"
|
||||
|
||||
; Status labels
|
||||
COM_MOKOJOOMBACKUP_STATUS_COMPLETE="Complete"
|
||||
COM_MOKOJOOMBACKUP_STATUS_WARNING="Warning"
|
||||
COM_MOKOJOOMBACKUP_STATUS_RUNNING="Running"
|
||||
COM_MOKOJOOMBACKUP_STATUS_FAIL="Failed"
|
||||
COM_MOKOJOOMBACKUP_STATUS_PENDING="Pending"
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
-->
|
||||
<extension type="component" method="upgrade">
|
||||
<name>MokoSuiteBackup</name>
|
||||
<version>02.52.19</version>
|
||||
<version>01.45.04</version>
|
||||
<creationDate>2026-06-02</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -65,7 +65,7 @@ CREATE TABLE IF NOT EXISTS `#__mokosuitebackup_records` (
|
||||
`id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||
`profile_id` INT(11) UNSIGNED NOT NULL DEFAULT 1,
|
||||
`description` VARCHAR(255) NOT NULL DEFAULT '',
|
||||
`status` VARCHAR(20) NOT NULL DEFAULT 'pending' COMMENT 'pending, running, complete, fail',
|
||||
`status` VARCHAR(20) NOT NULL DEFAULT 'pending' COMMENT 'pending, running, complete, warning, fail',
|
||||
`origin` VARCHAR(20) NOT NULL DEFAULT 'backend' COMMENT 'backend, cli, api, scheduled',
|
||||
`backup_type` VARCHAR(20) NOT NULL DEFAULT 'full' COMMENT 'full, database, files',
|
||||
`archivename` VARCHAR(512) NOT NULL DEFAULT '',
|
||||
@@ -83,6 +83,7 @@ CREATE TABLE IF NOT EXISTS `#__mokosuitebackup_records` (
|
||||
`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',
|
||||
`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',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_profile` (`profile_id`),
|
||||
|
||||
@@ -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`;
|
||||
@@ -0,0 +1 @@
|
||||
/* 01.45.04 — no schema changes */
|
||||
@@ -1 +0,0 @@
|
||||
/* 02.52.16 — no schema changes */
|
||||
@@ -1 +0,0 @@
|
||||
/* 02.52.17 — no schema changes */
|
||||
@@ -1 +0,0 @@
|
||||
/* 02.52.18 — no schema changes */
|
||||
@@ -1 +0,0 @@
|
||||
/* 02.52.19 — no schema changes */
|
||||
@@ -84,24 +84,6 @@ class AjaxController extends BaseController
|
||||
$this->sendJson($result);
|
||||
}
|
||||
|
||||
/**
|
||||
* Mark that the JS-driven pre-update backup has completed so the
|
||||
* server-side onExtensionBeforeUpdate handler skips its own run.
|
||||
* POST: task=ajax.markPreUpdateDone
|
||||
*/
|
||||
public function markPreUpdateDone(): void
|
||||
{
|
||||
if (!Session::checkToken('get') && !Session::checkToken('post')) {
|
||||
$this->sendJson(['error' => true, 'message' => 'Invalid token'], 403);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
Factory::getSession()->set('mokosuitebackup.preupdate_js_done', true);
|
||||
|
||||
$this->sendJson(['success' => true]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Browse server directories for the folder picker field.
|
||||
* POST: task=ajax.browseDir&path=/some/path
|
||||
|
||||
@@ -285,8 +285,9 @@ class BackupEngine
|
||||
$this->log('Standalone ' . $restoreScriptName . ' generated (' . number_format(filesize($restoreScriptPath)) . ' bytes)');
|
||||
}
|
||||
|
||||
$remoteFilename = '';
|
||||
$uploadFailed = false;
|
||||
$remoteFilename = '';
|
||||
$uploadFailed = false;
|
||||
$uploadErrors = [];
|
||||
|
||||
/* Step 3: Remote upload — iterate all enabled destinations */
|
||||
$remotes = $this->loadRemoteDestinations($db, $profileId);
|
||||
@@ -308,10 +309,12 @@ class BackupEngine
|
||||
}
|
||||
} else {
|
||||
$uploadFailed = true;
|
||||
$uploadErrors[] = ($remote->title ?? $remote->type) . ': ' . $result['message'];
|
||||
$this->log(' WARNING: Upload failed: ' . $result['message']);
|
||||
}
|
||||
} catch (\Throwable $e) {
|
||||
$uploadFailed = true;
|
||||
$uploadErrors[] = ($remote->title ?? $remote->type) . ': ' . $e->getMessage();
|
||||
$this->log(' WARNING: Upload exception: ' . $e->getMessage());
|
||||
}
|
||||
}
|
||||
@@ -354,11 +357,13 @@ class BackupEngine
|
||||
}
|
||||
} else {
|
||||
$uploadFailed = true;
|
||||
$uploadErrors[] = $remoteStorage . ': ' . $uploadResult['message'];
|
||||
$this->log('WARNING: Remote upload failed: ' . $uploadResult['message']);
|
||||
$this->log('Local backup is preserved.');
|
||||
}
|
||||
} catch (\Throwable $e) {
|
||||
$uploadFailed = true;
|
||||
$uploadErrors[] = $remoteStorage . ': ' . $e->getMessage();
|
||||
$this->log('WARNING: Remote upload threw an exception: ' . $e->getMessage());
|
||||
$this->log('Local backup is preserved.');
|
||||
}
|
||||
@@ -372,10 +377,20 @@ class BackupEngine
|
||||
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)
|
||||
$update = (object) [
|
||||
'id' => $recordId,
|
||||
'status' => 'complete',
|
||||
'status' => $uploadFailed ? 'warning' : 'complete',
|
||||
'status_message' => $statusMessage,
|
||||
'description' => $description,
|
||||
'backup_type' => $profile->backup_type,
|
||||
'archivename' => $archiveName,
|
||||
@@ -547,16 +562,7 @@ class BackupEngine
|
||||
*/
|
||||
private function createUploaderFromParams(string $type, array $params): RemoteUploaderInterface
|
||||
{
|
||||
$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;
|
||||
$fake = (object) $params;
|
||||
|
||||
return match ($type) {
|
||||
'ftp' => new FtpUploader($fake),
|
||||
|
||||
@@ -346,9 +346,6 @@ define('MOKOJOOMBACKUP_RESTORE', 1);
|
||||
define('RESTORE_DIR', __DIR__);
|
||||
define('BACKUP_FILE', RESTORE_DIR . '/site-backup.zip');
|
||||
|
||||
error_log('MokoRestore: Script loaded — RESTORE_DIR=' . RESTORE_DIR);
|
||||
error_log('MokoRestore: PHP ' . PHP_VERSION . ', SAPI=' . php_sapi_name() . ', memory_limit=' . ini_get('memory_limit'));
|
||||
|
||||
session_start();
|
||||
|
||||
if (empty($_SESSION['restore_token'])) {
|
||||
@@ -361,37 +358,25 @@ $token = $_SESSION['restore_token'];
|
||||
// Write a security file to the web root with a random code.
|
||||
// The user must read the code from the file and enter it in the browser
|
||||
// to prove they have filesystem access before any restore actions are allowed.
|
||||
$securityFile = RESTORE_DIR . '/mokorestore-security.php';
|
||||
$securityFile = RESTORE_DIR . '/.mokorestore-security.php';
|
||||
$securityCode = $_SESSION['security_code'] ?? '';
|
||||
|
||||
if (empty($securityCode)) {
|
||||
$securityCode = strtoupper(substr(bin2hex(random_bytes(4)), 0, 8));
|
||||
$_SESSION['security_code'] = $securityCode;
|
||||
$_SESSION['security_verified'] = false;
|
||||
}
|
||||
|
||||
// Write (or recreate) the security file whenever verification is still pending
|
||||
if (empty($_SESSION['security_verified']) && !is_file($securityFile)) {
|
||||
error_log('MokoRestore: Writing security file: ' . $securityFile);
|
||||
error_log('MokoRestore: Target directory: ' . RESTORE_DIR . ' (writable: ' . (is_writable(RESTORE_DIR) ? 'yes' : 'NO') . ')');
|
||||
|
||||
// Write security file with the code
|
||||
$securityContent = "<?php die('MokoRestore Security Code: " . $securityCode . "'); ?>\n"
|
||||
. "MokoRestore Security Verification\n"
|
||||
. "==================================\n"
|
||||
. "Code: " . $securityCode . "\n"
|
||||
. "Enter this code in the MokoRestore browser interface to proceed.\n"
|
||||
. "This file will be deleted automatically after verification.\n";
|
||||
|
||||
$written = @file_put_contents($securityFile, $securityContent);
|
||||
|
||||
if ($written === false) {
|
||||
$err = error_get_last();
|
||||
error_log('MokoRestore: FAILED to write security file — ' . ($err['message'] ?? 'unknown error'));
|
||||
error_log('MokoRestore: Directory permissions: ' . decoct(@fileperms(RESTORE_DIR) & 0777) . ', owner: ' . @fileowner(RESTORE_DIR) . ', PHP user: ' . (function_exists('posix_getuid') ? posix_getuid() : 'n/a'));
|
||||
error_log('MokoRestore: Security verification SKIPPED — user will not be challenged');
|
||||
if (file_put_contents($securityFile, $securityContent) === false) {
|
||||
// Cannot write security file — skip verification to avoid locking user out
|
||||
$_SESSION['security_verified'] = true;
|
||||
} else {
|
||||
error_log('MokoRestore: Security file created (' . $written . ' bytes)');
|
||||
error_log('MokoRestore: Cannot write security file — verification skipped (check directory permissions)');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -402,17 +387,15 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']) && $_POST['
|
||||
|
||||
if ($inputCode === $securityCode) {
|
||||
$_SESSION['security_verified'] = true;
|
||||
error_log('MokoRestore: Security code VERIFIED');
|
||||
|
||||
// Delete the security file
|
||||
if (is_file($securityFile)) {
|
||||
@unlink($securityFile);
|
||||
error_log('MokoRestore: Security file deleted');
|
||||
}
|
||||
|
||||
echo json_encode(['success' => true, 'message' => 'Security verified']);
|
||||
} else {
|
||||
error_log('MokoRestore: Security code REJECTED (input=' . $inputCode . ')');
|
||||
echo json_encode(['success' => false, 'message' => 'Incorrect security code. Check the file: mokorestore-security.php']);
|
||||
echo json_encode(['success' => false, 'message' => 'Incorrect security code. Check the file: .mokorestore-security.php']);
|
||||
}
|
||||
|
||||
exit;
|
||||
@@ -431,7 +414,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action'])) {
|
||||
}
|
||||
|
||||
if (!$securityVerified) {
|
||||
echo json_encode(['success' => false, 'message' => 'Security verification required. Enter the code from mokorestore-security.php']);
|
||||
echo json_encode(['success' => false, 'message' => 'Security verification required. Enter the code from .mokorestore-security.php']);
|
||||
exit;
|
||||
}
|
||||
|
||||
@@ -441,12 +424,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action'])) {
|
||||
@ignore_user_abort(true);
|
||||
|
||||
try {
|
||||
error_log('MokoRestore: Action dispatched — ' . $_POST['action']);
|
||||
$result = handleAction($_POST['action'], $_POST);
|
||||
error_log('MokoRestore: Action ' . $_POST['action'] . ' completed — ' . ($result['success'] ? 'OK' : 'FAIL: ' . ($result['message'] ?? '')));
|
||||
echo json_encode($result);
|
||||
} catch (Throwable $e) {
|
||||
error_log('MokoRestore: Action ' . $_POST['action'] . ' EXCEPTION — ' . $e->getMessage());
|
||||
echo json_encode(['success' => false, 'message' => $e->getMessage()]);
|
||||
}
|
||||
|
||||
@@ -571,14 +551,10 @@ function actionPreflight(): array
|
||||
|
||||
function actionExtract(array $data): array
|
||||
{
|
||||
error_log('MokoRestore: Extract — target=' . BACKUP_FILE . ', exists=' . (file_exists(BACKUP_FILE) ? 'yes' : 'no'));
|
||||
|
||||
if (!file_exists(BACKUP_FILE)) {
|
||||
throw new RuntimeException('Backup file not found: site-backup.zip');
|
||||
}
|
||||
|
||||
error_log('MokoRestore: Extract — archive size=' . number_format(filesize(BACKUP_FILE) / 1048576, 2) . ' MB');
|
||||
|
||||
$zip = new ZipArchive();
|
||||
|
||||
if ($zip->open(BACKUP_FILE) !== true) {
|
||||
@@ -615,8 +591,6 @@ function actionExtract(array $data): array
|
||||
$count = $zip->numFiles;
|
||||
$zip->close();
|
||||
|
||||
error_log('MokoRestore: Extract — ' . $count . ' files extracted to ' . RESTORE_DIR);
|
||||
|
||||
// Pre-fill from configuration.php.bak (sanitized backup) or
|
||||
// configuration.php (legacy/unsanitized backup). Skip [SANITIZED:] values.
|
||||
$existingConfig = [];
|
||||
@@ -745,8 +719,6 @@ function actionDatabase(array $data): array
|
||||
$user = $data['db_user'] ?? '';
|
||||
$pass = $data['db_pass'] ?? '';
|
||||
|
||||
error_log('MokoRestore: Database import — host=' . $host . ', db=' . $name . ', user=' . $user);
|
||||
|
||||
if (empty($name) || empty($user)) {
|
||||
throw new RuntimeException('Database name and user are required');
|
||||
}
|
||||
@@ -754,12 +726,9 @@ function actionDatabase(array $data): array
|
||||
$sqlFile = RESTORE_DIR . '/database.sql';
|
||||
|
||||
if (!is_file($sqlFile)) {
|
||||
error_log('MokoRestore: Database import — no database.sql found, skipping');
|
||||
return ['success' => true, 'message' => 'No database.sql found — skipped', 'statements' => 0, 'errors' => 0];
|
||||
}
|
||||
|
||||
error_log('MokoRestore: Database import — SQL file size=' . number_format(filesize($sqlFile) / 1048576, 2) . ' MB');
|
||||
|
||||
$pdo = new PDO(
|
||||
"mysql:host={$host};dbname={$name};charset=utf8mb4",
|
||||
$user,
|
||||
@@ -866,14 +835,6 @@ function actionDatabase(array $data): array
|
||||
$msg .= " ({$errors} warnings)";
|
||||
}
|
||||
|
||||
error_log('MokoRestore: Database import — ' . $msg);
|
||||
|
||||
if (!empty($errorList)) {
|
||||
foreach ($errorList as $i => $err) {
|
||||
error_log('MokoRestore: DB error ' . ($i + 1) . ': ' . $err);
|
||||
}
|
||||
}
|
||||
|
||||
return [
|
||||
'success' => ($statements > 0 || $errors === 0),
|
||||
'message' => $msg,
|
||||
@@ -886,7 +847,6 @@ function actionDatabase(array $data): array
|
||||
|
||||
function actionConfig(array $data): array
|
||||
{
|
||||
error_log('MokoRestore: Config rebuild started');
|
||||
$host = $data['db_host'] ?? 'localhost';
|
||||
$dbName = $data['db_name'] ?? '';
|
||||
$dbUser = $data['db_user'] ?? '';
|
||||
@@ -907,7 +867,6 @@ function actionConfig(array $data): array
|
||||
// debug, cache, SEF, editor, etc.). Fall back to existing config
|
||||
// for legacy/unsanitized backups, or build from scratch if neither exists.
|
||||
$basePath = is_file($bakPath) ? $bakPath : (is_file($configPath) ? $configPath : null);
|
||||
error_log('MokoRestore: Config — base template: ' . ($basePath ?? 'none (building from scratch)'));
|
||||
|
||||
if ($basePath !== null) {
|
||||
$config = file_get_contents($basePath);
|
||||
@@ -960,12 +919,9 @@ function actionConfig(array $data): array
|
||||
}
|
||||
|
||||
if (file_put_contents($configPath, $config) === false) {
|
||||
error_log('MokoRestore: Config — FAILED to write ' . $configPath);
|
||||
return ['success' => false, 'message' => 'Failed to write Joomla config file — check directory permissions'];
|
||||
}
|
||||
|
||||
error_log('MokoRestore: Config — written to ' . $configPath . ' (' . filesize($configPath) . ' bytes)');
|
||||
|
||||
// Remove .bak after successful rebuild
|
||||
if (is_file($bakPath)) {
|
||||
@unlink($bakPath);
|
||||
@@ -1219,8 +1175,6 @@ function actionResetAdmin(array $data): array
|
||||
$userId = (int) ($data['admin_id'] ?? 0);
|
||||
$password = $data['new_password'] ?? '';
|
||||
|
||||
error_log('MokoRestore: Admin password reset — user_id=' . $userId);
|
||||
|
||||
if ($userId < 1 || strlen($password) < 8) {
|
||||
throw new RuntimeException('Select an admin and enter a password (8+ characters)');
|
||||
}
|
||||
@@ -1234,7 +1188,6 @@ function actionResetAdmin(array $data): array
|
||||
throw new RuntimeException('User not found or password unchanged');
|
||||
}
|
||||
|
||||
error_log('MokoRestore: Admin password reset — success');
|
||||
return ['success' => true, 'message' => 'Admin password updated successfully'];
|
||||
}
|
||||
|
||||
@@ -1244,7 +1197,6 @@ function actionPostRestore(array $data): array
|
||||
$prefix = getValidatedPrefix($data);
|
||||
$tasks = json_decode($data['tasks'] ?? '[]', true) ?: [];
|
||||
$results = [];
|
||||
error_log('MokoRestore: Post-restore — ' . count($tasks) . ' task(s): ' . implode(', ', $tasks));
|
||||
|
||||
foreach ($tasks as $task) {
|
||||
try {
|
||||
@@ -1367,7 +1319,6 @@ function actionProvision(array $data): array
|
||||
$prefix = getValidatedPrefix($data);
|
||||
$tasks = json_decode($data['tasks'] ?? '[]', true) ?: [];
|
||||
$results = [];
|
||||
error_log('MokoRestore: Provisioning — ' . count($tasks) . ' task(s): ' . implode(', ', $tasks));
|
||||
|
||||
foreach ($tasks as $task) {
|
||||
try {
|
||||
@@ -1444,24 +1395,16 @@ function actionProvision(array $data): array
|
||||
|
||||
function actionCleanup(): array
|
||||
{
|
||||
error_log('MokoRestore: Cleanup started');
|
||||
$removed = [];
|
||||
|
||||
foreach (['database.sql', 'site-backup.zip', 'mokorestore-security.php'] as $file) {
|
||||
foreach (['database.sql', 'site-backup.zip'] as $file) {
|
||||
$path = RESTORE_DIR . '/' . $file;
|
||||
|
||||
if (is_file($path)) {
|
||||
if (@unlink($path)) {
|
||||
$removed[] = $file;
|
||||
error_log('MokoRestore: Cleanup — removed ' . $file);
|
||||
} else {
|
||||
error_log('MokoRestore: Cleanup — FAILED to remove ' . $file);
|
||||
}
|
||||
if (is_file($path) && @unlink($path)) {
|
||||
$removed[] = $file;
|
||||
}
|
||||
}
|
||||
|
||||
error_log('MokoRestore: Cleanup complete — removed ' . count($removed) . ' file(s)');
|
||||
|
||||
return [
|
||||
'success' => true,
|
||||
'message' => 'Removed: ' . (empty($removed) ? '(none)' : implode(', ', $removed))
|
||||
@@ -1627,14 +1570,14 @@ body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,'Helvetica N
|
||||
<!-- Step 0: Security Verification -->
|
||||
<div class="mr-panel <?php echo $securityVerified ? '' : 'visible'; ?>" id="panel0">
|
||||
<h2>Security Verification</h2>
|
||||
<p class="mr-desc">To prevent unauthorized access, enter the security code from the file <code>mokorestore-security.php</code> in your site root.</p>
|
||||
<p class="mr-desc">To prevent unauthorized access, enter the security code from the file <code>.mokorestore-security.php</code> in your site root.</p>
|
||||
<div style="border:1px solid #e2e8f0;border-radius:8px;padding:1.25rem;margin-bottom:1.25rem;background:#f8fafc">
|
||||
<div style="font-weight:600;font-size:0.9rem;color:#334155;margin-bottom:1rem;display:flex;align-items:center;gap:0.5rem">
|
||||
<span style="font-size:1.1rem">🔒</span> How to find the code
|
||||
</div>
|
||||
<ol style="margin:0;padding-left:1.25rem;color:#475569;font-size:0.9rem;line-height:1.6">
|
||||
<li>Connect to your server via FTP, SSH, or file manager</li>
|
||||
<li>Open <code>mokorestore-security.php</code> in the site root directory</li>
|
||||
<li>Open <code>.mokorestore-security.php</code> in the site root directory</li>
|
||||
<li>Copy the 8-character code and enter it below</li>
|
||||
</ol>
|
||||
</div>
|
||||
|
||||
@@ -451,6 +451,7 @@ class SteppedBackupEngine
|
||||
$db = Factory::getDbo();
|
||||
$remoteFilename = '';
|
||||
$uploadFailed = false;
|
||||
$uploadErrors = $session->uploadErrors ?? [];
|
||||
|
||||
if (!empty($session->remoteDestinations)) {
|
||||
// ── Multi-remote path ──────────────────────────────────
|
||||
@@ -485,13 +486,16 @@ class SteppedBackupEngine
|
||||
}
|
||||
} else {
|
||||
$uploadFailed = true;
|
||||
$uploadErrors[] = ($title) . ': ' . $result['message'];
|
||||
$session->log(' WARNING: Upload failed: ' . $result['message']);
|
||||
}
|
||||
} catch (\Throwable $e) {
|
||||
$uploadFailed = true;
|
||||
$uploadErrors[] = ($title ?? $type) . ': ' . $e->getMessage();
|
||||
$session->log(' WARNING: Upload exception: ' . $e->getMessage());
|
||||
}
|
||||
|
||||
$session->uploadErrors = $uploadErrors;
|
||||
$session->remoteIndex++;
|
||||
$session->currentStep++;
|
||||
|
||||
@@ -517,7 +521,7 @@ class SteppedBackupEngine
|
||||
$session->statusMessage = $uploadFailed
|
||||
? 'Backup complete (some remote uploads failed — local archive preserved)'
|
||||
: 'Backup complete';
|
||||
$this->completeRecord($session, $uploadFailed);
|
||||
$this->completeRecord($session, $uploadFailed, $uploadErrors);
|
||||
}
|
||||
} else {
|
||||
// ── Legacy single-remote fallback ──────────────────────
|
||||
@@ -557,11 +561,13 @@ class SteppedBackupEngine
|
||||
}
|
||||
} else {
|
||||
$uploadFailed = true;
|
||||
$uploadErrors[] = $session->remoteStorage . ': ' . $result['message'];
|
||||
$session->log('WARNING: Remote upload failed: ' . $result['message']);
|
||||
$session->log('Local backup is preserved.');
|
||||
}
|
||||
} catch (\Throwable $e) {
|
||||
$uploadFailed = true;
|
||||
$uploadErrors[] = $session->remoteStorage . ': ' . $e->getMessage();
|
||||
$session->log('WARNING: Remote upload threw an exception: ' . $e->getMessage());
|
||||
$session->log('Local backup is preserved.');
|
||||
}
|
||||
@@ -580,7 +586,7 @@ class SteppedBackupEngine
|
||||
$session->statusMessage = $uploadFailed
|
||||
? 'Backup complete (remote upload failed — local archive preserved)'
|
||||
: 'Backup complete';
|
||||
$this->completeRecord($session, $uploadFailed);
|
||||
$this->completeRecord($session, $uploadFailed, $uploadErrors);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -631,7 +637,7 @@ class SteppedBackupEngine
|
||||
/**
|
||||
* 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();
|
||||
$logContent = implode("\n", $session->log);
|
||||
@@ -645,13 +651,23 @@ class SteppedBackupEngine
|
||||
$totalSize = is_file($session->archivePath) ? filesize($session->archivePath) : 0;
|
||||
$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) [
|
||||
'id' => $session->recordId,
|
||||
'status' => 'complete',
|
||||
'backupend' => date('Y-m-d H:i:s'),
|
||||
'total_size' => $totalSize,
|
||||
'checksum' => $checksum,
|
||||
'log' => $logContent,
|
||||
'id' => $session->recordId,
|
||||
'status' => $uploadFailed ? 'warning' : 'complete',
|
||||
'status_message' => $statusMessage,
|
||||
'backupend' => date('Y-m-d H:i:s'),
|
||||
'total_size' => $totalSize,
|
||||
'checksum' => $checksum,
|
||||
'log' => $logContent,
|
||||
];
|
||||
|
||||
$db->updateObject('#__mokosuitebackup_records', $update, 'id');
|
||||
@@ -889,16 +905,7 @@ class SteppedBackupEngine
|
||||
*/
|
||||
private function createUploaderFromParams(string $type, array $params): RemoteUploaderInterface
|
||||
{
|
||||
$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;
|
||||
$fake = (object) $params;
|
||||
|
||||
return match ($type) {
|
||||
'ftp' => new FtpUploader($fake),
|
||||
|
||||
@@ -60,6 +60,7 @@ class SteppedSession
|
||||
// Multi-remote destinations (loaded from #__mokosuitebackup_remotes)
|
||||
public array $remoteDestinations = [];
|
||||
public int $remoteIndex = 0;
|
||||
public array $uploadErrors = [];
|
||||
|
||||
// Progress
|
||||
public int $totalSteps = 0;
|
||||
|
||||
@@ -30,7 +30,7 @@ class DashboardModel extends BaseDatabaseModel
|
||||
->select('r.*, p.title AS profile_title')
|
||||
->from($db->quoteName('#__mokosuitebackup_records', 'r'))
|
||||
->join('LEFT', $db->quoteName('#__mokosuitebackup_profiles', 'p') . ' ON p.id = r.profile_id')
|
||||
->where($db->quoteName('r.status') . ' = ' . $db->quote('complete'))
|
||||
->where($db->quoteName('r.status') . ' IN (' . $db->quote('complete') . ', ' . $db->quote('warning') . ')')
|
||||
->order($db->quoteName('r.backupend') . ' DESC');
|
||||
$db->setQuery($query, 0, 1);
|
||||
|
||||
@@ -75,7 +75,7 @@ class DashboardModel extends BaseDatabaseModel
|
||||
->select('COUNT(*) AS total_count')
|
||||
->select('COALESCE(SUM(' . $db->quoteName('total_size') . '), 0) AS total_size')
|
||||
->from($db->quoteName('#__mokosuitebackup_records'))
|
||||
->where($db->quoteName('status') . ' = ' . $db->quote('complete'));
|
||||
->where($db->quoteName('status') . ' IN (' . $db->quote('complete') . ', ' . $db->quote('warning') . ')');
|
||||
$db->setQuery($query);
|
||||
$stats = $db->loadObject();
|
||||
|
||||
@@ -274,7 +274,7 @@ class DashboardModel extends BaseDatabaseModel
|
||||
->select('COALESCE(SUM(r.total_size), 0) AS total_size')
|
||||
->from($db->quoteName('#__mokosuitebackup_records', 'r'))
|
||||
->join('LEFT', $db->quoteName('#__mokosuitebackup_profiles', 'p') . ' ON p.id = r.profile_id')
|
||||
->where($db->quoteName('r.status') . ' = ' . $db->quote('complete'))
|
||||
->where($db->quoteName('r.status') . ' IN (' . $db->quote('complete') . ', ' . $db->quote('warning') . ')')
|
||||
->group($db->quoteName('r.profile_id'))
|
||||
->order('total_size DESC');
|
||||
$db->setQuery($query);
|
||||
|
||||
@@ -30,12 +30,23 @@ $ajaxUrl = Route::_('index.php?option=com_mokosuitebackup&format=json', false)
|
||||
<?php
|
||||
$statusClass = match ($this->item->status) {
|
||||
'complete' => 'badge bg-success',
|
||||
'warning' => 'badge bg-warning text-dark',
|
||||
'running' => 'badge bg-info',
|
||||
'fail' => 'badge bg-danger',
|
||||
default => 'badge bg-secondary',
|
||||
};
|
||||
$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>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -94,7 +105,7 @@ $ajaxUrl = Route::_('index.php?option=com_mokosuitebackup&format=json', false)
|
||||
</tbody>
|
||||
</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 -->
|
||||
<h4 class="mt-4">
|
||||
<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;
|
||||
});
|
||||
|
||||
<?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
|
||||
function formatFileSize(bytes) {
|
||||
if (bytes === 0) return '0 B';
|
||||
|
||||
@@ -92,12 +92,23 @@ $listDirn = $this->escape($this->state->get('list.direction'));
|
||||
<?php
|
||||
$statusClass = match ($item->status) {
|
||||
'complete' => 'badge bg-success',
|
||||
'warning' => 'badge bg-warning text-dark',
|
||||
'running' => 'badge bg-info',
|
||||
'fail' => 'badge bg-danger',
|
||||
default => 'badge bg-secondary',
|
||||
};
|
||||
$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>
|
||||
<?php echo $this->escape($item->backup_type); ?>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
-->
|
||||
<extension type="module" client="administrator" method="upgrade">
|
||||
<name>mod_mokosuitebackup_cpanel</name>
|
||||
<version>02.52.19</version>
|
||||
<version>01.45.04</version>
|
||||
<creationDate>2026-06-23</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
-->
|
||||
<extension type="plugin" group="actionlog" method="upgrade">
|
||||
<name>Action Log - MokoSuiteBackup</name>
|
||||
<version>02.52.19</version>
|
||||
<version>01.45.04</version>
|
||||
<creationDate>2026-06-04</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
-->
|
||||
<extension type="plugin" group="console" method="upgrade">
|
||||
<name>Console - MokoSuiteBackup</name>
|
||||
<version>02.52.19</version>
|
||||
<version>01.45.04</version>
|
||||
<creationDate>2026-06-04</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
-->
|
||||
<extension type="plugin" group="content" method="upgrade">
|
||||
<name>Content - MokoSuiteBackup</name>
|
||||
<version>02.52.19</version>
|
||||
<version>01.45.04</version>
|
||||
<creationDate>2026-06-04</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -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.52.19</version>
|
||||
<version>01.45.04</version>
|
||||
<creationDate>2026-06-02</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
-->
|
||||
<extension type="plugin" group="system" method="upgrade">
|
||||
<name>System - MokoSuiteBackup</name>
|
||||
<version>02.52.19</version>
|
||||
<version>01.45.04</version>
|
||||
<creationDate>2026-06-02</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -28,7 +28,6 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
|
||||
return [
|
||||
'onAfterInitialise' => 'onAfterInitialise',
|
||||
'onAfterRoute' => 'onAfterRoute',
|
||||
'onBeforeRender' => 'onBeforeRender',
|
||||
'onExtensionBeforeUpdate' => 'onExtensionBeforeUpdate',
|
||||
'onExtensionBeforeUninstall' => 'onExtensionBeforeUninstall',
|
||||
];
|
||||
@@ -260,6 +259,8 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
|
||||
$maxCount = (int) $profile->retention_count > 0 ? (int) $profile->retention_count : $globalMaxCount;
|
||||
$pid = (int) $profile->id;
|
||||
|
||||
$completedStatuses = '(' . $db->quote('complete') . ', ' . $db->quote('warning') . ')';
|
||||
|
||||
// Delete by age for this profile
|
||||
$cutoff = date('Y-m-d H:i:s', strtotime("-{$maxAge} days"));
|
||||
$query = $db->getQuery(true)
|
||||
@@ -267,7 +268,7 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
|
||||
->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'));
|
||||
->where($db->quoteName('status') . ' IN ' . $completedStatuses);
|
||||
$db->setQuery($query);
|
||||
$expired = $db->loadObjectList();
|
||||
|
||||
@@ -280,7 +281,7 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
|
||||
->select('COUNT(*)')
|
||||
->from($db->quoteName('#__mokosuitebackup_records'))
|
||||
->where($db->quoteName('profile_id') . ' = ' . $pid)
|
||||
->where($db->quoteName('status') . ' = ' . $db->quote('complete'));
|
||||
->where($db->quoteName('status') . ' IN ' . $completedStatuses);
|
||||
$db->setQuery($query);
|
||||
$totalCount = (int) $db->loadResult();
|
||||
|
||||
@@ -290,7 +291,7 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
|
||||
->select('id, absolute_path')
|
||||
->from($db->quoteName('#__mokosuitebackup_records'))
|
||||
->where($db->quoteName('profile_id') . ' = ' . $pid)
|
||||
->where($db->quoteName('status') . ' = ' . $db->quote('complete'))
|
||||
->where($db->quoteName('status') . ' IN ' . $completedStatuses)
|
||||
->order($db->quoteName('backupstart') . ' ASC');
|
||||
$db->setQuery($query, 0, $excess);
|
||||
$oldest = $db->loadObjectList();
|
||||
@@ -307,7 +308,7 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
|
||||
->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'));
|
||||
->where($db->quoteName('r.status') . ' IN (' . $db->quote('complete') . ', ' . $db->quote('warning') . ')');
|
||||
$db->setQuery($query);
|
||||
$orphans = $db->loadObjectList();
|
||||
|
||||
@@ -348,52 +349,10 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
|
||||
}
|
||||
|
||||
/**
|
||||
* Inject JavaScript on installer/update pages to show a backup progress
|
||||
* modal before extension updates proceed.
|
||||
*/
|
||||
public function onBeforeRender(Event $event): void
|
||||
{
|
||||
$app = $this->getApplication();
|
||||
|
||||
if (!$app->isClient('administrator')) {
|
||||
return;
|
||||
}
|
||||
|
||||
$option = $app->input->getCmd('option', '');
|
||||
$view = $app->input->getCmd('view', '');
|
||||
|
||||
if ($option !== 'com_installer' && $option !== 'com_joomlaupdate') {
|
||||
return;
|
||||
}
|
||||
|
||||
$params = ComponentHelper::getParams('com_mokosuitebackup');
|
||||
|
||||
if (!(int) $params->get('backup_before_update', 0)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$profileId = (int) $params->get('default_profile', 1);
|
||||
$token = \Joomla\CMS\Session\Session::getFormToken();
|
||||
|
||||
$js = $this->getPreUpdateBackupScript($profileId, $token);
|
||||
|
||||
$app->getDocument()->addScriptDeclaration($js);
|
||||
}
|
||||
|
||||
/**
|
||||
* Run a backup before any extension is updated (server-side fallback
|
||||
* for CLI/API updates where JavaScript is not available).
|
||||
* Run a backup before any extension is updated.
|
||||
*/
|
||||
public function onExtensionBeforeUpdate(Event $event): void
|
||||
{
|
||||
$session = Factory::getSession();
|
||||
|
||||
if ($session->get('mokosuitebackup.preupdate_js_done', false)) {
|
||||
$session->set('mokosuitebackup.preupdate_js_done', false);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$this->runPreActionBackup('backup_before_update', 'Pre-update backup');
|
||||
}
|
||||
|
||||
@@ -451,161 +410,6 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Build the inline JavaScript that intercepts extension update actions
|
||||
* and runs a stepped backup with a progress modal first.
|
||||
*/
|
||||
private function getPreUpdateBackupScript(int $profileId, string $token): string
|
||||
{
|
||||
$baseUrl = \Joomla\CMS\Uri\Uri::base() . 'index.php?option=com_mokosuitebackup&format=json&' . $token . '=1';
|
||||
|
||||
return <<<JS
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
var msbOrigSubmit = Joomla.submitbutton;
|
||||
var msbBackupRunning = false;
|
||||
var msbPendingTask = null;
|
||||
|
||||
// Create modal
|
||||
var msbModal = document.createElement('div');
|
||||
msbModal.id = 'msbPreUpdateModal';
|
||||
msbModal.className = 'modal fade';
|
||||
msbModal.setAttribute('tabindex', '-1');
|
||||
msbModal.setAttribute('data-bs-backdrop', 'static');
|
||||
msbModal.setAttribute('data-bs-keyboard', 'false');
|
||||
msbModal.innerHTML = '<div class="modal-dialog modal-dialog-centered"><div class="modal-content">'
|
||||
+ '<div class="modal-header"><h5 class="modal-title"><span class="icon-archive me-2"></span>Pre-Update Backup</h5></div>'
|
||||
+ '<div class="modal-body">'
|
||||
+ '<p id="msbStatusText">Creating a backup before updating...</p>'
|
||||
+ '<div class="progress" style="height:24px"><div id="msbProgressBar" class="progress-bar progress-bar-striped progress-bar-animated" style="width:0%">0%</div></div>'
|
||||
+ '<div id="msbLogArea" style="max-height:120px;overflow-y:auto;font-size:0.8rem;color:#64748b;margin-top:12px;font-family:monospace;white-space:pre-wrap"></div>'
|
||||
+ '</div>'
|
||||
+ '<div class="modal-footer" id="msbFooter" style="display:none">'
|
||||
+ '<button type="button" class="btn btn-secondary" id="msbSkipBtn">Skip & Update</button>'
|
||||
+ '<button type="button" class="btn btn-danger" id="msbCancelBtn">Cancel</button>'
|
||||
+ '</div>'
|
||||
+ '</div></div>';
|
||||
document.body.appendChild(msbModal);
|
||||
|
||||
var bsModal = new bootstrap.Modal(msbModal);
|
||||
|
||||
function msbUpdateProgress(pct, msg) {
|
||||
var bar = document.getElementById('msbProgressBar');
|
||||
bar.style.width = pct + '%';
|
||||
bar.textContent = pct + '%';
|
||||
if (msg) document.getElementById('msbStatusText').textContent = msg;
|
||||
}
|
||||
|
||||
function msbLog(msg) {
|
||||
var log = document.getElementById('msbLogArea');
|
||||
log.textContent += msg + '\\n';
|
||||
log.scrollTop = log.scrollHeight;
|
||||
}
|
||||
|
||||
function msbShowFooter() {
|
||||
document.getElementById('msbFooter').style.display = '';
|
||||
}
|
||||
|
||||
function msbFinish(success) {
|
||||
msbBackupRunning = false;
|
||||
if (success && msbPendingTask) {
|
||||
msbUpdateProgress(100, 'Backup complete — proceeding with update...');
|
||||
// Mark JS backup done so server-side handler skips
|
||||
fetch('{$baseUrl}&task=ajax.markPreUpdateDone', {method:'POST', headers:{'X-Requested-With':'XMLHttpRequest'}});
|
||||
setTimeout(function() {
|
||||
bsModal.hide();
|
||||
msbOrigSubmit.call(Joomla, msbPendingTask);
|
||||
msbPendingTask = null;
|
||||
}, 800);
|
||||
}
|
||||
}
|
||||
|
||||
function msbRunStep(sessionId) {
|
||||
fetch('{$baseUrl}&task=ajax.step&session_id=' + encodeURIComponent(sessionId), {
|
||||
method: 'POST',
|
||||
headers: {'X-Requested-With': 'XMLHttpRequest'}
|
||||
})
|
||||
.then(function(r) { return r.json(); })
|
||||
.then(function(data) {
|
||||
if (data.error) {
|
||||
msbUpdateProgress(data.progress || 0, 'Backup error: ' + data.message);
|
||||
msbLog('ERROR: ' + data.message);
|
||||
msbShowFooter();
|
||||
return;
|
||||
}
|
||||
msbUpdateProgress(data.progress || 0, data.message || data.phase || 'Working...');
|
||||
if (data.message) msbLog(data.message);
|
||||
if (data.done) {
|
||||
msbFinish(true);
|
||||
} else {
|
||||
msbRunStep(sessionId);
|
||||
}
|
||||
})
|
||||
.catch(function(err) {
|
||||
msbUpdateProgress(0, 'Backup request failed');
|
||||
msbLog('Network error: ' + err.message);
|
||||
msbShowFooter();
|
||||
});
|
||||
}
|
||||
|
||||
function msbStartBackup() {
|
||||
msbBackupRunning = true;
|
||||
msbUpdateProgress(0, 'Initializing backup...');
|
||||
msbLog('Starting pre-update backup (profile {$profileId})...');
|
||||
|
||||
fetch('{$baseUrl}&task=ajax.init&profile_id={$profileId}&description=Pre-update+backup', {
|
||||
method: 'POST',
|
||||
headers: {'X-Requested-With': 'XMLHttpRequest'}
|
||||
})
|
||||
.then(function(r) { return r.json(); })
|
||||
.then(function(data) {
|
||||
if (data.error) {
|
||||
msbUpdateProgress(0, 'Backup init failed: ' + data.message);
|
||||
msbLog('INIT ERROR: ' + data.message);
|
||||
msbShowFooter();
|
||||
return;
|
||||
}
|
||||
msbLog('Backup initialized — ' + data.message);
|
||||
msbUpdateProgress(data.progress || 5, data.message || 'Running...');
|
||||
msbRunStep(data.session_id);
|
||||
})
|
||||
.catch(function(err) {
|
||||
msbUpdateProgress(0, 'Could not start backup');
|
||||
msbLog('Network error: ' + err.message);
|
||||
msbShowFooter();
|
||||
});
|
||||
}
|
||||
|
||||
// Intercept Joomla toolbar submit
|
||||
Joomla.submitbutton = function(task) {
|
||||
if ((task === 'update.update' || task === 'update.install') && !msbBackupRunning) {
|
||||
msbPendingTask = task;
|
||||
bsModal.show();
|
||||
msbStartBackup();
|
||||
return;
|
||||
}
|
||||
msbOrigSubmit.call(Joomla, task);
|
||||
};
|
||||
|
||||
// Skip button — proceed without backup
|
||||
document.getElementById('msbSkipBtn').addEventListener('click', function() {
|
||||
bsModal.hide();
|
||||
msbBackupRunning = false;
|
||||
if (msbPendingTask) {
|
||||
msbOrigSubmit.call(Joomla, msbPendingTask);
|
||||
msbPendingTask = null;
|
||||
}
|
||||
});
|
||||
|
||||
// Cancel button — abort everything
|
||||
document.getElementById('msbCancelBtn').addEventListener('click', function() {
|
||||
bsModal.hide();
|
||||
msbBackupRunning = false;
|
||||
msbPendingTask = null;
|
||||
});
|
||||
});
|
||||
JS;
|
||||
}
|
||||
|
||||
/**
|
||||
* Send a JSON response and terminate — used by web cron handler.
|
||||
*/
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
-->
|
||||
<extension type="plugin" group="task" method="upgrade">
|
||||
<name>Task - MokoSuiteBackup</name>
|
||||
<version>02.52.19</version>
|
||||
<version>01.45.04</version>
|
||||
<creationDate>2026-06-02</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
-->
|
||||
<extension type="plugin" group="webservices" method="upgrade">
|
||||
<name>Web Services - MokoSuiteBackup</name>
|
||||
<version>02.52.19</version>
|
||||
<version>01.45.04</version>
|
||||
<creationDate>2026-06-02</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<extension type="package" method="upgrade">
|
||||
<name>Package - MokoSuiteBackup</name>
|
||||
<packagename>mokosuitebackup</packagename>
|
||||
<version>02.52.19</version>
|
||||
<version>01.45.04</version>
|
||||
<creationDate>2026-06-02</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
Reference in New Issue
Block a user