From 93f0fa0a47f7d2fbb6bf6aef725d937cb3491de9 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 25 Jun 2026 12:17:45 -0500 Subject: [PATCH 1/2] fix: SSH key indicator detection and missing delete language key - SshKeyField: detect base64-encoded keys from DB so the "Key loaded" badge displays correctly after initial upload - Add COM_MOKOJOOMBACKUP_BACKUPS_N_ITEMS_DELETED language keys for Joomla's AdminController delete feedback message --- .../language/en-GB/com_mokosuitebackup.ini | 2 ++ .../packages/com_mokosuitebackup/src/Field/SshKeyField.php | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/source/packages/com_mokosuitebackup/language/en-GB/com_mokosuitebackup.ini b/source/packages/com_mokosuitebackup/language/en-GB/com_mokosuitebackup.ini index 8589854..8547103 100644 --- a/source/packages/com_mokosuitebackup/language/en-GB/com_mokosuitebackup.ini +++ b/source/packages/com_mokosuitebackup/language/en-GB/com_mokosuitebackup.ini @@ -42,6 +42,8 @@ COM_MOKOJOOMBACKUP_DASHBOARD_STORAGE_BREAKDOWN="Storage by Profile" COM_MOKOJOOMBACKUP_DASHBOARD_BACKUP_TREND="Backup Trend (30 days)" ; Backups view +COM_MOKOJOOMBACKUP_BACKUPS_N_ITEMS_DELETED="%d backup records deleted." +COM_MOKOJOOMBACKUP_BACKUPS_N_ITEMS_DELETED_1="%d backup record deleted." COM_MOKOJOOMBACKUP_BACKUPS_TITLE="Backup Records" COM_MOKOJOOMBACKUP_BACKUPS_TABLE_CAPTION="Table of backup records" COM_MOKOJOOMBACKUP_NO_BACKUPS="No backups found. Click 'Backup Now' to create your first backup." diff --git a/source/packages/com_mokosuitebackup/src/Field/SshKeyField.php b/source/packages/com_mokosuitebackup/src/Field/SshKeyField.php index 176ce22..6338928 100644 --- a/source/packages/com_mokosuitebackup/src/Field/SshKeyField.php +++ b/source/packages/com_mokosuitebackup/src/Field/SshKeyField.php @@ -29,7 +29,10 @@ class SshKeyField extends FormField $id = $this->id; $name = $this->name; - $hasKey = !empty($value) && str_contains($value, 'PRIVATE KEY'); + $decoded = !empty($value) ? (base64_decode($value, true) ?: '') : ''; + $hasKey = !empty($value) && ($value === '__KEEP_EXISTING__' + || str_contains($value, 'PRIVATE KEY') + || str_contains($decoded, 'PRIVATE KEY')); $html = '
'; -- 2.52.0 From 3bd1f6383391eadeb0c5da0ab58ffa6681c8bbbd Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Thu, 25 Jun 2026 17:18:03 +0000 Subject: [PATCH 2/2] chore(version): pre-release bump to 01.43.21-dev [skip ci] --- .mokogitea/workflows/issue-branch.yml | 2 +- source/packages/com_mokosuitebackup/mokosuitebackup.xml | 4 ++-- .../com_mokosuitebackup/sql/updates/mysql/01.43.21.sql | 1 + .../mod_mokosuitebackup_cpanel/mod_mokosuitebackup_cpanel.xml | 4 ++-- .../plg_actionlog_mokosuitebackup/mokosuitebackup.xml | 4 ++-- .../packages/plg_console_mokosuitebackup/mokosuitebackup.xml | 4 ++-- .../packages/plg_content_mokosuitebackup/mokosuitebackup.xml | 4 ++-- .../plg_quickicon_mokosuitebackup/mokosuitebackup.xml | 4 ++-- .../packages/plg_system_mokosuitebackup/mokosuitebackup.xml | 4 ++-- source/packages/plg_task_mokosuitebackup/mokosuitebackup.xml | 4 ++-- .../plg_webservices_mokosuitebackup/mokosuitebackup.xml | 4 ++-- source/pkg_mokosuitebackup.xml | 4 ++-- 12 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 source/packages/com_mokosuitebackup/sql/updates/mysql/01.43.21.sql diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index f2a0939..52925e2 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: mokocli.Automation -# VERSION: 01.43.20 +# VERSION: 01.43.21 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/source/packages/com_mokosuitebackup/mokosuitebackup.xml b/source/packages/com_mokosuitebackup/mokosuitebackup.xml index e379b0b..714ee1d 100644 --- a/source/packages/com_mokosuitebackup/mokosuitebackup.xml +++ b/source/packages/com_mokosuitebackup/mokosuitebackup.xml @@ -7,8 +7,8 @@ --> MokoSuiteBackup - 01.43.20 - 01.43.20 + 01.43.21 + 01.43.21 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/source/packages/com_mokosuitebackup/sql/updates/mysql/01.43.21.sql b/source/packages/com_mokosuitebackup/sql/updates/mysql/01.43.21.sql new file mode 100644 index 0000000..63dc486 --- /dev/null +++ b/source/packages/com_mokosuitebackup/sql/updates/mysql/01.43.21.sql @@ -0,0 +1 @@ +/* 01.43.21 — no schema changes */ diff --git a/source/packages/mod_mokosuitebackup_cpanel/mod_mokosuitebackup_cpanel.xml b/source/packages/mod_mokosuitebackup_cpanel/mod_mokosuitebackup_cpanel.xml index ac3ecfb..5b755bc 100644 --- a/source/packages/mod_mokosuitebackup_cpanel/mod_mokosuitebackup_cpanel.xml +++ b/source/packages/mod_mokosuitebackup_cpanel/mod_mokosuitebackup_cpanel.xml @@ -8,8 +8,8 @@ --> mod_mokosuitebackup_cpanel - 01.43.20 - 01.43.20 + 01.43.21 + 01.43.21 2026-06-23 Moko Consulting hello@mokoconsulting.tech diff --git a/source/packages/plg_actionlog_mokosuitebackup/mokosuitebackup.xml b/source/packages/plg_actionlog_mokosuitebackup/mokosuitebackup.xml index 333de5f..ba6a45c 100644 --- a/source/packages/plg_actionlog_mokosuitebackup/mokosuitebackup.xml +++ b/source/packages/plg_actionlog_mokosuitebackup/mokosuitebackup.xml @@ -7,8 +7,8 @@ --> Action Log - MokoSuiteBackup - 01.43.20 - 01.43.20 + 01.43.21 + 01.43.21 2026-06-04 Moko Consulting hello@mokoconsulting.tech diff --git a/source/packages/plg_console_mokosuitebackup/mokosuitebackup.xml b/source/packages/plg_console_mokosuitebackup/mokosuitebackup.xml index 017afed..ec04881 100644 --- a/source/packages/plg_console_mokosuitebackup/mokosuitebackup.xml +++ b/source/packages/plg_console_mokosuitebackup/mokosuitebackup.xml @@ -7,8 +7,8 @@ --> Console - MokoSuiteBackup - 01.43.20 - 01.43.20 + 01.43.21 + 01.43.21 2026-06-04 Moko Consulting hello@mokoconsulting.tech diff --git a/source/packages/plg_content_mokosuitebackup/mokosuitebackup.xml b/source/packages/plg_content_mokosuitebackup/mokosuitebackup.xml index 599c0cb..3d9f6ce 100644 --- a/source/packages/plg_content_mokosuitebackup/mokosuitebackup.xml +++ b/source/packages/plg_content_mokosuitebackup/mokosuitebackup.xml @@ -7,8 +7,8 @@ --> Content - MokoSuiteBackup - 01.43.20 - 01.43.20 + 01.43.21 + 01.43.21 2026-06-04 Moko Consulting hello@mokoconsulting.tech diff --git a/source/packages/plg_quickicon_mokosuitebackup/mokosuitebackup.xml b/source/packages/plg_quickicon_mokosuitebackup/mokosuitebackup.xml index 8fca3b2..7c1fc89 100644 --- a/source/packages/plg_quickicon_mokosuitebackup/mokosuitebackup.xml +++ b/source/packages/plg_quickicon_mokosuitebackup/mokosuitebackup.xml @@ -1,8 +1,8 @@ Quick Icon - MokoSuiteBackup - 01.43.20 - 01.43.20 + 01.43.21 + 01.43.21 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/source/packages/plg_system_mokosuitebackup/mokosuitebackup.xml b/source/packages/plg_system_mokosuitebackup/mokosuitebackup.xml index 6302c95..4fc480d 100644 --- a/source/packages/plg_system_mokosuitebackup/mokosuitebackup.xml +++ b/source/packages/plg_system_mokosuitebackup/mokosuitebackup.xml @@ -7,8 +7,8 @@ --> System - MokoSuiteBackup - 01.43.20 - 01.43.20 + 01.43.21 + 01.43.21 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/source/packages/plg_task_mokosuitebackup/mokosuitebackup.xml b/source/packages/plg_task_mokosuitebackup/mokosuitebackup.xml index 45577c8..adc4062 100644 --- a/source/packages/plg_task_mokosuitebackup/mokosuitebackup.xml +++ b/source/packages/plg_task_mokosuitebackup/mokosuitebackup.xml @@ -7,8 +7,8 @@ --> Task - MokoSuiteBackup - 01.43.20 - 01.43.20 + 01.43.21 + 01.43.21 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/source/packages/plg_webservices_mokosuitebackup/mokosuitebackup.xml b/source/packages/plg_webservices_mokosuitebackup/mokosuitebackup.xml index f51304e..26109fb 100644 --- a/source/packages/plg_webservices_mokosuitebackup/mokosuitebackup.xml +++ b/source/packages/plg_webservices_mokosuitebackup/mokosuitebackup.xml @@ -7,8 +7,8 @@ --> Web Services - MokoSuiteBackup - 01.43.20 - 01.43.20 + 01.43.21 + 01.43.21 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/source/pkg_mokosuitebackup.xml b/source/pkg_mokosuitebackup.xml index ecf589d..b495ca1 100644 --- a/source/pkg_mokosuitebackup.xml +++ b/source/pkg_mokosuitebackup.xml @@ -8,8 +8,8 @@ Package - MokoSuiteBackup mokosuitebackup - 01.43.20 - 01.43.20 + 01.43.21 + 01.43.21 2026-06-02 Moko Consulting hello@mokoconsulting.tech -- 2.52.0