Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f560b0c63e | |||
| 430b25cea5 |
@@ -0,0 +1,126 @@
|
||||
# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
#
|
||||
# FILE INFORMATION
|
||||
# DEFGROUP: Gitea.Workflow
|
||||
# INGROUP: MokoStandards.Deploy
|
||||
# REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards-API
|
||||
# PATH: /templates/workflows/joomla/deploy-manual.yml.template
|
||||
# VERSION: 04.07.00
|
||||
# BRIEF: Manual SFTP deploy to dev server for Joomla repos
|
||||
|
||||
name: "Universal: Deploy to Dev (Manual)"
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
clear_remote:
|
||||
description: 'Delete all remote files before uploading'
|
||||
required: false
|
||||
default: 'false'
|
||||
type: boolean
|
||||
|
||||
env:
|
||||
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
name: SFTP Deploy to Dev
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
||||
|
||||
- name: Setup PHP
|
||||
run: |
|
||||
php -v && composer --version
|
||||
|
||||
- name: Setup MokoStandards tools
|
||||
env:
|
||||
MOKOGITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN || github.token }}
|
||||
MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN || github.token }}
|
||||
MOKO_CLONE_HOST: ${{ secrets.MOKOGITEA_TOKEN && 'git.mokoconsulting.tech/MokoConsulting' || 'github.com/mokoconsulting-tech' }}
|
||||
COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.MOKOGITEA_TOKEN || github.token }}"}}'
|
||||
run: |
|
||||
git clone --depth 1 --branch main --quiet \
|
||||
"https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/MokoStandards-API.git" \
|
||||
/tmp/mokostandards-api 2>/dev/null || true
|
||||
if [ -d "/tmp/mokostandards-api" ] && [ -f "/tmp/mokostandards-api/composer.json" ]; then
|
||||
cd /tmp/mokostandards-api && composer install --no-dev --no-interaction --quiet 2>/dev/null || true
|
||||
fi
|
||||
|
||||
- name: Check FTP configuration
|
||||
id: check
|
||||
env:
|
||||
HOST: ${{ vars.DEV_FTP_HOST }}
|
||||
PATH_VAR: ${{ vars.DEV_FTP_PATH }}
|
||||
PORT: ${{ vars.DEV_FTP_PORT }}
|
||||
run: |
|
||||
if [ -z "$HOST" ] || [ -z "$PATH_VAR" ]; then
|
||||
echo "DEV_FTP_HOST or DEV_FTP_PATH not configured -- cannot deploy"
|
||||
echo "skip=true" >> "$GITHUB_OUTPUT"
|
||||
exit 0
|
||||
fi
|
||||
echo "skip=false" >> "$GITHUB_OUTPUT"
|
||||
echo "host=$HOST" >> "$GITHUB_OUTPUT"
|
||||
|
||||
REMOTE="${PATH_VAR%/}"
|
||||
echo "remote=$REMOTE" >> "$GITHUB_OUTPUT"
|
||||
|
||||
[ -z "$PORT" ] && PORT="22"
|
||||
echo "port=$PORT" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: Deploy via SFTP
|
||||
if: steps.check.outputs.skip != 'true'
|
||||
env:
|
||||
SFTP_KEY: ${{ secrets.DEV_FTP_KEY }}
|
||||
SFTP_PASS: ${{ secrets.DEV_FTP_PASSWORD }}
|
||||
SFTP_USER: ${{ vars.DEV_FTP_USERNAME }}
|
||||
run: |
|
||||
SOURCE_DIR="src"
|
||||
[ ! -d "$SOURCE_DIR" ] && SOURCE_DIR="htdocs"
|
||||
[ ! -d "$SOURCE_DIR" ] && { echo "No src/ or htdocs/ -- nothing to deploy"; exit 0; }
|
||||
|
||||
printf '{"host":"%s","port":%s,"username":"%s","remotePath":"%s"' \
|
||||
"${{ steps.check.outputs.host }}" "${{ steps.check.outputs.port }}" "$SFTP_USER" "${{ steps.check.outputs.remote }}" \
|
||||
> /tmp/sftp-config.json
|
||||
|
||||
if [ -n "$SFTP_KEY" ]; then
|
||||
echo "$SFTP_KEY" > /tmp/deploy_key
|
||||
chmod 600 /tmp/deploy_key
|
||||
printf ',"privateKeyPath":"/tmp/deploy_key"}' >> /tmp/sftp-config.json
|
||||
else
|
||||
printf ',"password":"%s"}' "$SFTP_PASS" >> /tmp/sftp-config.json
|
||||
fi
|
||||
|
||||
DEPLOY_ARGS=(--path . --src-dir "$SOURCE_DIR" --config /tmp/sftp-config.json)
|
||||
[ "${{ inputs.clear_remote }}" = "true" ] && DEPLOY_ARGS+=(--clear-remote)
|
||||
|
||||
PLATFORM=$(php /tmp/mokostandards-api/cli/platform_detect.php --path . 2>/dev/null || true)
|
||||
if [ "$PLATFORM" = "waas-component" ] && [ -f "/tmp/mokostandards-api/deploy/deploy-joomla.php" ]; then
|
||||
php /tmp/mokostandards-api/deploy/deploy-joomla.php "${DEPLOY_ARGS[@]}"
|
||||
else
|
||||
php /tmp/mokostandards-api/deploy/deploy-sftp.php "${DEPLOY_ARGS[@]}"
|
||||
fi
|
||||
|
||||
rm -f /tmp/deploy_key /tmp/sftp-config.json
|
||||
|
||||
- name: Summary
|
||||
if: always()
|
||||
run: |
|
||||
if [ "${{ steps.check.outputs.skip }}" = "true" ]; then
|
||||
echo "### Deploy Skipped -- FTP not configured" >> $GITHUB_STEP_SUMMARY
|
||||
else
|
||||
echo "### Manual Dev Deploy Complete" >> $GITHUB_STEP_SUMMARY
|
||||
echo "" >> $GITHUB_STEP_SUMMARY
|
||||
echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY
|
||||
echo "|-------|-------|" >> $GITHUB_STEP_SUMMARY
|
||||
echo "| Host | \`${{ steps.check.outputs.host }}\` |" >> $GITHUB_STEP_SUMMARY
|
||||
echo "| Remote | \`${{ steps.check.outputs.remote }}\` |" >> $GITHUB_STEP_SUMMARY
|
||||
echo "| Clear | ${{ inputs.clear_remote }} |" >> $GITHUB_STEP_SUMMARY
|
||||
fi
|
||||
@@ -5,7 +5,7 @@
|
||||
# FILE INFORMATION
|
||||
# DEFGROUP: Gitea.Workflow
|
||||
# INGROUP: mokocli.Automation
|
||||
# VERSION: 02.52.22
|
||||
# VERSION: 02.52.19
|
||||
# BRIEF: Auto-create feature branch when an issue is opened
|
||||
|
||||
name: "Universal: Issue Branch"
|
||||
|
||||
+4
-16
@@ -1,25 +1,13 @@
|
||||
# Changelog
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## [02.52.22] --- 2026-06-30
|
||||
|
||||
## [02.52.22] --- 2026-06-30
|
||||
|
||||
### Added
|
||||
- Cancel Stalled toolbar button on Backup Records view to cancel backups stuck in "running" status
|
||||
- New ACL permission `mokosuitebackup.backup.cancel` for cancel stalled action
|
||||
- AJAX endpoint `ajax.cancelBackup` for programmatic/API cancel
|
||||
- Auto-timeout failsafe: preflight auto-cancels "running" backups older than 30 minutes
|
||||
- Pre-extension-update backup progress modal (Bootstrap 5 modal with stepped AJAX progress bar)
|
||||
|
||||
### Fixed
|
||||
- Pre-update backup ran synchronously with no browser feedback — page hung until complete
|
||||
- Stalled backups permanently blocked future backups for the same profile
|
||||
- Preflight error message now directs users to Cancel Stalled action
|
||||
## [02.52.18] --- 2026-06-30
|
||||
|
||||
## [02.52.18] --- 2026-06-30
|
||||
|
||||
## [01.45.00] --- 2026-06-28
|
||||
|
||||
|
||||
## [01.45.00] --- 2026-06-28
|
||||
|
||||
## [01.43.35] --- 2026-06-28
|
||||
|
||||
+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.22
|
||||
VERSION: 02.52.19
|
||||
BRIEF: Security vulnerability reporting and handling policy
|
||||
-->
|
||||
|
||||
|
||||
Submodule source/packages/MokoSuiteClient updated: c7e6670544...0a9125e519
@@ -15,6 +15,5 @@
|
||||
<action name="mokosuitebackup.backup.purge" title="COM_MOKOSUITEBACKUP_ACTION_BACKUP_PURGE" />
|
||||
<action name="mokosuitebackup.backup.compare" title="COM_MOKOSUITEBACKUP_ACTION_BACKUP_COMPARE" />
|
||||
<action name="mokosuitebackup.backup.browse" title="COM_MOKOSUITEBACKUP_ACTION_BACKUP_BROWSE" />
|
||||
<action name="mokosuitebackup.backup.cancel" title="COM_MOKOSUITEBACKUP_ACTION_BACKUP_CANCEL" />
|
||||
</section>
|
||||
</access>
|
||||
|
||||
@@ -450,8 +450,6 @@ COM_MOKOSUITEBACKUP_ACTION_BACKUP_COMPARE="Compare Backups"
|
||||
COM_MOKOSUITEBACKUP_ACTION_BACKUP_COMPARE_DESC="Allows users to compare two backup records side-by-side."
|
||||
COM_MOKOSUITEBACKUP_ACTION_BACKUP_BROWSE="Browse Archives"
|
||||
COM_MOKOSUITEBACKUP_ACTION_BACKUP_BROWSE_DESC="Allows users to view file listings inside backup archives without extracting."
|
||||
COM_MOKOSUITEBACKUP_ACTION_BACKUP_CANCEL="Cancel Stalled Backup"
|
||||
COM_MOKOSUITEBACKUP_ACTION_BACKUP_CANCEL_DESC="Allows users to cancel backup records stuck in running status and clean up partial archive files."
|
||||
|
||||
; Snapshot ACL
|
||||
COM_MOKOSUITEBACKUP_ACTION_SNAPSHOT_MANAGE="Manage Snapshots"
|
||||
@@ -502,12 +500,6 @@ COM_MOKOJOOMBACKUP_PURGE_INVALID_DATE="Invalid date. Please select a valid date.
|
||||
COM_MOKOJOOMBACKUP_PURGE_SUCCESS="%d backup(s) purged successfully."
|
||||
COM_MOKOJOOMBACKUP_PURGE_PARTIAL="%d backup(s) purged, but %d could not be deleted."
|
||||
|
||||
; Cancel Stalled Backup
|
||||
COM_MOKOJOOMBACKUP_TOOLBAR_CANCEL_STALLED="Cancel Stalled"
|
||||
COM_MOKOJOOMBACKUP_CANCEL_NONE_SELECTED="No backup records selected."
|
||||
COM_MOKOJOOMBACKUP_CANCEL_NONE_RUNNING="None of the selected backups are in running status."
|
||||
COM_MOKOJOOMBACKUP_CANCEL_SUCCESS="%d stalled backup(s) cancelled."
|
||||
|
||||
; Remote Destinations (multi-remote)
|
||||
COM_MOKOJOOMBACKUP_REMOTE_DESTINATIONS="Remote Destinations"
|
||||
COM_MOKOJOOMBACKUP_REMOTE_ADD="Add Destination"
|
||||
|
||||
@@ -116,13 +116,3 @@ COM_MOKOJOOMBACKUP_PURGE_NONE_FOUND="No completed backups found before the selec
|
||||
COM_MOKOJOOMBACKUP_PURGE_INVALID_DATE="Invalid date. Please select a valid date."
|
||||
COM_MOKOJOOMBACKUP_PURGE_SUCCESS="%d backup(s) purged successfully."
|
||||
COM_MOKOJOOMBACKUP_PURGE_PARTIAL="%d backup(s) purged, but %d could not be deleted."
|
||||
|
||||
; Cancel Stalled Backup
|
||||
COM_MOKOJOOMBACKUP_TOOLBAR_CANCEL_STALLED="Cancel Stalled"
|
||||
COM_MOKOJOOMBACKUP_CANCEL_NONE_SELECTED="No backup records selected."
|
||||
COM_MOKOJOOMBACKUP_CANCEL_NONE_RUNNING="None of the selected backups are in running status."
|
||||
COM_MOKOJOOMBACKUP_CANCEL_SUCCESS="%d stalled backup(s) cancelled."
|
||||
|
||||
; ACL - Cancel
|
||||
COM_MOKOSUITEBACKUP_ACTION_BACKUP_CANCEL="Cancel Stalled Backup"
|
||||
COM_MOKOSUITEBACKUP_ACTION_BACKUP_CANCEL_DESC="Allows users to cancel backup records stuck in running status and clean up partial archive files."
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
-->
|
||||
<extension type="component" method="upgrade">
|
||||
<name>MokoSuiteBackup</name>
|
||||
<version>02.52.22</version>
|
||||
<version>02.52.19</version>
|
||||
<creationDate>2026-06-02</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
/* 02.52.19 — no schema changes */
|
||||
@@ -1 +0,0 @@
|
||||
/* 02.52.20 — no schema changes */
|
||||
@@ -1 +0,0 @@
|
||||
/* 02.52.21 — no schema changes */
|
||||
@@ -1 +0,0 @@
|
||||
/* 02.52.22 — no schema changes */
|
||||
@@ -85,10 +85,11 @@ class AjaxController extends BaseController
|
||||
}
|
||||
|
||||
/**
|
||||
* Cancel a backup record stuck in "running" status.
|
||||
* POST: task=ajax.cancelBackup&id=123
|
||||
* 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 cancelBackup(): void
|
||||
public function markPreUpdateDone(): void
|
||||
{
|
||||
if (!Session::checkToken('get') && !Session::checkToken('post')) {
|
||||
$this->sendJson(['error' => true, 'message' => 'Invalid token'], 403);
|
||||
@@ -96,53 +97,9 @@ class AjaxController extends BaseController
|
||||
return;
|
||||
}
|
||||
|
||||
if (!$this->app->getIdentity()->authorise('mokosuitebackup.backup.cancel', 'com_mokosuitebackup')) {
|
||||
$this->sendJson(['error' => true, 'message' => 'Access denied'], 403);
|
||||
Factory::getSession()->set('mokosuitebackup.preupdate_js_done', true);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$id = $this->input->getInt('id', 0);
|
||||
|
||||
if (!$id) {
|
||||
$this->sendJson(['error' => true, 'message' => 'Missing record ID']);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$db = Factory::getDbo();
|
||||
$query = $db->getQuery(true)
|
||||
->select($db->quoteName(['id', 'status', 'absolute_path']))
|
||||
->from($db->quoteName('#__mokosuitebackup_records'))
|
||||
->where($db->quoteName('id') . ' = ' . $id);
|
||||
$db->setQuery($query);
|
||||
$record = $db->loadObject();
|
||||
|
||||
if (!$record) {
|
||||
$this->sendJson(['error' => true, 'message' => 'Record not found'], 404);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if ($record->status !== 'running') {
|
||||
$this->sendJson(['error' => true, 'message' => 'Backup is not in running status']);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$update = $db->getQuery(true)
|
||||
->update($db->quoteName('#__mokosuitebackup_records'))
|
||||
->set($db->quoteName('status') . ' = ' . $db->quote('fail'))
|
||||
->set($db->quoteName('backupend') . ' = ' . $db->quote(date('Y-m-d H:i:s')))
|
||||
->where($db->quoteName('id') . ' = ' . $id);
|
||||
$db->setQuery($update);
|
||||
$db->execute();
|
||||
|
||||
if (!empty($record->absolute_path) && is_file($record->absolute_path)) {
|
||||
@unlink($record->absolute_path);
|
||||
}
|
||||
|
||||
$this->sendJson(['error' => false, 'message' => 'Backup cancelled']);
|
||||
$this->sendJson(['success' => true]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -235,76 +235,6 @@ class BackupsController extends AdminController
|
||||
$this->setRedirect(Route::_('index.php?option=com_mokosuitebackup&view=backups', false));
|
||||
}
|
||||
|
||||
/**
|
||||
* Cancel selected backup records that are stuck in "running" status.
|
||||
*
|
||||
* Sets their status to "fail", cleans up partial archive files,
|
||||
* and destroys any associated stepped session.
|
||||
*/
|
||||
public function cancelStalled(): void
|
||||
{
|
||||
$this->checkToken();
|
||||
|
||||
if (!$this->app->getIdentity()->authorise('mokosuitebackup.backup.cancel', 'com_mokosuitebackup')) {
|
||||
$this->setMessage(Text::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'), 'error');
|
||||
$this->setRedirect(Route::_('index.php?option=com_mokosuitebackup&view=backups', false));
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$cid = $this->input->get('cid', [], 'array');
|
||||
|
||||
if (empty($cid)) {
|
||||
$this->setMessage(Text::_('COM_MOKOJOOMBACKUP_CANCEL_NONE_SELECTED'), 'warning');
|
||||
$this->setRedirect(Route::_('index.php?option=com_mokosuitebackup&view=backups', false));
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$db = $this->app->getContainer()->get('DatabaseDriver');
|
||||
$cancelled = 0;
|
||||
$skipped = 0;
|
||||
|
||||
foreach ($cid as $id) {
|
||||
$id = (int) $id;
|
||||
|
||||
$query = $db->getQuery(true)
|
||||
->select($db->quoteName(['id', 'status', 'absolute_path']))
|
||||
->from($db->quoteName('#__mokosuitebackup_records'))
|
||||
->where($db->quoteName('id') . ' = ' . $id);
|
||||
$db->setQuery($query);
|
||||
$record = $db->loadObject();
|
||||
|
||||
if (!$record || $record->status !== 'running') {
|
||||
$skipped++;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
$update = $db->getQuery(true)
|
||||
->update($db->quoteName('#__mokosuitebackup_records'))
|
||||
->set($db->quoteName('status') . ' = ' . $db->quote('fail'))
|
||||
->set($db->quoteName('backupend') . ' = ' . $db->quote(date('Y-m-d H:i:s')))
|
||||
->where($db->quoteName('id') . ' = ' . $id);
|
||||
$db->setQuery($update);
|
||||
$db->execute();
|
||||
|
||||
if (!empty($record->absolute_path) && is_file($record->absolute_path)) {
|
||||
@unlink($record->absolute_path);
|
||||
}
|
||||
|
||||
$cancelled++;
|
||||
}
|
||||
|
||||
if ($cancelled > 0) {
|
||||
$this->setMessage(Text::sprintf('COM_MOKOJOOMBACKUP_CANCEL_SUCCESS', $cancelled));
|
||||
} elseif ($skipped > 0) {
|
||||
$this->setMessage(Text::_('COM_MOKOJOOMBACKUP_CANCEL_NONE_RUNNING'), 'warning');
|
||||
}
|
||||
|
||||
$this->setRedirect(Route::_('index.php?option=com_mokosuitebackup&view=backups', false));
|
||||
}
|
||||
|
||||
/**
|
||||
* No-op target for the purge toolbar button.
|
||||
*
|
||||
|
||||
@@ -194,58 +194,22 @@ class PreflightCheck
|
||||
}
|
||||
}
|
||||
|
||||
private const STALE_TIMEOUT_MINUTES = 30;
|
||||
|
||||
/**
|
||||
* Check if another backup is already running for this profile.
|
||||
*
|
||||
* Backups running longer than STALE_TIMEOUT_MINUTES are automatically
|
||||
* marked as failed so they don't permanently block future runs.
|
||||
*/
|
||||
private function checkRunningBackup(object $profile, object $db): void
|
||||
{
|
||||
$query = $db->getQuery(true)
|
||||
->select($db->quoteName(['id', 'backupstart', 'absolute_path']))
|
||||
->select('COUNT(*)')
|
||||
->from($db->quoteName('#__mokosuitebackup_records'))
|
||||
->where($db->quoteName('profile_id') . ' = ' . (int) $profile->id)
|
||||
->where($db->quoteName('status') . ' = ' . $db->quote('running'));
|
||||
$db->setQuery($query);
|
||||
$rows = $db->loadObjectList();
|
||||
$running = (int) $db->loadResult();
|
||||
|
||||
if (empty($rows)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$cutoff = time() - (self::STALE_TIMEOUT_MINUTES * 60);
|
||||
$stillAlive = 0;
|
||||
|
||||
foreach ($rows as $row) {
|
||||
$started = strtotime($row->backupstart);
|
||||
|
||||
if ($started !== false && $started < $cutoff) {
|
||||
$update = $db->getQuery(true)
|
||||
->update($db->quoteName('#__mokosuitebackup_records'))
|
||||
->set($db->quoteName('status') . ' = ' . $db->quote('fail'))
|
||||
->set($db->quoteName('backupend') . ' = ' . $db->quote(date('Y-m-d H:i:s')))
|
||||
->where($db->quoteName('id') . ' = ' . (int) $row->id);
|
||||
$db->setQuery($update);
|
||||
$db->execute();
|
||||
|
||||
if (!empty($row->absolute_path) && is_file($row->absolute_path)) {
|
||||
@unlink($row->absolute_path);
|
||||
}
|
||||
|
||||
$this->warnings[] = 'Auto-cancelled stalled backup #' . $row->id
|
||||
. ' (started ' . $row->backupstart . ', exceeded '
|
||||
. self::STALE_TIMEOUT_MINUTES . ' min timeout)';
|
||||
} else {
|
||||
$stillAlive++;
|
||||
}
|
||||
}
|
||||
|
||||
if ($stillAlive > 0) {
|
||||
if ($running > 0) {
|
||||
$this->errors[] = 'Another backup is already running for profile: ' . $profile->title
|
||||
. ' — wait for it to finish or use Cancel Stalled from the Backup Records toolbar';
|
||||
. ' — wait for it to finish or delete the stale record';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -113,10 +113,6 @@ class HtmlView extends BaseHtmlView
|
||||
ToolbarHelper::custom('backups.compare', 'copy', '', 'COM_MOKOJOOMBACKUP_TOOLBAR_COMPARE', true);
|
||||
}
|
||||
|
||||
if ($user->authorise('mokosuitebackup.backup.cancel', 'com_mokosuitebackup')) {
|
||||
ToolbarHelper::custom('backups.cancelStalled', 'stop-circle', '', 'COM_MOKOJOOMBACKUP_TOOLBAR_CANCEL_STALLED', true);
|
||||
}
|
||||
|
||||
if ($user->authorise('core.delete', 'com_mokosuitebackup')) {
|
||||
ToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'backups.delete');
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
-->
|
||||
<extension type="module" client="administrator" method="upgrade">
|
||||
<name>mod_mokosuitebackup_cpanel</name>
|
||||
<version>02.52.22</version>
|
||||
<version>02.52.19</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.22</version>
|
||||
<version>02.52.19</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.22</version>
|
||||
<version>02.52.19</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.22</version>
|
||||
<version>02.52.19</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.22</version>
|
||||
<version>02.52.19</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.22</version>
|
||||
<version>02.52.19</version>
|
||||
<creationDate>2026-06-02</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -28,6 +28,7 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
|
||||
return [
|
||||
'onAfterInitialise' => 'onAfterInitialise',
|
||||
'onAfterRoute' => 'onAfterRoute',
|
||||
'onBeforeRender' => 'onBeforeRender',
|
||||
'onExtensionBeforeUpdate' => 'onExtensionBeforeUpdate',
|
||||
'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
|
||||
{
|
||||
$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');
|
||||
}
|
||||
|
||||
@@ -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.
|
||||
*/
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
-->
|
||||
<extension type="plugin" group="task" method="upgrade">
|
||||
<name>Task - MokoSuiteBackup</name>
|
||||
<version>02.52.22</version>
|
||||
<version>02.52.19</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.22</version>
|
||||
<version>02.52.19</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.22</version>
|
||||
<version>02.52.19</version>
|
||||
<creationDate>2026-06-02</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
Reference in New Issue
Block a user