Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4a3826314f | |||
| 1f387039a0 |
@@ -5,7 +5,7 @@
|
|||||||
# FILE INFORMATION
|
# FILE INFORMATION
|
||||||
# DEFGROUP: Gitea.Workflow
|
# DEFGROUP: Gitea.Workflow
|
||||||
# INGROUP: mokocli.Automation
|
# INGROUP: mokocli.Automation
|
||||||
# VERSION: 01.45.08
|
# 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"
|
||||||
|
|||||||
+1
-1
@@ -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.08
|
VERSION: 01.45.04
|
||||||
BRIEF: Security vulnerability reporting and handling policy
|
BRIEF: Security vulnerability reporting and handling policy
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
|||||||
Submodule source/packages/MokoSuiteClient updated: aa52076cb0...ff1ee76d71
@@ -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.08</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`),
|
||||||
|
|||||||
@@ -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 @@
|
|||||||
/* 01.45.08 — 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,
|
||||||
|
|||||||
@@ -451,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 ──────────────────────────────────
|
||||||
@@ -485,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++;
|
||||||
|
|
||||||
@@ -517,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 ──────────────────────
|
||||||
@@ -557,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.');
|
||||||
}
|
}
|
||||||
@@ -580,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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -631,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);
|
||||||
@@ -645,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.08</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.08</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.08</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.08</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.08</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.08</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();
|
||||||
|
|
||||||
@@ -390,19 +392,11 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
|
|||||||
$profileId = (int) $params->get('default_profile', 1);
|
$profileId = (int) $params->get('default_profile', 1);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$app = Factory::getApplication();
|
|
||||||
$app->enqueueMessage('MokoSuiteBackup: ' . $description . ' in progress…', 'info');
|
|
||||||
|
|
||||||
$engine = new BackupEngine();
|
$engine = new BackupEngine();
|
||||||
$result = $engine->run($profileId, $description, 'preaction');
|
$result = $engine->run($profileId, $description, 'preaction');
|
||||||
|
|
||||||
if ($result['success']) {
|
if (!$result['success']) {
|
||||||
$app->enqueueMessage(
|
Factory::getApplication()->enqueueMessage(
|
||||||
'MokoSuiteBackup: ' . $description . ' completed successfully.',
|
|
||||||
'success'
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
$app->enqueueMessage(
|
|
||||||
'MokoSuiteBackup: ' . $description . ' failed — ' . $result['message'],
|
'MokoSuiteBackup: ' . $description . ' failed — ' . $result['message'],
|
||||||
'warning'
|
'warning'
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -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.08</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.08</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>
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<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.08</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>
|
||||||
|
|||||||
Reference in New Issue
Block a user