Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f560b0c63e | |||
| 430b25cea5 |
@@ -5,7 +5,7 @@
|
|||||||
# FILE INFORMATION
|
# FILE INFORMATION
|
||||||
# DEFGROUP: Gitea.Workflow
|
# DEFGROUP: Gitea.Workflow
|
||||||
# INGROUP: mokocli.Automation
|
# INGROUP: mokocli.Automation
|
||||||
# VERSION: 01.00.00
|
# VERSION: 02.52.19
|
||||||
# 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: 02.52.18
|
VERSION: 02.52.19
|
||||||
BRIEF: Security vulnerability reporting and handling policy
|
BRIEF: Security vulnerability reporting and handling policy
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
-->
|
-->
|
||||||
<extension type="component" method="upgrade">
|
<extension type="component" method="upgrade">
|
||||||
<name>MokoSuiteBackup</name>
|
<name>MokoSuiteBackup</name>
|
||||||
<version>02.52.18</version>
|
<version>02.52.19</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>
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
/* 02.52.19 — no schema changes */
|
||||||
@@ -84,6 +84,24 @@ class AjaxController extends BaseController
|
|||||||
$this->sendJson($result);
|
$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.
|
* Browse server directories for the folder picker field.
|
||||||
* POST: task=ajax.browseDir&path=/some/path
|
* POST: task=ajax.browseDir&path=/some/path
|
||||||
|
|||||||
@@ -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>02.52.18</version>
|
<version>02.52.19</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>02.52.18</version>
|
<version>02.52.19</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>02.52.18</version>
|
<version>02.52.19</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>02.52.18</version>
|
<version>02.52.19</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>02.52.18</version>
|
<version>02.52.19</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>02.52.18</version>
|
<version>02.52.19</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>
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
|
|||||||
return [
|
return [
|
||||||
'onAfterInitialise' => 'onAfterInitialise',
|
'onAfterInitialise' => 'onAfterInitialise',
|
||||||
'onAfterRoute' => 'onAfterRoute',
|
'onAfterRoute' => 'onAfterRoute',
|
||||||
|
'onBeforeRender' => 'onBeforeRender',
|
||||||
'onExtensionBeforeUpdate' => 'onExtensionBeforeUpdate',
|
'onExtensionBeforeUpdate' => 'onExtensionBeforeUpdate',
|
||||||
'onExtensionBeforeUninstall' => 'onExtensionBeforeUninstall',
|
'onExtensionBeforeUninstall' => 'onExtensionBeforeUninstall',
|
||||||
];
|
];
|
||||||
@@ -347,10 +348,52 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Run a backup before any extension is updated.
|
* 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).
|
||||||
*/
|
*/
|
||||||
public function onExtensionBeforeUpdate(Event $event): void
|
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');
|
$this->runPreActionBackup('backup_before_update', 'Pre-update backup');
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -408,6 +451,161 @@ 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.
|
* Send a JSON response and terminate — used by web cron handler.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -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>02.52.18</version>
|
<version>02.52.19</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>02.52.18</version>
|
<version>02.52.19</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>02.52.18</version>
|
<version>02.52.19</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